Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2017-07-24 17:49:45 -0400
committerRyan D. Brooks2017-07-26 17:02:41 -0400
commit52cc33b7a8d0d173526d44676daeb0cdef797d1d (patch)
tree2fea02f93933a60967a51c6200bbe41df7b100a9
parente53eaed2e8067a59671b4628616dd149fdb92676 (diff)
downloadorg.eclipse.osee-52cc33b7a8d0d173526d44676daeb0cdef797d1d.tar.gz
org.eclipse.osee-52cc33b7a8d0d173526d44676daeb0cdef797d1d.tar.xz
org.eclipse.osee-52cc33b7a8d0d173526d44676daeb0cdef797d1d.zip
refactor: Remove redundant ArtifactQueryBuilder.andIds
- done using an automated refactor Change-Id: I51dc8b10848e77c9868c156a940f7bba77b0d929
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsServerImpl.java2
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsConfigEndpointImpl.java6
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsUserServiceServerImpl.java2
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/UpdateAtsConfiguration.java8
-rw-r--r--plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/DataRightBuilder.java2
-rw-r--r--plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java4
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AbstractOrcsStorage.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsSubscriptionStorage.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorage.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ArtifactQueryBuilderImpl.java7
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TupleEndpointImpl.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeLoadingTest.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchTest.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsPortingTest.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsRelationLoadingTest.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java86
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ArtifactQueryBuilder.java2
21 files changed, 70 insertions, 77 deletions
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsServerImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsServerImpl.java
index f73c681537f..28554a4eb6e 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsServerImpl.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsServerImpl.java
@@ -253,7 +253,7 @@ public class AtsServerImpl extends AtsCoreServiceImpl implements IAtsServer {
@Override
public String getConfigValue(String key) {
String result = null;
- ArtifactReadable atsConfig = orcsApi.getQueryFactory().fromBranch(COMMON).andIds(
+ ArtifactReadable atsConfig = orcsApi.getQueryFactory().fromBranch(COMMON).andId(
AtsArtifactToken.AtsConfig).getResults().getAtMostOneOrNull();
if (atsConfig != null) {
for (Object obj : atsConfig.getAttributeValues(CoreAttributeTypes.GeneralStringData)) {
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsConfigEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsConfigEndpointImpl.java
index ca962e8849b..0df3d836b74 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsConfigEndpointImpl.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsConfigEndpointImpl.java
@@ -128,7 +128,7 @@ public final class AtsConfigEndpointImpl implements AtsConfigEndpointApi {
configs.getUsers().add((AtsUser) user);
}
// load admins
- ArtifactReadable atsAdminArt = orcsApi.getQueryFactory().fromBranch(services.getAtsBranch()).andIds(
+ ArtifactReadable atsAdminArt = orcsApi.getQueryFactory().fromBranch(services.getAtsBranch()).andId(
AtsArtifactToken.AtsAdmin).getResults().getAtMostOneOrNull();
if (atsAdminArt != null) {
for (ArtifactReadable member : atsAdminArt.getRelated(CoreRelationTypes.Users_User)) {
@@ -381,7 +381,7 @@ public final class AtsConfigEndpointImpl implements AtsConfigEndpointApi {
private ArtifactId introduceAndRelateTo(TransactionBuilder tx, org.eclipse.osee.orcs.data.BranchReadable fromBranch, ArtifactToken introToken, BranchReadable newBranch, ArtifactToken relateToToken, ArtifactId relateToArt) {
ArtifactReadable introArt =
- orcsApi.getQueryFactory().fromBranch(fromBranch).andIds(introToken).getResults().getAtMostOneOrNull();
+ orcsApi.getQueryFactory().fromBranch(fromBranch).andId(introToken).getResults().getAtMostOneOrNull();
if (introArt == null) {
introArt =
orcsApi.getQueryFactory().fromBranch(fromBranch).andTypeEquals(introToken.getArtifactType()).andNameEquals(
@@ -391,7 +391,7 @@ public final class AtsConfigEndpointImpl implements AtsConfigEndpointApi {
ArtifactId artifact = tx.introduceArtifact(fromBranch, introArt);
if (relateToToken != null) {
relateToArt =
- orcsApi.getQueryFactory().fromBranch(newBranch).andIds(relateToToken).getResults().getAtMostOneOrNull();
+ orcsApi.getQueryFactory().fromBranch(newBranch).andId(relateToToken).getResults().getAtMostOneOrNull();
if (relateToArt == null) {
relateToArt = orcsApi.getQueryFactory().fromBranch(newBranch).andTypeEquals(
relateToToken.getArtifactType()).andNameEquals(
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsUserServiceServerImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsUserServiceServerImpl.java
index 3e776db198b..91d3967eae4 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsUserServiceServerImpl.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsUserServiceServerImpl.java
@@ -48,7 +48,7 @@ public class AtsUserServiceServerImpl extends AbstractAtsUserService {
@Override
public boolean isAtsAdmin(IAtsUser user) {
if (atsAdminArt == null) {
- atsAdminArt = orcsApi.getQueryFactory().fromBranch(CoreBranches.COMMON).andIds(
+ atsAdminArt = orcsApi.getQueryFactory().fromBranch(CoreBranches.COMMON).andId(
AtsArtifactToken.AtsAdmin).getResults().getAtMostOneOrNull();
}
return atsAdminArt.areRelated(CoreRelationTypes.User_Grouping__Members, (ArtifactReadable) user.getStoreObject());
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/UpdateAtsConfiguration.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/UpdateAtsConfiguration.java
index 5ca0395530d..724932fd0e4 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/UpdateAtsConfiguration.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/UpdateAtsConfiguration.java
@@ -164,13 +164,13 @@ public class UpdateAtsConfiguration {
public ArtifactId getOrCreateConfigFolder(ArtifactId userArt, XResultData rd) {
ArtifactReadable configFolderArt =
- atsServer.getOrcsApi().getQueryFactory().fromBranch(CoreBranches.COMMON).andIds(
+ atsServer.getOrcsApi().getQueryFactory().fromBranch(CoreBranches.COMMON).andId(
AtsArtifactToken.ConfigFolder).getResults().getAtMostOneOrNull();
if (configFolderArt == null) {
TransactionBuilder tx = atsServer.getOrcsApi().getTransactionFactory().createTransaction(CoreBranches.COMMON,
userArt, "Create Config Folder");
ArtifactReadable headingFolderArt =
- atsServer.getOrcsApi().getQueryFactory().fromBranch(CoreBranches.COMMON).andIds(
+ atsServer.getOrcsApi().getQueryFactory().fromBranch(CoreBranches.COMMON).andId(
AtsArtifactToken.HeadingFolder).getResults().getExactlyOne();
configFolderArt = (ArtifactReadable) tx.createArtifact(AtsArtifactToken.ConfigFolder);
tx.relate(headingFolderArt, CoreRelationTypes.Default_Hierarchical__Parent, configFolderArt);
@@ -181,7 +181,7 @@ public class UpdateAtsConfiguration {
}
public ArtifactId getOrCreateAtsConfig(ArtifactReadable userArt, XResultData rd) {
- ArtifactReadable atsConfigArt = atsServer.getOrcsApi().getQueryFactory().fromBranch(CoreBranches.COMMON).andIds(
+ ArtifactReadable atsConfigArt = atsServer.getOrcsApi().getQueryFactory().fromBranch(CoreBranches.COMMON).andId(
AtsArtifactToken.AtsConfig).getResults().getAtMostOneOrNull();
if (atsConfigArt == null) {
TransactionBuilder tx = atsServer.getOrcsApi().getTransactionFactory().createTransaction(CoreBranches.COMMON,
@@ -210,7 +210,7 @@ public class UpdateAtsConfiguration {
public ArtifactId getOrCreateConfigsFolder(ArtifactId userArt, XResultData rd) {
ArtifactId configFolderArt = getOrCreateConfigFolder(userArt, rd);
- ArtifactId configsFolderArt = atsServer.getOrcsApi().getQueryFactory().fromBranch(CoreBranches.COMMON).andIds(
+ ArtifactId configsFolderArt = atsServer.getOrcsApi().getQueryFactory().fromBranch(CoreBranches.COMMON).andId(
AtsArtifactToken.ConfigsFolder).getResults().getAtMostOneOrNull();
if (configsFolderArt == null) {
TransactionBuilder tx = atsServer.getOrcsApi().getTransactionFactory().createTransaction(CoreBranches.COMMON,
diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/DataRightBuilder.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/DataRightBuilder.java
index 785e0ac61d4..c1a8ce96eff 100644
--- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/DataRightBuilder.java
+++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/DataRightBuilder.java
@@ -133,7 +133,7 @@ public class DataRightBuilder {
Map<String, DataRight> toReturn = new HashMap<>();
@SuppressWarnings("unchecked")
- ArtifactReadable footerMappingArt = query.andIds(MAPPING_ARTIFACT).getResults().getOneOrNull();
+ ArtifactReadable footerMappingArt = query.andId(MAPPING_ARTIFACT).getResults().getOneOrNull();
if (footerMappingArt != null) {
List<String> footers = new ArrayList<>();
diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java
index deebb83976b..1674c85443e 100644
--- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java
+++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java
@@ -42,7 +42,7 @@ public class DispositionInitializer {
@SuppressWarnings("unchecked")
private ArtifactReadable getDispositionUser() throws OseeCoreException {
- return getQueryFactory().fromBranch(CoreBranches.COMMON).andIds(
+ return getQueryFactory().fromBranch(CoreBranches.COMMON).andId(
SystemUser.OseeSystem).getResults().getExactlyOne();
}
@@ -80,7 +80,7 @@ public class DispositionInitializer {
@SuppressWarnings("unchecked")
private ArtifactReadable findUser() {
- return orcsApi.getQueryFactory().fromBranch(CoreBranches.COMMON).andIds(
+ return orcsApi.getQueryFactory().fromBranch(CoreBranches.COMMON).andId(
SystemUser.OseeSystem).getResults().getExactlyOne();
}
}
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java
index 4631f5912f3..25dbe261d1b 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java
@@ -70,7 +70,7 @@ public class OrcsStorageImpl implements Storage {
}
private ArtifactReadable getDispoUser() throws OseeCoreException {
- return getQuery().fromBranch(COMMON).andIds(SystemUser.OseeSystem).getResults().getExactlyOne();
+ return getQuery().fromBranch(COMMON).andId(SystemUser.OseeSystem).getResults().getExactlyOne();
}
private QueryFactory getQuery() {
@@ -122,7 +122,7 @@ public class OrcsStorageImpl implements Storage {
@Override
public ArtifactReadable findUser() {
- return getQuery().fromBranch(COMMON).andIds(SystemUser.OseeSystem).getResults().getExactlyOne();
+ return getQuery().fromBranch(COMMON).andId(SystemUser.OseeSystem).getResults().getExactlyOne();
}
@Override
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AbstractOrcsStorage.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AbstractOrcsStorage.java
index 7f4aab423c4..8050b7e3e07 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AbstractOrcsStorage.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AbstractOrcsStorage.java
@@ -74,7 +74,7 @@ public abstract class AbstractOrcsStorage {
@SuppressWarnings("unchecked")
protected ArtifactReadable getSystemUser() {
- return newQuery().andIds(SystemUser.OseeSystem).getResults().getExactlyOne();
+ return newQuery().andId(SystemUser.OseeSystem).getResults().getExactlyOne();
}
protected TransactionBuilder newTransaction(String comment) {
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsSubscriptionStorage.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsSubscriptionStorage.java
index f8a29eacf04..ce18a51be26 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsSubscriptionStorage.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsSubscriptionStorage.java
@@ -107,7 +107,7 @@ public class OrcsSubscriptionStorage extends AbstractOrcsStorage implements Subs
ArtifactId artId = tx.createArtifact(CoreArtifactTypes.SubscriptionGroup, name);
tx.commit();
- ArtifactReadable groupArt = newQuery().andIds(artId).getResults().getExactlyOne();
+ ArtifactReadable groupArt = newQuery().andId(artId).getResults().getExactlyOne();
return new SubscriptionGroupId(groupArt.getUuid());
}
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorage.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorage.java
index ca2bfe9262c..be356a349c4 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorage.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorage.java
@@ -87,7 +87,7 @@ public class ClientStorage {
@SuppressWarnings("unchecked")
private ArtifactReadable getSystemUser() {
- return newQuery().andIds(SystemUser.OseeSystem).getResults().getExactlyOne();
+ return newQuery().andId(SystemUser.OseeSystem).getResults().getExactlyOne();
}
private TransactionBuilder newTransaction(OseePrincipal principal, String comment) {
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java
index 9548c580ba8..0875aad4a25 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java
@@ -250,7 +250,7 @@ public class OrcsApiImpl implements OrcsApi {
@SuppressWarnings("unchecked")
@Override
public ArtifactReadable call() throws Exception {
- return getQueryFactory().fromBranch(CoreBranches.COMMON).andIds(
+ return getQueryFactory().fromBranch(CoreBranches.COMMON).andId(
SystemUser.OseeSystem).getResults().getExactlyOne();
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ArtifactQueryBuilderImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ArtifactQueryBuilderImpl.java
index d5c8eea4b7f..c0261c028a0 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ArtifactQueryBuilderImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ArtifactQueryBuilderImpl.java
@@ -153,11 +153,6 @@ public class ArtifactQueryBuilderImpl<T> implements ArtifactQueryBuilder<T> {
}
@Override
- public T andIds(ArtifactId id) {
- return andId(id);
- }
-
- @Override
public T andIds(Collection<? extends ArtifactId> ids) {
return addAndCheck(queryData, new CriteriaArtifactIds(ids));
}
@@ -355,7 +350,7 @@ public class ArtifactQueryBuilderImpl<T> implements ArtifactQueryBuilder<T> {
@SuppressWarnings("unchecked")
@Override
public T andIsHeirarchicalRootArtifact() {
- andIds(CoreArtifactTokens.DefaultHierarchyRoot);
+ andId(CoreArtifactTokens.DefaultHierarchyRoot);
return (T) this;
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TupleEndpointImpl.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TupleEndpointImpl.java
index 9434a473390..9ac10a55e04 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TupleEndpointImpl.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TupleEndpointImpl.java
@@ -156,7 +156,7 @@ public class TupleEndpointImpl implements TupleEndpoint {
}
private ArtifactReadable getUser() {
- return getQuery().fromBranch(getAdminBranch()).andIds(SystemUser.OseeSystem).getResults().getExactlyOne();
+ return getQuery().fromBranch(getAdminBranch()).andId(SystemUser.OseeSystem).getResults().getExactlyOne();
}
private QueryFactory getQuery() {
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeLoadingTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeLoadingTest.java
index 8ff8826bedb..b71de9a89cd 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeLoadingTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeLoadingTest.java
@@ -58,7 +58,7 @@ public class OrcsAttributeLoadingTest {
@Test
public void testAttributeLoading() throws Exception {
- ArtifactReadable art = query.fromBranch(COMMON).andIds(CoreArtifactTokens.Everyone).getResults().getExactlyOne();
+ ArtifactReadable art = query.fromBranch(COMMON).andId(CoreArtifactTokens.Everyone).getResults().getExactlyOne();
Assert.assertNotNull(art);
assertEquals("Everyone", art.getSoleAttributeAsString(CoreAttributeTypes.Name));
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java
index 69bb3581957..ec143c1e1ef 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java
@@ -304,7 +304,7 @@ public class OrcsBranchQueryTest {
@SuppressWarnings("unchecked")
private ArtifactReadable getSystemUser() throws OseeCoreException {
- return factory.fromBranch(CoreBranches.COMMON).andIds(SystemUser.OseeSystem).getResults().getExactlyOne();
+ return factory.fromBranch(CoreBranches.COMMON).andId(SystemUser.OseeSystem).getResults().getExactlyOne();
}
private OrcsBranch getBranchOps() {
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchTest.java
index f1c171b656c..81cde8b4c3e 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchTest.java
@@ -168,7 +168,7 @@ public class OrcsBranchTest {
BranchReadable childBranch = callableChildBranch.call();
TransactionBuilder tx2 = txFactory.createTransaction(childBranch, author, "modify and make new arts");
- ArtifactReadable readableFolder = query.fromBranch(childBranch).andIds(folder).getResults().getExactlyOne();
+ ArtifactReadable readableFolder = query.fromBranch(childBranch).andId(folder).getResults().getExactlyOne();
tx2.setName(readableFolder, "New Folder Name");
tx2.setSoleAttributeFromString(readableFolder, CoreAttributeTypes.StaticId, "test id");
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsPortingTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsPortingTest.java
index 0ce0cd7c9df..122ab371f88 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsPortingTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsPortingTest.java
@@ -189,7 +189,7 @@ public class OrcsPortingTest {
// get the setup associated artifact - this is for a later test to make sure the branch is not duplicated
// there should only be one port branch per associated artifact
ArtifactReadable readableReq =
- query.fromBranch(CoreBranches.COMMON).andIds(assocaitedArt).getResults().getExactlyOne();
+ query.fromBranch(CoreBranches.COMMON).andId(assocaitedArt).getResults().getExactlyOne();
assertNotNull(readableReq);
// the new branch will contain two transactions -
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java
index f8b7bfc5612..a64fb288f39 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java
@@ -532,7 +532,7 @@ public class OrcsQueryTest {
.andNameEquals("Robot Interfaces").getResults().getExactlyOne();
ArtifactReadable folderArt = factory.fromBranch(SAW_Bld_2) //
- .andIds(folder).getResults().getExactlyOne();
+ .andId(folder).getResults().getExactlyOne();
// robotApi should be related to folder
Assert.assertTrue(robotApi.areRelated(CoreRelationTypes.Default_Hierarchical__Child, folderArt));
}
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsRelationLoadingTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsRelationLoadingTest.java
index beabe73c4f1..abb5a94a4bf 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsRelationLoadingTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsRelationLoadingTest.java
@@ -56,10 +56,10 @@ public class OrcsRelationLoadingTest {
queryFactory.fromBranch(CoreBranches.COMMON).andIsOfType(CoreArtifactTypes.OseeTypeDefinition).andNameEquals(
"org.eclipse.osee.ats.client.demo.OseeTypes_Demo").getResults().getAtMostOneOrNull();
assertNotNull(art6);
- ArtifactReadable art7 = queryFactory.fromBranch(CoreBranches.COMMON).andIds(
+ ArtifactReadable art7 = queryFactory.fromBranch(CoreBranches.COMMON).andId(
CoreArtifactTokens.UserGroups).getResults().getAtMostOneOrNull();
assertNotNull(art7);
- ArtifactReadable art8 = queryFactory.fromBranch(CoreBranches.COMMON).andIds(
+ ArtifactReadable art8 = queryFactory.fromBranch(CoreBranches.COMMON).andId(
CoreArtifactTokens.Everyone).getResults().getAtMostOneOrNull();
assertNotNull(art8);
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java
index 353951ef0c2..e5d99e0acb8 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java
@@ -167,7 +167,7 @@ public class OrcsTransactionTest {
TransactionReadable newTxReadable = transactionQuery.andTxId(newTx).getResults().getExactlyOne();
checkTransaction(previousTx, newTxReadable, COMMON, comment, userArtifact);
- ResultSet<ArtifactReadable> result = query.fromBranch(COMMON).andIds(artifact).getResults();
+ ResultSet<ArtifactReadable> result = query.fromBranch(COMMON).andId(artifact).getResults();
ArtifactReadable artifact1 = result.getExactlyOne();
@@ -199,7 +199,7 @@ public class OrcsTransactionTest {
tx.commit();
- ArtifactReadable artifactReadable = query.fromBranch(COMMON).andIds(artifact).getResults().getExactlyOne();
+ ArtifactReadable artifactReadable = query.fromBranch(COMMON).andId(artifact).getResults().getExactlyOne();
assertEquals(expectedName, artifactReadable.getName());
assertEquals(expectedQualifaction,
artifactReadable.getSoleAttributeAsString(CoreAttributeTypes.QualificationMethod));
@@ -208,13 +208,13 @@ public class OrcsTransactionTest {
@Test
public void testCopyArtifact() throws Exception {
- ArtifactReadable user = query.fromBranch(COMMON).andIds(SystemUser.Anonymous).getResults().getExactlyOne();
+ ArtifactReadable user = query.fromBranch(COMMON).andId(SystemUser.Anonymous).getResults().getExactlyOne();
// duplicate on same branch
TransactionBuilder transaction1 = createTx();
ArtifactId duplicate = transaction1.copyArtifact(user);
transaction1.commit();
- ArtifactReadable userDup = query.fromBranch(COMMON).andIds(duplicate).getResults().getExactlyOne();
+ ArtifactReadable userDup = query.fromBranch(COMMON).andId(duplicate).getResults().getExactlyOne();
assertNotSame(SystemUser.Anonymous.getGuid(), userDup.getGuid());
assertEquals(SystemUser.Anonymous.getName(), userDup.getName());
@@ -229,7 +229,7 @@ public class OrcsTransactionTest {
txFactory.createTransaction(topLevelBranch, userArtifact, testName.getMethodName());
duplicate = transaction2.copyArtifact(user);
transaction2.commit();
- userDup = query.fromBranch(topLevelBranch).andIds(duplicate).getResults().getExactlyOne();
+ userDup = query.fromBranch(topLevelBranch).andId(duplicate).getResults().getExactlyOne();
assertNotSame(SystemUser.Anonymous.getGuid(), userDup.getGuid());
assertEquals(SystemUser.Anonymous.getName(), userDup.getName());
@@ -237,7 +237,7 @@ public class OrcsTransactionTest {
@Test
public void testIntroduceArtifact() throws Exception {
- ArtifactReadable user = query.fromBranch(COMMON).andIds(SystemUser.Anonymous).getResults().getExactlyOne();
+ ArtifactReadable user = query.fromBranch(COMMON).andId(SystemUser.Anonymous).getResults().getExactlyOne();
IOseeBranch branchToken = IOseeBranch.create("IntroduceArtifact tests");
BranchReadable topLevelBranch = orcsBranch.createTopLevelBranch(branchToken, userArtifact).call();
@@ -248,13 +248,13 @@ public class OrcsTransactionTest {
transaction.commit();
ArtifactReadable introduced =
- query.fromBranch(topLevelBranch).andIds(SystemUser.Anonymous).getResults().getExactlyOne();
+ query.fromBranch(topLevelBranch).andId(SystemUser.Anonymous).getResults().getExactlyOne();
assertEquals(user, introduced);
}
@Test
public void testIntroduceOnSameBranch() throws OseeCoreException {
- ArtifactReadable user = query.fromBranch(COMMON).andIds(SystemUser.Anonymous).getResults().getExactlyOne();
+ ArtifactReadable user = query.fromBranch(COMMON).andId(SystemUser.Anonymous).getResults().getExactlyOne();
TransactionBuilder tx = createTx();
@@ -264,7 +264,7 @@ public class OrcsTransactionTest {
@Test
public void testReadAfterWrite() throws OseeCoreException {
- QueryBuilder queryBuilder = query.fromBranch(COMMON).andIds(OseeSystem);
+ QueryBuilder queryBuilder = query.fromBranch(COMMON).andId(OseeSystem);
ArtifactReadable oseeSystem = queryBuilder.getResults().getExactlyOne();
@@ -284,13 +284,13 @@ public class OrcsTransactionTest {
ArtifactId artifact = tx.createArtifact(CoreArtifactTypes.AccessControlModel, "deleteMe");
tx.commit();
- ArtifactReadable toDelete = query.fromBranch(COMMON).andIds(artifact).getResults().getExactlyOne();
+ ArtifactReadable toDelete = query.fromBranch(COMMON).andId(artifact).getResults().getExactlyOne();
tx = txFactory.createTransaction(COMMON, userArtifact, testName.getMethodName());
tx.deleteArtifact(toDelete);
tx.commit();
- toDelete = query.fromBranch(COMMON).andIds(artifact).includeDeletedArtifacts().getResults().getOneOrNull();
+ toDelete = query.fromBranch(COMMON).andId(artifact).includeDeletedArtifacts().getResults().getOneOrNull();
assertNotNull(toDelete);
assertTrue(toDelete.isDeleted());
}
@@ -309,29 +309,29 @@ public class OrcsTransactionTest {
QueryBuilder builder = query.fromBranch(COMMON);
builder.andExists(CoreAttributeTypes.GeneralStringData);
- builder.andIds(artifact);
+ builder.andId(artifact);
ResultSet<ArtifactReadable> artifacts = builder.getResults();
assertEquals(0, artifacts.size());
builder = query.fromBranch(COMMON);
builder.andExists(CoreAttributeTypes.GeneralStringData);
- builder.andIds(artifact);
+ builder.andId(artifact);
builder.includeDeletedAttributes();
artifacts = builder.getResults();
assertEquals(1, artifacts.size());
builder = query.fromBranch(COMMON);
builder.andExists(CoreAttributeTypes.Annotation);
- builder.andIds(artifact);
+ builder.andId(artifact);
builder.includeDeletedAttributes();
artifacts = builder.getResults();
assertEquals(0, artifacts.size());
- ArtifactReadable toDelete = query.fromBranch(COMMON).andIds(artifact).getResults().getExactlyOne();
+ ArtifactReadable toDelete = query.fromBranch(COMMON).andId(artifact).getResults().getExactlyOne();
tx = createTx();
tx.deleteArtifact(toDelete);
tx.commit();
- toDelete = query.fromBranch(COMMON).andIds(artifact).includeDeletedArtifacts().getResults().getOneOrNull();
+ toDelete = query.fromBranch(COMMON).andId(artifact).includeDeletedArtifacts().getResults().getOneOrNull();
assertNotNull(toDelete);
assertTrue(toDelete.isDeleted());
@@ -351,7 +351,7 @@ public class OrcsTransactionTest {
tx.deleteAttributes(artifact1, CoreAttributeTypes.GeneralStringData);
TransactionId tx2 = tx.commit();
- ArtifactReadable toDelete = query.fromBranch(COMMON).andIds(artifact1).getResults().getExactlyOne();
+ ArtifactReadable toDelete = query.fromBranch(COMMON).andId(artifact1).getResults().getExactlyOne();
tx = txFactory.createTransaction(COMMON, userArtifact, "delete art 1");
tx.deleteArtifact(toDelete);
@@ -359,13 +359,13 @@ public class OrcsTransactionTest {
tx.unrelate(artifact2, Default_Hierarchical__Parent, artifact1);
TransactionId tx3 = tx.commit();
- toDelete = query.fromBranch(COMMON).andIds(artifact2).getResults().getExactlyOne();
+ toDelete = query.fromBranch(COMMON).andId(artifact2).getResults().getExactlyOne();
tx = txFactory.createTransaction(COMMON, userArtifact, "delete art 2");
tx.deleteArtifact(toDelete);
TransactionId tx4 = tx.commit();
- toDelete = query.fromBranch(COMMON).andIds(artifact1).includeDeletedArtifacts().getResults().getOneOrNull();
+ toDelete = query.fromBranch(COMMON).andId(artifact1).includeDeletedArtifacts().getResults().getOneOrNull();
assertNotNull(toDelete);
assertTrue(toDelete.isDeleted());
transactions = new TransactionId[] {tx1, tx2, tx3, tx4};
@@ -407,7 +407,7 @@ public class OrcsTransactionTest {
QueryBuilder builder = query.fromBranch(COMMON);
builder.fromTransaction(transactions[1]);
builder.andExists(CoreAttributeTypes.GeneralStringData, CoreAttributeTypes.Annotation);
- builder.andIds(artifact1);
+ builder.andId(artifact1);
ResultSet<ArtifactReadable> artifacts = builder.getResults();
verifyHistoricalArtifacts(artifacts, null, null);
}
@@ -417,7 +417,7 @@ public class OrcsTransactionTest {
QueryBuilder builder = query.fromBranch(COMMON);
builder.fromTransaction(transactions[1]);
builder.andExists(CoreAttributeTypes.GeneralStringData, CoreAttributeTypes.Annotation);
- builder.andIds(artifact1);
+ builder.andId(artifact1);
builder.includeDeletedAttributes();
ResultSet<ArtifactReadable> artifacts = builder.getResults();
verifyHistoricalArtifacts(artifacts, artifact1, null);
@@ -586,7 +586,7 @@ public class OrcsTransactionTest {
tx1.relate(art1, CoreRelationTypes.Users_User, art2);
tx1.commit();
- ArtifactReadable artifact = query.fromBranch(COMMON).andIds(art1).getResults().getExactlyOne();
+ ArtifactReadable artifact = query.fromBranch(COMMON).andId(art1).getResults().getExactlyOne();
assertEquals("A component", artifact.getName());
ResultSet<ArtifactReadable> related = artifact.getRelated(CoreRelationTypes.Users_User);
@@ -615,7 +615,7 @@ public class OrcsTransactionTest {
tx1.addChildren(art1, art2, art3);
TransactionId tx1Id = tx1.commit();
- QueryBuilder art1Query = query.fromBranch(COMMON).andIds(art1);
+ QueryBuilder art1Query = query.fromBranch(COMMON).andId(art1);
ArtifactReadable artifact = art1Query.getResults().getExactlyOne();
assertEquals("A component", artifact.getName());
@@ -656,7 +656,7 @@ public class OrcsTransactionTest {
tx1.addChildren(art1, art2);
tx1.commit();
- ArtifactReadable artifact1 = query.fromBranch(COMMON).andIds(art1).getResults().getExactlyOne();
+ ArtifactReadable artifact1 = query.fromBranch(COMMON).andId(art1).getResults().getExactlyOne();
assertEquals("A component", artifact1.getName());
ResultSet<ArtifactReadable> children = artifact1.getChildren();
@@ -673,7 +673,7 @@ public class OrcsTransactionTest {
tx2.setRelations(art1, Default_Hierarchical__Child, Arrays.asList(art3, art4));
tx2.commit();
- artifact1 = query.fromBranch(COMMON).andIds(art1).getResults().getExactlyOne();
+ artifact1 = query.fromBranch(COMMON).andId(art1).getResults().getExactlyOne();
assertEquals("A component", artifact1.getName());
children = artifact1.getChildren();
@@ -692,7 +692,7 @@ public class OrcsTransactionTest {
assertEquals(art3, artifact3);
assertEquals(art4, artifact4);
- artifact2 = query.fromBranch(COMMON).andIds(art2).getResults().getExactlyOne();
+ artifact2 = query.fromBranch(COMMON).andId(art2).getResults().getExactlyOne();
assertEquals("B component", artifact2.getName());
assertNull(artifact2.getParent());
assertEquals(art2, artifact2);
@@ -710,7 +710,7 @@ public class OrcsTransactionTest {
tx2.addChildren(art1, art2, art3);
tx2.commit();
- ArtifactReadable artifact1 = query.fromBranch(COMMON).andIds(art1).getResults().getExactlyOne();
+ ArtifactReadable artifact1 = query.fromBranch(COMMON).andId(art1).getResults().getExactlyOne();
assertEquals("A component", artifact1.getName());
ResultSet<ArtifactReadable> children = artifact1.getChildren();
@@ -743,7 +743,7 @@ public class OrcsTransactionTest {
tx1.commit();
- ArtifactReadable artifact = query.fromBranch(COMMON).andIds(art1).getResults().getExactlyOne();
+ ArtifactReadable artifact = query.fromBranch(COMMON).andId(art1).getResults().getExactlyOne();
assertEquals("A component", artifact.getName());
ResultSet<ArtifactReadable> children = artifact.getChildren();
@@ -770,7 +770,7 @@ public class OrcsTransactionTest {
tx1.relate(art1, Dependency__Dependency, art4);
tx1.commit();
- ArtifactReadable artifact4 = query.fromBranch(COMMON).andIds(art4).getResults().getExactlyOne();
+ ArtifactReadable artifact4 = query.fromBranch(COMMON).andId(art4).getResults().getExactlyOne();
assertEquals(art4, artifact4);
ArtifactReadable artifact1 = artifact4.getRelated(CoreRelationTypes.Dependency__Artifact).getExactlyOne();
@@ -785,7 +785,7 @@ public class OrcsTransactionTest {
tx2.unrelate(art1, Default_Hierarchical__Child, art2);
tx2.commit();
- artifact4 = query.fromBranch(COMMON).andIds(art4).getResults().getExactlyOne();
+ artifact4 = query.fromBranch(COMMON).andId(art4).getResults().getExactlyOne();
assertEquals(art4, artifact4);
artifact1 = artifact4.getRelated(CoreRelationTypes.Dependency__Artifact).getExactlyOne();
@@ -806,7 +806,7 @@ public class OrcsTransactionTest {
tx1.relate(art1, Dependency__Dependency, art4);
tx1.commit();
- ArtifactReadable artifact4 = query.fromBranch(COMMON).andIds(art4).getResults().getExactlyOne();
+ ArtifactReadable artifact4 = query.fromBranch(COMMON).andId(art4).getResults().getExactlyOne();
assertEquals(art4, artifact4);
ArtifactReadable artifact1 = artifact4.getRelated(Dependency__Artifact).getExactlyOne();
@@ -821,7 +821,7 @@ public class OrcsTransactionTest {
tx2.unrelateFromAll(Default_Hierarchical__Parent, art1);
tx2.commit();
- artifact4 = query.fromBranch(COMMON).andIds(art4).getResults().getExactlyOne();
+ artifact4 = query.fromBranch(COMMON).andId(art4).getResults().getExactlyOne();
assertEquals(art4, artifact4);
artifact1 = artifact4.getRelated(Dependency__Artifact).getExactlyOne();
@@ -837,18 +837,18 @@ public class OrcsTransactionTest {
ArtifactToken art1 = tx1.createArtifact(Component, "orig name");
TransactionId rec1 = tx1.commit();
assertNotNull(rec1);
- art1 = query.fromBranch(COMMON).andIds(art1).getResults().getExactlyOne();
+ art1 = query.fromBranch(COMMON).andId(art1).getResults().getExactlyOne();
assertEquals("orig name", art1.getName());
// change name
- ArtifactToken art2 = query.fromBranch(COMMON).andIds(art1).getResults().getExactlyOne();
+ ArtifactToken art2 = query.fromBranch(COMMON).andId(art1).getResults().getExactlyOne();
TransactionBuilder tx2 = createTx();
tx2.setName(art2, "new name");
TransactionId rec2 = tx2.commit();
assertNotNull(rec2);
// verify that change only exists on new stripe?
- ArtifactToken art3 = query.fromBranch(COMMON).andIds(art1).getResults().getExactlyOne();
+ ArtifactToken art3 = query.fromBranch(COMMON).andId(art1).getResults().getExactlyOne();
assertEquals("orig name", art1.getName());
// this should be same name cause we didn't re-query it and the tx didn't change the model?
assertEquals("orig name", art2.getName());
@@ -874,7 +874,7 @@ public class OrcsTransactionTest {
TransactionId rec1 = tx1.commit();
assertNotNull(rec1);
- artifact4 = query.fromBranch(COMMON).andIds(art4).getResults().getExactlyOne();
+ artifact4 = query.fromBranch(COMMON).andId(art4).getResults().getExactlyOne();
assertEquals(art4, artifact4);
artifact1 = artifact4.getRelated(Dependency__Artifact).getExactlyOne();
@@ -931,13 +931,13 @@ public class OrcsTransactionTest {
tx.setSoleAttributeFromString(art1, CoreAttributeTypes.Annotation, "write5");
TransactionId lastTx = tx.commit();
- ArtifactReadable art = query.fromBranch(COMMON).andIds(art1).getResults().getExactlyOne();
+ ArtifactReadable art = query.fromBranch(COMMON).andId(art1).getResults().getExactlyOne();
ResultSet<? extends AttributeReadable<Object>> attributes = art.getAttributes(CoreAttributeTypes.Annotation);
assertEquals(1, attributes.size());
assertEquals("write5", attributes.getExactlyOne().getValue());
- QueryBuilder builder = query.fromBranch(COMMON).fromTransaction(lastTx).andIds(art1);
+ QueryBuilder builder = query.fromBranch(COMMON).fromTransaction(lastTx).andId(art1);
ResultSet<ArtifactReadable> results = builder.getResults();
art = results.getExactlyOne();
attributes = art.getAttributes(CoreAttributeTypes.Annotation);
@@ -969,7 +969,7 @@ public class OrcsTransactionTest {
tx.setRationale(art1, CoreRelationTypes.Users_User, art2, "rationale5");
TransactionId lastTx = tx.commit();
- ArtifactReadable art = query.fromBranch(COMMON).andIds(art1).getResults().getExactlyOne();
+ ArtifactReadable art = query.fromBranch(COMMON).andId(art1).getResults().getExactlyOne();
ResultSet<ArtifactReadable> related = art.getRelated(CoreRelationTypes.Users_User);
assertEquals(1, related.size());
ArtifactReadable other = related.getExactlyOne();
@@ -977,7 +977,7 @@ public class OrcsTransactionTest {
assertEquals("rationale5", rationale);
- art = query.fromBranch(COMMON).fromTransaction(lastTx).andIds(art1).getResults().getExactlyOne();
+ art = query.fromBranch(COMMON).fromTransaction(lastTx).andId(art1).getResults().getExactlyOne();
related = art.getRelated(CoreRelationTypes.Users_User);
assertEquals(1, related.size());
other = related.getExactlyOne();
@@ -994,7 +994,7 @@ public class OrcsTransactionTest {
tx.relate(art1, CoreRelationTypes.Users_User, art2, "rationale1");
tx.commit();
- ArtifactReadable art = query.fromBranch(COMMON).andIds(art1).getResults().getExactlyOne();
+ ArtifactReadable art = query.fromBranch(COMMON).andId(art1).getResults().getExactlyOne();
ArtifactReadable otherSide = art.getRelated(CoreRelationTypes.Users_User).getExactlyOne();
assertEquals(true, art.areRelated(CoreRelationTypes.Users_User, otherSide));
@@ -1002,7 +1002,7 @@ public class OrcsTransactionTest {
tx.unrelate(art1, CoreRelationTypes.Users_User, art2);
tx.commit();
- art = query.fromBranch(COMMON).andIds(art1).getResults().getExactlyOne();
+ art = query.fromBranch(COMMON).andId(art1).getResults().getExactlyOne();
ResultSet<ArtifactReadable> otherSideResults = art.getRelated(CoreRelationTypes.Users_User);
assertEquals(true, otherSideResults.isEmpty());
@@ -1010,7 +1010,7 @@ public class OrcsTransactionTest {
tx.relate(art1, CoreRelationTypes.Users_User, art2);
tx.commit();
- art = query.fromBranch(COMMON).andIds(art1).getResults().getExactlyOne();
+ art = query.fromBranch(COMMON).andId(art1).getResults().getExactlyOne();
otherSide = art.getRelated(CoreRelationTypes.Users_User).getExactlyOne();
assertEquals(true, art.areRelated(CoreRelationTypes.Users_User, otherSide));
}
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ArtifactQueryBuilder.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ArtifactQueryBuilder.java
index c1d60aceba4..6404123ec15 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ArtifactQueryBuilder.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ArtifactQueryBuilder.java
@@ -60,8 +60,6 @@ public interface ArtifactQueryBuilder<T> {
T andId(ArtifactId id);
- T andIds(ArtifactId id);
-
T andIds(Collection<? extends ArtifactId> ids);
T andIds(ArtifactId... ids);

Back to the top