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 01:58:53 UTC
[2/2] incubator-usergrid git commit: Pushed changes detailed in last
commit and also fixed slight merge error.
Pushed changes detailed in last commit and also fixed slight merge error.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d1e06f7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d1e06f7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d1e06f7f
Branch: refs/heads/USERGRID-256-ApiResponseImplementation
Commit: d1e06f7f77a3e538f7dfb678de3bb823a1a552fa
Parents: 0a8c041
Author: grey <gr...@apigee.com>
Authored: Wed Dec 3 16:58:49 2014 -0800
Committer: grey <gr...@apigee.com>
Committed: Wed Dec 3 16:58:49 2014 -0800
----------------------------------------------------------------------
.../collection/CollectionsResourceIT.java | 9 +++------
.../collection/users/UserResourceIT.java | 4 +---
.../rest/test/resource/RevisedApiResponse.java | 17 +++++++++--------
.../rest/test/resource/ValueResource.java | 12 ++----------
.../test/resource/app/ApiResponseCollection.java | 19 +++++++++----------
.../rest/test/resource/app/Collection.java | 14 ++++++--------
.../rest/test/resource/app/GroupsCollection.java | 12 ++++++------
.../rest/test/resource/app/model/Entity.java | 14 +++-----------
8 files changed, 39 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d1e06f7f/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 7c035bf..b58a834 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
@@ -31,11 +31,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.usergrid.cassandra.Concurrent;
import org.apache.usergrid.rest.AbstractRestIT;
-import org.apache.usergrid.rest.ApiResponse;
-import org.apache.usergrid.rest.RevisedApiResponse;
import org.apache.usergrid.rest.TestContextSetup;
import org.apache.usergrid.rest.test.resource.app.ApiResponseCollection;
-import org.apache.usergrid.rest.test.resource.app.Collection;
import org.apache.usergrid.rest.test.resource.app.User;
import org.apache.usergrid.utils.UUIDUtils;
import org.apache.usergrid.rest.test.resource.app.model.Entity;
@@ -97,13 +94,13 @@ public class CollectionsResourceIT extends AbstractRestIT {
Map<String, String> payload = hashMap( "name", "Austin" ).map( "state", "TX" );
- ApiResponseCollection<Entity> node = context.collection( "cities" ).postResponse( payload );
+ ApiResponseCollection node = context.collection( "cities" ).postResponse( payload );
//TODO: code = node.getHTTPResponseCode();
// assertFalse( node.hasNext() );
Entity entity = node.getResponse().getEntities().get( 0 );
- ApiResponseCollection<Entity> collection = context.collection( "cities" ).getCollectionResponse();
+ ApiResponseCollection collection = context.collection( "cities" ).getCollectionResponse();
assertEquals( ( Object ) 0, collection.getResponse().getCount() );
}
@@ -169,7 +166,7 @@ public class CollectionsResourceIT extends AbstractRestIT {
// .queryParam( "access_token", access_token ).accept( MediaType.APPLICATION_JSON )
// .type( MediaType.APPLICATION_JSON_TYPE ).post( String.class, payload ));
//this need to be decoupled so that it only requires client side models ( in this case we need an entity class.
- ApiResponseCollection<User> arc = context.<User>collection( collectionName ).postResponse( payload );
+ ApiResponseCollection arc = context.collection( collectionName ).postResponse( payload );
//TODO:broken, plz fix
// org.apache.usergrid.persistence.Entity entity = arc.next().toTypedEntity();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d1e06f7f/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
index f6c246e..f5ec434 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
@@ -43,11 +43,9 @@ import org.apache.usergrid.cassandra.Concurrent;
import org.apache.usergrid.management.ApplicationInfo;
import org.apache.usergrid.management.OrganizationInfo;
import org.apache.usergrid.rest.AbstractRestIT;
-import org.apache.usergrid.rest.RevisedApiResponse;
+import org.apache.usergrid.rest.test.resource.RevisedApiResponse;
import org.apache.usergrid.rest.TestContextSetup;
import org.apache.usergrid.rest.applications.utils.UserRepo;
-import org.apache.usergrid.rest.test.security.TestAppUser;
-import org.apache.usergrid.rest.test.security.TestUser;
import org.apache.usergrid.utils.UUIDUtils;
import com.sun.jersey.api.client.ClientResponse.Status;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d1e06f7f/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/RevisedApiResponse.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/RevisedApiResponse.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/RevisedApiResponse.java
index b64a9d0..96dacee 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/RevisedApiResponse.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/RevisedApiResponse.java
@@ -45,6 +45,7 @@ import org.apache.commons.lang.ClassUtils;
import org.apache.commons.lang.StringUtils;
import static org.apache.usergrid.utils.InflectionUtils.pluralize;
+import org.apache.usergrid.rest.test.resource.app.model.Entity;
//TODO: Move this into the testing framework
@@ -70,7 +71,7 @@ public class RevisedApiResponse {
private String organization;
private String applicationName;
private UUID application;
- private List<org.apache.usergrid.persistence.Entity> entities;
+ private List<Entity> entities;
private UUID next;
private String cursor;
private Integer count;
@@ -358,22 +359,22 @@ public class RevisedApiResponse {
@JsonSerialize( include = Inclusion.NON_NULL )
@XmlAnyElement
- public List<T> getEntities() {
+ public List<Entity> getEntities() {
return entities;
}
- public void setEntities( List<T> entities ) {
+ public void setEntities( List<Entity> entities ) {
if ( entities != null ) {
this.entities = entities;
}
else {
- this.entities = new ArrayList<T>();
+ this.entities = new ArrayList<Entity>();
}
}
- public RevisedApiResponse withEntities( List<T> entities ) {
+ public RevisedApiResponse withEntities( List<Entity> entities ) {
setEntities( entities );
return this;
}
@@ -388,7 +389,7 @@ public class RevisedApiResponse {
counters = results.getCounters();
}
else {
- entities = new ArrayList<T>();
+ entities = new ArrayList<Entity>();
}
}
@@ -441,8 +442,8 @@ public class RevisedApiResponse {
}
- public RevisedApiResponse withEntity( T entity ) {
- entities = new ArrayList<T>();
+ public RevisedApiResponse withEntity( Entity entity ) {
+ entities = new ArrayList<Entity>();
entities.add( entity );
return this;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d1e06f7f/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 ce5b33e..8a6b58d 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
@@ -22,12 +22,9 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
-import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.sun.jersey.api.client.GenericType;
import com.sun.jersey.api.client.WebResource;
import java.io.IOException;
@@ -35,11 +32,6 @@ import static org.junit.Assert.assertEquals;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.usergrid.persistence.Entity;
-import org.apache.usergrid.rest.ApiResponse;
-import org.apache.usergrid.rest.RevisedApiResponse;
-
-
/** @author tnine */
public abstract class ValueResource extends NamedResource {
@@ -110,10 +102,10 @@ public abstract class ValueResource extends NamedResource {
}
//TODO: eventually we need to merge this and make it the offical postInternal. this was not done to keep tests compiling.
- protected <T> RevisedApiResponse<T> postInternalResponse( Map<String, ?> entity ) throws IOException {
+ protected RevisedApiResponse postInternalResponse( Map<String, ?> entity ) throws IOException {
return mapper.readValue( jsonMedia( withParams( withToken( resource() ) ) ).post( String.class, entity ),
- new TypeReference<RevisedApiResponse<T>>() {} );
+ RevisedApiResponse.class );
//jsonMedia( withParams( withToken( resource() ) ) ).post( RevisedApiResponse.class, entity );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d1e06f7f/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 bec4224..b14f542 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
@@ -2,11 +2,10 @@ package org.apache.usergrid.rest.test.resource.app;
import java.util.Iterator;
-import java.util.List;
-import org.apache.usergrid.rest.ApiResponse;
-import org.apache.usergrid.rest.RevisedApiResponse;
+import org.apache.usergrid.rest.test.resource.RevisedApiResponse;
import org.apache.usergrid.rest.test.resource.CollectionResource;
+import org.apache.usergrid.rest.test.resource.app.model.Entity;
/**
@@ -29,13 +28,13 @@ import org.apache.usergrid.rest.test.resource.CollectionResource;
* 2. GET /users/fred/groups
*
*/
-public class ApiResponseCollection<T> implements Iterable<T>, Iterator<T> {
+public class ApiResponseCollection implements Iterable, Iterator {
private final CollectionResource sourceEndpoint;
- private RevisedApiResponse<T> response;
+ private RevisedApiResponse response;
- public Iterator<T> entities;
+ public Iterator entities;
public ApiResponseCollection(final CollectionResource sourceCollection, final RevisedApiResponse response){
@@ -44,12 +43,12 @@ public class ApiResponseCollection<T> implements Iterable<T>, Iterator<T> {
this.entities = response.getEntities().iterator();
}
- public RevisedApiResponse<T> getResponse(){
+ public RevisedApiResponse getResponse(){
return response;
}
@Override
- public Iterator<T> iterator() {
+ public Iterator iterator() {
return this;
}
@@ -65,8 +64,8 @@ public class ApiResponseCollection<T> implements Iterable<T>, Iterator<T> {
@Override
- public T next() {
- return entities.next();
+ public Entity next() {
+ return (Entity)entities.next();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d1e06f7f/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 2be60a1..1d96741 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
@@ -20,9 +20,7 @@ package org.apache.usergrid.rest.test.resource.app;
import java.io.IOException;
import java.util.Map;
-import org.apache.usergrid.persistence.Entity;
-import org.apache.usergrid.rest.ApiResponse;
-import org.apache.usergrid.rest.RevisedApiResponse;
+import org.apache.usergrid.rest.test.resource.RevisedApiResponse;
import org.apache.usergrid.rest.test.resource.CollectionResource;
import org.apache.usergrid.rest.test.resource.NamedResource;
import org.apache.usergrid.rest.test.resource.SetResource;
@@ -84,11 +82,11 @@ public class Collection extends SetResource {
return getEntity( response, 0 );
}
- public <T> ApiResponseCollection<T> postResponse(Map entityData) throws IOException{
+ public ApiResponseCollection postResponse(Map entityData) throws IOException{
CollectionResource collectionResource = new CollectionResource( this.getName(),this.getParent() );
- RevisedApiResponse<T> response = this.<T>postInternalResponse( entityData );
- ApiResponseCollection<T> collectionRevisedApiResponse = new ApiResponseCollection<T>(collectionResource,response );
+ RevisedApiResponse response = this.postInternalResponse( entityData );
+ ApiResponseCollection collectionRevisedApiResponse = new ApiResponseCollection(collectionResource,response );
return collectionRevisedApiResponse;
}
@@ -99,9 +97,9 @@ public class Collection extends SetResource {
* @return
* @throws IOException
*/
- public <T> ApiResponseCollection<T> getCollectionResponse() throws IOException {
+ public <T> ApiResponseCollection getCollectionResponse() throws IOException {
CollectionResource collectionResource = new CollectionResource( this.getName(),this.getParent() );
- ApiResponseCollection<T> collectionRevisedApiResponse = new ApiResponseCollection<T>(collectionResource,this.getResponse() );
+ ApiResponseCollection collectionRevisedApiResponse = new ApiResponseCollection(collectionResource,this.getResponse() );
return collectionRevisedApiResponse;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d1e06f7f/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/GroupsCollection.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/GroupsCollection.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/GroupsCollection.java
index 9601c3f..8240406 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/GroupsCollection.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/GroupsCollection.java
@@ -58,12 +58,12 @@ public class GroupsCollection extends CollectionResource {
}
//example of what a call could look like
- public ApiResponseCollection<Group> getResource() throws IOException {
- //create new ApiResponseCollection from ApiResponse then return to user for further processing.
- CollectionResource collectionResource = new CollectionResource( this.getName(),this.getParent() );
- ApiResponseCollection<Group> collectionRevisedApiResponse = new ApiResponseCollection<>(collectionResource,this.getResponse() );
- return collectionRevisedApiResponse;
- }
+// public ApiResponseCollection<Group> getResource() throws IOException {
+// //create new ApiResponseCollection from ApiResponse then return to user for further processing.
+// CollectionResource collectionResource = new CollectionResource( this.getName(),this.getParent() );
+// ApiResponseCollection<Group> collectionRevisedApiResponse = new ApiResponseCollection(collectionResource,this.getResponse() );
+// return collectionRevisedApiResponse;
+// }
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d1e06f7f/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/model/Entity.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/model/Entity.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/model/Entity.java
index da83dcf..2966e85 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/model/Entity.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/app/model/Entity.java
@@ -1,12 +1,4 @@
-<<<<<<< Updated upstream
-package org.apache.usergrid.rest.test.resource.app.model;
-
-/**
- * Created by ApigeeCorporation on 12/2/14.
- */
-public class Entity {}
-=======
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -22,8 +14,8 @@ public class Entity {}
* 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.model;
+ */package org.apache.usergrid.rest.test.resource.app.model;
+
@@ -366,4 +358,4 @@ public class Entity implements Serializable {
// return true;
// }
}
->>>>>>> Stashed changes
+