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 2015/02/11 22:18:33 UTC
[24/25] incubator-usergrid git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-273
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-273
Conflicts:
stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
stack/core/src/main/java/org/apache/usergrid/corepersistence/HybridEntityManagerFactory.java
stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.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/02852a74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/02852a74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/02852a74
Branch: refs/heads/USERGRID-273
Commit: 02852a74a902a4abb287516b927b03406525ae15
Parents: b3951ee 198f479
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Feb 11 14:17:36 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Feb 11 14:17:36 2015 -0700
----------------------------------------------------------------------
.gitignore | 4 +-
portal/js/global/ug-service.js | 72 +++----
portal/js/push/push-config-controller.js | 18 +-
portal/js/push/push-config.html | 50 +++++
.../Usergrid.Notifications/App.xaml | 27 +++
.../Usergrid.Notifications/App.xaml.cs | 150 ++++++++++++++
.../Assets/Logo.scale-240.png | Bin 0 -> 2516 bytes
.../Assets/SmallLogo.scale-240.png | Bin 0 -> 753 bytes
.../Assets/SplashScreen.scale-240.png | Bin 0 -> 14715 bytes
.../Assets/Square71x71Logo.scale-240.png | Bin 0 -> 1122 bytes
.../Assets/StoreLogo.scale-240.png | Bin 0 -> 2200 bytes
.../Assets/WideLogo.scale-240.png | Bin 0 -> 4530 bytes
.../Client/EntityResponse.cs | 80 ++++++++
.../Client/IUsergridClient.cs | 123 ++++++++++++
.../Usergrid.Notifications/Client/PushClient.cs | 155 +++++++++++++++
.../Usergrid.Notifications/Client/Usergrid.cs | 122 ++++++++++++
.../Usergrid.Notifications/MainPage.xaml | 38 ++++
.../Usergrid.Notifications/MainPage.xaml.cs | 124 ++++++++++++
.../Package.StoreAssociation.xml | 194 +++++++++++++++++++
.../Usergrid.Notifications/Package.appxmanifest | 53 +++++
.../Properties/AssemblyInfo.cs | 29 +++
.../Usergrid.Notifications.csproj | 142 ++++++++++++++
.../Usergrid.Notifications/packages.config | 25 +++
.../notifications/packages/repositories.config | 4 +
.../corepersistence/CpEntityManagerFactory.java | 56 +++++-
.../persistence/EntityManagerFactory.java | 7 +
.../cassandra/EntityManagerFactoryImpl.java | 8 +-
.../usergrid/persistence/entities/Notifier.java | 31 ++-
.../cassandra/EntityManagerFactoryImplIT.java | 65 ++++---
.../usergrid/persistence/index/EntityIndex.java | 2 +
.../index/impl/EsEntityIndexBatchImpl.java | 14 +-
.../index/impl/EsEntityIndexImpl.java | 115 +++++------
.../persistence/index/impl/EsIndexCache.java | 12 +-
.../persistence/queue/impl/QueueScopeImpl.java | 4 -
.../rest/applications/ApplicationResource.java | 32 ++-
.../applications/ApplicationDeleteTest.java | 54 ++++++
.../collection/groups/GroupResourceIT.java | 2 +-
stack/services/pom.xml | 5 +
.../notifications/ProviderAdapterFactory.java | 5 +
.../impl/ApplicationQueueManagerImpl.java | 8 +-
.../wns/TranslatedNotification.java | 50 +++++
.../services/notifications/wns/WNSAdapter.java | 163 ++++++++++++++++
42 files changed, 1857 insertions(+), 186 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/02852a74/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 c9319fb,93eb15e..bf85b45
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
@@@ -163,17 -147,27 +163,18 @@@ public class CpEntityManagerFactory imp
}
- public ManagerCache getManagerCache() {
-
- if ( managerCache == null ) {
-
- // TODO: better solution for getting injector?
- Injector injector = CpSetup.getInjector();
-
- managerCache = injector.getInstance( ManagerCache.class );
-
- dataMigrationManager = injector.getInstance( DataMigrationManager.class );
- }
- return managerCache;
- }
-
+// public ManagerCache getManagerCache() {
+//
+// if ( managerCache == null ) {
+// managerCache = injector.getInstance( ManagerCache.class );
+//
+// dataMigrationManager = injector.getInstance( DataMigrationManager.class );
+// }
+// return managerCache;
+// }
- @Override
- public String getImplementationDescription() throws Exception {
- return IMPLEMENTATION_DESCRIPTION;
- }
+
@Override
public EntityManager getEntityManager(UUID applicationId) {
try {
@@@ -413,6 -423,11 +444,11 @@@
managerCache.getEntityCollectionManager( collScope ).load( targetId )
.toBlockingObservable().lastOrDefault(null);
+ if ( e == null ) {
+ logger.warn("Applicaion {} in index but not found in collections", targetId );
+ continue;
- }
-
++ }
++
appMap.put(
(String)e.getField( PROPERTY_NAME ).getValue(),
(UUID)e.getField( "applicationUuid" ).getValue());
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/02852a74/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/02852a74/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
index 086b039,a598a82..b7808d8
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
@@@ -116,10 -116,20 +116,9 @@@ public class EntityManagerFactoryImpl i
}
-
/*
* (non-Javadoc)
- *
- * @see org.apache.usergrid.core.Datastore#getImplementationDescription()
- */
- @Override
- public String getImplementationDescription() {
- return IMPLEMENTATION_DESCRIPTION;
- }
-
-
- /*
- * (non-Javadoc)
- *
+ *
* @see org.apache.usergrid.core.Datastore#getEntityDao(java.util.UUID,
* java.util.UUID)
*/
@@@ -208,7 -218,14 +207,14 @@@
return applicationId;
}
-
+
+ @Override
+ public void deleteApplication(UUID applicationId) throws Exception {
+ // TODO implement deleteApplication in Usergrid 1 code base (master branch?)
- throw new UnsupportedOperationException("Not supported.");
++ throw new UnsupportedOperationException("Not supported.");
+ }
+
+
private String buildAppName( String organizationName, String name ) {
return StringUtils.lowerCase( name.contains( "/" ) ? name : organizationName + "/" + name );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/02852a74/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 e953fd2,8841e56..f69eed3
--- 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
@@@ -17,42 -17,25 +17,25 @@@
package org.apache.usergrid.persistence.cassandra;
- import java.util.ArrayList;
- import java.util.LinkedHashMap;
- import java.util.List;
- import java.util.Map;
- import java.util.UUID;
-
- import org.junit.AfterClass;
- import org.junit.Before;
- import org.junit.BeforeClass;
- import org.junit.ClassRule;
- import org.junit.Test;
- import org.slf4j.Logger;
- import org.slf4j.LoggerFactory;
-
import org.apache.commons.lang3.RandomStringUtils;
-
import org.apache.usergrid.AbstractCoreIT;
- import org.apache.usergrid.cassandra.SpringResource;
+ import org.apache.usergrid.cassandra.CassandraResource;
+ import org.apache.usergrid.cassandra.Concurrent;
-import org.apache.usergrid.persistence.*;
+import org.apache.usergrid.persistence.Entity;
+import org.apache.usergrid.persistence.EntityManager;
+import org.apache.usergrid.persistence.EntityManagerFactory;
+import org.apache.usergrid.persistence.Results;
+import org.apache.usergrid.persistence.SimpleEntityRef;
import org.apache.usergrid.persistence.cassandra.util.TraceTag;
import org.apache.usergrid.persistence.cassandra.util.TraceTagManager;
import org.apache.usergrid.persistence.cassandra.util.TraceTagReporter;
import org.apache.usergrid.persistence.index.impl.ElasticSearchResource;
- import org.apache.usergrid.setup.ConcurrentProcessSingleton;
-import org.junit.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
- import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertFalse;
- import static org.junit.Assert.assertNotNull;
- import static org.junit.Assert.assertTrue;
+ import java.util.*;
+ import static org.junit.Assert.*;
-@Concurrent()
public class EntityManagerFactoryImplIT extends AbstractCoreIT {
@SuppressWarnings("PointlessBooleanExpression")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/02852a74/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
index d239641,e221f0e..ef510b2
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
@@@ -105,8 -100,9 +105,10 @@@ public interface EntityIndex
* Check health of this specific index.
*/
public Health getIndexHealth();
+
+ public void deleteIndex();
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/02852a74/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/02852a74/stack/services/pom.xml
----------------------------------------------------------------------