From 8e2f994f3ff6ce1b45b8897a9838b24e8a925e9d Mon Sep 17 00:00:00 2001
From: micdzied <michal.1.dziedzic@nokia.com>
Date: Thu, 21 Feb 2019 13:21:43 +0100
Subject: [PATCH] move URI class

Change-Id: I4e923f0426ecccda6de973400a022e4d86780d4f
Issue-ID: DCAEGEN2-1267
Signed-off-by: micdzied <michal.1.dziedzic@nokia.com>
---
 rest-services/cbs-client/pom.xml                   |  9 ++++++++
 .../ReactiveCloudConfigurationProvider.java        |  1 +
 .../services/sdk/rest/services/uri}/URI.java       | 26 +++++++++++-----------
 3 files changed, 23 insertions(+), 13 deletions(-)
 rename rest-services/{cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers => common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/uri}/URI.java (87%)

diff --git a/rest-services/cbs-client/pom.xml b/rest-services/cbs-client/pom.xml
index a3424b63..b1306919 100644
--- a/rest-services/cbs-client/pom.xml
+++ b/rest-services/cbs-client/pom.xml
@@ -19,7 +19,16 @@
   <description>Config Binding Service Rest Services Module</description>
   <packaging>jar</packaging>
 
+  <properties>
+    <common-dependency.version>1.1.2-SNAPSHOT</common-dependency.version>
+  </properties>
+
   <dependencies>
+    <dependency>
+      <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
+      <artifactId>common-dependency</artifactId>
+      <version>${common-dependency.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webflux</artifactId>
diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProvider.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProvider.java
index a0b4a6f0..88665e75 100644
--- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProvider.java
+++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProvider.java
@@ -25,6 +25,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.http.configuration.CloudHttpClient;
 import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.http.configuration.EnvProperties;
+import org.onap.dcaegen2.services.sdk.rest.services.uri.URI;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Mono;
diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/URI.java b/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/uri/URI.java
similarity index 87%
rename from rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/URI.java
rename to rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/uri/URI.java
index f478ff06..6b74a82a 100644
--- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/URI.java
+++ b/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/uri/URI.java
@@ -19,9 +19,9 @@
  *
  */
 
-package org.onap.dcaegen2.services.sdk.rest.services.cbs.client.providers;
+package org.onap.dcaegen2.services.sdk.rest.services.uri;
 
-final class URI {
+public final class URI {
     private String scheme;
     private String host;
     private int port;
@@ -36,7 +36,7 @@ final class URI {
     private URI() {
     }
 
-    static final class URIBuilder {
+    public static final class URIBuilder {
         private String scheme;
         private String host;
         private int port;
@@ -47,52 +47,52 @@ final class URI {
         private String query;
         private String schemeSpecificPart;
 
-        URIBuilder scheme(String scheme) {
+        public URIBuilder scheme(String scheme) {
             this.scheme = scheme;
             return this;
         }
 
-        URIBuilder host(String host) {
+        public URIBuilder host(String host) {
             this.host = host;
             return this;
         }
 
-        URIBuilder port(int port) {
+        public URIBuilder port(int port) {
             this.port = port;
             return this;
         }
 
-        URIBuilder path(String path) {
+        public URIBuilder path(String path) {
             this.path = path;
             return this;
         }
 
-        URIBuilder fragment(String fragment) {
+        public URIBuilder fragment(String fragment) {
             this.fragment = fragment;
             return this;
         }
 
-        URIBuilder authority(String authority) {
+        public URIBuilder authority(String authority) {
             this.authority = authority;
             return this;
         }
 
-        URIBuilder userInfo(String userInfo) {
+        public URIBuilder userInfo(String userInfo) {
             this.userInfo = userInfo;
             return this;
         }
 
-        URIBuilder query(String query) {
+        public URIBuilder query(String query) {
             this.query = query;
             return this;
         }
 
-        URIBuilder schemeSpecificPart(String schemeSpecificPart) {
+        public URIBuilder schemeSpecificPart(String schemeSpecificPart) {
             this.schemeSpecificPart = schemeSpecificPart;
             return this;
         }
 
-        URI build() {
+        public URI build() {
             URI uri = new URI();
             uri.scheme = this.scheme;
             uri.host = this.host;
-- 
2.16.6