Made Fields Private

Change-Id: I00ffe1aeb7e68cdfd93056fcc33c628c1c3ea63c
Issue-ID: HOLMES-118
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/config/MQConfig.java b/holmes-actions/src/main/java/org/onap/holmes/common/config/MQConfig.java
index 2ade152..70ef0cb 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/config/MQConfig.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/config/MQConfig.java
@@ -16,13 +16,20 @@
 \r
 package org.onap.holmes.common.config;\r
 \r
+import lombok.Getter;\r
+import lombok.NoArgsConstructor;\r
+import lombok.Setter;\r
+\r
+@Getter\r
+@Setter\r
+@NoArgsConstructor\r
 public class MQConfig {\r
 \r
-    public String brokerIp;\r
+    private String brokerIp;\r
 \r
-    public int brokerPort;\r
+    private int brokerPort;\r
 \r
-    public String brokerUsername;\r
+    private String brokerUsername;\r
 \r
-    public String brokerPassword;\r
+    private String brokerPassword;\r
 }\r

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java
index 240f09b..c64bd59 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java
@@ -38,8 +38,8 @@ public class DmaapService {
 
     @Inject
     private AaiQuery aaiQuery;
-    public static ConcurrentHashMap<String, String> loopControlNames = new ConcurrentHashMap<>();
-    public static ConcurrentHashMap<String, String> alarmUniqueRequestID = new ConcurrentHashMap<>();
+    public static final ConcurrentHashMap<String, String> loopControlNames = new ConcurrentHashMap<>();
+    public static final ConcurrentHashMap<String, String> alarmUniqueRequestID = new ConcurrentHashMap<>();
 
     public void publishPolicyMsg(PolicyMsg policyMsg, String dmaapConfigKey) {
         try {

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/producer/MQProducer.java b/holmes-actions/src/main/java/org/onap/holmes/common/producer/MQProducer.java
index fd91bbd..4bbffac 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/producer/MQProducer.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/producer/MQProducer.java
@@ -48,9 +48,9 @@ public class MQProducer {
     public void init() {\r
 \r
         String brokerURL =\r
-            "tcp://" + mqConfigProvider.get().brokerIp + ":" + mqConfigProvider.get().brokerPort;\r
-        connectionFactory = new ActiveMQConnectionFactory(mqConfigProvider.get().brokerUsername,\r
-            mqConfigProvider.get().brokerPassword, brokerURL);\r
+            "tcp://" + mqConfigProvider.get().getBrokerIp() + ":" + mqConfigProvider.get().getBrokerPort();\r
+        connectionFactory = new ActiveMQConnectionFactory(mqConfigProvider.get().getBrokerUsername(),\r
+            mqConfigProvider.get().getBrokerPassword(), brokerURL);\r
     }\r
 \r
     public void sendAlarmMQTopicMsg(VesAlarm alarm) {\r

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/producer/MQProducerTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/producer/MQProducerTest.java
index d9dffeb..3fad981 100644 (file)
--- a/holmes-actions/src/test/java/org/onap/holmes/common/producer/MQProducerTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/producer/MQProducerTest.java
@@ -70,10 +70,10 @@ public class MQProducerTest {
     @Test
     public void init() {
         MQConfig mqConfig = new MQConfig();
-        mqConfig.brokerIp = "127.0.0.1";
-        mqConfig.brokerPort = 61616;
-        mqConfig.brokerPassword = "admin";
-        mqConfig.brokerUsername = "admin";
+        mqConfig.setBrokerIp("127.0.0.1");
+        mqConfig.setBrokerPort(61616);
+        mqConfig.setBrokerPassword("admin");
+        mqConfig.setBrokerUsername("admin");
         expect(mqConfigProvider.get()).andReturn(mqConfig).anyTimes();
 
         PowerMock.replayAll();