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/25 01:33:32 UTC

incubator-usergrid git commit: app info test change for correct appuuid name

Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o-dev b0d68692e -> 5699a1bd3


app info test change for correct appuuid name


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

Branch: refs/heads/two-dot-o-dev
Commit: 5699a1bd3ab8882073e2d32fdd5e8611bc818fcc
Parents: b0d6869
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jun 24 15:58:47 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jun 24 15:58:47 2015 -0600

----------------------------------------------------------------------
 .../usergrid/corepersistence/migration/AppInfoMigrationPlugin.java | 2 +-
 .../corepersistence/migration/AppInfoMigrationPluginTest.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5699a1bd/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/AppInfoMigrationPlugin.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/AppInfoMigrationPlugin.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/AppInfoMigrationPlugin.java
index 8f18ba3..a7f086a 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/AppInfoMigrationPlugin.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/AppInfoMigrationPlugin.java
@@ -149,7 +149,7 @@ public class AppInfoMigrationPlugin implements MigrationPlugin {
         try {
             final String orgName = name.split("/")[0];
             final String appName = name.split("/")[1];
-            UUID applicationId = getUuid(oldAppInfoMap,"applicationUuid");
+            UUID applicationId = getUuid(oldAppInfoMap,"appUuid");
 
             //get app info from graph to see if it has been migrated already
             Entity appInfo = getApplicationInfo(applicationId);

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5699a1bd/stack/services/src/test/java/org/apache/usergrid/corepersistence/migration/AppInfoMigrationPluginTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/corepersistence/migration/AppInfoMigrationPluginTest.java b/stack/services/src/test/java/org/apache/usergrid/corepersistence/migration/AppInfoMigrationPluginTest.java
index f242318..58ae747 100644
--- a/stack/services/src/test/java/org/apache/usergrid/corepersistence/migration/AppInfoMigrationPluginTest.java
+++ b/stack/services/src/test/java/org/apache/usergrid/corepersistence/migration/AppInfoMigrationPluginTest.java
@@ -150,7 +150,7 @@ public class AppInfoMigrationPluginTest {
             systemAppEm.create("appinfo", new HashMap<String, Object>() {{
                 put("name", appName );
                 put("organizationUuid", finalOrgId );
-                put("applicationUuid", finalAppId );
+                put("appUuid", finalAppId );
             }});
 
             // delete some but not all of the application_info entities