diff options
Diffstat (limited to 'services/services-engine')
4 files changed, 9 insertions, 6 deletions
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 @@ -32,6 +32,10 @@ <dependencies> <dependency> + <groupId>org.onap.policy.common</groupId> + <artifactId>utils</artifactId> + </dependency> + <dependency> <groupId>org.onap.policy.apex-pdp.core</groupId> <artifactId>core-engine</artifactId> <version>${project.version}</version> @@ -55,7 +59,6 @@ <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>${version.commons-cli}</version> </dependency> </dependencies> 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"); |