You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ni...@apache.org on 2016/08/04 18:20:04 UTC
ambari git commit: AMBARI-18020 : returning Response object instead
of Pojo from REST endpoint to avoid getting empty object on client side
(nitirajrathore)
Repository: ambari
Updated Branches:
refs/heads/trunk 564273cd5 -> 97dd0815c
AMBARI-18020 : returning Response object instead of Pojo from REST endpoint to avoid getting empty object on client side (nitirajrathore)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/97dd0815
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/97dd0815
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/97dd0815
Branch: refs/heads/trunk
Commit: 97dd0815cfac17902b58ecbe9b5b4953c6921178
Parents: 564273c
Author: Nitiraj Rathore <ni...@gmail.com>
Authored: Thu Aug 4 23:48:59 2016 +0530
Committer: Nitiraj Rathore <ni...@gmail.com>
Committed: Thu Aug 4 23:48:59 2016 +0530
----------------------------------------------------------------------
.../view/hive2/resources/uploads/UploadService.java | 12 ++++++------
.../view/hive/resources/uploads/UploadService.java | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/97dd0815/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/resources/uploads/UploadService.java
----------------------------------------------------------------------
diff --git a/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/resources/uploads/UploadService.java b/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/resources/uploads/UploadService.java
index 08d91e9..9800c22 100644
--- a/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/resources/uploads/UploadService.java
+++ b/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/resources/uploads/UploadService.java
@@ -229,7 +229,7 @@ public class UploadService extends BaseService {
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- public Job createTable(TableInput tableInput) {
+ public Response createTable(TableInput tableInput) {
try {
tableInput.validate();
String databaseName = tableInput.getDatabaseName();
@@ -238,7 +238,7 @@ public class UploadService extends BaseService {
Job job = createJob(tableCreationQuery, databaseName);
LOG.info("job created for table creation {}", job);
- return job;
+ return Response.ok(job).build();
} catch (WebApplicationException e) {
LOG.error(getErrorMessage(e), e);
throw e;
@@ -320,14 +320,14 @@ public class UploadService extends BaseService {
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- public Job insertFromTempTable(InsertFromQueryInput input) {
+ public Response insertFromTempTable(InsertFromQueryInput input) {
try {
String insertQuery = generateInsertFromQuery(input);
LOG.info("insertQuery : {}", insertQuery);
Job job = createJob(insertQuery, "default");
LOG.info("Job created for insert from temp table : {}", job);
- return job;
+ return Response.ok(job).build();
} catch (WebApplicationException e) {
LOG.error(getErrorMessage(e), e);
throw e;
@@ -341,14 +341,14 @@ public class UploadService extends BaseService {
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- public Job deleteTable(DeleteQueryInput input) {
+ public Response deleteTable(DeleteQueryInput input) {
try {
String deleteQuery = generateDeleteQuery(input);
LOG.info("deleteQuery : {}", deleteQuery);
Job job = createJob(deleteQuery, "default");
LOG.info("Job created for delete temp table : {} ", job);
- return job;
+ return Response.ok(job).build();
} catch (WebApplicationException e) {
LOG.error(getErrorMessage(e), e);
throw e;
http://git-wip-us.apache.org/repos/asf/ambari/blob/97dd0815/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/uploads/UploadService.java
----------------------------------------------------------------------
diff --git a/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/uploads/UploadService.java b/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/uploads/UploadService.java
index a83d17d..7dccbd4 100644
--- a/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/uploads/UploadService.java
+++ b/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/uploads/UploadService.java
@@ -218,7 +218,7 @@ public class UploadService extends BaseService {
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- public Job createTable(TableInput tableInput) {
+ public Response createTable(TableInput tableInput) {
try {
tableInput.validate();
String databaseName = tableInput.getDatabaseName();
@@ -227,7 +227,7 @@ public class UploadService extends BaseService {
Job job = createJob(tableCreationQuery, databaseName);
LOG.info("job created for table creation {}", job);
- return job;
+ return Response.ok(job).build();
} catch (WebApplicationException e) {
LOG.error(getErrorMessage(e), e);
throw e;
@@ -309,14 +309,14 @@ public class UploadService extends BaseService {
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- public Job insertFromTempTable(InsertFromQueryInput input) {
+ public Response insertFromTempTable(InsertFromQueryInput input) {
try {
String insertQuery = generateInsertFromQuery(input);
LOG.info("insertQuery : {}", insertQuery);
Job job = createJob(insertQuery, "default");
LOG.info("Job created for insert from temp table : {}", job);
- return job;
+ return Response.ok(job).build();
} catch (WebApplicationException e) {
LOG.error(getErrorMessage(e), e);
throw e;
@@ -330,14 +330,14 @@ public class UploadService extends BaseService {
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- public Job deleteTable(DeleteQueryInput input) {
+ public Response deleteTable(DeleteQueryInput input) {
try {
String deleteQuery = generateDeleteQuery(input);
LOG.info("deleteQuery : {}", deleteQuery);
Job job = createJob(deleteQuery, "default");
LOG.info("Job created for delete temp table : {} ", job);
- return job;
+ return Response.ok(job).build();
} catch (WebApplicationException e) {
LOG.error(getErrorMessage(e), e);
throw e;