summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
0cd31c3)
Change-Id: I8d0efeaa01eea6163194c86e309e17367fb178db
Issue-ID: HOLMES-85
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
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 javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
import java.util.Locale;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
CorrelationRuleResponse crResponse = new CorrelationRuleResponse();
Locale locale = LanguageUtil.getLocale(httpRequest);
try {
CorrelationRuleResponse crResponse = new CorrelationRuleResponse();
Locale locale = LanguageUtil.getLocale(httpRequest);
try {
- String packageName = droolsEngine.deployRule(deployRuleRequest, locale);
+ String packageName = getPackageName(deployRuleRequest.getContent());
DmaapService.loopControlNames
.put(packageName, deployRuleRequest.getLoopControlName());
DmaapService.loopControlNames
.put(packageName, deployRuleRequest.getLoopControlName());
+ String packageNameRet = droolsEngine.deployRule(deployRuleRequest, locale);
+ 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);
} catch (CorrelationException correlationException) {
log.error(correlationException.getMessage(), correlationException);
throw ExceptionUtil.buildExceptionResponse(correlationException.getMessage());
log.info("Rule deployed. Package name: " + packageName);
crResponse.setPackageName(packageName);
} catch (CorrelationException correlationException) {
log.error(correlationException.getMessage(), correlationException);
throw ExceptionUtil.buildExceptionResponse(correlationException.getMessage());
+ } catch (RuntimeException e) {
+ log.error(e.getMessage(), e);
+ throw ExceptionUtil.buildExceptionResponse(e.getMessage());
Locale locale = LanguageUtil.getLocale(httpRequest);
try {
Locale locale = LanguageUtil.getLocale(httpRequest);
try {
droolsEngine.undeployRule(packageName, locale);
droolsEngine.undeployRule(packageName, locale);
+ DmaapService.loopControlNames.remove(packageName);
} catch (CorrelationException correlationException) {
log.error(correlationException.getMessage(), correlationException);
throw ExceptionUtil.buildExceptionResponse(correlationException.getMessage());
} catch (CorrelationException correlationException) {
log.error(correlationException.getMessage(), correlationException);
throw ExceptionUtil.buildExceptionResponse(correlationException.getMessage());
+
+ 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;
+ }
@Test\r
public void deployRule_normal() throws CorrelationException {\r
DeployRuleRequest deployRuleRequest = new DeployRuleRequest();\r
@Test\r
public void deployRule_normal() throws CorrelationException {\r
DeployRuleRequest deployRuleRequest = new DeployRuleRequest();\r
+ deployRuleRequest.setContent("package packageName;\n\nimport xxx.xxx.xxx;");\r
deployRuleRequest.setLoopControlName("loopControlName");\r
HttpServletRequest httpRequest = PowerMock.createMock(HttpServletRequest.class);\r
\r
deployRuleRequest.setLoopControlName("loopControlName");\r
HttpServletRequest httpRequest = PowerMock.createMock(HttpServletRequest.class);\r
\r