Upgrade version of aai-common

* Configure Spike with schema ingestion beans.
* Update OXMModelLoader and EdgeRulesLoader to make use of schema
  ingestion beans. Here there is an acknowledged awkward marrying of
  bean creation and static method use.
* Update tests to mock schema ingestion beans and organise test
  resources.

Change-Id: I1f043aa5852dbd2737a804ebc282a12afb9fb39f
Issue-ID: AAI-1951
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>

1 files changed, 0 insertions, 116 deletions

diff --git a/src/main/java/org/onap/aai/spike/util/SchemaIngestPropertiesReader.java b/src/main/java/org/onap/aai/spike/util/SchemaIngestPropertiesReader.java
deleted file mode 100644
index 48e26c8..0000000
--- a/src/main/java/org/onap/aai/spike/util/SchemaIngestPropertiesReader.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 Amdocs
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-package org.onap.aai.spike.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Properties;
-import org.onap.aai.cl.eelf.LoggerFactory;
-import org.onap.aai.spike.exception.SpikeException;
-import org.onap.aai.spike.logging.SpikeMsgs;
-
-public class SchemaIngestPropertiesReader {
-
-    private static final String SCHEMA_INGEST_PROPERTIES_LOCATION =
-            System.getProperty("CONFIG_HOME") + "/schemaIngest.properties";
-
-    private static org.onap.aai.cl.api.Logger logger =
-            LoggerFactory.getInstance().getLogger(SchemaIngestPropertiesReader.class.getName());
-
-    /**
-     * Gets the Node directory location to ingest OXMs
-     *
-     * @return path to OXMs
-     * @throws SpikeException
-     */
-    public String getNodeDir() throws SpikeException {
-        Properties prop = findSchemaIngestPropertyFile();
-        return prop.getProperty("nodeDir");
-    }
-
-    /**
-     * Gets the Edge directory location to ingest OXM
-     *
-     * @return path to OXMs
-     * @throws SpikeException
-     */
-    public String getEdgeDir() throws SpikeException {
-        Properties prop = findSchemaIngestPropertyFile();
-        return prop.getProperty("edgeDir");
-    }
-
-    /**
-     * Gets the location of the Edge Properties
-     *
-     * @return
-     * @throws SpikeException
-     */
-    public String getEdgePropsDir() throws SpikeException {
-
-        Properties prop = findSchemaIngestPropertyFile();
-        return prop.getProperty("edgePropsDir");
-    }
-
-
-    private Properties findSchemaIngestPropertyFile() throws SpikeException {
-        Properties prop = new Properties();
-        try {
-            prop = loadFromFile(SCHEMA_INGEST_PROPERTIES_LOCATION);
-        } catch (NoSuchFileException e) {
-            // if file not found, try via classpath
-            try {
-                prop = loadFromClasspath("schemaIngest.properties");
-            } catch (URISyntaxException | IOException e1) {
-                logger.error(SpikeMsgs.SPIKE_SCHEMA_INGEST_LOAD_ERROR, e1.getMessage());
-                throw new SpikeException("Failed to load schemaIngest.properties", e1);
-            }
-        } catch (IOException e) {
-            logger.error(SpikeMsgs.SPIKE_SCHEMA_INGEST_LOAD_ERROR, e.getMessage());
-            throw new SpikeException("Failed to load schemaIngest.properties", e);
-        }
-        return prop;
-    }
-
-    private Properties loadFromFile(String filename) throws IOException {
-        Path configLocation = Paths.get(filename);
-        try (InputStream stream = Files.newInputStream(configLocation)) {
-            return loadProperties(stream);
-        }
-    }
-
-    private Properties loadFromClasspath(String resourceName) throws URISyntaxException, IOException {
-        Path path = Paths.get(ClassLoader.getSystemResource(resourceName).toURI());
-        try (InputStream stream = Files.newInputStream(path)) {
-            return loadProperties(stream);
-        }
-    }
-
-    private Properties loadProperties(InputStream stream) throws IOException {
-        Properties config = new Properties();
-        config.load(stream);
-        return config;
-    }
-}