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 2015/06/30 19:03:51 UTC

[1/7] incubator-usergrid git commit: Prevent quadruple logging during testing.

Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o-dev f7af573d0 -> 483c781dc


Prevent quadruple logging 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/fb7dc960
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fb7dc960
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fb7dc960

Branch: refs/heads/two-dot-o-dev
Commit: fb7dc96043953cf9118017ee58680a75a625aef6
Parents: 4b9a310
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Jun 17 18:10:39 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Jun 17 18:10:39 2015 -0400

----------------------------------------------------------------------
 stack/rest/src/test/resources/log4j.properties | 28 ++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/fb7dc960/stack/rest/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/log4j.properties b/stack/rest/src/test/resources/log4j.properties
index ab700af..50bcd03 100644
--- a/stack/rest/src/test/resources/log4j.properties
+++ b/stack/rest/src/test/resources/log4j.properties
@@ -29,21 +29,21 @@ log4j.appender.stdout.layout.ConversionPattern=%d %p (%t) %c{1} - %m%n
 log4j.logger.org.apache.usergrid=INFO
 #log4j.logger.org.apache.usergrid.cassandra=DEBUG
 #log4j.logger.org.apache.usergrid.persistence.cassandra=DEBUG
-log4j.category.org.apache=ERROR, stdout
-log4j.category.org.apache.usergrid=WARN, stdout
-log4j.category.org.apache.usergrid.rest=INFO, stdout
+log4j.category.org.apache=ERROR
+log4j.category.org.apache.usergrid=WARN
+log4j.category.org.apache.usergrid.rest=INFO
 
-log4j.logger.org.apache.usergrid.persistence.cassandra.CounterUtils=ERROR, stdout
-log4j.logger.org.apache.usergrid.persistence.cassandra.DB=WARN, stdout
-log4j.logger.org.apache.usergrid.persistence.cassandra.BATCH=WARN, stdout
-log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerFactoryImpl=WARN, stdout
-log4j.logger.org.apache.usergrid.persistence.cassandra.DaoUtils=WARN, stdout
-log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerImpl=WARN, stdout
-log4j.logger.org.apache.usergrid.persistence.cassandra.ConnectionRefImpl=WARN, stdout
-log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=WARN, stdout
-log4j.logger.org.apache.usergrid.rest.security.AllowAjaxFilter=WARN, stdout
-log4j.logger.me.prettyprint.hector.api.beans.AbstractComposite=ERROR, stdout
-log4j.logger.org.apache.usergrid.locking.singlenode.SingleNodeLockManagerImpl=DEBUG, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.CounterUtils=ERROR
+log4j.logger.org.apache.usergrid.persistence.cassandra.DB=WARN
+log4j.logger.org.apache.usergrid.persistence.cassandra.BATCH=WARN
+log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerFactoryImpl=WARN
+log4j.logger.org.apache.usergrid.persistence.cassandra.DaoUtils=WARN
+log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerImpl=WARN
+log4j.logger.org.apache.usergrid.persistence.cassandra.ConnectionRefImpl=WARN
+log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=WARN
+log4j.logger.org.apache.usergrid.rest.security.AllowAjaxFilter=WARN
+log4j.logger.me.prettyprint.hector.api.beans.AbstractComposite=ERROR
+log4j.logger.org.apache.usergrid.locking.singlenode.SingleNodeLockManagerImpl=DEBUG
 log4j.logger.org.apache.usergrid.rest.filters.MeteringFilter=ERROR
 
 #log4j.logger.org.apache.usergrid.corepersistence=DEBUG


[5/7] incubator-usergrid git commit: Convert newer methods to use new testing framework.

Posted by sf...@apache.org.
Convert newer methods to use new testing framework.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b3aa0d87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b3aa0d87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b3aa0d87

Branch: refs/heads/two-dot-o-dev
Commit: b3aa0d87f0f356d6e3453fc0905d5f7fea93c948
Parents: a06954e
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Jun 19 07:53:39 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Jun 19 07:53:39 2015 -0400

----------------------------------------------------------------------
 .../rest/management/ManagementResourceIT.java   | 37 +++++---------------
 .../endpoints/NamedResource.java                | 12 ++++---
 2 files changed, 17 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b3aa0d87/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
