Optimized Rule Deployment Logic

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

diff --git a/engine-d/src/main/java/org/onap/holmes/engine/resources/EngineResources.java b/engine-d/src/main/java/org/onap/holmes/engine/resources/EngineResources.java
index b4cb0b1..0d26b6e 100644 (file)
--- a/engine-d/src/main/java/org/onap/holmes/engine/resources/EngineResources.java
+++ b/engine-d/src/main/java/org/onap/holmes/engine/resources/EngineResources.java
@@ -20,10 +20,10 @@ import com.codahale.metrics.annotation.Timed;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringReader;
 import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.DELETE;
@@ -51,7 +51,8 @@ import org.onap.holmes.engine.response.CorrelationRuleResponse;
 @Produces(MediaType.APPLICATION_JSON)
 @Slf4j
 public class EngineResources {
-
+       private Pattern packagePattern = Pattern.compile("package[\\s]+([^;]+)[;\\s]*");
+    
     @Inject
     DroolsEngine droolsEngine;
 
@@ -61,8 +62,8 @@ public class EngineResources {
     @Timed
     public CorrelationRuleResponse deployRule(
             @ApiParam(value = "The request entity of the HTTP call, which comprises three "
-                    + "fields: \"content\" , \"loopcontrolname\" and \"engineid\". "
-                    + "The \"content\" should be a valid Drools rule string and the \"engineid\" "
+                    + "fields: \"content\" , \"loopControlName\" and \"engineId\". "
+                    + "The \"content\" should be a valid Drools rule string and the \"engineId\" "
                     + "has to be \"engine-d\" in the Amsterdam release.", required = true) DeployRuleRequest deployRuleRequest,
             @Context HttpServletRequest httpRequest) {
 
@@ -70,17 +71,21 @@ public class EngineResources {
         Locale locale = LanguageUtil.getLocale(httpRequest);
         try {
             String packageName = getPackageName(deployRuleRequest.getContent());
+            if(packageName == null) {
+               throw new CorrelationException("Could not find package name in rule: "+deployRuleRequest.getContent());
+            }
+            
             DmaapService.loopControlNames
                     .put(packageName, deployRuleRequest.getLoopControlName());
-            String packageNameRet = droolsEngine.deployRule(deployRuleRequest, locale);
+            String packageNameRet = droolsEngine.deployRule(deployRuleRequest);
             if (!packageName.equals(packageNameRet)) {
                 log.info("The parsed package name is different from that returned by the engine.");
                 DmaapService.loopControlNames.remove(packageName);
                 DmaapService.loopControlNames
                         .put(packageNameRet, deployRuleRequest.getLoopControlName());
             }
-            log.info("Rule deployed. Package name: " + packageName);
-            crResponse.setPackageName(packageName);
+            log.info("Rule deployed. Package name: " + packageNameRet);
+            crResponse.setPackageName(packageNameRet);
 
         } catch (CorrelationException correlationException) {
             log.error(correlationException.getMessage(), correlationException);
@@ -104,12 +109,13 @@ public class EngineResources {
         Locale locale = LanguageUtil.getLocale(httpRequest);
 
         try {
-            droolsEngine.undeployRule(packageName, locale);
+            droolsEngine.undeployRule(packageName);
             DmaapService.loopControlNames.remove(packageName);
         } catch (CorrelationException correlationException) {
             log.error(correlationException.getMessage(), correlationException);
             throw ExceptionUtil.buildExceptionResponse(correlationException.getMessage());
         }
+
         return true;
     }
 
@@ -124,17 +130,21 @@ public class EngineResources {
         Locale locale = LanguageUtil.getLocale(httpRequest);
 
         try {
-            droolsEngine.compileRule(compileRuleRequest.getContent(), locale);
+            droolsEngine.compileRule(compileRuleRequest.getContent());
         } catch (CorrelationException correlationException) {
             log.error(correlationException.getMessage(), correlationException);
             throw ExceptionUtil.buildExceptionResponse(correlationException.getMessage());
         }
         return true;
     }
-
+    
     private String getPackageName(String contents){
-        String ret = contents.trim();
-        ret = ret.substring(7, ret.indexOf("import")).trim();
-        return ret.endsWith(";") ? ret.substring(0, ret.length() - 1) : ret;
+        Matcher m = packagePattern.matcher(contents);
+        
+        if (m.find( )) {
+           return m.group(1);
+        }else {
+           return null;
+        }
     }
 }