From efdaa0d840ed5289bda63ea15d76d8a5446c1746 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Fri, 3 Aug 2018 16:12:01 +0100 Subject: Use common components in apex Common ResourceUtil class replaces specific one in APEX Managed dependency version clashes removed in POMs Dependency versions with security vulnerabilities changed for zookeeper kafka infinispan Change-Id: I3c4b367cb5556b2dc255ab62c84f85738165eb81 Issue-ID: POLICY-954 Signed-off-by: liamfallon --- services/services-engine/pom.xml | 5 ++++- .../impl/filecarrierplugin/FILECarrierTechnologyParameters.java | 2 +- .../policy/apex/service/engine/main/ApexCommandLineArguments.java | 4 ++-- .../service/parameters/engineservice/EngineServiceParameters.java | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) (limited to 'services/services-engine') diff --git a/services/services-engine/pom.xml b/services/services-engine/pom.xml index 6ad0f5006..face719f8 100644 --- a/services/services-engine/pom.xml +++ b/services/services-engine/pom.xml @@ -31,6 +31,10 @@ External services provided by the Apex policy execution engine + + org.onap.policy.common + utils + org.onap.policy.apex-pdp.core core-engine @@ -55,7 +59,6 @@ commons-cli commons-cli - ${version.commons-cli} diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/FILECarrierTechnologyParameters.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/FILECarrierTechnologyParameters.java index f7f25cb9e..0081312fe 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/FILECarrierTechnologyParameters.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/FILECarrierTechnologyParameters.java @@ -20,10 +20,10 @@ package org.onap.policy.apex.service.engine.event.impl.filecarrierplugin; -import org.onap.policy.apex.model.utilities.ResourceUtils; import org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.consumer.ApexFileEventConsumer; import org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.producer.ApexFileEventProducer; import org.onap.policy.apex.service.parameters.carriertechnology.CarrierTechnologyParameters; +import org.onap.policy.common.utils.resources.ResourceUtils; /** * This class holds the parameters that allows transport of events into and out of Apex using files diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexCommandLineArguments.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexCommandLineArguments.java index 02dc248b4..374b38482 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexCommandLineArguments.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexCommandLineArguments.java @@ -34,7 +34,7 @@ import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.onap.policy.apex.model.basicmodel.concepts.ApexException; import org.onap.policy.apex.model.basicmodel.concepts.ApexRuntimeException; -import org.onap.policy.apex.model.utilities.ResourceUtils; +import org.onap.policy.common.utils.resources.ResourceUtils; /** * This class reads and handles command line parameters for the Apex main program. @@ -266,7 +266,7 @@ public class ApexCommandLineArguments { } // The file name can refer to a resource on the local file system or on the class path - final URL fileURL = ResourceUtils.getURL4Resource(fileName); + final URL fileURL = ResourceUtils.getUrl4Resource(fileName); if (fileURL == null) { throw new ApexException(fileTag + " file \"" + fileName + "\" does not exist"); } diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParameters.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParameters.java index 6b60732c3..1db7aeb2d 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParameters.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParameters.java @@ -26,8 +26,8 @@ import java.net.URL; import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; import org.onap.policy.apex.model.basicmodel.service.AbstractParameters; import org.onap.policy.apex.model.basicmodel.service.ParameterService; -import org.onap.policy.apex.model.utilities.ResourceUtils; import org.onap.policy.apex.service.parameters.ApexParameterValidator; +import org.onap.policy.common.utils.resources.ResourceUtils; import org.onap.policy.apex.core.engine.EngineParameters; @@ -305,7 +305,7 @@ public class EngineServiceParameters extends AbstractParameters implements ApexP } else { // The file name can refer to a resource on the local file system or on the class // path - final URL fileURL = ResourceUtils.getURL4Resource(policyModelFileName); + final URL fileURL = ResourceUtils.getUrl4Resource(policyModelFileName); if (fileURL == null) { errorMessageBuilder.append( " policyModelFileName [" + policyModelFileName + "] not found or is not a plain file\n"); -- cgit 1.2.3-korg