CCSDK-1556 -Move this constructor to comply with Java Code Conventions

Move this constructor to comply with Java Code Conventions

Issue-ID: CCSDK-1556
Change-Id: I6b6c75c07cccdd4b18027f6c4ab3badf9c273c97
Signed-off-by: Thugutla Sailakshmi <tsaila10@in.ibm.com>

17 files changed, 35 insertions, 34 deletions

diff --git a/message-router/consumer/api/pom.xml b/message-router/consumer/api/pom.xml
index 7a65eae9..2b55169b 100755
--- a/message-router/consumer/api/pom.xml
+++ b/message-router/consumer/api/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 	<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
 	<artifactId>consumer.aggregate</artifactId>
-	<version>0.5.1-SNAPSHOT</version>
+	<version>0.5.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>consumer.api</artifactId>
diff --git a/message-router/consumer/features/ccsdk-messagerouter-consumer/pom.xml b/message-router/consumer/features/ccsdk-messagerouter-consumer/pom.xml
index 4f4a43e0..f3fc352c 100755
--- a/message-router/consumer/features/ccsdk-messagerouter-consumer/pom.xml
+++ b/message-router/consumer/features/ccsdk-messagerouter-consumer/pom.xml
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>single-feature-parent</artifactId>
-		<version>1.3.2</version>
+		<version>1.3.3-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
 	<artifactId>ccsdk-messagerouter-consumer</artifactId>
-	<version>0.5.1-SNAPSHOT</version>
+	<version>0.5.2-SNAPSHOT</version>
 	<packaging>feature</packaging>
 	
 	<dependencies>
diff --git a/message-router/consumer/features/features-messagerouter-consumer/pom.xml b/message-router/consumer/features/features-messagerouter-consumer/pom.xml
index 810cd05a..a1e12a4b 100755
--- a/message-router/consumer/features/features-messagerouter-consumer/pom.xml
+++ b/message-router/consumer/features/features-messagerouter-consumer/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
     <artifactId>features-messagerouter-consumer</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.5.2-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId}</name>
diff --git a/message-router/consumer/features/pom.xml b/message-router/consumer/features/pom.xml
index cd8407dc..2651a501 100755
--- a/message-router/consumer/features/pom.xml
+++ b/message-router/consumer/features/pom.xml
@@ -16,12 +16,12 @@
     <parent>
         <artifactId>odlparent-lite</artifactId>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <version>1.3.2</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
     <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
     <artifactId>consumer.features</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.5.2-SNAPSHOT</version>
     <name>ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId}</name>
 
     <packaging>pom</packaging>
diff --git a/message-router/consumer/installer/pom.xml b/message-router/consumer/installer/pom.xml
index 62e21477..1e6cc380 100755
--- a/message-router/consumer/installer/pom.xml
+++ b/message-router/consumer/installer/pom.xml
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
 		<artifactId>consumer.aggregate</artifactId>
-		<version>0.5.1-SNAPSHOT</version>
+		<version>0.5.2-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
 	<artifactId>consumer.installer</artifactId>
-	<version>0.5.1-SNAPSHOT</version>
+	<version>0.5.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
diff --git a/message-router/consumer/pom.xml b/message-router/consumer/pom.xml
index 5a292ce1..6476c407 100755
--- a/message-router/consumer/pom.xml
+++ b/message-router/consumer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
 		<artifactId>messagerouter-root</artifactId>
-		<version>0.5.1-SNAPSHOT</version>
+		<version>0.5.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>consumer.aggregate</artifactId>
diff --git a/message-router/consumer/provider/pom.xml b/message-router/consumer/provider/pom.xml
index fa8dfee1..3b1373ed 100755
--- a/message-router/consumer/provider/pom.xml
+++ b/message-router/consumer/provider/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
 		<artifactId>consumer.aggregate</artifactId>
-		<version>0.5.1-SNAPSHOT</version>
+		<version>0.5.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>consumer.provider</artifactId>
diff --git a/message-router/consumer/provider/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/consumer/provider/impl/ConsumerFactory.java b/message-router/consumer/provider/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/consumer/provider/impl/ConsumerFactory.java
index 0802bec2..1aa02c70 100755
--- a/message-router/consumer/provider/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/consumer/provider/impl/ConsumerFactory.java
+++ b/message-router/consumer/provider/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/consumer/provider/impl/ConsumerFactory.java
@@ -77,6 +77,16 @@ public class ConsumerFactory {
     	setDefaults();

         }

     

+    public ConsumerFactory(String username, String password, String host, String group, String id, Integer connectTimeout, Integer readTimeout) {

+    	this.username = username;

+    	this.password = password;

+    	this.host = host;

+    	this.group = group;

+    	this.id = id;

+    	setDefaults();

+        }

