Address some pendings items for SSLBasicAuthRestClient

[ccsdk/cds.git] / ms / blueprintsprocessor / modules / commons / rest-lib / src / main / kotlin / org / onap / ccsdk / cds / blueprintsprocessor / rest / RestClientPropertiesDSL.kt

diff --git a/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/RestClientPropertiesDSL.kt b/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/RestClientPropertiesDSL.kt
index 45b9e38..b1692d9 100644 (file)
--- a/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/RestClientPropertiesDSL.kt
+++ b/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/RestClientPropertiesDSL.kt
@@ -77,6 +77,10 @@ open class RestClientRelationshipTemplateBuilder(name: String, description: Stri
         property(BlueprintConstants.PROPERTY_CONNECTION_CONFIG, BlueprintTypes.tokenAuthRestClientProperties(block))
     }
 
+    fun sslBasicAuth(block: SSLBasicAuthRestClientPropertiesBuilder.() -> Unit) {
+        property(BlueprintConstants.PROPERTY_CONNECTION_CONFIG, BlueprintTypes.sslBasicAuthRestClientProperties(block))
+    }
+
     fun sslAuth(block: SslAuthRestClientPropertiesAssignmentBuilder.() -> Unit) {
         property(BlueprintConstants.PROPERTY_CONNECTION_CONFIG, BlueprintTypes.sslRestClientProperties(block))
     }
@@ -94,6 +98,12 @@ fun BlueprintTypes.tokenAuthRestClientProperties(block: TokenAuthRestClientPrope
     return assignments.asJsonType()
 }
 
+fun BlueprintTypes.sslBasicAuthRestClientProperties(block: SSLBasicAuthRestClientPropertiesBuilder.() -> Unit): JsonNode {
+    val assignments = SSLBasicAuthRestClientPropertiesBuilder().apply(block).build()
+    assignments[RestClientProperties::type.name] = RestLibConstants.TYPE_SSL_BASIC_AUTH.asJsonPrimitive()
+    return assignments.asJsonType()
+}
+
 fun BlueprintTypes.sslRestClientProperties(block: SslAuthRestClientPropertiesAssignmentBuilder.() -> Unit): JsonNode {
     val assignments = SslAuthRestClientPropertiesAssignmentBuilder().apply(block).build()
     assignments[RestClientProperties::type.name] = RestLibConstants.TYPE_SSL_NO_AUTH.asJsonPrimitive()
@@ -182,10 +192,32 @@ open class SslAuthRestClientPropertiesAssignmentBuilder : RestClientPropertiesAs
     open fun sslKeyPassword(sslKeyPassword: JsonNode) {
         property(SSLRestClientProperties::sslKeyPassword, sslKeyPassword)
     }
+
+    open fun sslTrustIgnoreHostname(sslTrustIgnoreHostname: String) {
+        sslTrustIgnoreHostname(sslTrustIgnoreHostname.asJsonPrimitive())
+    }
+
+    open fun sslTrustIgnoreHostname(sslTrustIgnoreHostname: JsonNode) {
+        property(SSLRestClientProperties::sslTrustIgnoreHostname, sslTrustIgnoreHostname)
+    }
 }
 
 open class SSLBasicAuthRestClientPropertiesBuilder : SslAuthRestClientPropertiesAssignmentBuilder() {
-    // TODO()
+    open fun password(password: String) {
+        password(password.asJsonPrimitive())
+    }
+
+    open fun password(password: JsonNode) {
+        property(SSLBasicAuthRestClientProperties::password, password)
+    }
+
+    open fun username(username: String) {
+        username(username.asJsonPrimitive())
+    }
+
+    open fun username(username: JsonNode) {
+        property(SSLBasicAuthRestClientProperties::username, username)
+    }
 }
 
 open class SSLTokenAuthRestClientPropertiesBuilder : SslAuthRestClientPropertiesAssignmentBuilder() {