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 <liam.fallon@ericsson.com>

2 files changed, 0 insertions, 304 deletions

diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/PropertyUtils.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/PropertyUtils.java
deleted file mode 100644
index 72f85638b..000000000
--- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/PropertyUtils.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.model.utilities;
-
-import java.util.Map.Entry;
-
-/**
- * Convenience methods for handling Java properties class instances.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public abstract class PropertyUtils {
-    /**
-     * Private constructor used to prevent sub class instantiation.
-     */
-    private PropertyUtils() {
-    }
-
-    /**
-     * Return all properties as a string.
-     *
-     * @return a string containing all the property values
-     */
-    public static String getAllProperties() {
-        final StringBuilder builder = new StringBuilder();
-
-        for (final Entry<Object, Object> property : System.getProperties().entrySet()) {
-            builder.append(property.getKey().toString());
-            builder.append('=');
-            builder.append(property.getValue().toString());
-            builder.append('\n');
-        }
-
-        return builder.toString();
-    }
-
-    /**
-     * Checks if a property is set. If the property is set with no value or with a value of "true", this method returns true. It returns "false" if the property
-     * is not set or is set to false
-     *
-     * @param propertyName The property to check
-     * @return true if the property is set to true, false otherwise
-     */
-    public static boolean propertySetOrTrue(final String propertyName) {
-        if (propertyName == null) {
-            return false;
-        }
-
-        final String propertyValue = System.getProperty(propertyName);
-        if (propertyValue == null) {
-            return false;
-        }
-
-        if (propertyValue.trim().length() == 0) {
-            return true;
-        }
-
-        return new Boolean(propertyValue);
-    }
-}
diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/ResourceUtils.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/ResourceUtils.java
deleted file mode 100644
index 588748dda..000000000
--- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/ResourceUtils.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.model.utilities;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * This is common utility class with static methods for handling Java resources on the class path. It is an abstract class to prevent any direct instantiation
- * and private constructor to prevent extending this class.
- *
- * @author Sajeevan Achuthan (sajeevan.achuthan@ericsson.com)
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public abstract class ResourceUtils {
-    // Get a reference to the logger
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ResourceUtils.class);
-
-    // The length of byte buffers used to read resources into strings
-    private static final int BYTE_BUFFER_LENGH = 1024;
-
-    /**
-     * Private constructor used to prevent sub class instantiation.
-     */
-    private ResourceUtils() {
-    }
-
-    /**
-     * Method to resolve a resource; the local file system is checked first and then the class path is checked.
-     *
-     * @param resourceName The resource name
-     * @return A URL to a resource
-     */
-    public static URL getURL4Resource(final String resourceName) {
-        // Check the local fine system first
-        final URL urlToResource = getLocalFile(resourceName);
-
-        // Check if this is a local file
-        if (urlToResource != null) {
-            return urlToResource;
-        }
-        else {
-            // Resort to the class path
-            return getURLResource(resourceName);
-        }
-    }
-
-    /**
-     * Method to return a resource as a string. The resource can be on the local file system or in the class path. The resource is resolved and loaded into a
-     * string.
-     *
-     * @param resourceName The resource name
-     * @return A string containing the resource
-     */
-    public static String getResourceAsString(final String resourceName) {
-        // Get the resource as a stream, we'll convert it to a string then
-        final InputStream resourceStream = getResourceAsStream(resourceName);
-        if (resourceStream == null) {
-            return null;
-        }
-
-        // Read the stream contents in to an output stream
-        final ByteArrayOutputStream resourceOutputStreamBuffer = new ByteArrayOutputStream();
-        final byte[] resourceBuffer = new byte[BYTE_BUFFER_LENGH];
-        int length;
-        try {
-            while ((length = resourceStream.read(resourceBuffer)) != -1) {
-                resourceOutputStreamBuffer.write(resourceBuffer, 0, length);
-            }
-        }
-        catch (final IOException e) {
-            LOGGER.debug("error reading resource stream \"{}\" : " + e.getMessage(), resourceName, e);
-            return null;
-        }
-
-        return resourceOutputStreamBuffer.toString();
-    }
-
-    /**
-     * Method to return a resource as a stream. The resource can be on the local file system or in the class path. The resource is resolved and returned as a
-     * stream.
-     *
-     * @param resourceName The resource name
-     * @return A stream attached to the resource
-     */
-    public static InputStream getResourceAsStream(final String resourceName) {
-        // Find a URL to the resource first
-        final URL urlToResource = getURL4Resource(resourceName);
-
-        // Check if the resource exists
-        if (urlToResource == null) {
-            // No resource found
-            LOGGER.debug("cound not find resource \"{}\" : ", resourceName);
-            return null;
-        }
-
-        // Read the resource into a string
-        try {
-            return urlToResource.openStream();
-        }
-        catch (final IOException e) {
-            // Any of many IO exceptions such as the resource is a directory
-            LOGGER.debug("error attaching resource \"{}\" to stream : " + e.getMessage(), resourceName, e);
-            return null;
-        }
-    }
-
-    /**
-     * Method to get a URL resource from the class path.
-     *
-     * @param resourceName The resource name
-     * @return The URL to the resource
-     */
-    public static URL getURLResource(final String resourceName) {
-        try {
-            final ClassLoader classLoader = ResourceUtils.class.getClassLoader();
-
-            final String[] fileParts = resourceName.split("/");
-            // Read the resource
-            URL url = classLoader.getResource(resourceName);
-
-            // Check if the resource is defined
-            if (url != null) {
-                // Return the resource as a file name
-                LOGGER.debug("found URL resource \"{}\" : ", url);
-                return url;
-            }
-            else {
-                url = classLoader.getResource(fileParts[fileParts.length - 1]);
-                if (url == null) {
-                    LOGGER.debug("cound not find URL resource \"{}\" : ", resourceName);
-                    return null;
-                }
-                LOGGER.debug("found URL resource \"{}\" : ", url);
-                return url;
-            }
-        }
-        catch (final Exception e) {
-            LOGGER.debug("error getting URL resource \"{}\" : " + e.getMessage(), e);
-            return null;
-        }
-    }
-
-    /**
-     * Method to get a URL resource from the local machine.
-     *
-     * @param resourceName The resource name
-     * @return The URL to the resource
-     */
-    public static URL getLocalFile(final String resourceName) {
-        try {
-            // Input might already be in URL format
-            final URL ret = new URL(resourceName);
-            final File f = new File(ret.toURI());
-            if (f.exists()) {
-                return ret;
-            }
-        }
-        catch (final Exception ignore) {
-        		// We ignore exceptions here and catch them below
-        }
-
-        try {
-            final File f = new File(resourceName);
-            // Check if the file exists
-            if (f.exists()) {
-                final URL urlret = f.toURI().toURL();
-                LOGGER.debug("resource \"{}\" was found on the local file system", f.toURI().toURL());
-                return urlret;
-            }
-            else {
-                LOGGER.debug("resource \"{}\" does not exist on the local file system", resourceName);
-                return null;
-            }
-        }
-        catch (final Exception e) {
-            LOGGER.debug("error finding resource \"{}\" : " + e.getMessage(), e);
-            return null;
-        }
-    }
-
-    /**
-     * Gets the file path for a resource on the local file system or on the class path.
-     *
-     * @param resource the resource to the get the file path for
-     * @return the resource file path
-     */
-    public static String getFilePath4Resource(final String resource) {
-        if (resource == null) {
-            return null;
-        }
-
-        URL modelFileURL = getURL4Resource(resource);
-        if (modelFileURL != null) {
-            return modelFileURL.getPath();
-        }
-        else {
-            return resource;
-        }
-    }
-
-}