diff options
Diffstat (limited to 'plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs')
12 files changed, 127 insertions, 92 deletions
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DataLoader.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DataLoader.java index aca01c7e55e..4eb61b289af 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DataLoader.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DataLoader.java @@ -11,7 +11,6 @@ package org.eclipse.osee.orcs.core.ds; import java.util.Collection; -import org.eclipse.osee.executor.admin.HasCancellation; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.enums.LoadLevel; @@ -22,44 +21,59 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; */ public interface DataLoader extends Loader { + ////////// OPTIONS @Override - DataLoader includeDeleted(); + DataLoader setOptions(Options sourceOptions); - @Override - DataLoader includeDeleted(boolean enabled); - - @Override DataLoader fromTransaction(int transactionId); - @Override - DataLoader headTransaction(); + DataLoader fromHeadTransaction(); - @Override - DataLoader setLoadLevel(LoadLevel loadLevel); + DataLoader withLoadLevel(LoadLevel loadLevel); - @Override - DataLoader resetToDefaults(); + LoadLevel getLoadLevel(); - @Override - DataLoader loadAttributeType(IAttributeType... attributeType) throws OseeCoreException; + int getFromTransaction(); - @Override - DataLoader loadAttributeTypes(Collection<? extends IAttributeType> attributeTypes) throws OseeCoreException; + boolean isHeadTransaction(); - @Override - DataLoader loadRelationType(IRelationType... relationType) throws OseeCoreException; + //////////////// Deletion Options + DataLoader includeDeletedArtifacts(); - @Override - DataLoader loadRelationTypes(Collection<? extends IRelationType> relationType) throws OseeCoreException; + DataLoader includeDeletedAttributes(); + + DataLoader includeDeletedRelations(); + + DataLoader includeDeletedArtifacts(boolean enabled); + + DataLoader includeDeletedAttributes(boolean enabled); + + DataLoader includeDeletedRelations(boolean enabled); + + boolean areDeletedArtifactsIncluded(); + + boolean areDeletedAttributesIncluded(); + + boolean areDeletedRelationsIncluded(); + + //////////// IDS + + DataLoader withAttributeIds(int... attributeIds) throws OseeCoreException; + + DataLoader withAttributeIds(Collection<Integer> attributeIds) throws OseeCoreException; + + DataLoader withRelationIds(int... relationIds) throws OseeCoreException; + + DataLoader withRelationIds(Collection<Integer> relationIds) throws OseeCoreException; - DataLoader loadAttributeLocalId(int... attributeIds) throws OseeCoreException; + ///////// TYPES - DataLoader loadAttributeLocalIds(Collection<Integer> attributeIds) throws OseeCoreException; + DataLoader withAttributeTypes(IAttributeType... attributeType) throws OseeCoreException; - DataLoader loadRelationLocalId(int... relationIds) throws OseeCoreException; + DataLoader withAttributeTypes(Collection<? extends IAttributeType> attributeTypes) throws OseeCoreException; - DataLoader loadRelationLocalIds(Collection<Integer> relationIds) throws OseeCoreException; + DataLoader withRelationTypes(IRelationType... relationType) throws OseeCoreException; - void load(HasCancellation cancellation, LoadDataHandler handler) throws OseeCoreException; + DataLoader withRelationTypes(Collection<? extends IRelationType> relationType) throws OseeCoreException; } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DataLoaderFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DataLoaderFactory.java index f3c80a346d5..ce9107d5835 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DataLoaderFactory.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DataLoaderFactory.java @@ -23,14 +23,14 @@ public interface DataLoaderFactory { int getCount(HasCancellation cancellation, QueryContext queryContext) throws OseeCoreException; - DataLoader fromQueryContext(QueryContext queryContext) throws OseeCoreException; + DataLoader newDataLoader(QueryContext queryContext) throws OseeCoreException; - DataLoader fromBranchAndArtifactIds(OrcsSession session, IOseeBranch branch, Collection<Integer> artifactIds) throws OseeCoreException; + DataLoader newDataLoaderFromIds(OrcsSession session, IOseeBranch branch, Integer... artifactIds) throws OseeCoreException; - DataLoader fromBranchAndArtifactIds(OrcsSession session, IOseeBranch branch, int... artifactIds) throws OseeCoreException; + DataLoader newDataLoaderFromIds(OrcsSession session, IOseeBranch branch, Collection<Integer> artifactIds) throws OseeCoreException; - DataLoader fromBranchAndIds(OrcsSession session, IOseeBranch branch, Collection<String> ids) throws OseeCoreException; + DataLoader newDataLoaderFromGuids(OrcsSession session, IOseeBranch branch, String... artifactGuids) throws OseeCoreException; - DataLoader fromBranchAndIds(OrcsSession session, IOseeBranch branch, String... ids) throws OseeCoreException; + DataLoader newDataLoaderFromGuids(OrcsSession session, IOseeBranch branch, Collection<String> artifactGuids) throws OseeCoreException; } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/Loader.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/Loader.java index 21b7ea49d11..2320eb582f0 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/Loader.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/Loader.java @@ -10,10 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.orcs.core.ds; -import java.util.Collection; -import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.IRelationType; -import org.eclipse.osee.framework.core.enums.LoadLevel; +import org.eclipse.osee.executor.admin.HasCancellation; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; /** @@ -23,32 +20,8 @@ public interface Loader { Loader setOptions(Options sourceOptions); - Loader includeDeleted(); + void load(HasCancellation cancellation, LoadDataHandler handler) throws OseeCoreException; - Loader includeDeleted(boolean enabled); - - boolean areDeletedIncluded(); - - Loader fromTransaction(int transactionId); - - int getFromTransaction(); - - Loader headTransaction(); - - boolean isHeadTransaction(); - - LoadLevel getLoadLevel(); - - Loader setLoadLevel(LoadLevel loadLevel); - - Loader resetToDefaults(); - - Loader loadAttributeType(IAttributeType... attributeType) throws OseeCoreException; - - Loader loadAttributeTypes(Collection<? extends IAttributeType> attributeTypes) throws OseeCoreException; - - Loader loadRelationType(IRelationType... relationType) throws OseeCoreException; - - Loader loadRelationTypes(Collection<? extends IRelationType> relationType) throws OseeCoreException; + void load(LoadDataHandler handler) throws OseeCoreException; } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/OptionsUtil.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/OptionsUtil.java index e8a7ce5ddd1..7a401c2db9d 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/OptionsUtil.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/OptionsUtil.java @@ -22,46 +22,92 @@ public final class OptionsUtil { private static final int TRANSACTION_SENTINEL = -1; private static final String FROM_TRANSACTION = "from.transaction"; - private static final String INCLUDE_DELETED = "include.deleted"; + private static final String INCLUDE_DELETED_ARTIFACTS = "include.deleted.artifacts"; + private static final String INCLUDE_DELETED_ATTRIBUTES = "include.deleted.attributes"; + private static final String INCLUDE_DELETED_RELATIONS = "include.deleted.relations"; + private static final String INCLUDE_CACHE = "include.cache"; private static final String LOAD_LEVEL = "load.level"; public static Options createBranchOptions() { Options options = new Options(); - setIncludeDeleted(options, false); - setLoadLevel(options, LoadLevel.SHALLOW); + setIncludeCache(options, false); + setIncludeDeletedArtifacts(options, false); + setIncludeDeletedAttributes(options, false); + setIncludeDeletedRelations(options, false); + setLoadLevel(options, LoadLevel.ARTIFACT_DATA); return options; } public static Options createOptions() { Options options = new Options(); - setIncludeDeleted(options, false); + setIncludeCache(options, false); + setIncludeDeletedArtifacts(options, false); + setIncludeDeletedAttributes(options, false); + setIncludeDeletedRelations(options, false); setHeadTransaction(options); - setLoadLevel(options, LoadLevel.SHALLOW); + setLoadLevel(options, LoadLevel.ALL); return options; } public static void reset(Options options) { - setIncludeDeleted(options, false); + setIncludeCache(options, false); + setIncludeDeletedArtifacts(options, false); + setIncludeDeletedAttributes(options, false); + setIncludeDeletedRelations(options, false); setHeadTransaction(options); - setLoadLevel(options, LoadLevel.SHALLOW); + setLoadLevel(options, LoadLevel.ALL); } - public static boolean areDeletedIncluded(Options options) { - return options.getBoolean(INCLUDE_DELETED); + public static boolean isCacheIncluded(Options options) { + return options.getBoolean(INCLUDE_CACHE); } - public static void setIncludeDeleted(Options options, boolean enabled) { - options.put(INCLUDE_DELETED, enabled); + public static void setIncludeCache(Options options, boolean enabled) { + options.put(INCLUDE_CACHE, enabled); } - public static DeletionFlag getIncludeDeleted(Options options) { - boolean includeDeleted = areDeletedIncluded(options); + public static boolean areDeletedArtifactsIncluded(Options options) { + return options.getBoolean(INCLUDE_DELETED_ARTIFACTS); + } + + public static void setIncludeDeletedArtifacts(Options options, boolean enabled) { + options.put(INCLUDE_DELETED_ARTIFACTS, enabled); + } + + public static DeletionFlag getIncludeDeletedArtifacts(Options options) { + boolean includeDeleted = areDeletedArtifactsIncluded(options); + return DeletionFlag.allowDeleted(includeDeleted); + } + + public static boolean areDeletedAttributesIncluded(Options options) { + return options.getBoolean(INCLUDE_DELETED_ATTRIBUTES); + } + + public static void setIncludeDeletedAttributes(Options options, boolean enabled) { + options.put(INCLUDE_DELETED_ATTRIBUTES, enabled); + } + + public static DeletionFlag getIncludeDeletedAttributes(Options options) { + boolean includeDeleted = areDeletedAttributesIncluded(options); + return DeletionFlag.allowDeleted(includeDeleted); + } + + public static boolean areDeletedRelationsIncluded(Options options) { + return options.getBoolean(INCLUDE_DELETED_RELATIONS); + } + + public static void setIncludeDeletedRelations(Options options, boolean enabled) { + options.put(INCLUDE_DELETED_RELATIONS, enabled); + } + + public static DeletionFlag getIncludeDeletedRelations(Options options) { + boolean includeDeleted = areDeletedRelationsIncluded(options); return DeletionFlag.allowDeleted(includeDeleted); } public static LoadLevel getLoadLevel(Options options) { String level = options.get(LOAD_LEVEL); - LoadLevel loadLevel = LoadLevel.SHALLOW; + LoadLevel loadLevel = LoadLevel.ARTIFACT_DATA; if (Strings.isValid(level)) { loadLevel = LoadLevel.valueOf(level); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationNodeLoaderImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationNodeLoaderImpl.java index 6203d856b0a..4600d577af4 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationNodeLoaderImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationNodeLoaderImpl.java @@ -40,10 +40,10 @@ public class RelationNodeLoaderImpl implements RelationNodeLoader { public <T extends RelationNode> Iterable<T> loadNodes(OrcsSession session, final GraphData graph, Collection<Integer> ids, LoadLevel level) throws OseeCoreException { GraphBuilder builder = graphBuilderFactory.createBuilderForGraph(graph); - DataLoader loader = dataLoaderFactory.fromBranchAndArtifactIds(session, graph.getBranch(), ids); - loader.setLoadLevel(level); + DataLoader loader = dataLoaderFactory.newDataLoaderFromIds(session, graph.getBranch(), ids); + loader.withLoadLevel(level); loader.fromTransaction(graph.getTransaction()); - loader.includeDeleted(); + loader.includeDeletedArtifacts(); loader.load(null, builder); return getResults(builder); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationResolverImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationResolverImpl.java index 0eb8164a4c9..28f56c52464 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationResolverImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationResolverImpl.java @@ -62,7 +62,7 @@ public class RelationResolverImpl implements RelationResolver { } } if (toLoad != null && !toLoad.isEmpty()) { - Iterable<T> result = loader.loadNodes(session, graph, toLoad, LoadLevel.FULL); + Iterable<T> result = loader.loadNodes(session, graph, toLoad, LoadLevel.ALL); for (T item : result) { items.put(item.getLocalId(), item); } @@ -88,7 +88,7 @@ public class RelationResolverImpl implements RelationResolver { @Override public void resolve(OrcsSession session, GraphData graph, RelationNode node) throws OseeCoreException { - loader.loadNodes(session, graph, Collections.singleton(node.getLocalId()), LoadLevel.RELATION); + loader.loadNodes(session, graph, Collections.singleton(node.getLocalId()), LoadLevel.RELATION_DATA); } } 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 ed19f531e21..659eef30bcc 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 @@ -72,7 +72,7 @@ public class BranchCallableQueryFactory { return (BranchReadable) data; } }; - OptionsUtil.setLoadLevel(getQueryData().getOptions(), LoadLevel.FULL); + OptionsUtil.setLoadLevel(getQueryData().getOptions(), LoadLevel.ALL); queryEngine.createBranchQuery(getSession(), getQueryData(), handler).call(); List<BranchReadable> results = handler.getBranches(); setItemsFound(results.size()); @@ -94,7 +94,7 @@ public class BranchCallableQueryFactory { } }; - OptionsUtil.setLoadLevel(getQueryData().getOptions(), LoadLevel.FULL); + OptionsUtil.setLoadLevel(getQueryData().getOptions(), LoadLevel.ALL); queryEngine.createBranchQuery(getSession(), getQueryData(), handler).call(); List<IOseeBranch> results = handler.getBranches(); setItemsFound(results.size()); 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 41115e6897d..3075bd7ed98 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,11 +15,13 @@ 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; @@ -77,13 +79,13 @@ public class BranchQueryImpl implements BranchQuery { @Override public BranchQuery includeDeleted(boolean enabled) { - OptionsUtil.setIncludeDeleted(getOptions(), enabled); + OptionsUtil.setIncludeDeletedArtifacts(getOptions(), enabled); return this; } @Override public boolean areDeletedIncluded() { - return OptionsUtil.areDeletedIncluded(getOptions()); + return OptionsUtil.areDeletedArtifactsIncluded(getOptions()); } @Override 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 8f1ecc8da7a..46b7522ac86 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 @@ -81,7 +81,7 @@ public class CallableQueryFactory { results.add(data); } }; - OptionsUtil.setLoadLevel(getQueryData().getOptions(), LoadLevel.ATTRIBUTE); + OptionsUtil.setLoadLevel(getQueryData().getOptions(), LoadLevel.ARTIFACT_AND_ATTRIBUTE_DATA); queryEngine.createArtifactQuery(getSession(), getQueryData(), handler).call(); setItemsFound(results.size()); return ResultSets.newResultSet(results); @@ -95,7 +95,7 @@ public class CallableQueryFactory { @Override protected ResultSet<ArtifactReadable> innerCall() throws Exception { GraphBuilder handler = builderFactory.createGraphBuilder(provider); - OptionsUtil.setLoadLevel(getQueryData().getOptions(), LoadLevel.FULL); + OptionsUtil.setLoadLevel(getQueryData().getOptions(), LoadLevel.ALL); queryEngine.createArtifactQuery(getSession(), getQueryData(), handler).call(); Iterable<Artifact> results = handler.getArtifacts(); setItemsFound(Iterables.size(results)); @@ -111,7 +111,7 @@ public class CallableQueryFactory { protected ResultSet<Match<ArtifactReadable, AttributeReadable<?>>> innerCall() throws Exception { GraphBuilder handler = builderFactory.createGraphBuilder(provider); ArtifactMatchDataHandler matchHandler = new ArtifactMatchDataHandler(getSession(), handler, proxyManager); - OptionsUtil.setLoadLevel(getQueryData().getOptions(), LoadLevel.FULL); + OptionsUtil.setLoadLevel(getQueryData().getOptions(), LoadLevel.ALL); queryEngine.createArtifactQuery(getSession(), getQueryData(), matchHandler).call(); List<Match<ArtifactReadable, AttributeReadable<?>>> results = matchHandler.getResults(); setItemsFound(Iterables.size(results)); 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 3bfc4134ae1..a7900a42c5a 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 @@ -77,13 +77,13 @@ public class QueryBuilderImpl implements QueryBuilder { @Override public QueryBuilder includeDeleted(boolean enabled) { - OptionsUtil.setIncludeDeleted(getOptions(), enabled); + OptionsUtil.setIncludeDeletedArtifacts(getOptions(), enabled); return this; } @Override public boolean areDeletedIncluded() { - return OptionsUtil.areDeletedIncluded(getOptions()); + return OptionsUtil.areDeletedArtifactsIncluded(getOptions()); } @Override 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 f845c8a523e..1799b1f42ab 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 @@ -73,7 +73,7 @@ public class TransactionCallableQueryFactory { return data; } }; - OptionsUtil.setLoadLevel(getQueryData().getOptions(), LoadLevel.FULL); + OptionsUtil.setLoadLevel(getQueryData().getOptions(), LoadLevel.ALL); queryEngine.createTxQuery(getSession(), getQueryData(), handler).call(); ResultSet<TransactionReadable> results = handler.getTransactions(); setItemsFound(results.size()); @@ -94,7 +94,7 @@ public class TransactionCallableQueryFactory { txs.add(data.getLocalId()); } }; - OptionsUtil.setLoadLevel(getQueryData().getOptions(), LoadLevel.FULL); + OptionsUtil.setLoadLevel(getQueryData().getOptions(), LoadLevel.ALL); queryEngine.createTxQuery(getSession(), getQueryData(), handler).call(); setItemsFound(txs.size()); return ResultSets.newResultSet(txs); 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 b3729428e53..0d3560feaa6 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 @@ -54,8 +54,8 @@ public class TxDataLoaderImpl implements TxDataLoader { for (ArtifactId artifactId : artifactIds) { ids.add(artifactId.getGuid()); } - DataLoader loader = dataLoaderFactory.fromBranchAndIds(session, branch, ids); - loader.setLoadLevel(LoadLevel.FULL); + DataLoader loader = dataLoaderFactory.newDataLoaderFromGuids(session, branch, ids); + loader.withLoadLevel(LoadLevel.ALL); return loader; } |