diff options
Diffstat (limited to 'plugins/org.eclipse.osee.orcs.core/src/org')
23 files changed, 33 insertions, 192 deletions
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeCollection.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeCollection.java index 99d451d96ff..e982b569569 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeCollection.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeCollection.java @@ -16,9 +16,9 @@ import static org.eclipse.osee.orcs.core.internal.util.OrcsPredicates.attributeV import static org.eclipse.osee.orcs.core.internal.util.OrcsPredicates.deletionFlagEquals; import java.util.List; import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; import org.eclipse.osee.orcs.core.internal.util.AbstractTypeCollection; import com.google.common.base.Predicate; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeManagerImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeManagerImpl.java index ee3075bb35c..dfcfb7a6095 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeManagerImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeManagerImpl.java @@ -20,7 +20,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.enums.ModificationType; @@ -30,6 +29,7 @@ import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.jdk.core.type.BaseIdentity; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.Conditions; import org.eclipse.osee.framework.jdk.core.util.Lib; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeResultSet.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeResultSet.java index 0bd326cb160..36783d4a494 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeResultSet.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeResultSet.java @@ -12,8 +12,8 @@ package org.eclipse.osee.orcs.core.internal.attribute; import java.util.List; import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.ResultSetList; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.ResultSetList; /** * @author Roberto E. Escobar diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/FromStringAttributeSetHelper.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/FromStringAttributeSetHelper.java index ef92c8666e7..9454914f87d 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/FromStringAttributeSetHelper.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/FromStringAttributeSetHelper.java @@ -11,9 +11,9 @@ package org.eclipse.osee.orcs.core.internal.attribute; import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; /** * @author Roberto E. Escobar diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/TypedValueAttributeSetHelper.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/TypedValueAttributeSetHelper.java index bb0412cbe68..17fec31f15c 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/TypedValueAttributeSetHelper.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/TypedValueAttributeSetHelper.java @@ -11,9 +11,9 @@ package org.eclipse.osee.orcs.core.internal.attribute; import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; /** * @author Roberto E. Escobar diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/ExternalArtifactManager.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/ExternalArtifactManager.java index 658fdacf059..d8dc77ffe43 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/ExternalArtifactManager.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/ExternalArtifactManager.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.orcs.core.internal.proxy; -import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; import org.eclipse.osee.orcs.OrcsSession; import org.eclipse.osee.orcs.core.internal.artifact.Artifact; import org.eclipse.osee.orcs.core.internal.attribute.Attribute; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImpl.java index dcf19e5652f..46719d9694a 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImpl.java @@ -18,12 +18,12 @@ import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.IRelationTypeSide; -import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.jdk.core.type.Identity; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.Pair; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; import org.eclipse.osee.orcs.OrcsSession; import org.eclipse.osee.orcs.core.internal.artifact.Artifact; import org.eclipse.osee.orcs.core.internal.attribute.Attribute; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ExternalArtifactManagerImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ExternalArtifactManagerImpl.java index e3e56e1139e..e38614534da 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ExternalArtifactManagerImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ExternalArtifactManagerImpl.java @@ -10,15 +10,14 @@ *******************************************************************************/ package org.eclipse.osee.orcs.core.internal.proxy.impl; -import org.eclipse.osee.framework.core.data.ResultSet; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; +import org.eclipse.osee.framework.jdk.core.type.ResultSets; import org.eclipse.osee.orcs.OrcsSession; import org.eclipse.osee.orcs.core.internal.artifact.Artifact; import org.eclipse.osee.orcs.core.internal.attribute.Attribute; import org.eclipse.osee.orcs.core.internal.proxy.ExternalArtifactManager; import org.eclipse.osee.orcs.core.internal.relation.RelationManager; import org.eclipse.osee.orcs.core.internal.relation.RelationNode; -import org.eclipse.osee.orcs.core.internal.util.ResultSetIterable; -import org.eclipse.osee.orcs.core.internal.util.ResultSets; import org.eclipse.osee.orcs.data.ArtifactReadable; import org.eclipse.osee.orcs.data.AttributeReadable; import com.google.common.base.Function; @@ -69,7 +68,7 @@ public class ExternalArtifactManagerImpl implements ExternalArtifactManager { return asExternalArtifact(session, internal); } }); - return new ResultSetIterable<ArtifactReadable>(transformed); + return ResultSets.newResultSet(transformed); } @Override diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationManager.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationManager.java index d1b159ed73a..56a396b23f6 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationManager.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationManager.java @@ -14,10 +14,10 @@ import java.util.Collection; import java.util.List; import org.eclipse.osee.framework.core.data.IRelationSorterId; import org.eclipse.osee.framework.core.data.IRelationType; -import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; import org.eclipse.osee.orcs.OrcsSession; import org.eclipse.osee.orcs.core.internal.graph.GraphData; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java index ab31d9ff628..2d3862c0914 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java @@ -35,13 +35,14 @@ import java.util.Set; import org.eclipse.osee.framework.core.data.IRelationSorterId; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.IRelationTypeSide; -import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.jdk.core.type.Identifiable; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Conditions; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; +import org.eclipse.osee.framework.jdk.core.type.ResultSets; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.OrcsSession; import org.eclipse.osee.orcs.core.internal.graph.GraphData; @@ -54,7 +55,6 @@ import org.eclipse.osee.orcs.core.internal.relation.RelationTypeValidity; import org.eclipse.osee.orcs.core.internal.relation.RelationVisitor; import org.eclipse.osee.orcs.core.internal.relation.order.OrderManager; import org.eclipse.osee.orcs.core.internal.relation.order.OrderManagerFactory; -import org.eclipse.osee.orcs.core.internal.util.ResultSets; /** * @author Andrew M. Finkbeiner diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationNodeAdjacencies.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationNodeAdjacencies.java index d5391d47d4c..3d6dee15f3f 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationNodeAdjacencies.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationNodeAdjacencies.java @@ -15,17 +15,17 @@ import static org.eclipse.osee.orcs.core.internal.util.OrcsPredicates.deletionFl import static org.eclipse.osee.orcs.core.internal.util.OrcsPredicates.nodeIdOnSideEquals; import java.util.List; import org.eclipse.osee.framework.core.data.IRelationType; -import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; +import org.eclipse.osee.framework.jdk.core.type.ResultSets; import org.eclipse.osee.orcs.core.internal.graph.GraphAdjacencies; import org.eclipse.osee.orcs.core.internal.relation.Relation; import org.eclipse.osee.orcs.core.internal.relation.RelationNode; import org.eclipse.osee.orcs.core.internal.relation.RelationVisitor; import org.eclipse.osee.orcs.core.internal.util.AbstractTypeCollection; import org.eclipse.osee.orcs.core.internal.util.OrcsPredicates; -import org.eclipse.osee.orcs.core.internal.util.ResultSets; import org.eclipse.osee.orcs.data.HasLocalId; import com.google.common.base.Predicate; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCallableQueryFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCallableQueryFactory.java index 659eef30bcc..46b3b97918b 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCallableQueryFactory.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCallableQueryFactory.java @@ -16,11 +16,11 @@ import java.util.List; import java.util.Map; import org.eclipse.osee.executor.admin.CancellableCallable; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.ResultSet; -import org.eclipse.osee.framework.core.data.ResultSetList; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.LoadLevel; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; +import org.eclipse.osee.framework.jdk.core.type.ResultSets; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.OrcsSession; @@ -76,7 +76,7 @@ public class BranchCallableQueryFactory { queryEngine.createBranchQuery(getSession(), getQueryData(), handler).call(); List<BranchReadable> results = handler.getBranches(); setItemsFound(results.size()); - return new ResultSetList<BranchReadable>(results); + return ResultSets.newResultSet(results); } }; } @@ -98,7 +98,7 @@ public class BranchCallableQueryFactory { queryEngine.createBranchQuery(getSession(), getQueryData(), handler).call(); List<IOseeBranch> results = handler.getBranches(); setItemsFound(results.size()); - return new ResultSetList<IOseeBranch>(results); + return ResultSets.newResultSet(results); } }; } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchQueryImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchQueryImpl.java index 3075bd7ed98..77dafe24042 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchQueryImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchQueryImpl.java @@ -15,21 +15,19 @@ import static org.eclipse.osee.framework.core.enums.BranchState.DELETED; import static org.eclipse.osee.framework.core.enums.BranchState.DELETE_IN_PROGRESS; import static org.eclipse.osee.framework.core.enums.BranchState.PURGED; import static org.eclipse.osee.framework.core.enums.BranchState.PURGE_IN_PROGRESS; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.Set; - import org.eclipse.osee.executor.admin.CancellableCallable; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.BranchArchivedState; import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; import org.eclipse.osee.orcs.OrcsSession; import org.eclipse.osee.orcs.core.ds.Criteria; import org.eclipse.osee.orcs.core.ds.CriteriaSet; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/CallableQueryFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/CallableQueryFactory.java index 46b7522ac86..07a49eee3c6 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/CallableQueryFactory.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/CallableQueryFactory.java @@ -13,8 +13,9 @@ package org.eclipse.osee.orcs.core.internal.search; import java.util.LinkedList; import java.util.List; import org.eclipse.osee.executor.admin.CancellableCallable; -import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.LoadLevel; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; +import org.eclipse.osee.framework.jdk.core.type.ResultSets; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.OrcsSession; @@ -29,7 +30,6 @@ import org.eclipse.osee.orcs.core.internal.graph.GraphBuilder; import org.eclipse.osee.orcs.core.internal.graph.GraphBuilderFactory; import org.eclipse.osee.orcs.core.internal.graph.GraphProvider; import org.eclipse.osee.orcs.core.internal.proxy.ExternalArtifactManager; -import org.eclipse.osee.orcs.core.internal.util.ResultSets; import org.eclipse.osee.orcs.data.ArtifactReadable; import org.eclipse.osee.orcs.data.AttributeReadable; import org.eclipse.osee.orcs.data.HasLocalId; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/QueryBuilderImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/QueryBuilderImpl.java index 89a59a459ea..e1fad176386 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/QueryBuilderImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/QueryBuilderImpl.java @@ -20,7 +20,6 @@ import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.IRelationTypeSide; -import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.Operator; import org.eclipse.osee.framework.core.enums.QueryOption; @@ -29,6 +28,7 @@ import org.eclipse.osee.framework.jdk.core.type.Identifiable; import org.eclipse.osee.framework.jdk.core.type.Identity; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Conditions; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.orcs.OrcsSession; import org.eclipse.osee.orcs.core.ds.Criteria; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionCallableQueryFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionCallableQueryFactory.java index 1799b1f42ab..3b80dadcc02 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionCallableQueryFactory.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionCallableQueryFactory.java @@ -16,9 +16,10 @@ import java.util.LinkedList; import java.util.Map; import java.util.Set; import org.eclipse.osee.executor.admin.CancellableCallable; -import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.LoadLevel; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; +import org.eclipse.osee.framework.jdk.core.type.ResultSets; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.OrcsSession; @@ -29,7 +30,6 @@ import org.eclipse.osee.orcs.core.ds.QueryCollector; import org.eclipse.osee.orcs.core.ds.QueryData; import org.eclipse.osee.orcs.core.ds.QueryEngine; import org.eclipse.osee.orcs.core.ds.TxOrcsData; -import org.eclipse.osee.orcs.core.internal.util.ResultSets; import org.eclipse.osee.orcs.data.TransactionReadable; import com.google.common.collect.Lists; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionQueryImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionQueryImpl.java index c8261447eae..cbc330a2595 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionQueryImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionQueryImpl.java @@ -18,10 +18,10 @@ import java.util.LinkedHashSet; import java.util.Set; import org.eclipse.osee.executor.admin.CancellableCallable; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.TransactionDetailsType; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; import org.eclipse.osee.orcs.OrcsSession; import org.eclipse.osee.orcs.core.ds.Criteria; import org.eclipse.osee.orcs.core.ds.CriteriaSet; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataLoaderImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataLoaderImpl.java index 0d3560feaa6..e6135f750d9 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataLoaderImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataLoaderImpl.java @@ -14,9 +14,10 @@ import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.LoadLevel; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; +import org.eclipse.osee.framework.jdk.core.type.ResultSets; import org.eclipse.osee.orcs.OrcsSession; import org.eclipse.osee.orcs.core.ds.DataLoader; import org.eclipse.osee.orcs.core.ds.DataLoaderFactory; @@ -27,7 +28,6 @@ import org.eclipse.osee.orcs.core.internal.graph.GraphData; import org.eclipse.osee.orcs.core.internal.graph.GraphFactory; import org.eclipse.osee.orcs.core.internal.graph.GraphProvider; import org.eclipse.osee.orcs.core.internal.transaction.TxDataManager.TxDataLoader; -import org.eclipse.osee.orcs.core.internal.util.ResultSetIterable; import org.eclipse.osee.orcs.data.ArtifactId; /** @@ -64,7 +64,7 @@ public class TxDataLoaderImpl implements TxDataLoader { DataLoader loader = createLoader(session, branch, artifactIds); GraphBuilder handler = graphBuilderFactory.createGraphBuilder(graphProvider); loader.load(null, handler); - return new ResultSetIterable<Artifact>(handler.getArtifacts()); + return ResultSets.newResultSet(handler.getArtifacts()); } @Override @@ -73,7 +73,7 @@ public class TxDataLoaderImpl implements TxDataLoader { loader.fromTransaction(graph.getTransaction()); GraphBuilder handler = graphBuilderFactory.createBuilderForGraph(graph); loader.load(null, handler); - return new ResultSetIterable<Artifact>(handler.getArtifacts()); + return ResultSets.newResultSet(handler.getArtifacts()); } @Override diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java index 476dbacc84c..7bface2c857 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java @@ -21,11 +21,11 @@ import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.data.IRelationSorterId; import org.eclipse.osee.framework.core.data.IRelationType; -import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; import org.eclipse.osee.framework.jdk.core.util.Conditions; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.orcs.OrcsSession; import org.eclipse.osee.orcs.core.ds.OrcsChangeSet; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/AbstractTypeCollection.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/AbstractTypeCollection.java index 54cf34fa909..0e129a4b66a 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/AbstractTypeCollection.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/AbstractTypeCollection.java @@ -16,9 +16,9 @@ import java.util.Collection; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; import com.google.common.base.Predicate; import com.google.common.collect.Multimap; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/FilterableCollection.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/FilterableCollection.java index 2fc7a88432e..9a1b5ce48c8 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/FilterableCollection.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/FilterableCollection.java @@ -15,8 +15,8 @@ import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.ResultSet; import com.google.common.base.Predicate; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/ResultSetIterable.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/ResultSetIterable.java deleted file mode 100644 index bab53706111..00000000000 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/ResultSetIterable.java +++ /dev/null @@ -1,90 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.orcs.core.internal.util; - -import java.util.Iterator; -import org.eclipse.osee.framework.core.data.ResultSet; -import org.eclipse.osee.framework.core.exception.ItemDoesNotExist; -import org.eclipse.osee.framework.core.exception.MultipleItemsExist; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; -import com.google.common.collect.Iterables; - -/** - * @author Roberto E. Escobar - */ -public class ResultSetIterable<T> implements ResultSet<T> { - - private final Iterable<T> data; - - public ResultSetIterable(Iterable<T> iterable) { - super(); - this.data = iterable; - } - - @Override - public T getOneOrNull() { - T result = null; - int size = size(); - if (size > 0) { - result = iterator().next(); - } - return result; - } - - @Override - public T getAtMostOneOrNull() throws OseeCoreException { - T result = null; - int size = size(); - if (size > 1) { - throw createManyExistException(size); - } else if (size == 1) { - result = iterator().next(); - } - return result; - } - - @Override - public T getExactlyOne() throws OseeCoreException { - T result = getAtMostOneOrNull(); - if (result == null) { - throw createDoesNotExistException(); - } - return result; - } - - private Iterable<T> getData() { - return data; - } - - @Override - public Iterator<T> iterator() { - return getData().iterator(); - } - - @Override - public int size() { - return Iterables.size(getData()); - } - - @Override - public boolean isEmpty() { - return Iterables.isEmpty(getData()); - } - - protected OseeCoreException createManyExistException(int count) { - return new MultipleItemsExist("Multiple items found - total [%s]", count); - } - - protected OseeCoreException createDoesNotExistException() { - return new ItemDoesNotExist("No item found"); - } - -} diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/ResultSets.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/ResultSets.java deleted file mode 100644 index 26d1c72223f..00000000000 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/ResultSets.java +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.orcs.core.internal.util; - -import java.util.Collections; -import java.util.List; -import org.eclipse.osee.framework.core.data.ResultSet; -import org.eclipse.osee.framework.core.data.ResultSetList; -import com.google.common.collect.Iterables; - -/** - * @author Roberto E. Escobar - */ -public final class ResultSets { - - @SuppressWarnings({"rawtypes", "unchecked"}) - private static final ResultSet EMPTY_RESULT_SET = new ResultSetList(Collections.emptyList()); - - private ResultSets() { - // Utility - } - - public static <T> ResultSet<T> singleton(T item) { - ResultSet<T> toReturn; - if (item == null) { - toReturn = emptyResultSet(); - } else { - toReturn = new ResultSetList<T>(Collections.singletonList(item)); - } - return toReturn; - } - - public static <T> ResultSet<T> newResultSet(List<T> list) { - ResultSet<T> toReturn; - if (list.isEmpty()) { - toReturn = emptyResultSet(); - } else { - toReturn = new ResultSetList<T>(list); - } - return toReturn; - } - - public static <T> ResultSet<T> newResultSet(Iterable<T> iterable) { - ResultSet<T> toReturn; - if (Iterables.isEmpty(iterable)) { - toReturn = emptyResultSet(); - } else { - toReturn = new ResultSetIterable<T>(iterable); - } - return toReturn; - } - - @SuppressWarnings("unchecked") - public static <T> ResultSet<T> emptyResultSet() { - return EMPTY_RESULT_SET; - } - -} |