diff options
Diffstat (limited to 'rest-services')
| -rw-r--r-- | rest-services/cbs-client/pom.xml | 9 | ||||
| -rw-r--r-- | rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProvider.java | 1 | ||||
| -rw-r--r-- | rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/uri/URI.java (renamed from rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/URI.java) | 26 |
3 files changed, 23 insertions, 13 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/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; |