Integrate aai-schema-ingest library into aai-core

[aai/aai-common.git] / aai-core / src / main / java / org / onap / aai / parsers / uri / URIToObject.java

diff --git a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToObject.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToObject.java
index 6d5d98a..d8bdab8 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToObject.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToObject.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. 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.
@@ -16,19 +16,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aai.parsers.uri;
 
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
 import org.onap.aai.exceptions.AAIException;
 import org.onap.aai.introspection.Introspector;
 import org.onap.aai.introspection.Loader;
-import org.onap.aai.introspection.Version;
 import org.onap.aai.schema.enums.ObjectMetadata;
-import org.onap.aai.serialization.db.EdgeType;
+import org.onap.aai.edges.enums.EdgeType;
+import org.onap.aai.setup.SchemaVersion;
 
 import javax.ws.rs.core.MultivaluedMap;
 import java.io.UnsupportedEncodingException;
@@ -41,12 +37,9 @@ import java.util.List;
  * with their keys populated based off the values in the URI.
  * 
  * It populates the keys in the order they are listed in the model.
- * 
- 
- *
  */
 public class URIToObject implements Parsable {
-       private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(URIToObject.class);
+
        
        private Introspector topEntity = null;
        
@@ -60,7 +53,7 @@ public class URIToObject implements Parsable {
        
        private List<Object> parentList = null;
        
-       private Version version = null;
+       private SchemaVersion version = null;
        private Loader loader = null;
        private final HashMap<String, Introspector> relatedObjects;
        
@@ -168,7 +161,7 @@ public class URIToObject implements Parsable {
         *
         * @return the object version
         */
-       public Version getObjectVersion() {
+       public SchemaVersion getObjectVersion() {
                return this.loader.getVersion();
        }
        public Loader getLoader() {
@@ -205,7 +198,6 @@ public class URIToObject implements Parsable {
                                }
                        }
                } catch (UnsupportedEncodingException e) {
-                       LOGGER.error(e.getMessage(),e);
                }
                this.previous = entity;
        }