From 059d701cc5741938793fbdd3fb4d29f9d0d26df1 Mon Sep 17 00:00:00 2001 From: Guangrong Fu Date: Wed, 17 Aug 2022 16:17:04 +0800 Subject: bugfix - mis-removal of rules Issue-ID: HOLMES-564 Signed-off-by: Guangrong Fu Change-Id: I2dcf9f1a3f2bec54a6018afa203adff369c64554 --- .../org/onap/holmes/rulemgt/dcae/ConfigFileScanningTask.java | 2 +- .../org/onap/holmes/rulemgt/resources/RuleMgtResources.java | 11 ++++------- rulemgt/src/main/resources/logback-spring.xml | 2 +- .../onap/holmes/rulemgt/dcae/ConfigFileScanningTaskTest.java | 6 ++++-- .../onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java | 10 +++++----- 5 files changed, 15 insertions(+), 16 deletions(-) (limited to 'rulemgt') diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/ConfigFileScanningTask.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/ConfigFileScanningTask.java index d24d567..650ebbb 100644 --- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/ConfigFileScanningTask.java +++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/ConfigFileScanningTask.java @@ -186,6 +186,7 @@ public class ConfigFileScanningTask implements Runnable { private boolean deployRule(String clName, String contents) { RuleCreateRequest ruleCreateRequest = getRuleCreateRequest(clName, contents); if (JerseyClient.newInstance().header("Accept", MediaType.APPLICATION_JSON) + .header("username", DEFAULT_CREATOR) .put(url, Entity.json(ruleCreateRequest)) == null) { LOGGER.error("Failed to deploy rule: {}.", clName); return false; @@ -200,7 +201,6 @@ public class ConfigFileScanningTask implements Runnable { ruleCreateRequest.setContent(contents); ruleCreateRequest.setDescription(""); ruleCreateRequest.setEnabled(1); - ruleCreateRequest.setCreator(DEFAULT_CREATOR); return ruleCreateRequest; } diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/RuleMgtResources.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/RuleMgtResources.java index 133e859..2c9a462 100644 --- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/RuleMgtResources.java +++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/RuleMgtResources.java @@ -62,10 +62,9 @@ public class RuleMgtResources { try { ruleChangeResponse = ruleMgtWrapper .addCorrelationRule(UserUtil.getUserName(request), ruleCreateRequest); - log.info("create rule:" + ruleCreateRequest.getRuleName() + " success."); return ruleChangeResponse; } catch (CorrelationException e) { - log.error("create rule:" + ruleCreateRequest.getRuleName() + " failed", e); + log.error(String.format("failed to create the rule: %s", ruleCreateRequest.getRuleName()), e); throw ExceptionUtil.buildExceptionResponse(e.getMessage()); } } @@ -85,7 +84,7 @@ public class RuleMgtResources { log.info("update rule:" + ruleUpdateRequest.getRuleId() + " successful"); return ruleChangeResponse; } catch (CorrelationException e) { - log.error("update rule:" + ruleUpdateRequest.getContent() + " failed", e); + log.error(String.format("failed to update the rule: %s", ruleUpdateRequest.getRuleId()), e); throw ExceptionUtil.buildExceptionResponse(e.getMessage()); } } @@ -95,10 +94,9 @@ public class RuleMgtResources { public ResponseEntity deleteCorrelationRule(@PathVariable("ruleid") String ruleId) { try { ruleMgtWrapper.deleteCorrelationRule(new RuleDeleteRequest(ruleId)); - log.info("delete rule:" + ruleId + " successful"); return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); } catch (CorrelationException e) { - log.error("delete rule:" + ruleId + " failed", e); + log.error(String.format("failed to delete the rule: %s", ruleId), e); throw ExceptionUtil.buildExceptionResponse(e.getMessage()); } } @@ -118,10 +116,9 @@ public class RuleMgtResources { try { ruleQueryListResponse = ruleMgtWrapper .getCorrelationRuleByCondition(ruleQueryCondition); - log.info("query rule successful by condition:" + ruleQueryCondition); return ruleQueryListResponse; } catch (CorrelationException e) { - log.error("query rule failed,cause query condition conversion failure", e); + log.error(String.format("failed to query the rule: %s", ruleQueryCondition.getName()), e); throw ExceptionUtil.buildExceptionResponse(e.getMessage()); } } diff --git a/rulemgt/src/main/resources/logback-spring.xml b/rulemgt/src/main/resources/logback-spring.xml index 197057e..eda9c6b 100644 --- a/rulemgt/src/main/resources/logback-spring.xml +++ b/rulemgt/src/main/resources/logback-spring.xml @@ -1,7 +1,7 @@ - + diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/ConfigFileScanningTaskTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/ConfigFileScanningTaskTest.java index a4ab15b..cc29103 100644 --- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/ConfigFileScanningTaskTest.java +++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/ConfigFileScanningTaskTest.java @@ -28,6 +28,7 @@ import org.onap.holmes.rulemgt.bean.response.RuleQueryListResponse; import org.onap.holmes.rulemgt.bean.response.RuleResult4API; import org.powermock.api.easymock.PowerMock; import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; @@ -37,6 +38,7 @@ import static org.junit.Assert.assertThat; @RunWith(PowerMockRunner.class) @PrepareForTest({JerseyClient.class}) +@SuppressStaticInitializationFor({"org.onap.holmes.common.utils.JerseyClient"}) public class ConfigFileScanningTaskTest { @Rule @@ -81,7 +83,7 @@ public class ConfigFileScanningTaskTest { EasyMock.expect(jcMock.get(EasyMock.anyString(), EasyMock.anyObject())).andReturn(rqlr); // mock for deployRule - EasyMock.expect(jcMock.header(EasyMock.anyString(), EasyMock.anyObject())).andReturn(jcMock); + EasyMock.expect(jcMock.header(EasyMock.anyString(), EasyMock.anyObject())).andReturn(jcMock).times(2); EasyMock.expect(jcMock.put(EasyMock.anyString(), EasyMock.anyObject())).andReturn(""); PowerMock.replayAll(); @@ -169,7 +171,7 @@ public class ConfigFileScanningTaskTest { EasyMock.expect(jcMock.delete(EasyMock.anyString())).andReturn(""); // mock for deployRule - EasyMock.expect(jcMock.header(EasyMock.anyString(), EasyMock.anyObject())).andReturn(jcMock); + EasyMock.expect(jcMock.header(EasyMock.anyString(), EasyMock.anyObject())).andReturn(jcMock).times(2); EasyMock.expect(jcMock.put(EasyMock.anyString(), EasyMock.anyObject())).andReturn(""); PowerMock.replayAll(); diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java index a515196..7cc0def 100644 --- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java +++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java @@ -51,7 +51,7 @@ public class RuleMgtResourcesTest { private RuleMgtResources ruleMgtResources = new RuleMgtResources(); @Before - public void setUp() throws Exception { + public void setUp() { Whitebox.setInternalState(ruleMgtResources, "ruleMgtWrapper", ruleMgtWrapper); PowerMock.resetAll(); } @@ -64,7 +64,7 @@ public class RuleMgtResourcesTest { final RuleCreateRequest ruleCreateRequest = new RuleCreateRequest(); EasyMock.expect(ruleMgtWrapper.addCorrelationRule("admin", ruleCreateRequest)) .andThrow(new CorrelationException(EasyMock.anyObject(String.class))); - EasyMock.expect(request.getHeader("username")).andReturn("admin"); + EasyMock.expect(request.getHeader("username")).andReturn("admin").times(2); PowerMock.replayAll(); ruleMgtResources.addCorrelationRule(request, ruleCreateRequest); PowerMock.verifyAll(); @@ -76,7 +76,7 @@ public class RuleMgtResourcesTest { final RuleCreateRequest ruleCreateRequest = new RuleCreateRequest(); EasyMock.expect(ruleMgtWrapper.addCorrelationRule("admin", ruleCreateRequest)).andReturn(new RuleAddAndUpdateResponse()); - EasyMock.expect(request.getHeader("username")).andReturn("admin"); + EasyMock.expect(request.getHeader("username")).andReturn("admin").times(2); PowerMock.replayAll(); ruleMgtResources.addCorrelationRule(request, ruleCreateRequest); PowerMock.verifyAll(); @@ -89,7 +89,7 @@ public class RuleMgtResourcesTest { final RuleUpdateRequest ruleUpdateRequest = new RuleUpdateRequest(); EasyMock.expect(ruleMgtWrapper.updateCorrelationRule("admin", ruleUpdateRequest)) .andThrow(new CorrelationException(EasyMock.anyObject(String.class))); - EasyMock.expect(request.getHeader("username")).andReturn("admin"); + EasyMock.expect(request.getHeader("username")).andReturn("admin").times(2); PowerMock.replayAll(); ruleMgtResources.updateCorrelationRule(request, ruleUpdateRequest); PowerMock.verifyAll(); @@ -100,7 +100,7 @@ public class RuleMgtResourcesTest { final RuleUpdateRequest ruleUpdateRequest = new RuleUpdateRequest(); EasyMock.expect(ruleMgtWrapper.updateCorrelationRule("admin", ruleUpdateRequest)).andReturn(new RuleAddAndUpdateResponse()); - EasyMock.expect(request.getHeader("username")).andReturn("admin"); + EasyMock.expect(request.getHeader("username")).andReturn("admin").times(2); PowerMock.replayAll(); ruleMgtResources.updateCorrelationRule(request, ruleUpdateRequest); PowerMock.verifyAll(); -- cgit 1.2.3-korg