Integrate aai-schema-ingest library into aai-core

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

diff --git a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToDBKey.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToDBKey.java
index 1df39b3..007f1b3 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToDBKey.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToDBKey.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,8 +16,6 @@
  * 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;
 
@@ -25,7 +23,7 @@ import com.google.common.base.Joiner;
 import org.onap.aai.exceptions.AAIException;
 import org.onap.aai.introspection.Introspector;
 import org.onap.aai.introspection.Loader;
-import org.onap.aai.serialization.db.EdgeType;
+import org.onap.aai.edges.enums.EdgeType;
 
 import javax.ws.rs.core.MultivaluedMap;
 import java.io.UnsupportedEncodingException;
@@ -53,25 +51,10 @@ public class URIToDBKey implements Parsable {
         * @throws UnsupportedEncodingException the unsupported encoding exception
         */
        public URIToDBKey(Loader loader, URI uri) throws IllegalArgumentException, AAIException, UnsupportedEncodingException {
-               
                URIParser parser = new URIParser(loader, uri);
                parser.parse(this);
        }
-       /*
-       public URIToDBKey(Version version, String uri) throws IllegalArgumentException {
-               
-               super(version, uri);
-               try {
-                       context = ModelInjestor.getInstance().getContextForVersion(version);
-                       if (context == null) {
-                               throw new IllegalArgumentException("could not find a context for version: " + version);
-                       }
-                       this.parse();
-               } catch (Exception e) {
-                       throw new IllegalArgumentException("uri not valid against our model: " + uri);
-               }
-       }*/
-       
+
        /**
         * @{inheritDoc}
         */
@@ -118,6 +101,6 @@ public class URIToDBKey implements Parsable {
 
        @Override
        public void processContainer(Introspector obj, EdgeType type, MultivaluedMap<String, String> uriKeys,
-                       boolean isFinalContainer) throws AAIException {
+                       boolean isFinalContainer) {
        }
 }