diff options
author | FengLiang <feng.liang1@zte.com.cn> | 2017-02-24 15:27:04 +0800 |
---|---|---|
committer | FengLiang <feng.liang1@zte.com.cn> | 2017-02-24 15:46:32 +0800 |
commit | 2b4967270e624300f2890d604a6d1f013c084f10 (patch) | |
tree | dda9e7c0129f269c7621767a89d186307062f64a /engine-d/src/main/java/org | |
parent | fada906058895412557bdddf11c8850ff5ed4369 (diff) |
Remove DBException
Change-Id: I1eaadc6f893e98d0fe79769e21bcfea5f076b90c
Issue-ID: HOLMES-47
Signed-off-by: FengLiang <feng.liang1@zte.com.cn>
Diffstat (limited to 'engine-d/src/main/java/org')
-rw-r--r-- | engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java | 15 | ||||
-rw-r--r-- | engine-d/src/main/java/org/openo/holmes/engine/wrapper/RuleMgtWrapper.java | 6 |
2 files changed, 9 insertions, 12 deletions
diff --git a/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java b/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java index b6d867f..9b83002 100644 --- a/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java +++ b/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java @@ -49,9 +49,6 @@ import org.openo.holmes.common.api.stat.Alarm; import org.openo.holmes.common.config.MQConfig; import org.openo.holmes.common.constant.AlarmConst; import org.openo.holmes.common.exception.CorrelationException; -import org.openo.holmes.common.exception.DbException; -import org.openo.holmes.common.exception.EngineException; -import org.openo.holmes.common.exception.RuleIllegalityException; import org.openo.holmes.common.utils.ExceptionUtil; import org.openo.holmes.common.utils.I18nProxy; import org.openo.holmes.engine.request.DeployRuleRequest; @@ -107,7 +104,7 @@ public class DroolsEngine { } - private void start() throws EngineException, RuleIllegalityException, DbException { + private void start() throws CorrelationException { log.info("Drools Engine Initialize Beginning..."); initEngineParameter(); @@ -120,7 +117,7 @@ public class DroolsEngine { this.ksession.dispose(); } - private void initEngineParameter() throws EngineException { + private void initEngineParameter(){ this.kconf = KnowledgeBaseFactory.newKnowledgeBaseConfiguration(); this.kconf.setOption(EventProcessingOption.STREAM); @@ -134,19 +131,19 @@ public class DroolsEngine { this.ksession = kbase.newStatefulKnowledgeSession(); } - private void initDeployRule() throws RuleIllegalityException, EngineException, DbException { + private void initDeployRule() throws CorrelationException { List<CorrelationRule> rules = ruleMgtWrapper.queryRuleByEnable(ENABLE); if (!rules.isEmpty()) { for (CorrelationRule rule : rules) { if (rule.getContent() != null) { - deployRuleFromCache(rule.getContent()); + deployRuleFromDB(rule.getContent()); } } } } - private void deployRuleFromCache(String ruleContent) throws EngineException { + private void deployRuleFromDB(String ruleContent) throws CorrelationException { StringReader reader = new StringReader(ruleContent); Resource res = ResourceFactory.newReaderResource(reader); @@ -160,7 +157,7 @@ public class DroolsEngine { kbase.addKnowledgePackages(kbuilder.getKnowledgePackages()); } catch (Exception e) { - throw new EngineException(e); + throw new CorrelationException(e.getMessage(), e); } ksession.fireAllRules(); diff --git a/engine-d/src/main/java/org/openo/holmes/engine/wrapper/RuleMgtWrapper.java b/engine-d/src/main/java/org/openo/holmes/engine/wrapper/RuleMgtWrapper.java index 59110d8..7df791d 100644 --- a/engine-d/src/main/java/org/openo/holmes/engine/wrapper/RuleMgtWrapper.java +++ b/engine-d/src/main/java/org/openo/holmes/engine/wrapper/RuleMgtWrapper.java @@ -21,7 +21,7 @@ import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import org.jvnet.hk2.annotations.Service; import org.openo.holmes.common.api.entity.CorrelationRule; -import org.openo.holmes.common.exception.DbException; +import org.openo.holmes.common.exception.CorrelationException; import org.openo.holmes.common.utils.DbDaoUtil; import org.openo.holmes.common.utils.I18nProxy; import org.openo.holmes.engine.db.CorrelationRuleDao; @@ -35,12 +35,12 @@ public class RuleMgtWrapper { @Inject private DbDaoUtil daoUtil; - public List<CorrelationRule> queryRuleByEnable(int enable) throws DbException { + public List<CorrelationRule> queryRuleByEnable(int enable) throws CorrelationException { List<CorrelationRule> ruleTemp = daoUtil.getJdbiDaoByOnDemand(CorrelationRuleDao.class) .queryRuleByRuleEnable(enable); if (ruleTemp == null) { - throw new DbException(I18nProxy.RULE_MANAGEMENT_DB_ERROR); + throw new CorrelationException(I18nProxy.RULE_MANAGEMENT_DB_ERROR); } return ruleTemp; } |