Merge "Add Rest client that do not add any default headers"

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

diff --git a/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/BluePrintRestLibData.kt b/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/BluePrintRestLibData.kt
index ea32a16..a12680e 100644 (file)
--- a/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/BluePrintRestLibData.kt
+++ b/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/BluePrintRestLibData.kt
@@ -19,12 +19,18 @@
 package org.onap.ccsdk.cds.blueprintsprocessor.rest
 
 open class RestClientProperties {
+
     lateinit var type: String
     lateinit var url: String
+    lateinit var values: Map<String, Any>
+    var connectTimeout: Int = 0
+    var socketTimeout: Int = 0
+    var connectionRequestTimeout: Int = 0
     var additionalHeaders: Map<String, String>? = null
 }
 
 open class SSLRestClientProperties : RestClientProperties() {
+
     lateinit var keyStoreInstance: String // JKS, PKCS12
     lateinit var sslTrust: String
     lateinit var sslTrustPassword: String
@@ -33,26 +39,30 @@ open class SSLRestClientProperties : RestClientProperties() {
     var sslKeyPassword: String? = null
 }
 
-// FIXME("Define basic auth userName and password properties")
 open class SSLBasicAuthRestClientProperties : SSLRestClientProperties() {
-    var basicAuth: BasicAuthRestClientProperties? = null
+    lateinit var password: String
+    lateinit var username: String
 }
 
 // FIXME("Define token properties")
 open class SSLTokenAuthRestClientProperties : SSLRestClientProperties() {
+
     var tokenAuth: TokenAuthRestClientProperties? = null
 }
 
 open class BasicAuthRestClientProperties : RestClientProperties() {
+
     lateinit var password: String
     lateinit var username: String
 }
 
 open class TokenAuthRestClientProperties : RestClientProperties() {
+
     var token: String? = null
 }
 
 open class PolicyManagerRestClientProperties : RestClientProperties() {
+
     lateinit var env: String
     lateinit var clientAuth: String
     lateinit var authorisation: String