Fix compileRule

[holmes/engine-management.git] / engine-d / src / main / java / org / openo / holmes / engine / resources / EngineResources.java

diff --git a/engine-d/src/main/java/org/openo/holmes/engine/resources/EngineResources.java b/engine-d/src/main/java/org/openo/holmes/engine/resources/EngineResources.java
index 24de064..5be8eb9 100644 (file)
--- a/engine-d/src/main/java/org/openo/holmes/engine/resources/EngineResources.java
+++ b/engine-d/src/main/java/org/openo/holmes/engine/resources/EngineResources.java
@@ -19,9 +19,7 @@ package org.openo.holmes.engine.resources;
 import com.codahale.metrics.annotation.Timed;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.io.IOException;
 import java.util.Locale;
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.DELETE;
@@ -34,12 +32,9 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import lombok.extern.slf4j.Slf4j;
 import org.jvnet.hk2.annotations.Service;
-import org.openo.holmes.common.api.entity.ServiceRegisterEntity;
-import org.openo.holmes.common.config.MicroServiceConfig;
 import org.openo.holmes.common.exception.CorrelationException;
 import org.openo.holmes.common.utils.ExceptionUtil;
 import org.openo.holmes.common.utils.LanguageUtil;
-import org.openo.holmes.common.utils.MSBRegisterUtil;
 import org.openo.holmes.engine.manager.DroolsEngine;
 import org.openo.holmes.engine.request.CompileRuleRequest;
 import org.openo.holmes.engine.request.DeployRuleRequest;
@@ -55,30 +50,19 @@ public class EngineResources {
     @Inject
     DroolsEngine droolsEngine;
 
-    @Inject
-    MSBRegisterUtil msbRegisterUtil;
-
-    @PostConstruct
-    private void initMsbService() {
-        try {
-            msbRegisterUtil.register(initServiceEntity());
-        } catch (IOException e) {
-            log.warn("Failed register msb" + e.getMessage(), e);
-        }
-    }
-
     @PUT
     @ApiOperation(value = "Add rule to Engine and Cache", response = CorrelationRuleResponse.class)
     @Produces(MediaType.APPLICATION_JSON)
     @Timed
     public CorrelationRuleResponse deployRule(DeployRuleRequest deployRuleRequest,
-        @Context HttpServletRequest httpRequest) {
+            @Context HttpServletRequest httpRequest) {
 
         CorrelationRuleResponse crResponse = new CorrelationRuleResponse();
         Locale locale = LanguageUtil.getLocale(httpRequest);
         try {
 
             String packageName = droolsEngine.deployRule(deployRuleRequest, locale);
+            log.info("Rule deployed. Package name: " + packageName);
             crResponse.setPackageName(packageName);
 
         } catch (CorrelationException correlationException) {
@@ -95,7 +79,7 @@ public class EngineResources {
     @Timed
     @Path("/{packageName}")
     public boolean undeployRule(@PathParam("packageName") String packageName,
-        @Context HttpServletRequest httpRequest) {
+            @Context HttpServletRequest httpRequest) {
 
         Locale locale = LanguageUtil.getLocale(httpRequest);
 
@@ -116,7 +100,7 @@ public class EngineResources {
     @Produces(MediaType.APPLICATION_JSON)
     @Timed
     public boolean compileRule(CompileRuleRequest compileRuleRequest,
-        @Context HttpServletRequest httpRequest) {
+            @Context HttpServletRequest httpRequest) {
 
         Locale locale = LanguageUtil.getLocale(httpRequest);
 
@@ -128,15 +112,4 @@ public class EngineResources {
         }
         return true;
     }
-
-    private ServiceRegisterEntity initServiceEntity() {
-        ServiceRegisterEntity serviceRegisterEntity = new ServiceRegisterEntity();
-        serviceRegisterEntity.setServiceName("holmes");
-        serviceRegisterEntity.setProtocol("REST");
-        serviceRegisterEntity.setVersion("v1");
-        serviceRegisterEntity.setUrl("/api/holmes/v1");
-        serviceRegisterEntity.setSingleNode(MicroServiceConfig.getServiceIp(), "9102", 0);
-        serviceRegisterEntity.setVisualRange("1");
-        return serviceRegisterEntity;
-    }
 }