Removed all unused imports in cpRelationManager and IndexServiceImpl and EsEntityIndexBatchImpl. Re-added final keyword to indexing interface
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/bc1fdef3 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/bc1fdef3 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/bc1fdef3 Branch: refs/heads/release-2.1.1 Commit: bc1fdef34b6d68ff9f95fcae93c4733ca52f91f7 Parents: 899e464 Author: George Reyes <[email protected]> Authored: Wed Mar 30 11:02:19 2016 -0700 Committer: George Reyes <[email protected]> Committed: Wed Mar 30 11:02:19 2016 -0700 ---------------------------------------------------------------------- .../corepersistence/CpRelationManager.java | 12 --------- .../corepersistence/index/IndexServiceImpl.java | 26 +++++++++++--------- .../persistence/index/EntityIndexBatch.java | 10 ++++++-- .../index/impl/EsEntityIndexBatchImpl.java | 13 +++++----- 4 files changed, 30 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/bc1fdef3/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java index 378767e..67e92f8 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java @@ -18,7 +18,6 @@ package org.apache.usergrid.corepersistence; import java.util.ArrayList; -import java.util.Collection; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashMap; @@ -66,29 +65,19 @@ import org.apache.usergrid.persistence.graph.SearchByEdgeType; import org.apache.usergrid.persistence.graph.impl.SimpleSearchByEdge; import org.apache.usergrid.persistence.graph.impl.SimpleSearchByEdgeType; import org.apache.usergrid.persistence.graph.impl.SimpleSearchEdgeType; -import org.apache.usergrid.persistence.index.EntityIndex; -import org.apache.usergrid.persistence.index.EntityIndexBatch; -import org.apache.usergrid.persistence.index.SearchEdge; import org.apache.usergrid.persistence.index.query.Identifier; -import org.apache.usergrid.persistence.map.MapManager; -import org.apache.usergrid.persistence.map.MapScope; import org.apache.usergrid.persistence.model.entity.Id; import org.apache.usergrid.persistence.model.entity.SimpleId; -import org.apache.usergrid.persistence.model.field.Field; -import org.apache.usergrid.persistence.model.field.NullField; import org.apache.usergrid.persistence.schema.CollectionInfo; import org.apache.usergrid.utils.InflectionUtils; -import org.apache.usergrid.utils.JsonUtils; import org.apache.usergrid.utils.MapUtils; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import rx.Observable; -import rx.functions.Func1; import static org.apache.usergrid.corepersistence.util.CpNamingUtils.createCollectionEdge; -import static org.apache.usergrid.corepersistence.util.CpNamingUtils.createCollectionSearchEdge; import static org.apache.usergrid.corepersistence.util.CpNamingUtils.createConnectionEdge; import static org.apache.usergrid.corepersistence.util.CpNamingUtils.createConnectionSearchByEdge; import static org.apache.usergrid.corepersistence.util.CpNamingUtils.getNameFromEdgeType; @@ -96,7 +85,6 @@ import static org.apache.usergrid.persistence.Schema.COLLECTION_ROLES; import static org.apache.usergrid.persistence.Schema.PROPERTY_INACTIVITY; import static org.apache.usergrid.persistence.Schema.PROPERTY_NAME; import static org.apache.usergrid.persistence.Schema.PROPERTY_TITLE; -import static org.apache.usergrid.persistence.Schema.TYPE_APPLICATION; import static org.apache.usergrid.persistence.Schema.TYPE_ENTITY; import static org.apache.usergrid.persistence.Schema.TYPE_ROLE; import static org.apache.usergrid.persistence.Schema.getDefaultSchema; http://git-wip-us.apache.org/repos/asf/usergrid/blob/bc1fdef3/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java index c010c06..f3a3389 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java @@ -21,7 +21,6 @@ package org.apache.usergrid.corepersistence.index; import java.util.ArrayList; -import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Optional; @@ -29,20 +28,11 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.TimeUnit; -import org.apache.usergrid.persistence.Schema; -import org.apache.usergrid.persistence.index.*; -import org.apache.usergrid.persistence.index.impl.EntityField; -import org.apache.usergrid.persistence.index.impl.IndexOperation; -import org.apache.usergrid.persistence.map.MapManager; -import org.apache.usergrid.persistence.map.MapManagerFactory; -import org.apache.usergrid.persistence.map.MapScope; -import org.apache.usergrid.persistence.model.entity.SimpleId; -import org.apache.usergrid.utils.JsonUtils; -import org.apache.usergrid.utils.UUIDUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.usergrid.corepersistence.util.CpNamingUtils; +import org.apache.usergrid.persistence.Schema; import org.apache.usergrid.persistence.core.metrics.MetricsFactory; import org.apache.usergrid.persistence.core.metrics.ObservableTimer; import org.apache.usergrid.persistence.core.scope.ApplicationScope; @@ -51,10 +41,24 @@ import org.apache.usergrid.persistence.graph.GraphManager; import org.apache.usergrid.persistence.graph.GraphManagerFactory; import org.apache.usergrid.persistence.graph.impl.SimpleEdge; import org.apache.usergrid.persistence.graph.serialization.EdgesObservable; +import org.apache.usergrid.persistence.index.CandidateResult; +import org.apache.usergrid.persistence.index.CandidateResults; +import org.apache.usergrid.persistence.index.EntityIndex; +import org.apache.usergrid.persistence.index.EntityIndexBatch; +import org.apache.usergrid.persistence.index.EntityIndexFactory; +import org.apache.usergrid.persistence.index.IndexEdge; +import org.apache.usergrid.persistence.index.IndexFig; +import org.apache.usergrid.persistence.index.SearchEdge; import org.apache.usergrid.persistence.index.impl.IndexOperationMessage; +import org.apache.usergrid.persistence.map.MapManager; +import org.apache.usergrid.persistence.map.MapManagerFactory; +import org.apache.usergrid.persistence.map.MapScope; import org.apache.usergrid.persistence.model.entity.Entity; import org.apache.usergrid.persistence.model.entity.Id; +import org.apache.usergrid.persistence.model.entity.SimpleId; import org.apache.usergrid.utils.InflectionUtils; +import org.apache.usergrid.utils.JsonUtils; +import org.apache.usergrid.utils.UUIDUtils; import com.codahale.metrics.Timer; import com.google.inject.Inject; http://git-wip-us.apache.org/repos/asf/usergrid/blob/bc1fdef3/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndexBatch.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndexBatch.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndexBatch.java index 2e5ece6..274aea5 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndexBatch.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndexBatch.java @@ -32,7 +32,13 @@ import rx.Observable; public interface EntityIndexBatch { - EntityIndexBatch index( IndexEdge indexEdge, Entity entity ); + /** + * Create index for Entity + * + * @param indexEdge The edge to index the document into + * @param entity Entity to be indexed. + * */ + EntityIndexBatch index(final IndexEdge indexEdge, final Entity entity ); /** * Remove index of entity @@ -51,7 +57,7 @@ public interface EntityIndexBatch { EntityIndexBatch deindex( final SearchEdge searchEdge, final CandidateResult result ); - EntityIndexBatch index( IndexEdge indexEdge, Entity entity, Optional<Set<String>> fieldsToIndex ); + EntityIndexBatch index(final IndexEdge indexEdge, final Entity entity, final Optional<Set<String>> fieldsToIndex ); /** * Remove index of entity. http://git-wip-us.apache.org/repos/asf/usergrid/blob/bc1fdef3/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java index ed00f48..0375841 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java @@ -19,24 +19,25 @@ package org.apache.usergrid.persistence.index.impl; -import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.UUID; -import org.apache.usergrid.persistence.index.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.auth.IAuthenticator; - import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.core.util.ValidationUtils; +import org.apache.usergrid.persistence.index.CandidateResult; +import org.apache.usergrid.persistence.index.EntityIndex; +import org.apache.usergrid.persistence.index.EntityIndexBatch; +import org.apache.usergrid.persistence.index.IndexAlias; +import org.apache.usergrid.persistence.index.IndexEdge; +import org.apache.usergrid.persistence.index.IndexLocationStrategy; +import org.apache.usergrid.persistence.index.SearchEdge; import org.apache.usergrid.persistence.index.utils.IndexValidationUtils; -import org.apache.usergrid.persistence.map.MapManager; import org.apache.usergrid.persistence.model.entity.Entity; import org.apache.usergrid.persistence.model.entity.Id; -import org.apache.usergrid.persistence.model.entity.SimpleId; public class EsEntityIndexBatchImpl implements EntityIndexBatch {
