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:16 UTC
[6/6] usergrid git commit: Minor formatting and import cleanups. This
closes #378
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();
}