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:54:30 UTC
incubator-usergrid git commit: 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 082039f26 -> 354c39750
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/354c3975
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/354c3975
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/354c3975
Branch: refs/heads/USERGRID-256-ApiResponseImplementation
Commit: 354c397506865748e3bca71ee3ba5c8c9f33416a
Parents: 082039f
Author: grey <gr...@apigee.com>
Authored: Thu Dec 4 10:54:26 2014 -0800
Committer: grey <gr...@apigee.com>
Committed: Thu Dec 4 10:54:26 2014 -0800
----------------------------------------------------------------------
.../collection/CollectionsResourceIT.java | 2 +-
.../rest/test/resource/ValueResource.java | 9 ++++-----
.../test/resource/app/ApiResponseCollection.java | 18 +++++++++++++++++-
.../rest/test/resource/app/Collection.java | 5 ++---
4 files changed, 24 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/354c3975/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
index b58a834..f50ef73 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
@@ -100,7 +100,7 @@ public class CollectionsResourceIT extends AbstractRestIT {
Entity entity = node.getResponse().getEntities().get( 0 );
- ApiResponseCollection collection = context.collection( "cities" ).getCollectionResponse();
+ ApiResponseCollection collection = context.collection( "cities" ).getResponse();
assertEquals( ( Object ) 0, collection.getResponse().getCount() );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/354c3975/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ValueResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ValueResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ValueResource.java
index 8a6b58d..d5f0053 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ValueResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ValueResource.java
@@ -106,7 +106,6 @@ public abstract class ValueResource extends NamedResource {
return mapper.readValue( jsonMedia( withParams( withToken( resource() ) ) ).post( String.class, entity ),
RevisedApiResponse.class );
- //jsonMedia( withParams( withToken( resource() ) ) ).post( RevisedApiResponse.class, entity );
}
@@ -140,9 +139,9 @@ public abstract class ValueResource extends NamedResource {
}
}
- public RevisedApiResponse getResponse() {
+ public RevisedApiResponse getInternalResponse() {
try {
- return getInternalResponse();
+ return getInternalApiResponse();
}
catch ( IOException e ) {
throw new RuntimeException("Cannot parse JSON data", e);
@@ -236,8 +235,8 @@ public abstract class ValueResource extends NamedResource {
//logger.debug(json);
return mapper.readTree( json );
}
-
- protected RevisedApiResponse getInternalResponse() throws IOException {
+//TODO: find better name / design paradigm for the methods that call upon this class
+ protected RevisedApiResponse getInternalApiResponse() throws IOException {
WebResource resource = withParams( withToken( resource() ) );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/354c3975/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/ApiResponseCollection.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/ApiResponseCollection.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/ApiResponseCollection.java
index b14f542..32a1da0 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/ApiResponseCollection.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/ApiResponseCollection.java
@@ -1,3 +1,19 @@
+/*
+ * 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.usergrid.rest.test.resource.app;
@@ -83,7 +99,7 @@ public class ApiResponseCollection implements Iterable, Iterator {
return;
}
- response = sourceEndpoint.withCursor( cursor ).getResponse();
+ response = sourceEndpoint.withCursor( cursor ).getInternalResponse();
this.entities = response.getEntities().iterator();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/354c3975/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/Collection.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/Collection.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/Collection.java
index 1d96741..7d3e526 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/Collection.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/Collection.java
@@ -78,7 +78,6 @@ public class Collection extends SetResource {
public JsonNode post(Map entityData) throws IOException{
JsonNode response = this.postInternal( entityData );
-//I think this is wrong
return getEntity( response, 0 );
}
@@ -97,9 +96,9 @@ public class Collection extends SetResource {
* @return
* @throws IOException
*/
- public <T> ApiResponseCollection getCollectionResponse() throws IOException {
+ public ApiResponseCollection getResponse() throws IOException {
CollectionResource collectionResource = new CollectionResource( this.getName(),this.getParent() );
- ApiResponseCollection collectionRevisedApiResponse = new ApiResponseCollection(collectionResource,this.getResponse() );
+ ApiResponseCollection collectionRevisedApiResponse = new ApiResponseCollection(collectionResource,this.getInternalResponse() );
return collectionRevisedApiResponse;
}