You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/02/26 19:18:35 UTC
[02/50] [abbrv] incubator-usergrid git commit: 1) PUT on
// will not restore a deleted app and 2)
/applications?deleted=true will return list of deleted applications.
1) PUT on /<org-name>/<app-id> will not restore a deleted app and 2) /applications?deleted=true will return list of deleted applications.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f004f5a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f004f5a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f004f5a3
Branch: refs/heads/USERGRID-280
Commit: f004f5a31c32bc329e859fd203315cea41a55fe9
Parents: fe8f404
Author: Dave Johnson <dm...@apigee.com>
Authored: Sat Feb 21 09:02:01 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Sat Feb 21 09:02:01 2015 -0500
----------------------------------------------------------------------
.../corepersistence/CpEntityManagerFactory.java | 112 +++++++++++++++----
.../corepersistence/util/CpNamingUtils.java | 3 +
.../persistence/EntityManagerFactory.java | 7 ++
.../cassandra/EntityManagerFactoryImpl.java | 21 +++-
.../PerformanceEntityRebuildIndexTest.java | 16 ++-
.../cassandra/EntityManagerFactoryImplIT.java | 66 ++++++++++-
stack/pom.xml | 6 +-
stack/rest/pom.xml | 43 ++++---
.../org/apache/usergrid/rest/RootResource.java | 25 +++--
.../rest/applications/ApplicationResource.java | 72 ++++++++----
.../applications/ApplicationsResource.java | 28 +++--
11 files changed, 293 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f004f5a3/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
index 01691d4..59f2c9e 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
@@ -22,15 +22,7 @@ import com.google.inject.Injector;
import com.yammer.metrics.annotation.Metered;
import static java.lang.String.CASE_INSENSITIVE_ORDER;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.UUID;
+import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.commons.lang.StringUtils;
@@ -59,6 +51,7 @@ import org.apache.usergrid.persistence.core.util.Health;
import org.apache.usergrid.persistence.entities.Application;
import org.apache.usergrid.persistence.exceptions.ApplicationAlreadyExistsException;
import org.apache.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException;
+import org.apache.usergrid.persistence.exceptions.EntityNotFoundException;
import org.apache.usergrid.persistence.exceptions.OrganizationAlreadyExistsException;
import org.apache.usergrid.persistence.graph.Edge;
import org.apache.usergrid.persistence.graph.GraphManager;
@@ -317,6 +310,8 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
@Override
public void deleteApplication(UUID applicationId) throws Exception {
+ //throw new UnsupportedOperationException("Delete application not supported");
+
// 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()));
@@ -337,6 +332,43 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
@Override
+ public void restoreApplication(UUID applicationId) throws Exception {
+
+ // remove old delete_appinfos Entity
+ 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(), "deleted_appinfos", q);
+ Entity appToRestore = results.getEntity();
+
+ if ( appToRestore == null ) {
+ throw new EntityNotFoundException("Cannot restore. Deleted Application not found: " + applicationId );
+ }
+
+ em.delete( appToRestore );
+
+ // restore entity in appinfo collection
+ Map<String, Object> appProps = appToRestore.getProperties();
+ appProps.remove("uuid");
+ appProps.put("type", "appinfo");
+ Entity restoredApp = em.create("appinfo", appToRestore.getProperties());
+
+ em.refreshIndex();
+
+ // rebuild the apps index
+ this.rebuildApplicationIndexes(applicationId, new ProgressObserver() {
+ @Override
+ public void onProgress(EntityRef entity) {
+ logger.debug("Restored entity {}:{}", entity.getType(), entity.getUuid());
+ }
+ @Override
+ public long getWriteDelayTime() {
+ return 0;
+ }
+ });
+ }
+
+
+ @Override
public UUID importApplication(
String organization, UUID applicationId,
String name, Map<String, Object> properties) throws Exception {
@@ -380,31 +412,56 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
public UUID lookupApplication( String name ) throws Exception {
init();
- EntityManager em = getEntityManager( CpNamingUtils.SYSTEM_APP_ID );
+ // TODO: why does this not work for restored apps
+
+// EntityManager em = getEntityManager( CpNamingUtils.SYSTEM_APP_ID );
+// final EntityRef alias = em.getAlias( CpNamingUtils.APPINFOS, name );
+// if ( alias == null ) {
+// return null;
+// }
+// final Entity entity = em.get( alias );
+// if ( entity == null ) {
+// return null;
+// }
+// final UUID property = ( UUID ) entity.getProperty( "applicationUuid" );
+// return property;
+ Query q = Query.fromQL( PROPERTY_NAME + " = '" + name + "'");
- final EntityRef alias = em.getAlias( CpNamingUtils.APPINFOS, name );
+ EntityManager em = getEntityManager(CpNamingUtils.SYSTEM_APP_ID);
- if ( alias == null ) {
+ Results results = em.searchCollection( em.getApplicationRef(), "appinfos", q);
+
+ if ( results.isEmpty() ) {
return null;
}
- final Entity entity = em.get( alias );
-
- if ( entity == null ) {
- return null;
+ Entity entity = results.iterator().next();
+ Object uuidObject = entity.getProperty("applicationUuid");
+ if ( uuidObject instanceof UUID ) {
+ return (UUID)uuidObject;
}
+ return UUIDUtils.tryExtractUUID( entity.getProperty("applicationUuid").toString() );
+ }
- final UUID property = ( UUID ) entity.getProperty( "applicationUuid" );
+ @Override
+ @Metered(group = "core", name = "EntityManagerFactory_getApplication")
+ public Map<String, UUID> getApplications() throws Exception {
+ return getApplications( false );
+ }
- return property;
+
+ @Override
+ @Metered(group = "core", name = "EntityManagerFactory_getApplication")
+ public Map<String, UUID> getDeletedApplications() throws Exception {
+ return getApplications( true );
}
@Override
@Metered(group = "core", name = "EntityManagerFactory_getApplication")
- public Map<String, UUID> getApplications() throws Exception {
+ public Map<String, UUID> getApplications(boolean deleted) throws Exception {
Map<String, UUID> appMap = new HashMap<String, UUID>();
@@ -415,7 +472,15 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
Application app = em.getApplication();
Id fromEntityId = new SimpleId( app.getUuid(), app.getType() );
- String edgeType = CpNamingUtils.getEdgeTypeFromCollectionName( CpNamingUtils.APPINFOS );
+ final String scopeName;
+ final String edgeType;
+ if ( deleted ) {
+ edgeType = CpNamingUtils.getEdgeTypeFromCollectionName(CpNamingUtils.DELETED_APPINFOS);
+ scopeName = CpNamingUtils.getCollectionScopeNameFromCollectionName(CpNamingUtils.DELETED_APPINFOS);
+ } else {
+ edgeType = CpNamingUtils.getEdgeTypeFromCollectionName(CpNamingUtils.APPINFOS);
+ scopeName = CpNamingUtils.getCollectionScopeNameFromCollectionName(CpNamingUtils.APPINFOS);
+ }
logger.debug("getApplications(): Loading edges of edgeType {} from {}:{}",
new Object[] { edgeType, fromEntityId.getType(), fromEntityId.getUuid() } );
@@ -436,9 +501,9 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
});
CollectionScope collScope = new CollectionScopeImpl(
- appScope.getApplication(),
- appScope.getApplication(),
- CpNamingUtils.getCollectionScopeNameFromCollectionName( CpNamingUtils.APPINFOS ));
+ appScope.getApplication(),
+ appScope.getApplication(),
+ scopeName);
org.apache.usergrid.persistence.model.entity.Entity e =
managerCache.getEntityCollectionManager( collScope ).load( targetId )
@@ -779,4 +844,5 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
return ecm.getHealth();
}
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f004f5a3/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java
index 0d7b6ff..8208855 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java
@@ -66,6 +66,9 @@ public class CpNamingUtils {
* The app infos entity object type. This holds the app name, appId, and org name
*/
public static final String APPINFOS = "appinfos";
+
+ public static final String DELETED_APPINFOS = "deleted_appinfos";
+
/**
* The name of the map that holds our entity id->type mapping
*/
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f004f5a3/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java b/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
index 6a9095d..2881111 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
@@ -19,6 +19,8 @@ package org.apache.usergrid.persistence;
import java.util.Map;
import java.util.UUID;
+
+import com.yammer.metrics.annotation.Metered;
import org.apache.usergrid.persistence.core.util.Health;
import org.apache.usergrid.persistence.index.EntityIndex;
import org.springframework.context.ApplicationContext;
@@ -95,8 +97,11 @@ public interface EntityManagerFactory {
*
* @throws Exception the exception
*/
+ @Metered(group = "core", name = "EntityManagerFactory_getApplication")
public abstract Map<String, UUID> getApplications() throws Exception;
+ public Map<String, UUID> getDeletedApplications() throws Exception;
+
public abstract void setup() throws Exception;
public abstract Map<String, String> getServiceProperties();
@@ -165,6 +170,8 @@ public interface EntityManagerFactory {
public Health getEntityStoreHealth();
+ void restoreApplication(UUID applicationId) throws Exception;
+
public interface ProgressObserver {
public void onProgress( EntityRef entity);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f004f5a3/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
----------------------------------------------------------------------
diff --git 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
index 535a14e..05cbf5e 100644
--- 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
@@ -330,8 +330,7 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
return applications;
}
-
- @Override
+ @Override
public boolean setServiceProperty( String name, String value ) {
try {
cass.setColumn( cass.getSystemKeyspace(), PROPERTIES_CF, PROPERTIES_CF, name, value );
@@ -473,6 +472,22 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
@Override
public Health getEntityStoreHealth() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException("Not supported in v1.");
+ }
+
+ @Override
+ public void restoreApplication(UUID applicationId) throws Exception {
+ throw new UnsupportedOperationException("Not supported in v1");
}
+
+ @Override
+ public Map<String, UUID> getDeletedApplications() throws Exception {
+ throw new UnsupportedOperationException("Not supported in v1");
+ }
+
+ @Override
+ public Map<String, UUID> getApplications(boolean deleted) throws Exception {
+ throw new UnsupportedOperationException("Not supported in v1");
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f004f5a3/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
index 52b6fe4..4bbce9c 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
@@ -218,8 +218,12 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
try {
+ // do it forwards
setup.getEmf().rebuildCollectionIndex( em.getApplicationId(), "catherders", false, po );
+ // and backwards, just to make sure both cases are covered
+ setup.getEmf().rebuildCollectionIndex( em.getApplicationId(), "catherders", true, po );
+
reporter.report();
registry.remove( meterName );
logger.info("Rebuilt index");
@@ -312,9 +316,13 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
// ----------------- delete the system and application indexes
logger.debug("Deleting app index and system app index");
- //deleteIndex( CpNamingUtils.SYSTEM_APP_ID );
+
deleteIndex( em.getApplicationId() );
+ // deleting sytem app index will interfere with other concurrently running tests
+ //deleteIndex( CpNamingUtils.SYSTEM_APP_ID );
+
+
// ----------------- test that we can read them, should fail
logger.debug("Reading data, should fail this time ");
@@ -335,7 +343,7 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
int counter = 0;
@Override
- public void onProgress( final EntityRef entity ) {
+ public void onProgress( final EntityRef entity ) {
meter.mark();
logger.debug("Indexing {}:{}", entity.getType(), entity.getUuid());
@@ -345,8 +353,6 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
counter++;
}
-
-
@Override
public long getWriteDelayTime() {
return 0;
@@ -355,6 +361,8 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
try {
+ setup.getEmf().rebuildInternalIndexes( po );
+
setup.getEmf().rebuildApplicationIndexes( em.getApplicationId(), po );
reporter.report();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f004f5a3/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
----------------------------------------------------------------------
diff --git 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
index 09e7ce1..850ac6b 100644
--- 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
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
+import org.apache.usergrid.persistence.*;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -33,11 +34,6 @@ import org.slf4j.LoggerFactory;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.usergrid.AbstractCoreIT;
-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;
@@ -123,10 +119,27 @@ public class EntityManagerFactoryImplIT extends AbstractCoreIT {
em.refreshIndex();
+ // TODO: this assertion should work!
+ //assertNotNull( "cannot lookup app by name", setup.getEmf().lookupApplication("test-app-" + rand) );
+
// delete the application
setup.getEmf().deleteApplication( applicationId );
+ em.refreshIndex();
+
+ 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;
+ break;
+ }
+ }
+
+ assertTrue("Deleted app not found in deleted apps collection", found );
+
// attempt to get entities in application's collections in various ways should all fail
assertNull( setup.getEmf().lookupApplication("test-app-" + rand) );
@@ -138,6 +151,49 @@ public class EntityManagerFactoryImplIT extends AbstractCoreIT {
assertNotEquals( appName, "test-app-" + rand );
}
+ // restore the app
+
+ emf.restoreApplication( applicationId );
+
+ emf.rebuildAllIndexes(new EntityManagerFactory.ProgressObserver() {
+ @Override
+ public void onProgress(EntityRef entity) {
+ logger.debug("Reindexing {}:{}", entity.getType(), entity.getUuid() );
+ }
+
+ @Override
+ public long getWriteDelayTime() {
+ return 0;
+ }
+ });
+
+ // test to see that app now works and is happy
+
+ // it should not be found in the deleted apps collection
+ found = false;
+ deletedApps = emf.getDeletedApplications();
+ for ( String appName : deletedApps.keySet() ) {
+ UUID appId = deletedApps.get( appName );
+ if ( appId.equals( applicationId )) {
+ found = true;
+ break;
+ }
+ }
+ assertFalse("Restored app found in deleted apps collection", found);
+
+ found = false;
+ appMap = setup.getEmf().getApplications();
+ for ( String appName : appMap.keySet() ) {
+ UUID appId = appMap.get( appName );
+ if ( appId.equals( applicationId )) {
+ found = true;
+ break;
+ }
+ }
+ assertTrue("Restored app not found in apps collection", found);
+
+ // TODO: this assertion should work!
+ //assertNotNull(setup.getEmf().lookupApplication("test-app-" + rand));
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f004f5a3/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 12fac3f..2735366 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -1565,12 +1565,14 @@
<exclude>**/aws.properties</exclude>
<exclude>**/tempExport*</exclude>
<exclude>loadtests/loadtest_setup.sh</exclude>
- <exclude>loadtests/gatling/user-files/request-bodies/**</exclude>
+ <exclude>loadtests/gatling/user-files/request-bodies/**</exclude>
+
<!-- other -->
<exclude>**/m2/**</exclude>
<exclude>**/*.asc</exclude>
<exclude>**/dummy.txt</exclude>
- <exclude>**/cloudbees.xml</exclude>
+ <exclude>**/cloudbees.xml</exclude>
+ <exclude>**/catalina_base/**</exclude>
<exlude>loadtests/gatling/lib/**</exlude>
<exlude>loadtests/gatling/user-files/**</exlude>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f004f5a3/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index e07e218..0680da2 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -45,12 +45,11 @@
<id>arquillian-tomcat</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<dependencies>
-
<!--embedded mode-->
<!--<dependency>-->
<!--<groupId>org.apache.tomcat.embed</groupId>-->
@@ -429,26 +428,26 @@
<!-- Some arquillian dependency runs and old version of guice. We're overridding it here so that we include
the right value into the test scope -->
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>${guice.version}</version>
- <scope>test</scope>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.google.inject</groupId>-->
+ <!--<artifactId>guice</artifactId>-->
+ <!--<version>${guice.version}</version>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-multibindings</artifactId>
- <version>${guice.version}</version>
- <scope>test</scope>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.google.inject.extensions</groupId>-->
+ <!--<artifactId>guice-multibindings</artifactId>-->
+ <!--<version>${guice.version}</version>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-assistedinject</artifactId>
- <version>${guice.version}</version>
- <scope>test</scope>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.google.inject.extensions</groupId>-->
+ <!--<artifactId>guice-assistedinject</artifactId>-->
+ <!--<version>${guice.version}</version>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
<!-- documentation here
@@ -463,10 +462,6 @@
<type>pom</type>
</dependency>
-
-
-
-
<!-- use the external test client. Just depend on the maven jetty plugin to launch jetty -->
<dependency>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f004f5a3/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java
index f324d28..27eff28 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java
@@ -111,9 +111,10 @@ public class RootResource extends AbstractContextResource implements MetricProce
@RequireSystemAccess
@GET
@Path("applications")
- public JSONWithPadding getAllApplications( @Context UriInfo ui,
- @QueryParam("callback") @DefaultValue("callback") String callback )
- throws URISyntaxException {
+ public JSONWithPadding getAllApplications(
+ @Context UriInfo ui,
+ @QueryParam("deleted") @DefaultValue("false") Boolean deleted,
+ @QueryParam("callback") @DefaultValue("callback") String callback ) throws URISyntaxException {
logger.info( "RootResource.getAllApplications" );
@@ -122,7 +123,11 @@ public class RootResource extends AbstractContextResource implements MetricProce
Map<String, UUID> applications = null;
try {
- applications = emf.getApplications();
+ if ( deleted ) {
+ applications = emf.getDeletedApplications();
+ } else {
+ applications = emf.getApplications();
+ }
response.setSuccess();
response.setApplications( applications );
}
@@ -141,7 +146,7 @@ public class RootResource extends AbstractContextResource implements MetricProce
public JSONWithPadding getAllApplications2( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws URISyntaxException {
- return getAllApplications( ui, callback );
+ return getAllApplications( ui, false, callback );
}
@@ -162,16 +167,16 @@ public class RootResource extends AbstractContextResource implements MetricProce
/**
* Return status of this Usergrid instance in JSON format.
- *
+ *
* By Default this end-point will ignore errors but if you call it with ignore_status=false
* then it will return HTTP 500 if either the Entity store or the Index for the management
* application are in a bad state.
- *
+ *
* @param ignoreError Ignore any errors and return status no matter what.
*/
@GET
@Path("status")
- public JSONWithPadding getStatus(
+ public JSONWithPadding getStatus(
@QueryParam("ignore_error") @DefaultValue("true") Boolean ignoreError,
@QueryParam("callback") @DefaultValue("callback") String callback ) {
@@ -195,10 +200,10 @@ public class RootResource extends AbstractContextResource implements MetricProce
node.put( "version", usergridSystemMonitor.getBuildNumber() );
// Hector status, for backwards compatibility
- node.put( "cassandraAvailable", usergridSystemMonitor.getIsCassandraAlive() );
+ node.put( "cassandraAvailable", usergridSystemMonitor.getIsCassandraAlive() );
// Core Persistence Collections module status
- node.put( "cassandraStatus", emf.getEntityStoreHealth().toString() );
+ node.put( "cassandraStatus", emf.getEntityStoreHealth().toString() );
// Core Persistence Query Index module status for Management App Index
EntityManager em = emf.getEntityManager( emf.getManagementAppId() );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f004f5a3/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java
index 6a3c94c..2c252e7 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java
@@ -20,18 +20,10 @@ package org.apache.usergrid.rest.applications;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.Map;
+import java.util.Properties;
import java.util.UUID;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
+import javax.ws.rs.*;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.PathSegment;
@@ -328,9 +320,9 @@ public class ApplicationResource extends ServiceResource {
@POST
@Path("token")
@Consumes(APPLICATION_JSON)
- public Response getAccessTokenPostJson( @Context UriInfo ui,
- @HeaderParam("Authorization") String authorization,
- Map<String, Object> json,
+ public Response getAccessTokenPostJson( @Context UriInfo ui,
+ @HeaderParam("Authorization") String authorization,
+ Map<String, Object> json,
@QueryParam("callback") @DefaultValue("") String callback ) throws Exception {
String grant_type = ( String ) json.get( "grant_type" );
@@ -352,7 +344,7 @@ public class ApplicationResource extends ServiceResource {
}
}
- return getAccessToken( ui, authorization, grant_type, username, password, pin, client_id,
+ return getAccessToken( ui, authorization, grant_type, username, password, pin, client_id,
client_secret, code, ttl, redirect_uri, callback );
}
@@ -384,7 +376,7 @@ public class ApplicationResource extends ServiceResource {
@Path("credentials")
@RequireApplicationAccess
@Produces(MediaType.APPLICATION_JSON)
- public JSONWithPadding generateKeys( @Context UriInfo ui,
+ public JSONWithPadding generateKeys( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception {
logger.debug( "AuthResource.keys" );
@@ -393,7 +385,7 @@ public class ApplicationResource extends ServiceResource {
throw new UnauthorizedException();
}
- ClientCredentialsInfo kp = new ClientCredentialsInfo(
+ ClientCredentialsInfo kp = new ClientCredentialsInfo(
management.getClientIdForApplication( services.getApplicationId() ),
management.newClientSecretForApplication( services.getApplicationId() ) );
@@ -405,12 +397,12 @@ public class ApplicationResource extends ServiceResource {
@GET
@Path("authorize")
- public Viewable showAuthorizeForm(
- @Context UriInfo ui,
+ public Viewable showAuthorizeForm(
+ @Context UriInfo ui,
@QueryParam("response_type") String response_type,
@QueryParam("client_id") String client_id,
@QueryParam("redirect_uri") String redirect_uri,
- @QueryParam("scope") String scope,
+ @QueryParam("scope") String scope,
@QueryParam("state") String state ) {
try {
@@ -443,7 +435,7 @@ public class ApplicationResource extends ServiceResource {
@POST
@Path("authorize")
@Produces(MediaType.TEXT_HTML)
- public Response handleAuthorizeForm( @Context UriInfo ui,
+ public Response handleAuthorizeForm( @Context UriInfo ui,
@FormParam("response_type") String response_type,
@FormParam("client_id") String client_id,
@FormParam("redirect_uri") String redirect_uri,
@@ -501,21 +493,55 @@ public class ApplicationResource extends ServiceResource {
}
+ @PUT
+ @RequireOrganizationAccess
+ @Override
+ public JSONWithPadding executePut( @Context UriInfo ui, String body,
+ @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception {
+
+ if ( applicationId == null ) {
+ throw new IllegalArgumentException("Application ID not specified in request");
+ }
+
+ ApplicationInfo app = management.getApplicationInfo( applicationId );
+ if ( app == null ) {
+ throw new EntityNotFoundException("Application ID " + applicationId + " not found");
+ }
+
+ emf.restoreApplication( applicationId );
+
+ ApiResponse response = createApiResponse();
+ response.setAction( "restore" );
+ response.setApplication( services.getApplication() );
+ response.setParams( ui.getQueryParameters() );
+
+ return new JSONWithPadding( response, callback );
+ }
+
+
@DELETE
@RequireOrganizationAccess
@Override
public JSONWithPadding executeDelete( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception {
-
+
+ Properties props = management.getProperties();
+
+ // for now, only works in test mode
+ String testProp = ( String ) props.get( "usergrid.test" );
+ if ( testProp == null || !Boolean.parseBoolean( testProp ) ) {
+ throw new UnsupportedOperationException();
+ }
+
if ( applicationId == null ) {
throw new IllegalArgumentException("Application ID not specified in request");
}
-
+
ApplicationInfo app = management.getApplicationInfo( applicationId );
if ( app == null ) {
throw new EntityNotFoundException("Application ID " + applicationId + " not found");
}
-
+
emf.deleteApplication( applicationId );
ApiResponse response = createApiResponse();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f004f5a3/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java
index 1d2c504..56d2f98 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java
@@ -21,15 +21,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.UUID;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
+import javax.ws.rs.*;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.UriInfo;
@@ -78,9 +70,10 @@ public class ApplicationsResource extends AbstractContextResource {
@RequireOrganizationAccess
@GET
- public JSONWithPadding getOrganizationApplications( @Context UriInfo ui,
- @QueryParam( "callback" ) @DefaultValue( "callback" )
- String callback ) throws Exception {
+ public JSONWithPadding getOrganizationApplications(
+ @Context UriInfo ui,
+ @QueryParam( "deleted" ) @DefaultValue( "false" ) Boolean deleted, // only return deleted apps if true
+ @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception {
ApiResponse response = createApiResponse();
response.setAction( "get organization application" );
@@ -148,6 +141,17 @@ public class ApplicationsResource extends AbstractContextResource {
@RequireOrganizationAccess
+ @Path(RootResource.APPLICATION_ID_PATH)
+ public ApplicationResource restoreApplicationFromOrganizationByApplicationId(
+ @Context UriInfo ui,
+ @PathParam( "applicationId" )
+ String applicationIdStr ) throws Exception {
+
+ return getSubResource( ApplicationResource.class ).init( organization, UUID.fromString( applicationIdStr ) );
+ }
+
+
+ @RequireOrganizationAccess
@Path( "{applicationName}" )
public ApplicationResource applicationFromOrganizationByApplicationName( @Context UriInfo ui,
@PathParam( "applicationName" )