diff options
author | Michal Kabaj <michal.kabaj@nokia.com> | 2019-12-04 12:51:19 +0100 |
---|---|---|
committer | Michal Kabaj <michal.kabaj@nokia.com> | 2019-12-04 13:18:57 +0100 |
commit | 2532f556a8bda4d6eec02d5120553262e65c7329 (patch) | |
tree | c39374d379454bf6d90256c0f5701185c259e6a0 /prh-commons/src/main/java/org/onap/dcaegen2/services/prh/adapter/aai/api/patch/AaiHttpPatchClient.java | |
parent | 26b3fd4c057a8e1ac38bcc48c920c4aef61da9e2 (diff) |
Refactor AaiClient API - remove interfaces
- Removed JsonBodyBuilder because it had only one impl - AaiJsonBodyBuilderImpl
- Removed AaiModel because it had only one impl - ConsumerDmaapModel
- Replaced usages of removed interfaces with concrete implementations
Issue-ID: DCAEGEN2-1955
Signed-off-by: Michal Kabaj <michal.kabaj@nokia.com>
Change-Id: I6cd651b2061e8520a508e3a62091d1cb15002c99
Diffstat (limited to 'prh-commons/src/main/java/org/onap/dcaegen2/services/prh/adapter/aai/api/patch/AaiHttpPatchClient.java')
-rw-r--r-- | prh-commons/src/main/java/org/onap/dcaegen2/services/prh/adapter/aai/api/patch/AaiHttpPatchClient.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/adapter/aai/api/patch/AaiHttpPatchClient.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/adapter/aai/api/patch/AaiHttpPatchClient.java index fdeb5e3c..efae2d54 100644 --- a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/adapter/aai/api/patch/AaiHttpPatchClient.java +++ b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/adapter/aai/api/patch/AaiHttpPatchClient.java @@ -26,8 +26,8 @@ import io.vavr.collection.HashMap; import io.vavr.collection.Map; import org.onap.dcaegen2.services.prh.adapter.aai.api.AaiClientConfiguration; import org.onap.dcaegen2.services.prh.adapter.aai.api.AaiHttpClient; -import org.onap.dcaegen2.services.prh.adapter.aai.model.AaiModel; -import org.onap.dcaegen2.services.prh.adapter.aai.model.JsonBodyBuilder; +import org.onap.dcaegen2.services.prh.model.AaiJsonBodyBuilderImpl; +import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel; import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpMethod; import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpResponse; import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.ImmutableHttpRequest; @@ -35,28 +35,28 @@ import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.RequestBody; import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.RxHttpClient; import reactor.core.publisher.Mono; -public final class AaiHttpPatchClient implements AaiHttpClient<AaiModel, HttpResponse> { +public final class AaiHttpPatchClient implements AaiHttpClient<ConsumerDmaapModel, HttpResponse> { private final static Map<String, String> CONTENT_TYPE = HashMap.of("Content-Type", "application/merge-patch+json"); private RxHttpClient httpClient; private final AaiClientConfiguration configuration; - private final JsonBodyBuilder jsonBodyBuilder; + private final AaiJsonBodyBuilderImpl jsonBodyBuilder; - public AaiHttpPatchClient(final AaiClientConfiguration configuration, JsonBodyBuilder jsonBodyBuilder, + public AaiHttpPatchClient(final AaiClientConfiguration configuration, AaiJsonBodyBuilderImpl jsonBodyBuilder, RxHttpClient httpClient) { this.configuration = configuration; this.jsonBodyBuilder = jsonBodyBuilder; this.httpClient = httpClient; } - public Mono<HttpResponse> getAaiResponse(AaiModel aaiModel) { + public Mono<HttpResponse> getAaiResponse(ConsumerDmaapModel aaiModel) { final Map<String, String> headers = CONTENT_TYPE.merge(HashMap.ofAll(configuration.aaiHeaders())); String jsonBody = jsonBodyBuilder.createJsonBody(aaiModel); return httpClient.call(ImmutableHttpRequest.builder() - .url(configuration.pnfUrl() + "/" + aaiModel.getCorrelationId()) + .url(configuration.pnfUrl() + "/" + aaiModel.getCorrelationId()) .customHeaders(headers) .diagnosticContext(createRequestDiagnosticContext()) .body(RequestBody.fromString(jsonBody)) |