usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [4/8] incubator-usergrid git commit: remove application id
Date Wed, 01 Jul 2015 22:52:33 GMT
remove application id


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

Branch: refs/heads/two-dot-o-dev
Commit: 3afbc7849d929b033ffed2190275216103e7c111
Parents: b8a40f8
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Wed Jul 1 09:42:10 2015 -0600
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Wed Jul 1 09:42:10 2015 -0600

----------------------------------------------------------------------
 .../management/cassandra/ManagementServiceIT.java     | 14 ++++++--------
 .../usergrid/management/export/ExportServiceIT.java   |  5 ++---
 .../apache/usergrid/services/ServiceFactoryIT.java    |  5 ++---
 3 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3afbc784/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
index 196400f..f0c0c10 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
@@ -59,7 +59,6 @@ import static org.apache.usergrid.TestHelper.uniqueEmail;
 import static org.apache.usergrid.TestHelper.uniqueOrg;
 import static org.apache.usergrid.TestHelper.uniqueUsername;
 import static org.apache.usergrid.persistence.Schema.DICTIONARY_CREDENTIALS;
-import static org.apache.usergrid.persistence.Schema.PROPERTY_APPLICATION_ID;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -639,8 +638,8 @@ public class ManagementServiceIT {
         String appName = uniqueApp();
 
         Entity appInfo = setup.getEmf().createApplicationV2( orgName, appName );
-        UUID appId = UUIDUtils.tryExtractUUID(
-            appInfo.getProperty(PROPERTY_APPLICATION_ID).toString());
+        UUID appId = appInfo.getUuid();
+
 
         User user = new User();
         user.setActivated( true );
@@ -685,8 +684,8 @@ public class ManagementServiceIT {
         String appName = "testAppUserPasswordChangeShaType"+newUUIDString();
 
         Entity appInfo = setup.getEmf().createApplicationV2(orgName, appName);
-        UUID appId = UUIDUtils.tryExtractUUID(
-            appInfo.getProperty(PROPERTY_APPLICATION_ID).toString());
+        UUID appId = appInfo.getUuid();
+
 
         User user = new User();
         user.setActivated( true );
@@ -745,9 +744,8 @@ public class ManagementServiceIT {
         String orgName = uniqueOrg();
         String appName = uniqueApp();
 
-        Entity appInfo = setup.getEmf().createApplicationV2( orgName, appName );
-        UUID appId = UUIDUtils.tryExtractUUID(
-            appInfo.getProperty(PROPERTY_APPLICATION_ID).toString());
+        Entity appInfo = setup.getEmf().createApplicationV2(orgName, appName);
+        UUID appId = appInfo.getUuid();
 
         User user = new User();
         user.setActivated( true );

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3afbc784/stack/services/src/test/java/org/apache/usergrid/management/export/ExportServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/export/ExportServiceIT.java
b/stack/services/src/test/java/org/apache/usergrid/management/export/ExportServiceIT.java
index 95e8c7d..8f67e85 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/export/ExportServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/export/ExportServiceIT.java
@@ -62,7 +62,6 @@ import com.google.inject.Module;
 import static org.apache.usergrid.TestHelper.newUUIDString;
 import static org.apache.usergrid.TestHelper.uniqueApp;
 import static org.apache.usergrid.TestHelper.uniqueOrg;
-import static org.apache.usergrid.persistence.Schema.PROPERTY_APPLICATION_ID;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -407,8 +406,8 @@ public class ExportServiceIT {
 
 
         Entity appInfo = setup.getEmf().createApplicationV2(orgName, appName);
-        UUID applicationId = UUIDUtils.tryExtractUUID(
-            appInfo.getProperty(PROPERTY_APPLICATION_ID).toString());
+        UUID applicationId = appInfo.getUuid();
+
 
 
         EntityManager em = setup.getEmf().getEntityManager( applicationId );

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3afbc784/stack/services/src/test/java/org/apache/usergrid/services/ServiceFactoryIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/ServiceFactoryIT.java
b/stack/services/src/test/java/org/apache/usergrid/services/ServiceFactoryIT.java
index cc05451..1d1565b 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/ServiceFactoryIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/ServiceFactoryIT.java
@@ -30,7 +30,6 @@ import org.apache.usergrid.services.simple.SimpleService;
 
 import static org.apache.usergrid.TestHelper.uniqueApp;
 import static org.apache.usergrid.TestHelper.uniqueOrg;
-import static org.apache.usergrid.persistence.Schema.PROPERTY_APPLICATION_ID;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -46,8 +45,8 @@ public class ServiceFactoryIT extends AbstractServiceIT {
         logger.info( "test package prefixes" );
 
         Entity appInfo = setup.getEmf().createApplicationV2(uniqueOrg(), uniqueApp());
-        UUID applicationId = UUIDUtils.tryExtractUUID(
-            appInfo.getProperty(PROPERTY_APPLICATION_ID).toString());
+        UUID applicationId = appInfo.getUuid();
+
 
         ServiceManager sm = setup.getSmf().getServiceManager( applicationId );
         Service service = sm.getService( "simple" );


Mime
View raw message