You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2015/03/03 21:38:38 UTC
[16/18] incubator-usergrid git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-280
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-280
# By Shawn Feldman (15) and Dave Johnson (2)
# Via Shawn Feldman (9) and Dave Johnson (1)
* 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
Removing unnecessary test class and commented out dependencies.
Exclude Codehaus Jackson JAX-RS dependency, plus some better logging & test improvements.
compilation
fix compilation
indexbuffer: update method names
index message comments
undo change
change config
add batching
Add futures to batch and refresh
Add batch of batches
add batches of batches
removing future, moving around some initialization code
add comments
add blocking queue
Adding metrics to cp
adding index buffer
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/749905fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/749905fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/749905fe
Branch: refs/heads/two-dot-o
Commit: 749905fe7a6c353e2ab38723f3089e3af73f65bc
Parents: ec1c94d 489bf45
Author: grey <gr...@apigee.com>
Authored: Mon Mar 2 16:21:32 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Mon Mar 2 16:21:32 2015 -0800
----------------------------------------------------------------------
.../batch/service/JobSchedulerService.java | 2 +-
.../corepersistence/CpEntityManager.java | 4 +-
.../corepersistence/CpRelationManager.java | 6 +-
.../results/FilteringLoader.java | 42 ++---
.../apache/usergrid/metrics/MetricsFactory.java | 112 ------------
.../main/resources/usergrid-core-context.xml | 4 +-
.../usergrid/persistence/CollectionIT.java | 2 +-
stack/corepersistence/common/pom.xml | 12 ++
.../persistence/core/future/BetterFuture.java | 43 +++++
.../persistence/core/guice/CommonModule.java | 6 +-
.../core/metrics/MetricsFactory.java | 34 ++++
.../core/metrics/MetricsFactoryImpl.java | 113 ++++++++++++
.../persistence/core/metrics/MetricsFig.java | 33 ++++
stack/corepersistence/pom.xml | 1 +
.../persistence/index/EntityIndexBatch.java | 32 ++--
.../persistence/index/IndexBatchBuffer.java | 36 ++++
.../persistence/index/IndexBufferConsumer.java | 26 +++
.../persistence/index/IndexBufferProducer.java | 36 ++++
.../usergrid/persistence/index/IndexFig.java | 45 ++++-
.../index/IndexOperationMessage.java | 64 +++++++
.../persistence/index/guice/IndexModule.java | 17 +-
.../index/impl/EsEntityIndexBatchImpl.java | 130 +++----------
.../index/impl/EsEntityIndexImpl.java | 16 +-
.../index/impl/EsIndexBufferConsumerImpl.java | 183 +++++++++++++++++++
.../index/impl/EsIndexBufferProducerImpl.java | 57 ++++++
.../index/impl/CorePerformanceIT.java | 44 ++---
.../impl/EntityConnectionIndexImplTest.java | 7 +-
.../persistence/index/impl/EntityIndexTest.java | 106 ++++++++---
stack/rest/pom.xml | 37 +---
.../org/apache/usergrid/rest/SimplestTest.java | 35 ----
.../collection/BrowserCompatibilityTest.java | 5 +-
.../collection/CollectionsResourceIT.java | 3 +-
.../applications/queries/GeoPagingTest.java | 44 ++---
.../rest/management/ImportResourceIT.java | 1 -
.../endpoints/CollectionEndpoint.java | 155 ++++++++++++----
.../endpoints/mgmt/OrgResource.java | 81 ++++++--
.../rest/test/resource2point0/model/Entity.java | 6 -
stack/services/pom.xml | 6 +
.../usergrid/services/guice/ServiceModule.java | 2 -
.../notifications/NotificationsService.java | 4 +-
.../services/notifications/QueueJob.java | 6 +-
.../services/notifications/QueueListener.java | 6 +-
.../impl/ApplicationQueueManagerImpl.java | 2 +-
.../services/queues/ImportQueueListener.java | 7 +-
.../usergrid/services/queues/QueueListener.java | 7 +-
.../resources/usergrid-services-context.xml | 1 -
.../apns/NotificationsServiceIT.java | 2 +-
.../gcm/NotificationsServiceIT.java | 4 +-
stack/test-utils/pom.xml | 11 --
49 files changed, 1119 insertions(+), 519 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/749905fe/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrgResource.java
----------------------------------------------------------------------
diff --cc stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrgResource.java
index 93e7d6b,1a940bd..2786cb0
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrgResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrgResource.java
@@@ -38,9 -43,10 +44,10 @@@ import java.io.StringReader
* Manages the Management/ORG endpoint.
*/
public class OrgResource extends NamedResource {
+ private static final Logger logger = LoggerFactory.getLogger(OrgResource.class);
public OrgResource( final ClientContext context, final UrlResource parent ) {
- super( "orgs", context, parent );
+ super( "organizations", context, parent );
}
@@@ -90,19 -121,23 +122,32 @@@
return org;
}
+ public Organization post(Organization organization, Token token){
+ ApiResponse response = getResource(true,token).type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON )
+ .post( ApiResponse.class,organization );
+
+ Organization org = new Organization(response);
+ org.setOwner( response );
+
+ return org;
+ }
public Organization put(Organization organization){
- ApiResponse response = getResource().type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON )
- .put(ApiResponse.class, organization);
+
+ // use string type so we can log actual response from server
+ String responseString = getResource().type( MediaType.APPLICATION_JSON_TYPE )
+ .accept(MediaType.APPLICATION_JSON)
+ .put(String.class, organization);
+
+ logger.debug("Response from put: " + responseString);
+
+ ObjectMapper mapper = new ObjectMapper();
+ ApiResponse response;
+ try {
+ response = mapper.readValue( new StringReader(responseString), ApiResponse.class);
+ } catch (IOException e) {
+ throw new RuntimeException("Error parsing response", e);
+ }
Organization org = new Organization(response);
org.setOwner( response );