index 104d64f..580d629 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
@@ -562,11 +562,7 @@ public class ManagementResourceIT extends AbstractRestIT {
         String suToken = clientSetup.getSuperuserToken().getAccessToken();
         Map<String, String> props = new HashMap<String, String>();
         props.put( USERGRID_CENTRAL_URL, getBaseURI().toURL().toExternalForm() );
-        resource().path( "/testproperties" )
-                .queryParam("access_token", suToken)
-                .accept( MediaType.APPLICATION_JSON )
-                .type( MediaType.APPLICATION_JSON_TYPE )
-                .post( props );
+        pathResource( "testproperties" ).post( props );
 
         try {
 
@@ -590,6 +586,7 @@ public class ManagementResourceIT extends AbstractRestIT {
                 validatedNode = management.externaltoken().get( Entity.class, queryParams );
 
                 fail( "Validation should have failed" );
+
             } catch (UniformInterfaceException actual) {
                 assertEquals( 404, actual.getResponse().getStatus() );
                 String errorMsg = actual.getResponse().getEntity(
@@ -605,11 +602,7 @@ public class ManagementResourceIT extends AbstractRestIT {
             // unset the Usergrid Central SSO URL so it does not interfere with other tests
 
             props.put( USERGRID_CENTRAL_URL, "" );
-            resource().path( "/testproperties" )
-                .queryParam( "access_token", suToken )
-                .accept( MediaType.APPLICATION_JSON )
-                .type( MediaType.APPLICATION_JSON_TYPE )
-                .post( props );
+            pathResource( "testproperties" ).post( props );
         }
 
     }
@@ -629,12 +622,8 @@ public class ManagementResourceIT extends AbstractRestIT {
 
         String suToken = clientSetup.getSuperuserToken().getAccessToken();
         Map<String, String> props = new HashMap<String, String>();
-        props.put( USERGRID_CENTRAL_URL, getBaseURI().toURL().toExternalForm());
-        resource().path( "/testproperties" )
-                .queryParam( "access_token", suToken)
-                .accept( MediaType.APPLICATION_JSON )
-                .type( MediaType.APPLICATION_JSON_TYPE )
-                .post( props );
+        props.put( USERGRID_CENTRAL_URL, getBaseURI().toURL().toExternalForm() );
+        pathResource( "testproperties" ).post( props );
 
         try {
             // calls to login as an Admin User must now fail
@@ -646,9 +635,7 @@ public class ManagementResourceIT extends AbstractRestIT {
                     put( "password", "password" );
                     put( "grant_type", "password" );
                 }};
-                JsonNode accessInfoNode = resource().path( "/management/token" )
-                    .type( MediaType.APPLICATION_JSON_TYPE )
-                    .post( JsonNode.class, loginInfo );
+                ApiResponse postResponse = pathResource( "management/token" ).post( false, ApiResponse.class, loginInfo );
                 fail( "Login as Admin User must fail when validate external tokens is enabled" );
 
             } catch (UniformInterfaceException actual) {
@@ -669,10 +656,8 @@ public class ManagementResourceIT extends AbstractRestIT {
                 put( "password", "superpassword" );
                 put( "grant_type", "password" );
             }};
-            JsonNode accessInfoNode = resource().path( "/management/token" )
-                .type( MediaType.APPLICATION_JSON_TYPE )
-                .post( JsonNode.class, loginInfo );
-            String accessToken = accessInfoNode.get( "access_token" ).textValue();
+            ApiResponse postResponse2 = pathResource( "management/token" ).post( loginInfo );
+            String accessToken = postResponse2.getAccessToken();
             assertNotNull( accessToken );
 
         } finally {
@@ -680,11 +665,7 @@ public class ManagementResourceIT extends AbstractRestIT {
             // turn off validate external tokens by un-setting the usergrid.central.url
 
             props.put( USERGRID_CENTRAL_URL, "" );
-            resource().path( "/testproperties" )
-                .queryParam( "access_token", suToken )
-                .accept( MediaType.APPLICATION_JSON )
-                .type( MediaType.APPLICATION_JSON_TYPE )
-                .post( props );
+            pathResource( "testproperties" ).post( props );
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b3aa0d87/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
index 69d2fcf..8bf1d67 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
@@ -215,6 +215,11 @@ public class NamedResource implements UrlResource {
 
     }
 
+    public <T> T post( boolean useToken, Class<T> type, Map requestEntity) {
+        return post(useToken, type, requestEntity, null, false);
+
+    }
+
     /**
      * Used to test POST using form payloads.
      * @param type
@@ -269,8 +274,7 @@ public class NamedResource implements UrlResource {
         }
 
         GenericType<T> gt = new GenericType<>((Class) type);
-        return builder
-            .post(gt.getRawClass());
+        return builder.post( gt.getRawClass() );
 
     }
 
@@ -282,13 +286,13 @@ public class NamedResource implements UrlResource {
 
     //For edge cases like Organizations and Tokens without any payload
     public <T> T get(Class<T> type, boolean useToken) {
-        return get(type,null,useToken);
+        return get( type, null, useToken );
 
     }
 
 
     public <T> T get(Class<T> type,QueryParameters queryParameters) {
-        return get(type,queryParameters,true);
+        return get( type, queryParameters, true );
     }
 
     public <T> T get(Class<T> type,QueryParameters queryParameters, boolean useToken) {


[6/7] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' into USERGRID-703

Posted by sf...@apache.org.
Merge branch 'two-dot-o-dev' into USERGRID-703

Conflicts:
	stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.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/28f39b9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/28f39b9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/28f39b9c

Branch: refs/heads/two-dot-o-dev
Commit: 28f39b9c711fc0ccf7d4828b28f999e9e9310a47
Parents: b3aa0d8 5731a01
Author: Dave Johnson <sn...@apache.org>
Authored: Mon Jun 29 10:48:38 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Mon Jun 29 10:48:38 2015 -0400

----------------------------------------------------------------------
 portal/css/main.min.css                         |   2 +-
 .../main/resources/usergrid-default.properties  | 813 +++++++++++++------
 .../asyncevents/AmazonAsyncEventService.java    | 125 +--
 .../asyncevents/AsyncIndexProvider.java         |   2 +-
 .../asyncevents/InMemoryAsyncEventService.java  |   1 -
 .../asyncevents/model/AsyncEvent.java           |  31 +-
 .../asyncevents/model/EdgeDeleteEvent.java      |  12 +-
 .../asyncevents/model/EdgeIndexEvent.java       |   2 +
 .../asyncevents/model/EntityDeleteEvent.java    |   2 +
 .../asyncevents/model/EntityIndexEvent.java     |   7 +-
 .../corepersistence/index/CoreIndexFig.java     |   2 +-
 .../index/IndexProcessorFig.java                |  46 +-
 .../migration/AppInfoMigrationPlugin.java       |  31 +-
 .../migration/MigrationModuleVersionPlugin.java |   3 -
 .../rx/impl/AllApplicationsObservableImpl.java  |   8 +-
 .../corepersistence/util/CpNamingUtils.java     |   3 -
 .../main/resources/usergrid-core-context.xml    |   2 +-
 .../MigrationModuleVersionPluginTest.java       |   2 +-
 .../MultiTennantColumnFamilyDefinition.java     |   2 +-
 .../persistence/core/metrics/MetricsFig.java    |   5 +-
 .../data/DataMigrationManagerImpl.java          |  14 +-
 .../data/DataMigrationManagerImplTest.java      | 101 ++-
 .../usergrid/persistence/index/IndexFig.java    |  96 ++-
 .../index/IndexLocationStrategy.java            |  10 +
 .../index/impl/EsIndexBufferConsumerImpl.java   |  15 +-
 .../index/impl/IndexOperationMessage.java       |   6 +
 .../index/migration/EsIndexMigrationPlugin.java |   2 +-
 .../usergrid/persistence/queue/QueueFig.java    |  32 +-
 .../queue/impl/SNSQueueManagerImpl.java         | 138 +++-
 .../queue/impl/SQSQueueManagerImpl.java         |   2 +-
 .../queue/util/AmazonNotificationUtils.java     |  85 +-
 .../org/apache/usergrid/rest/IndexResource.java |  53 +-
 .../applications/assets/AssetsResource.java     |  41 +-
 .../apache/usergrid/rest/IndexResourceIT.java   |  14 +-
 .../applications/ApplicationResourceIT.java     | 126 ++-
 .../applications/assets/AssetResourceIT.java    | 401 +++------
 .../rest/test/resource2point0/ClientSetup.java  |  32 +-
 .../rest/test/resource2point0/RestClient.java   |   8 +-
 .../endpoints/NamedResource.java                |  77 +-
 .../endpoints/SystemResource.java               |  21 +
 .../endpoints/mgmt/ApplicationResource.java     |   2 +-
 .../endpoints/mgmt/OrgResource.java             |   5 -
 .../endpoints/mgmt/OrganizationResource.java    |  15 +-
 stack/rest/src/test/resources/log4j.properties  |   2 +-
 .../cassandra/ManagementServiceImpl.java        |   3 +-
 .../apache/usergrid/security/shiro/Realm.java   |   2 +-
 .../security/shiro/utils/SubjectUtils.java      |   4 +-
 .../assets/data/LocalFileBinaryStore.java       |   5 +
 .../services/notifications/QueueListener.java   |   2 +-
 .../usergrid/services/queues/QueueListener.java |   2 +-
 .../migration/AppInfoMigrationPluginTest.java   |   4 +-
 .../apache/usergrid/management/EmailFlowIT.java |   6 +-
 .../org/apache/usergrid/tools/ExportAdmins.java | 469 ++++++++---
 .../org/apache/usergrid/tools/ImportAdmins.java | 598 ++++++++++----
 54 files changed, 2228 insertions(+), 1266 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/28f39b9c/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
----------------------------------------------------------------------
diff --cc stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
index 8bf1d67,c80516f..3eeddf8
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
@@@ -286,13 -281,13 +285,13 @@@ public class NamedResource implements U
  
      //For edge cases like Organizations and Tokens without any payload
      public <T> T get(Class<T> type, boolean useToken) {
 -        return get(type,null,useToken);
 +        return get( type, null, useToken );
- 
      }
  
  
+ 
      public <T> T get(Class<T> type,QueryParameters queryParameters) {
 -        return get(type,queryParameters,true);
 +        return get( type, queryParameters, true );
      }
  
      public <T> T get(Class<T> type,QueryParameters queryParameters, boolean useToken) {


[7/7] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' into USERGRID-703

Posted by sf...@apache.org.
Merge branch 'two-dot-o-dev' into USERGRID-703


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/483c781d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/483c781d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/483c781d

Branch: refs/heads/two-dot-o-dev
Commit: 483c781dccf1b396af89537139b1140471f631d9
Parents: 28f39b9 f7af573
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Jun 30 10:46:32 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Jun 30 10:46:32 2015 -0600

----------------------------------------------------------------------
 .usergridversion                                |   1 +
 LICENSE                                         |  41 +--
 NOTICE                                          |   3 +-
 .../css/arsmarquette/ARSMaquettePro-Light.otf   | Bin 184600 -> 0 bytes
 .../css/arsmarquette/ARSMaquettePro-Medium.otf  | Bin 188020 -> 0 bytes
 .../css/arsmarquette/ARSMaquettePro-Regular.otf | Bin 188096 -> 0 bytes
 portal/css/main.css                             |  15 --
 portal/css/main.min.css                         |   2 +-
 release/release-candidate.sh                    |  10 -
 .../asyncevents/AmazonAsyncEventService.java    |   4 +-
 .../MvccEntitySerializationStrategyV2Impl.java  |  12 +-
 .../persistence/model/field/ListField.java      |   2 +-
 .../org/apache/usergrid/tools/ExportAdmins.java | 268 ++++++++++---------
 .../org/apache/usergrid/tools/ImportAdmins.java | 252 ++++++++---------
 stack/tools/src/main/resources/log4j.properties |   5 +-
 15 files changed, 305 insertions(+), 310 deletions(-)
----------------------------------------------------------------------



[3/7] incubator-usergrid git commit: don't run tests concurrently, also: ensure that properties are reset to default values after tests

Posted by sf...@apache.org.
don't run tests concurrently, also: ensure that properties are reset to default values after tests


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c2d5e116
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c2d5e116
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c2d5e116

Branch: refs/heads/two-dot-o-dev
Commit: c2d5e1165d8bd0b66f1233d7ef1b2997e044838b
Parents: dd3ede0
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Jun 17 18:11:56 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Jun 17 18:11:56 2015 -0400

----------------------------------------------------------------------
 .../rest/management/ManagementResourceIT.java   | 135 ++++++++++---------
 1 file changed, 75 insertions(+), 60 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c2d5e116/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
index c41735c..31064bf 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
@@ -21,6 +21,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.sun.jersey.api.client.ClientResponse.Status;
 import com.sun.jersey.api.client.UniformInterfaceException;
 import com.sun.jersey.api.representation.Form;
+import net.jcip.annotations.NotThreadSafe;
 import org.apache.commons.lang.RandomStringUtils;
 
 import org.apache.usergrid.persistence.index.utils.UUIDUtils;
@@ -46,6 +47,7 @@ import static org.junit.Assert.*;
 /**
  * @author tnine
  */
+@NotThreadSafe // due to use of /testproperties end-point
 public class ManagementResourceIT extends AbstractRestIT {
 
     private static final Logger logger = LoggerFactory.getLogger(ManagementResourceIT.class);
@@ -67,10 +69,10 @@ public class ManagementResourceIT extends AbstractRestIT {
      * Test if we can reset our password as an admin
      */
     @Test
-    public void setSelfAdminPasswordAsAdwmin() {
+    public void setSelfAdminPasswordAsAdmin() {
         UUID uuid =  UUIDUtils.newTimeUUID();
         management.token().setToken(clientSetup.getSuperuserToken());
-        management.orgs().org( clientSetup.getOrganizationName() ).users().post(ApiResponse.class, new User("test" + uuid, "test" + uuid, "test" + uuid + "@email.com", "test"));
+        management.orgs().org( clientSetup.getOrganizationName() ).users().post( ApiResponse.class, new User( "test" + uuid, "test" + uuid, "test" + uuid + "@email.com", "test" ) );
         Map<String, Object> data = new HashMap<>();
         data.put( "newpassword", "foo" );
         data.put( "oldpassword", "test" );
@@ -94,7 +96,7 @@ public class ManagementResourceIT extends AbstractRestIT {
         String name = "someguy2";
         String email = "someguy" + "@usergrid.com";
         String password = "password";
-        String orgName = "someneworg";
+        String orgName = "someneworg" + UUIDUtils.newTimeUUID();
 
         Entity payload =
                 new Entity().chainPut("company", "Apigee" );
@@ -288,7 +290,7 @@ public class ManagementResourceIT extends AbstractRestIT {
 
         long ttl = 2000;
 
-        Token token = management.token().get(new QueryParameters().addParam("grant_type", "password").addParam("username", clientSetup.getEmail()).addParam("password", clientSetup.getPassword()).addParam("ttl", String.valueOf(ttl)));
+        Token token = management.token().get(new QueryParameters().addParam( "grant_type", "password" ).addParam("username", clientSetup.getEmail()).addParam("password", clientSetup.getPassword()).addParam("ttl", String.valueOf(ttl)));
 
 
         long startTime = System.currentTimeMillis();
@@ -498,7 +500,6 @@ public class ManagementResourceIT extends AbstractRestIT {
 
 
     @Test
-    @Ignore
     public void testValidateExternalToken() throws Exception {
 
         // create a new admin user, get access token
@@ -509,7 +510,12 @@ public class ManagementResourceIT extends AbstractRestIT {
             new Organization( username, username, username+"@example.com", username, "password", null ) );
 
         refreshIndex();
-        QueryParameters queryParams = new QueryParameters().addParam("username", username ).addParam("password", "password").addParam("grant_type", "password");
+
+        refreshIndex();
+        QueryParameters queryParams = new QueryParameters()
+            .addParam( "username", username )
+            .addParam( "password", "password" )
+            .addParam( "grant_type", "password" );
         Token accessInfoNode = management.token().get(queryParams);
         String accessToken = accessInfoNode.getAccessToken();
 
@@ -524,48 +530,53 @@ public class ManagementResourceIT extends AbstractRestIT {
                 .type( MediaType.APPLICATION_JSON_TYPE )
                 .post( props );
 
-        // attempt to validate the token, must be valid
-        queryParams = new QueryParameters().addParam("access_token", suToken ).addParam("ext_access_token", accessToken).addParam("ttl", "1000");
-
-        Entity validatedNode = management.externaltoken().get(Entity.class,queryParams);
-        String validatedAccessToken = validatedNode.get( "access_token" ).toString();
-        assertEquals( accessToken, validatedAccessToken );
-
-        // attempt to validate an invalid token, must fail
-
         try {
-            queryParams = new QueryParameters().addParam("access_token", suToken ).addParam("ext_access_token", "rubbish_token").addParam("ttl", "1000");
 
-            validatedNode = management.externaltoken().get(Entity.class,queryParams);
+            // attempt to validate the token, must be valid
+            queryParams = new QueryParameters()
+                .addParam( "ext_access_token", accessToken )
+                .addParam( "ttl", "1000" );
 
-            fail("Validation should have failed");
-        } catch ( UniformInterfaceException actual ) {
-            assertEquals( 404, actual.getResponse().getStatus() );
-            String errorMsg = actual.getResponse().getEntity( JsonNode.class ).get( "error_description" ).toString();
-            logger.error( "ERROR: " + errorMsg );
-            assertTrue( errorMsg.contains( "Cannot find Admin User" ) );
-        }
+            Entity validatedNode = management.externaltoken().get( Entity.class, queryParams );
+            String validatedAccessToken = validatedNode.get( "access_token" ).toString();
+            assertEquals( accessToken, validatedAccessToken );
 
+            // attempt to validate an invalid token, must fail
 
+            try {
+                queryParams = new QueryParameters()
+                    .addParam( "access_token", suToken )
+                    .addParam( "ext_access_token", "rubbish_token" )
+                    .addParam( "ttl", "1000" );
 
-        // TODO: how do we test the create new user and organization case?
+                validatedNode = management.externaltoken().get( Entity.class, queryParams );
 
+                fail( "Validation should have failed" );
+            } catch (UniformInterfaceException actual) {
+                assertEquals( 404, actual.getResponse().getStatus() );
+                String errorMsg = actual.getResponse().getEntity( JsonNode.class ).get( "error_description" ).toString();
+                logger.error( "ERROR: " + errorMsg );
+                assertTrue( errorMsg.contains( "Cannot find Admin User" ) );
+            }
 
+            // TODO: how do we test the create new user and organization case?
 
-        // unset the Usergrid Central SSO URL so it does not interfere with other tests
+        } finally {
 
-        props.put( USERGRID_CENTRAL_URL, "" );
-        resource().path( "/testproperties" )
-                .queryParam( "access_token", suToken)
+            // unset the Usergrid Central SSO URL so it does not interfere with other tests
+
+            props.put( USERGRID_CENTRAL_URL, "" );
+            resource().path( "/testproperties" )
+                .queryParam( "access_token", suToken )
                 .accept( MediaType.APPLICATION_JSON )
                 .type( MediaType.APPLICATION_JSON_TYPE )
                 .post( props );
+        }
 
     }
 
 
     @Test
-    @Ignore
     public void testSuperuserOnlyWhenValidateExternalTokensEnabled() throws Exception {
 
         // create an org and an admin user
@@ -586,51 +597,55 @@ public class ManagementResourceIT extends AbstractRestIT {
                 .type( MediaType.APPLICATION_JSON_TYPE )
                 .post( props );
 
-        // calls to login as an Admin User must now fail
-
         try {
+            // calls to login as an Admin User must now fail
 
-            Map<String, Object> loginInfo = new HashMap<String, Object>() {{
-                put("username", username );
-                put("password", "password");
-                put("grant_type", "password");
-            }};
-            JsonNode accessInfoNode = resource().path("/management/token")
+            try {
+
+                Map<String, Object> loginInfo = new HashMap<String, Object>() {{
+                    put( "username", username );
+                    put( "password", "password" );
+                    put( "grant_type", "password" );
+                }};
+                JsonNode accessInfoNode = resource().path( "/management/token" )
                     .type( MediaType.APPLICATION_JSON_TYPE )
                     .post( JsonNode.class, loginInfo );
-            fail("Login as Admin User must fail when validate external tokens is enabled");
+                fail( "Login as Admin User must fail when validate external tokens is enabled" );
 
-        } catch ( UniformInterfaceException actual ) {
-            assertEquals( 400, actual.getResponse().getStatus() );
-            String errorMsg = actual.getResponse().getEntity( JsonNode.class ).get( "error_description" ).toString();
-            logger.error( "ERROR: " + errorMsg );
-            assertTrue( errorMsg.contains( "Admin Users must login via" ));
+            } catch (UniformInterfaceException actual) {
+                assertEquals( 400, actual.getResponse().getStatus() );
+                String errorMsg = actual.getResponse().getEntity( JsonNode.class ).get( "error_description" ).toString();
+                logger.error( "ERROR: " + errorMsg );
+                assertTrue( errorMsg.contains( "Admin Users must login via" ) );
 
-        } catch ( Exception e ) {
-            fail( "We expected a UniformInterfaceException" );
-        }
+            } catch (Exception e) {
+                fail( "We expected a UniformInterfaceException" );
+            }
 
-        // login as superuser must succeed
+            // login as superuser must succeed
 
-        Map<String, Object> loginInfo = new HashMap<String, Object>() {{
-            put("username", "superuser");
-            put("password", "superpassword");
-            put("grant_type", "password");
-        }};
-        JsonNode accessInfoNode = resource().path("/management/token")
+            Map<String, Object> loginInfo = new HashMap<String, Object>() {{
+                put( "username", "superuser" );
+                put( "password", "superpassword" );
+                put( "grant_type", "password" );
+            }};
+            JsonNode accessInfoNode = resource().path( "/management/token" )
                 .type( MediaType.APPLICATION_JSON_TYPE )
                 .post( JsonNode.class, loginInfo );
-        String accessToken = accessInfoNode.get( "access_token" ).textValue();
-        assertNotNull( accessToken );
+            String accessToken = accessInfoNode.get( "access_token" ).textValue();
+            assertNotNull( accessToken );
 
-        // turn off validate external tokens by un-setting the usergrid.central.url
+        } finally {
 
-        props.put( USERGRID_CENTRAL_URL, "" );
-        resource().path( "/testproperties" )
-                .queryParam( "access_token", suToken)
+            // turn off validate external tokens by un-setting the usergrid.central.url
+
+            props.put( USERGRID_CENTRAL_URL, "" );
+            resource().path( "/testproperties" )
+                .queryParam( "access_token", suToken )
                 .accept( MediaType.APPLICATION_JSON )
                 .type( MediaType.APPLICATION_JSON_TYPE )
                 .post( props );
+        }
     }
 
 }


[2/7] incubator-usergrid git commit: We use fasterxml not codehaus.

Posted by sf...@apache.org.
We use fasterxml not codehaus.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/dd3ede07
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/dd3ede07
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/dd3ede07

Branch: refs/heads/two-dot-o-dev
Commit: dd3ede07d3abd4558ceab94d82791c7ab29fb516
Parents: fb7dc96
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Jun 17 18:11:09 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Jun 17 18:11:09 2015 -0400

----------------------------------------------------------------------
 .../usergrid/rest/management/ManagementResource.java      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd3ede07/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
index e0bedf8..caed361 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
@@ -19,6 +19,7 @@ package org.apache.usergrid.rest.management;
 
 import com.codahale.metrics.Counter;
 import com.codahale.metrics.Timer;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.google.inject.Injector;
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.config.ClientConfig;
@@ -53,7 +54,6 @@ import org.apache.usergrid.rest.management.organizations.OrganizationsResource;
 import org.apache.usergrid.rest.management.users.UsersResource;
 import org.apache.usergrid.security.oauth.AccessInfo;
 import org.apache.usergrid.security.shiro.utils.SubjectUtils;
-import org.codehaus.jackson.JsonNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -596,7 +596,7 @@ public class ManagementResource extends AbstractContextResource {
             JsonNode accessInfoNode = getMeFromUgCentral( extAccessToken );
 
             JsonNode userNode = accessInfoNode.get( "user" );
-            String username = userNode.get( "username" ).getTextValue();
+            String username = userNode.get( "username" ).textValue();
 
             // if user does not exist locally then we need to fix that
 
@@ -608,12 +608,12 @@ public class ManagementResource extends AbstractContextResource {
                 // create local user and and organizations they have on the central Usergrid instance
                 logger.info("User {} does not exist locally, creating", username );
 
-                String name  = userNode.get( "name" ).getTextValue();
-                String email = userNode.get( "email" ).getTextValue();
+                String name  = userNode.get( "name" ).textValue();
+                String email = userNode.get( "email" ).textValue();
                 String dummyPassword = RandomStringUtils.randomAlphanumeric( 40 );
 
                 JsonNode orgsNode = userNode.get( "organizations" );
-                Iterator<String> fieldNames = orgsNode.getFieldNames();
+                Iterator<String> fieldNames = orgsNode.fieldNames();
 
                 if ( !fieldNames.hasNext() ) {
                     // no organizations for user exist in response from central Usergrid SSO


[4/7] incubator-usergrid git commit: Formatting and import cleanup only.

Posted by sf...@apache.org.
Formatting and import cleanup 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/a06954ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a06954ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a06954ef

Branch: refs/heads/two-dot-o-dev
Commit: a06954ef7cfed96bf296a5c7429ef9f92c43f411
Parents: c2d5e11
Author: Dave Johnson <dm...@apigee.com>
Authored: Thu Jun 18 16:18:29 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Thu Jun 18 16:18:29 2015 -0400

----------------------------------------------------------------------
 .../rest/management/ManagementResourceIT.java   | 108 +++++++++++++------
 1 file changed, 74 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a06954ef/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
index 31064bf..104d64f 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
@@ -23,14 +23,12 @@ import com.sun.jersey.api.client.UniformInterfaceException;
 import com.sun.jersey.api.representation.Form;
 import net.jcip.annotations.NotThreadSafe;
 import org.apache.commons.lang.RandomStringUtils;
-
 import org.apache.usergrid.persistence.index.utils.UUIDUtils;
 import org.apache.usergrid.rest.management.organizations.OrganizationsResource;
 import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
 import org.apache.usergrid.rest.test.resource2point0.model.*;
 import org.apache.usergrid.rest.test.resource2point0.model.Collection;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -61,7 +59,11 @@ public class ManagementResourceIT extends AbstractRestIT {
     @Before
     public void setup() {
         management= clientSetup.getRestClient().management();
-        Token token = management.token().get(new QueryParameters().addParam("grant_type", "password").addParam("username", clientSetup.getEmail()).addParam("password", clientSetup.getPassword()));
+        Token token = management.token()
+            .get( new QueryParameters()
+                .addParam( "grant_type", "password" )
+                .addParam( "username", clientSetup.getEmail() )
+                .addParam( "password", clientSetup.getPassword() ) );
         management.token().setToken(token);
     }
 
@@ -72,11 +74,17 @@ public class ManagementResourceIT extends AbstractRestIT {
     public void setSelfAdminPasswordAsAdmin() {
         UUID uuid =  UUIDUtils.newTimeUUID();
         management.token().setToken(clientSetup.getSuperuserToken());
-        management.orgs().org( clientSetup.getOrganizationName() ).users().post( ApiResponse.class, new User( "test" + uuid, "test" + uuid, "test" + uuid + "@email.com", "test" ) );
+        management.orgs()
+            .org( clientSetup.getOrganizationName() )
+            .users()
+            .post( ApiResponse.class, new User( "test" + uuid, "test" + uuid, "test" + uuid + "@email.com", "test" ) );
         Map<String, Object> data = new HashMap<>();
         data.put( "newpassword", "foo" );
         data.put( "oldpassword", "test" );
-        management.users().user("test"+uuid).password().post(Entity.class, data);
+        management.users()
+            .user( "test" + uuid )
+            .password()
+            .post( Entity.class, data );
         Token token = management.token().post(Token.class, new Token( "test"+uuid, "foo" ) );
         management.token().setToken( token );
         data.clear();
@@ -205,7 +213,10 @@ public class ManagementResourceIT extends AbstractRestIT {
         userFeed = getUserFeed( lastUser );
         assertNotNull( userFeed );
         assertTrue( userFeed.size() > 1 );
-        String serialized = ((Entity)userFeed.get(0)).get("content").toString()+ ((Entity)userFeed.get(1)).get("content").toString();
+        String serialized = ((Entity)userFeed.get(0))
+            .get( "content" )
+            .toString()+ ((Entity)userFeed.get(1))
+            .get( "content" ).toString();
         assertTrue( serialized.indexOf( postFollowContent ) >= 0 );
         assertTrue( serialized.indexOf( preFollowContent ) >= 0 );
     }
@@ -226,7 +237,13 @@ public class ManagementResourceIT extends AbstractRestIT {
 
     private void follow( String user, String followUser ) {
         //post follow
-        Entity entity = this.app().collection("users").entity(user).collection("following").collection("users").entity(followUser).post();
+        Entity entity = this.app()
+            .collection( "users" )
+            .entity( user )
+            .collection( "following" )
+            .collection( "users" )
+            .entity( followUser )
+            .post();
     }
 
 
@@ -238,23 +255,30 @@ public class ManagementResourceIT extends AbstractRestIT {
         actorMap.put( "displayName", name );
         actorMap.put( "username", user );
         activityPayload.put("actor", actorMap);
-        Entity entity = this.app().collection("users").entity(user).collection("activities").post(new Entity(activityPayload));
+        Entity entity = this.app()
+            .collection( "users" )
+            .entity( user )
+            .collection( "activities" )
+            .post( new Entity( activityPayload ) );
     }
 
 
     @Test
     public void mgmtCreateAndGetApplication() throws Exception {
 
-
-
         // POST /applications
-        ApiResponse apiResponse = management().orgs().org( clientSetup.getOrganizationName() ).app().post(new Application("mgmt-org-app"));
+        ApiResponse apiResponse = management()
+            .orgs()
+            .org( clientSetup.getOrganizationName() )
+            .app()
+            .post( new Application( "mgmt-org-app" ) );
 
 
         refreshIndex();
 
         Entity appdata = apiResponse.getEntities().get(0);
-        assertEquals((clientSetup.getOrganizationName() + "/mgmt-org-app").toLowerCase(), appdata.get("name").toString().toLowerCase());
+        assertEquals((clientSetup.getOrganizationName() + "/mgmt-org-app")
+            .toLowerCase(), appdata.get("name") .toString() .toLowerCase());
         assertNotNull(appdata.get("metadata"));
         Map metadata =(Map) appdata.get( "metadata" );
         assertNotNull(metadata.get("collections"));
@@ -290,7 +314,11 @@ public class ManagementResourceIT extends AbstractRestIT {
 
         long ttl = 2000;
 
-        Token token = management.token().get(new QueryParameters().addParam( "grant_type", "password" ).addParam("username", clientSetup.getEmail()).addParam("password", clientSetup.getPassword()).addParam("ttl", String.valueOf(ttl)));
+        Token token = management.token().get( new QueryParameters()
+            .addParam( "grant_type", "password" )
+            .addParam( "username", clientSetup.getEmail() )
+            .addParam( "password", clientSetup.getPassword() )
+            .addParam( "ttl", String.valueOf( ttl ) ) );
 
 
         long startTime = System.currentTimeMillis();
@@ -319,7 +347,11 @@ public class ManagementResourceIT extends AbstractRestIT {
 
     @Test
     public void token() throws Exception {
-        Token myToken = management.token().get(new QueryParameters().addParam("grant_type", "password").addParam("username", clientSetup.getEmail()).addParam("password", clientSetup.getPassword()));
+        Token myToken = management.token()
+            .get( new QueryParameters()
+                .addParam( "grant_type", "password" )
+                .addParam( "username", clientSetup.getEmail() )
+                .addParam( "password", clientSetup.getPassword() ) );
 
         String token = myToken.getAccessToken();
         assertNotNull( token );
@@ -329,8 +361,7 @@ public class ManagementResourceIT extends AbstractRestIT {
         Map<String, Object> properties = new HashMap<String, Object>();
         properties.put( "securityLevel", 5 );
         payload.put( OrganizationsResource.ORGANIZATION_PROPERTIES, properties );
-        management.orgs().org( clientSetup.getOrganizationName() )
-            .put(payload);
+        management.orgs().org( clientSetup.getOrganizationName() ).put( payload );
 
 
         // ensure the organization property is included
@@ -341,9 +372,11 @@ public class ManagementResourceIT extends AbstractRestIT {
 
     @Test
     public void meToken() throws Exception {
-        QueryParameters queryParameters = new QueryParameters().addParam("grant_type", "password")
-                                  .addParam("username", clientSetup.getUsername()).addParam("password",clientSetup.getPassword());
-        Token myToken = management.me().get(Token.class,queryParameters);
+        QueryParameters queryParameters = new QueryParameters()
+            .addParam( "grant_type", "password" )
+            .addParam( "username", clientSetup.getUsername() )
+            .addParam( "password", clientSetup.getPassword() );
+        Token myToken = management.me().get( Token.class, queryParameters );
 
 
         String token = myToken.getAccessToken();
@@ -372,10 +405,11 @@ public class ManagementResourceIT extends AbstractRestIT {
 
     @Test
     public void meTokenPost() throws Exception {
-        Map<String, String> payload =
-                hashMap( "grant_type", "password" ).map( "username", clientSetup.getUsername() ).map( "password",clientSetup.getPassword() );
+        Map<String, String> payload = hashMap( "grant_type", "password" )
+            .map( "username", clientSetup.getUsername() )
+            .map( "password", clientSetup.getPassword() );
 
-        JsonNode node = management.me().post(JsonNode.class, payload);
+        JsonNode node = management.me().post( JsonNode.class, payload );
 
         logNode( node );
         String token = node.get( "access_token" ).textValue();
@@ -410,13 +444,14 @@ public class ManagementResourceIT extends AbstractRestIT {
     @Test
     public void ttlNan() throws Exception {
 
-        Map<String, String> payload =
-                hashMap( "grant_type", "password" ).map("username", clientSetup.getUsername()).map( "password",clientSetup.getPassword() )
-                                                   .map("ttl", "derp");
+        Map<String, String> payload = hashMap( "grant_type", "password" )
+            .map( "username", clientSetup.getUsername() )
+            .map( "password", clientSetup.getPassword() )
+            .map( "ttl", "derp" );
 
         Status responseStatus = null;
         try {
-           management.token().post(JsonNode.class, payload);
+           management.token().post( JsonNode.class, payload );
         }
         catch ( UniformInterfaceException uie ) {
             responseStatus = uie.getResponse().getClientResponseStatus();
@@ -429,14 +464,15 @@ public class ManagementResourceIT extends AbstractRestIT {
     @Test
     public void ttlOverMax() throws Exception {
 
-        Map<String, String> payload =
-                hashMap( "grant_type", "password" ).map( "username", clientSetup.getUsername()).map( "password", clientSetup.getPassword() )
-                                                   .map( "ttl", Long.MAX_VALUE + "" );
+        Map<String, String> payload = hashMap( "grant_type", "password" )
+            .map( "username", clientSetup.getUsername() )
+            .map( "password", clientSetup.getPassword() )
+            .map( "ttl", Long.MAX_VALUE + "" );
 
         Status responseStatus = null;
 
         try {
-            management.token().post(JsonNode.class, payload);
+            management.token().post( JsonNode.class, payload );
         }
         catch ( UniformInterfaceException uie ) {
             responseStatus = uie.getResponse().getClientResponseStatus();
@@ -459,7 +495,8 @@ public class ManagementResourceIT extends AbstractRestIT {
         assertNotNull(response.get("email").toString());
 
         // now revoke the tokens
-        response = management.users().user(clientSetup.getUsername()).revokeTokens().post(true,Entity.class,null, null,false);
+        response = management.users().user(
+            clientSetup.getUsername()).revokeTokens().post(true,Entity.class,null, null,false);
 
         // the tokens shouldn't work
 
@@ -482,7 +519,8 @@ public class ManagementResourceIT extends AbstractRestIT {
         // now revoke the token3
         QueryParameters queryParameters = new QueryParameters();
         queryParameters.addParam( "token", token3.getAccessToken() );
-        management.users().user(clientSetup.getUsername()).revokeToken().post( false, Entity.class,null,queryParameters );
+        management.users().user(
+            clientSetup.getUsername()).revokeToken().post( false, Entity.class,null,queryParameters );
 
         // the token3 shouldn't work
         status = null;
@@ -554,7 +592,8 @@ public class ManagementResourceIT extends AbstractRestIT {
                 fail( "Validation should have failed" );
             } catch (UniformInterfaceException actual) {
                 assertEquals( 404, actual.getResponse().getStatus() );
-                String errorMsg = actual.getResponse().getEntity( JsonNode.class ).get( "error_description" ).toString();
+                String errorMsg = actual.getResponse().getEntity(
+                    JsonNode.class ).get( "error_description" ).toString();
                 logger.error( "ERROR: " + errorMsg );
                 assertTrue( errorMsg.contains( "Cannot find Admin User" ) );
             }
@@ -614,7 +653,8 @@ public class ManagementResourceIT extends AbstractRestIT {
 
             } catch (UniformInterfaceException actual) {
                 assertEquals( 400, actual.getResponse().getStatus() );
-                String errorMsg = actual.getResponse().getEntity( JsonNode.class ).get( "error_description" ).toString();
+                String errorMsg = actual.getResponse()
+                    .getEntity( JsonNode.class ).get( "error_description" ).toString();
                 logger.error( "ERROR: " + errorMsg );
                 assertTrue( errorMsg.contains( "Admin Users must login via" ) );