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>

4 files changed, 61 insertions, 43 deletions

diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/Config.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/Config.java
deleted file mode 100644
index 422f3daf..00000000
--- a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/Config.java
+++ /dev/null
@@ -1,29 +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 org.onap.dcaegen2.services.config;
-
-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 {
-
-}
diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConfig.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConfig.java
index 3b485cdb..0d77c057 100644
--- a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConfig.java
+++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConfig.java
@@ -19,16 +19,11 @@
  */
 package org.onap.dcaegen2.services.config;
 
+import java.io.Serializable;
+
 /**
  * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
  */
-public abstract class DmaapConfig implements Config {
+interface DmaapConfig extends Serializable {
 
-    private String dmmaphostName;
-    private Integer dmmapportNumber;
-    private String dmmaptopicName;
-    private String dmmapprotocol;
-    private String dmmapuserName;
-    private String dmmapuserPassword;
-    private String dmmapcontentType;
 }
diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConsumerConfiguration.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConsumerConfiguration.java
index d36104bd..f2a2f061 100644
--- a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConsumerConfiguration.java
+++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConsumerConfiguration.java
@@ -26,12 +26,40 @@ import org.immutables.value.Value;
  */
 @Value.Immutable(prehash = true)
 @Value.Style(stagedBuilder = true)
-public abstract class DmaapConsumerConfiguration extends DmaapConfig {
+public abstract class DmaapConsumerConfiguration implements DmaapConfig {
 
     private static final long serialVersionUID = 1L;
 
-    private String consumerId;
-    private String consumerGroup;
-    private Integer timeoutMS;
-    private Integer messageLimit;
+    @Value.Parameter
+    public abstract String consumerId();
+
+    @Value.Parameter
+    public abstract String consumerGroup();
+
+    @Value.Parameter
+    public abstract Integer timeoutMS();
+
+    @Value.Parameter
+    public abstract Integer messageLimit();
+
+    @Value.Parameter
+    public abstract String dmmaphostName();
+
+    @Value.Parameter
+    public abstract Integer dmmapportNumber();
+
+    @Value.Parameter
+    public abstract String dmmaptopicName();
+
+    @Value.Parameter
+    public abstract String dmmapprotocol();
+
+    @Value.Parameter
+    public abstract String dmmapuserName();
+
+    @Value.Parameter
+    public abstract String dmmapuserPassword();
+
+    @Value.Parameter
+    public abstract String dmmapcontentType();
 }
\ No newline at end of file
diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapProducerConfiguration.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapProducerConfiguration.java
index f5749a3f..a0f29e44 100644
--- a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapProducerConfiguration.java
+++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapProducerConfiguration.java
@@ -19,11 +19,35 @@
  */
 package org.onap.dcaegen2.services.config;
 
+import org.immutables.value.Value;
+
 /**
  * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
  */
-public class DmaapProducerConfiguration extends DmaapConfig {
+@Value.Immutable(prehash = true)
+@Value.Style(stagedBuilder = true)
+public abstract class DmaapProducerConfiguration implements DmaapConfig {
 
     private static final long serialVersionUID = 1L;
 
+    @Value.Parameter
+    public abstract String dmmaphostName();
+
+    @Value.Parameter
+    public abstract Integer dmmapportNumber();
+
+    @Value.Parameter
+    public abstract String dmmaptopicName();
+
+    @Value.Parameter
+    public abstract String dmmapprotocol();
+
+    @Value.Parameter
+    public abstract String dmmapuserName();
+
+    @Value.Parameter
+    public abstract String dmmapuserPassword();
+
+    @Value.Parameter
+    public abstract String dmmapcontentType();
 }