You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/02 08:35:33 UTC
[1/6] git commit: Fix for partial update error
Repository: incubator-usergrid
Updated Branches:
refs/heads/tempmerge [created] 93471f78d
Fix for partial update error
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a5b62748
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a5b62748
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a5b62748
Branch: refs/heads/tempmerge
Commit: a5b6274864b11f27c8c95d9f1781a96c2b8b01f6
Parents: 0cc97c6
Author: amuramoto <am...@apigee.com>
Authored: Tue Sep 30 15:37:13 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Tue Sep 30 15:37:13 2014 -0700
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 2 +-
.../apache/usergrid/rest/PartialUpdateTest.java | 50 +++++++++++++-------
2 files changed, 34 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a5b62748/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index b27a61d..5e46d7f 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@ -505,7 +505,7 @@ public class CpEntityManager implements EntityManager {
logger.debug("About to Write {}:{} version {}", new Object[] {
cpEntity.getId().getType(), cpEntity.getId().getUuid(), cpEntity.getVersion() });
- cpEntity = ecm.write( cpEntity ).toBlockingObservable().last();
+ cpEntity = ecm.update( cpEntity ).toBlockingObservable().last();
logger.debug("Wrote {}:{} version {}", new Object[] {
cpEntity.getId().getType(), cpEntity.getId().getUuid(), cpEntity.getVersion() });
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a5b62748/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
index 366df14..e150755 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
@@ -23,13 +23,14 @@ import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.Map;
import javax.ws.rs.core.MediaType;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.Assert.*;
+
/**
* Partial update test.
@@ -40,15 +41,23 @@ public class PartialUpdateTest extends AbstractRestIT {
@Rule
public TestContextSetup context = new TestContextSetup( this );
+ double latitude=37.772837;
+ double longitude=-122.409895;
+
+ Map<String, Object> geolocation = new LinkedHashMap<String, Object>() {{
+ put("latitude", latitude);
+ put("longitude", longitude);
+ }};
+
@Test
public void testPartialUpdate() throws IOException {
// create user bart
-
Map<String, Object> userProperties = new LinkedHashMap<String, Object>() {{
put( "username", "bart" );
put( "employer", "Brawndo" );
put( "email", "bart@personal-email.example.com" );
+ put( "location", geolocation);
}};
JsonNode userNode = mapper.readTree(
@@ -64,22 +73,29 @@ public class PartialUpdateTest extends AbstractRestIT {
refreshIndex( "test-organization", "test-app" );
- // update user bart passing only an update to his employer
-
- Map<String, Object> updateProperties = new LinkedHashMap<String, Object>() {{
- put( "employer", "Initech" );
- }};
+ // update user bart passing only an update to a property
+ for(int i=1; i<20; i++) {
+ geolocation.put("latitude", latitude += 0.00001);
+ geolocation.put("longitude", longitude += 0.00001);
+ Map<String, Object> updateProperties = new LinkedHashMap<String, Object>() {{
+ put("employer", "Initech");
+ put("location", geolocation);
+ }};
- try {
- JsonNode updatedNode = mapper.readTree(
- resource().path( "/test-organization/test-app/user/" + uuid )
- .queryParam( "access_token", adminAccessToken )
- .accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON )
- .put( String.class, updateProperties ));
+ try {
+ JsonNode updatedNode = mapper.readTree(
+ resource().path("/test-organization/test-app/user/" + uuid)
+ .queryParam("access_token", adminAccessToken)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON)
+ .put(String.class, updateProperties));
+ assertNotNull(updatedNode);
+ assertNotEquals(latitude, updatedNode.get("entities").get(0).get("location").get("latitude"));
+ assertNotEquals(longitude, updatedNode.get("entities").get(0).get("location").get("longitude"));
- } catch ( UniformInterfaceException uie ) {
- fail("Update failed due to: " + uie.getResponse().getEntity(String.class));
+ } catch (UniformInterfaceException uie) {
+ fail("Update failed due to: " + uie.getResponse().getEntity(String.class));
+ }
}
}
}
[4/6] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into 2.0
Posted by to...@apache.org.
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7bb9c647
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7bb9c647
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7bb9c647
Branch: refs/heads/tempmerge
Commit: 7bb9c6475004e7eab36275cdf68394344208b1af
Parents: 76b3421 1e7da5c
Author: amuramoto <am...@apigee.com>
Authored: Wed Oct 1 15:33:20 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Wed Oct 1 15:33:20 2014 -0700
----------------------------------------------------------------------
.../mq/cassandra/io/AbstractSearch.java | 60 +-
.../mq/cassandra/io/ConsumerTransaction.java | 2 +-
.../collection/EntityCollectionManager.java | 12 +-
.../collection/event/EntityDeleted.java | 25 +
.../collection/event/EntityVersionCreated.java | 25 +
.../collection/event/EntityVersionDeleted.java | 29 +
.../collection/guice/CollectionModule.java | 18 +-
.../guice/CollectionTaskExecutor.java | 35 +
.../impl/EntityCollectionManagerImpl.java | 14 +
.../impl/EntityVersionCleanupTask.java | 198 ++++++
.../serialization/SerializationFig.java | 32 +-
.../serialization/impl/LogEntryIterator.java | 114 +++
.../EntityCollectionManagerStressTest.java | 2 +
.../impl/EntityVersionCleanupTaskTest.java | 690 +++++++++++++++++++
.../impl/LogEntryIteratorTest.java | 131 ++++
.../collection/util/LogEntryMock.java | 152 ++++
.../core/astyanax/AstyanaxKeyspaceProvider.java | 2 +
.../persistence/core/guice/CommonModule.java | 2 +
.../core/task/NamedTaskExecutorImpl.java | 167 +++++
.../usergrid/persistence/core/task/Task.java | 31 +
.../persistence/core/task/TaskExecutor.java | 23 +
.../core/task/NamedTaskExecutorImplTest.java | 227 ++++++
.../usergrid/persistence/graph/GraphFig.java | 2 +
.../persistence/graph/event/EdgeDeleted.java | 8 +
.../persistence/graph/guice/GraphModule.java | 16 +
.../graph/guice/GraphTaskExecutor.java | 33 +
.../impl/shard/impl/NodeShardCacheImpl.java | 5 -
.../shard/impl/ShardGroupCompactionImpl.java | 175 +++--
.../graph/GraphManagerStressTest.java | 1 +
.../impl/shard/ShardGroupCompactionTest.java | 5 +-
.../notifications/ApplicationQueueManager.java | 42 +-
.../notifications/SingleQueueTaskManager.java | 177 -----
.../services/notifications/TaskManager.java | 180 +++++
.../services/notifications/TaskTracker.java | 4 +-
.../apns/NotificationsServiceIT.java | 13 +-
.../gcm/NotificationsServiceIT.java | 8 +-
36 files changed, 2355 insertions(+), 305 deletions(-)
----------------------------------------------------------------------
[6/6] git commit: Merge remote-tracking branch 'amuramoto/2.0' into
tempmerge
Posted by to...@apache.org.
Merge remote-tracking branch 'amuramoto/2.0' into tempmerge
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/93471f78
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/93471f78
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/93471f78
Branch: refs/heads/tempmerge
Commit: 93471f78dfb0276909833dda2015fba93b56375f
Parents: c051fda d1dc7cd
Author: Todd Nine <to...@apache.org>
Authored: Wed Oct 1 23:47:57 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Wed Oct 1 23:47:57 2014 -0600
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 9 +-
.../usergrid/persistence/CollectionIT.java | 3 -
.../usergrid/persistence/index/query/Query.java | 2 +-
.../index/query/tree/AndOperand.java | 2 +-
.../persistence/index/query/tree/Property.java | 2 +-
.../index/query/tree/StringLiteral.java | 2 +-
.../apache/usergrid/rest/PartialUpdateTest.java | 120 ++++++++++---------
7 files changed, 75 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93471f78/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
[3/6] git commit: update to partialUpdateTest
Posted by to...@apache.org.
update to partialUpdateTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/76b3421b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/76b3421b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/76b3421b
Branch: refs/heads/tempmerge
Commit: 76b3421bad587c2339bd9a8772179f9586fae751
Parents: 16d497e
Author: amuramoto <am...@apigee.com>
Authored: Tue Sep 30 16:37:34 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Tue Sep 30 16:37:34 2014 -0700
----------------------------------------------------------------------
.../apache/usergrid/rest/PartialUpdateTest.java | 86 +++++++++-----------
1 file changed, 38 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/76b3421b/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
index c2f3fcb..7053160 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
@@ -23,19 +23,14 @@ import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.Map;
import javax.ws.rs.core.MediaType;
-<<<<<<< HEAD
-=======
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
->>>>>>> e5bcbb23be66d12e428d817fd8b0b495793a939c
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotEquals;
/**
@@ -63,14 +58,7 @@ public class PartialUpdateTest extends AbstractRestIT {
put( "username", "bart" );
put( "employer", "Brawndo" );
put( "email", "bart@personal-email.example.com" );
-<<<<<<< HEAD
put( "location", geolocation);
-=======
- put( "location", new LinkedHashMap<String, Object>() {{
- put("latitude", "37.3638875323994");
- put("longitude", "-122.12334411518498");
- }} );
->>>>>>> e5bcbb23be66d12e428d817fd8b0b495793a939c
}};
JsonNode userNode = mapper.readTree(
@@ -85,14 +73,13 @@ public class PartialUpdateTest extends AbstractRestIT {
assertNotNull( uuid );
refreshIndex( "test-organization", "test-app" );
+ Map<String, Object> updateProperties = new LinkedHashMap<String, Object>();
// update user bart passing only an update to a property
- for(int i=1; i<20; i++) {
+ for(int i=1; i<10; i++) {
geolocation.put("latitude", latitude += 0.00001);
geolocation.put("longitude", longitude += 0.00001);
- Map<String, Object> updateProperties = new LinkedHashMap<String, Object>() {{
- put("employer", "Initech");
- put("location", geolocation);
- }};
+ updateProperties.put("employer", "Initech");
+ updateProperties.put("location", geolocation);
try {
JsonNode updatedNode = mapper.readTree(
@@ -102,22 +89,23 @@ public class PartialUpdateTest extends AbstractRestIT {
.type(MediaType.APPLICATION_JSON)
.put(String.class, updateProperties));
assertNotNull(updatedNode);
- assertNotEquals(latitude, updatedNode.get("entities").get(0).get("location").get("latitude"));
- assertNotEquals(longitude, updatedNode.get("entities").get(0).get("location").get("longitude"));
+
} catch (UniformInterfaceException uie) {
fail("Update failed due to: " + uie.getResponse().getEntity(String.class));
}
- }
- refreshIndex( "test-organization", "test-app" );
-
- userNode = mapper.readTree(
- resource().path( "/test-organization/test-app/users/" + uuid )
- .queryParam( "access_token", adminAccessToken )
- .accept( MediaType.APPLICATION_JSON )
- .get( String.class ));
- assertNotNull( userNode );
- assertEquals( "Initech", userNode.withArray("entities").get(0).get("employer").asText());
+ refreshIndex("test-organization", "test-app");
+
+ userNode = mapper.readTree(
+ resource().path("/test-organization/test-app/users/" + uuid)
+ .queryParam("access_token", adminAccessToken)
+ .accept(MediaType.APPLICATION_JSON)
+ .get(String.class));
+ assertNotNull(userNode);
+ assertEquals("Initech", userNode.withArray("entities").get(0).get("employer").asText());
+ assertNotEquals(latitude, userNode.withArray("entities").get(0).get("location").get("latitude"));
+ assertNotEquals(longitude, userNode.withArray("entities").get(0).get("location").get("longitude"));
+ }
// Update bart's employer without specifying any required fields
// (this time with username specified in URL)
@@ -126,25 +114,27 @@ public class PartialUpdateTest extends AbstractRestIT {
put( "employer", "ACME Corporation" );
}};
- try {
- mapper.readTree(
- resource().path( "/test-organization/test-app/users/bart")
- .queryParam( "access_token", adminAccessToken )
- .accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON )
- .put( String.class, updateProperties ));
+ for(int i=1; i<10; i++) {
+ try {
+ mapper.readTree(
+ resource().path("/test-organization/test-app/users/bart")
+ .queryParam("access_token", adminAccessToken)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON)
+ .put(String.class, updateProperties));
- } catch ( UniformInterfaceException uie ) {
- fail("Update failed due to: " + uie.getResponse().getEntity(String.class));
+ } catch (UniformInterfaceException uie) {
+ fail("Update failed due to: " + uie.getResponse().getEntity(String.class));
+ }
+ refreshIndex("test-organization", "test-app");
+
+ userNode = mapper.readTree(
+ resource().path("/test-organization/test-app/users/bart")
+ .queryParam("access_token", adminAccessToken)
+ .accept(MediaType.APPLICATION_JSON)
+ .get(String.class));
+ assertNotNull(userNode);
+ assertEquals("ACME Corporation", userNode.withArray("entities").get(0).get("employer").asText());
}
- refreshIndex( "test-organization", "test-app" );
-
- userNode = mapper.readTree(
- resource().path( "/test-organization/test-app/users/bart" )
- .queryParam( "access_token", adminAccessToken )
- .accept( MediaType.APPLICATION_JSON )
- .get( String.class ));
- assertNotNull( userNode );
- assertEquals( "ACME Corporation", userNode.withArray("entities").get(0).get("employer").asText());
}
}
[2/6] git commit: merged upstream
Posted by to...@apache.org.
merged upstream
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/16d497ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/16d497ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/16d497ed
Branch: refs/heads/tempmerge
Commit: 16d497ed29a9c24629a81980dcecf421e773034c
Parents: a5b6274 e5bcbb2
Author: amuramoto <am...@apigee.com>
Authored: Tue Sep 30 15:53:15 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Tue Sep 30 15:53:15 2014 -0700
----------------------------------------------------------------------
.gitignore | 1 +
portal/js/global/ug-service.js | 1100 +++--
portal/js/libs/usergrid.sdk.js | 4264 +++++++++---------
sdks/java/pom.xml | 33 +-
stack/.gitignore | 4 +-
.../main/dist/init_instance/init_rest_server.sh | 38 +-
.../dist/init_instance/install_cassandra.sh | 14 +-
.../dist/init_instance/install_elasticsearch.sh | 32 +-
.../main/dist/init_instance/install_yourkit.sh | 14 +-
stack/awscluster/ugcluster-cf.json | 3 +-
stack/config/README.txt | 4 +-
.../main/resources/usergrid-default.properties | 2 +-
stack/core/pom.xml | 10 -
.../corepersistence/CpEntityManager.java | 12 +-
.../corepersistence/CpEntityManagerFactory.java | 184 +-
.../corepersistence/CpRelationManager.java | 71 +-
.../HybridEntityManagerFactory.java | 10 +
.../apache/usergrid/metrics/MetricsFactory.java | 18 +-
.../usergrid/mq/cassandra/QueueManagerImpl.java | 18 +-
.../mq/cassandra/io/AbstractSearch.java | 172 +-
.../mq/cassandra/io/ConsumerTransaction.java | 17 +-
.../persistence/EntityManagerFactory.java | 4 +
.../cassandra/EntityManagerFactoryImpl.java | 51 +
.../usergrid/persistence/entities/Receipt.java | 20 +-
.../main/resources/usergrid-core-context.xml | 13 +-
.../java/org/apache/usergrid/Application.java | 7 +
.../org/apache/usergrid/CoreApplication.java | 7 +
.../persistence/PerformanceEntityReadTest.java | 173 +
.../persistence/PerformanceEntityWriteTest.java | 170 +
.../cassandra/QueryProcessorTest.java | 2 -
stack/core/src/test/resources/log4j.properties | 1 +
.../impl/EntityCollectionManagerImpl.java | 8 +-
.../mvcc/stage/write/WriteUniqueVerify.java | 2 +-
.../persistence/core/astyanax/CassandraFig.java | 4 +-
.../core/migration/MigrationManagerImpl.java | 6 +
.../graph/impl/GraphManagerImpl.java | 6 +-
.../impl/shard/impl/NodeShardCacheImpl.java | 7 +-
.../impl/shard/NodeShardCacheTest.java | 7 +-
.../index/impl/EsEntityIndexImpl.java | 185 +-
.../persistence/index/impl/EsProvider.java | 1 +
.../persistence/index/impl/EsQueryVistor.java | 151 +-
.../persistence/index/utils/LRUCache2.java | 151 -
.../index/impl/ElasticSearchTest.java | 273 --
.../impl/EntityConnectionIndexImplTest.java | 2 -
.../index/impl/EntityIndexMapUtils.java | 12 +-
.../persistence/index/impl/EntityIndexTest.java | 79 +-
stack/launcher/README.txt | 2 +-
.../resources/usergrid-standalone-context.xml | 2 +-
stack/pom.xml | 2 +-
.../apache/usergrid/rest/SystemResource.java | 32 +-
.../apache/usergrid/rest/AbstractRestIT.java | 6 +-
.../java/org/apache/usergrid/rest/BasicIT.java | 34 +-
.../usergrid/rest/ConcurrentRestITSuite.java | 54 +-
.../apache/usergrid/rest/NotificationsIT.java | 239 +
.../apache/usergrid/rest/PartialUpdateTest.java | 53 +-
.../org/apache/usergrid/rest/RestITSuite.java | 45 +-
.../apache/usergrid/rest/TomcatResource.java | 4 +-
.../ApplicationRequestCounterIT.java | 97 -
.../rest/applications/DevicesResourceIT.java | 87 -
.../collection/BadGrammarQueryTest.java | 79 -
.../collection/CollectionsResourceIT.java | 205 +
.../collection/PagingResourceIT.java | 239 -
.../activities/ActivityResourceIT.java | 188 +
.../collection/activities/AndOrQueryTest.java | 203 -
.../collection/activities/OrderByTest.java | 172 -
.../activities/PagingEntitiesTest.java | 141 -
.../collection/devices/DevicesResourceIT.java | 87 +
.../collection/groups/GeoPagingTest.java | 133 -
.../collection/groups/GroupResourceIT.java | 295 ++
.../collection/paging/PagingEntitiesTest.java | 141 +
.../collection/paging/PagingResourceIT.java | 301 ++
.../users/ConnectionResourceTest.java | 271 ++
.../collection/users/OwnershipResourceIT.java | 379 ++
.../collection/users/PermissionsResourceIT.java | 768 ++++
.../collection/users/RetrieveUsersTest.java | 87 +
.../collection/users/UserResourceIT.java | 1418 ++++++
.../users/extensions/TestResource.java | 51 +
.../events/ApplicationRequestCounterIT.java | 97 +
.../applications/queries/AndOrQueryTest.java | 203 +
.../queries/BadGrammarQueryTest.java | 79 +
.../applications/queries/GeoPagingTest.java | 133 +
.../applications/queries/MatrixQueryTests.java | 202 +
.../rest/applications/queries/OrderByTest.java | 172 +
.../applications/users/ActivityResourceIT.java | 188 -
.../users/CollectionsResourceIT.java | 205 -
.../users/ConnectionResourceTest.java | 271 --
.../applications/users/GroupResourceIT.java | 295 --
.../applications/users/MatrixQueryTests.java | 202 -
.../applications/users/OwnershipResourceIT.java | 379 --
.../users/PermissionsResourceIT.java | 768 ----
.../applications/users/RetrieveUsersTest.java | 87 -
.../rest/applications/users/UserResourceIT.java | 1418 ------
.../users/extensions/TestResource.java | 51 -
.../usergrid/rest/management/AccessTokenIT.java | 350 ++
.../usergrid/rest/management/AdminUsersIT.java | 807 ++++
.../rest/management/ManagementResourceIT.java | 397 +-
.../rest/management/OrganizationsIT.java | 378 ++
.../organizations/OrganizationResourceIT.java | 90 -
.../organizations/OrganizationsResourceIT.java | 322 --
.../rest/management/users/MUUserResourceIT.java | 654 ---
.../UsersOrganizationsResourceIT.java | 72 -
stack/rest/src/test/resources/log4j.properties | 18 +-
.../notifications/ApplicationQueueManager.java | 182 +-
.../notifications/NotificationsService.java | 31 +-
.../notifications/NotificationsTaskManager.java | 33 -
.../services/notifications/QueueJob.java | 4 +-
.../services/notifications/QueueListener.java | 235 +-
.../services/notifications/QueueManager.java | 2 -
.../notifications/SingleQueueTaskManager.java | 115 +-
.../services/notifications/TaskManager.java | 199 -
.../services/notifications/TaskTracker.java | 4 +-
.../services/notifications/gcm/GCMAdapter.java | 61 +-
.../resources/usergrid-services-context.xml | 9 +-
.../AbstractServiceNotificationIT.java | 22 +-
.../apns/NotificationsServiceIT.java | 12 +-
.../gcm/NotificationsServiceIT.java | 9 +-
stack/tools/README.md | 22 +-
.../org/apache/usergrid/tools/IndexRebuild.java | 99 +-
.../org/apache/usergrid/tools/ToolBase.java | 26 +-
119 files changed, 11428 insertions(+), 10653 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16d497ed/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index 5e46d7f,f85ba30..f62c3fd
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@@ -505,7 -503,8 +503,9 @@@ public class CpEntityManager implement
logger.debug("About to Write {}:{} version {}", new Object[] {
cpEntity.getId().getType(), cpEntity.getId().getUuid(), cpEntity.getVersion() });
+ cpEntity = ecm.update( cpEntity ).toBlockingObservable().last();
+ // using ecm.update() here causes Core tests to fail
- cpEntity = ecm.write( cpEntity ).toBlockingObservable().last();
++// cpEntity = ecm.write( cpEntity ).toBlockingObservable().last();
logger.debug("Wrote {}:{} version {}", new Object[] {
cpEntity.getId().getType(), cpEntity.getId().getUuid(), cpEntity.getVersion() });
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16d497ed/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
----------------------------------------------------------------------
diff --cc stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
index e150755,d685811..c2f3fcb
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
@@@ -23,7 -23,9 +23,13 @@@ import java.io.IOException
import java.util.LinkedHashMap;
import java.util.Map;
import javax.ws.rs.core.MediaType;
++<<<<<<< HEAD
+
++=======
+ import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertNotNull;
+ import static org.junit.Assert.fail;
++>>>>>>> e5bcbb23be66d12e428d817fd8b0b495793a939c
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
@@@ -57,7 -50,10 +63,14 @@@ public class PartialUpdateTest extends
put( "username", "bart" );
put( "employer", "Brawndo" );
put( "email", "bart@personal-email.example.com" );
++<<<<<<< HEAD
+ put( "location", geolocation);
++=======
+ put( "location", new LinkedHashMap<String, Object>() {{
+ put("latitude", "37.3638875323994");
+ put("longitude", "-122.12334411518498");
+ }} );
++>>>>>>> e5bcbb23be66d12e428d817fd8b0b495793a939c
}};
JsonNode userNode = mapper.readTree(
@@@ -70,32 -66,63 +83,68 @@@
assertNotNull( userNode );
String uuid = userNode.withArray("entities").get(0).get("uuid").asText();
assertNotNull( uuid );
-
refreshIndex( "test-organization", "test-app" );
- // Update bart's employer without specifying any required fields
- // (with uuid specified in URL)
-
- Map<String, Object> updateProperties = new LinkedHashMap<String, Object>() {{
- put( "employer", "Initech" );
- }};
-
- try {
- mapper.readTree(
- resource().path( "/test-organization/test-app/user/" + uuid )
- .queryParam( "access_token", adminAccessToken )
- .accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON )
- .put( String.class, updateProperties ));
-
- } catch ( UniformInterfaceException uie ) {
- fail("Update failed due to: " + uie.getResponse().getEntity(String.class));
+ // update user bart passing only an update to a property
+ for(int i=1; i<20; i++) {
+ geolocation.put("latitude", latitude += 0.00001);
+ geolocation.put("longitude", longitude += 0.00001);
+ Map<String, Object> updateProperties = new LinkedHashMap<String, Object>() {{
+ put("employer", "Initech");
+ put("location", geolocation);
+ }};
+
+ try {
+ JsonNode updatedNode = mapper.readTree(
+ resource().path("/test-organization/test-app/user/" + uuid)
+ .queryParam("access_token", adminAccessToken)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON)
+ .put(String.class, updateProperties));
+ assertNotNull(updatedNode);
+ assertNotEquals(latitude, updatedNode.get("entities").get(0).get("location").get("latitude"));
+ assertNotEquals(longitude, updatedNode.get("entities").get(0).get("location").get("longitude"));
-
+ } catch (UniformInterfaceException uie) {
+ fail("Update failed due to: " + uie.getResponse().getEntity(String.class));
+ }
}
+ refreshIndex( "test-organization", "test-app" );
+
+ userNode = mapper.readTree(
+ resource().path( "/test-organization/test-app/users/" + uuid )
+ .queryParam( "access_token", adminAccessToken )
+ .accept( MediaType.APPLICATION_JSON )
+ .get( String.class ));
+ assertNotNull( userNode );
+ assertEquals( "Initech", userNode.withArray("entities").get(0).get("employer").asText());
+
+
+ // Update bart's employer without specifying any required fields
+ // (this time with username specified in URL)
+
+ updateProperties = new LinkedHashMap<String, Object>() {{
+ put( "employer", "ACME Corporation" );
+ }};
+
+ try {
+ mapper.readTree(
+ resource().path( "/test-organization/test-app/users/bart")
+ .queryParam( "access_token", adminAccessToken )
+ .accept( MediaType.APPLICATION_JSON )
+ .type( MediaType.APPLICATION_JSON )
+ .put( String.class, updateProperties ));
+
+ } catch ( UniformInterfaceException uie ) {
+ fail("Update failed due to: " + uie.getResponse().getEntity(String.class));
+ }
+ refreshIndex( "test-organization", "test-app" );
+
+ userNode = mapper.readTree(
+ resource().path( "/test-organization/test-app/users/bart" )
+ .queryParam( "access_token", adminAccessToken )
+ .accept( MediaType.APPLICATION_JSON )
+ .get( String.class ));
+ assertNotNull( userNode );
+ assertEquals( "ACME Corporation", userNode.withArray("entities").get(0).get("employer").asText());
}
}
[5/6] git commit: Fixed tests in core, Query.addEqualityFilter,
and partial update.
Posted by to...@apache.org.
Fixed tests in core, Query.addEqualityFilter, and partial update.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d1dc7cd4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d1dc7cd4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d1dc7cd4
Branch: refs/heads/tempmerge
Commit: d1dc7cd43b5f2cb9b52ee2fc0c8fc43105c25be0
Parents: 7bb9c64
Author: amuramoto <am...@apigee.com>
Authored: Wed Oct 1 15:43:05 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Wed Oct 1 15:43:05 2014 -0700
----------------------------------------------------------------------
.../org/apache/usergrid/corepersistence/CpEntityManager.java | 8 ++++----
.../java/org/apache/usergrid/persistence/CollectionIT.java | 3 ---
.../org/apache/usergrid/persistence/index/query/Query.java | 2 +-
.../usergrid/persistence/index/query/tree/AndOperand.java | 2 +-
.../usergrid/persistence/index/query/tree/Property.java | 2 +-
.../usergrid/persistence/index/query/tree/StringLiteral.java | 2 +-
6 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d1dc7cd4/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index f62c3fd..e44f4b4 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@ -496,7 +496,7 @@ public class CpEntityManager implements EntityManager {
org.apache.usergrid.persistence.model.entity.Entity cpEntity =
ecm.load( entityId ).toBlockingObservable().last();
- cpEntity = CpEntityMapUtils.fromMap(
+ cpEntity = CpEntityMapUtils.fromMap(
cpEntity, entity.getProperties(), entity.getType(), true );
try {
@@ -504,8 +504,8 @@ public class CpEntityManager implements EntityManager {
cpEntity.getId().getType(), cpEntity.getId().getUuid(), cpEntity.getVersion() });
cpEntity = ecm.update( cpEntity ).toBlockingObservable().last();
- // using ecm.update() here causes Core tests to fail
-// cpEntity = ecm.write( cpEntity ).toBlockingObservable().last();
+ refreshIndex();
+ cpEntity = ecm.load( entityId ).toBlockingObservable().last();
logger.debug("Wrote {}:{} version {}", new Object[] {
cpEntity.getId().getType(), cpEntity.getId().getUuid(), cpEntity.getVersion() });
@@ -520,7 +520,7 @@ public class CpEntityManager implements EntityManager {
handleWriteUniqueVerifyException( entity, wuve );
}
}
-
+
// update in all containing collections and connection indexes
CpRelationManager rm = (CpRelationManager)getRelationManager( entity );
rm.updateContainingCollectionAndCollectionIndexes( entity, cpEntity );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d1dc7cd4/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java
index 57b4940..a93c343 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java
@@ -210,7 +210,6 @@ public class CollectionIT extends AbstractCoreIT {
assertEquals( 1, r.size() );
}
-
@Test
public void userFirstNameSearch() throws Exception {
LOG.debug( "userFirstNameSearch" );
@@ -255,9 +254,7 @@ public class CollectionIT extends AbstractCoreIT {
em.refreshIndex();
// search with the old username, should be no results
- query = new Query();
query.addEqualityFilter( "firstname", firstName );
-
r = em.searchCollection( em.getApplicationRef(), "users", query );
assertEquals( 0, r.size() );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d1dc7cd4/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/Query.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/Query.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/Query.java
index f845e63..a1e25da 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/Query.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/Query.java
@@ -739,7 +739,7 @@ public class Query {
/** Add a equal filter to this query. && with existing clauses */
public Query addEqualityFilter( String propName, Object value ) {
- Equal equality = new Equal( new ClassicToken( 0, "=" ) );
+ Equal equality = new Equal( new ClassicToken( 1, "=" ) );
addClause( equality, propName, value );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d1dc7cd4/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/tree/AndOperand.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/tree/AndOperand.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/tree/AndOperand.java
index a6b2f8b..f0444c7 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/tree/AndOperand.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/tree/AndOperand.java
@@ -27,7 +27,7 @@ import org.apache.usergrid.persistence.index.exceptions.IndexException;
public class AndOperand extends BooleanOperand {
public AndOperand() {
- super( new CommonToken( 0, "and" ) );
+ super( new CommonToken( 1, "and" ) );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d1dc7cd4/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/tree/Property.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/tree/Property.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/tree/Property.java
index f9bf67c..e2be661 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/tree/Property.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/tree/Property.java
@@ -40,7 +40,7 @@ public class Property extends Literal<String> {
public Property( String property ) {
- this( new ClassicToken( 0, property ) );
+ this( new ClassicToken( 1, property ) );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d1dc7cd4/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/tree/StringLiteral.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/tree/StringLiteral.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/tree/StringLiteral.java
index e3ab780..92f9033 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/tree/StringLiteral.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/tree/StringLiteral.java
@@ -45,7 +45,7 @@ public class StringLiteral extends Literal<String> {
public StringLiteral( String value ) {
- super( new ClassicToken( 0, value ) );
+ super( new ClassicToken( 1, value ) );
parseValue( value );
}