You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/10/17 21:12:42 UTC
[1/8] git commit: Remove unnecessary recursion from CpWalker and
un-ignore the re-index test.
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o 2cdcf6240 -> 68bd94fd0
Remove unnecessary recursion from CpWalker and un-ignore the re-index test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1d26caa5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1d26caa5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1d26caa5
Branch: refs/heads/two-dot-o
Commit: 1d26caa52dda711cfe2b113ac489c2546492a16b
Parents: c88282b
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Oct 13 16:50:33 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Oct 13 16:50:33 2014 -0400
----------------------------------------------------------------------
.../usergrid/corepersistence/CpWalker.java | 18 -----------------
.../PerformanceEntityRebuildIndexTest.java | 21 ++++++++++----------
2 files changed, 11 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d26caa5/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
index b507edd..049f43f 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
@@ -90,11 +90,6 @@ public class CpWalker {
applicationScope.getApplication().getUuid()
});
-
- Observable<String> edgeTypes = gm.getEdgeTypesFromSource( new SimpleSearchEdgeType(fromEntityId, CpNamingUtils.EDGE_COLL_SUFFIX, null ));
-
-
-
Observable<Edge> edges = gm.loadEdgesFromSource( new SimpleSearchByEdgeType(
fromEntityId, edgeType, Long.MAX_VALUE,
SearchByEdgeType.Order.DESCENDING, null ));
@@ -133,13 +128,6 @@ public class CpWalker {
visitor.visitCollectionEntry(
em, collName, sourceEntity, targetEntity );
- // recursion
- if ( !stack.contains( targetEntity.getUuid() )) {
- stack.push( targetEntity.getUuid() );
- doWalkCollections( em, edge.getSourceNode(), visitor, stack );
- stack.pop();
- }
-
} else {
String collName = CpNamingUtils.getConnectionType(edgeType);
@@ -147,12 +135,6 @@ public class CpWalker {
visitor.visitConnectionEntry(
em, collName, sourceEntity, targetEntity );
- // recursion
- if ( !stack.contains( targetEntity.getUuid() )) {
- stack.push( targetEntity.getUuid() );
- doWalkCollections( em, edge.getTargetNode(), visitor, stack );
- stack.pop();
- }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d26caa5/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
index 8de520a..a759f48 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
@@ -60,17 +60,15 @@ import static org.junit.Assert.fail;
//@RunWith(JukitoRunner.class)
//@UseModules({ GuiceModule.class })
@Concurrent()
-@Ignore("Temporary ignore")
public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
private static final Logger logger = LoggerFactory.getLogger(PerformanceEntityRebuildIndexTest.class );
private static final MetricRegistry registry = new MetricRegistry();
private Slf4jReporter reporter;
- private static final long RUNTIME = TimeUnit.MINUTES.toMillis( 1 );
+ private static final long RuntimeMs = 10000;
- private static final long writeDelayMs = 100;
- //private static final long readDelayMs = 7;
+ private static final long writeDelayMs = 10;
@Rule
public Application app = new CoreApplication( setup );
@@ -106,8 +104,6 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
// ----------------- create a bunch of entities
- final long stopTime = System.currentTimeMillis() + RUNTIME;
-
Map<String, Object> entityMap = new HashMap<String, Object>() {{
put("key1", 1000 );
put("key2", 2000 );
@@ -130,6 +126,8 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
Entity cat2 = em.create("cat", cat2map );
Entity cat3 = em.create("cat", cat3map );
+ final long stopTime = System.currentTimeMillis() + RuntimeMs;
+
List<EntityRef> entityRefs = new ArrayList<EntityRef>();
int entityCount = 0;
while ( System.currentTimeMillis() < stopTime ) {
@@ -151,7 +149,7 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
}
entityRefs.add(new SimpleEntityRef( entity.getType(), entity.getUuid() ) );
- if ( entityCount % 100 == 0 ) {
+ if ( entityCount % 10 == 0 ) {
logger.info("Created {} entities", entityCount );
}
@@ -191,12 +189,15 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
EntityManagerFactory.ProgressObserver po = new EntityManagerFactory.ProgressObserver() {
int counter = 0;
+
@Override
public void onProgress( EntityRef s, EntityRef t, String etype ) {
meter.mark();
- logger.debug("Indexing from {}:{} to {}:{} edgeType {}", new Object[] {
- s.getType(), s.getUuid(), t.getType(), t.getUuid(), etype });
- if ( !logger.isDebugEnabled() && counter % 100 == 0 ) {
+
+// logger.debug("Indexing from {}:{} to {}:{} edgeType {}", new Object[] {
+// s.getType(), s.getUuid(), t.getType(), t.getUuid(), etype });
+
+ if ( !logger.isDebugEnabled() && counter % 10 == 0 ) {
logger.info("Reindexed {} entities", counter );
}
counter++;
[6/8] git commit: Fix some issues found during testing.
Posted by sn...@apache.org.
Fix some issues found during testing.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/bdcf8050
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bdcf8050
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bdcf8050
Branch: refs/heads/two-dot-o
Commit: bdcf80509e662442ccad312e19b878812f467eac
Parents: 7c06f6b
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Oct 17 15:01:54 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Oct 17 15:01:54 2014 -0400
----------------------------------------------------------------------
stack/core/pom.xml | 21 ---------------------
stack/pom.xml | 4 ++--
stack/rest/src/main/webapp/WEB-INF/web.xml | 2 +-
3 files changed, 3 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bdcf8050/stack/core/pom.xml
----------------------------------------------------------------------
diff --git a/stack/core/pom.xml b/stack/core/pom.xml
index 30a14d1..7bd4da4 100644
--- a/stack/core/pom.xml
+++ b/stack/core/pom.xml
@@ -540,14 +540,6 @@
<type>jar</type>
</dependency>
-
- <!--<dependency>-->
- <!--<artifactId>lucene-core</artifactId>-->
- <!--<groupId>org.apache.lucene</groupId>-->
- <!--<type>jar</type>-->
- <!--<version>4.7.2</version>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.jukito</groupId>
<artifactId>jukito</artifactId>
@@ -555,19 +547,6 @@
<scope>test</scope>
</dependency>
-<!-- <dependency>
- <groupId>org.apache.usergrid.chop</groupId>
- <artifactId>chop-api</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.usergrid.chop</groupId>
- <artifactId>chop-stack</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
- -->
-
<dependency>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bdcf8050/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 9231a2f..94135e8 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -115,7 +115,7 @@
<tomcat-version>7.0.52</tomcat-version>
<antlr.version>3.4</antlr.version>
<tika.version>1.4</tika.version>
- <elasticsearch.version>1.2.4</elasticsearch.version>
+ <elasticsearch.version>1.3.2</elasticsearch.version>
<usergrid.it.forkCount>3</usergrid.it.forkCount>
<usergrid.it.reuseForks>false</usergrid.it.reuseForks>
@@ -208,7 +208,7 @@
https://issues.apache.org/jira/browse/USERGRID-224
<module>launcher</module>
-->
- <!-- <module>mongo-emulator</module> -->
+ <module>mongo-emulator</module>
<!--
Re-enable when query-validator updated to work with Core Persistence.
https://issues.apache.org/jira/browse/USERGRID-221
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bdcf8050/stack/rest/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/webapp/WEB-INF/web.xml b/stack/rest/src/main/webapp/WEB-INF/web.xml
index 92753de..24a82ca 100644
--- a/stack/rest/src/main/webapp/WEB-INF/web.xml
+++ b/stack/rest/src/main/webapp/WEB-INF/web.xml
@@ -59,7 +59,7 @@
<filter-name>contentTypeFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
- `
+
<filter>
<filter-name>shiroFilter</filter-name>
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
[7/8] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Conflicts:
stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6f040c74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6f040c74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6f040c74
Branch: refs/heads/two-dot-o
Commit: 6f040c746c96b401743a15ea95a0805eac38ac6e
Parents: bdcf805 2cdcf62
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Oct 17 15:11:41 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Oct 17 15:11:41 2014 -0400
----------------------------------------------------------------------
stack/awscluster/pom.xml | 2 +-
stack/awscluster/src/main/cql/create_locks.cql | 24 +-
.../awscluster/src/main/cql/create_usergrid.cql | 80 +-
.../main/cql/create_usergrid_applications.cql | 411 +----
.../main/dist/init_instance/create_keyspaces.sh | 28 +-
.../src/main/dist/init_instance/init_cass.sh | 70 -
.../main/dist/init_instance/init_db_server.sh | 11 +-
.../main/dist/init_instance/init_es_server.sh | 67 +
.../dist/init_instance/init_graphite_server.sh | 6 +
.../main/dist/init_instance/init_rest_server.sh | 10 +
.../dist/init_instance/install_cassandra.sh | 2 +-
.../dist/init_instance/install_elasticsearch.sh | 19 +-
.../init_instance/install_opscenter_agent.sh | 1 +
.../main/dist/init_instance/install_yourkit.sh | 6 +-
.../main/groovy/configure_elasticsearch.groovy | 23 +-
.../src/main/groovy/configure_usergrid.groovy | 9 +-
.../src/main/groovy/tag_instance.groovy | 10 +-
stack/awscluster/ugcluster-cf.json | 317 +++-
.../corepersistence/CpEntityManager.java | 107 +-
.../corepersistence/CpEntityManagerFactory.java | 40 +-
.../corepersistence/CpRelationManager.java | 1427 ++++++++----------
.../usergrid/corepersistence/CpVisitor.java | 11 +-
.../usergrid/corepersistence/CpWalker.java | 145 +-
.../usergrid/persistence/EntityManager.java | 2 +-
.../persistence/EntityManagerFactory.java | 8 +-
.../org/apache/usergrid/CoreApplication.java | 1 -
.../PerformanceEntityRebuildIndexTest.java | 26 +-
stack/corepersistence/common/pom.xml | 13 +-
stack/corepersistence/pom.xml | 1 +
.../index/impl/EsEntityIndexImpl.java | 146 +-
.../persistence/index/impl/EsProvider.java | 21 +-
stack/corepersistence/queue/pom.xml | 8 +-
stack/pom.xml | 25 +-
.../apache/usergrid/rest/SystemResource.java | 50 +-
.../services/devices/DevicesService.java | 28 +-
.../services/users/devices/DevicesService.java | 8 +-
.../AbstractServiceNotificationIT.java | 4 -
.../apns/NotificationsServiceIT.java | 5 +-
38 files changed, 1525 insertions(+), 1647 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6f040c74/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6f040c74/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
----------------------------------------------------------------------
diff --cc stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
index a759f48,ed3fd61..619fb89
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
@@@ -66,9 -66,10 +66,9 @@@ public class PerformanceEntityRebuildIn
private static final MetricRegistry registry = new MetricRegistry();
private Slf4jReporter reporter;
- private static final long RuntimeMs = 10000;
+ private static final long RUNTIME = TimeUnit.SECONDS.toMillis( 5 );
- private static final long writeDelayMs = 100;
- //private static final long readDelayMs = 7;
+ private static final long writeDelayMs = 10;
@Rule
public Application app = new CoreApplication( setup );
@@@ -189,15 -190,12 +189,13 @@@
EntityManagerFactory.ProgressObserver po = new EntityManagerFactory.ProgressObserver() {
int counter = 0;
+
@Override
- public void onProgress( EntityRef s, EntityRef t, String etype ) {
- meter.mark();
-
- // logger.debug("Indexing from {}:{} to {}:{} edgeType {}", new Object[] {
- // s.getType(), s.getUuid(), t.getType(), t.getUuid(), etype });
+ public void onProgress( final EntityRef entity ) {
- if ( !logger.isDebugEnabled() && counter % 10 == 0 ) {
+ meter.mark();
+ logger.debug("Indexing {}:{}", entity.getType(), entity.getUuid());
+ if ( !logger.isDebugEnabled() && counter % 100 == 0 ) {
logger.info("Reindexed {} entities", counter );
}
counter++;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6f040c74/stack/pom.xml
----------------------------------------------------------------------
[3/8] git commit: Bug in logging.
Posted by sn...@apache.org.
Bug in logging.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c6e0cd0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c6e0cd0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c6e0cd0d
Branch: refs/heads/two-dot-o
Commit: c6e0cd0dc7efd8e6356b301f600f664c0e5f5b21
Parents: e946fe9
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Oct 14 10:27:12 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Oct 14 10:27:12 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/usergrid/corepersistence/CpWalker.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c6e0cd0d/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
index 309af04..b354ad9 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
@@ -107,7 +107,7 @@ public class CpWalker {
sourceEntity.getUuid();
} catch (Exception ex) {
- logger.error( "Error getting sourceEntity {}:{}, continuing",
+ logger.error( "Error getting sourceEntity {}:{}, skipping this edge",
sourceEntityRef.getType(), sourceEntityRef.getUuid());
logger.error( "Exception", ex);
return;
@@ -121,8 +121,8 @@ public class CpWalker {
targetEntity.getUuid();
} catch (Exception ex) {
- logger.error( "Error getting sourceEntity {}:{}, continuing",
- sourceEntityRef.getType(), sourceEntityRef.getUuid());
+ logger.error( "Error getting targetEntity {}:{}, skipping this edge",
+ targetEntityRef.getType(), targetEntityRef.getUuid());
logger.error( "Exception", ex);
return;
}
[2/8] git commit: Force exception at fetch time if entity not found
and ensure exception is correctly logged as error.
Posted by sn...@apache.org.
Force exception at fetch time if entity not found and ensure exception is correctly logged as 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/e946fe9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e946fe9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e946fe9c
Branch: refs/heads/two-dot-o
Commit: e946fe9cd0d1c112f81a3e09fbd4c57ccbeabae9
Parents: 1d26caa
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Oct 14 09:20:25 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Oct 14 09:20:25 2014 -0400
----------------------------------------------------------------------
.../org/apache/usergrid/corepersistence/CpEntityManager.java | 2 +-
.../java/org/apache/usergrid/corepersistence/CpWalker.java | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e946fe9c/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index 8753670..f7cebf5 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@ -463,7 +463,7 @@ public class CpEntityManager implements EntityManager {
CollectionScope collectionScope = new CollectionScopeImpl(
getApplicationScope().getApplication(),
getApplicationScope().getApplication(),
- CpNamingUtils.getCollectionScopeNameFromEntityType( entity.getType() ) );
+ CpNamingUtils.getCollectionScopeNameFromEntityType( entity.getType() ) );
EntityCollectionManager ecm = managerCache.getEntityCollectionManager( collectionScope );
Id entityId = new SimpleId( entity.getUuid(), entity.getType() );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e946fe9c/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
index 049f43f..309af04 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
@@ -104,9 +104,12 @@ public class CpWalker {
Entity sourceEntity;
try {
sourceEntity = em.get( sourceEntityRef );
+ sourceEntity.getUuid();
+
} catch (Exception ex) {
logger.error( "Error getting sourceEntity {}:{}, continuing",
sourceEntityRef.getType(), sourceEntityRef.getUuid());
+ logger.error( "Exception", ex);
return;
}
@@ -115,9 +118,12 @@ public class CpWalker {
Entity targetEntity;
try {
targetEntity = em.get( targetEntityRef );
+ targetEntity.getUuid();
+
} catch (Exception ex) {
logger.error( "Error getting sourceEntity {}:{}, continuing",
- sourceEntityRef.getType(), sourceEntityRef.getUuid());
+ sourceEntityRef.getType(), sourceEntityRef.getUuid());
+ logger.error( "Exception", ex);
return;
}
[8/8] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Conflicts:
stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/68bd94fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/68bd94fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/68bd94fd
Branch: refs/heads/two-dot-o
Commit: 68bd94fd0d2672054fc28734837e0b80849259c9
Parents: 6f040c7
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Oct 17 15:12:07 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Oct 17 15:12:07 2014 -0400
----------------------------------------------------------------------
.../org/apache/usergrid/corepersistence/CpWalker.java | 4 ----
.../persistence/PerformanceEntityRebuildIndexTest.java | 11 ++++-------
2 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/68bd94fd/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
index ecf7787..27d4224 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
@@ -15,9 +15,6 @@
*/
package org.apache.usergrid.corepersistence;
-
-import java.util.Stack;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,7 +35,6 @@ import rx.Observable;
import rx.functions.Action1;
import rx.functions.Func1;
-import static org.apache.usergrid.persistence.Schema.TYPE_APPLICATION;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/68bd94fd/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
index 619fb89..837dd9d 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
@@ -21,7 +21,6 @@ import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
@@ -47,9 +46,7 @@ import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl;
import org.apache.usergrid.persistence.index.EntityIndex;
import org.apache.usergrid.persistence.index.EntityIndexFactory;
-import org.apache.usergrid.persistence.index.IndexScope;
import org.apache.usergrid.persistence.index.impl.EsEntityIndexImpl;
-import org.apache.usergrid.persistence.index.impl.IndexScopeImpl;
import org.apache.usergrid.persistence.index.query.Query;
import org.apache.usergrid.persistence.model.entity.Id;
import org.apache.usergrid.persistence.model.entity.SimpleId;
@@ -66,9 +63,9 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
private static final MetricRegistry registry = new MetricRegistry();
private Slf4jReporter reporter;
- private static final long RUNTIME = TimeUnit.SECONDS.toMillis( 5 );
+ private static final long RUNTIME_MS = TimeUnit.SECONDS.toMillis( 5 );
- private static final long writeDelayMs = 10;
+ private static final long WRITE_DELAY_MS = 10;
@Rule
public Application app = new CoreApplication( setup );
@@ -126,7 +123,7 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
Entity cat2 = em.create("cat", cat2map );
Entity cat3 = em.create("cat", cat3map );
- final long stopTime = System.currentTimeMillis() + RuntimeMs;
+ final long stopTime = System.currentTimeMillis() + RUNTIME_MS;
List<EntityRef> entityRefs = new ArrayList<EntityRef>();
int entityCount = 0;
@@ -154,7 +151,7 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
}
entityCount++;
- try { Thread.sleep( writeDelayMs ); } catch (InterruptedException ignored ) {}
+ try { Thread.sleep( WRITE_DELAY_MS ); } catch (InterruptedException ignored ) {}
}
logger.info("Created {} entities", entityCount);
[5/8] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7c06f6bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7c06f6bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7c06f6bb
Branch: refs/heads/two-dot-o
Commit: 7c06f6bbba61fb5df7647a7dcbe77efa000a7d16
Parents: 2c5e6f5 dbdba30
Author: Dave Johnson <dm...@apigee.com>
Authored: Thu Oct 16 07:51:31 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Thu Oct 16 07:51:31 2014 -0400
----------------------------------------------------------------------
.../corepersistence/CpRelationManager.java | 10 +-
.../usergrid/corepersistence/CpSetup.java | 3 +
.../queue/impl/SQSQueueManagerImpl.java | 2 +-
.../services/devices/DevicesService.java | 49 +++++-
.../notifications/ApplicationQueueManager.java | 5 +-
.../notifications/NotificationsService.java | 7 +-
.../services/notifications/QueueListener.java | 2 +-
.../services/users/devices/DevicesService.java | 33 ++++
.../AbstractServiceNotificationIT.java | 6 +-
.../apns/NotificationsServiceIT.java | 173 ++++++++++---------
.../gcm/NotificationsServiceIT.java | 164 ++----------------
11 files changed, 202 insertions(+), 252 deletions(-)
----------------------------------------------------------------------
[4/8] git commit: Formatting only.
Posted by sn...@apache.org.
Formatting only.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2c5e6f59
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2c5e6f59
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2c5e6f59
Branch: refs/heads/two-dot-o
Commit: 2c5e6f590e39534e810d28f0440df7c656faabb2
Parents: c6e0cd0
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Oct 14 10:41:21 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Oct 14 10:41:21 2014 -0400
----------------------------------------------------------------------
.../usergrid/rest/management/AccessTokenIT.java | 381 ++++++++++---------
1 file changed, 207 insertions(+), 174 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2c5e6f59/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
index bad46a7..65900c4 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
@@ -14,34 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.usergrid.rest.management;
-
+import com.fasterxml.jackson.databind.JsonNode;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.representation.Form;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-
import javax.ws.rs.core.MediaType;
-
-import org.junit.Test;
-
import org.apache.usergrid.rest.AbstractRestIT;
import org.apache.usergrid.rest.management.organizations.OrganizationsResource;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.representation.Form;
-
import static org.apache.usergrid.utils.MapUtils.hashMap;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-
-
-/**
- * Created by ApigeeCorporation on 9/17/14.
- */
+import org.junit.Test;
/**
@@ -49,7 +37,7 @@ import static org.junit.Assert.assertNotNull;
*/
public class AccessTokenIT extends AbstractRestIT {
- public AccessTokenIT() throws Exception{
+ public AccessTokenIT() throws Exception {
}
@@ -58,293 +46,338 @@ public class AccessTokenIT extends AbstractRestIT {
long ttl = 2000;
- JsonNode node = mapper.readTree( resource().path( "/management/token" ).queryParam( "grant_type", "password" )
- .queryParam( "username", "test@usergrid.com" ).queryParam( "password", "test" )
- .queryParam( "ttl", String.valueOf( ttl ) ).accept( MediaType.APPLICATION_JSON )
- .get( String.class ));
+ JsonNode node = mapper.readTree(resource()
+ .path("/management/token")
+ .queryParam("grant_type", "password")
+ .queryParam("username", "test@usergrid.com")
+ .queryParam("password", "test")
+ .queryParam("ttl", String.valueOf(ttl))
+ .accept(MediaType.APPLICATION_JSON)
+ .get(String.class));
long startTime = System.currentTimeMillis();
- String token = node.get( "access_token" ).textValue();
+ String token = node.get("access_token").textValue();
- assertNotNull( token );
+ assertNotNull(token);
- JsonNode userdata = mapper.readTree( resource().path( "/management/users/test@usergrid.com" ).queryParam( "access_token", token )
- .accept( MediaType.APPLICATION_JSON ).get( String.class ));
+ JsonNode userdata = mapper.readTree(resource()
+ .path("/management/users/test@usergrid.com")
+ .queryParam("access_token", token)
+ .accept(MediaType.APPLICATION_JSON)
+ .get(String.class));
- assertEquals( "test@usergrid.com", userdata.get( "data" ).get( "email" ).asText() );
+ assertEquals("test@usergrid.com", userdata.get("data").get("email").asText());
// wait for the token to expire
- Thread.sleep( ttl - ( System.currentTimeMillis() - startTime ) + 1000 );
+ Thread.sleep(ttl - (System.currentTimeMillis() - startTime) + 1000);
ClientResponse.Status responseStatus = null;
try {
- userdata = mapper.readTree( resource().path( "/management/users/test@usergrid.com" ).accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE ).get( String.class ));
- }
- catch ( UniformInterfaceException uie ) {
+ userdata = mapper.readTree(resource()
+ .path("/management/users/test@usergrid.com")
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .get(String.class));
+ } catch (UniformInterfaceException uie) {
responseStatus = uie.getResponse().getClientResponseStatus();
}
- assertEquals( ClientResponse.Status.UNAUTHORIZED, responseStatus );
+ assertEquals(ClientResponse.Status.UNAUTHORIZED, responseStatus);
}
-
@Test
public void token() throws Exception {
- JsonNode node = mapper.readTree( resource().path( "/management/token" ).queryParam( "grant_type", "password" )
- .queryParam( "username", "test@usergrid.com" ).queryParam( "password", "test" )
- .accept( MediaType.APPLICATION_JSON ).get( String.class ));
-
- logNode( node );
- String token = node.get( "access_token" ).textValue();
- assertNotNull( token );
+ JsonNode node = mapper.readTree(resource()
+ .path("/management/token")
+ .queryParam("grant_type", "password")
+ .queryParam("username", "test@usergrid.com")
+ .queryParam("password", "test")
+ .accept(MediaType.APPLICATION_JSON)
+ .get(String.class));
+
+ logNode(node);
+ String token = node.get("access_token").textValue();
+ assertNotNull(token);
// set an organization property
HashMap<String, Object> payload = new HashMap<String, Object>();
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put( "securityLevel", 5 );
- payload.put( OrganizationsResource.ORGANIZATION_PROPERTIES, properties );
- node = mapper.readTree( resource().path( "/management/organizations/test-organization" )
- .queryParam( "access_token", superAdminToken() ).accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE ).put( String.class, payload ));
+ properties.put("securityLevel", 5);
+ payload.put(OrganizationsResource.ORGANIZATION_PROPERTIES, properties);
+ node = mapper.readTree(resource()
+ .path("/management/organizations/test-organization")
+ .queryParam("access_token", superAdminToken())
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .put(String.class, payload));
refreshIndex("test-organization", "test-app");
// ensure the organization property is included
- node = mapper.readTree( resource().path( "/management/token" ).queryParam( "access_token", token )
- .accept( MediaType.APPLICATION_JSON ).get( String.class ));
- logNode( node );
+ node = mapper.readTree(resource().path("/management/token").queryParam("access_token", token)
+ .accept(MediaType.APPLICATION_JSON).get(String.class));
+ logNode(node);
- JsonNode securityLevel = node.findValue( "securityLevel" );
- assertNotNull( securityLevel );
- assertEquals( 5L, securityLevel.asLong() );
+ JsonNode securityLevel = node.findValue("securityLevel");
+ assertNotNull(securityLevel);
+ assertEquals(5L, securityLevel.asLong());
}
-
@Test
public void meToken() throws Exception {
- JsonNode node = mapper.readTree( resource().path( "/management/me" ).queryParam( "grant_type", "password" )
- .queryParam( "username", "test@usergrid.com" ).queryParam( "password", "test" )
- .accept( MediaType.APPLICATION_JSON ).get( String.class ));
-
- logNode( node );
- String token = node.get( "access_token" ).textValue();
- assertNotNull( token );
-
- node = mapper.readTree( resource().path( "/management/me" ).queryParam( "access_token", token )
- .accept( MediaType.APPLICATION_JSON ).get( String.class ));
- logNode( node );
-
- assertNotNull( node.get( "passwordChanged" ) );
- assertNotNull( node.get( "access_token" ) );
- assertNotNull( node.get( "expires_in" ) );
- JsonNode userNode = node.get( "user" );
- assertNotNull( userNode );
- assertNotNull( userNode.get( "uuid" ) );
- assertNotNull( userNode.get( "username" ) );
- assertNotNull( userNode.get( "email" ) );
- assertNotNull( userNode.get( "name" ) );
- assertNotNull( userNode.get( "properties" ) );
- JsonNode orgsNode = userNode.get( "organizations" );
- assertNotNull( orgsNode );
- JsonNode orgNode = orgsNode.get( "test-organization" );
- assertNotNull( orgNode );
- assertNotNull( orgNode.get( "name" ) );
- assertNotNull( orgNode.get( "properties" ) );
+ JsonNode node = mapper.readTree(resource()
+ .path("/management/me")
+ .queryParam("grant_type", "password")
+ .queryParam("username", "test@usergrid.com")
+ .queryParam("password", "test")
+ .accept(MediaType.APPLICATION_JSON)
+ .get(String.class));
+
+ logNode(node);
+ String token = node.get("access_token").textValue();
+ assertNotNull(token);
+
+ node = mapper.readTree(resource()
+ .path("/management/me")
+ .queryParam("access_token", token)
+ .accept(MediaType.APPLICATION_JSON)
+ .get(String.class));
+ logNode(node);
+
+ assertNotNull(node.get("passwordChanged"));
+ assertNotNull(node.get("access_token"));
+ assertNotNull(node.get("expires_in"));
+ JsonNode userNode = node.get("user");
+ assertNotNull(userNode);
+ assertNotNull(userNode.get("uuid"));
+ assertNotNull(userNode.get("username"));
+ assertNotNull(userNode.get("email"));
+ assertNotNull(userNode.get("name"));
+ assertNotNull(userNode.get("properties"));
+ JsonNode orgsNode = userNode.get("organizations");
+ assertNotNull(orgsNode);
+ JsonNode orgNode = orgsNode.get("test-organization");
+ assertNotNull(orgNode);
+ assertNotNull(orgNode.get("name"));
+ assertNotNull(orgNode.get("properties"));
}
-
@Test
public void meTokenPost() throws Exception {
- Map<String, String> payload =
- hashMap( "grant_type", "password" ).map( "username", "test@usergrid.com" ).map( "password", "test" );
+ Map<String, String> payload
+ = hashMap("grant_type", "password")
+ .map("username", "test@usergrid.com").map("password", "test");
- JsonNode node = mapper.readTree( resource().path( "/management/me" ).accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE ).post( String.class, payload ));
+ JsonNode node = mapper.readTree(resource()
+ .path("/management/me")
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .post(String.class, payload));
- logNode( node );
- String token = node.get( "access_token" ).textValue();
+ logNode(node);
+ String token = node.get("access_token").textValue();
- assertNotNull( token );
+ assertNotNull(token);
refreshIndex("test-organization", "test-app");
- node = mapper.readTree( resource().path( "/management/me" ).queryParam( "access_token", token )
- .accept( MediaType.APPLICATION_JSON ).get( String.class ));
- logNode( node );
+ node = mapper.readTree(resource()
+ .path("/management/me")
+ .queryParam("access_token", token)
+ .accept(MediaType.APPLICATION_JSON)
+ .get(String.class));
+ logNode(node);
}
-
@Test
public void meTokenPostForm() throws IOException {
Form form = new Form();
- form.add( "grant_type", "password" );
- form.add( "username", "test@usergrid.com" );
- form.add( "password", "test" );
+ form.add("grant_type", "password");
+ form.add("username", "test@usergrid.com");
+ form.add("password", "test");
- JsonNode node = mapper.readTree( resource().path( "/management/me" ).accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_FORM_URLENCODED_TYPE )
- .entity( form, MediaType.APPLICATION_FORM_URLENCODED_TYPE ).post( String.class ));
+ JsonNode node = mapper.readTree(resource()
+ .path("/management/me")
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_FORM_URLENCODED_TYPE)
+ .entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE)
+ .post(String.class));
- logNode( node );
- String token = node.get( "access_token" ).textValue();
+ logNode(node);
+ String token = node.get("access_token").textValue();
- assertNotNull( token );
+ assertNotNull(token);
refreshIndex("test-organization", "test-app");
- node = mapper.readTree( resource().path( "/management/me" ).queryParam( "access_token", token )
- .accept( MediaType.APPLICATION_JSON ).get( String.class ));
- logNode( node );
+ node = mapper.readTree(resource()
+ .path("/management/me")
+ .queryParam("access_token", token)
+ .accept(MediaType.APPLICATION_JSON).get(String.class));
+ logNode(node);
}
-
@Test
public void ttlNan() throws Exception {
- Map<String, String> payload =
- hashMap( "grant_type", "password" ).map( "username", "test@usergrid.com" ).map( "password", "test" )
- .map( "ttl", "derp" );
+ Map<String, String> payload = hashMap("grant_type", "password")
+ .map("username", "test@usergrid.com")
+ .map("password", "test")
+ .map("ttl", "derp");
ClientResponse.Status responseStatus = null;
try {
- resource().path( "/management/token" ).accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE ).post( String.class, payload );
- }
- catch ( UniformInterfaceException uie ) {
+ resource().path("/management/token")
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .post(String.class, payload);
+ } catch (UniformInterfaceException uie) {
responseStatus = uie.getResponse().getClientResponseStatus();
}
- assertEquals( ClientResponse.Status.BAD_REQUEST, responseStatus );
+ assertEquals(ClientResponse.Status.BAD_REQUEST, responseStatus);
}
-
@Test
public void ttlOverMax() throws Exception {
- Map<String, String> payload =
- hashMap( "grant_type", "password" ).map( "username", "test@usergrid.com" ).map( "password", "test" )
- .map( "ttl", Long.MAX_VALUE + "" );
+ Map<String, String> payload = hashMap("grant_type", "password")
+ .map("username", "test@usergrid.com")
+ .map("password", "test")
+ .map("ttl", Long.MAX_VALUE + "");
ClientResponse.Status responseStatus = null;
try {
- resource().path( "/management/token" ).accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE ).post( String.class, payload );
- }
- catch ( UniformInterfaceException uie ) {
+ resource().path("/management/token")
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .post(String.class, payload);
+ } catch (UniformInterfaceException uie) {
responseStatus = uie.getResponse().getClientResponseStatus();
}
- assertEquals( ClientResponse.Status.BAD_REQUEST, responseStatus );
+ assertEquals(ClientResponse.Status.BAD_REQUEST, responseStatus);
}
-
@Test
public void revokeToken() throws Exception {
String token1 = super.adminToken();
String token2 = super.adminToken();
- JsonNode response = mapper.readTree( resource().path( "/management/users/test" ).queryParam( "access_token", token1 )
- .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE )
- .get( String.class ));
+ JsonNode response = mapper.readTree(resource().path("/management/users/test")
+ .queryParam("access_token", token1)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .get(String.class));
- assertEquals( "test@usergrid.com", response.get( "data" ).get( "email" ).asText() );
+ assertEquals("test@usergrid.com", response.get("data").get("email").asText());
- response = mapper.readTree( resource().path( "/management/users/test" ).queryParam( "access_token", token2 )
- .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE )
- .get( String.class ));
+ response = mapper.readTree(resource().path("/management/users/test")
+ .queryParam("access_token", token2)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .get(String.class));
- assertEquals( "test@usergrid.com", response.get( "data" ).get( "email" ).asText() );
+ assertEquals("test@usergrid.com", response.get("data").get("email").asText());
// now revoke the tokens
- response = mapper.readTree( resource().path( "/management/users/test/revoketokens" ).queryParam( "access_token", superAdminToken() )
- .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE )
- .post( String.class ));
+ response = mapper.readTree(resource().path("/management/users/test/revoketokens")
+ .queryParam("access_token", superAdminToken())
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .post(String.class));
refreshIndex("test-organization", "test-app");
// the tokens shouldn't work
-
ClientResponse.Status status = null;
try {
- response = mapper.readTree( resource().path( "/management/users/test" ).queryParam( "access_token", token1 )
- .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE )
- .get( String.class ));
- }
- catch ( UniformInterfaceException uie ) {
+ response = mapper.readTree(resource().path("/management/users/test")
+ .queryParam("access_token", token1)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .get(String.class));
+ } catch (UniformInterfaceException uie) {
status = uie.getResponse().getClientResponseStatus();
}
- assertEquals( ClientResponse.Status.UNAUTHORIZED, status );
+ assertEquals(ClientResponse.Status.UNAUTHORIZED, status);
status = null;
try {
- response = mapper.readTree( resource().path( "/management/users/test" ).queryParam( "access_token", token2 )
- .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE )
- .get( String.class ));
- }
- catch ( UniformInterfaceException uie ) {
+ response = mapper.readTree(resource().path("/management/users/test")
+ .queryParam("access_token", token2)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .get(String.class));
+ } catch (UniformInterfaceException uie) {
status = uie.getResponse().getClientResponseStatus();
}
- assertEquals( ClientResponse.Status.UNAUTHORIZED, status );
+ assertEquals(ClientResponse.Status.UNAUTHORIZED, status);
String token3 = super.adminToken();
String token4 = super.adminToken();
- response = mapper.readTree( resource().path( "/management/users/test" ).queryParam( "access_token", token3 )
- .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE )
- .get( String.class ));
+ response = mapper.readTree(resource().path("/management/users/test")
+ .queryParam("access_token", token3)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .get(String.class));
- assertEquals( "test@usergrid.com", response.get( "data" ).get( "email" ).asText() );
+ assertEquals("test@usergrid.com", response.get("data").get("email").asText());
- response = mapper.readTree( resource().path( "/management/users/test" ).queryParam( "access_token", token4 )
- .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE )
- .get( String.class ));
+ response = mapper.readTree(resource().path("/management/users/test")
+ .queryParam("access_token", token4)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .get(String.class));
- assertEquals( "test@usergrid.com", response.get( "data" ).get( "email" ).asText() );
+ assertEquals("test@usergrid.com", response.get("data").get("email").asText());
// now revoke the token3
- response = mapper.readTree( resource().path( "/management/users/test/revoketoken" ).queryParam( "access_token", token3 )
- .queryParam( "token", token3 ).accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE ).post( String.class ));
+ response = mapper.readTree(resource().path("/management/users/test/revoketoken")
+ .queryParam("access_token", token3)
+ .queryParam("token", token3)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .post(String.class));
// the token3 shouldn't work
-
status = null;
try {
- response = mapper.readTree( resource().path( "/management/users/test" ).queryParam( "access_token", token3 )
- .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE )
- .get( String.class ));
- }
- catch ( UniformInterfaceException uie ) {
+ response = mapper.readTree(resource().path("/management/users/test")
+ .queryParam("access_token", token3)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .get(String.class));
+ } catch (UniformInterfaceException uie) {
status = uie.getResponse().getClientResponseStatus();
}
- assertEquals( ClientResponse.Status.UNAUTHORIZED, status );
+ assertEquals(ClientResponse.Status.UNAUTHORIZED, status);
status = null;
try {
- response = mapper.readTree( resource().path( "/management/users/test" ).queryParam( "access_token", token4 )
- .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE )
- .get( String.class ));
+ response = mapper.readTree(resource().path("/management/users/test")
+ .queryParam("access_token", token4)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .get(String.class));
status = ClientResponse.Status.OK;
- }
- catch ( UniformInterfaceException uie ) {
+ } catch (UniformInterfaceException uie) {
status = uie.getResponse().getClientResponseStatus();
}
- assertEquals( ClientResponse.Status.OK, status );
+ assertEquals(ClientResponse.Status.OK, status);
}
-
-
}