usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [3/8] incubator-usergrid git commit: remove application id
Date Wed, 01 Jul 2015 22:52:32 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/b8a40f8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b8a40f8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b8a40f8a

Branch: refs/heads/two-dot-o-dev
Commit: b8a40f8a4619d5c2cbbc31fec28838236e3fbd93
Parents: cd6b63d
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Wed Jul 1 09:14:07 2015 -0600
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Wed Jul 1 09:14:07 2015 -0600

----------------------------------------------------------------------
 .../apache/usergrid/management/AppInfoMigrationPlugin.java  | 9 ---------
 .../management/cassandra/ManagementServiceImpl.java         | 3 +--
 2 files changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b8a40f8a/stack/services/src/main/java/org/apache/usergrid/management/AppInfoMigrationPlugin.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/AppInfoMigrationPlugin.java
b/stack/services/src/main/java/org/apache/usergrid/management/AppInfoMigrationPlugin.java
index 3ac72d2..2a5346a 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/AppInfoMigrationPlugin.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/AppInfoMigrationPlugin.java
@@ -54,7 +54,6 @@ import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.apache.usergrid.corepersistence.util.CpNamingUtils.getApplicationScope;
-import static org.apache.usergrid.persistence.Schema.PROPERTY_APPLICATION_ID;
 import static org.apache.usergrid.persistence.Schema.PROPERTY_NAME;
 
 /**
@@ -209,14 +208,6 @@ public class AppInfoMigrationPlugin implements MigrationPlugin {
         return applicationId;
     }
 
-    private org.apache.usergrid.persistence.Entity createNewAppInfo(EntityManager managementEm,
final String name, final UUID applicationId) throws Exception {
-        org.apache.usergrid.persistence.Entity appInfo;Map<String, Object> appInfoMap
= new HashMap<String, Object>() {{
-            put(PROPERTY_NAME, name);
-            put(PROPERTY_APPLICATION_ID, applicationId);
-        }};
-        appInfo = managementEm.create(new SimpleId(applicationId, CpNamingUtils.APPLICATION_INFO),
appInfoMap);
-        return appInfo;
-    }
 
     /**
      * TODO: Use Graph to get application_info for an specified Application.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b8a40f8a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
index 3606f36..0693057 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -1803,8 +1803,7 @@ public class ManagementServiceImpl implements ManagementService {
             }
 
             // make sure we return applicationId and not the application_info UUID
-            UUID applicationId = UUIDUtils.tryExtractUUID(
-                entity.getProperty( PROPERTY_APPLICATION_ID ).toString() );
+            UUID applicationId = entity.getUuid();
 
             applications.put( applicationId, entityName );
         }


Mime
View raw message