You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2014/12/04 19:50:11 UTC
incubator-usergrid git commit: Reverted all changes to ApiResponse to
avoid changing how rest tier functions. ( if it ain't broke...) Cleaned up
and renamed some of the getResponse methods. Added header to file missing
header.
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-256-ApiResponseImplementation d1e06f7f7 -> 082039f26
Reverted all changes to ApiResponse to avoid changing how rest tier functions. ( if it ain't broke...)
Cleaned up and renamed some of the getResponse methods.
Added header to file missing header.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/082039f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/082039f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/082039f2
Branch: refs/heads/USERGRID-256-ApiResponseImplementation
Commit: 082039f266c70da99ae1b26b3164723476cc62e2
Parents: d1e06f7
Author: grey <gr...@apigee.com>
Authored: Thu Dec 4 10:50:08 2014 -0800
Committer: grey <gr...@apigee.com>
Committed: Thu Dec 4 10:50:08 2014 -0800
----------------------------------------------------------------------
.../org/apache/usergrid/rest/ApiResponse.java | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/082039f2/stack/rest/src/main/java/org/apache/usergrid/rest/ApiResponse.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/ApiResponse.java b/stack/rest/src/main/java/org/apache/usergrid/rest/ApiResponse.java
index c3ed0eb..f61bc8a 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/ApiResponse.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/ApiResponse.java
@@ -115,7 +115,7 @@ public class ApiResponse {
return error;
}
- @JsonProperty("error")
+
public void setError( String code ) {
error = code;
}
@@ -227,7 +227,7 @@ public class ApiResponse {
uri = null;
}
this.path = path;
- //uri = createPath( path );
+ uri = createPath( path );
}
@@ -331,18 +331,14 @@ public class ApiResponse {
/** Set the application and organization information */
public void setApplication( Application app) {
+ this.organization = app.getOrganizationName();
+ this.applicationName = app.getApplicationName();
this.application = app.getUuid();
- }
- // public void setApplication( Application app ) {
-// this.organization = app.getOrganizationName();
-// this.applicationName = app.getApplicationName();
-// this.application = app.getUuid();
-//
-// if ( esp != null ) {
-// uri = createPath( esp.toString() );
-// }
-// }
+ if ( esp != null ) {
+ uri = createPath( esp.toString() );
+ }
+ }
@JsonSerialize( include = Inclusion.NON_NULL )