[37/50] [abbrv] atlas git commit: Fix for generating correct REST API docs
Fix for generating correct REST API docs
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/6973830c
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/6973830c
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/6973830c
Branch: refs/heads/branch-1.0
Commit: 6973830c8e50642c53d922709170333acbaed0a2
Parents: 314569d
Author: apoorvnaik
Authored: Mon Oct 22 09:22:45 2018 -0700
Committer: Ashutosh Mestry
Committed: Thu Nov 1 15:42:58 2018 -0700
--
build-tools/src/main/resources/enunciate.xml| 8 ++--
pom.xml | 4 +-
.../apache/atlas/web/rest/DiscoveryREST.java| 29 ++
.../org/apache/atlas/web/rest/EntityREST.java | 41 +---
.../org/apache/atlas/web/rest/GlossaryREST.java | 7 ++--
.../org/apache/atlas/web/rest/LineageREST.java | 6 +--
.../apache/atlas/web/rest/RelationshipREST.java | 22 ++-
.../org/apache/atlas/web/rest/TypesREST.java| 35 ++---
8 files changed, 32 insertions(+), 120 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/atlas/blob/6973830c/build-tools/src/main/resources/enunciate.xml
--
diff --git a/build-tools/src/main/resources/enunciate.xml
b/build-tools/src/main/resources/enunciate.xml
index dafd66f..e01d696 100755
--- a/build-tools/src/main/resources/enunciate.xml
+++ b/build-tools/src/main/resources/enunciate.xml
@@ -16,8 +16,7 @@
~ limitations under the License.
-->
-http://www.w3.org/2001/XMLSchema-instance;
-
xsi:noNamespaceSchemaLocation="http://enunciate.webcohesion.com/schemas/enunciate-2.8.0.xsd;>
+http://www.w3.org/2001/XMLSchema-instance;
xsi:noNamespaceSchemaLocation="http://enunciate.webcohesion.com/schemas/enunciate-2.11.0.xsd;>
Atlas REST API
Atlas exposes a variety of REST endpoints to work with
types, entities, lineage and data discovery.
@@ -26,8 +25,9 @@
-
-
+
+
+
http://git-wip-us.apache.org/repos/asf/atlas/blob/6973830c/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 2b1956f..a3437f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -683,7 +683,7 @@
1.3.7
2.7
0.8
-2.10.1
+2.11.1
4.5
3.7
1.8
@@ -706,7 +706,7 @@
false
true
true
-true
+false
${project.basedir}
10
http://git-wip-us.apache.org/repos/asf/atlas/blob/6973830c/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java
--
diff --git a/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java
b/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java
index 82d6f35..64da211 100644
--- a/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java
+++ b/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java
@@ -51,6 +51,7 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
import java.io.IOException;
import java.util.List;
@@ -60,6 +61,8 @@ import java.util.List;
@Path("v2/search")
@Singleton
@Service
+@Consumes({Servlets.JSON_MEDIA_TYPE, MediaType.APPLICATION_JSON})
+@Produces({Servlets.JSON_MEDIA_TYPE, MediaType.APPLICATION_JSON})
public class DiscoveryREST {
private static final Logger PERF_LOG =
AtlasPerfTracer.getPerfLogger("rest.DiscoveryREST");
@@ -95,8 +98,6 @@ public class DiscoveryREST {
*/
@GET
@Path("/dsl")
-@Consumes(Servlets.JSON_MEDIA_TYPE)
-@Produces(Servlets.JSON_MEDIA_TYPE)
public AtlasSearchResult searchUsingDSL(@QueryParam("query")
String query,
@QueryParam("typeName")
String typeName,
@QueryParam("classification")
String classification,
@@ -144,8 +145,6 @@ public class DiscoveryREST {
*/
@GET
@Path("/fulltext")
-@Consumes(Servlets.JSON_MEDIA_TYPE)
-@Produces(Servlets.JSON_MEDIA_TYPE)
public AtlasSearchResult searchUsingFullText(@QueryParam("query")
String query,
@QueryParam("excludeDeletedEntities") boolean excludeDeletedEntities,
@QueryParam("limit")
int limit,
@@ -185,8 +184,6 @@ public class DiscoveryREST {
*/
@GET
@Path("/basic")
-@Consumes(Servlets.JSON_MEDIA_TYPE)
-@Produces(Servlets.JSON_MEDIA_TYPE)
public
atlas git commit: Fix for generating correct REST API docs
Repository: atlas
Updated Branches:
refs/heads/master 93bd535eb -> 756c272ef
Fix for generating correct REST API docs
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/756c272e
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/756c272e
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/756c272e
Branch: refs/heads/master
Commit: 756c272ef0db175b3b6aca09d86b8a4acafd27ca
Parents: 93bd535
Author: apoorvnaik
Authored: Mon Oct 22 09:22:45 2018 -0700
Committer: apoorvnaik
Committed: Wed Oct 24 21:49:59 2018 -0700
--
build-tools/src/main/resources/enunciate.xml| 8 ++--
pom.xml | 4 +-
.../apache/atlas/web/rest/DiscoveryREST.java| 29 ++
.../org/apache/atlas/web/rest/EntityREST.java | 41 +---
.../org/apache/atlas/web/rest/GlossaryREST.java | 7 ++--
.../org/apache/atlas/web/rest/LineageREST.java | 6 +--
.../apache/atlas/web/rest/RelationshipREST.java | 22 ++-
.../org/apache/atlas/web/rest/TypesREST.java| 35 ++---
8 files changed, 32 insertions(+), 120 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/atlas/blob/756c272e/build-tools/src/main/resources/enunciate.xml
--
diff --git a/build-tools/src/main/resources/enunciate.xml
b/build-tools/src/main/resources/enunciate.xml
index dafd66f..e01d696 100755
--- a/build-tools/src/main/resources/enunciate.xml
+++ b/build-tools/src/main/resources/enunciate.xml
@@ -16,8 +16,7 @@
~ limitations under the License.
-->
-http://www.w3.org/2001/XMLSchema-instance;
-
xsi:noNamespaceSchemaLocation="http://enunciate.webcohesion.com/schemas/enunciate-2.8.0.xsd;>
+http://www.w3.org/2001/XMLSchema-instance;
xsi:noNamespaceSchemaLocation="http://enunciate.webcohesion.com/schemas/enunciate-2.11.0.xsd;>
Atlas REST API
Atlas exposes a variety of REST endpoints to work with
types, entities, lineage and data discovery.
@@ -26,8 +25,9 @@
-
-
+
+
+
http://git-wip-us.apache.org/repos/asf/atlas/blob/756c272e/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 91ec2c8..887d3ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -693,7 +693,7 @@
1.3.7
2.7
0.8
-2.10.1
+2.11.1
4.5
3.7
1.8
@@ -716,7 +716,7 @@
false
true
true
-true
+false
${project.basedir}
10
http://git-wip-us.apache.org/repos/asf/atlas/blob/756c272e/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java
--
diff --git a/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java
b/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java
index 82d6f35..64da211 100644
--- a/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java
+++ b/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java
@@ -51,6 +51,7 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
import java.io.IOException;
import java.util.List;
@@ -60,6 +61,8 @@ import java.util.List;
@Path("v2/search")
@Singleton
@Service
+@Consumes({Servlets.JSON_MEDIA_TYPE, MediaType.APPLICATION_JSON})
+@Produces({Servlets.JSON_MEDIA_TYPE, MediaType.APPLICATION_JSON})
public class DiscoveryREST {
private static final Logger PERF_LOG =
AtlasPerfTracer.getPerfLogger("rest.DiscoveryREST");
@@ -95,8 +98,6 @@ public class DiscoveryREST {
*/
@GET
@Path("/dsl")
-@Consumes(Servlets.JSON_MEDIA_TYPE)
-@Produces(Servlets.JSON_MEDIA_TYPE)
public AtlasSearchResult searchUsingDSL(@QueryParam("query")
String query,
@QueryParam("typeName")
String typeName,
@QueryParam("classification")
String classification,
@@ -144,8 +145,6 @@ public class DiscoveryREST {
*/
@GET
@Path("/fulltext")
-@Consumes(Servlets.JSON_MEDIA_TYPE)
-@Produces(Servlets.JSON_MEDIA_TYPE)
public AtlasSearchResult searchUsingFullText(@QueryParam("query")
String query,
@QueryParam("excludeDeletedEntities") boolean excludeDeletedEntities,
@QueryParam("limit")
int limit,
@@ -185,8 +184,6 @@ public class DiscoveryREST {
*/
@GET
@Path("/basic")
-
