You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2014/12/22 17:54:39 UTC
[33/50] incubator-usergrid git commit: add connection resource
add connection resource
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1c48771b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1c48771b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1c48771b
Branch: refs/heads/two-dot-o
Commit: 1c48771b604d90a23148ce3439af4d6e675a76b0
Parents: ba2cb21
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Dec 17 10:22:00 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Dec 17 10:22:00 2014 -0700
----------------------------------------------------------------------
.../collection/groups/GroupResourceIT.java | 2 +
.../test/resource2point0/AbstractRestIT.java | 2 +
.../endpoints/AbstractCollectionResource.java | 17 +++---
.../endpoints/AbstractEntityResource.java | 16 +++++-
.../endpoints/ApplicationsResource.java | 5 +-
.../endpoints/CollectionResource.java | 2 +-
.../endpoints/ConnectionResource.java | 60 ++++++++++++++++++++
.../endpoints/GroupsResource.java | 2 +-
.../endpoints/RolesResource.java | 2 +-
.../endpoints/UsersResource.java | 2 +-
10 files changed, 93 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1c48771b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
index f7edaea..eee2d06 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
@@ -19,6 +19,8 @@ package org.apache.usergrid.rest.applications.collection.groups;
import com.fasterxml.jackson.databind.JsonNode;
import java.io.IOException;
+import java.util.Date;
+
import com.sun.jersey.api.client.UniformInterfaceException;
import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1c48771b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
index 51e287b..59d51ba 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
@@ -103,10 +103,12 @@ public class AbstractRestIT extends JerseyTest {
return new com.sun.jersey.test.framework.spi.container.external.ExternalTestContainerFactory();
}
+ ///myorg/
protected OrganizationResource org(){
return clientSetup.restClient.org(clientSetup.getOrganization().getName());
}
+ //myorg/myapp
protected ApplicationsResource app(){
return clientSetup.restClient.org(clientSetup.getOrganization().getName()).app(clientSetup.getAppName());
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1c48771b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/AbstractCollectionResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/AbstractCollectionResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/AbstractCollectionResource.java
index fdb2435..cf0d151 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/AbstractCollectionResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/AbstractCollectionResource.java
@@ -29,19 +29,20 @@ import org.apache.usergrid.rest.test.resource2point0.state.ClientContext;
import javax.ws.rs.core.MediaType;
/**
- * Classy class class.
+ * //myorg/myapp/mycollection
*/
-public abstract class AbstractCollectionResource<T extends Entity,SubResource> extends NamedResource {
+public abstract class AbstractCollectionResource<T extends Entity,EntityResource> extends NamedResource {
public AbstractCollectionResource(String name, ClientContext context, UrlResource parent) {
super(name, context, parent);
}
- public SubResource getSubResource(final String identifier){
- return instantiateSubResource(identifier, context, this);
+
+ public EntityResource entityResource(final String identifier){
+ return instantiateEntityResource(identifier, context, this);
}
- public SubResource uniqueID(final String identifier){
- return instantiateSubResource(identifier, context, this);
+ public EntityResource uniqueID(final String identifier){
+ return instantiateEntityResource(identifier, context, this);
}
/**
@@ -49,7 +50,7 @@ public abstract class AbstractCollectionResource<T extends Entity,SubResource> e
* @return
*/
public ApiResponse get( final QueryParameters parameters){
- return get(parameters,true);
+ return get(parameters, true);
}
/**
@@ -87,6 +88,6 @@ public abstract class AbstractCollectionResource<T extends Entity,SubResource> e
protected abstract T instantiateT(ApiResponse response);
- protected abstract SubResource instantiateSubResource(String identifier, ClientContext context, UrlResource parent);
+ protected abstract EntityResource instantiateEntityResource(String identifier, ClientContext context, UrlResource parent);
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1c48771b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/AbstractEntityResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/AbstractEntityResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/AbstractEntityResource.java
index 1834e9f..1edf59e 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/AbstractEntityResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/AbstractEntityResource.java
@@ -21,6 +21,7 @@
package org.apache.usergrid.rest.test.resource2point0.endpoints;
import com.sun.jersey.api.client.WebResource;
+import org.apache.usergrid.rest.test.resource.Connection;
import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
import org.apache.usergrid.rest.test.resource2point0.model.Entity;
import org.apache.usergrid.rest.test.resource2point0.state.ClientContext;
@@ -28,7 +29,7 @@ import org.apache.usergrid.rest.test.resource2point0.state.ClientContext;
import javax.ws.rs.core.MediaType;
/**
- * Classy class class.
+ * //myorg/myapp/mycollection/myentityid
*/
public abstract class AbstractEntityResource<T extends Entity> extends NamedResource {
@@ -55,10 +56,19 @@ public abstract class AbstractEntityResource<T extends Entity> extends NamedReso
.put(ApiResponse.class, entity));
}
- public void delete(final T entity) {
+ public void delete() {
WebResource resource = getResource(true);
resource.type(MediaType.APPLICATION_JSON_TYPE).accept(MediaType.APPLICATION_JSON)
- .delete(ApiResponse.class, entity);
+ .delete(ApiResponse.class);
}
+
+ public ConnectionResource connectionByVerb(String verb, String collection, String entityId){
+ return new ConnectionResource(verb,collection,entityId,context,this);
+ }
+
+ public ConnectionResource connection(String collection, String entityId){
+ return new ConnectionResource(collection,entityId,context,this);
+ }
+
protected abstract T instantiateT(ApiResponse response);
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1c48771b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java
index 0507678..462a776 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java
@@ -32,7 +32,6 @@ import javax.ws.rs.core.MediaType;
*/
public class ApplicationsResource extends AbstractCollectionResource<Application,CollectionResource> {
-
public ApplicationsResource(final String name, final ClientContext context, final UrlResource parent) {
super( name, context, parent );
}
@@ -42,8 +41,10 @@ public class ApplicationsResource extends AbstractCollectionResource<Application
return new Application(response);
}
+ //myorg/myapp/collectionname
+
@Override
- protected CollectionResource instantiateSubResource(String identifier, ClientContext context, UrlResource parent) {
+ protected CollectionResource instantiateEntityResource(String identifier, ClientContext context, UrlResource parent) {
return new CollectionResource(identifier,context,parent);
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1c48771b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/CollectionResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/CollectionResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/CollectionResource.java
index 21bcd7e..ac67ee3 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/CollectionResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/CollectionResource.java
@@ -51,7 +51,7 @@ public class CollectionResource extends AbstractCollectionResource<Entity,Entit
}
@Override
- protected EntityResource instantiateSubResource(String identifier, ClientContext context, UrlResource parent) {
+ protected EntityResource instantiateEntityResource(String identifier, ClientContext context, UrlResource parent) {
return new EntityResource( identifier, context, this );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1c48771b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ConnectionResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ConnectionResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ConnectionResource.java
new file mode 100644
index 0000000..bc73e23
--- /dev/null
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ConnectionResource.java
@@ -0,0 +1,60 @@
+/*
+ *
+ * * Licensed to the Apache Software Foundation (ASF) under one or more
+ * * contributor license agreements. 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. For additional information regarding
+ * * copyright in this work, please see the NOTICE file in the top level
+ * * directory of this distribution.
+ *
+ */
+
+package org.apache.usergrid.rest.test.resource2point0.endpoints;
+
+import com.google.common.base.Optional;
+import com.sun.jersey.api.client.WebResource;
+import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
+import org.apache.usergrid.rest.test.resource2point0.model.Entity;
+import org.apache.usergrid.rest.test.resource2point0.state.ClientContext;
+
+import javax.ws.rs.core.MediaType;
+
+/**
+ * //myorg/myapp/mycollection/myentityid/verb/collection/entityId
+ */
+public class ConnectionResource extends NamedResource {
+
+ public ConnectionResource(String verb, String collection, String entityId,ClientContext context, UrlResource parent) {
+ super(verb+"/"+collection+"/"+entityId, context, parent);
+ }
+ public ConnectionResource( String collection, String entityId,ClientContext context, UrlResource parent) {
+ super(collection+"/"+entityId, context, parent);
+ }
+ //TODO: figure out how to do a get
+
+ public void post(final Optional<Entity> entity) {
+ WebResource resource = getResource(true);
+ resource.type(MediaType.APPLICATION_JSON_TYPE).accept(MediaType.APPLICATION_JSON)
+ .post(ApiResponse.class, entity);
+ }
+
+ public void put(final Optional<Entity> entity) {
+ WebResource resource = getResource(true);
+ resource.type(MediaType.APPLICATION_JSON_TYPE).accept(MediaType.APPLICATION_JSON)
+ .put(ApiResponse.class, entity);
+ }
+ public void delete() {
+ WebResource resource = getResource(true);
+ resource.type(MediaType.APPLICATION_JSON_TYPE).accept(MediaType.APPLICATION_JSON)
+ .delete(ApiResponse.class);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1c48771b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/GroupsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/GroupsResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/GroupsResource.java
index 7c8e849..d81b88f 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/GroupsResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/GroupsResource.java
@@ -37,7 +37,7 @@ public class GroupsResource extends AbstractCollectionResource<Group,GroupResour
}
@Override
- protected GroupResource instantiateSubResource(String name, ClientContext context, UrlResource parent) {
+ protected GroupResource instantiateEntityResource(String name, ClientContext context, UrlResource parent) {
return new GroupResource(name,context,parent);
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1c48771b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/RolesResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/RolesResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/RolesResource.java
index 5b678c9..97d312d 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/RolesResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/RolesResource.java
@@ -41,7 +41,7 @@ public class RolesResource extends AbstractCollectionResource<Role,RoleResource>
}
@Override
- protected RoleResource instantiateSubResource(String identifier, ClientContext context, UrlResource parent) {
+ protected RoleResource instantiateEntityResource(String identifier, ClientContext context, UrlResource parent) {
return new RoleResource(identifier,context,parent);
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1c48771b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/UsersResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/UsersResource.java
index 9e875e0..8befbf7 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/UsersResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/UsersResource.java
@@ -42,7 +42,7 @@ public class UsersResource extends AbstractCollectionResource<User,UserResource>
}
@Override
- protected UserResource instantiateSubResource(String name, ClientContext context, UrlResource parent) {
+ protected UserResource instantiateEntityResource(String name, ClientContext context, UrlResource parent) {
return new UserResource(name,context,parent);
}
}