Change the groupid from openo to onap

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

diff --git a/rulemgt/src/main/java/org/openo/holmes/rulemgt/db/CorrelationRuleQueryDao.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryDao.java
similarity index 86%
rename from rulemgt/src/main/java/org/openo/holmes/rulemgt/db/CorrelationRuleQueryDao.java
rename to rulemgt/src/main/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryDao.java
index 487684e..322006d 100644 (file)
--- a/rulemgt/src/main/java/org/openo/holmes/rulemgt/db/CorrelationRuleQueryDao.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryDao.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
  */\r
-package org.openo.holmes.rulemgt.db;\r
+package org.onap.holmes.rulemgt.db;\r
 \r
 import java.beans.PropertyDescriptor;\r
 import java.lang.reflect.Field;\r
@@ -26,12 +26,11 @@ import java.util.Properties;
 import javax.inject.Inject;\r
 import lombok.extern.slf4j.Slf4j;\r
 import org.jvnet.hk2.annotations.Service;\r
-import org.openo.holmes.common.api.entity.CorrelationRule;\r
-import org.openo.holmes.common.exception.CorrelationException;\r
-import org.openo.holmes.common.utils.DbDaoUtil;\r
-import org.openo.holmes.common.utils.I18nProxy;\r
-import org.openo.holmes.rulemgt.bean.request.RuleQueryCondition;\r
-import org.openo.holmes.rulemgt.constant.RuleMgtConstant;\r
+import org.onap.holmes.rulemgt.bean.request.RuleQueryCondition;\r
+import org.onap.holmes.rulemgt.constant.RuleMgtConstant;\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
 \r
@@ -57,8 +56,8 @@ public class CorrelationRuleQueryDao {
             }\r
             return correlationRules;\r
         } catch (Exception e) {\r
-            log.warn("Query rule: rule id =" + ruleQueryCondition.getRid() + " failed");\r
-            throw new CorrelationException(I18nProxy.RULE_MANAGEMENT_QUERY_RULE_FAILED, e);\r
+            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
         }\r
@@ -123,7 +122,7 @@ public class CorrelationRuleQueryDao {
             }\r
             return "";\r
         } catch (Exception e) {\r
-            throw new CorrelationException(I18nProxy.RULE_MANAGEMENT_CREATE_QUERY_SQL_FAILED, e);\r
+            throw new CorrelationException("An error occurred while building the query SQL.", e);\r
         }\r
     }\r
 }\r