From 93e2ba2e1756596323774398673736946b220090 Mon Sep 17 00:00:00 2001 From: RossC Date: Wed, 24 Jun 2020 10:49:26 +0100 Subject: Updating models dependencies to latest versions Issue-ID: POLICY-2387 Change-Id: Id89dac64139490f6d9b83b295cfe99c43ed657cf Signed-off-by: RossC --- models-base/pom.xml | 1 - models-interactions/model-actors/actor.appclcm/pom.xml | 1 - models-interactions/model-impl/aai/pom.xml | 2 +- models-interactions/model-yaml/pom.xml | 2 +- .../policy/controlloop/compiler/ControlLoopCompiler.java | 16 ++++++++-------- pom.xml | 3 +-- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/models-base/pom.xml b/models-base/pom.xml index 0f2990db6..57cf917ac 100644 --- a/models-base/pom.xml +++ b/models-base/pom.xml @@ -40,7 +40,6 @@ org.apache.commons commons-lang3 - 3.9 diff --git a/models-interactions/model-actors/actor.appclcm/pom.xml b/models-interactions/model-actors/actor.appclcm/pom.xml index de91da4e1..63bc0886e 100644 --- a/models-interactions/model-actors/actor.appclcm/pom.xml +++ b/models-interactions/model-actors/actor.appclcm/pom.xml @@ -74,7 +74,6 @@ org.apache.commons commons-lang3 - 3.8.1 org.onap.policy.models.policy-models-interactions.model-actors diff --git a/models-interactions/model-impl/aai/pom.xml b/models-interactions/model-impl/aai/pom.xml index 79537a550..a08bbfdfa 100644 --- a/models-interactions/model-impl/aai/pom.xml +++ b/models-interactions/model-impl/aai/pom.xml @@ -72,7 +72,7 @@ org.onap.aai.schema-service aai-schema - 1.0.3 + 1.7.2 diff --git a/models-interactions/model-yaml/pom.xml b/models-interactions/model-yaml/pom.xml index 56df41fbe..fb80eafa6 100644 --- a/models-interactions/model-yaml/pom.xml +++ b/models-interactions/model-yaml/pom.xml @@ -52,7 +52,7 @@ org.jgrapht jgrapht-core - 0.9.2 + 1.2.0 org.onap.policy.models.policy-models-interactions.model-impl diff --git a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java index 0bfc9062a..5204a1b7f 100644 --- a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java +++ b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java @@ -27,7 +27,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; import org.apache.commons.lang3.StringUtils; -import org.jgrapht.DirectedGraph; +import org.jgrapht.Graph; import org.jgrapht.graph.ClassBasedEdgeFactory; import org.jgrapht.graph.DefaultEdge; import org.jgrapht.graph.DirectedMultigraph; @@ -115,7 +115,7 @@ public class ControlLoopCompiler implements Serializable { // // For this version we can use a directed multigraph, in the future we may not be able to // - DirectedGraph graph = + Graph graph = new DirectedMultigraph<>(new ClassBasedEdgeFactory(LabeledEdge.class)); // @@ -226,7 +226,7 @@ public class ControlLoopCompiler implements Serializable { } private static Map addPoliciesAsNodes(ControlLoopPolicy policy, - DirectedGraph graph, TriggerNodeWrapper triggerNode, + Graph graph, TriggerNodeWrapper triggerNode, ControlLoopCompilerCallback callback) { Map mapNodes = new HashMap<>(); for (Policy operPolicy : policy.getPolicies()) { @@ -259,7 +259,7 @@ public class ControlLoopCompiler implements Serializable { return mapNodes; } - private static void addEdge(DirectedGraph graph, Map mapNodes, + private static void addEdge(Graph graph, Map mapNodes, String policyId, String connectedPolicy, FinalResultNodeWrapper finalResultNodeWrapper, PolicyResult policyResult, NodeWrapper node) throws CompilerException { @@ -278,7 +278,7 @@ public class ControlLoopCompiler implements Serializable { } } - private static void validateNodesAndEdges(DirectedGraph graph, + private static void validateNodesAndEdges(Graph graph, ControlLoopCompilerCallback callback) throws CompilerException { for (NodeWrapper node : graph.vertexSet()) { if (node instanceof TriggerNodeWrapper) { @@ -294,7 +294,7 @@ public class ControlLoopCompiler implements Serializable { } } - private static void validateTriggerNodeWrapper(DirectedGraph graph, + private static void validateTriggerNodeWrapper(Graph graph, NodeWrapper node) throws CompilerException { if (LOGGER.isDebugEnabled()) { LOGGER.info("Trigger Node {}", node); @@ -313,7 +313,7 @@ public class ControlLoopCompiler implements Serializable { } } - private static void validateFinalResultNodeWrapper(DirectedGraph graph, + private static void validateFinalResultNodeWrapper(Graph graph, NodeWrapper node) throws CompilerException { if (LOGGER.isDebugEnabled()) { LOGGER.info("FinalResult Node {}", node); @@ -326,7 +326,7 @@ public class ControlLoopCompiler implements Serializable { } } - private static void validatePolicyNodeWrapper(DirectedGraph graph, + private static void validatePolicyNodeWrapper(Graph graph, NodeWrapper node, ControlLoopCompilerCallback callback) throws CompilerException { if (LOGGER.isDebugEnabled()) { LOGGER.info("Policy Node {}", node); diff --git a/pom.xml b/pom.xml index d46aff3aa..e6332db7e 100644 --- a/pom.xml +++ b/pom.xml @@ -153,7 +153,7 @@ org.eclipse.jetty jetty-security - 9.4.25.v20191220 + 9.4.30.v20200611 org.eclipse.jetty @@ -176,7 +176,6 @@ commons-io commons-io - 2.6 org.apache.commons -- cgit 1.2.3-korg