From 6ef3cb626cdf753b15cf91b88bf8304b7ea7a812 Mon Sep 17 00:00:00 2001 From: pwielebs Date: Mon, 27 May 2019 11:20:22 +0200 Subject: [PATCH] Refactor of AAI model Unused fields removed from AAI model in SDK Change-Id: Ie46c98edd2ccbcff146b210c715f472d15e26bef Issue-ID: DCAEGEN2-1533 Signed-off-by: pwielebs --- .../aai/client/config/AaiClientConfiguration.java | 25 ---------------------- .../http/get/AaiGetServiceInstanceClient.java | 10 ++------- .../client/service/http/get/AaiHttpGetClient.java | 8 ++----- .../service/http/patch/AaiHttpPatchClient.java | 7 ++---- .../aai/client/AaiClientConfigurations.java | 5 ----- .../service/http/AbstractHttpClientTest.java | 7 +----- version.properties | 12 +++++------ 7 files changed, 13 insertions(+), 61 deletions(-) diff --git a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/config/AaiClientConfiguration.java b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/config/AaiClientConfiguration.java index fad3cb60..00d323cc 100644 --- a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/config/AaiClientConfiguration.java +++ b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/config/AaiClientConfiguration.java @@ -37,23 +37,6 @@ public abstract class AaiClientConfiguration implements Serializable { @Value.Parameter public abstract String pnfUrl(); - /** - Due to changes in the aai client configuration json old parameters: - aaiHost, aaiProtocol, aaiPort, aaiBasePath, aaiPnfPath - will be replaced by pnfUrl - */ - @Deprecated - @Value.Parameter - public abstract String aaiHost(); - - @Deprecated - @Value.Parameter - public abstract Integer aaiPort(); - - @Deprecated - @Value.Parameter - public abstract String aaiProtocol(); - @Value.Parameter public abstract String aaiUserName(); @@ -63,14 +46,6 @@ public abstract class AaiClientConfiguration implements Serializable { @Value.Parameter public abstract Boolean aaiIgnoreSslCertificateErrors(); - @Deprecated - @Value.Parameter - public abstract String aaiBasePath(); - - @Deprecated - @Value.Parameter - public abstract String aaiPnfPath(); - @Value.Parameter public abstract String aaiServiceInstancePath(); diff --git a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/get/AaiGetServiceInstanceClient.java b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/get/AaiGetServiceInstanceClient.java index 30e28a47..9c9b9fed 100644 --- a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/get/AaiGetServiceInstanceClient.java +++ b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/get/AaiGetServiceInstanceClient.java @@ -46,7 +46,7 @@ public class AaiGetServiceInstanceClient implements private final RxHttpClient httpClient; private final AaiClientConfiguration configuration; - public AaiGetServiceInstanceClient(final AaiClientConfiguration configuration, + AaiGetServiceInstanceClient(final AaiClientConfiguration configuration, final RxHttpClient httpClient) { this.configuration = configuration; this.httpClient = httpClient; @@ -69,12 +69,6 @@ public class AaiGetServiceInstanceClient implements } private String getUri(final String endpoint) { - return new URI.URIBuilder() - .scheme(configuration.aaiProtocol()) - .host(configuration.aaiHost()) - .port(configuration.aaiPort()) - .path(configuration.aaiBasePath() + "/" + endpoint) - .build() - .toString(); + return new URI.URIBuilder().path(configuration.pnfUrl() + "/" + endpoint).build().toString(); } } diff --git a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/get/AaiHttpGetClient.java b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/get/AaiHttpGetClient.java index d78953da..9c059a99 100644 --- a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/get/AaiHttpGetClient.java +++ b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/get/AaiHttpGetClient.java @@ -38,7 +38,7 @@ public final class AaiHttpGetClient implements AaiHttpClient headers, boolean secure) { return new ImmutableAaiClientConfiguration.Builder() .pnfUrl("some-url") - .aaiHost("sample-host") .aaiUserName("sample-username") .aaiUserPassword("sample-password") .aaiIgnoreSslCertificateErrors(false) @@ -54,10 +53,6 @@ public final class AaiClientConfigurations { .keyStorePasswordPath("/server.pass") .enableAaiCertAuth(secure) .aaiHeaders(headers) - .aaiProtocol("sample-protocol") - .aaiPort(8080) - .aaiBasePath("sample-base-path") - .aaiPnfPath("sample-pnf-path") .aaiServiceInstancePath("sample-instance-path") .build(); } diff --git a/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/AbstractHttpClientTest.java b/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/AbstractHttpClientTest.java index 7a8d39d1..097c5d3a 100644 --- a/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/AbstractHttpClientTest.java +++ b/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/AbstractHttpClientTest.java @@ -37,11 +37,6 @@ public class AbstractHttpClientTest { protected String constructAaiUri(AaiClientConfiguration configuration, String pnfName) { - return new URI.URIBuilder() - .scheme(configuration.aaiProtocol()) - .host(configuration.aaiHost()) - .port(configuration.aaiPort()) - .path(configuration.aaiBasePath() + configuration.aaiPnfPath() + "/" + pnfName) - .build().toString(); + return new URI.URIBuilder().path(configuration.pnfUrl() + "/" + pnfName).build().toString(); } } diff --git a/version.properties b/version.properties index 07578e54..00ef5645 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ -major=1 -minor=2 -patch=0 -base_version=${major}.${minor}.${patch} -release_version=${base_version} -snapshot_version=${base_version}-SNAPSHOT +major=1 +minor=2 +patch=0 +base_version=${major}.${minor}.${patch} +release_version=${base_version} +snapshot_version=${base_version}-SNAPSHOT -- 2.16.6