You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/12/17 18:35:16 UTC
[1/2] incubator-usergrid git commit: changing base class
getappresource name; adding connections
Repository: incubator-usergrid
Updated Branches:
refs/heads/UG-rest-test-framework-overhaul 1c48771b6 -> 900195029
changing base class getappresource name; adding connections
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/95fd8e5b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/95fd8e5b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/95fd8e5b
Branch: refs/heads/UG-rest-test-framework-overhaul
Commit: 95fd8e5b77996ef3958cc21242291ad12c1ff6bb
Parents: 1c48771
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Dec 17 10:34:05 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Dec 17 10:34:05 2014 -0700
----------------------------------------------------------------------
.../collection/groups/GroupResourceIT.java | 4 ++
.../endpoints/AbstractEntityResource.java | 8 +--
.../endpoints/ConnectionResource.java | 30 +++--------
.../endpoints/ConnectionsResource.java | 54 ++++++++++++++++++++
4 files changed, 69 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/95fd8e5b/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 eee2d06..ebba1dc 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
@@ -127,6 +127,10 @@ public class GroupResourceIT extends AbstractRestIT {
assertNull(testGroup.get("errors"));
assertEquals(testGroup.get("path"), groupPath);
+ this.app().groups()
+ .entityResource("carlovers")
+ .connections("likes","cars")
+ .connection("ferraris").delete();
//now change the name
testGroup.put("path", newGroupPath);
Group group = this.app().groups().uniqueID(testGroup.getName()).put(testGroup);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/95fd8e5b/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 1edf59e..345173e 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
@@ -62,12 +62,12 @@ public abstract class AbstractEntityResource<T extends Entity> extends NamedReso
.delete(ApiResponse.class);
}
- public ConnectionResource connectionByVerb(String verb, String collection, String entityId){
- return new ConnectionResource(verb,collection,entityId,context,this);
+ public ConnectionsResource connections(String verb, String collection){
+ return new ConnectionsResource(verb,collection,context,this);
}
- public ConnectionResource connection(String collection, String entityId){
- return new ConnectionResource(collection,entityId,context,this);
+ public ConnectionsResource connections(String collection){
+ return new ConnectionsResource(collection,context,this);
}
protected abstract T instantiateT(ApiResponse response);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/95fd8e5b/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
index bc73e23..a647199 100644
--- 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
@@ -29,32 +29,16 @@ import org.apache.usergrid.rest.test.resource2point0.state.ClientContext;
import javax.ws.rs.core.MediaType;
/**
- * //myorg/myapp/mycollection/myentityid/verb/collection/entityId
+ * //myorg/myapp/mycollection/myentityid/verborcollection/collection/entityId
*/
-public class ConnectionResource extends NamedResource {
+public class ConnectionResource extends AbstractEntityResource<Entity> {
- 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 ConnectionResource(String entityId,ClientContext context, UrlResource parent) {
+ super(entityId, context, parent);
}
- 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);
+ @Override
+ protected Entity instantiateT(ApiResponse response) {
+ return new Entity(response);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/95fd8e5b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ConnectionsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ConnectionsResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ConnectionsResource.java
new file mode 100644
index 0000000..28368ff
--- /dev/null
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ConnectionsResource.java
@@ -0,0 +1,54 @@
+/*
+ *
+ * * 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 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;
+
+/**
+ * /myorg/myapp/collection/id/verborcollection/collection
+ */
+public class ConnectionsResource extends AbstractCollectionResource<Entity,ConnectionResource> {
+
+ public ConnectionsResource(String verb, String collection,ClientContext context, UrlResource parent) {
+ super(verb+"/"+collection, context, parent);
+ }
+ public ConnectionsResource( String collection,ClientContext context, UrlResource parent) {
+ super(collection, context, parent);
+ }
+
+ @Override
+ protected Entity instantiateT(ApiResponse response) {
+ return new Entity(response);
+ }
+
+ @Override
+ protected ConnectionResource instantiateEntityResource(String identifier, ClientContext context, UrlResource parent) {
+ return new ConnectionResource(identifier,context,parent);
+ }
+
+ public ConnectionResource connection(String entityId){
+ return new ConnectionResource(entityId,context,this);
+ }
+
+
+}
[2/2] incubator-usergrid git commit: comment out connections example
Posted by sf...@apache.org.
comment out connections example
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/90019502
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/90019502
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/90019502
Branch: refs/heads/UG-rest-test-framework-overhaul
Commit: 900195029c10f3d6b894f8fde051fb64d84976a9
Parents: 95fd8e5
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Dec 17 10:35:00 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Dec 17 10:35:00 2014 -0700
----------------------------------------------------------------------
.../applications/collection/groups/GroupResourceIT.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/90019502/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 ebba1dc..88195aa 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
@@ -126,11 +126,12 @@ public class GroupResourceIT extends AbstractRestIT {
Group testGroup = this.app().groups().post(new Group(groupName, groupPath));
assertNull(testGroup.get("errors"));
assertEquals(testGroup.get("path"), groupPath);
-
- this.app().groups()
- .entityResource("carlovers")
- .connections("likes","cars")
- .connection("ferraris").delete();
+ /** connections
+ * this.app().groups()
+ .entityResource("carlovers")
+ .connections("likes","cars")
+ .connection("ferraris").delete();
+ */
//now change the name
testGroup.put("path", newGroupPath);
Group group = this.app().groups().uniqueID(testGroup.getName()).put(testGroup);