From 3c2e8c9c4c32ad59be75a7500e628344c6dab5bf Mon Sep 17 00:00:00 2001 From: wasala Date: Thu, 12 Apr 2018 13:37:41 +0200 Subject: Already added loading config for AAI and DMAAP First of all we have defined a file in which we have pointer to configuration file for DMAAP and AAI After that added UT Change-Id: I7f9554a019b348a3460f5fa9d8dd3e4002a6686f Issue-ID: DCAEGEN2-407 Signed-off-by: wasala --- .../services/config/AAIHttpClientConfiguration.java | 7 ++++--- .../config/AAIHttpClientConfigurationTest.java | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) (limited to 'prh-aai-client/src') diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/config/AAIHttpClientConfiguration.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/config/AAIHttpClientConfiguration.java index 9f93f896..4b17b4b6 100644 --- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/config/AAIHttpClientConfiguration.java +++ b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/config/AAIHttpClientConfiguration.java @@ -20,15 +20,16 @@ package org.onap.dcaegen2.services.config; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.immutables.value.Value; -import org.springframework.stereotype.Component; - import java.io.Serializable; +import org.springframework.stereotype.Component; @Component @Value.Immutable(prehash = true) -@Value.Style(stagedBuilder = true) +@Value.Style(builder = "new") +@JsonDeserialize(builder = ImmutableAAIHttpClientConfiguration.Builder.class) public abstract class AAIHttpClientConfiguration implements Serializable { private static final long serialVersionUID = 1L; diff --git a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/config/AAIHttpClientConfigurationTest.java b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/config/AAIHttpClientConfigurationTest.java index a759aca5..76c2969a 100644 --- a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/config/AAIHttpClientConfigurationTest.java +++ b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/config/AAIHttpClientConfigurationTest.java @@ -36,21 +36,21 @@ public class AAIHttpClientConfigurationTest { @BeforeAll public static void init() { - client = ImmutableAAIHttpClientConfiguration.builder() - .aaiHost(AAI_HOST) - .aaiHostPortNumber(PORT) - .aaiProtocol(PROTOCOL) - .aaiUserName(USER_NAME_PASSWORD) - .aaiUserPassword(USER_NAME_PASSWORD) - .aaiIgnoreSSLCertificateErrors(true) - .build(); + client = new ImmutableAAIHttpClientConfiguration.Builder() + .aaiHost(AAI_HOST) + .aaiHostPortNumber(PORT) + .aaiProtocol(PROTOCOL) + .aaiUserName(USER_NAME_PASSWORD) + .aaiUserPassword(USER_NAME_PASSWORD) + .aaiIgnoreSSLCertificateErrors(true) + .build(); } @Test public void testGetters_success() { - Assertions.assertEquals(AAI_HOST,client.aaiHost()); + Assertions.assertEquals(AAI_HOST, client.aaiHost()); Assertions.assertEquals(PORT, client.aaiHostPortNumber()); - Assertions.assertEquals(PROTOCOL,client.aaiProtocol()); + Assertions.assertEquals(PROTOCOL, client.aaiProtocol()); Assertions.assertEquals(USER_NAME_PASSWORD, client.aaiUserName()); Assertions.assertEquals(USER_NAME_PASSWORD, client.aaiUserPassword()); Assertions.assertEquals(true, client.aaiIgnoreSSLCertificateErrors()); -- cgit 1.2.3-korg