Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2016-05-30 13:26:28 -0400
committerAngel Avila2016-05-30 13:26:28 -0400
commitb7c6c777bd6a51b8b9066ec8aac517c8a08db7f3 (patch)
treebad5bfeed789b6d2da1e30da571ab628557c2c85
parentc3cafba89b7d841899f53ca46d804ed3d6894cac (diff)
downloadorg.eclipse.osee-b7c6c777bd6a51b8b9066ec8aac517c8a08db7f3.tar.gz
org.eclipse.osee-b7c6c777bd6a51b8b9066ec8aac517c8a08db7f3.tar.xz
org.eclipse.osee-b7c6c777bd6a51b8b9066ec8aac517c8a08db7f3.zip
refactor: Rename ITransaction to create TransactionId
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/IAtsChangeSet.java4
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/IAtsBranchService.java20
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/branch/AtsBranchServiceImplTest.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/internal/AtsBranchServiceImpl.java10
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java8
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsBranchService.java50
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsBranchServiceImpl.java14
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsChangeSet.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/TransactionRecordTest.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/TransactionRecord.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ITransaction.java20
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TransactionId.java57
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/Id.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactoryTest.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxCallableFactoryTest.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/TxDataStore.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsBranchImpl.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactory.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/CreateBranchCallable.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeTransactionCommand.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionFactoryImpl.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxCallableFactory.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeTransactionTxCallable.java18
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/SetTransactionTxCallable.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxModule.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchTest.java8
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/OrcsBranch.java6
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/CreateBranchData.java14
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/TransactionReadable.java4
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionFactory.java6
34 files changed, 195 insertions, 158 deletions
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/IAtsChangeSet.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/IAtsChangeSet.java
index 9fbb4164d7..aafb553850 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/IAtsChangeSet.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/IAtsChangeSet.java
@@ -23,7 +23,7 @@ import org.eclipse.osee.framework.core.data.IArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
/**
@@ -40,7 +40,7 @@ public interface IAtsChangeSet {
*
* @throws OseeCoreException if no items exist to store. Use executeIfNeeded to execute quietly.
*/
- ITransaction execute() throws OseeCoreException;
+ TransactionId execute() throws OseeCoreException;
void clear();
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/IAtsBranchService.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/IAtsBranchService.java
index 1b83200ec7..9300dace66 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/IAtsBranchService.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/IAtsBranchService.java
@@ -18,7 +18,7 @@ import org.eclipse.osee.ats.api.commit.ICommitConfigItem;
import org.eclipse.osee.ats.api.version.IAtsVersion;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.util.Result;
@@ -60,9 +60,9 @@ public interface IAtsBranchService {
Collection<ICommitConfigItem> getConfigArtifactsConfiguredToCommitTo(IAtsTeamWorkflow teamWf);
- ITransaction getEarliestTransactionId(IAtsTeamWorkflow teamWf);
+ TransactionId getEarliestTransactionId(IAtsTeamWorkflow teamWf);
- Collection<ITransaction> getTransactionIds(IAtsTeamWorkflow teamWf, boolean forMergeBranches);
+ Collection<TransactionId> getTransactionIds(IAtsTeamWorkflow teamWf, boolean forMergeBranches);
boolean isBranchesAllCommittedExcept(IAtsTeamWorkflow teamWf, BranchId branchToExclude);
@@ -91,15 +91,15 @@ public interface IAtsBranchService {
boolean isWorkingBranchEverCommitted(IAtsTeamWorkflow teamWf);
- Collection<Object> combineCommitTransactionsAndConfigItems(Collection<ICommitConfigItem> configArtSet, Collection<ITransaction> commitTxs);
+ Collection<Object> combineCommitTransactionsAndConfigItems(Collection<ICommitConfigItem> configArtSet, Collection<TransactionId> commitTxs);
- Collection<ITransaction> getCommitTransactionsToUnarchivedBaselineBranchs(IAtsTeamWorkflow teamWf);
+ Collection<TransactionId> getCommitTransactionsToUnarchivedBaselineBranchs(IAtsTeamWorkflow teamWf);
BranchType getBranchType(BranchId branch);
BranchState getBranchState(BranchId branch);
- Collection<ITransaction> getCommittedArtifactTransactionIds(IAtsTeamWorkflow teamWf);
+ Collection<TransactionId> getCommittedArtifactTransactionIds(IAtsTeamWorkflow teamWf);
boolean isMergeBranchExists(IAtsTeamWorkflow teamWf, BranchId destinationBranch);
@@ -115,19 +115,19 @@ public interface IAtsBranchService {
boolean isArchived(BranchId branch);
- ITransaction getCommitTransactionRecord(IAtsTeamWorkflow teamWf, BranchId branch);
+ TransactionId getCommitTransactionRecord(IAtsTeamWorkflow teamWf, BranchId branch);
- Date getTimeStamp(ITransaction committedToParentTransRecord);
+ Date getTimeStamp(TransactionId committedToParentTransRecord);
Collection<BranchId> getBranchesToCommitTo(IAtsTeamWorkflow teamWf) throws OseeCoreException;
Collection<BranchId> getBranchesInCommit();
- boolean workingBranchCommittedToDestinationBranchParentPriorToDestinationBranchCreation(IAtsTeamWorkflow teamWf, BranchId destinationBranch, Collection<ITransaction> commitTransactionIds) throws OseeCoreException;
+ boolean workingBranchCommittedToDestinationBranchParentPriorToDestinationBranchCreation(IAtsTeamWorkflow teamWf, BranchId destinationBranch, Collection<TransactionId> commitTransactionIds) throws OseeCoreException;
BranchId getParentBranch(BranchId branch);
- ITransaction getBaseTransaction(BranchId branch);
+ TransactionId getBaseTransaction(BranchId branch);
String getBranchName(IAtsTeamWorkflow teamWf);
}
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/branch/AtsBranchServiceImplTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/branch/AtsBranchServiceImplTest.java
index 6020600828..5623d60df7 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/branch/AtsBranchServiceImplTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/branch/AtsBranchServiceImplTest.java
@@ -22,7 +22,7 @@ import org.eclipse.osee.ats.api.version.IAtsVersion;
import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil;
import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -99,7 +99,7 @@ public class AtsBranchServiceImplTest {
//Test TxRecords
TransactionRecord txRecord = new TransactionRecord(1234, SAW_Bld_1, "comment", new Date(),
UserManager.getUser().getArtId(), UserManager.getUser().getArtId(), TransactionDetailsType.Baselined);
- Collection<ITransaction> commitTxs = new ArrayList<>();
+ Collection<TransactionId> commitTxs = new ArrayList<>();
Collection<ICommitConfigItem> configArtSet = new HashSet<>();
commitTxs.add(txRecord);
Collection<Object> commitObjs =
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/internal/AtsBranchServiceImpl.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/internal/AtsBranchServiceImpl.java
index 26fe02f8b3..3f4c09d171 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/internal/AtsBranchServiceImpl.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/internal/AtsBranchServiceImpl.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.ats.core.util.AbstractAtsBranchService;
import org.eclipse.osee.ats.core.workflow.ITeamWorkflowProvidersLazy;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.model.TransactionRecord;
@@ -72,8 +72,8 @@ public class AtsBranchServiceImpl extends AbstractAtsBranchService {
}
@Override
- public Collection<ITransaction> getCommittedArtifactTransactionIds(IAtsTeamWorkflow teamWf) {
- List<ITransaction> transactions = new ArrayList<>();
+ public Collection<TransactionId> getCommittedArtifactTransactionIds(IAtsTeamWorkflow teamWf) {
+ List<TransactionId> transactions = new ArrayList<>();
for (TransactionRecord trans : TransactionManager.getCommittedArtifactTransactionIds(
(Artifact) teamWf.getStoreObject())) {
transactions.add(trans);
@@ -109,7 +109,7 @@ public class AtsBranchServiceImpl extends AbstractAtsBranchService {
}
@Override
- public Date getTimeStamp(ITransaction transaction) {
+ public Date getTimeStamp(TransactionId transaction) {
return TransactionManager.getTransactionId(transaction.getGuid()).getTimeStamp();
}
@@ -119,7 +119,7 @@ public class AtsBranchServiceImpl extends AbstractAtsBranchService {
}
@Override
- public ITransaction getBaseTransaction(BranchId branch) {
+ public TransactionId getBaseTransaction(BranchId branch) {
return BranchManager.getBaseTransaction(branch);
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java
index 91579fb95a..66a3540711 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java
@@ -36,7 +36,7 @@ import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -65,7 +65,7 @@ public class AtsChangeSet extends AbstractAtsChangeSet {
}
@Override
- public ITransaction execute() throws OseeCoreException {
+ public TransactionId execute() throws OseeCoreException {
Conditions.checkNotNull(comment, "comment");
if (objects.isEmpty() && deleteObjects.isEmpty() && execptionIfEmpty) {
throw new OseeArgumentException("objects/deleteObjects cannot be empty");
@@ -109,7 +109,7 @@ public class AtsChangeSet extends AbstractAtsChangeSet {
throw new OseeArgumentException("ATsChangeSet: Unhandled deleteObject type: " + obj);
}
}
- ITransaction transactionRecord = transaction.execute();
+ TransactionId transactionRecord = transaction.execute();
for (IExecuteListener listener : listeners) {
listener.changesStored(this);
}
@@ -188,7 +188,7 @@ public class AtsChangeSet extends AbstractAtsChangeSet {
}
}
- public static ITransaction execute(String comment, Object object, Object... objects) throws OseeCoreException {
+ public static TransactionId execute(String comment, Object object, Object... objects) throws OseeCoreException {
AtsChangeSet changes = new AtsChangeSet(comment);
changes.add(object);
for (Object obj : objects) {
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsBranchService.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsBranchService.java
index ec5f7053a2..f064907897 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsBranchService.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsBranchService.java
@@ -31,7 +31,7 @@ import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow;
import org.eclipse.osee.ats.core.workflow.ITeamWorkflowProvidersLazy;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.util.Result;
@@ -79,7 +79,7 @@ public abstract class AbstractAtsBranchService implements IAtsBranchService {
return branches;
}
- public ITransaction getCommitTransactionRecord(IAtsTeamWorkflow teamWf, ICommitConfigItem configArt) throws OseeCoreException {
+ public TransactionId getCommitTransactionRecord(IAtsTeamWorkflow teamWf, ICommitConfigItem configArt) throws OseeCoreException {
BranchId branch = getBranch(configArt);
return getCommitTransactionRecord(teamWf, branch);
}
@@ -141,13 +141,13 @@ public abstract class AbstractAtsBranchService implements IAtsBranchService {
}
@Override
- public ITransaction getCommitTransactionRecord(IAtsTeamWorkflow teamWf, BranchId branch) {
+ public TransactionId getCommitTransactionRecord(IAtsTeamWorkflow teamWf, BranchId branch) {
if (branch == null) {
return null;
}
- Collection<ITransaction> transactions = getCommittedArtifactTransactionIds(teamWf);
- for (ITransaction transId : transactions) {
+ Collection<TransactionId> transactions = getCommittedArtifactTransactionIds(teamWf);
+ for (TransactionId transId : transactions) {
if (transId.isOnBranch(branch)) {
return transId;
}
@@ -170,14 +170,14 @@ public abstract class AbstractAtsBranchService implements IAtsBranchService {
}
@Override
- public ITransaction getEarliestTransactionId(IAtsTeamWorkflow teamWf) {
- Collection<ITransaction> transactionIds = getTransactionIds(teamWf, false);
- ITransaction earliestTransactionId;
+ public TransactionId getEarliestTransactionId(IAtsTeamWorkflow teamWf) {
+ Collection<TransactionId> transactionIds = getTransactionIds(teamWf, false);
+ TransactionId earliestTransactionId;
if (transactionIds.isEmpty()) {
earliestTransactionId = null;
} else {
earliestTransactionId = transactionIds.iterator().next();
- for (ITransaction transactionId : transactionIds) {
+ for (TransactionId transactionId : transactionIds) {
if (transactionId.getGuid() < earliestTransactionId.getGuid()) {
earliestTransactionId = transactionId;
}
@@ -201,7 +201,7 @@ public abstract class AbstractAtsBranchService implements IAtsBranchService {
@Override
public Collection<BranchId> getBranchesCommittedTo(IAtsTeamWorkflow teamWf) {
Set<BranchId> branches = new HashSet<>();
- for (ITransaction transId : getTransactionIds(teamWf, false)) {
+ for (TransactionId transId : getTransactionIds(teamWf, false)) {
branches.add(transId.getBranch());
}
return branches;
@@ -248,11 +248,11 @@ public abstract class AbstractAtsBranchService implements IAtsBranchService {
}
@Override
- public Collection<ITransaction> getCommitTransactionsToUnarchivedBaselineBranchs(IAtsTeamWorkflow teamWf) {
- Collection<ITransaction> committedTransactions = getCommittedArtifactTransactionIds(teamWf);
+ public Collection<TransactionId> getCommitTransactionsToUnarchivedBaselineBranchs(IAtsTeamWorkflow teamWf) {
+ Collection<TransactionId> committedTransactions = getCommittedArtifactTransactionIds(teamWf);
- Collection<ITransaction> transactionIds = new ArrayList<>();
- for (ITransaction transactionId : committedTransactions) {
+ Collection<TransactionId> transactionIds = new ArrayList<>();
+ for (TransactionId transactionId : committedTransactions) {
// exclude working branches including branch states that are re-baselined
BranchId branch = transactionId.getBranch();
if (getBranchType(branch).isBaselineBranch() && !isArchived(branch)) {
@@ -387,7 +387,7 @@ public abstract class AbstractAtsBranchService implements IAtsBranchService {
* This method was refactored from above so it could be tested independently
*/
@Override
- public Collection<Object> combineCommitTransactionsAndConfigItems(Collection<ICommitConfigItem> configArtSet, Collection<ITransaction> commitTxs) throws OseeCoreException {
+ public Collection<Object> combineCommitTransactionsAndConfigItems(Collection<ICommitConfigItem> configArtSet, Collection<TransactionId> commitTxs) throws OseeCoreException {
// commitMgrInputObjs will hold a union of all commits from configArtSet and commitTxs.
// - first, we addAll configArtSet
// - next, we loop through commitTxs and for any tx that has the same branch as ANY pre-existing commit
@@ -395,7 +395,7 @@ public abstract class AbstractAtsBranchService implements IAtsBranchService {
Collection<Object> commitMgrInputObjs = new HashSet<>();
commitMgrInputObjs.addAll(configArtSet);
//for each tx commit...
- for (ITransaction txRecord : commitTxs) {
+ for (TransactionId txRecord : commitTxs) {
boolean isCommitAlreadyPresent = false;
// ... compare the branch of the tx commit to all the parent branches in configArtSet and do NOT add the tx
// commit if it is already represented.
@@ -423,7 +423,7 @@ public abstract class AbstractAtsBranchService implements IAtsBranchService {
@Override
public Collection<Object> getCommitTransactionsAndConfigItemsForTeamWf(IAtsTeamWorkflow teamWf) throws OseeCoreException {
Collection<ICommitConfigItem> configArtSet = getConfigArtifactsConfiguredToCommitTo(teamWf);
- Collection<ITransaction> commitTxs = getCommitTransactionsToUnarchivedBaselineBranchs(teamWf);
+ Collection<TransactionId> commitTxs = getCommitTransactionsToUnarchivedBaselineBranchs(teamWf);
Collection<Object> commitMgrInputObjs = combineCommitTransactionsAndConfigItems(configArtSet, commitTxs);
return commitMgrInputObjs;
}
@@ -520,10 +520,10 @@ public abstract class AbstractAtsBranchService implements IAtsBranchService {
return CommitStatus.Branch_Not_Configured;
}
- Collection<ITransaction> transactions = getCommittedArtifactTransactionIds(teamWf);
+ Collection<TransactionId> transactions = getCommittedArtifactTransactionIds(teamWf);
boolean mergeBranchExists = isMergeBranchExists(teamWf, destinationBranch);
- for (ITransaction transId : transactions) {
+ for (TransactionId transId : transactions) {
if (transId.isOnBranch(destinationBranch)) {
if (mergeBranchExists) {
return CommitStatus.Committed_With_Merge;
@@ -561,12 +561,12 @@ public abstract class AbstractAtsBranchService implements IAtsBranchService {
* @return TransactionId associated with this state machine artifact
*/
@Override
- public Collection<ITransaction> getTransactionIds(IAtsTeamWorkflow teamWf, boolean forMergeBranches) {
+ public Collection<TransactionId> getTransactionIds(IAtsTeamWorkflow teamWf, boolean forMergeBranches) {
if (forMergeBranches) {
BranchId workingBranch = getWorkingBranch(teamWf);
// grab only the transaction that had merge conflicts
- Collection<ITransaction> transactionIds = new ArrayList<>();
- for (ITransaction transactionId : getCommitTransactionsToUnarchivedBaselineBranchs(teamWf)) {
+ Collection<TransactionId> transactionIds = new ArrayList<>();
+ for (TransactionId transactionId : getCommitTransactionsToUnarchivedBaselineBranchs(teamWf)) {
if (isMergeBranchExists(teamWf, workingBranch, transactionId.getBranch())) {
transactionIds.add(transactionId);
}
@@ -591,14 +591,14 @@ public abstract class AbstractAtsBranchService implements IAtsBranchService {
}
@Override
- public boolean workingBranchCommittedToDestinationBranchParentPriorToDestinationBranchCreation(IAtsTeamWorkflow teamWf, BranchId destinationBranch, Collection<ITransaction> commitTransactionIds) throws OseeCoreException {
+ public boolean workingBranchCommittedToDestinationBranchParentPriorToDestinationBranchCreation(IAtsTeamWorkflow teamWf, BranchId destinationBranch, Collection<TransactionId> commitTransactionIds) throws OseeCoreException {
BranchId destinationBranchParent = getParentBranch(destinationBranch);
if (getBranchType(destinationBranchParent) == BranchType.SYSTEM_ROOT) {
return false;
}
- ITransaction committedToParentTransRecord = null;
- for (ITransaction transId : commitTransactionIds) {
+ TransactionId committedToParentTransRecord = null;
+ for (TransactionId transId : commitTransactionIds) {
if (transId.isOnBranch(destinationBranchParent)) {
committedToParentTransRecord = transId;
break;
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsBranchServiceImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsBranchServiceImpl.java
index 4f4294d979..42ebc78c19 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsBranchServiceImpl.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsBranchServiceImpl.java
@@ -23,7 +23,7 @@ import org.eclipse.osee.ats.core.util.AbstractAtsBranchService;
import org.eclipse.osee.ats.core.workflow.ITeamWorkflowProvidersLazy;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
@@ -42,8 +42,8 @@ import org.eclipse.osee.orcs.search.TransactionQuery;
public class AtsBranchServiceImpl extends AbstractAtsBranchService {
private final OrcsApi orcsApi;
- private static final HashMap<Integer, List<ITransaction>> commitArtifactIdMap =
- new HashMap<Integer, List<ITransaction>>();
+ private static final HashMap<Integer, List<TransactionId>> commitArtifactIdMap =
+ new HashMap<Integer, List<TransactionId>>();
public AtsBranchServiceImpl(IAtsServices atsServices, OrcsApi orcsApi, ITeamWorkflowProvidersLazy teamWorkflowProvidersLazy) {
super(atsServices, teamWorkflowProvidersLazy);
@@ -128,14 +128,14 @@ public class AtsBranchServiceImpl extends AbstractAtsBranchService {
}
@Override
- public Date getTimeStamp(ITransaction transaction) {
+ public Date getTimeStamp(TransactionId transaction) {
return ((TransactionRecord) transaction).getTimeStamp();
}
@Override
- public Collection<ITransaction> getCommittedArtifactTransactionIds(IAtsTeamWorkflow teamWf) {
+ public Collection<TransactionId> getCommittedArtifactTransactionIds(IAtsTeamWorkflow teamWf) {
ArtifactReadable artifactReadable = (ArtifactReadable) teamWf.getStoreObject();
- List<ITransaction> transactionIds = commitArtifactIdMap.get(artifactReadable.getUuid());
+ List<TransactionId> transactionIds = commitArtifactIdMap.get(artifactReadable.getUuid());
// Cache the transactionIds first time through. Other commits will be added to cache as they
// happen in this client or as remote commit events come through
if (transactionIds == null) {
@@ -158,7 +158,7 @@ public class AtsBranchServiceImpl extends AbstractAtsBranchService {
}
@Override
- public ITransaction getBaseTransaction(BranchId branch) {
+ public TransactionId getBaseTransaction(BranchId branch) {
TransactionQuery txQuery = orcsApi.getQueryFactory().transactionQuery();
return txQuery.andBranch(branch).andIs(TransactionDetailsType.Baselined).getResults().getExactlyOne();
}
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsChangeSet.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsChangeSet.java
index f70ec29c1d..335b88a075 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsChangeSet.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsChangeSet.java
@@ -33,7 +33,7 @@ import org.eclipse.osee.framework.core.data.AttributeId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
@@ -86,7 +86,7 @@ public class AtsChangeSet extends AbstractAtsChangeSet {
}
@Override
- public ITransaction execute() throws OseeCoreException {
+ public TransactionId execute() throws OseeCoreException {
Conditions.checkNotNull(comment, "comment");
if (objects.isEmpty() && deleteObjects.isEmpty() && execptionIfEmpty) {
throw new OseeArgumentException("objects/deleteObjects cannot be empty");
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java
index ed0b62db1f..a8b385a5e9 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java
@@ -25,7 +25,7 @@ import org.eclipse.osee.ats.internal.Activator;
import org.eclipse.osee.ats.internal.AtsClientService;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.model.MergeBranch;
@@ -119,7 +119,7 @@ public final class AtsBranchManager {
IOseeBranch workingBranch = AtsClientService.get().getBranchService().getWorkingBranch(teamArt);
MergeView.openView(workingBranch, destinationBranch, BranchManager.getBaseTransaction(workingBranch));
} else if (AtsClientService.get().getBranchService().isCommittedBranchExists(teamArt)) {
- Collection<ITransaction> transactions =
+ Collection<TransactionId> transactions =
AtsClientService.get().getBranchService().getTransactionIds(teamArt, true);
Collection<TransactionRecord> trs = Collections.castAll(transactions);
for (TransactionRecord transactionId : trs) {
@@ -191,7 +191,7 @@ public final class AtsBranchManager {
*/
public static TransactionRecord getTransactionIdOrPopupChoose(TeamWorkFlowArtifact teamArt, String title, boolean showMergeManager) throws OseeCoreException {
Collection<TransactionRecord> transactionIds = new HashSet<>();
- Collection<ITransaction> transactions =
+ Collection<TransactionId> transactions =
AtsClientService.get().getBranchService().getTransactionIds(teamArt, showMergeManager);
Collection<TransactionRecord> trs = Collections.castAll(transactions);
@@ -263,7 +263,7 @@ public final class AtsBranchManager {
*/
public static void showChangeReportForBranch(TeamWorkFlowArtifact teamArt, BranchId destinationBranch) {
try {
- Collection<ITransaction> transactions =
+ Collection<TransactionId> transactions =
AtsClientService.get().getBranchService().getTransactionIds(teamArt, false);
Collection<TransactionRecord> trs = Collections.castAll(transactions);
for (TransactionRecord transactionId : trs) {
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/TransactionRecordTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/TransactionRecordTest.java
index 607540d72f..71e1da9396 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/TransactionRecordTest.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/TransactionRecordTest.java
@@ -14,8 +14,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.ITransaction;
import org.eclipse.osee.framework.core.data.TokenFactory;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.core.model.mocks.MockDataFactory;
@@ -35,7 +35,7 @@ import org.junit.runners.Parameterized.Parameters;
public class TransactionRecordTest {
private final TransactionRecord transaction;
- private final int transactionNumber;
+ private final Integer transactionNumber;
private final BranchId branch;
private final TransactionDetailsType txType;
@@ -116,7 +116,7 @@ public class TransactionRecordTest {
@Test
public void testEqualsAndHashCode() {
TransactionRecord tx2 = MockDataFactory.createTransaction(99, 2);
- ITransaction tx1 = TokenFactory.createTransaction(tx2.getId());
+ TransactionId tx1 = TokenFactory.createTransaction(tx2.getId());
// Add some variation to tx2 so we are certain that only the txId is used in the equals method;
tx2.setAuthor(0);
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/TransactionRecord.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/TransactionRecord.java
index 01de6a5400..d7087f46c1 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/TransactionRecord.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/TransactionRecord.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.framework.core.model;
import java.util.Date;
import org.eclipse.osee.framework.core.data.Adaptable;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
import org.eclipse.osee.framework.jdk.core.type.BaseIdentity;
import org.eclipse.osee.framework.jdk.core.util.Strings;
@@ -21,7 +21,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings;
/**
* @author Jeff C. Phillips
*/
-public class TransactionRecord extends BaseIdentity<Integer> implements ITransaction, Adaptable {
+public class TransactionRecord extends BaseIdentity<Integer> implements TransactionId, Adaptable {
private final TransactionDetailsType txType;
private final BranchId branch;
private String comment;
@@ -48,10 +48,6 @@ public class TransactionRecord extends BaseIdentity<Integer> implements ITransac
return branch;
}
- public int getId() {
- return getGuid();
- }
-
public String getComment() {
return comment;
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ITransaction.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ITransaction.java
deleted file mode 100644
index 9eba8e1aa8..0000000000
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ITransaction.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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.framework.core.data;
-
-import org.eclipse.osee.framework.jdk.core.type.Identity;
-
-/**
- * @author Ryan D. Brooks
- */
-public interface ITransaction extends Identity<Integer>, HasBranch {
- // composition interface requires no additional methods,fields
-}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java
index 99e06ca061..0a1b01babe 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java
@@ -134,11 +134,11 @@ public final class TokenFactory {
}
}
- public static ITransaction createTransaction(int txId) {
+ public static TransactionId createTransaction(int txId) {
return new TransactionToken(txId);
}
- private static final class TransactionToken extends BaseIdentity<Integer> implements ITransaction {
+ private static final class TransactionToken extends BaseIdentity<Integer> implements TransactionId {
public TransactionToken(Integer txId) {
super(txId);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TransactionId.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TransactionId.java
new file mode 100644
index 0000000000..43bf181222
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TransactionId.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2007 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.framework.core.data;
+
+import org.codehaus.jackson.annotate.JsonCreator;
+import org.eclipse.osee.framework.jdk.core.type.BaseIdentity;
+import org.eclipse.osee.framework.jdk.core.type.Id;
+import org.eclipse.osee.framework.jdk.core.type.Identity;
+
+/**
+ * @author Ryan D. Brooks
+ */
+public interface TransactionId extends Identity<Integer>, HasBranch {
+ TransactionId SENTINEL = valueOf(Id.SENTINEL);
+
+ @JsonCreator
+ public static TransactionId valueOf(long id) {
+ final class TransactionToken extends BaseIdentity<Integer> implements TransactionId {
+ public TransactionToken(Integer txId) {
+ super(txId);
+ }
+ }
+ return new TransactionToken((int) id);
+ }
+
+ default boolean isValid() {
+ return !isInvalid();
+ }
+
+ default boolean isInvalid() {
+ return getGuid().equals(SENTINEL);
+ }
+
+ default boolean equals(Long id) {
+ return getGuid().equals(id.intValue());
+ }
+
+ default boolean isOlderThan(TransactionId other) {
+ return getGuid() < other.getGuid();
+ }
+
+ default boolean notEqual(TransactionId other) {
+ return !equals(other);
+ }
+
+ default Integer getId() {
+ return getGuid();
+ }
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/Id.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/Id.java
index f5272cbdce..8895157649 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/Id.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/Id.java
@@ -35,6 +35,10 @@ public interface Id {
return getId().equals(id);
}
+ default boolean notEqual(Id id) {
+ return !equals(id);
+ }
+
default boolean isValid() {
return !isInvalid();
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
index 06ea6628d2..20f0450940 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
@@ -30,7 +30,7 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.osee.framework.core.client.OseeClientProperties;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.BranchArchivedState;
import org.eclipse.osee.framework.core.enums.BranchState;
@@ -730,11 +730,11 @@ public final class BranchManager {
return getBranch(branch).getShortName();
}
- public static String getBranchName(ITransaction tx) {
+ public static String getBranchName(TransactionId tx) {
return getBranch(tx.getBranch()).getName();
}
- public static String getBranchShortName(ITransaction tx) {
+ public static String getBranchShortName(TransactionId tx) {
return getBranch(tx.getBranch()).getShortName();
}
-}
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
index 8a1591d10a..ddc63ad275 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
@@ -25,7 +25,7 @@ import java.util.Set;
import java.util.logging.Level;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
@@ -412,7 +412,7 @@ public final class SkynetTransaction extends TransactionOperation<BranchId> {
}
//TODO this method needs to be removed
- public ITransaction execute() throws OseeCoreException {
+ public TransactionId execute() throws OseeCoreException {
Operations.executeWorkAndCheckStatus(this);
return transaction;
}
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactoryTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactoryTest.java
index 4bf2639d24..9ea72a4f9e 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactoryTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactoryTest.java
@@ -14,7 +14,7 @@ import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.CoreBranches;
@@ -139,7 +139,7 @@ public class BranchDataFactoryTest {
when(branch.getUuid()).thenReturn(branchUuid);
when(parent.getName()).thenReturn(parentName);
- ITransaction tx = TokenFactory.createTransaction(99);
+ TransactionId tx = TokenFactory.createTransaction(99);
when(txQuery.andTxId(tx.getGuid())).thenReturn(txQuery);
when(txQuery.getResults()).thenReturn(results);
@@ -169,7 +169,7 @@ public class BranchDataFactoryTest {
when(branch.getUuid()).thenReturn(branchUuid);
when(parent.getName()).thenReturn(parentName);
- ITransaction tx = TokenFactory.createTransaction(99);
+ TransactionId tx = TokenFactory.createTransaction(99);
when(txQuery.andTxId(tx.getGuid())).thenReturn(txQuery);
when(txQuery.getResults()).thenReturn(results);
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxCallableFactoryTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxCallableFactoryTest.java
index 059c95eac7..75c5612f84 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxCallableFactoryTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxCallableFactoryTest.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.concurrent.Callable;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.logger.Log;
import org.eclipse.osee.orcs.OrcsSession;
@@ -95,7 +95,7 @@ public class TxCallableFactoryTest {
@Test
public void testpurgeTransactions() throws Exception {
Callable callable = mock(Callable.class);
- Collection<? extends ITransaction> transactions = Collections.emptyList();
+ Collection<? extends TransactionId> transactions = Collections.emptyList();
when(txDataStore.purgeTransactions(session, transactions)).thenReturn(callable);
txFactory.purgeTransactions(session, transactions).call();
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/TxDataStore.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/TxDataStore.java
index d91541bac6..5af0081ed0 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/TxDataStore.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/TxDataStore.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.orcs.core.ds;
import java.util.Collection;
import java.util.concurrent.Callable;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.orcs.OrcsSession;
/**
@@ -22,8 +22,8 @@ public interface TxDataStore {
Callable<TransactionResult> commitTransaction(OrcsSession session, TransactionData transaction);
- Callable<Integer> purgeTransactions(OrcsSession session, Collection<? extends ITransaction> transactions);
+ Callable<Integer> purgeTransactions(OrcsSession session, Collection<? extends TransactionId> transactions);
- Callable<Void> setTransactionComment(OrcsSession session, ITransaction transaction, String comment);
+ Callable<Void> setTransactionComment(OrcsSession session, TransactionId transaction, String comment);
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsBranchImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsBranchImpl.java
index 697bcb809b..a9a59c015a 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsBranchImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsBranchImpl.java
@@ -15,7 +15,7 @@ import java.util.List;
import java.util.concurrent.Callable;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.model.change.ChangeItem;
@@ -163,14 +163,14 @@ public class OrcsBranchImpl implements OrcsBranch {
}
@Override
- public Callable<BranchReadable> createCopyTxBranch(IOseeBranch branch, ArtifactReadable author, ITransaction fromTransaction, ArtifactReadable associatedArtifact) throws OseeCoreException {
+ public Callable<BranchReadable> createCopyTxBranch(IOseeBranch branch, ArtifactReadable author, TransactionId fromTransaction, ArtifactReadable associatedArtifact) throws OseeCoreException {
CreateBranchData branchData =
branchDataFactory.createCopyTxBranchData(branch, author, fromTransaction, associatedArtifact);
return createBranch(branchData);
}
@Override
- public Callable<BranchReadable> createPortBranch(IOseeBranch branch, ArtifactReadable author, ITransaction fromTransaction, ArtifactReadable associatedArtifact) throws OseeCoreException {
+ public Callable<BranchReadable> createPortBranch(IOseeBranch branch, ArtifactReadable author, TransactionId fromTransaction, ArtifactReadable associatedArtifact) throws OseeCoreException {
CreateBranchData branchData =
branchDataFactory.createPortBranchData(branch, author, fromTransaction, associatedArtifact);
return createBranch(branchData);
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactory.java
index 4ee1a4ff9d..4f71f80f97 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactory.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactory.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.orcs.core.internal.branch;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -58,7 +58,7 @@ public class BranchDataFactory {
false);
}
- public CreateBranchData createCopyTxBranchData(IOseeBranch branch, ArtifactReadable author, ITransaction fromTransaction, ArtifactReadable associatedArtifact) throws OseeCoreException {
+ public CreateBranchData createCopyTxBranchData(IOseeBranch branch, ArtifactReadable author, TransactionId fromTransaction, ArtifactReadable associatedArtifact) throws OseeCoreException {
TransactionQuery txQuery = queryFactory.transactionQuery();
BranchQuery branchQuery = queryFactory.branchQuery();
TransactionReadable fromTx = txQuery.andTxId(fromTransaction.getGuid()).getResults().getExactlyOne();
@@ -70,7 +70,7 @@ public class BranchDataFactory {
true);
}
- public CreateBranchData createPortBranchData(IOseeBranch branch, ArtifactReadable author, ITransaction fromTransaction, ArtifactReadable associatedArtifact) throws OseeCoreException {
+ public CreateBranchData createPortBranchData(IOseeBranch branch, ArtifactReadable author, TransactionId fromTransaction, ArtifactReadable associatedArtifact) throws OseeCoreException {
TransactionQuery txQuery = queryFactory.transactionQuery();
BranchQuery branchQuery = queryFactory.branchQuery();
int value = fromTransaction.getGuid();
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/CreateBranchCallable.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/CreateBranchCallable.java
index d194afc3ec..c92298b449 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/CreateBranchCallable.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/CreateBranchCallable.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.orcs.core.internal.branch;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
import org.eclipse.osee.logger.Log;
import org.eclipse.osee.orcs.OrcsSession;
@@ -40,12 +40,12 @@ public class CreateBranchCallable extends AbstractBranchCallable<BranchReadable>
Conditions.checkNotNull(branchData.getName(), "branchName");
Conditions.checkNotNull(branchData.getBranchType(), "branchType");
- ITransaction txData = branchData.getFromTransaction();
+ TransactionId txData = branchData.getFromTransaction();
Conditions.checkNotNull(txData, "sourceTransaction");
if (branchData.isTxCopyBranchType()) {
TransactionQuery txQuery = queryFactory.transactionQuery();
- ITransaction givenTx = branchData.getFromTransaction();
+ TransactionId givenTx = branchData.getFromTransaction();
Conditions.checkNotNull(givenTx, "Transaction used for copy");
branchData.setSavedTransaction(givenTx);
TransactionReadable priorTx = txQuery.andIsPriorTx(givenTx.getGuid()).getResults().getExactlyOne();
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeTransactionCommand.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeTransactionCommand.java
index 5478c5a557..68a281568c 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeTransactionCommand.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeTransactionCommand.java
@@ -17,7 +17,7 @@ import java.util.concurrent.Callable;
import org.eclipse.osee.console.admin.Console;
import org.eclipse.osee.console.admin.ConsoleCommand;
import org.eclipse.osee.console.admin.ConsoleParameters;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.orcs.OrcsApi;
import org.eclipse.osee.orcs.transaction.TransactionFactory;
@@ -60,9 +60,9 @@ public class PurgeTransactionCommand implements ConsoleCommand {
@Override
public Object call() throws Exception {
String[] stringIds = params.getArray("txIds");
- final List<ITransaction> transactions = new ArrayList<>();
+ final List<TransactionId> transactions = new ArrayList<>();
for (String arg : stringIds) {
- ITransaction tx = TokenFactory.createTransaction(Integer.parseInt(arg));
+ TransactionId tx = TokenFactory.createTransaction(Integer.parseInt(arg));
transactions.add(tx);
}
console.writeln();
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionFactoryImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionFactoryImpl.java
index 36023c5f58..ae7ec974c1 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionFactoryImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionFactoryImpl.java
@@ -18,7 +18,7 @@ import java.util.concurrent.Callable;
import org.eclipse.osee.executor.admin.CancellableCallable;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.core.model.change.ChangeItem;
@@ -65,7 +65,7 @@ public class TransactionFactoryImpl implements TransactionFactory {
}
@Override
- public CancellableCallable<Integer> purgeTransaction(Collection<? extends ITransaction> transactions) {
+ public CancellableCallable<Integer> purgeTransaction(Collection<? extends TransactionId> transactions) {
return txCallableFactory.purgeTransactions(session, transactions);
}
@@ -90,7 +90,7 @@ public class TransactionFactoryImpl implements TransactionFactory {
}
@Override
- public Callable<Void> setTransactionComment(ITransaction transaction, String comment) {
+ public Callable<Void> setTransactionComment(TransactionId transaction, String comment) {
return txCallableFactory.setTransactionComment(session, transaction, comment);
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxCallableFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxCallableFactory.java
index 417a07bd1c..16f0fa87c7 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxCallableFactory.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxCallableFactory.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.core.internal.transaction;
import java.util.Collection;
import java.util.concurrent.Callable;
import org.eclipse.osee.executor.admin.CancellableCallable;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.logger.Log;
@@ -39,7 +39,7 @@ public class TxCallableFactory {
this.txManager = txManager;
}
- public CancellableCallable<Integer> purgeTransactions(OrcsSession session, final Collection<? extends ITransaction> transactions) {
+ public CancellableCallable<Integer> purgeTransactions(OrcsSession session, final Collection<? extends TransactionId> transactions) {
return new AbstractTxCallable<Integer>("PurgeTransactions", session) {
@Override
protected Integer innerCall() throws Exception {
@@ -48,7 +48,7 @@ public class TxCallableFactory {
};
}
- public Callable<Void> setTransactionComment(OrcsSession session, final ITransaction transaction, final String comment) {
+ public Callable<Void> setTransactionComment(OrcsSession session, final TransactionId transaction, final String comment) {
return new AbstractTxCallable<Void>("SetTxComment", session) {
@Override
protected Void innerCall() throws Exception {
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeTransactionTxCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeTransactionTxCallable.java
index a716c1f609..359618e1e2 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeTransactionTxCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeTransactionTxCallable.java
@@ -20,7 +20,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.data.RelationalConstants;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.enums.TxChange;
@@ -64,21 +64,21 @@ public class PurgeTransactionTxCallable extends AbstractDatastoreTxCallable<Inte
"select branch_id from osee_tx_details WHERE transaction_id = ?";
private final SqlJoinFactory joinFactory;
- private final Collection<? extends ITransaction> txIdsToDelete;
+ private final Collection<? extends TransactionId> txIdsToDelete;
- public PurgeTransactionTxCallable(Log logger, OrcsSession session, JdbcClient jdbcClient, SqlJoinFactory joinFactory, Collection<? extends ITransaction> txIdsToDelete) {
+ public PurgeTransactionTxCallable(Log logger, OrcsSession session, JdbcClient jdbcClient, SqlJoinFactory joinFactory, Collection<? extends TransactionId> txIdsToDelete) {
super(logger, session, jdbcClient);
this.joinFactory = joinFactory;
this.txIdsToDelete = txIdsToDelete;
}
- private List<ITransaction> sortTxs(Collection<? extends ITransaction> txIdsToDelete) {
- List<ITransaction> txs = new ArrayList<>(txIdsToDelete);
+ private List<TransactionId> sortTxs(Collection<? extends TransactionId> txIdsToDelete) {
+ List<TransactionId> txs = new ArrayList<>(txIdsToDelete);
if (txs.size() > 1) {
- Collections.sort(txs, new Comparator<ITransaction>() {
+ Collections.sort(txs, new Comparator<TransactionId>() {
@Override
- public int compare(ITransaction o1, ITransaction o2) {
+ public int compare(TransactionId o1, TransactionId o2) {
return o1.getGuid().compareTo(o2.getGuid());
}
});
@@ -91,9 +91,9 @@ public class PurgeTransactionTxCallable extends AbstractDatastoreTxCallable<Inte
Conditions.checkNotNull(txIdsToDelete, "transaction ids to delete");
Conditions.checkExpressionFailOnTrue(txIdsToDelete.isEmpty(), "transaction ids to delete cannot be empty");
- List<ITransaction> txIds = sortTxs(txIdsToDelete);
+ List<TransactionId> txIds = sortTxs(txIdsToDelete);
int purgeCount = 0;
- for (ITransaction tx : txIds) {
+ for (TransactionId tx : txIds) {
getLogger().info("Purging Transaction: [%s]", tx);
List<Object[]> txsToDelete = new ArrayList<>();
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/SetTransactionTxCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/SetTransactionTxCallable.java
index ceb4407d76..00c239d7ba 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/SetTransactionTxCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/SetTransactionTxCallable.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.db.internal.callable;
import static org.eclipse.osee.framework.jdk.core.util.Conditions.checkNotNull;
import static org.eclipse.osee.framework.jdk.core.util.Conditions.checkNotNullOrEmpty;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.jdbc.JdbcClient;
import org.eclipse.osee.jdbc.JdbcConnection;
@@ -28,10 +28,10 @@ public class SetTransactionTxCallable extends AbstractDatastoreTxCallable<Void>
private static final String UPDATE_TRANSACTION_COMMENT =
"UPDATE osee_tx_details SET osee_comment = ? WHERE transaction_id = ?";
- private final ITransaction txs;
+ private final TransactionId txs;
private final String comment;
- public SetTransactionTxCallable(Log logger, OrcsSession session, JdbcClient jdbcClient, ITransaction txs, String comment) {
+ public SetTransactionTxCallable(Log logger, OrcsSession session, JdbcClient jdbcClient, TransactionId txs, String comment) {
super(logger, session, jdbcClient);
this.txs = txs;
this.comment = comment;
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxModule.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxModule.java
index c1b7c6cb00..aea528eb01 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxModule.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxModule.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.orcs.db.internal.transaction;
import java.util.Collection;
import java.util.concurrent.Callable;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.jdbc.JdbcClient;
import org.eclipse.osee.logger.Log;
import org.eclipse.osee.orcs.OrcsSession;
@@ -60,12 +60,12 @@ public class TxModule {
}
@Override
- public Callable<Integer> purgeTransactions(OrcsSession session, Collection<? extends ITransaction> transactionsToPurge) {
+ public Callable<Integer> purgeTransactions(OrcsSession session, Collection<? extends TransactionId> transactionsToPurge) {
return new PurgeTransactionTxCallable(logger, session, jdbcClient, sqlJoinFactory, transactionsToPurge);
}
@Override
- public Callable<Void> setTransactionComment(OrcsSession session, ITransaction transaction, String comment) {
+ public Callable<Void> setTransactionComment(OrcsSession session, TransactionId transaction, String comment) {
return new SetTransactionTxCallable(logger, session, jdbcClient, transaction, comment);
}
};
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 67a71278d1..2fca8587e9 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
@@ -20,7 +20,7 @@ import java.util.concurrent.Callable;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
@@ -83,7 +83,7 @@ public class OrcsBranchTest {
ArtifactReadable author = getSystemUser();
- ITransaction tx = TokenFactory.createTransaction(SOURCE_TX_ID);
+ TransactionId tx = TokenFactory.createTransaction(SOURCE_TX_ID);
Callable<BranchReadable> callable = branchOps.createCopyTxBranch(branch, author, tx, null);
assertNotNull(callable);
@@ -107,7 +107,7 @@ public class OrcsBranchTest {
// create the branch with the copied transaction
IOseeBranch postbranch = TokenFactory.createBranch("PostBranch");
- ITransaction tx1 = TokenFactory.createTransaction(CHANGED_TX_ID);
+ TransactionId tx1 = TokenFactory.createTransaction(CHANGED_TX_ID);
Callable<BranchReadable> postCallable = branchOps.createCopyTxBranch(postbranch, author, tx1, null);
assertNotNull(postCallable);
@@ -135,7 +135,7 @@ public class OrcsBranchTest {
ArtifactReadable author = getSystemUser();
- ITransaction tx = TokenFactory.createTransaction(SOURCE_TX_ID);
+ TransactionId tx = TokenFactory.createTransaction(SOURCE_TX_ID);
Callable<BranchReadable> callableBranch = branchOps.createCopyTxBranch(branch, author, tx, null);
// the new branch will contain two transactions - these should have the same change report as the original branch
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/OrcsBranch.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/OrcsBranch.java
index b4fde9eafa..450de1c4a0 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/OrcsBranch.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/OrcsBranch.java
@@ -15,7 +15,7 @@ import java.util.List;
import java.util.concurrent.Callable;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.model.change.ChangeItem;
@@ -53,9 +53,9 @@ public interface OrcsBranch {
Callable<BranchReadable> createWorkingBranch(IOseeBranch branch, ArtifactReadable author, IOseeBranch parent, ArtifactReadable associatedArtifact) throws OseeCoreException;
- Callable<BranchReadable> createCopyTxBranch(IOseeBranch branch, ArtifactReadable author, ITransaction fromTransaction, ArtifactReadable associatedArtifact) throws OseeCoreException;
+ Callable<BranchReadable> createCopyTxBranch(IOseeBranch branch, ArtifactReadable author, TransactionId fromTransaction, ArtifactReadable associatedArtifact) throws OseeCoreException;
- Callable<BranchReadable> createPortBranch(IOseeBranch branch, ArtifactReadable author, ITransaction fromTransaction, ArtifactReadable associatedArtifact) throws OseeCoreException;
+ Callable<BranchReadable> createPortBranch(IOseeBranch branch, ArtifactReadable author, TransactionId fromTransaction, ArtifactReadable associatedArtifact) throws OseeCoreException;
/////////////////////////////////////////////////////////////////////////
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/CreateBranchData.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/CreateBranchData.java
index 5ebb6bc8fd..1d183cb9c4 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/CreateBranchData.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/CreateBranchData.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.orcs.data;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
import org.eclipse.osee.framework.jdk.core.type.Identity;
@@ -31,8 +31,8 @@ public class CreateBranchData implements Identifiable<Long> {
private long branchUuid;
private BranchType branchType;
private String creationComment;
- private ITransaction fromTransaction;
- private ITransaction savedTransaction;
+ private TransactionId fromTransaction;
+ private TransactionId savedTransaction;
private ArtifactReadable associatedArtifact;
private ArtifactReadable userArtifact;
@@ -97,19 +97,19 @@ public class CreateBranchData implements Identifiable<Long> {
this.creationComment = creationComment;
}
- public ITransaction getFromTransaction() {
+ public TransactionId getFromTransaction() {
return fromTransaction;
}
- public void setFromTransaction(ITransaction fromTransaction) {
+ public void setFromTransaction(TransactionId fromTransaction) {
this.fromTransaction = fromTransaction;
}
- public ITransaction getSavedTransaction() {
+ public TransactionId getSavedTransaction() {
return savedTransaction;
}
- public void setSavedTransaction(ITransaction priorTransaction) {
+ public void setSavedTransaction(TransactionId priorTransaction) {
this.savedTransaction = priorTransaction;
}
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/TransactionReadable.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/TransactionReadable.java
index 110f4c3764..c9bbb29197 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/TransactionReadable.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/TransactionReadable.java
@@ -12,13 +12,13 @@ package org.eclipse.osee.orcs.data;
import java.util.Date;
import org.eclipse.osee.framework.core.data.HasLocalId;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
/**
* @author Roberto E. Escobar
*/
-public interface TransactionReadable extends HasLocalId<Integer>, ITransaction {
+public interface TransactionReadable extends HasLocalId<Integer>, TransactionId {
TransactionDetailsType getTxType();
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionFactory.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionFactory.java
index 627d0c795e..1157cde7eb 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionFactory.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionFactory.java
@@ -14,7 +14,7 @@ import java.util.Collection;
import java.util.concurrent.Callable;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.ITransaction;
+import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.ResultSet;
import org.eclipse.osee.orcs.data.TransactionReadable;
@@ -28,9 +28,9 @@ public interface TransactionFactory {
TransactionBuilder createTransaction(Long branchId, ArtifactId userArtifact, String comment) throws OseeCoreException;
- Callable<Integer> purgeTransaction(Collection<? extends ITransaction> transactions);
+ Callable<Integer> purgeTransaction(Collection<? extends TransactionId> transactions);
- Callable<Void> setTransactionComment(ITransaction transaction, String comment);
+ Callable<Void> setTransactionComment(TransactionId transaction, String comment);
CompareResults compareTxs(int txId1, int txId2);

Back to the top