<dependency>
<groupId>org.onap.holmes.common</groupId>
<artifactId>holmes-actions</artifactId>
- <version>1.4.3</version>
+ <version>1.4.4</version>
<exclusions>
<exclusion>
<groupId>io.swagger</groupId>
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;
ruleCreateRequest.setContent(contents);
ruleCreateRequest.setDescription("");
ruleCreateRequest.setEnabled(1);
- ruleCreateRequest.setCreator(DEFAULT_CREATOR);
return ruleCreateRequest;
}
try {\r
ruleChangeResponse = ruleMgtWrapper\r
.addCorrelationRule(UserUtil.getUserName(request), ruleCreateRequest);\r
- log.info("create rule:" + ruleCreateRequest.getRuleName() + " success.");\r
return ruleChangeResponse;\r
} catch (CorrelationException e) {\r
- log.error("create rule:" + ruleCreateRequest.getRuleName() + " failed", e);\r
+ log.error(String.format("failed to create the rule: %s", ruleCreateRequest.getRuleName()), e);\r
throw ExceptionUtil.buildExceptionResponse(e.getMessage());\r
}\r
}\r
log.info("update rule:" + ruleUpdateRequest.getRuleId() + " successful");\r
return ruleChangeResponse;\r
} catch (CorrelationException e) {\r
- log.error("update rule:" + ruleUpdateRequest.getContent() + " failed", e);\r
+ log.error(String.format("failed to update the rule: %s", ruleUpdateRequest.getRuleId()), e);\r
throw ExceptionUtil.buildExceptionResponse(e.getMessage());\r
}\r
}\r
public ResponseEntity deleteCorrelationRule(@PathVariable("ruleid") String ruleId) {\r
try {\r
ruleMgtWrapper.deleteCorrelationRule(new RuleDeleteRequest(ruleId));\r
- log.info("delete rule:" + ruleId + " successful");\r
return ResponseEntity.status(HttpStatus.NO_CONTENT).build();\r
} catch (CorrelationException e) {\r
- log.error("delete rule:" + ruleId + " failed", e);\r
+ log.error(String.format("failed to delete the rule: %s", ruleId), e);\r
throw ExceptionUtil.buildExceptionResponse(e.getMessage());\r
}\r
}\r
try {\r
ruleQueryListResponse = ruleMgtWrapper\r
.getCorrelationRuleByCondition(ruleQueryCondition);\r
- log.info("query rule successful by condition:" + ruleQueryCondition);\r
return ruleQueryListResponse;\r
} catch (CorrelationException e) {\r
- log.error("query rule failed,cause query condition conversion failure", e);\r
+ log.error(String.format("failed to query the rule: %s", ruleQueryCondition.getName()), e);\r
throw ExceptionUtil.buildExceptionResponse(e.getMessage());\r
}\r
}\r
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
<property name="LOG_HOME" value="/var/log/ONAP/holmes"/>
- <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] - %msg%n" />
+ <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t][%X{RequestID}][%X{InvocationID}] - %m%n" />
<appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
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;
@RunWith(PowerMockRunner.class)
@PrepareForTest({JerseyClient.class})
+@SuppressStaticInitializationFor({"org.onap.holmes.common.utils.JerseyClient"})
public class ConfigFileScanningTaskTest {
@Rule
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();
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();
private RuleMgtResources ruleMgtResources = new RuleMgtResources();\r
\r
@Before\r
- public void setUp() throws Exception {\r
+ public void setUp() {\r
Whitebox.setInternalState(ruleMgtResources, "ruleMgtWrapper", ruleMgtWrapper);\r
PowerMock.resetAll();\r
}\r
final RuleCreateRequest ruleCreateRequest = new RuleCreateRequest();\r
EasyMock.expect(ruleMgtWrapper.addCorrelationRule("admin", ruleCreateRequest))\r
.andThrow(new CorrelationException(EasyMock.anyObject(String.class)));\r
- EasyMock.expect(request.getHeader("username")).andReturn("admin");\r
+ EasyMock.expect(request.getHeader("username")).andReturn("admin").times(2);\r
PowerMock.replayAll();\r
ruleMgtResources.addCorrelationRule(request, ruleCreateRequest);\r
PowerMock.verifyAll();\r
final RuleCreateRequest ruleCreateRequest = new RuleCreateRequest();\r
EasyMock.expect(ruleMgtWrapper.addCorrelationRule("admin",\r
ruleCreateRequest)).andReturn(new RuleAddAndUpdateResponse());\r
- EasyMock.expect(request.getHeader("username")).andReturn("admin");\r
+ EasyMock.expect(request.getHeader("username")).andReturn("admin").times(2);\r
PowerMock.replayAll();\r
ruleMgtResources.addCorrelationRule(request, ruleCreateRequest);\r
PowerMock.verifyAll();\r
final RuleUpdateRequest ruleUpdateRequest = new RuleUpdateRequest();\r
EasyMock.expect(ruleMgtWrapper.updateCorrelationRule("admin", ruleUpdateRequest))\r
.andThrow(new CorrelationException(EasyMock.anyObject(String.class)));\r
- EasyMock.expect(request.getHeader("username")).andReturn("admin");\r
+ EasyMock.expect(request.getHeader("username")).andReturn("admin").times(2);\r
PowerMock.replayAll();\r
ruleMgtResources.updateCorrelationRule(request, ruleUpdateRequest);\r
PowerMock.verifyAll();\r
final RuleUpdateRequest ruleUpdateRequest = new RuleUpdateRequest();\r
EasyMock.expect(ruleMgtWrapper.updateCorrelationRule("admin",\r
ruleUpdateRequest)).andReturn(new RuleAddAndUpdateResponse());\r
- EasyMock.expect(request.getHeader("username")).andReturn("admin");\r
+ EasyMock.expect(request.getHeader("username")).andReturn("admin").times(2);\r
PowerMock.replayAll();\r
ruleMgtResources.updateCorrelationRule(request, ruleUpdateRequest);\r
PowerMock.verifyAll();\r