2 files changed, 0 insertions, 151 deletions
diff --git a/aai-core/src/main/java/org/onap/aai/restcore/search/GremlinGroovyShellSingleton.java b/aai-core/src/main/java/org/onap/aai/restcore/search/GremlinGroovyShellSingleton.java
deleted file mode 100644
index 328429b1..00000000
--- a/aai-core/src/main/java/org/onap/aai/restcore/search/GremlinGroovyShellSingleton.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * 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.
- * 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.restcore.search;
-
-import groovy.lang.Binding;
-import groovy.lang.Script;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import org.onap.aai.serialization.engines.TransactionalGraphEngine;
-
-import java.util.Map;
-
-/**
- * Creates and returns a groovy shell with the
- * configuration to statically import graph classes
- *
- */
-public class GremlinGroovyShellSingleton extends AAIAbstractGroovyShell {
-
-	private GremlinGroovyShellSingleton() {
-		super();
-	}
-
-	private static class Helper {
-		 private static final GremlinGroovyShellSingleton INSTANCE = new GremlinGroovyShellSingleton();
-	 }
-
-	 public static GremlinGroovyShellSingleton getInstance() {
-		 
-		 return Helper.INSTANCE;
-	 }
-
-	/** 
-	 * {@inheritDoc}
-	 */
-	@Override
-	public GraphTraversal<?, ?> executeTraversal (String traversal, Map<String, Object> params) {
-		Binding binding = new Binding(params);
-		Script script = shell.parse(traversal);
-		script.setBinding(binding);
-		return (GraphTraversal<?, ?>) script.run();
-	}
-
-	/**
-	 * @throws UnsupportedOperationException
-	 */
-	@Override
-	public String executeTraversal(TransactionalGraphEngine engine, String traversal, Map<String, Object> params) {
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/aai-core/src/main/java/org/onap/aai/restcore/search/GroovyQueryBuilderSingleton.java b/aai-core/src/main/java/org/onap/aai/restcore/search/GroovyQueryBuilderSingleton.java
deleted file mode 100644
index 03a8bfc3..00000000
--- a/aai-core/src/main/java/org/onap/aai/restcore/search/GroovyQueryBuilderSingleton.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * 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.
- * 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.restcore.search;
-
-import groovy.lang.Binding;
-import groovy.lang.Script;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.onap.aai.config.SpringContextAware;
-import org.onap.aai.introspection.Loader;
-import org.onap.aai.introspection.LoaderFactory;
-import org.onap.aai.introspection.ModelType;
-import org.onap.aai.query.builder.QueryBuilder;
-import org.onap.aai.serialization.engines.QueryStyle;
-import org.onap.aai.serialization.engines.TransactionalGraphEngine;
-import org.onap.aai.setup.SchemaVersion;
-import org.onap.aai.setup.SchemaVersions;
-
-import java.util.Map;
-
-/**
- * Creates and returns a groovy shell with the
- * configuration to statically import graph classes
- *
- */
-public class GroovyQueryBuilderSingleton extends AAIAbstractGroovyShell {
-
-	private GroovyQueryBuilderSingleton() {
-		super();
-	}
-	
-	 private static class Helper {
-		 private static final GroovyQueryBuilderSingleton INSTANCE = new GroovyQueryBuilderSingleton();
-	 }
-
-	 public static GroovyQueryBuilderSingleton getInstance() {
-		 
-		 return Helper.INSTANCE;
-	 }
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String executeTraversal (TransactionalGraphEngine engine, String traversal, Map<String, Object> params) {
-		QueryBuilder<Vertex> builder = engine.getQueryBuilder(QueryStyle.GREMLIN_TRAVERSAL);
-		SchemaVersions schemaVersions = SpringContextAware.getBean(SchemaVersions.class);
-		Loader loader = SpringContextAware.getBean(LoaderFactory.class).createLoaderForVersion(ModelType.MOXY,  schemaVersions.getDefaultVersion());
-		
-		builder.changeLoader(loader);
-		Binding binding = new Binding(params);
-		binding.setVariable("builder", builder);
-		Script script = shell.parse(traversal);
-		script.setBinding(binding);
-		script.run();
-		
-		return builder.getQuery();
-	}
-
-	/**
-	 * @throws UnsupportedOperationException
-	 */
-	@Override
-	public GraphTraversal<?, ?> executeTraversal(String traversal, Map<String, Object> params) {
-		throw new UnsupportedOperationException();
-	}
-}