From 56c57f2e215787fd1189e077e4dd91da9db099ca Mon Sep 17 00:00:00 2001 From: Rupinder Date: Mon, 15 Jun 2020 12:22:27 +0530 Subject: [PATCH] reorder the modifier Issue-ID: APPC-1859 Change-Id: I494466f4d84c8347b52e7a530b48a73ddee278b1 Signed-off-by: Rupinder --- .../src/main/java/org/onap/appc/util/MessageFormatter.java | 4 ++-- .../java/org/onap/appc/oam/messageadapter/DmaapOutgoingMessage.java | 2 +- .../java/org/onap/appc/listener/LCM/model/DmaapOutgoingMessage.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 a46047eaa..3bc25c364 100644 --- 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 = "\\$\\{(?[^}$]+)\\}"; + private static final String paramRegex = "\\$\\{(?[^}$]+)\\}"; public static String format(String messageTemplate, Map 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 824dd20bb..a266c17dd 100644 --- 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 b1daed8de..e24747409 100644 --- 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(); -- 2.16.6