aboutsummaryrefslogtreecommitdiffstats
path: root/examples/examples-adaptive
diff options
context:
space:
mode:
authorhuaxing <huaxing.jin@est.tech>2020-04-10 13:16:12 +0800
committerhuaxing <huaxing.jin@est.tech>2020-04-15 10:39:36 +0800
commiteb06c3532c133a9126bd45c5485087edf5e3ad54 (patch)
treec2cd6193b43d3c0fa51d5fa01f81558b9129c865 /examples/examples-adaptive
parent649740ca4ada4bf91f7bc223e5464c51b4d3b93d (diff)
Fix sonar issues
Issue-ID: POLICY-1913 Signed-off-by: huaxing <huaxing.jin@est.tech> Change-Id: Id1a9a6b6f7a9c8c74dd69bd0d30af05162a92cd1
Diffstat (limited to 'examples/examples-adaptive')
-rw-r--r--examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/model/java/AnomalyDetectionPolicyDecideTaskSelectionLogic.java41
1 files changed, 17 insertions, 24 deletions
diff --git a/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/model/java/AnomalyDetectionPolicyDecideTaskSelectionLogic.java b/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/model/java/AnomalyDetectionPolicyDecideTaskSelectionLogic.java
index ffbaf5905..99dd28dd8 100644
--- a/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/model/java/AnomalyDetectionPolicyDecideTaskSelectionLogic.java
+++ b/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/model/java/AnomalyDetectionPolicyDecideTaskSelectionLogic.java
@@ -1,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -37,7 +38,6 @@ import org.slf4j.Logger;
* The Class AnomalyDetectionPolicyDecideTaskSelectionLogic.
*/
public class AnomalyDetectionPolicyDecideTaskSelectionLogic {
- private Logger logger;
// Recurring string constants
private static final String ANOMALY_DETECTION_ALBUM = "AnomalyDetectionAlbum";
@@ -71,8 +71,6 @@ public class AnomalyDetectionPolicyDecideTaskSelectionLogic {
}
// CHECKSTYLE:ON: checkstyle:magicNumber
- private volatile TaskSelectionExecutionContext executionContext;
-
/**
* Gets the task.
*
@@ -80,16 +78,14 @@ public class AnomalyDetectionPolicyDecideTaskSelectionLogic {
* @return the task
*/
public boolean getTask(final TaskSelectionExecutionContext executor) {
- executionContext = executor;
- logger = executionContext.logger;
String id = executor.subject.getId();
- logger.debug(id);
+ executor.logger.debug(id);
String inFields = executor.inFields.toString();
- logger.debug(inFields);
+ executor.logger.debug(inFields);
final double now = (Double) (executor.inFields.get("MonitoredValue"));
final Integer iteration = (Integer) (executor.inFields.get("Iteration"));
// get the double[forecastedValue, AnomalyScore, AnomalyProbability]
- final double[] vals = this.forecastingAndAnomaly(now);
+ final double[] vals = forecastingAndAnomaly(executor, now);
final double anomalyness = vals[2];
String task = null;
for (final Map.Entry<double[], String> i : TASK_INTERVALS.entrySet()) {
@@ -99,17 +95,14 @@ public class AnomalyDetectionPolicyDecideTaskSelectionLogic {
}
}
if (task == null) {
- executionContext.subject.getDefaultTaskKey().copyTo(executionContext.selectedTask);
+ executor.subject.getDefaultTaskKey().copyTo(executor.selectedTask);
} else {
- executionContext.subject.getTaskKey(task).copyTo(executionContext.selectedTask);
- }
- if (logger.isDebugEnabled()) {
- logger.debug(
- "TestAnomalyDetectionTSLPolicy0000DecideStateTaskSelectionLogic.getTask():\t************\t\t\t\t"
- + "Iteration:\t" + iteration + "\tValue:\t" + now + "\tForecast:\t" + vals[0]
- + "\tAnomalyScore:\t" + vals[1] + "\tAnomalyProbability:\t" + vals[2] + "\tInvoking Task:\t"
- + executionContext.selectedTask);
+ executor.subject.getTaskKey(task).copyTo(executor.selectedTask);
}
+ executor.logger.debug(
+ "TestAnomalyDetectionTSLPolicy0000DecideStateTaskSelectionLogic.getTask():\t************\t\t\t\t"
+ + "Iteration:\t{}\tValue:\t{}\tForecast:\t{}\tAnomalyScore:\t{}\tAnomalyProbability:\t{}\t"
+ + "Invoking Task:\t{}", iteration, now, vals[0], vals[1], vals[2], executor.selectedTask);
return true;
}
@@ -120,20 +113,20 @@ public class AnomalyDetectionPolicyDecideTaskSelectionLogic {
* @return Null if the function can not be executed correctly, otherwise double[forecastedValue,
* AnomalyScore, AnomalyProbability]
*/
- public double[] forecastingAndAnomaly(final double value) {
+ private double[] forecastingAndAnomaly(final TaskSelectionExecutionContext executor, final double value) {
try {
- executionContext.getContextAlbum(ANOMALY_DETECTION_ALBUM).lockForWriting(ANOMALY_DETECTION);
+ executor.getContextAlbum(ANOMALY_DETECTION_ALBUM).lockForWriting(ANOMALY_DETECTION);
} catch (final ApexException e) {
- logger.error("Failed to acquire write lock on \"AnomalyDetection\" context", e);
+ executor.logger.error("Failed to acquire write lock on \"AnomalyDetection\" context", e);
return new double[0];
}
// Get the context object
AnomalyDetection anomalyDetection =
- (AnomalyDetection) executionContext.getContextAlbum(ANOMALY_DETECTION_ALBUM).get(ANOMALY_DETECTION);
+ (AnomalyDetection) executor.getContextAlbum(ANOMALY_DETECTION_ALBUM).get(ANOMALY_DETECTION);
if (anomalyDetection == null) {
anomalyDetection = new AnomalyDetection();
- executionContext.getContextAlbum(ANOMALY_DETECTION_ALBUM).put(ANOMALY_DETECTION, anomalyDetection);
+ executor.getContextAlbum(ANOMALY_DETECTION_ALBUM).put(ANOMALY_DETECTION, anomalyDetection);
}
// Check the lists are initialized
@@ -186,9 +179,9 @@ public class AnomalyDetectionPolicyDecideTaskSelectionLogic {
// CHECKSTYLE:ON: checkstyle:magicNumber
try {
- executionContext.getContextAlbum(ANOMALY_DETECTION_ALBUM).unlockForWriting(ANOMALY_DETECTION);
+ executor.getContextAlbum(ANOMALY_DETECTION_ALBUM).unlockForWriting(ANOMALY_DETECTION);
} catch (final ApexException e) {
- logger.error("Failed to release write lock on \"AnomalyDetection\" context", e);
+ executor.logger.error("Failed to release write lock on \"AnomalyDetection\" context", e);
return new double[0];
}