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 4e6e62e..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
@@ -1,5 +1,7 @@
 /*
  * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2019 Huawei.
+ * Modifications Copyright © 2019 Bell Canada.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,39 +19,51 @@
 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 BasicAuthRestClientProperties : RestClientProperties() {
+open class SSLRestClientProperties : RestClientProperties() {
+
+    lateinit var keyStoreInstance: String // JKS, PKCS12
+    lateinit var sslTrust: String
+    lateinit var sslTrustPassword: String
+    var sslTrustIgnoreHostname: Boolean = false
+    var sslKey: String? = null
+    var sslKeyPassword: String? = null
+}
+
+open class SSLBasicAuthRestClientProperties : SSLRestClientProperties() {
     lateinit var password: String
     lateinit var username: String
 }
 
-open class TokenAuthRestClientProperties : RestClientProperties() {
-    var token: String? = null
+// FIXME("Define token properties")
+open class SSLTokenAuthRestClientProperties : SSLRestClientProperties() {
+
+    var tokenAuth: TokenAuthRestClientProperties? = null
 }
 
-open class SSLBasicAuthRestClientProperties : RestClientProperties() {
-    lateinit var keyStoreInstance: String // JKS, PKCS12
-    lateinit var sslTrust: String
-    lateinit var sslTrustPassword: String
-    lateinit var sslKey: String
-    lateinit var sslKeyPassword: String
+open class BasicAuthRestClientProperties : RestClientProperties() {
+
+    lateinit var password: String
+    lateinit var username: String
 }
 
-open class DME2RestClientProperties : RestClientProperties() {
-    lateinit var service: String
-    lateinit var subContext: String
-    lateinit var version: String
-    lateinit var envContext: String
-    lateinit var routeOffer: String
-    var partner: String? = null
-    lateinit var appId: 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
-}
\ No newline at end of file
+}