diff options
author | Ryan D. Brooks | 2016-05-28 19:09:55 +0000 |
---|---|---|
committer | Angel Avila | 2016-05-28 19:09:55 +0000 |
commit | ae2be1e1d4017f175ccca5800c373ed29faa442c (patch) | |
tree | 52b2008c7685690b2977aa5c44501cae5e96aebf /plugins/org.eclipse.osee.orcs.db/src/org | |
parent | 40f7093891f3a002c94a30209ed0aa6849bd8b0e (diff) | |
download | org.eclipse.osee-ae2be1e1d4017f175ccca5800c373ed29faa442c.tar.gz org.eclipse.osee-ae2be1e1d4017f175ccca5800c373ed29faa442c.tar.xz org.eclipse.osee-ae2be1e1d4017f175ccca5800c373ed29faa442c.zip |
refactor: Add BranchId.SENTINEL
Change-Id: I880c9a3355797aa894caac144bfdbe7178818506
Diffstat (limited to 'plugins/org.eclipse.osee.orcs.db/src/org')
7 files changed, 11 insertions, 12 deletions
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CommitBranchDatabaseCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CommitBranchDatabaseCallable.java index 71772ded324..8b3e759de0b 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CommitBranchDatabaseCallable.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CommitBranchDatabaseCallable.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.orcs.db.internal.callable; -import static org.eclipse.osee.framework.core.data.RelationalConstants.BRANCH_SENTINEL; import static org.eclipse.osee.framework.core.data.RelationalConstants.TRANSACTION_SENTINEL; import java.util.ArrayList; import java.util.List; @@ -94,7 +93,7 @@ public class CommitBranchDatabaseCallable extends AbstractDatastoreCallable<Inte @Override public Integer call() throws Exception { - BranchId mergeBranch = getJdbcClient().fetch(BRANCH_SENTINEL, SELECT_MERGE_BRANCH_UUID, source, destination); + BranchId mergeBranch = getJdbcClient().fetch(BranchId.SENTINEL, SELECT_MERGE_BRANCH_UUID, source, destination); List<ChangeItem> changes = callComputeChanges(mergeBranch); CancellableCallable<Integer> commitCallable = new CommitBranchDatabaseTxCallable(getLogger(), getSession(), diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CompareDatabaseCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CompareDatabaseCallable.java index 3af7aa99a34..25bda088700 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CompareDatabaseCallable.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CompareDatabaseCallable.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.orcs.db.internal.callable; -import static org.eclipse.osee.framework.core.data.RelationalConstants.BRANCH_SENTINEL; import static org.eclipse.osee.framework.core.data.RelationalConstants.TRANSACTION_SENTINEL; import java.util.List; import java.util.concurrent.Callable; @@ -57,7 +56,7 @@ public class CompareDatabaseCallable extends AbstractDatastoreCallable<List<Chan callable = new LoadDeltasBetweenTxsOnTheSameBranch(getLogger(), getSession(), getJdbcClient(), joinFactory, txDelta); } else { - BranchId mergeBranch = getJdbcClient().fetch(BRANCH_SENTINEL, SELECT_MERGE_BRANCH_UUID, sourceTx.getBranch(), + BranchId mergeBranch = getJdbcClient().fetch(BranchId.SENTINEL, SELECT_MERGE_BRANCH_UUID, sourceTx.getBranch(), destinationTx.getBranch()); Integer mergeTxId = null; 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 ecafd997fd8..a716c1f6092 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 @@ -98,8 +98,7 @@ public class PurgeTransactionTxCallable extends AbstractDatastoreTxCallable<Inte List<Object[]> txsToDelete = new ArrayList<>(); - BranchId txBranchId = - getJdbcClient().fetch(RelationalConstants.BRANCH_SENTINEL, SELECT_TRANSACTION_BRANCH_ID, tx); + BranchId txBranchId = getJdbcClient().fetch(BranchId.SENTINEL, SELECT_TRANSACTION_BRANCH_ID, tx); if (txBranchId.isInvalid()) { throw new OseeArgumentException("Cannot find branch for transaction record [%s]", tx); } diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchDataImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchDataImpl.java index b72cf9985b0..f7559f20bae 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchDataImpl.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchDataImpl.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.orcs.db.internal.loader.data; -import org.eclipse.osee.framework.core.data.RelationalConstants; import org.eclipse.osee.framework.core.data.BranchId; +import org.eclipse.osee.framework.core.data.RelationalConstants; import org.eclipse.osee.framework.core.enums.BranchArchivedState; import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.enums.BranchType; @@ -26,7 +26,7 @@ public class BranchDataImpl extends NamedId implements BranchData, BranchReadabl private int associatedArtifactId = RelationalConstants.ART_ID_SENTINEL; private int baseTransaction = RelationalConstants.TRANSACTION_SENTINEL; private int sourceTransaction = RelationalConstants.TRANSACTION_SENTINEL; - private BranchId parentBranch = RelationalConstants.BRANCH_SENTINEL; + private BranchId parentBranch = BranchId.SENTINEL; private BranchArchivedState archiveState = BranchArchivedState.UNARCHIVED; private BranchState branchState = BranchState.CREATED; private BranchType branchType = BranchType.WORKING; @@ -78,7 +78,7 @@ public class BranchDataImpl extends NamedId implements BranchData, BranchReadabl @Override public boolean hasParentBranch() { - return !RelationalConstants.BRANCH_SENTINEL.equals(getParentBranch()); + return getParentBranch().isValid(); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java index e4258f0c73a..490f8219e95 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java @@ -56,7 +56,7 @@ public class OrcsObjectFactoryImpl implements OrcsObjectFactory { public VersionData createDefaultVersionData() { // @formatter:off return createVersion( - RelationalConstants.BRANCH_SENTINEL.getId(), + BranchId.SENTINEL.getId(), RelationalConstants.TRANSACTION_SENTINEL, RelationalConstants.GAMMA_SENTINEL, RelationalConstants.IS_HISTORICAL_DEFAULT, diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/TransactionDataImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/TransactionDataImpl.java index d397d0fbd21..b5bb5882407 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/TransactionDataImpl.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/TransactionDataImpl.java @@ -11,6 +11,7 @@ package org.eclipse.osee.orcs.db.internal.loader.data; import java.util.Date; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.RelationalConstants; import org.eclipse.osee.framework.core.enums.TransactionDetailsType; import org.eclipse.osee.orcs.core.ds.TxOrcsData; @@ -21,7 +22,7 @@ import org.eclipse.osee.orcs.core.ds.TxOrcsData; public class TransactionDataImpl extends OrcsObjectImpl<Integer> implements TxOrcsData { private int authorId = RelationalConstants.ART_ID_SENTINEL; - private Long branchId = RelationalConstants.BRANCH_SENTINEL.getId(); + private Long branchId = BranchId.SENTINEL.getId(); private String comment = RelationalConstants.DEFAULT_COMMENT; private int commitId = RelationalConstants.ART_ID_SENTINEL; private TransactionDetailsType type = TransactionDetailsType.INVALID; diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/VersionDataImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/VersionDataImpl.java index c8757ea2a83..2efe01fb0cc 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/VersionDataImpl.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/VersionDataImpl.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.orcs.db.internal.loader.data; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.RelationalConstants; import org.eclipse.osee.orcs.core.ds.VersionData; @@ -18,7 +19,7 @@ import org.eclipse.osee.orcs.core.ds.VersionData; */ public class VersionDataImpl implements VersionData { - private Long branchId = RelationalConstants.BRANCH_SENTINEL.getId(); + private Long branchId = BranchId.SENTINEL.getId(); private int txId = RelationalConstants.TRANSACTION_SENTINEL; private long gamma = RelationalConstants.GAMMA_SENTINEL; private boolean historical = RelationalConstants.IS_HISTORICAL_DEFAULT; |