ATLAS-698 Remove Rexster Graph API (svimal2106 via shwethags)

release-log.txt

@@ -12,6 +12,7 @@ ATLAS-925 Change master version to 0.8-incubating (shwethags)
 --Release 0.7-incubating
 
 INCOMPATIBLE CHANGES:
+ATLAS-698 Remove Rexster Graph API (svimal2106 via shwethags)
 ATLAS-844 Remove titan berkeley and elastic search jars if hbase/solr based profiles are chosen (yhemanth via shwethags)
 ATLAS-819 All user defined types should have a set of common attributes (shwethags)
 ATLAS-915 Fix docs for import-hive changes (svimal2106 via sumasai)

webapp/src/main/java/org/apache/atlas/web/resources/MetadataDiscoveryResource.java

@@ -41,6 +41,7 @@ import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
 import java.util.List;
 import java.util.Map;
+import org.apache.hadoop.classification.InterfaceAudience;
 
 /**
  * Jersey Resource for metadata operations.
@@ -82,10 +83,6 @@ public class MetadataDiscoveryResource {
         try {   // fall back to dsl
             ParamChecker.notEmpty(query, "query cannot be null");
 
-            if (query.startsWith("g.")) { // raw gremlin query
-                return searchUsingGremlinQuery(query);
-            }
-
             final String jsonResultStr = discoveryService.searchByDSL(query);
             response = new DSLJSONResponseBuilder().results(jsonResultStr).query(query).build();
             return Response.ok(response).build();
@@ -137,6 +134,7 @@ public class MetadataDiscoveryResource {
     @Path("search/gremlin")
     @Consumes(Servlets.JSON_MEDIA_TYPE)
     @Produces(Servlets.JSON_MEDIA_TYPE)
+    @InterfaceAudience.Private
     public Response searchUsingGremlinQuery(@QueryParam("query") String gremlinQuery) {
         try {
             ParamChecker.notEmpty(gremlinQuery, "gremlinQuery cannot be null or empty");

webapp/src/test/java/org/apache/atlas/web/resources/MetadataDiscoveryJerseyResourceIT.java

@@ -100,7 +100,7 @@ public class MetadataDiscoveryJerseyResourceIT extends BaseResourceIT {
     @Test
     public void testSearchUsingGremlin() throws Exception {
         String query = "g.V.has('type', 'dsl_test_type').toList()";
-        WebResource resource = service.path("api/atlas/discovery/search").queryParam("query", query);
+        WebResource resource = service.path("api/atlas/discovery/search/gremlin").queryParam("query", query);
 
         ClientResponse clientResponse = resource.accept(Servlets.JSON_MEDIA_TYPE).type(Servlets.JSON_MEDIA_TYPE)
                 .method(HttpMethod.GET, ClientResponse.class);

webapp/src/test/java/org/apache/atlas/web/resources/RexsterGraphJerseyResourceIT.java

-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.atlas.web.resources;
-
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-import org.apache.atlas.web.util.Servlets;
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.core.Response;
-
-/**
- * Integration tests for Rexster Graph Jersey Resource.
- */
-@Test
-public class RexsterGraphJerseyResourceIT extends BaseResourceIT {
-
-    @BeforeClass
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-    }
-
-    @Test(enabled = false)
-    public void testGetVertex() throws Exception {
-        // todo: add a vertex before fetching it
-
-        WebResource resource = service.path("api/atlas/graph/vertices").path("0");
-
-        ClientResponse clientResponse = resource.accept(Servlets.JSON_MEDIA_TYPE).type(Servlets.JSON_MEDIA_TYPE)
-                .method(HttpMethod.GET, ClientResponse.class);
-        Assert.assertEquals(clientResponse.getStatus(), Response.Status.OK.getStatusCode());
-        String response = clientResponse.getEntity(String.class);
-        Assert.assertNotNull(response);
-    }
-
-    public void testGetVertexWithInvalidId() throws Exception {
-        WebResource resource = service.path("api/atlas/graph/vertices/blah");
-
-        ClientResponse clientResponse = resource.accept(Servlets.JSON_MEDIA_TYPE).type(Servlets.JSON_MEDIA_TYPE)
-                .method(HttpMethod.GET, ClientResponse.class);
-        Assert.assertEquals(clientResponse.getStatus(), Response.Status.NOT_FOUND.getStatusCode());
-    }
-
-    public void testGetVertexProperties() throws Exception {
-
-    }
-
-    public void testGetVertices() throws Exception {
-
-    }
-
-    public void testGetVertexEdges() throws Exception {
-
-    }
-
-    public void testGetEdge() throws Exception {
-
-    }
-}

webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTestBase.java

@@ -26,7 +26,6 @@ import org.apache.atlas.web.TestUtils;
 import org.apache.atlas.web.resources.AdminJerseyResourceIT;
 import org.apache.atlas.web.resources.EntityJerseyResourceIT;
 import org.apache.atlas.web.resources.MetadataDiscoveryJerseyResourceIT;
-import org.apache.atlas.web.resources.RexsterGraphJerseyResourceIT;
 import org.apache.atlas.web.resources.TypesJerseyResourceIT;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.hadoop.conf.Configuration;
@@ -173,7 +172,7 @@ public class SecureEmbeddedServerTestBase {
             TestListenerAdapter tla = new TestListenerAdapter();
             TestNG testng = new TestNG();
             testng.setTestClasses(new Class[]{AdminJerseyResourceIT.class, EntityJerseyResourceIT.class,
-                    MetadataDiscoveryJerseyResourceIT.class, RexsterGraphJerseyResourceIT.class,
+                    MetadataDiscoveryJerseyResourceIT.class,
                     TypesJerseyResourceIT.class});
             testng.addListener(tla);
             testng.run();