modify pom and rule.enabled = 1

Issue-ID: HOLMES-63

Change-Id: Id136259af2951520f6b9d4781c32f0a64dc4e339
Signed-off-by: Shiwei Tian <tian.shiwei@zte.com.cn>

diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index 506d60a..a44a27f 100644 (file)
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -94,6 +94,11 @@
             <artifactId>powermock-api-easymock</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
+        <dependency>\r
+            <groupId>org.powermock</groupId>\r
+            <artifactId>powermock-api-mockito</artifactId>\r
+            <scope>test</scope>\r
+        </dependency>\r
         <dependency>\r
             <groupId>org.powermock</groupId>\r
             <artifactId>powermock-module-junit4-rule</artifactId>\r

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/entity/Rule.java b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/entity/Rule.java
index 4ff1d05..207f224 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/entity/Rule.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/entity/Rule.java
@@ -26,4 +26,5 @@ import lombok.Setter;
 public class Rule {\r
     private String name;\r
     private String contents;\r
+    private int enabled = 1;\r
 }\r

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/utils/DcaeConfigurationParser.java b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/utils/DcaeConfigurationParser.java
index 260b26a..e4899d3 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/utils/DcaeConfigurationParser.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/utils/DcaeConfigurationParser.java
@@ -102,7 +102,7 @@ public class DcaeConfigurationParser {
         Set<Entry<String, Object>> entries = jsonObject.entrySet();\r
         for (Entry<String, Object> entry : entries) {\r
             if (entry.getKey().startsWith("holmes.default.rule")) {\r
-                ret.addDefaultRule(new Rule(entry.getKey(), (String) entry.getValue()));\r
+                ret.addDefaultRule(new Rule(entry.getKey(), (String) entry.getValue(), 1));\r
             }\r
         }\r
     }\r

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/Publisher.java b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/Publisher.java
index eaeaf43..035ecaa 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/Publisher.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/Publisher.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
  */\r
-\r
 package org.onap.holmes.common.dmaap;\r
 \r
 import com.fasterxml.jackson.core.JsonProcessingException;\r
@@ -27,11 +26,13 @@ import javax.ws.rs.core.Response;
 import lombok.Getter;\r
 import lombok.Setter;\r
 import org.glassfish.jersey.client.ClientConfig;\r
+import org.jvnet.hk2.annotations.Service;\r
 import org.onap.holmes.common.dmaap.entity.PolicyMsg;\r
 import org.onap.holmes.common.exception.CorrelationException;\r
 \r
 @Getter\r
 @Setter\r
+@Service\r
 public class Publisher {\r
 \r
     private String topic;\r

diff --git a/pom.xml b/pom.xml
index 449c56d..378568d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,12 @@
                 <version>1.6.5</version>\r
                 <scope>test</scope>\r
             </dependency>\r
+            <dependency>\r
+                <groupId>org.powermock</groupId>\r
+                <artifactId>powermock-api-mockito</artifactId>\r
+                <version>1.7.1</version>\r
+                <scope>test</scope>\r
+            </dependency>\r
             <dependency>\r
                 <groupId>org.powermock</groupId>\r
                 <artifactId>powermock-module-junit4-rule</artifactId>\r