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/02/13 17:26:37 UTC
incubator-usergrid git commit: fix test
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-365 ba189eaf9 -> 35b95fd14
fix test
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/35b95fd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/35b95fd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/35b95fd1
Branch: refs/heads/USERGRID-365
Commit: 35b95fd14d1792eb6a51dd9f4a3373d241469fc6
Parents: ba189ea
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Feb 13 09:26:26 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Feb 13 09:26:26 2015 -0700
----------------------------------------------------------------------
.../corepersistence/rx/AllEntitiesInSystemObservableIT.java | 6 +++---
.../core/migration/data/DataMigrationManagerImpl.java | 9 +++++++++
2 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/35b95fd1/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/AllEntitiesInSystemObservableIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/AllEntitiesInSystemObservableIT.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/AllEntitiesInSystemObservableIT.java
index f4228b3..cfe6b3b 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/AllEntitiesInSystemObservableIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/AllEntitiesInSystemObservableIT.java
@@ -62,9 +62,9 @@ public class AllEntitiesInSystemObservableIT extends AbstractCoreIT {
@Test
public void testEntities() throws Exception {
-
- AllEntitiesInSystemObservable allEntitiesInSystemObservableImpl =SpringResource.getInstance().getBean(AllEntitiesInSystemObservable.class);
- TargetIdObservable targetIdObservable = SpringResource.getInstance().getBean(TargetIdObservable.class);
+ Injector injector = SpringResource.getInstance().getBean(Injector.class);
+ AllEntitiesInSystemObservable allEntitiesInSystemObservableImpl =injector.getInstance(AllEntitiesInSystemObservable.class);
+ TargetIdObservable targetIdObservable = injector.getInstance(TargetIdObservable.class);
final EntityManager em = app.getEntityManager();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/35b95fd1/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
index a9b4f56..db93898 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
@@ -85,6 +85,10 @@ public class DataMigrationManagerImpl implements DataMigrationManager {
final int currentVersion = migrationInfoSerialization.getVersion();
+ if(currentVersion <= 0){
+ resetToHighestVersion();
+ }
+
LOG.info( "Saved schema version is {}, max migration version is {}", currentVersion,
migrationTreeMap.lastKey() );
@@ -190,6 +194,7 @@ public class DataMigrationManagerImpl implements DataMigrationManager {
}
+
@Override
public void resetToVersion( final int version ) {
final int highestAllowed = migrationTreeMap.lastKey();
@@ -201,6 +206,10 @@ public class DataMigrationManagerImpl implements DataMigrationManager {
migrationInfoSerialization.setVersion( version );
}
+ private void resetToHighestVersion( ) {
+ final int highestAllowed = migrationTreeMap.lastKey();
+ resetToVersion(highestAllowed);
+ }
@Override
public String getLastStatus() {