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 02:30:17 UTC
incubator-usergrid git commit: fix app migration
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev 5699a1bd3 -> fca575178
fix app migration
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/fca57517
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fca57517
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fca57517
Branch: refs/heads/two-dot-o-dev
Commit: fca575178af33976f15e8976ea764269fcdac29e
Parents: 5699a1b
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jun 24 18:30:10 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jun 24 18:30:10 2015 -0600
----------------------------------------------------------------------
.../corepersistence/migration/AppInfoMigrationPlugin.java | 7 ++++---
.../corepersistence/migration/AppInfoMigrationPluginTest.java | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/fca57517/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 a7f086a..a22bea6 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
@@ -117,6 +117,7 @@ public class AppInfoMigrationPlugin implements MigrationPlugin {
logger.debug("Skipping Migration Plugin: " + getName());
return;
}
+
observer.start();
//get old app infos to migrate
final Observable<org.apache.usergrid.persistence.model.entity.Entity> oldAppInfos = getOldAppInfos();
@@ -149,8 +150,8 @@ public class AppInfoMigrationPlugin implements MigrationPlugin {
try {
final String orgName = name.split("/")[0];
final String appName = name.split("/")[1];
- UUID applicationId = getUuid(oldAppInfoMap,"appUuid");
-
+ UUID applicationId = getUuid(oldAppInfoMap,"applicationUuid") ;
+ applicationId = applicationId == null ? getUuid(oldAppInfoMap,"appUuid") : applicationId ;
//get app info from graph to see if it has been migrated already
Entity appInfo = getApplicationInfo(applicationId);
if (appInfo == null) {
@@ -182,7 +183,7 @@ public class AppInfoMigrationPlugin implements MigrationPlugin {
if (uuidObject instanceof UUID) {
applicationId = (UUID) uuidObject;
} else {
- applicationId = UUIDUtils.tryExtractUUID(uuidObject.toString());
+ applicationId = uuidObject == null ? null : UUIDUtils.tryExtractUUID(uuidObject.toString());
}
return applicationId;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/fca57517/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 58ae747..f242318 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("appUuid", finalAppId );
+ put("applicationUuid", finalAppId );
}});
// delete some but not all of the application_info entities