summaryrefslogtreecommitdiffstats
path: root/rest-services/cbs-client
diff options
context:
space:
mode:
authormicdzied <michal.1.dziedzic@nokia.com>2019-02-21 13:21:43 +0100
committermicdzied <michal.1.dziedzic@nokia.com>2019-02-21 13:21:43 +0100
commit8e2f994f3ff6ce1b45b8897a9838b24e8a925e9d (patch)
tree33c1f7b3366f1edf1dc5fe4b04a236fb2e12fc0e /rest-services/cbs-client
parentfc88ac806f5650ec9f70c4849e3815132038ec5c (diff)
move URI class
Change-Id: I4e923f0426ecccda6de973400a022e4d86780d4f Issue-ID: DCAEGEN2-1267 Signed-off-by: micdzied <michal.1.dziedzic@nokia.com>
Diffstat (limited to 'rest-services/cbs-client')
-rw-r--r--rest-services/cbs-client/pom.xml9
-rw-r--r--rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProvider.java1
-rw-r--r--rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/URI.java164
3 files changed, 10 insertions, 164 deletions
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,8 +19,17 @@
<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>
</dependency>
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/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/URI.java
deleted file mode 100644
index f478ff06..00000000
--- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/URI.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * DCAEGEN2-SERVICES-SDK
- * ================================================================================
- * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- *
- */
-
-package org.onap.dcaegen2.services.sdk.rest.services.cbs.client.providers;
-
-final class URI {
- private String scheme;
- private String host;
- private int port;
- private String path;
- private String fragment;
- private String authority;
- private String userInfo;
- private String query;
- private String schemeSpecificPart;
- private String string;
-
- private URI() {
- }
-
- static final class URIBuilder {
- private String scheme;
- private String host;
- private int port;
- private String path;
- private String fragment;
- private String authority;
- private String userInfo;
- private String query;
- private String schemeSpecificPart;
-
- URIBuilder scheme(String scheme) {
- this.scheme = scheme;
- return this;
- }
-
- URIBuilder host(String host) {
- this.host = host;
- return this;
- }
-
- URIBuilder port(int port) {
- this.port = port;
- return this;
- }
-
- URIBuilder path(String path) {
- this.path = path;
- return this;
- }
-
- URIBuilder fragment(String fragment) {
- this.fragment = fragment;
- return this;
- }
-
- URIBuilder authority(String authority) {
- this.authority = authority;
- return this;
- }
-
- URIBuilder userInfo(String userInfo) {
- this.userInfo = userInfo;
- return this;
- }
-
- URIBuilder query(String query) {
- this.query = query;
- return this;
- }
-
- URIBuilder schemeSpecificPart(String schemeSpecificPart) {
- this.schemeSpecificPart = schemeSpecificPart;
- return this;
- }
-
- URI build() {
- URI uri = new URI();
- uri.scheme = this.scheme;
- uri.host = this.host;
- uri.port = this.port;
- uri.path = this.path;
- uri.fragment = this.fragment;
- uri.authority = this.authority;
- uri.userInfo = this.userInfo;
- uri.query = this.query;
- uri.schemeSpecificPart = this.schemeSpecificPart;
- return uri;
- }
- }
-
- @Override
- public String toString() {
- defineString();
- return string;
- }
-
- private void defineString() {
- if (string != null) return;
-
- StringBuffer sb = new StringBuffer();
- if (scheme != null) {
- sb.append(scheme);
- sb.append(':');
- }
- if (isOpaque()) {
- sb.append(schemeSpecificPart);
- } else {
- if (host != null) {
- sb.append("//");
- if (userInfo != null) {
- sb.append(userInfo);
- sb.append('@');
- }
- boolean needBrackets = ((host.indexOf(':') >= 0)
- && !host.startsWith("[")
- && !host.endsWith("]"));
- if (needBrackets) sb.append('[');
- sb.append(host);
- if (needBrackets) sb.append(']');
- if (port != -1) {
- sb.append(':');
- sb.append(port);
- }
- } else if (authority != null) {
- sb.append("//");
- sb.append(authority);
- }
- if (path != null)
- sb.append(path);
- if (query != null) {
- sb.append('?');
- sb.append(query);
- }
- }
- if (fragment != null) {
- sb.append('#');
- sb.append(fragment);
- }
- string = sb.toString();
- }
-
- private boolean isOpaque() {
- return path == null;
- }
-} \ No newline at end of file