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/03/30 21:58:08 UTC
[04/50] incubator-usergrid git commit: Merge branch 'two-dot-o' into
USERGRID-448-appinfofix
Merge branch 'two-dot-o' into USERGRID-448-appinfofix
Conflicts:
stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/54ce892a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/54ce892a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/54ce892a
Branch: refs/heads/two-dot-o-dev
Commit: 54ce892a49b3bb737c25f19c27d5a15b3fb65a35
Parents: c0d5039 710a1a3
Author: Dave Johnson <dm...@apigee.com>
Authored: Thu Mar 5 11:12:27 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Thu Mar 5 11:12:27 2015 -0500
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 26 ++++---
.../corepersistence/CpEntityManagerFactory.java | 19 +++---
.../usergrid/corepersistence/CpWalker.java | 10 ++-
.../persistence/EntityManagerFactory.java | 3 +-
.../cassandra/EntityManagerFactoryImpl.java | 2 +-
.../corepersistence/StaleIndexCleanupTest.java | 34 ++++-----
.../cassandra/EntityManagerFactoryImplIT.java | 55 +++++++++------
.../usergrid/persistence/index/EntityIndex.java | 9 ++-
.../usergrid/persistence/index/IndexFig.java | 2 +-
.../index/IndexOperationMessage.java | 7 +-
.../index/impl/EsEntityIndexImpl.java | 72 ++++++++++++++------
.../index/impl/EsIndexBufferConsumerImpl.java | 27 ++++++--
.../persistence/index/impl/EntityIndexTest.java | 6 +-
stack/pom.xml | 24 ++++---
.../org/apache/usergrid/rest/IndexResource.java | 9 ++-
.../usergrid/rest/JobServiceBoostrap.java | 12 ++++
.../apache/usergrid/rest/AbstractRestIT.java | 8 ++-
.../apache/usergrid/rest/IndexResourceIT.java | 1 +
.../apache/usergrid/rest/SystemResourceIT.java | 60 ++++++++++++++++
.../rest/test/resource2point0/RestClient.java | 5 ++
.../endpoints/DatabaseResource.java | 39 +++++++++++
.../endpoints/SetupResource.java | 46 +++++++++++++
.../endpoints/SystemResource.java | 36 ++++++++++
.../cassandra/ManagementServiceImpl.java | 7 +-
.../services/notifications/QueueListener.java | 11 ++-
.../resources/usergrid-services-context.xml | 3 +-
.../resources/usergrid-custom-test.properties | 3 +
.../usergrid/cassandra/ClearShiroSubject.java | 19 +++---
28 files changed, 422 insertions(+), 133 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/54ce892a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
index 99e07a5,9aa36a0..0144ea8
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
@@@ -297,20 -310,24 +297,19 @@@ public class CpEntityManagerFactory imp
@Override
public void deleteApplication(UUID applicationId) throws Exception {
- // remove old appinfo Entity, which is in the Management App's appinfos collection
- //throw new UnsupportedOperationException("Delete application not supported");
++ // remove old application info Entity, which is in the Management App's application infos collection
+ EntityManager em = getEntityManager( this.getManagementAppId() );
+ Entity applicationInfo = em.get(new SimpleEntityRef(CpNamingUtils.APPLICATION_INFO, applicationId));
+ em.delete( applicationInfo );
- // create new Entity in deleted_appinfos collection, with same UUID and properties as deleted appinfo
- // remove old appinfo Entity, which is in the System App's appinfos collection
- EntityManager em = getEntityManager(CpNamingUtils.SYSTEM_APP_ID);
- Query q = Query.fromQL(String.format("select * where applicationUuid = '%s'", applicationId.toString()));
- Results results = em.searchCollection(em.getApplicationRef(), "appinfos", q);
++ // create new Entity in deleted_application_infos collection,
++ // with same UUID and properties as deleted application info
+ em.create( applicationId, CpNamingUtils.DELETED_APPLICATION_INFO, applicationInfo.getProperties() );
- Entity appToDelete = results.getEntity();
- if(appToDelete != null) {
- // create new Entity in deleted_appinfos collection, with same UUID and properties as deleted appinfo
- em.create("deleted_appinfo", appToDelete.getProperties());
- em.delete(appToDelete);
+ em.refreshIndex();
- }
// delete the application's index
- EntityIndex ei = managerCache.getEntityIndex(
- new ApplicationScopeImpl( new SimpleId(applicationId, TYPE_APPLICATION)) );
- EntityIndex ei = managerCache.getEntityIndex(new ApplicationScopeImpl(new SimpleId(applicationId, TYPE_APPLICATION)));
-- ei.deleteIndex();
- em.refreshIndex();
++ managerCache.getEntityIndex( new ApplicationScopeImpl(new SimpleId(applicationId, TYPE_APPLICATION)));
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/54ce892a/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/54ce892a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/54ce892a/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
----------------------------------------------------------------------
diff --cc stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
index 2f29735,9392d06..463daae
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
@@@ -122,17 -126,31 +126,32 @@@ public class EntityManagerFactoryImplI
em.refreshIndex();
+ Func2<UUID, Map<String, UUID> ,Boolean> findApps = new Func2<UUID,Map<String, UUID> ,Boolean>() {
+ @Override
+ public Boolean call(UUID applicationId, Map<String, UUID> apps) {
+ boolean found = false;
+ for (String appName : apps.keySet()) {
+ UUID appId = apps.get(appName);
+ if (appId.equals(applicationId)) {
+ found = true;
+ break;
+ }
+ }
+ return found;
+ }
+ };
+
boolean found = false;
- Map<String, UUID> deletedApps = emf.getDeletedApplications();
- for ( String appName : deletedApps.keySet() ) {
- UUID appId = deletedApps.get( appName );
- if ( appId.equals( applicationId )) {
- found = true;
+ for(int i=0;i<10;i++){
+ found = findApps.call(applicationId,emf.getDeletedApplications());
+ if(found){
break;
+ } else{
+ Thread.sleep(500);
}
}
- assertTrue("Deleted app not found in deleted apps collection", found );
+
+ assertTrue( "Deleted app must be found in in deleted apps collection", found );
// attempt to get entities in application's collections in various ways should all fail
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/54ce892a/stack/rest/src/test/java/org/apache/usergrid/rest/AbstractRestIT.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/54ce892a/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/54ce892a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------