You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/08/28 17:09:02 UTC
[1/2] usergrid git commit: Mock the migration version to 0 for index
mapping migration test to ensure it won't be skipped.
Repository: usergrid
Updated Branches:
refs/heads/two-dot-o-dev 912c78ea1 -> fd18f1f14
Mock the migration version to 0 for index mapping migration test to ensure it won't be skipped.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/230abf34
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/230abf34
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/230abf34
Branch: refs/heads/two-dot-o-dev
Commit: 230abf34858f7a592f9afc7a3a143e83d12c0221
Parents: 912c78e
Author: Michael Russo <mi...@gmail.com>
Authored: Thu Aug 27 17:16:51 2015 -0700
Committer: Michael Russo <mi...@gmail.com>
Committed: Thu Aug 27 17:16:51 2015 -0700
----------------------------------------------------------------------
.../index/impl/EsIndexMappingMigrationPluginTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/230abf34/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EsIndexMappingMigrationPluginTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EsIndexMappingMigrationPluginTest.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EsIndexMappingMigrationPluginTest.java
index e5d9380..6d61cb1 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EsIndexMappingMigrationPluginTest.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EsIndexMappingMigrationPluginTest.java
@@ -21,7 +21,6 @@ package org.apache.usergrid.persistence.index.impl;
import com.google.inject.Inject;
import org.apache.usergrid.persistence.core.migration.data.MigrationInfoSerialization;
-import org.apache.usergrid.persistence.core.migration.data.ProgressObserver;
import org.apache.usergrid.persistence.core.migration.data.TestProgressObserver;
import org.apache.usergrid.persistence.core.test.UseModules;
import org.apache.usergrid.persistence.index.EntityIndexFactory;
@@ -29,6 +28,7 @@ import org.apache.usergrid.persistence.index.guice.TestIndexModule;
import org.apache.usergrid.persistence.index.migration.EsIndexMappingMigrationPlugin;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Mockito;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -48,6 +48,8 @@ public class EsIndexMappingMigrationPluginTest extends BaseIT {
EsProvider provider;
@Test
public void runMigration(){
+ MigrationInfoSerialization serialization = Mockito.mock(MigrationInfoSerialization.class);
+ Mockito.when(serialization.getVersion(Mockito.any())).thenReturn(0);
EsIndexMappingMigrationPlugin plugin = new EsIndexMappingMigrationPlugin(serialization,provider);
TestProgressObserver progressObserver = new TestProgressObserver();
plugin.run(progressObserver);
[2/2] usergrid git commit: This closes #360.
Posted by sn...@apache.org.
This closes #360.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/fd18f1f1
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/fd18f1f1
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/fd18f1f1
Branch: refs/heads/two-dot-o-dev
Commit: fd18f1f147353f4eef22875dd58f9ac2903f1440
Parents: 230abf3
Author: Dave Johnson <sn...@apache.org>
Authored: Fri Aug 28 11:08:39 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Fri Aug 28 11:08:39 2015 -0400
----------------------------------------------------------------------
.../usergrid/persistence/model/entity/MapToEntityConverter.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/fd18f1f1/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/MapToEntityConverter.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/MapToEntityConverter.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/MapToEntityConverter.java
index 323d424..441ddf1 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/MapToEntityConverter.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/MapToEntityConverter.java
@@ -26,7 +26,6 @@ import org.apache.usergrid.persistence.model.collection.SchemaManager;
import org.apache.usergrid.persistence.model.field.*;
import org.apache.usergrid.persistence.model.field.value.Location;
-import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.*;
@@ -178,9 +177,6 @@ public class MapToEntityConverter{
/**
* for location we need to parse two formats potentially and convert to a typed field
- * @param value
- * @param fieldName
- * @param entity
*/
private void processLocationField(Map<String, Object> value, String fieldName, Entity entity) {
// get the object to inspect