summaryrefslogtreecommitdiffstats
path: root/prh-aai-client/src/main
diff options
context:
space:
mode:
authorwasala <przemyslaw.wasala@nokia.com>2018-03-27 13:02:10 +0200
committerwasala <przemyslaw.wasala@nokia.com>2018-03-28 13:52:17 +0200
commit961af3e21239edd4714e7e586ed5db902bd85d53 (patch)
treed28687a6ca73199be3a7687b389ea34415193a84 /prh-aai-client/src/main
parentb80bcb81356fc9953e85196d8cbf6ada2ebbc143 (diff)
Added U&IT tests in prh module
We have already added tests in our Module. In addition some dependencies were added too. Clean up in pom.xml files Change-Id: I4217d585293f48f2f00870d147807bb1d5b2b33f Issue-ID: DCAEGEN2-407 Signed-off-by: wasala <przemyslaw.wasala@nokia.com>
Diffstat (limited to 'prh-aai-client/src/main')
-rw-r--r--prh-aai-client/src/main/java/services/config/AAIConfig.java (renamed from prh-aai-client/src/main/java/services/config/Config.java)2
-rw-r--r--prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java30
-rw-r--r--prh-aai-client/src/main/java/services/config/DmaapConfig.java34
3 files changed, 23 insertions, 43 deletions
diff --git a/prh-aai-client/src/main/java/services/config/Config.java b/prh-aai-client/src/main/java/services/config/AAIConfig.java
index a2a012c5..5d98b6ce 100644
--- a/prh-aai-client/src/main/java/services/config/Config.java
+++ b/prh-aai-client/src/main/java/services/config/AAIConfig.java
@@ -24,6 +24,6 @@ import java.io.Serializable;
/**
* @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
*/
-interface Config extends Serializable {
+interface AAIConfig extends Serializable {
}
diff --git a/prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java b/prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java
index 396a78be..a7b0aac6 100644
--- a/prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java
+++ b/prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java
@@ -27,15 +27,29 @@ import org.immutables.value.Value;
*/
@Value.Immutable(prehash = true)
@Value.Style(stagedBuilder = true)
-public abstract class AAIDmaapProducerConfiguration extends DmaapConfig {
+public abstract class AAIDmaapProducerConfiguration implements AAIConfig {
private static final long serialVersionUID = 1L;
- private String aaiHost;
- private Integer aaiHostPortNumber;
- private String aaiProtocol;
- private String aaiUserName;
- private String aaiUserPassword;
- private URL aaiProxyURL;
- private boolean aaiIgnoreSSLCertificateErrors;
+ @Value.Parameter
+ public abstract String aaiHost();
+
+ @Value.Parameter
+ public abstract Integer aaiHostPortNumber();
+
+ @Value.Parameter
+ public abstract String aaiProtocol();
+
+ @Value.Parameter
+ public abstract String aaiUserName();
+
+ @Value.Parameter
+ public abstract String aaiUserPassword();
+
+ @Value.Parameter
+ public abstract URL aaiProxyURL();
+
+ @Value.Parameter
+ public abstract boolean aaiIgnoreSSLCertificateErrors();
+
}
diff --git a/prh-aai-client/src/main/java/services/config/DmaapConfig.java b/prh-aai-client/src/main/java/services/config/DmaapConfig.java
deleted file mode 100644
index 0ddaea28..00000000
--- a/prh-aai-client/src/main/java/services/config/DmaapConfig.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * PROJECT
- * ================================================================================
- * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package services.config;
-
-/**
- * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
- */
-public abstract class DmaapConfig implements Config {
-
- private String dmmaphostName;
- private Integer dmmapportNumber;
- private String dmmaptopicName;
- private String dmmapprotocol;
- private String dmmapuserName;
- private String dmmapuserPassword;
- private String dmmapcontentType;
-}