From 53a1c38610822ba590252a0bc122eadfbe626a8c Mon Sep 17 00:00:00 2001 From: Marcin Migdal Date: Wed, 10 Apr 2019 13:11:32 +0200 Subject: Add endpoint Url do DmaapCustomConfig Change-Id: Ibe397e474964c0012068a3ab4606e441562464d9 Issue-ID: DCAEGEN2-1310 Signed-off-by: mmigdal Signed-off-by: Marcin Migdal --- .../sdk/rest/services/dmaap/client/config/DmaapCustomConfig.java | 9 +++++++++ .../dmaap/client/config/DmaapConsumerConfigurationTest.java | 6 +++++- .../dmaap/client/config/DmaapPublisherConfigurationTest.java | 5 ++++- 3 files changed, 18 insertions(+), 2 deletions(-) (limited to 'rest-services') diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapCustomConfig.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapCustomConfig.java index efeaa85f..6cfb358b 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapCustomConfig.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapCustomConfig.java @@ -28,15 +28,19 @@ import org.immutables.value.Value; */ public interface DmaapCustomConfig extends Serializable { + @Deprecated @Value.Parameter String dmaapHostName(); + @Deprecated @Value.Parameter Integer dmaapPortNumber(); + @Deprecated @Value.Parameter String dmaapTopicName(); + @Deprecated @Value.Parameter String dmaapProtocol(); @@ -64,6 +68,9 @@ public interface DmaapCustomConfig extends Serializable { @Value.Parameter Boolean enableDmaapCertAuth(); + @Value.Parameter + String endpointUrl(); + interface Builder> { B dmaapHostName(String dmaapHostName); @@ -90,6 +97,8 @@ public interface DmaapCustomConfig extends Serializable { B enableDmaapCertAuth(Boolean enableDmaapCertAuth); + B endpointUrl(String endpointUrl); + T build(); } } diff --git a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapConsumerConfigurationTest.java b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapConsumerConfigurationTest.java index f7940c8f..8ae5e62d 100644 --- a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapConsumerConfigurationTest.java +++ b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapConsumerConfigurationTest.java @@ -49,6 +49,8 @@ class DmaapConsumerConfigurationTest { String keyStorePath = "keyStorePath"; String keyStorePasswordPath = "keyStorePasswordPath"; Boolean enableDmaapCertAuth = true; + String endpointUrl = "http://dmaap-mr:8080/events/topic"; + // When configuration = new ImmutableDmaapConsumerConfiguration.Builder() @@ -68,6 +70,7 @@ class DmaapConsumerConfigurationTest { .keyStorePath(keyStorePath) .keyStorePasswordPath(keyStorePasswordPath) .enableDmaapCertAuth(enableDmaapCertAuth) + .endpointUrl(endpointUrl) .build(); // Then @@ -76,7 +79,8 @@ class DmaapConsumerConfigurationTest { + "dmaapPortNumber=2222, dmaapTopicName=temp, dmaapProtocol=http, dmaapUserName=admin, " + "dmaapUserPassword=admin, dmaapContentType=application/json, " + "trustStorePath=trustStorePath, trustStorePasswordPath=trustStorePasswordPath, " - + "keyStorePath=keyStorePath, keyStorePasswordPath=keyStorePasswordPath, enableDmaapCertAuth=true}", + + "keyStorePath=keyStorePath, keyStorePasswordPath=keyStorePasswordPath, enableDmaapCertAuth=true, " + + "endpointUrl=http://dmaap-mr:8080/events/topic}", configuration.toString()); } diff --git a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapPublisherConfigurationTest.java b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapPublisherConfigurationTest.java index d7f06d1b..0bbd1650 100644 --- a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapPublisherConfigurationTest.java +++ b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapPublisherConfigurationTest.java @@ -46,6 +46,7 @@ class DmaapPublisherConfigurationTest { String keyStorePath = "keyStorePath"; String keyStorePasswordPath = "keyStorePasswordPath"; Boolean enableDmaapCertAuth = true; + String endpointUrl = "http://dmaap-mr:8080/events/topic"; // When configuration = new ImmutableDmaapPublisherConfiguration.Builder() @@ -61,6 +62,7 @@ class DmaapPublisherConfigurationTest { .keyStorePath(keyStorePath) .keyStorePasswordPath(keyStorePasswordPath) .enableDmaapCertAuth(enableDmaapCertAuth) + .endpointUrl(endpointUrl) .build(); // Then @@ -68,6 +70,7 @@ class DmaapPublisherConfigurationTest { + "dmaapTopicName=temp, dmaapProtocol=http, dmaapUserName=admin, dmaapUserPassword=admin, " + "dmaapContentType=application/json, trustStorePath=trustStorePath, " + "trustStorePasswordPath=trustStorePasswordPath, keyStorePath=keyStorePath, " - + "keyStorePasswordPath=keyStorePasswordPath, enableDmaapCertAuth=true}", configuration.toString()); + + "keyStorePasswordPath=keyStorePasswordPath, enableDmaapCertAuth=true, " + + "endpointUrl=http://dmaap-mr:8080/events/topic}", configuration.toString()); } } -- cgit 1.2.3-korg