Migrate from DW to Springboot

[holmes/rule-management.git] / rulemgt / src / main / java / org / onap / holmes / rulemgt / db / CorrelationRuleQueryService.java

diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryDao.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryService.java
similarity index 84%
rename from rulemgt/src/main/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryDao.java
rename to rulemgt/src/main/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryService.java
index 104f74d..9658ded 100644 (file)
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryDao.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryService.java
@@ -1,5 +1,5 @@
 /**\r
- * Copyright 2017 ZTE Corporation.\r
+ * Copyright 2017-2021 ZTE Corporation.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -15,31 +15,28 @@
  */\r
 package org.onap.holmes.rulemgt.db;\r
 \r
-import java.beans.PropertyDescriptor;\r
-import java.lang.reflect.Field;\r
-import java.lang.reflect.Method;\r
-import java.util.ArrayList;\r
-import java.util.Date;\r
-import java.util.List;\r
-import java.util.Map;\r
-import java.util.Properties;\r
-import javax.inject.Inject;\r
 import lombok.extern.slf4j.Slf4j;\r
-import org.jvnet.hk2.annotations.Service;\r
-import org.onap.holmes.rulemgt.bean.request.RuleQueryCondition;\r
-import org.onap.holmes.rulemgt.constant.RuleMgtConstant;\r
+import org.jdbi.v3.core.Handle;\r
+import org.jdbi.v3.core.Jdbi;\r
+import org.jdbi.v3.core.statement.Query;\r
 import org.onap.holmes.common.api.entity.CorrelationRule;\r
 import org.onap.holmes.common.exception.CorrelationException;\r
-import org.onap.holmes.common.utils.DbDaoUtil;\r
-import org.skife.jdbi.v2.Handle;\r
-import org.skife.jdbi.v2.Query;\r
+import org.onap.holmes.rulemgt.bean.request.RuleQueryCondition;\r
+import org.onap.holmes.rulemgt.constant.RuleMgtConstant;\r
+import org.springframework.beans.factory.annotation.Autowired;\r
+import org.springframework.stereotype.Service;\r
+\r
+import java.beans.PropertyDescriptor;\r
+import java.lang.reflect.Field;\r
+import java.lang.reflect.Method;\r
+import java.util.*;\r
 \r
 @Service\r
 @Slf4j\r
-public class CorrelationRuleQueryDao {\r
+public class CorrelationRuleQueryService {\r
 \r
-    @Inject\r
-    private DbDaoUtil dbDaoUtil;\r
+    @Autowired\r
+    private Jdbi jdbi;\r
 \r
     public List<CorrelationRule> getCorrelationRulesByCondition(RuleQueryCondition ruleQueryCondition)\r
             throws CorrelationException {\r
@@ -48,9 +45,9 @@ public class CorrelationRuleQueryDao {
         String whereStr = getWhereStrByRequestEntity(ruleQueryCondition);\r
         try {\r
             StringBuilder querySql = new StringBuilder("SELECT * FROM APLUS_RULE ").append(whereStr);\r
-            handle = dbDaoUtil.getHandle();\r
+            handle = jdbi.open();\r
             Query query = handle.createQuery(querySql.toString());\r
-            for (Object value : query.list()) {\r
+            for (Object value : query.mapToMap().list()) {\r
                 CorrelationRule correlationRule = getCorrelationRule((Map) value);\r
                 correlationRules.add(correlationRule);\r
             }\r
@@ -59,7 +56,7 @@ public class CorrelationRuleQueryDao {
             log.warn("Failed to query the rule: id =" + ruleQueryCondition.getRid() + ".");\r
             throw new CorrelationException("Failed to query the rule.", e);\r
         } finally {\r
-            dbDaoUtil.close(handle);\r
+            handle.close();\r
         }\r
     }\r
 \r
@@ -69,19 +66,19 @@ public class CorrelationRuleQueryDao {
         correlationRule.setRid((String) value.get("rid"));\r
         correlationRule.setDescription((String) value.get("description"));\r
         correlationRule.setEnabled((Integer) value.get("enable"));\r
-        correlationRule.setTemplateID((Long) value.get("templateID"));\r
-        correlationRule.setEngineID((String) value.get("engineID"));\r
-        correlationRule.setEngineType((String) value.get("engineType"));\r
+        correlationRule.setTemplateID((Long) value.get("templateid"));\r
+        correlationRule.setEngineID((String) value.get("engineid"));\r
+        correlationRule.setEngineType((String) value.get("enginetype"));\r
         correlationRule.setCreator((String) value.get("creator"));\r
-        correlationRule.setCreateTime((Date) value.get("createTime"));\r
+        correlationRule.setCreateTime((Date) value.get("createtime"));\r
         correlationRule.setModifier((String) value.get("updator"));\r
-        correlationRule.setUpdateTime((Date) value.get("updateTime"));\r
+        correlationRule.setUpdateTime((Date) value.get("updatetime"));\r
         correlationRule.setParams((Properties) value.get("params"));\r
         correlationRule.setContent((String) value.get("content"));\r
         correlationRule.setVendor((String) value.get("vendor"));\r
         correlationRule.setPackageName((String) value.get("package"));\r
         correlationRule.setClosedControlLoopName((String) value.get("ctrlloop"));\r
-        correlationRule.setEngineInstance((String) value.get("engineInstance"));\r
+        correlationRule.setEngineInstance((String) value.get("engineinstance"));\r
         return correlationRule;\r
     }\r
 \r