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/09/09 18:12:11 UTC
[1/6] usergrid git commit: add limit
Repository: usergrid
Updated Branches:
refs/heads/two-dot-o-dev bc3ce1b24 -> a1be2fdaa
add limit
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/88f0751a
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/88f0751a
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/88f0751a
Branch: refs/heads/two-dot-o-dev
Commit: 88f0751a22bb65d5784ff76fc7339564c9b65dea
Parents: bc3ce1b
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Sep 8 13:18:51 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Sep 8 13:18:51 2015 -0600
----------------------------------------------------------------------
.../usergrid/corepersistence/CoreModule.java | 1 +
.../service/ApplicationService.java | 2 +-
.../service/ApplicationServiceImpl.java | 21 ++++---
.../corepersistence/service/StatusService.java | 64 ++++++++++++++++++++
.../service/StatusServiceImpl.java | 52 ++++++++++++++++
.../persistence/ApplicationServiceIT.java | 2 +-
.../usergrid/rest/ApplicationsResource.java | 3 +-
.../usergrid/management/ManagementService.java | 2 +-
.../cassandra/ManagementServiceImpl.java | 4 +-
9 files changed, 137 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/88f0751a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
index c032dcb..05c13c9 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
@@ -169,6 +169,7 @@ public class CoreModule extends AbstractModule {
bind( ApplicationService.class ).to( ApplicationServiceImpl.class );
+ bind( StatusService.class ).to( StatusServiceImpl.class );
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/88f0751a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ApplicationService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ApplicationService.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ApplicationService.java
index 73547a7..25e290a 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ApplicationService.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ApplicationService.java
@@ -28,5 +28,5 @@ import rx.Observable;
*/
public interface ApplicationService {
- Observable<Id> deleteAllEntities(ApplicationScope applicationScope);
+ Observable<Id> deleteAllEntities(final ApplicationScope applicationScope, final int limit);
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/88f0751a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ApplicationServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ApplicationServiceImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ApplicationServiceImpl.java
index 91f8dcd..c822413 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ApplicationServiceImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ApplicationServiceImpl.java
@@ -73,7 +73,7 @@ public class ApplicationServiceImpl implements ApplicationService{
this.graphManagerFactory = graphManagerFactory;
}
@Override
- public Observable<Id> deleteAllEntities(ApplicationScope applicationScope) {
+ public Observable<Id> deleteAllEntities(final ApplicationScope applicationScope, final int limit) {
if (applicationScope.getApplication().getUuid().equals(CpNamingUtils.MANAGEMENT_APPLICATION_ID)) {
throw new IllegalArgumentException("Can't delete from management app");
}
@@ -85,18 +85,23 @@ public class ApplicationServiceImpl implements ApplicationService{
MapManager mapManager = getMapManagerForTypes(applicationScope);
Observable<Id> countObservable = allEntityIdsObservable.getEntities(appObservable)
- //.map(entity -> eventBuilder.buildEntityDelete(applicationScope, entity.getId()).getEntitiesCompacted())
.map(entityIdScope -> ((EntityIdScope) entityIdScope).getId())
.filter(id -> {
final String type = InflectionUtils.pluralize(((Id) id).getType());
return ! (type.equals(Schema.COLLECTION_USERS) || type.equals(Schema.COLLECTION_GROUPS)
|| type.equals(InflectionUtils.pluralize( Schema.TYPE_APPLICATION)) || type.equals(Schema.COLLECTION_ROLES));
- })//skip application entity
- .map(id -> {
- entityCollectionManager.mark((Id) id)
- .mergeWith(graphManager.markNode((Id) id, createGraphOperationTimestamp())).toBlocking().last();
- return id;
- })
+ })//skip application entity and users and groups and roles
+ ;
+
+ if(limit>0){
+ countObservable = countObservable.limit(limit);
+ }
+
+ countObservable = countObservable.map(id -> {
+ entityCollectionManager.mark((Id) id)
+ .mergeWith(graphManager.markNode((Id) id, createGraphOperationTimestamp())).toBlocking().last();
+ return id;
+ })
.doOnNext(id -> deleteAsync(mapManager, applicationScope, (Id) id));
return countObservable;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/88f0751a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java
new file mode 100644
index 0000000..5faa0fc
--- /dev/null
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java
@@ -0,0 +1,64 @@
+/*
+ *
+ * * Licensed to the Apache Software Foundation (ASF) under one or more
+ * * contributor license agreements. The ASF licenses this file to You
+ * * under the Apache License, Version 2.0 (the "License"); you may not
+ * * use this file except in compliance with the License.
+ * * You may obtain a copy of the License at
+ * *
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * *
+ * * Unless required by applicable law or agreed to in writing, software
+ * * distributed under the License is distributed on an "AS IS" BASIS,
+ * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * * See the License for the specific language governing permissions and
+ * * limitations under the License. For additional information regarding
+ * * copyright in this work, please see the NOTICE file in the top level
+ * * directory of this distribution.
+ *
+ */
+package org.apache.usergrid.corepersistence.service;
+
+import org.apache.usergrid.persistence.model.entity.Id;
+import rx.Observable;
+
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * serializing job status or any kind
+ */
+public interface StatusService {
+ public Observable<UUID> setStatus(final UUID jobStatusId, final Status status, final Map<String,Object> data );
+
+ public Observable<JobStatus> getStatus(final UUID jobId);
+
+ enum Status{
+ STARTED, INPROGRESS, COMPLETE, UNKNOWN;
+ }
+
+ class JobStatus{
+ private final UUID jobStatusId;
+ private final Status status;
+ private final Map<String, Object> data;
+
+ public JobStatus(final UUID jobStatusId, final Status status, final Map<String,Object> data){
+
+ this.jobStatusId = jobStatusId;
+ this.status = status;
+ this.data = data;
+ }
+
+ public Map<String, Object> getData() {
+ return data;
+ }
+
+ public Status getStatus() {
+ return status;
+ }
+
+ public UUID getJobStatusId() {
+ return jobStatusId;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/88f0751a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
new file mode 100644
index 0000000..90025a9
--- /dev/null
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
@@ -0,0 +1,52 @@
+/*
+ *
+ * * Licensed to the Apache Software Foundation (ASF) under one or more
+ * * contributor license agreements. The ASF licenses this file to You
+ * * under the Apache License, Version 2.0 (the "License"); you may not
+ * * use this file except in compliance with the License.
+ * * You may obtain a copy of the License at
+ * *
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * *
+ * * Unless required by applicable law or agreed to in writing, software
+ * * distributed under the License is distributed on an "AS IS" BASIS,
+ * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * * See the License for the specific language governing permissions and
+ * * limitations under the License. For additional information regarding
+ * * copyright in this work, please see the NOTICE file in the top level
+ * * directory of this distribution.
+ *
+ */
+package org.apache.usergrid.corepersistence.service;
+
+import com.google.inject.Inject;
+import org.apache.usergrid.persistence.map.MapManager;
+import org.apache.usergrid.persistence.map.MapManagerFactory;
+import rx.Observable;
+
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * Implementation for serializing job status or any kind
+ */
+public class StatusServiceImpl implements StatusService {
+
+ private final MapManagerFactory mapManagerFactory;
+
+ @Inject
+ public StatusServiceImpl(final MapManagerFactory mapManagerFactory){
+ this.mapManagerFactory = mapManagerFactory;
+ }
+
+ @Override
+ public Observable<UUID> setStatus( UUID jobStatusId, Status status, Map<String, Object> data) {
+// mapManager.putUuid(jobStatusId+"ke",);
+ return null;
+ }
+
+ @Override
+ public Observable<JobStatus> getStatus(UUID jobId) {
+ return null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/88f0751a/stack/core/src/test/java/org/apache/usergrid/persistence/ApplicationServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/ApplicationServiceIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/ApplicationServiceIT.java
index 27ee4ba..24643c5 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/ApplicationServiceIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/ApplicationServiceIT.java
@@ -68,7 +68,7 @@ public class ApplicationServiceIT extends AbstractCoreIT {
Thread.sleep(500);
ApplicationScope appScope = CpNamingUtils.getApplicationScope(entityManager.getApplicationId());
Observable<Id> ids =
- this.app.getApplicationService().deleteAllEntities(appScope);
+ this.app.getApplicationService().deleteAllEntities(appScope,0);
int count = ids.count().toBlocking().last();
Assert.assertEquals(count, 10);
this.app.refreshIndex();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/88f0751a/stack/rest/src/main/java/org/apache/usergrid/rest/ApplicationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/ApplicationsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/ApplicationsResource.java
index 86adbcc..a554dfb 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/ApplicationsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/ApplicationsResource.java
@@ -64,6 +64,7 @@ public class ApplicationsResource extends AbstractContextResource {
public JSONWithPadding clearApplication( @Context UriInfo ui,
@PathParam("applicationId") UUID applicationId,
@QueryParam( "confirmApplicationName" ) String confirmApplicationName,
+ @QueryParam( "limit" ) int limit,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
@@ -82,7 +83,7 @@ public class ApplicationsResource extends AbstractContextResource {
logger.info( "clearing up application" );
final AtomicInteger itemsDeleted = new AtomicInteger(0);
try {
- management.deleteAllEntities(applicationId)
+ management.deleteAllEntities(applicationId, limit)
.count()
.doOnNext(count -> itemsDeleted.set(count))
.toBlocking().lastOrDefault(0);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/88f0751a/stack/services/src/main/java/org/apache/usergrid/management/ManagementService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/ManagementService.java b/stack/services/src/main/java/org/apache/usergrid/management/ManagementService.java
index 25a693b..c61ee10 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/ManagementService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/ManagementService.java
@@ -346,5 +346,5 @@ public interface ManagementService {
* @param applicationId
* @return
*/
- Observable<Id> deleteAllEntities(UUID applicationId);
+ Observable<Id> deleteAllEntities(final UUID applicationId,final int limit);
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/88f0751a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
index 1ef5659..e4b45e6 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -3068,13 +3068,13 @@ public class ManagementServiceImpl implements ManagementService {
}
@Override
- public Observable<Id> deleteAllEntities(UUID applicationId){
+ public Observable<Id> deleteAllEntities(final UUID applicationId,final int limit){
if(applicationId.equals(CpNamingUtils.MANAGEMENT_APPLICATION_ID)){
throw new IllegalArgumentException("Can't delete from management app");
}
ApplicationService service = injector.getInstance(ApplicationService.class);
- return service.deleteAllEntities(CpNamingUtils.getApplicationScope(applicationId));
+ return service.deleteAllEntities(CpNamingUtils.getApplicationScope(applicationId),limit);
}
private String getProperty(String key) {
[2/6] usergrid git commit: adding status service
Posted by sn...@apache.org.
adding status service
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/1c742af7
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/1c742af7
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/1c742af7
Branch: refs/heads/two-dot-o-dev
Commit: 1c742af77bc9edec078580aed700c2ef60a3def5
Parents: 88f0751
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Sep 8 16:23:07 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Sep 8 16:23:07 2015 -0600
----------------------------------------------------------------------
.../corepersistence/service/StatusService.java | 6 +-
.../service/StatusServiceImpl.java | 46 +++++++++--
.../usergrid/rest/ApplicationsResource.java | 86 +++++++++++++++++---
3 files changed, 119 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1c742af7/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java
index 5faa0fc..37fac78 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java
@@ -29,12 +29,12 @@ import java.util.UUID;
* serializing job status or any kind
*/
public interface StatusService {
- public Observable<UUID> setStatus(final UUID jobStatusId, final Status status, final Map<String,Object> data );
+ Observable<UUID> setStatus(final UUID applicationdId, final UUID jobStatusId, final Status status, final Map<String,Object> data );
- public Observable<JobStatus> getStatus(final UUID jobId);
+ Observable<JobStatus> getStatus(final UUID applicationdId, final UUID jobId);
enum Status{
- STARTED, INPROGRESS, COMPLETE, UNKNOWN;
+ STARTED, FAILED, INPROGRESS, COMPLETE, UNKNOWN;
}
class JobStatus{
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1c742af7/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
index 90025a9..6a3a220 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
@@ -19,9 +19,16 @@
*/
package org.apache.usergrid.corepersistence.service;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.inject.Inject;
+import org.apache.usergrid.corepersistence.util.CpNamingUtils;
+import org.apache.usergrid.persistence.core.util.StringUtils;
import org.apache.usergrid.persistence.map.MapManager;
import org.apache.usergrid.persistence.map.MapManagerFactory;
+import org.apache.usergrid.persistence.map.impl.MapScopeImpl;
+import org.apache.usergrid.persistence.model.entity.Id;
+import org.apache.usergrid.persistence.model.entity.SimpleId;
import rx.Observable;
import java.util.Map;
@@ -33,6 +40,10 @@ import java.util.UUID;
public class StatusServiceImpl implements StatusService {
private final MapManagerFactory mapManagerFactory;
+ final static String statusKey = "status";
+ final static String dataKey = "data";
+ private final JsonFactory JSON_FACTORY = new JsonFactory();
+ private final ObjectMapper MAPPER = new ObjectMapper( JSON_FACTORY );
@Inject
public StatusServiceImpl(final MapManagerFactory mapManagerFactory){
@@ -40,13 +51,38 @@ public class StatusServiceImpl implements StatusService {
}
@Override
- public Observable<UUID> setStatus( UUID jobStatusId, Status status, Map<String, Object> data) {
-// mapManager.putUuid(jobStatusId+"ke",);
- return null;
+ public Observable<UUID> setStatus(final UUID applicationId, final UUID jobId, final Status status, final Map<String, Object> data) {
+ return Observable.create(sub -> {
+ final String jobString = StringUtils.sanitizeUUID(jobId);
+ final Id appId = CpNamingUtils.generateApplicationId(applicationId);
+ final MapManager mapManager = mapManagerFactory.createMapManager(new MapScopeImpl(appId, "status"));
+ try {
+ final String dataString = MAPPER.writeValueAsString(data);
+ mapManager.putString(jobString + dataKey, dataString);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ mapManager.putString(jobString + statusKey, status.toString());
+ sub.onNext(jobId);
+ sub.onCompleted();
+ });
}
@Override
- public Observable<JobStatus> getStatus(UUID jobId) {
- return null;
+ public Observable<JobStatus> getStatus(final UUID applicationId, UUID jobId) {
+ final String jobString = StringUtils.sanitizeUUID(jobId);
+
+ return Observable.create(subscriber -> {
+ Id appId = CpNamingUtils.generateApplicationId(applicationId);
+ final MapManager mapManager = mapManagerFactory.createMapManager(new MapScopeImpl(appId, "status"));
+ try {
+ final Map<String, Object> data = MAPPER.readValue(mapManager.getString(jobString+dataKey), Map.class);
+ final Status status = Status.valueOf(mapManager.getString(jobString+statusKey));
+ subscriber.onNext(new JobStatus(jobId,status,data));
+ subscriber.onCompleted();
+ }catch (Exception e){
+ throw new RuntimeException(e);
+ }
+ });
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1c742af7/stack/rest/src/main/java/org/apache/usergrid/rest/ApplicationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/ApplicationsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/ApplicationsResource.java
index a554dfb..ac1a834 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/ApplicationsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/ApplicationsResource.java
@@ -20,8 +20,11 @@
package org.apache.usergrid.rest;
import com.sun.jersey.api.json.JSONWithPadding;
+import org.apache.usergrid.corepersistence.service.StatusService;
import org.apache.usergrid.persistence.Entity;
import org.apache.usergrid.persistence.EntityManager;
+import org.apache.usergrid.persistence.core.util.StringUtils;
+import org.apache.usergrid.persistence.model.util.UUIDGenerator;
import org.apache.usergrid.rest.security.annotations.RequireSystemAccess;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,6 +36,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.UriInfo;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
@@ -72,30 +76,90 @@ public class ApplicationsResource extends AbstractContextResource {
throw new IllegalArgumentException("please make add a QueryString for confirmApplicationName");
}
+ final UUID jobId = UUIDGenerator.newTimeUUID();
+
final EntityManager em = emf.getEntityManager(applicationId);
final String name = em.getApplication().getApplicationName();
if(!name.toLowerCase().equals(confirmApplicationName.toLowerCase())){
throw new IllegalArgumentException("confirmApplicationName: " + confirmApplicationName + " does not equal " + name);
}
+ final StatusService statusService = injector.getInstance(StatusService.class);
+
final ApiResponse response = createApiResponse();
+
response.setAction( "clear application" );
logger.info( "clearing up application" );
- final AtomicInteger itemsDeleted = new AtomicInteger(0);
- try {
- management.deleteAllEntities(applicationId, limit)
- .count()
- .doOnNext(count -> itemsDeleted.set(count))
- .toBlocking().lastOrDefault(0);
- }
- catch ( Exception e ) {
- logger.error( "Unable to delete all items, deleted: " + itemsDeleted.get(), e );
- }
+
+
+ final Thread delete = new Thread() {
+
+ @Override
+ public void run() {
+ final AtomicInteger itemsDeleted = new AtomicInteger(0);
+ try {
+ management.deleteAllEntities(applicationId, limit)
+ .count()
+ .doOnNext(count -> itemsDeleted.set(count))
+ .doOnNext(count -> {
+ if( count%100 == 0 ){
+ Map<String,Object> map = new LinkedHashMap<>();
+ map.put("count",itemsDeleted.intValue());
+ statusService.setStatus(applicationId, jobId, StatusService.Status.INPROGRESS,map);
+ }
+ })
+ .doOnCompleted(() ->{
+ Map<String,Object> map = new LinkedHashMap<>();
+ map.put("count",itemsDeleted.intValue());
+ statusService.setStatus(applicationId,jobId, StatusService.Status.FAILED,map);
+ })
+ .subscribe();
+
+ } catch ( Exception e ) {
+ Map<String,Object> map = new LinkedHashMap<>();
+ map.put("exception",e);
+ statusService.setStatus(applicationId,jobId, StatusService.Status.FAILED,map).subscribe();
+ logger.error( "Failed to delete appid:"+applicationId + " jobid:"+jobId+" count:"+itemsDeleted, e );
+ }
+ }
+ };
+
+ delete.setName( "Delete for app : "+applicationId + " job: "+jobId );
+ delete.setDaemon(true);
+ delete.start();
+
+ statusService.setStatus(applicationId,jobId, StatusService.Status.STARTED,new LinkedHashMap<>()).subscribe();
+
Map<String,Object> data = new HashMap<>();
- data.put("count",itemsDeleted.get());
+ data.put("jobId",jobId);
response.setData(data);
response.setSuccess();
return new JSONWithPadding( response, callback );
}
+ @RequireSystemAccess
+ @GET
+ @Path( "{applicationId}/job/{jobId}" )
+ public JSONWithPadding getStatus( @Context UriInfo ui,
+ @PathParam("applicationId") UUID applicationId,
+ @PathParam("jobId") UUID jobId,
+ @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) {
+ final StatusService statusService = injector.getInstance(StatusService.class);
+
+ final ApiResponse response = createApiResponse();
+
+ response.setAction( "clear application" );
+
+ StatusService.JobStatus jobStatus = statusService.getStatus(applicationId, jobId).toBlocking().lastOrDefault(null);
+
+ Map<String,Object> data = new HashMap<>();
+ data.put("jobId",jobId);
+ data.put( "status", jobStatus.getStatus().toString() );
+ data.put( "metadata", jobStatus.getData().toString() );
+ response.setData(data);
+ response.setSuccess();
+
+ return new JSONWithPadding( response, callback );
+
+ }
}
[4/6] usergrid git commit: add comments;clean up;
Posted by sn...@apache.org.
add comments;clean up;
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/60bb149c
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/60bb149c
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/60bb149c
Branch: refs/heads/two-dot-o-dev
Commit: 60bb149c752118e665b6416ea6e3762b0e7b5e2d
Parents: 803da96
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Sep 9 08:07:31 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Sep 9 08:07:31 2015 -0600
----------------------------------------------------------------------
.../corepersistence/service/StatusService.java | 19 ++++++++++++++++++-
.../service/StatusServiceImpl.java | 17 +++++++++++------
2 files changed, 29 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/60bb149c/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java
index 37fac78..cb8e8ab 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java
@@ -29,14 +29,31 @@ import java.util.UUID;
* serializing job status or any kind
*/
public interface StatusService {
+ /**
+ * set status
+ * @param applicationdId
+ * @param jobStatusId
+ * @param status
+ * @param data
+ * @return job id
+ */
Observable<UUID> setStatus(final UUID applicationdId, final UUID jobStatusId, final Status status, final Map<String,Object> data );
- Observable<JobStatus> getStatus(final UUID applicationdId, final UUID jobId);
+ /**
+ * Get status based on app and job
+ * @param applicationId
+ * @param jobId
+ * @return
+ */
+ Observable<JobStatus> getStatus(final UUID applicationId, final UUID jobId);
enum Status{
STARTED, FAILED, INPROGRESS, COMPLETE, UNKNOWN;
}
+ /**
+ * Encapsulate job return
+ */
class JobStatus{
private final UUID jobStatusId;
private final Status status;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/60bb149c/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
index 6a3a220..41462f7 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
@@ -28,7 +28,8 @@ import org.apache.usergrid.persistence.map.MapManager;
import org.apache.usergrid.persistence.map.MapManagerFactory;
import org.apache.usergrid.persistence.map.impl.MapScopeImpl;
import org.apache.usergrid.persistence.model.entity.Id;
-import org.apache.usergrid.persistence.model.entity.SimpleId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import rx.Observable;
import java.util.Map;
@@ -39,6 +40,8 @@ import java.util.UUID;
*/
public class StatusServiceImpl implements StatusService {
+ private static final Logger logger = LoggerFactory.getLogger(StatusServiceImpl.class);
+
private final MapManagerFactory mapManagerFactory;
final static String statusKey = "status";
final static String dataKey = "data";
@@ -59,20 +62,21 @@ public class StatusServiceImpl implements StatusService {
try {
final String dataString = MAPPER.writeValueAsString(data);
mapManager.putString(jobString + dataKey, dataString);
+ mapManager.putString(jobString + statusKey, status.toString());
+ sub.onNext(jobId);
+ sub.onCompleted();
} catch (Exception e) {
+ logger.error("Failed to serialize map",e);
throw new RuntimeException(e);
}
- mapManager.putString(jobString + statusKey, status.toString());
- sub.onNext(jobId);
- sub.onCompleted();
+
});
}
@Override
public Observable<JobStatus> getStatus(final UUID applicationId, UUID jobId) {
- final String jobString = StringUtils.sanitizeUUID(jobId);
-
return Observable.create(subscriber -> {
+ final String jobString = StringUtils.sanitizeUUID(jobId);
Id appId = CpNamingUtils.generateApplicationId(applicationId);
final MapManager mapManager = mapManagerFactory.createMapManager(new MapScopeImpl(appId, "status"));
try {
@@ -81,6 +85,7 @@ public class StatusServiceImpl implements StatusService {
subscriber.onNext(new JobStatus(jobId,status,data));
subscriber.onCompleted();
}catch (Exception e){
+ logger.error("Failed to parse map",e);
throw new RuntimeException(e);
}
});
[6/6] usergrid git commit: Minor formatting and import cleanups. This
closes #378
Posted by sn...@apache.org.
Minor formatting and import cleanups. This closes #378
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a1be2fda
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a1be2fda
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a1be2fda
Branch: refs/heads/two-dot-o-dev
Commit: a1be2fdaa7d63c4296d37bc804768f35faba4048
Parents: 5d5fa9d
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Sep 9 12:10:32 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Sep 9 12:10:32 2015 -0400
----------------------------------------------------------------------
.../usergrid/corepersistence/CoreModule.java | 24 +++++------
.../service/ApplicationServiceImpl.java | 17 +++++---
.../corepersistence/service/StatusService.java | 4 +-
.../service/StatusServiceImpl.java | 7 +++-
.../corepersistence/CpEntityMapUtilsTest.java | 26 ++++++------
.../rest/applications/ApplicationResource.java | 42 ++++++--------------
.../applications/ApplicationResource.java | 17 ++++----
.../applications/ApplicationsResource.java | 32 +++++++--------
.../cassandra/ManagementServiceImpl.java | 41 ++++++++++---------
9 files changed, 95 insertions(+), 115 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a1be2fda/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
index 05c13c9..e290cfe 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
@@ -16,26 +16,22 @@
package org.apache.usergrid.corepersistence;
+import com.google.inject.AbstractModule;
+import com.google.inject.TypeLiteral;
import com.google.inject.assistedinject.FactoryModuleBuilder;
-import org.apache.usergrid.corepersistence.index.*;
-import org.apache.usergrid.corepersistence.service.*;
-import org.safehaus.guicyfig.GuicyFigModule;
-
+import com.google.inject.multibindings.Multibinder;
import org.apache.usergrid.corepersistence.asyncevents.AsyncEventService;
import org.apache.usergrid.corepersistence.asyncevents.AsyncIndexProvider;
import org.apache.usergrid.corepersistence.asyncevents.EventBuilder;
import org.apache.usergrid.corepersistence.asyncevents.EventBuilderImpl;
+import org.apache.usergrid.corepersistence.index.*;
import org.apache.usergrid.corepersistence.migration.CoreMigration;
import org.apache.usergrid.corepersistence.migration.CoreMigrationPlugin;
import org.apache.usergrid.corepersistence.migration.EntityTypeMappingMigration;
import org.apache.usergrid.corepersistence.migration.MigrationModuleVersionPlugin;
import org.apache.usergrid.corepersistence.pipeline.PipelineModule;
-import org.apache.usergrid.corepersistence.rx.impl.AllApplicationsObservable;
-import org.apache.usergrid.corepersistence.rx.impl.AllApplicationsObservableImpl;
-import org.apache.usergrid.corepersistence.rx.impl.AllEntitiesInSystemImpl;
-import org.apache.usergrid.corepersistence.rx.impl.AllEntityIdsObservable;
-import org.apache.usergrid.corepersistence.rx.impl.AllEntityIdsObservableImpl;
-import org.apache.usergrid.corepersistence.rx.impl.AllNodesInGraphImpl;
+import org.apache.usergrid.corepersistence.rx.impl.*;
+import org.apache.usergrid.corepersistence.service.*;
import org.apache.usergrid.persistence.collection.guice.CollectionModule;
import org.apache.usergrid.persistence.collection.serialization.impl.migration.EntityIdScope;
import org.apache.usergrid.persistence.core.guice.CommonModule;
@@ -46,10 +42,7 @@ import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.graph.guice.GraphModule;
import org.apache.usergrid.persistence.graph.serialization.impl.migration.GraphNode;
import org.apache.usergrid.persistence.index.guice.IndexModule;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.TypeLiteral;
-import com.google.inject.multibindings.Multibinder;
+import org.safehaus.guicyfig.GuicyFigModule;
/**
@@ -108,7 +101,8 @@ public class CoreModule extends AbstractModule {
* Create our migrations for within our core plugin
*/
Multibinder<DataMigration<EntityIdScope>> dataMigrationMultibinder =
- Multibinder.newSetBinder( binder(), new TypeLiteral<DataMigration<EntityIdScope>>() {}, CoreMigration.class );
+ Multibinder.newSetBinder( binder(),
+ new TypeLiteral<DataMigration<EntityIdScope>>() {}, CoreMigration.class );
dataMigrationMultibinder.addBinding().to( EntityTypeMappingMigration.class );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a1be2fda/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ApplicationServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ApplicationServiceImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ApplicationServiceImpl.java
index c822413..7c9fee3 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ApplicationServiceImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ApplicationServiceImpl.java
@@ -22,10 +22,8 @@ package org.apache.usergrid.corepersistence.service;
import com.google.inject.Inject;
import org.apache.usergrid.corepersistence.asyncevents.AsyncEventService;
import org.apache.usergrid.corepersistence.asyncevents.EventBuilder;
-import org.apache.usergrid.corepersistence.index.IndexService;
import org.apache.usergrid.corepersistence.rx.impl.AllEntityIdsObservable;
import org.apache.usergrid.corepersistence.util.CpNamingUtils;
-import org.apache.usergrid.persistence.EntityRef;
import org.apache.usergrid.persistence.Schema;
import org.apache.usergrid.persistence.collection.EntityCollectionManager;
import org.apache.usergrid.persistence.collection.EntityCollectionManagerFactory;
@@ -56,6 +54,7 @@ public class ApplicationServiceImpl implements ApplicationService{
private final MapManagerFactory mapManagerFactory;
private final GraphManagerFactory graphManagerFactory;
+
@Inject
public ApplicationServiceImpl(AllEntityIdsObservable allEntityIdsObservable,
EntityCollectionManagerFactory entityCollectionManagerFactory,
@@ -72,6 +71,8 @@ public class ApplicationServiceImpl implements ApplicationService{
this.mapManagerFactory = mapManagerFactory;
this.graphManagerFactory = graphManagerFactory;
}
+
+
@Override
public Observable<Id> deleteAllEntities(final ApplicationScope applicationScope, final int limit) {
if (applicationScope.getApplication().getUuid().equals(CpNamingUtils.MANAGEMENT_APPLICATION_ID)) {
@@ -80,7 +81,8 @@ public class ApplicationServiceImpl implements ApplicationService{
//EventBuilder eventBuilder = injector.getInstance(EventBuilder.class);
Observable appObservable = Observable.just(applicationScope);
- EntityCollectionManager entityCollectionManager = entityCollectionManagerFactory.createCollectionManager(applicationScope);
+ EntityCollectionManager entityCollectionManager =
+ entityCollectionManagerFactory.createCollectionManager(applicationScope);
GraphManager graphManager = graphManagerFactory.createEdgeManager(applicationScope);
MapManager mapManager = getMapManagerForTypes(applicationScope);
@@ -88,8 +90,10 @@ public class ApplicationServiceImpl implements ApplicationService{
.map(entityIdScope -> ((EntityIdScope) entityIdScope).getId())
.filter(id -> {
final String type = InflectionUtils.pluralize(((Id) id).getType());
- return ! (type.equals(Schema.COLLECTION_USERS) || type.equals(Schema.COLLECTION_GROUPS)
- || type.equals(InflectionUtils.pluralize( Schema.TYPE_APPLICATION)) || type.equals(Schema.COLLECTION_ROLES));
+ return ! (type.equals(Schema.COLLECTION_USERS)
+ || type.equals(Schema.COLLECTION_GROUPS)
+ || type.equals(InflectionUtils.pluralize( Schema.TYPE_APPLICATION))
+ || type.equals(Schema.COLLECTION_ROLES));
})//skip application entity and users and groups and roles
;
@@ -106,6 +110,7 @@ public class ApplicationServiceImpl implements ApplicationService{
return countObservable;
}
+
/**
* 4. Delete all entity documents out of elasticsearch.
* 5. Compact Graph so that it deletes the marked values.
@@ -124,6 +129,8 @@ public class ApplicationServiceImpl implements ApplicationService{
}
}
+
+
/**
* Get the map manager for uuid mapping
*/
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a1be2fda/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java
index cb8e8ab..6688cff 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusService.java
@@ -19,7 +19,6 @@
*/
package org.apache.usergrid.corepersistence.service;
-import org.apache.usergrid.persistence.model.entity.Id;
import rx.Observable;
import java.util.Map;
@@ -37,7 +36,8 @@ public interface StatusService {
* @param data
* @return job id
*/
- Observable<UUID> setStatus(final UUID applicationdId, final UUID jobStatusId, final Status status, final Map<String,Object> data );
+ Observable<UUID> setStatus(
+ final UUID applicationdId, final UUID jobStatusId, final Status status, final Map<String,Object> data );
/**
* Get status based on app and job
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a1be2fda/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
index 41462f7..88023ed 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/StatusServiceImpl.java
@@ -35,6 +35,7 @@ import rx.Observable;
import java.util.Map;
import java.util.UUID;
+
/**
* Implementation for serializing job status or any kind
*/
@@ -53,8 +54,11 @@ public class StatusServiceImpl implements StatusService {
this.mapManagerFactory = mapManagerFactory;
}
+
@Override
- public Observable<UUID> setStatus(final UUID applicationId, final UUID jobId, final Status status, final Map<String, Object> data) {
+ public Observable<UUID> setStatus(
+ final UUID applicationId, final UUID jobId, final Status status, final Map<String, Object> data) {
+
return Observable.create(sub -> {
final String jobString = StringUtils.sanitizeUUID(jobId);
final Id appId = CpNamingUtils.generateApplicationId(applicationId);
@@ -73,6 +77,7 @@ public class StatusServiceImpl implements StatusService {
});
}
+
@Override
public Observable<JobStatus> getStatus(final UUID applicationId, UUID jobId) {
return Observable.create(subscriber -> {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a1be2fda/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityMapUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityMapUtilsTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityMapUtilsTest.java
index f9c6da6..5dd8f3a 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityMapUtilsTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityMapUtilsTest.java
@@ -17,26 +17,24 @@
package org.apache.usergrid.corepersistence;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
import org.apache.usergrid.corepersistence.util.CpEntityMapUtils;
import org.apache.usergrid.persistence.model.entity.Entity;
import org.apache.usergrid.persistence.model.entity.SimpleId;
import org.apache.usergrid.persistence.model.field.ListField;
import org.apache.usergrid.persistence.model.field.value.EntityObject;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a1be2fda/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 c49c543..52a0f99 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
@@ -17,39 +17,14 @@
package org.apache.usergrid.rest.applications;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.Map;
-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.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.api.view.Viewable;
import org.apache.amber.oauth2.common.error.OAuthError;
import org.apache.amber.oauth2.common.exception.OAuthProblemException;
import org.apache.amber.oauth2.common.message.OAuthResponse;
import org.apache.amber.oauth2.common.message.types.GrantType;
import org.apache.shiro.authz.UnauthorizedException;
import org.apache.shiro.codec.Base64;
-
import org.apache.usergrid.management.ApplicationInfo;
import org.apache.usergrid.management.exceptions.DisabledAdminUserException;
import org.apache.usergrid.management.exceptions.DisabledAppUserException;
@@ -72,15 +47,22 @@ import org.apache.usergrid.rest.security.annotations.RequireApplicationAccess;
import org.apache.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.apache.usergrid.security.oauth.AccessInfo;
import org.apache.usergrid.security.oauth.ClientCredentialsInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
+import javax.ws.rs.*;
+import javax.ws.rs.core.*;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Map;
+import java.util.UUID;
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.apache.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
import static org.apache.usergrid.security.oauth.ClientCredentialsInfo.getUUIDFromClientId;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a1be2fda/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
index be8af2d..1b25d63 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
@@ -23,10 +23,11 @@ import org.apache.amber.oauth2.common.exception.OAuthSystemException;
import org.apache.amber.oauth2.common.message.OAuthResponse;
import org.apache.commons.lang.NullArgumentException;
import org.apache.commons.lang.StringUtils;
-
import org.apache.usergrid.management.ApplicationInfo;
import org.apache.usergrid.management.OrganizationInfo;
import org.apache.usergrid.management.export.ExportService;
+import org.apache.usergrid.persistence.EntityManager;
+import org.apache.usergrid.persistence.core.util.Health;
import org.apache.usergrid.persistence.queue.impl.UsergridAwsCredentials;
import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
@@ -38,7 +39,6 @@ import org.apache.usergrid.security.oauth.ClientCredentialsInfo;
import org.apache.usergrid.security.providers.SignInAsProvider;
import org.apache.usergrid.security.providers.SignInProviderFactory;
import org.apache.usergrid.services.ServiceManager;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,16 +50,13 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
-import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED;
-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
-import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
-import static javax.servlet.http.HttpServletResponse.SC_OK;
+import static javax.servlet.http.HttpServletResponse.*;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import org.apache.usergrid.persistence.EntityManager;
-import org.apache.usergrid.persistence.core.util.Health;
@Component("org.apache.usergrid.rest.management.organizations.applications.ApplicationResource")
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a1be2fda/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 28eff4e..87e8e69 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
@@ -17,30 +17,28 @@
package org.apache.usergrid.rest.management.organizations.applications;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
-import org.apache.usergrid.rest.RootResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.BiMap;
+import com.sun.jersey.api.json.JSONWithPadding;
import org.apache.usergrid.management.ApplicationInfo;
import org.apache.usergrid.management.OrganizationInfo;
import org.apache.usergrid.persistence.exceptions.EntityNotFoundException;
import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
+import org.apache.usergrid.rest.RootResource;
import org.apache.usergrid.rest.security.annotations.RequireOrganizationAccess;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.BiMap;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.apache.commons.lang.StringUtils.isEmpty;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a1be2fda/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
index e4b45e6..1aa22a7 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -18,16 +18,12 @@ package org.apache.usergrid.management.cassandra;
import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import com.google.inject.Injector;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang.text.StrSubstitutor;
import org.apache.shiro.UnavailableSecurityManagerException;
-import org.apache.usergrid.corepersistence.asyncevents.AsyncEventService;
-import org.apache.usergrid.corepersistence.asyncevents.EventBuilder;
-import org.apache.usergrid.corepersistence.rx.impl.AllEntityIdsObservable;
import org.apache.usergrid.corepersistence.service.AggregationService;
import org.apache.usergrid.corepersistence.service.AggregationServiceFactory;
import org.apache.usergrid.corepersistence.service.ApplicationService;
@@ -39,7 +35,6 @@ import org.apache.usergrid.management.*;
import org.apache.usergrid.management.exceptions.*;
import org.apache.usergrid.persistence.*;
import org.apache.usergrid.persistence.Query.Level;
-import org.apache.usergrid.persistence.collection.EntityCollectionManager;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.entities.Application;
import org.apache.usergrid.persistence.entities.Group;
@@ -70,7 +65,6 @@ import org.apache.usergrid.utils.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import rx.*;
import rx.Observable;
import java.nio.ByteBuffer;
@@ -375,15 +369,16 @@ public class ManagementServiceImpl implements ManagementService {
}
} );
- sm.newRequest( ServiceAction.POST, parameters( Schema.COLLECTION_GROUPS, organizationId, "activities" ), payload( properties ) )
- .execute().getEntity();
+ sm.newRequest( ServiceAction.POST, parameters( Schema.COLLECTION_GROUPS, organizationId, "activities" ),
+ payload( properties ) ).execute().getEntity();
}
@Override
public ServiceResults getOrganizationActivity( OrganizationInfo organization ) throws Exception {
ServiceManager sm = smf.getServiceManager( smf.getManagementAppId() );
- return sm.newRequest( ServiceAction.GET, parameters( Schema.COLLECTION_GROUPS, organization.getUuid(), "feed" ) ).execute();
+ return sm.newRequest( ServiceAction.GET, parameters(
+ Schema.COLLECTION_GROUPS, organization.getUuid(), "feed" ) ).execute();
}
@@ -391,8 +386,8 @@ public class ManagementServiceImpl implements ManagementService {
public ServiceResults getOrganizationActivityForAdminUser( OrganizationInfo organization, UserInfo user )
throws Exception {
ServiceManager sm = smf.getServiceManager( smf.getManagementAppId() );
- return sm.newRequest( ServiceAction.GET,
- parameters( Schema.COLLECTION_GROUPS, organization.getUuid(), "users", user.getUuid(), "feed" ) ).execute();
+ return sm.newRequest( ServiceAction.GET, parameters( Schema.COLLECTION_GROUPS, organization.getUuid(),
+ "users", user.getUuid(), "feed" ) ).execute();
}
@@ -440,8 +435,8 @@ public class ManagementServiceImpl implements ManagementService {
* Only lock on the target values. We don't want lock contention if another
* node is trying to set the property do a different value
*/
- Lock groupLock =
- getUniqueUpdateLock( lockManager, smf.getManagementAppId(), organizationName, Schema.COLLECTION_GROUPS, PROPERTY_PATH );
+ Lock groupLock = getUniqueUpdateLock( lockManager, smf.getManagementAppId(), organizationName,
+ Schema.COLLECTION_GROUPS, PROPERTY_PATH );
Lock userLock = getUniqueUpdateLock( lockManager, smf.getManagementAppId(), username, "users", "username" );
@@ -482,8 +477,8 @@ public class ManagementServiceImpl implements ManagementService {
}
- private OrganizationInfo createOrganizationInternal( UUID orgUuid, String organizationName, UserInfo user, boolean activated )
- throws Exception {
+ private OrganizationInfo createOrganizationInternal(
+ UUID orgUuid, String organizationName, UserInfo user, boolean activated ) throws Exception {
logger.debug("createOrganizationInternal1");
return createOrganizationInternal( orgUuid, organizationName, user, activated, null );
}
@@ -667,8 +662,8 @@ public class ManagementServiceImpl implements ManagementService {
// still need the bimap to search for existing
BiMap<UUID, String> organizations = HashBiMap.create();
EntityManager em = emf.getEntityManager(smf.getManagementAppId());
- Results results =
- em.getCollection(em.getApplicationRef(), Schema.COLLECTION_GROUPS, startResult, count, Level.ALL_PROPERTIES, false);
+ Results results = em.getCollection(em.getApplicationRef(),
+ Schema.COLLECTION_GROUPS, startResult, count, Level.ALL_PROPERTIES, false);
List<OrganizationInfo> orgs = new ArrayList<OrganizationInfo>( results.size() );
OrganizationInfo orgInfo;
for ( Entity entity : results.getEntities() ) {
@@ -1253,7 +1248,8 @@ public class ManagementServiceImpl implements ManagementService {
if ( verify( smf.getManagementAppId(), user.getUuid(), password ) ) {
userInfo = getUserInfo( smf.getManagementAppId(), user );
- boolean userIsSuperAdmin = properties.getSuperUser().isEnabled() && properties.getSuperUser().getEmail().equals(userInfo.getEmail());
+ boolean userIsSuperAdmin = properties.getSuperUser().isEnabled()
+ && properties.getSuperUser().getEmail().equals(userInfo.getEmail());
boolean testUserEnabled = parseBoolean( properties.getProperty( PROPERTIES_SETUP_TEST_ACCOUNT ) );
boolean userIsTestUser = testUserEnabled && properties.getProperty(PROPERTIES_SYSADMIN_LOGIN_EMAIL)
@@ -1746,7 +1742,8 @@ public class ManagementServiceImpl implements ManagementService {
AggregationServiceFactory aggregationServiceFactory = injector.getInstance(AggregationServiceFactory.class);
AggregationService aggregationService = aggregationServiceFactory.getAggregationService();
ApplicationScope applicationScope =CpNamingUtils.getApplicationScope(applicationId);
- return aggregationService.getSize(applicationScope, CpNamingUtils.createCollectionSearchEdge(applicationScope.getApplication(), collectionName));
+ return aggregationService.getSize(applicationScope,
+ CpNamingUtils.createCollectionSearchEdge(applicationScope.getApplication(), collectionName));
}
@@ -2434,7 +2431,8 @@ public class ManagementServiceImpl implements ManagementService {
public void sendAdminUserConfirmedAwaitingActivationEmail( UserInfo user ) throws Exception {
sendAdminUserEmail(user, "User Account Confirmed",
- emailMsg( hashMap("confirmed_email",user.getEmail() ),PROPERTIES_EMAIL_ADMIN_CONFIRMED_AWAITING_ACTIVATION ) );
+ emailMsg( hashMap("confirmed_email",user.getEmail() ),
+ PROPERTIES_EMAIL_ADMIN_CONFIRMED_AWAITING_ACTIVATION ) );
}
@@ -2626,7 +2624,8 @@ public class ManagementServiceImpl implements ManagementService {
Boolean registration_requires_email_confirmation = ( Boolean ) em
.getProperty( new SimpleEntityRef( Application.ENTITY_TYPE, applicationId ),
REGISTRATION_REQUIRES_EMAIL_CONFIRMATION );
- return registration_requires_email_confirmation != null && registration_requires_email_confirmation.booleanValue();
+ return registration_requires_email_confirmation != null
+ && registration_requires_email_confirmation.booleanValue();
}
[5/6] usergrid git commit: adding partial delete test
Posted by sn...@apache.org.
adding partial delete test
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/5d5fa9d2
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/5d5fa9d2
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/5d5fa9d2
Branch: refs/heads/two-dot-o-dev
Commit: 5d5fa9d287f075d26c78d7ba0e0c203b5c90734d
Parents: 60bb149
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Sep 9 09:49:30 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Sep 9 09:49:30 2015 -0600
----------------------------------------------------------------------
.../apache/usergrid/persistence/ApplicationServiceIT.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/5d5fa9d2/stack/core/src/test/java/org/apache/usergrid/persistence/ApplicationServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/ApplicationServiceIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/ApplicationServiceIT.java
index 24643c5..d870114 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/ApplicationServiceIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/ApplicationServiceIT.java
@@ -68,9 +68,13 @@ public class ApplicationServiceIT extends AbstractCoreIT {
Thread.sleep(500);
ApplicationScope appScope = CpNamingUtils.getApplicationScope(entityManager.getApplicationId());
Observable<Id> ids =
- this.app.getApplicationService().deleteAllEntities(appScope,0);
+ this.app.getApplicationService().deleteAllEntities(appScope, 5);
int count = ids.count().toBlocking().last();
- Assert.assertEquals(count, 10);
+ Assert.assertEquals(count, 5);
+ ids =
+ this.app.getApplicationService().deleteAllEntities(appScope, 5);
+ count = ids.count().toBlocking().last();
+ Assert.assertEquals(count, 5);
this.app.refreshIndex();
Thread.sleep(5000);
Injector injector = SpringResource.getInstance().getBean(Injector.class);
[3/6] usergrid git commit: add job status service
Posted by sn...@apache.org.
add job status service
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/803da96d
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/803da96d
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/803da96d
Branch: refs/heads/two-dot-o-dev
Commit: 803da96d6eca3d96feeb4ce9e1997c371e695c15
Parents: 1c742af
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Sep 9 08:00:21 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Sep 9 08:00:21 2015 -0600
----------------------------------------------------------------------
.../usergrid/rest/ApplicationsResource.java | 18 +++++++++------
.../apache/usergrid/rest/SystemResourceIT.java | 23 ++++++++++++++++----
.../test/resource/endpoints/SystemResource.java | 16 ++++++++++++++
3 files changed, 46 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/803da96d/stack/rest/src/main/java/org/apache/usergrid/rest/ApplicationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/ApplicationsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/ApplicationsResource.java
index ac1a834..8d36acb 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/ApplicationsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/ApplicationsResource.java
@@ -89,7 +89,7 @@ public class ApplicationsResource extends AbstractContextResource {
response.setAction( "clear application" );
- logger.info( "clearing up application" );
+ logger.info("clearing up application");
final Thread delete = new Thread() {
@@ -102,16 +102,18 @@ public class ApplicationsResource extends AbstractContextResource {
.count()
.doOnNext(count -> itemsDeleted.set(count))
.doOnNext(count -> {
- if( count%100 == 0 ){
+ if( count % 100 == 0 ){
Map<String,Object> map = new LinkedHashMap<>();
map.put("count",itemsDeleted.intValue());
- statusService.setStatus(applicationId, jobId, StatusService.Status.INPROGRESS,map);
+ final StatusService statusService = injector.getInstance(StatusService.class);
+ statusService.setStatus(applicationId, jobId, StatusService.Status.INPROGRESS,map).subscribe();
}
})
.doOnCompleted(() ->{
Map<String,Object> map = new LinkedHashMap<>();
map.put("count",itemsDeleted.intValue());
- statusService.setStatus(applicationId,jobId, StatusService.Status.FAILED,map);
+ final StatusService statusService = injector.getInstance(StatusService.class);
+ statusService.setStatus(applicationId,jobId, StatusService.Status.COMPLETE,map).subscribe();
})
.subscribe();
@@ -124,7 +126,7 @@ public class ApplicationsResource extends AbstractContextResource {
}
};
- delete.setName( "Delete for app : "+applicationId + " job: "+jobId );
+ delete.setName("Delete for app : " + applicationId + " job: " + jobId);
delete.setDaemon(true);
delete.start();
@@ -132,17 +134,19 @@ public class ApplicationsResource extends AbstractContextResource {
Map<String,Object> data = new HashMap<>();
data.put("jobId",jobId);
+ data.put("status",StatusService.Status.STARTED);
response.setData(data);
response.setSuccess();
return new JSONWithPadding( response, callback );
}
+
@RequireSystemAccess
@GET
@Path( "{applicationId}/job/{jobId}" )
public JSONWithPadding getStatus( @Context UriInfo ui,
@PathParam("applicationId") UUID applicationId,
@PathParam("jobId") UUID jobId,
- @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) {
+ @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception{
final StatusService statusService = injector.getInstance(StatusService.class);
final ApiResponse response = createApiResponse();
@@ -154,7 +158,7 @@ public class ApplicationsResource extends AbstractContextResource {
Map<String,Object> data = new HashMap<>();
data.put("jobId",jobId);
data.put( "status", jobStatus.getStatus().toString() );
- data.put( "metadata", jobStatus.getData().toString() );
+ data.put( "metadata", jobStatus.getData() );
response.setData(data);
response.setSuccess();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/803da96d/stack/rest/src/test/java/org/apache/usergrid/rest/SystemResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/SystemResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/SystemResourceIT.java
index 83e29fa..55623dd 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/SystemResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/SystemResourceIT.java
@@ -24,6 +24,7 @@ import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import java.util.LinkedHashMap;
+import java.util.UUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -52,7 +53,7 @@ public class SystemResourceIT extends AbstractRestIT {
}
@Test
- public void testDeleteAllApplicationEntities() {
+ public void testDeleteAllApplicationEntities() throws Exception{
int count = 10;
for(int i =0; i<count;i++) {
this.app().collection("tests").post(new Entity().chainPut("testval", "test"));
@@ -64,9 +65,23 @@ public class SystemResourceIT extends AbstractRestIT {
org.apache.usergrid.rest.test.resource.model.ApiResponse result = clientSetup.getRestClient().system().applications(this.clientSetup.getAppUuid()).delete( queryParameters);
- assertNotNull( result );
- assertNotNull( "ok",result.getStatus() );
- assertEquals(((LinkedHashMap) result.getData()).get("count"), count);
+ assertNotNull(result);
+ assertNotNull("ok", result.getStatus());
+ assertNotNull(((LinkedHashMap) result.getData()).get("jobId"));
+
+ String jobId = (String)((LinkedHashMap) result.getData()).get("jobId");
+ queryParameters = new QueryParameters();
+ for(int i = 0;i<10;i++ ) {
+ result = clientSetup.getRestClient().system().applications(this.clientSetup.getAppUuid(), "job/" + jobId).get(queryParameters);
+ String status = (String) ((LinkedHashMap) result.getData()).get("status");
+ if(status.equals("COMPLETE")){
+ break;
+ }else{
+ Thread.sleep(100);
+ }
+ }
+ assertEquals(((LinkedHashMap)((LinkedHashMap) result.getData()).get("metadata")).get("count"), 10);
+
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/803da96d/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SystemResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SystemResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SystemResource.java
index c6a0586..1a7b594 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SystemResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SystemResource.java
@@ -48,10 +48,26 @@ public class SystemResource extends NamedResource {
public ApplicationsResource applications(String appid) {
return new ApplicationsResource(appid,context,this);
}
+ public ApplicationsResource applications(String appid, String additionalPath) {
+ return new ApplicationsResource(appid+"/"+additionalPath,context,this);
+ }
public class ApplicationsResource extends NamedResource {
public ApplicationsResource(final String appid, final ClientContext context, final UrlResource parent ) {
super( "applications/"+appid,context, parent );
}
+
+ public ApiResponse get(QueryParameters queryParameters){
+
+ WebResource resource = getResource();
+ resource = addParametersToResource( resource, queryParameters );
+
+ //added httpBasicauth filter to all setup calls because they all do verification this way.
+ HTTPBasicAuthFilter httpBasicAuthFilter = new HTTPBasicAuthFilter( "superuser","superpassword" );
+ resource.addFilter(httpBasicAuthFilter);
+
+ return resource.type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON )
+ .get(ApiResponse.class);
+ }
public ApiResponse delete(QueryParameters queryParameters){
WebResource resource = getResource();