reorder the modifier

Issue-ID: APPC-1859
Change-Id: I494466f4d84c8347b52e7a530b48a73ddee278b1
Signed-off-by: Rupinder <rupinsi1@in.ibm.com>

diff --git a/appc-core/appc-common-bundle/src/main/java/org/onap/appc/util/MessageFormatter.java b/appc-core/appc-common-bundle/src/main/java/org/onap/appc/util/MessageFormatter.java
index a46047e..3bc25c3 100644 (file)
--- a/appc-core/appc-common-bundle/src/main/java/org/onap/appc/util/MessageFormatter.java
+++ b/appc-core/appc-common-bundle/src/main/java/org/onap/appc/util/MessageFormatter.java
@@ -30,12 +30,12 @@ import java.util.regex.Pattern;
 
 
 public class MessageFormatter {
-    private final static String paramNameRegexGroupName = "paramName";
+    private static final String paramNameRegexGroupName = "paramName";
 
     /**
      * start with ${ and after there is one or more characters that are not $ and not } and ended with }
      */
-    private final static String paramRegex = "\\$\\{(?<paramName>[^}$]+)\\}";
+    private static final String paramRegex = "\\$\\{(?<paramName>[^}$]+)\\}";
 
     public static String format(String messageTemplate, Map<String, Object> params) {
         if (StringUtils.isEmpty(messageTemplate))

diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/messageadapter/DmaapOutgoingMessage.java b/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/messageadapter/DmaapOutgoingMessage.java
index 824dd20..a266c17 100644 (file)
--- a/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/messageadapter/DmaapOutgoingMessage.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/messageadapter/DmaapOutgoingMessage.java
@@ -42,7 +42,7 @@ public class DmaapOutgoingMessage {
     @JsonProperty("correlation-id")
     private String correlationID;
 
-    private final static String defaultCambriaPartition = "MSO";
+    private static final String defaultCambriaPartition = "MSO";
     @JsonProperty("cambria.partition")
     private String cambriaPartition = defaultCambriaPartition;
 

diff --git a/services/appc-dmaap-service/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/model/DmaapOutgoingMessage.java b/services/appc-dmaap-service/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/model/DmaapOutgoingMessage.java
index b1daed8..e247474 100644 (file)
--- a/services/appc-dmaap-service/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/model/DmaapOutgoingMessage.java
+++ b/services/appc-dmaap-service/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/model/DmaapOutgoingMessage.java
@@ -33,7 +33,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class DmaapOutgoingMessage extends DmaapMessage{
-    private final static String defaultCambriaPartition = "MSO";
+    private static final String defaultCambriaPartition = "MSO";
 
     public DmaapOutgoingMessage() {
         super();