+

+    

     public String getAuth() {

 	return auth;

     }

@@ -133,15 +143,6 @@ public class ConsumerFactory {
 	processFilter(filter);

     }

 

-    public ConsumerFactory(String username, String password, String host, String group, String id, Integer connectTimeout, Integer readTimeout) {

-	this.username = username;

-	this.password = password;

-	this.host = host;

-	this.group = group;

-	this.id = id;

-	setDefaults();

-    }

-

     private Integer readOptionalInteger(Properties properties, String propertyName) {

 	String stringValue = properties.getProperty(propertyName);

 	if (stringValue != null && stringValue.length() > 0) {

diff --git a/message-router/pom.xml b/message-router/pom.xml
index 2484f0c2..1e059024 100755
--- a/message-router/pom.xml
+++ b/message-router/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
 	<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
 	<artifactId>messagerouter-root</artifactId>
-	<version>0.5.1-SNAPSHOT</version>
+	<version>0.5.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/message-router/publisher/api/pom.xml b/message-router/publisher/api/pom.xml
index 44990c10..1bdc3a26 100755
--- a/message-router/publisher/api/pom.xml
+++ b/message-router/publisher/api/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 	<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
 	<artifactId>publisher.aggregate</artifactId>
-	<version>0.5.1-SNAPSHOT</version>
+	<version>0.5.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>publisher.api</artifactId>
diff --git a/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml b/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml
index 1f2fb80c..81423b45 100755
--- a/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml
+++ b/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>single-feature-parent</artifactId>
-		<version>1.3.2</version>
+		<version>1.3.3-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
 	<artifactId>ccsdk-messagerouter-publisher</artifactId>
-	<version>0.5.1-SNAPSHOT</version>
+	<version>0.5.2-SNAPSHOT</version>
 	<packaging>feature</packaging>
 	
 	<dependencies>
diff --git a/message-router/publisher/features/features-messagerouter-publisher/pom.xml b/message-router/publisher/features/features-messagerouter-publisher/pom.xml
index d2d70694..3460d8a8 100755
--- a/message-router/publisher/features/features-messagerouter-publisher/pom.xml
+++ b/message-router/publisher/features/features-messagerouter-publisher/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
     <artifactId>features-messagerouter-publisher</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.5.2-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId}</name>
diff --git a/message-router/publisher/features/pom.xml b/message-router/publisher/features/pom.xml
index 1e5ce987..bf7d8b2f 100644
--- a/message-router/publisher/features/pom.xml
+++ b/message-router/publisher/features/pom.xml
@@ -16,12 +16,12 @@
     <parent>
         <artifactId>odlparent-lite</artifactId>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <version>1.3.2</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
     <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
     <artifactId>publisher.features</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.5.2-SNAPSHOT</version>
     <name>ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId}</name>
 
     <packaging>pom</packaging>
diff --git a/message-router/publisher/installer/pom.xml b/message-router/publisher/installer/pom.xml
index 24f07261..de3b5125 100644
--- a/message-router/publisher/installer/pom.xml
+++ b/message-router/publisher/installer/pom.xml
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
 		<artifactId>publisher.aggregate</artifactId>
-		<version>0.5.1-SNAPSHOT</version>
+		<version>0.5.2-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
 	<artifactId>publisher.installer</artifactId>
-	<version>0.5.1-SNAPSHOT</version>
+	<version>0.5.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
diff --git a/message-router/publisher/pom.xml b/message-router/publisher/pom.xml
index f74ee2e5..989254d0 100755
--- a/message-router/publisher/pom.xml
+++ b/message-router/publisher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
 		<artifactId>messagerouter-root</artifactId>
-		<version>0.5.1-SNAPSHOT</version>
+		<version>0.5.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>publisher.aggregate</artifactId>
diff --git a/message-router/publisher/provider/pom.xml b/message-router/publisher/provider/pom.xml
index 222adcd1..347e6a45 100755
--- a/message-router/publisher/provider/pom.xml
+++ b/message-router/publisher/provider/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
 		<artifactId>publisher.aggregate</artifactId>
-		<version>0.5.1-SNAPSHOT</version>
+		<version>0.5.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>publisher.provider</artifactId>
diff --git a/message-router/publisher/sample.client/pom.xml b/message-router/publisher/sample.client/pom.xml
index 4755afe3..d7ddce52 100755
--- a/message-router/publisher/sample.client/pom.xml
+++ b/message-router/publisher/sample.client/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
 		<artifactId>publisher.aggregate</artifactId>
-		<version>0.5.1-SNAPSHOT</version>
+		<version>0.5.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>sample.client</artifactId>