Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 722D510B68 for ; Mon, 1 Dec 2014 18:51:32 +0000 (UTC) Received: (qmail 78928 invoked by uid 500); 1 Dec 2014 18:51:32 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 78909 invoked by uid 500); 1 Dec 2014 18:51:32 -0000 Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.incubator.apache.org Delivered-To: mailing list commits@usergrid.incubator.apache.org Received: (qmail 78899 invoked by uid 99); 1 Dec 2014 18:51:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Dec 2014 18:51:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 18A9A9B0E03; Mon, 1 Dec 2014 18:51:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: grey@apache.org To: commits@usergrid.apache.org Message-Id: <44fe206d0b6a4a79bcedcabd19ab8f4a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-usergrid git commit: Revert "Add generics to the RevisedApiResponse class to start the first step of having generic types being returned" Date: Mon, 1 Dec 2014 18:51:32 +0000 (UTC) Repository: incubator-usergrid Updated Branches: refs/heads/USERGRID-256-ApiResponseImplementation 0e82b18c0 -> b2bdda4ee Revert "Add generics to the RevisedApiResponse class to start the first step of having generic types being returned" This reverts commit 0e82b18c02d40663bcb606ea1a1ed4e2d44305dc. Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b2bdda4e Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b2bdda4e Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b2bdda4e Branch: refs/heads/USERGRID-256-ApiResponseImplementation Commit: b2bdda4ee0f1089880ebf78f216194f5e624ac92 Parents: 0e82b18 Author: grey Authored: Mon Dec 1 10:51:08 2014 -0800 Committer: grey Committed: Mon Dec 1 10:51:08 2014 -0800 ---------------------------------------------------------------------- .../usergrid/rest/RevisedApiResponse.java | 36 ++++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b2bdda4e/stack/rest/src/main/java/org/apache/usergrid/rest/RevisedApiResponse.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/RevisedApiResponse.java b/stack/rest/src/main/java/org/apache/usergrid/rest/RevisedApiResponse.java index b0041f8..16c9bef 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/RevisedApiResponse.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/RevisedApiResponse.java @@ -53,7 +53,7 @@ import static org.apache.usergrid.utils.InflectionUtils.pluralize; "entities", "list", "data", "next", "timestamp", "duration" } ) @XmlRootElement -public class RevisedApiResponse { +public class RevisedApiResponse { private ServiceRequest esp; @@ -134,7 +134,7 @@ public class RevisedApiResponse { } - public T withError( String code ) { + public RevisedApiResponse withError( String code ) { return withError( code, null, null ); } @@ -144,7 +144,7 @@ public class RevisedApiResponse { } - public T withError( Throwable e ) { + public RevisedApiResponse withError( Throwable e ) { return withError( null, null, e ); } @@ -154,7 +154,7 @@ public class RevisedApiResponse { } - public T withError( String description, Throwable e ) { + public RevisedApiResponse withError( String description, Throwable e ) { return withError( null, description, e ); } @@ -175,7 +175,7 @@ public class RevisedApiResponse { } - public T withError( String code, String description, Throwable e ) { + public RevisedApiResponse withError( String code, String description, Throwable e ) { setError( code, description, e ); return this; } @@ -257,7 +257,7 @@ public class RevisedApiResponse { } - public T withServiceRequest( ServiceRequest p ) { + public RevisedApiResponse withServiceRequest( ServiceRequest p ) { setServiceRequest( p ); return this; } @@ -274,7 +274,7 @@ public class RevisedApiResponse { } - public T withSuccess() { + public RevisedApiResponse withSuccess() { status = "ok"; return this; } @@ -291,7 +291,7 @@ public class RevisedApiResponse { } - public T withTimestamp( long timestamp ) { + public RevisedApiResponse withTimestamp( long timestamp ) { this.timestamp = timestamp; return this; } @@ -314,7 +314,7 @@ public class RevisedApiResponse { } - public T withAction( String action ) { + public RevisedApiResponse withAction( String action ) { this.action = action; return this; } @@ -373,7 +373,7 @@ public class RevisedApiResponse { } - public T withEntities( List entities ) { + public RevisedApiResponse withEntities( List entities ) { setEntities( entities ); return this; } @@ -393,13 +393,13 @@ public class RevisedApiResponse { } - public T withResults( ServiceResults results ) { + public RevisedApiResponse withResults( ServiceResults results ) { setResults( results ); return this; } - public T withResultsCount( ServiceResults results ) { + public RevisedApiResponse withResultsCount( ServiceResults results ) { setResults( results ); if ( results != null ) { count = results.size(); @@ -441,7 +441,7 @@ public class RevisedApiResponse { } - public T withEntity( Entity entity ) { + public RevisedApiResponse withEntity( Entity entity ) { entities = new ArrayList(); entities.add( entity ); return this; @@ -464,13 +464,13 @@ public class RevisedApiResponse { } - public T withList( List list ) { + public RevisedApiResponse withList( List list ) { setList( list ); return this; } - public T withListCount( List list ) { + public RevisedApiResponse withListCount( List list ) { setList( list ); if ( !list.isEmpty() ) { this.count = list.size(); @@ -495,7 +495,7 @@ public class RevisedApiResponse { } - public T withData( Object data ) { + public RevisedApiResponse withData( Object data ) { setData( data ); return this; } @@ -523,7 +523,7 @@ public class RevisedApiResponse { } - public T withApplications( Map applications ) { + public RevisedApiResponse withApplications( Map applications ) { this.applications = applications; return this; } @@ -540,7 +540,7 @@ public class RevisedApiResponse { } - public T withCredentials( ClientCredentialsInfo credentials ) { + public RevisedApiResponse withCredentials( ClientCredentialsInfo credentials ) { this.credentials = credentials; return this; }