aboutsummaryrefslogtreecommitdiffstats
path: root/rest-services/aai-client/src/main
diff options
context:
space:
mode:
authorJakub Dudycz <jakub.dudycz@nokia.com>2019-03-28 17:16:25 +0100
committerJakub Dudycz <jakub.dudycz@nokia.com>2019-04-02 14:23:57 +0200
commitbf0927e896ed703fc25367fe80a0c21dffdbee31 (patch)
tree90ee946fa4c76612417ecf29b7c429312bc221db /rest-services/aai-client/src/main
parentca4e1bbb98e40bf89e4e3c83d7eb983b9027e65a (diff)
Improve code coverage in aai-client module
Change-Id: I6c840e136d39fbeca72e943d81cb3638927f89b0 Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com> Issue-ID: DCAEGEN2-1375
Diffstat (limited to 'rest-services/aai-client/src/main')
-rw-r--r--rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiHttpClientFactory.java16
-rw-r--r--rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/get/AaiGetServiceInstanceClient.java17
-rw-r--r--rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/get/AaiHttpGetClient.java10
-rw-r--r--rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/patch/AaiHttpPatchClient.java12
-rw-r--r--rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/put/AaiHttpPutClient.java7
5 files changed, 33 insertions, 29 deletions
diff --git a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiHttpClientFactory.java b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiHttpClientFactory.java
index d2e109ee..9c097ef1 100644
--- a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiHttpClientFactory.java
+++ b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiHttpClientFactory.java
@@ -22,6 +22,9 @@ package org.onap.dcaegen2.services.sdk.rest.services.aai.client.service;
import io.netty.handler.ssl.SslContext;
import io.vavr.control.Try;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.UUID;
import org.onap.dcaegen2.services.sdk.rest.services.aai.client.config.AaiClientConfiguration;
import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.CloudHttpClient;
import org.onap.dcaegen2.services.sdk.rest.services.model.logging.ImmutableRequestDiagnosticContext;
@@ -34,21 +37,20 @@ import org.onap.dcaegen2.services.sdk.security.ssl.SslFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Base64;
-import java.util.UUID;
-
public class AaiHttpClientFactory {
private static final Logger LOGGER = LoggerFactory.getLogger(AaiHttpClientFactory.class);
private final AaiClientConfiguration configuration;
- private final SslFactory sslFactory = new SslFactory();
-
+ private final SslFactory sslFactory;
public AaiHttpClientFactory(AaiClientConfiguration configuration) {
+ this(configuration, new SslFactory());
+ }
+
+ public AaiHttpClientFactory(AaiClientConfiguration configuration, SslFactory sslFactory) {
this.configuration = configuration;
+ this.sslFactory = sslFactory;
}
public CloudHttpClient build() {
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 f8300eb2..1838ce4a 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
@@ -20,6 +20,8 @@
package org.onap.dcaegen2.services.sdk.rest.services.aai.client.service.http.get;
+import static org.onap.dcaegen2.services.sdk.rest.services.aai.client.service.AaiHttpClientFactory.createRequestDiagnosticContext;
+
import io.vavr.collection.HashMap;
import io.vavr.collection.Map;
import org.apache.commons.text.StringSubstitutor;
@@ -31,20 +33,19 @@ import org.onap.dcaegen2.services.sdk.rest.services.model.AaiServiceInstanceQuer
import org.onap.dcaegen2.services.sdk.rest.services.uri.URI;
import reactor.core.publisher.Mono;
-import static org.onap.dcaegen2.services.sdk.rest.services.aai.client.service.AaiHttpClientFactory.createRequestDiagnosticContext;
-
public class AaiGetServiceInstanceClient implements
AaiHttpClient<AaiServiceInstanceQueryModel, HttpResponse> {
//variables for query "/business/customers/customer/${customer}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${serviceInstanceId}"
- public static final String CUSTOMER = "customer";
- public static final String SERVICE_TYPE = "serviceType";
- public static final String SERVICE_INSTANCE_ID = "serviceInstanceId";
+ private static final String CUSTOMER = "customer";
+ private static final String SERVICE_TYPE = "serviceType";
+ private static final String SERVICE_INSTANCE_ID = "serviceInstanceId";
- private CloudHttpClient httpGetClient;
+ private final CloudHttpClient httpGetClient;
private final AaiClientConfiguration configuration;
- public AaiGetServiceInstanceClient(final AaiClientConfiguration configuration, final CloudHttpClient httpGetClient) {
+ public AaiGetServiceInstanceClient(final AaiClientConfiguration configuration,
+ final CloudHttpClient httpGetClient) {
this.configuration = configuration;
this.httpGetClient = httpGetClient;
}
@@ -74,4 +75,4 @@ public class AaiGetServiceInstanceClient implements
.build()
.toString();
}
-} \ No newline at end of file
+}
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 1c3f20a6..7d511a9c 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
@@ -20,6 +20,8 @@
package org.onap.dcaegen2.services.sdk.rest.services.aai.client.service.http.get;
+import static org.onap.dcaegen2.services.sdk.rest.services.aai.client.service.AaiHttpClientFactory.createRequestDiagnosticContext;
+
import org.onap.dcaegen2.services.sdk.rest.services.aai.client.config.AaiClientConfiguration;
import org.onap.dcaegen2.services.sdk.rest.services.aai.client.service.http.AaiHttpClient;
import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.CloudHttpClient;
@@ -28,11 +30,9 @@ import org.onap.dcaegen2.services.sdk.rest.services.model.AaiModel;
import org.onap.dcaegen2.services.sdk.rest.services.uri.URI;
import reactor.core.publisher.Mono;
-import static org.onap.dcaegen2.services.sdk.rest.services.aai.client.service.AaiHttpClientFactory.createRequestDiagnosticContext;
-
public final class AaiHttpGetClient implements AaiHttpClient<AaiModel, HttpResponse> {
- private CloudHttpClient httpGetClient;
+ private final CloudHttpClient httpGetClient;
private final AaiClientConfiguration configuration;
@@ -43,7 +43,8 @@ public final class AaiHttpGetClient implements AaiHttpClient<AaiModel, HttpRespo
@Override
public Mono<HttpResponse> getAaiResponse(AaiModel aaiModel) {
- return httpGetClient.get(getUri(aaiModel.getCorrelationId()), createRequestDiagnosticContext(), configuration.aaiHeaders());
+ return httpGetClient
+ .get(getUri(aaiModel.getCorrelationId()), createRequestDiagnosticContext(), configuration.aaiHeaders());
}
private String getUri(String pnfName) {
@@ -53,5 +54,4 @@ public final class AaiHttpGetClient implements AaiHttpClient<AaiModel, HttpRespo
.port(configuration.aaiPort())
.path(configuration.aaiBasePath() + configuration.aaiPnfPath() + "/" + pnfName).build().toString();
}
-
}
diff --git a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/patch/AaiHttpPatchClient.java b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/patch/AaiHttpPatchClient.java
index f92dba99..679d9f18 100644
--- a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/patch/AaiHttpPatchClient.java
+++ b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/patch/AaiHttpPatchClient.java
@@ -20,6 +20,8 @@
package org.onap.dcaegen2.services.sdk.rest.services.aai.client.service.http.patch;
+import static org.onap.dcaegen2.services.sdk.rest.services.aai.client.service.AaiHttpClientFactory.createRequestDiagnosticContext;
+
import io.vavr.collection.HashMap;
import io.vavr.collection.Map;
import org.onap.dcaegen2.services.sdk.rest.services.aai.client.config.AaiClientConfiguration;
@@ -31,10 +33,8 @@ import org.onap.dcaegen2.services.sdk.rest.services.model.JsonBodyBuilder;
import org.onap.dcaegen2.services.sdk.rest.services.uri.URI;
import reactor.core.publisher.Mono;
-
-import static org.onap.dcaegen2.services.sdk.rest.services.aai.client.service.AaiHttpClientFactory.createRequestDiagnosticContext;
-
public final class AaiHttpPatchClient implements AaiHttpClient<AaiModel, HttpResponse> {
+
private final static Map<String, String> CONTENT_TYPE = HashMap.of("Content-Type", "application/merge-patch+json");
private CloudHttpClient httpPatchClient;
@@ -42,7 +42,8 @@ public final class AaiHttpPatchClient implements AaiHttpClient<AaiModel, HttpRes
private final JsonBodyBuilder jsonBodyBuilder;
- public AaiHttpPatchClient(final AaiClientConfiguration configuration, JsonBodyBuilder jsonBodyBuilder, CloudHttpClient httpPatchClient) {
+ public AaiHttpPatchClient(final AaiClientConfiguration configuration, JsonBodyBuilder jsonBodyBuilder,
+ CloudHttpClient httpPatchClient) {
this.configuration = configuration;
this.jsonBodyBuilder = jsonBodyBuilder;
this.httpPatchClient = httpPatchClient;
@@ -66,5 +67,4 @@ public final class AaiHttpPatchClient implements AaiHttpClient<AaiModel, HttpRes
.port(configuration.aaiPort())
.path(configuration.aaiBasePath() + configuration.aaiPnfPath() + "/" + pnfName).build().toString();
}
-
-} \ No newline at end of file
+}
diff --git a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/put/AaiHttpPutClient.java b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/put/AaiHttpPutClient.java
index eb1a389f..ce9eccc3 100644
--- a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/put/AaiHttpPutClient.java
+++ b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/put/AaiHttpPutClient.java
@@ -21,6 +21,8 @@
package org.onap.dcaegen2.services.sdk.rest.services.aai.client.service.http.put;
+import static org.onap.dcaegen2.services.sdk.rest.services.aai.client.service.AaiHttpClientFactory.createRequestDiagnosticContext;
+
import org.onap.dcaegen2.services.sdk.rest.services.aai.client.config.AaiClientConfiguration;
import org.onap.dcaegen2.services.sdk.rest.services.aai.client.service.http.AaiHttpClient;
import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.CloudHttpClient;
@@ -29,8 +31,6 @@ import org.onap.dcaegen2.services.sdk.rest.services.model.AaiModel;
import org.onap.dcaegen2.services.sdk.rest.services.model.JsonBodyBuilder;
import reactor.core.publisher.Mono;
-import static org.onap.dcaegen2.services.sdk.rest.services.aai.client.service.AaiHttpClientFactory.createRequestDiagnosticContext;
-
public class AaiHttpPutClient implements AaiHttpClient<AaiModel, HttpResponse> {
private CloudHttpClient httpPutClient;
@@ -38,7 +38,8 @@ public class AaiHttpPutClient implements AaiHttpClient<AaiModel, HttpResponse> {
private final JsonBodyBuilder jsonBodyBuilder;
private final String uri;
- public AaiHttpPutClient(final AaiClientConfiguration configuration, JsonBodyBuilder jsonBodyBuilder, String uri, CloudHttpClient httpPutClient) {
+ public AaiHttpPutClient(final AaiClientConfiguration configuration, JsonBodyBuilder jsonBodyBuilder, String uri,
+ CloudHttpClient httpPutClient) {
this.configuration = configuration;
this.jsonBodyBuilder = jsonBodyBuilder;
this.uri = uri;