Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2014-04-11 19:22:24 -0400
committerdonald.g.dunne2014-04-22 15:20:23 -0400
commit040fea496b7a84d65e610934f642790f22420077 (patch)
treec71a0ef84e0ed4450e11565ae26f4b08beed814d
parent51a5d09a64684b410a82624dce3645c05a229415 (diff)
downloadorg.eclipse.osee-040fea496b7a84d65e610934f642790f22420077.tar.gz
org.eclipse.osee-040fea496b7a84d65e610934f642790f22420077.tar.xz
org.eclipse.osee-040fea496b7a84d65e610934f642790f22420077.zip
feature[ats_ATS19845]: Rename branchId to branchUuid
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterTest.java4
-rw-r--r--plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterImpl.java6
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java16
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/RelationIntegrityCheckTest.java6
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/vcast/model/VCastBranchData.java8
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/vcast/model/VCastBranchDataTable.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitPage.java6
-rw-r--r--plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/SearchPresenterImpl.java8
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java34
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/ArtifactAccessObject.java32
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/BranchAccessObject.java16
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/PurgeBranchRequestTest.java10
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java36
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationResponse.java14
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchRow.java17
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchArchiveStateRequest.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchStateRequest.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchTypeRequest.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/PurgeBranchRequest.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeArchivedStateRequestTranslator.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeStateRequestTranslator.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeTypeRequestTranslator.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationResponseTranslator.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/PurgeBranchRequestTranslator.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/TransactionCacheUpdateResponseTranslator.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/TransactionRecordTranslator.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockOseeTransactionDataAccessor.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/TransactionRecordTest.java16
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/TransactionRecord.java10
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/ITransactionDataAccessor.java2
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/ArtifactJoinQuery.java22
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/Address.java12
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/PurgeTransactionOperation.java10
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchExchangeServlet.java8
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpBranchExchangeInfo.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkParserTest.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCache.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java44
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/AttributeLoader.java14
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeArtifactType.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UpdateMergeBranch.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/AbstractArtifactCache.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/ActiveArtifactCache.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/HttpBranchExchange.java20
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/BaseArtifactLoopbackCmd.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientTransactionAccessor.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkBuilder.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkParser.java10
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationCache.java16
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManager.java10
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactTransfer.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java10
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeCompoundContributionItem.java10
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/BranchStateHealthCheck.java18
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ItemsDeletedWithNoOtherModification.java8
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/LocalRelationLink.java8
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/LocalTxData.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationIntegrityCheck.java12
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java10
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java16
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataUI.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java8
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchOptionsEnum.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewerFactory.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java10
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java14
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/TxOrcsData.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/VersionData.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaTxGetHead.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchExportCommand.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchImportCommand.java16
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionCriteriaFactory.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionQueryImpl.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/TxQuerySqlContextFactoryImplTest.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseTransactionRecordAccessor.java12
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/UpdatePreviousTxCurrent.java14
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ConsolidateArtifactVersionDatabaseTxCallable.java18
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CreateBranchDatabaseTxCallable.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ExportBranchDatabaseCallable.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeBranchDatabaseCallable.java20
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeTransactionTxCallable.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/ExchangeDb.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/handler/BranchDataSaxHandler.java18
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/handler/DbTableSaxHandler.java14
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/transform/V0_9_2BranchTransformer.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/transform/V0_9_2Transformer.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/transform/V0_9_2TxDetailsHandler.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java12
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/TransactionDataImpl.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/TransactionObjectFactory.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/VersionDataImpl.java14
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/VersionObjectFactory.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/executors/ArtifactQueryContextLoadExecutor.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/ArtifactLoadProcessor.java16
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/AttributeLoadProcessor.java18
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/BranchLoadProcessor.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/RelationLoadProcessor.java18
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/TransactionLoadProcessor.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ArtifactQuerySqlWriter.java18
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/producer/IndexBranchesDatabaseCallable.java14
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TransactionWriter.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/UnsubscribeTransaction.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/branch/BranchQueryOptions.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/branch/BranchQueryResource.java20
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTxQueryTest.java4
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/TransactionQuery.java2
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java18
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java10
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/panels/GrayableBranchSelectionComposite.java4
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/views/TestRunArtifactOptions.java10
118 files changed, 562 insertions, 563 deletions
diff --git a/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterTest.java b/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterTest.java
index 2f58a30756..3e47eb2608 100644
--- a/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterTest.java
+++ b/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterTest.java
@@ -87,9 +87,9 @@ public class AtsSearchPresenterTest {
Assert.assertEquals(3, headerComp.getPrograms().size());
String programGuid = GUID.create();
- String buildGuid = "70559324";
+ long buildUuid = 70559324;
String url =
- "/" + new UrlQuery().put("program", programGuid).put("build", buildGuid).put("nameOnly", "true").put("search",
+ "/" + new UrlQuery().put("program", programGuid).put("build", buildUuid).put("nameOnly", "true").put("search",
"phrase").put("verbose", "false").toString();
presenter.initSearchResults(url, headerComp, resultsComponent, optionsComp);
Assert.assertEquals(1, resultsComponent.getSearchResults().size());
diff --git a/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterImpl.java b/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterImpl.java
index 3eaec3f466..e40b48e47d 100644
--- a/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterImpl.java
+++ b/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterImpl.java
@@ -135,13 +135,13 @@ public class AtsSearchPresenterImpl<T extends AtsSearchHeaderComponent, K extend
return builds;
}
- protected String encode(String url, AtsSearchParameters searchParams, String branchId) {
+ protected String encode(String url, AtsSearchParameters searchParams, String branchUuid) {
UrlQuery query = new UrlQuery();
try {
query.parse(url);
- if (Strings.isValid(branchId)) {
- query.putInPlace("branch", branchId);
+ if (Strings.isValid(branchUuid)) {
+ query.putInPlace("branch", branchUuid);
}
query.putInPlace("program", searchParams.getProgram().getGuid());
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java
index 8b0a69e0ea..7cc1c0ce4b 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java
@@ -161,9 +161,9 @@ public final class AtsUtil {
new ModifyActionableItemAction(teamArt).run();
}
- public static void openArtifact(String guid, Long branchId, OseeCmEditor view) {
+ public static void openArtifact(String guid, Long branchUuid, OseeCmEditor view) {
try {
- Branch branch = BranchManager.getBranch(branchId);
+ Branch branch = BranchManager.getBranch(branchUuid);
Artifact artifact = ArtifactQuery.getArtifactFromId(guid, branch);
openATSAction(artifact, AtsOpenOption.OpenOneOrPopupSelect);
} catch (Exception ex) {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java
index 5b100caa8b..ae07fbecd9 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java
@@ -157,18 +157,18 @@ public class XCommitManager extends GenericXWidget implements IArtifactWidget, I
}
try {
// commit all branches in order
- Map<Long, Branch> branchIdToBranchMap = new HashMap<Long, Branch>();
+ Map<Long, Branch> branchUuidToBranchMap = new HashMap<Long, Branch>();
for (IOseeBranch destinationBranch : AtsBranchManagerCore.getBranchesLeftToCommit(teamArt)) {
- branchIdToBranchMap.put(destinationBranch.getUuid(), (Branch) destinationBranch);
+ branchUuidToBranchMap.put(destinationBranch.getUuid(), (Branch) destinationBranch);
}
- List<Long> branchIds = new ArrayList<Long>();
- branchIds.addAll(branchIdToBranchMap.keySet());
- Arrays.sort(branchIds.toArray(new Integer[branchIds.size()]));
- for (Long branchId : branchIds) {
- Branch destinationBranch = branchIdToBranchMap.get(branchId);
+ List<Long> branchUuids = new ArrayList<Long>();
+ branchUuids.addAll(branchUuidToBranchMap.keySet());
+ Arrays.sort(branchUuids.toArray(new Integer[branchUuids.size()]));
+ for (Long branchUuid : branchUuids) {
+ Branch destinationBranch = branchUuidToBranchMap.get(branchUuid);
IOperation operation =
AtsBranchManager.commitWorkingBranch(teamArt, false, true, destinationBranch,
- branchId == branchIds.get(branchIds.size() - 1));
+ branchUuid == branchUuids.get(branchUuids.size() - 1));
Operations.executeWorkAndCheckStatus(operation);
}
} catch (Exception ex) {
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/RelationIntegrityCheckTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/RelationIntegrityCheckTest.java
index 65f8e7ad88..f48d5fe9d4 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/RelationIntegrityCheckTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/RelationIntegrityCheckTest.java
@@ -114,7 +114,7 @@ public class RelationIntegrityCheckTest {
private void applyFix() throws OseeCoreException {
List<Object[]> rowsToDelete = new LinkedList<Object[]>();
for (LocalRelationLink relLink : map.allValues()) {
- rowsToDelete.add(new Object[] {relLink.gammaId, relLink.relTransId, relLink.branchId});
+ rowsToDelete.add(new Object[] {relLink.gammaId, relLink.relTransId, relLink.branchUuid});
}
if (!rowsToDelete.isEmpty()) {
@@ -131,7 +131,7 @@ public class RelationIntegrityCheckTest {
int gammaId = chStmt.getInt("gamma_id");
int transactionId = chStmt.getInt("transaction_id");
int relationId = chStmt.getInt("rel_link_id");
- long branchId = chStmt.getLong("branch_id");
+ long branchUuid = chStmt.getLong("branch_id");
int a_sideArtifactId = chStmt.getInt("a_art_id");
int b_sideArtifactId = chStmt.getInt("b_art_id");
int deletedTransaction = chStmt.getInt("deleted_tran");
@@ -143,7 +143,7 @@ public class RelationIntegrityCheckTest {
if (!map.containsKey(gammaId, transactionId)) {
if (commitTransId > 0 && modType == 1) {
- map.put(gammaId, transactionId, new LocalRelationLink(relationId, gammaId, transactionId, branchId,
+ map.put(gammaId, transactionId, new LocalRelationLink(relationId, gammaId, transactionId, branchUuid,
a_sideArtifactId, b_sideArtifactId, deletedTransaction, commitTransId, modType));
}
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/vcast/model/VCastBranchData.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/vcast/model/VCastBranchData.java
index f31c3d1b56..3663fa83ae 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/vcast/model/VCastBranchData.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/vcast/model/VCastBranchData.java
@@ -16,15 +16,15 @@ package org.eclipse.osee.coverage.internal.vcast.model;
public class VCastBranchData {
private final int id;
- private final long branchId;
+ private final long branchUuid;
private final int resultId;
private final int resultLine;
private final Boolean taken;
- public VCastBranchData(int id, long branchId, int resultId, int resultLine, Boolean taken) {
+ public VCastBranchData(int id, long branchUuid, int resultId, int resultLine, Boolean taken) {
super();
this.id = id;
- this.branchId = branchId;
+ this.branchUuid = branchUuid;
this.resultId = resultId;
this.resultLine = resultLine;
this.taken = taken;
@@ -35,7 +35,7 @@ public class VCastBranchData {
}
public long getBranchId() {
- return branchId;
+ return branchUuid;
}
public int getResultId() {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/vcast/model/VCastBranchDataTable.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/vcast/model/VCastBranchDataTable.java
index 6840a299fd..2c1531660b 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/vcast/model/VCastBranchDataTable.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/vcast/model/VCastBranchDataTable.java
@@ -34,10 +34,10 @@ public class VCastBranchDataTable implements VCastTableData<VCastBranchData> {
@Override
public Object[] toRow(VCastBranchData data) {
int id = data.getId();
- Long branchId = data.getBranchId();
+ Long branchUuid = data.getBranchId();
Integer resultId = data.getResultId();
Integer resultLine = data.getResultLine();
Boolean taken = data.getTaken();
- return new Object[] {id, branchId, resultId, resultLine, taken};
+ return new Object[] {id, branchUuid, resultId, resultLine, taken};
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitPage.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitPage.java
index e7592cd5c0..6f3819f5c6 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitPage.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitPage.java
@@ -392,9 +392,9 @@ public class ImportTraceUnitPage extends WizardDataTransferPage {
}
try {
- Long branchId = settings.getLong(BRANCH_KEY);
- if (branchId > 0) {
- Branch branch = BranchManager.getBranch(branchId);
+ Long branchUuid = settings.getLong(BRANCH_KEY);
+ if (branchUuid > 0) {
+ Branch branch = BranchManager.getBranch(branchUuid);
if (branch != null) {
branchSelectComposite.setSelected(branch);
}
diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/SearchPresenterImpl.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/SearchPresenterImpl.java
index 6fe26509d4..707432a8b5 100644
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/SearchPresenterImpl.java
+++ b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/SearchPresenterImpl.java
@@ -438,12 +438,12 @@ public class SearchPresenterImpl<T extends SearchHeaderComponent, K extends View
private class SearchParameters {
- private final long branchId;
+ private final long branchUuid;
private final boolean nameOnly, verbose;
private final String searchPhrase;
public SearchParameters(long branchUuid, boolean nameOnly, String searchPhrase, boolean verbose) {
- this.branchId = branchUuid;
+ this.branchUuid = branchUuid;
this.nameOnly = nameOnly;
this.searchPhrase = searchPhrase;
this.verbose = verbose;
@@ -454,7 +454,7 @@ public class SearchPresenterImpl<T extends SearchHeaderComponent, K extends View
}
public long getBranchUuid() {
- return branchId;
+ return branchUuid;
}
public boolean isNameOnly() {
@@ -466,7 +466,7 @@ public class SearchPresenterImpl<T extends SearchHeaderComponent, K extends View
}
public boolean isValid() {
- return branchId > 0;
+ return branchUuid > 0;
}
}
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java
index c6b5438f62..cec3c18af1 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java
@@ -116,7 +116,7 @@ public class AccessControlService implements IAccessControlService {
private final HashCollection<AccessObject, Integer> objectToSubjectCache =
new HashCollection<AccessObject, Integer>(true); // <subjectId, groupId>
private final HashCollection<Integer, Integer> subjectToGroupCache = new HashCollection<Integer, Integer>(true); // <groupId, subjectId>
- private final HashCollection<Integer, Integer> groupToSubjectsCache = new HashCollection<Integer, Integer>(true); // <artId, branchId>
+ private final HashCollection<Integer, Integer> groupToSubjectsCache = new HashCollection<Integer, Integer>(true); // <artId, branchUuid>
// branch_id, art_id, subject_id
private final CompositeKeyHashMap<Long, Integer, Integer> artifactLockCache =
@@ -216,10 +216,10 @@ public class AccessControlService implements IAccessControlService {
chStmt.runPreparedQuery(GET_ALL_BRANCH_ACCESS_CONTROL_LIST);
while (chStmt.next()) {
Integer subjectId = chStmt.getInt("privilege_entity_id");
- Long branchId = chStmt.getLong("branch_id");
+ Long branchUuid = chStmt.getLong("branch_id");
Long subjectArtifactTypeId = chStmt.getLong("art_type_id");
PermissionEnum permission = PermissionEnum.getPermission(chStmt.getInt("permission_id"));
- BranchAccessObject branchAccessObject = BranchAccessObject.getBranchAccessObject(branchId);
+ BranchAccessObject branchAccessObject = BranchAccessObject.getBranchAccessObject(branchUuid);
accessControlListCache.put(subjectId, branchAccessObject, permission);
objectToSubjectCache.put(branchAccessObject, subjectId);
@@ -243,15 +243,15 @@ public class AccessControlService implements IAccessControlService {
while (chStmt.next()) {
Integer subjectId = chStmt.getInt("privilege_entity_id");
Integer objectId = chStmt.getInt("art_id");
- Long branchId = chStmt.getLong("branch_id");
+ Long branchUuid = chStmt.getLong("branch_id");
long subjectArtifactTypeId = chStmt.getLong("art_type_id");
PermissionEnum permission = PermissionEnum.getPermission(chStmt.getInt("permission_id"));
if (permission.equals(PermissionEnum.LOCK)) {
- artifactLockCache.put(branchId, objectId, subjectId);
+ artifactLockCache.put(branchUuid, objectId, subjectId);
} else {
AccessObject accessObject =
- ArtifactAccessObject.getArtifactAccessObject(objectId, BranchManager.getBranch(branchId));
+ ArtifactAccessObject.getArtifactAccessObject(objectId, BranchManager.getBranch(branchUuid));
cacheAccessObject(objectId, subjectId, permission, accessObject);
ArtifactType subjectArtifactType = getArtifactTypeCache().getById(subjectArtifactTypeId);
@@ -421,14 +421,14 @@ public class AccessControlService implements IAccessControlService {
Integer artId = artifact.getArtId();
Branch branch = artifact.getFullBranch();
- Long branchId = branch.getUuid();
+ Long branchUuid = branch.getUuid();
- // accessObject = accessObjectCache.get(artId, branchId);
+ // accessObject = accessObjectCache.get(artId, branchUuid);
accessObject = ArtifactAccessObject.getArtifactAccessObjectFromCache(artId, branch);
- if (artifactLockCache.containsKey(branchId, artId)) {
+ if (artifactLockCache.containsKey(branchUuid, artId)) {
- int lockOwnerId = artifactLockCache.get(branchId, artId);
+ int lockOwnerId = artifactLockCache.get(branchUuid, artId);
// this object is locked under a different branch
if (lockOwnerId != subject.getArtId()) {
userPermission = PermissionEnum.LOCK;
@@ -613,8 +613,8 @@ public class AccessControlService implements IAccessControlService {
}
private PermissionEnum getBranchPermission(IBasicArtifact<?> subject, Object object) throws OseeCoreException {
- long branchId = ((AccessObject) object).getId();
- Branch branch = BranchManager.getBranch(branchId);
+ long branchUuid = ((AccessObject) object).getId();
+ Branch branch = BranchManager.getBranch(branchUuid);
return getBranchPermission(subject, branch);
}
@@ -699,12 +699,12 @@ public class AccessControlService implements IAccessControlService {
Set<Artifact> lockedArts = new HashSet<Artifact>();
for (Artifact object : objects) {
Integer objectArtId = object.getArtId();
- Long branchId = object.getFullBranch().getUuid();
+ Long branchUuid = object.getFullBranch().getUuid();
- if (artifactLockCache.containsKey(branchId, objectArtId) && canUnlockObject(object, subject)) {
+ if (artifactLockCache.containsKey(branchUuid, objectArtId) && canUnlockObject(object, subject)) {
AccessObject accessObject = getAccessObject(object);
removeAccessControlDataIf(true, new AccessControlData(subject, accessObject, PermissionEnum.LOCK, false));
- artifactLockCache.remove(branchId, objectArtId);
+ artifactLockCache.remove(branchUuid, objectArtId);
event.getArtifacts().add(object.getBasicGuidArtifact());
lockedArts.add(object);
}
@@ -764,8 +764,8 @@ public class AccessControlService implements IAccessControlService {
}
if (hasLock(object)) {
- long branchId = object.getFullBranch().getUuid();
- hasAccess = artifactLockCache.get(branchId, object.getArtId()) == UserManager.getUser().getArtId();
+ long branchUuid = object.getFullBranch().getUuid();
+ hasAccess = artifactLockCache.get(branchUuid, object.getArtId()) == UserManager.getUser().getArtId();
}
return hasAccess;
}
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/ArtifactAccessObject.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/ArtifactAccessObject.java
index 01c63ecdeb..dec6a1a9f9 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/ArtifactAccessObject.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/ArtifactAccessObject.java
@@ -23,21 +23,21 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
public class ArtifactAccessObject extends AccessObject {
private final Integer artId;
- private final Long branchId;
+ private final Long branchUuid;
private static final DoubleKeyHashMap<Integer, Long, ArtifactAccessObject> cache =
new DoubleKeyHashMap<Integer, Long, ArtifactAccessObject>();
- public ArtifactAccessObject(Integer artId, Long branchId) {
+ public ArtifactAccessObject(Integer artId, Long branchUuid) {
super();
this.artId = artId;
- this.branchId = branchId;
+ this.branchUuid = branchUuid;
}
@Override
public int hashCode() {
int result = 17;
result = 31 * result + artId;
- result = 31 * result + branchId.hashCode();
+ result = 31 * result + branchUuid.hashCode();
return result;
}
@@ -47,34 +47,34 @@ public class ArtifactAccessObject extends AccessObject {
@Override
public long getId() {
- return branchId;
+ return branchUuid;
}
@Override
public void removeFromCache() {
- cache.remove(artId, branchId);
+ cache.remove(artId, branchUuid);
}
@Override
public void removeFromDatabase(int subjectId) throws OseeCoreException {
final String DELETE_ARTIFACT_ACL =
"DELETE FROM OSEE_ARTIFACT_ACL WHERE privilege_entity_id = ? AND art_id =? AND branch_id =?";
- ConnectionHandler.runPreparedUpdate(DELETE_ARTIFACT_ACL, subjectId, artId, branchId);
+ ConnectionHandler.runPreparedUpdate(DELETE_ARTIFACT_ACL, subjectId, artId, branchUuid);
}
public static ArtifactAccessObject getArtifactAccessObject(Artifact artifact) throws OseeCoreException {
Integer artId = artifact.getArtId();
- IOseeBranch branchId = artifact.getBranch();
- return getArtifactAccessObject(artId, branchId);
+ IOseeBranch branchUuid = artifact.getBranch();
+ return getArtifactAccessObject(artId, branchUuid);
}
public static ArtifactAccessObject getArtifactAccessObject(Integer artId, IOseeBranch branch) throws OseeCoreException {
- long branchId = branch.getUuid();
- ArtifactAccessObject accessObject = cache.get(artId, branchId);
+ long branchUuid = branch.getUuid();
+ ArtifactAccessObject accessObject = cache.get(artId, branchUuid);
if (accessObject == null) {
- accessObject = new ArtifactAccessObject(artId, branchId);
- cache.put(artId, branchId, accessObject);
+ accessObject = new ArtifactAccessObject(artId, branchUuid);
+ cache.put(artId, branchUuid, accessObject);
}
return accessObject;
}
@@ -84,8 +84,8 @@ public class ArtifactAccessObject extends AccessObject {
}
public static AccessObject getArtifactAccessObjectFromCache(Integer artId2, IOseeBranch branch) throws OseeCoreException {
- long branchId2 = branch.getUuid();
- return cache.get(artId2, branchId2);
+ long branchUuid2 = branch.getUuid();
+ return cache.get(artId2, branchUuid2);
}
@Override
@@ -94,6 +94,6 @@ public class ArtifactAccessObject extends AccessObject {
return false;
}
ArtifactAccessObject ao = (ArtifactAccessObject) obj;
- return ao.artId.equals(this.artId) && ao.branchId.equals(this.branchId);
+ return ao.artId.equals(this.artId) && ao.branchUuid.equals(this.branchUuid);
}
}
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/BranchAccessObject.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/BranchAccessObject.java
index 305500ecce..ca170f74e5 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/BranchAccessObject.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/BranchAccessObject.java
@@ -21,34 +21,34 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
* @author Jeff C. Phillips
*/
public class BranchAccessObject extends AccessObject {
- private final Long branchId;
+ private final Long branchUuid;
private static final Map<Long, BranchAccessObject> cache = new HashMap<Long, BranchAccessObject>();
@Override
public int hashCode() {
int result = 17;
- result = 31 * result + branchId.hashCode();
+ result = 31 * result + branchUuid.hashCode();
return result;
}
- public BranchAccessObject(long branchId) {
- this.branchId = branchId;
+ public BranchAccessObject(long branchUuid) {
+ this.branchUuid = branchUuid;
}
@Override
public long getId() {
- return branchId;
+ return branchUuid;
}
@Override
public void removeFromCache() {
- cache.remove(branchId);
+ cache.remove(branchUuid);
}
@Override
public void removeFromDatabase(int subjectId) throws OseeCoreException {
final String DELETE_BRANCH_ACL = "DELETE FROM OSEE_BRANCH_ACL WHERE privilege_entity_id = ? AND branch_id =?";
- ConnectionHandler.runPreparedUpdate(DELETE_BRANCH_ACL, subjectId, branchId);
+ ConnectionHandler.runPreparedUpdate(DELETE_BRANCH_ACL, subjectId, branchUuid);
}
public static BranchAccessObject getBranchAccessObject(IOseeBranch branch) throws OseeCoreException {
@@ -75,6 +75,6 @@ public class BranchAccessObject extends AccessObject {
if (!(obj instanceof BranchAccessObject)) {
return false;
}
- return branchId == ((BranchAccessObject) obj).branchId;
+ return branchUuid == ((BranchAccessObject) obj).branchUuid;
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/PurgeBranchRequestTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/PurgeBranchRequestTest.java
index f2dc99116c..32b5b23532 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/PurgeBranchRequestTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/PurgeBranchRequestTest.java
@@ -29,24 +29,24 @@ import org.junit.runners.Parameterized.Parameters;
public class PurgeBranchRequestTest {
private final PurgeBranchRequest request;
- private final int branchId;
+ private final int branchUuid;
public PurgeBranchRequestTest(int expectedBranchId) {
this.request = new PurgeBranchRequest(expectedBranchId, false);
- this.branchId = expectedBranchId;
+ this.branchUuid = expectedBranchId;
}
@Test
public void testGetBranchId() {
- Assert.assertEquals(branchId, request.getBranchId());
+ Assert.assertEquals(branchUuid, request.getBranchId());
}
@Parameters
public static Collection<Object[]> getData() {
Collection<Object[]> data = new ArrayList<Object[]>();
for (int index = 1; index <= 2; index++) {
- int branchId = index * 7;
- data.add(new Object[] {branchId});
+ int branchUuid = index * 7;
+ data.add(new Object[] {branchUuid});
}
return data;
}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java
index 5bdcb86ad2..4bf99190f2 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java
@@ -61,20 +61,20 @@ public final class BranchCacheUpdateUtil {
preLoadTransactions(cacheMessage);
for (BranchRow srcItem : cacheMessage.getBranchRows()) {
- long branchId = srcItem.getBranchId();
+ long branchUuid = srcItem.getBranchId();
Branch updated =
- factory.createOrUpdate(cache, branchId, srcItem.getBranchName(), srcItem.getBranchType(),
+ factory.createOrUpdate(cache, branchUuid, srcItem.getBranchName(), srcItem.getBranchType(),
srcItem.getBranchState(), srcItem.getBranchArchived().isArchived(), srcItem.getStorageState(),
srcItem.isInheritAccessControl());
updatedItems.add(updated);
- Integer artifactId = branchToAssocArt.get(branchId);
+ Integer artifactId = branchToAssocArt.get(branchUuid);
if (artifactId != null) {
updated.setAssociatedArtifactId(artifactId);
}
- updated.setBaseTransaction(getTx(cacheMessage.getBranchToBaseTx(), branchId));
- updated.setSourceTransaction(getTx(cacheMessage.getBranchToSourceTx(), branchId));
+ updated.setBaseTransaction(getTx(cacheMessage.getBranchToBaseTx(), branchUuid));
+ updated.setSourceTransaction(getTx(cacheMessage.getBranchToSourceTx(), branchUuid));
}
for (Entry<Long, Long> entry : cacheMessage.getChildToParent().entrySet()) {
@@ -119,9 +119,9 @@ public final class BranchCacheUpdateUtil {
}
}
- private TransactionRecord getTx(Map<Long, Integer> branchToTx, Long branchId) throws OseeCoreException {
+ private TransactionRecord getTx(Map<Long, Integer> branchToTx, Long branchUuid) throws OseeCoreException {
TransactionRecord tx = null;
- Integer txId = branchToTx.get(branchId);
+ Integer txId = branchToTx.get(branchUuid);
if (txId != null && txId > 0) {
tx = txCache.getOrLoad(txId);
}
@@ -130,27 +130,27 @@ public final class BranchCacheUpdateUtil {
public static void loadFromCache(AbstractBranchCacheMessage message, Collection<Branch> types) throws OseeCoreException {
for (Branch br : types) {
- Long branchId = br.getUuid();
+ Long branchUuid = br.getUuid();
message.getBranchRows().add(
new BranchRow(br.getUuid(), br.getName(), br.getBranchType(), br.getBranchState(), br.getArchiveState(),
br.getStorageState(), br.isInheritAccessControl()));
if (br.hasParentBranch()) {
- message.getChildToParent().put(branchId, br.getParentBranch().getUuid());
+ message.getChildToParent().put(branchUuid, br.getParentBranch().getUuid());
}
- addTxRecord(message.getBranchToBaseTx(), branchId, br.getBaseTransaction());
- addTxRecord(message.getBranchToSourceTx(), branchId, br.getSourceTransaction());
- addAssocArtifact(message.getBranchToAssocArt(), branchId, br.getAssociatedArtifactId());
+ addTxRecord(message.getBranchToBaseTx(), branchUuid, br.getBaseTransaction());
+ addTxRecord(message.getBranchToSourceTx(), branchUuid, br.getSourceTransaction());
+ addAssocArtifact(message.getBranchToAssocArt(), branchUuid, br.getAssociatedArtifactId());
if (br.getBranchType().isMergeBranch()) {
addMergeBranches(message.getMergeBranches(), (MergeBranch) br);
}
}
}
- private static void addAssocArtifact(Map<Long, Integer> map, Long branchId, Integer artId) {
+ private static void addAssocArtifact(Map<Long, Integer> map, Long branchUuid, Integer artId) {
if (artId != null) {
- map.put(branchId, artId);
+ map.put(branchUuid, artId);
} else {
- map.put(branchId, -1);
+ map.put(branchUuid, -1);
}
}
@@ -162,11 +162,11 @@ public final class BranchCacheUpdateUtil {
srcDestMerge.add(new Triplet<Long, Long, Long>(src, dest, merge));
}
- private static void addTxRecord(Map<Long, Integer> map, Long branchId, TransactionRecord toAdd) {
+ private static void addTxRecord(Map<Long, Integer> map, Long branchUuid, TransactionRecord toAdd) {
if (toAdd != null) {
- map.put(branchId, toAdd.getId());
+ map.put(branchUuid, toAdd.getId());
} else {
- map.put(branchId, -1);
+ map.put(branchUuid, -1);
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationResponse.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationResponse.java
index a2fb296895..5c54306c69 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationResponse.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationResponse.java
@@ -15,22 +15,22 @@ package org.eclipse.osee.framework.core.message;
*/
public class BranchCreationResponse {
- private long branchId;
+ private long branchUuid;
- public BranchCreationResponse(long branchId) {
- this.branchId = branchId;
+ public BranchCreationResponse(long branchUuid) {
+ this.branchUuid = branchUuid;
}
public long getBranchId() {
- return branchId;
+ return branchUuid;
}
- public void setBranchId(long branchId) {
- this.branchId = branchId;
+ public void setBranchId(long branchUuid) {
+ this.branchUuid = branchUuid;
}
@Override
public String toString() {
- return "BranchCreationResponse [branchId=" + branchId + "]";
+ return "BranchCreationResponse [branchUuid=" + branchUuid + "]";
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchRow.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchRow.java
index fc3bbe78fe..278a06cfd8 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchRow.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchRow.java
@@ -21,7 +21,7 @@ import org.eclipse.osee.framework.jdk.core.util.Conditions;
import org.eclipse.osee.framework.jdk.core.util.GUID;
public final class BranchRow {
- private final long branchId;
+ private final long branchUuid;
private final String branchName;
private final BranchType branchType;
@@ -35,8 +35,8 @@ public final class BranchRow {
this.storageState = storageState;
}
- public BranchRow(long branchId, String branchName, BranchType branchType, BranchState branchState, BranchArchivedState branchArchived, StorageState storageState, boolean inheritAccessControl) {
- this.branchId = branchId;
+ public BranchRow(long branchUuid, String branchName, BranchType branchType, BranchState branchState, BranchArchivedState branchArchived, StorageState storageState, boolean inheritAccessControl) {
+ this.branchUuid = branchUuid;
this.branchName = branchName;
this.branchType = branchType;
this.branchState = branchState;
@@ -46,7 +46,7 @@ public final class BranchRow {
}
public long getBranchId() {
- return branchId;
+ return branchUuid;
}
public String getBranchName() {
@@ -86,18 +86,19 @@ public final class BranchRow {
public static BranchRow fromArray(String[] data) {
BranchArchivedState archived = BranchArchivedState.valueOf(data[0]);
- long branchId = 0;
+ long branchUuid = 0;
if (GUID.isValid(data[1])) {
- branchId = getBranchIdLegacy(data[1]);
+ branchUuid = getBranchIdLegacy(data[1]);
} else {
- branchId = Long.valueOf(data[1]);
+ branchUuid = Long.valueOf(data[1]);
}
String branchName = data[2];
BranchState branchState = BranchState.valueOf(data[3]);
BranchType branchType = BranchType.valueOf(data[4]);
StorageState storageState = StorageState.valueOf(data[5]);
boolean inheritAccessControl = Boolean.parseBoolean(data[6]);
- return new BranchRow(branchId, branchName, branchType, branchState, archived, storageState, inheritAccessControl);
+ return new BranchRow(branchUuid, branchName, branchType, branchState, archived, storageState,
+ inheritAccessControl);
}
// Temporary cache till all code uses branch uuid. Remove after 0.17.0
private static final String SELECT_BRANCH_ID_BY_GUID = "select branch_id from osee_branch where branch_guid = ?";
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchArchiveStateRequest.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchArchiveStateRequest.java
index 87b707c169..e6e98eba1e 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchArchiveStateRequest.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchArchiveStateRequest.java
@@ -16,17 +16,17 @@ import org.eclipse.osee.framework.core.enums.BranchArchivedState;
* @author Megumi Telles
*/
public class ChangeBranchArchiveStateRequest {
- private final long branchId;
+ private final long branchUuid;
private final BranchArchivedState state;
- public ChangeBranchArchiveStateRequest(long branchId, BranchArchivedState state) {
+ public ChangeBranchArchiveStateRequest(long branchUuid, BranchArchivedState state) {
super();
- this.branchId = branchId;
+ this.branchUuid = branchUuid;
this.state = state;
}
public long getBranchId() {
- return branchId;
+ return branchUuid;
}
public BranchArchivedState getState() {
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchStateRequest.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchStateRequest.java
index aac473a230..0302c1ab93 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchStateRequest.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchStateRequest.java
@@ -16,17 +16,17 @@ import org.eclipse.osee.framework.core.enums.BranchState;
* @author Megumi Telles
*/
public class ChangeBranchStateRequest {
- private final long branchId;
+ private final long branchUuid;
private final BranchState state;
- public ChangeBranchStateRequest(long branchId, BranchState state) {
+ public ChangeBranchStateRequest(long branchUuid, BranchState state) {
super();
- this.branchId = branchId;
+ this.branchUuid = branchUuid;
this.state = state;
}
public long getBranchId() {
- return branchId;
+ return branchUuid;
}
public BranchState getState() {
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchTypeRequest.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchTypeRequest.java
index 477e4582e2..caf9536f80 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchTypeRequest.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchTypeRequest.java
@@ -16,17 +16,17 @@ import org.eclipse.osee.framework.core.enums.BranchType;
* @author Megumi Telles
*/
public class ChangeBranchTypeRequest {
- private final long branchId;
+ private final long branchUuid;
private final BranchType type;
- public ChangeBranchTypeRequest(long branchId, BranchType type) {
+ public ChangeBranchTypeRequest(long branchUuid, BranchType type) {
super();
- this.branchId = branchId;
+ this.branchUuid = branchUuid;
this.type = type;
}
public long getBranchId() {
- return branchId;
+ return branchUuid;
}
public BranchType getType() {
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/PurgeBranchRequest.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/PurgeBranchRequest.java
index 7b6236bc36..977fef72fc 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/PurgeBranchRequest.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/PurgeBranchRequest.java
@@ -15,16 +15,16 @@ package org.eclipse.osee.framework.core.message;
* @author Megumi Telles
*/
public class PurgeBranchRequest {
- private final long branchId;
+ private final long branchUuid;
private final boolean recursive;
- public PurgeBranchRequest(long branchId, boolean recursive) {
- this.branchId = branchId;
+ public PurgeBranchRequest(long branchUuid, boolean recursive) {
+ this.branchUuid = branchUuid;
this.recursive = recursive;
}
public long getBranchId() {
- return branchId;
+ return branchUuid;
}
public boolean isRecursive() {
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeArchivedStateRequestTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeArchivedStateRequestTranslator.java
index 8161280484..1a535d2f84 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeArchivedStateRequestTranslator.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeArchivedStateRequestTranslator.java
@@ -27,9 +27,9 @@ public final class BranchChangeArchivedStateRequestTranslator implements ITransl
@Override
public ChangeBranchArchiveStateRequest convert(PropertyStore propertyStore) {
- long branchId = propertyStore.getLong(Entry.BRANCH_ID.name());
+ long branchUuid = propertyStore.getLong(Entry.BRANCH_ID.name());
BranchArchivedState state = BranchArchivedState.valueOf(propertyStore.get(Entry.BRANCH_ARCHIVED_STATE.name()));
- ChangeBranchArchiveStateRequest data = new ChangeBranchArchiveStateRequest(branchId, state);
+ ChangeBranchArchiveStateRequest data = new ChangeBranchArchiveStateRequest(branchUuid, state);
return data;
}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeStateRequestTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeStateRequestTranslator.java
index 40f5e28e44..51ea0c219f 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeStateRequestTranslator.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeStateRequestTranslator.java
@@ -27,9 +27,9 @@ public final class BranchChangeStateRequestTranslator implements ITranslator<Cha
@Override
public ChangeBranchStateRequest convert(PropertyStore propertyStore) {
- long branchId = propertyStore.getLong(Entry.BRANCH_ID.name());
+ long branchUuid = propertyStore.getLong(Entry.BRANCH_ID.name());
BranchState state = BranchState.valueOf(propertyStore.get(Entry.BRANCH_STATE.name()));
- ChangeBranchStateRequest data = new ChangeBranchStateRequest(branchId, state);
+ ChangeBranchStateRequest data = new ChangeBranchStateRequest(branchUuid, state);
return data;
}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeTypeRequestTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeTypeRequestTranslator.java
index 3ffeb7f24c..3f4244763e 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeTypeRequestTranslator.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeTypeRequestTranslator.java
@@ -27,9 +27,9 @@ public final class BranchChangeTypeRequestTranslator implements ITranslator<Chan
@Override
public ChangeBranchTypeRequest convert(PropertyStore propertyStore) {
- long branchId = propertyStore.getLong(Entry.BRANCH_ID.name());
+ long branchUuid = propertyStore.getLong(Entry.BRANCH_ID.name());
BranchType type = BranchType.valueOf(propertyStore.get(Entry.BRANCH_TYPE.name()));
- ChangeBranchTypeRequest data = new ChangeBranchTypeRequest(branchId, type);
+ ChangeBranchTypeRequest data = new ChangeBranchTypeRequest(branchUuid, type);
return data;
}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationResponseTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationResponseTranslator.java
index bab7f29c4d..f6e5e61f8b 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationResponseTranslator.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationResponseTranslator.java
@@ -25,8 +25,8 @@ public class BranchCreationResponseTranslator implements ITranslator<BranchCreat
@Override
public BranchCreationResponse convert(PropertyStore store) {
- long branchId = store.getLong(Fields.BRANCH_ID.name());
- return new BranchCreationResponse(branchId);
+ long branchUuid = store.getLong(Fields.BRANCH_ID.name());
+ return new BranchCreationResponse(branchUuid);
}
@Override
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/PurgeBranchRequestTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/PurgeBranchRequestTranslator.java
index 69ef66b04b..235ecb19fd 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/PurgeBranchRequestTranslator.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/PurgeBranchRequestTranslator.java
@@ -26,9 +26,9 @@ public class PurgeBranchRequestTranslator implements ITranslator<PurgeBranchRequ
@Override
public PurgeBranchRequest convert(PropertyStore propertyStore) {
- long branchId = propertyStore.getLong(Entry.BRANCH_ID.name());
+ long branchUuid = propertyStore.getLong(Entry.BRANCH_ID.name());
boolean recursive = propertyStore.getBoolean(Entry.RECURSIVE.name());
- PurgeBranchRequest request = new PurgeBranchRequest(branchId, recursive);
+ PurgeBranchRequest request = new PurgeBranchRequest(branchUuid, recursive);
return request;
}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/TransactionCacheUpdateResponseTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/TransactionCacheUpdateResponseTranslator.java
index 73dded007c..55a4d43610 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/TransactionCacheUpdateResponseTranslator.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/TransactionCacheUpdateResponseTranslator.java
@@ -93,7 +93,7 @@ public class TransactionCacheUpdateResponseTranslator implements ITranslator<Tra
Date timeStamp = new Date(Long.valueOf(data[index++]));
int authorArtId = Integer.valueOf(data[index++]);
int commitArtId = Integer.valueOf(data[index++]);
- long branchId = Long.valueOf(data[index++]);
- return factory.create(txId, branchId, comment, timeStamp, authorArtId, commitArtId, txType, branchCache);
+ long branchUuid = Long.valueOf(data[index++]);
+ return factory.create(txId, branchUuid, comment, timeStamp, authorArtId, commitArtId, txType, branchCache);
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/TransactionRecordTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/TransactionRecordTranslator.java
index 15f474c28e..471ac1cda5 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/TransactionRecordTranslator.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/TransactionRecordTranslator.java
@@ -51,8 +51,8 @@ public final class TransactionRecordTranslator implements ITranslator<Transactio
Date time = new Timestamp(store.getLong(Entry.TRANSACTION_TIMESTAMP.name()));
int authorArtId = store.getInt(Entry.TRANSACTION_AUTHOR_ART_ID.name());
int commitArtId = store.getInt(Entry.TRANSACTION_COMMIT_ART_ID.name());
- long branchId = store.getLong(Entry.TRANSACTION_BRANCH.name());
- return txRecordFactory.create(transactionNumber, branchId, comment, time, authorArtId, commitArtId, txType,
+ long branchUuid = store.getLong(Entry.TRANSACTION_BRANCH.name());
+ return txRecordFactory.create(transactionNumber, branchUuid, comment, time, authorArtId, commitArtId, txType,
branchCache);
}
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java
index 7ad267c63a..8a6cbd11ac 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java
@@ -92,7 +92,7 @@ public final class MockDataFactory {
return new Branch(uuid, "branch_" + index, branchType, branchState, isArchived, false);
}
- public static TransactionRecord createTransaction(int index, int branchId) {
+ public static TransactionRecord createTransaction(int index, int branchUuid) {
TransactionDetailsType type =
TransactionDetailsType.values()[Math.abs(index % TransactionDetailsType.values().length)];
int value = index;
@@ -101,7 +101,7 @@ public final class MockDataFactory {
}
MockOseeDataAccessor<Long, Branch> accessor = new MockOseeDataAccessor<Long, Branch>();
BranchCache cache = new BranchCache(accessor);
- return new TransactionRecord(value * 47, branchId, "comment_" + value, new Date(), value * 37, value * 42, type,
+ return new TransactionRecord(value * 47, branchUuid, "comment_" + value, new Date(), value * 37, value * 42, type,
cache);
}
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockOseeTransactionDataAccessor.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockOseeTransactionDataAccessor.java
index 77bb520fa8..c891ffd51d 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockOseeTransactionDataAccessor.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockOseeTransactionDataAccessor.java
@@ -70,7 +70,7 @@ public class MockOseeTransactionDataAccessor implements ITransactionDataAccessor
}
@Override
- public TransactionRecord getOrLoadPriorTransaction(TransactionCache cache, int transactionNumber, long branchId) throws OseeCoreException {
+ public TransactionRecord getOrLoadPriorTransaction(TransactionCache cache, int transactionNumber, long branchUuid) throws OseeCoreException {
return null;
}
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 7274af8afc..b48e5bfa8a 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
@@ -35,7 +35,7 @@ public class TransactionRecordTest {
private final TransactionRecord transaction;
private final int transactionNumber;
- private final int branchId;
+ private final int branchUuid;
private final TransactionDetailsType txType;
private final String comment;
@@ -43,9 +43,9 @@ public class TransactionRecordTest {
private final int authorArtId;
private final int commitArtId;
- public TransactionRecordTest(int transactionNumber, int branchId, String comment, Date time, int authorArtId, int commitArtId, TransactionDetailsType txType) {
+ public TransactionRecordTest(int transactionNumber, int branchUuid, String comment, Date time, int authorArtId, int commitArtId, TransactionDetailsType txType) {
this.transactionNumber = transactionNumber;
- this.branchId = branchId;
+ this.branchUuid = branchUuid;
this.comment = comment;
this.time = time;
this.authorArtId = authorArtId;
@@ -53,12 +53,12 @@ public class TransactionRecordTest {
this.txType = txType;
this.transaction =
- new TransactionRecord(transactionNumber, branchId, comment, time, authorArtId, commitArtId, txType, null);
+ new TransactionRecord(transactionNumber, branchUuid, comment, time, authorArtId, commitArtId, txType, null);
}
@Test
public void getBranch() {
- Assert.assertEquals(branchId, transaction.getBranchId());
+ Assert.assertEquals(branchUuid, transaction.getBranchId());
}
@Test
@@ -143,7 +143,7 @@ public class TransactionRecordTest {
@Test
public void testToString() {
- Assert.assertEquals(transactionNumber + ":" + branchId, transaction.toString());
+ Assert.assertEquals(transactionNumber + ":" + branchUuid, transaction.toString());
}
@Parameters
@@ -151,13 +151,13 @@ public class TransactionRecordTest {
Collection<Object[]> data = new ArrayList<Object[]>();
for (int index = 1; index <= 2; index++) {
int transactionNumber = index * 11;
- int branchId = index * 9;
+ int branchUuid = index * 9;
String comment = GUID.create();
Date time = new Date();
int authorArtId = index * 47;
int commitArtId = index * 37;
TransactionDetailsType txType = TransactionDetailsType.toEnum(index % TransactionDetailsType.values().length);
- data.add(new Object[] {transactionNumber, branchId, comment, time, authorArtId, commitArtId, txType});
+ data.add(new Object[] {transactionNumber, branchUuid, comment, time, authorArtId, commitArtId, txType});
}
return data;
}
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 2b16f17ccc..3ea6878d3e 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
@@ -27,16 +27,16 @@ public class TransactionRecord extends BaseIdentity<Integer> implements ITransac
private static final int NON_EXISTING_BRANCH = -1;
private final TransactionDetailsType txType;
- private final long branchId;
+ private final long branchUuid;
private String comment;
private Date time;
private int authorArtId;
private int commitArtId;
private final BranchCache branchCache;
- public TransactionRecord(int transactionNumber, long branchId, String comment, Date time, int authorArtId, int commitArtId, TransactionDetailsType txType, BranchCache branchCache) {
+ public TransactionRecord(int transactionNumber, long branchUuid, String comment, Date time, int authorArtId, int commitArtId, TransactionDetailsType txType, BranchCache branchCache) {
super(transactionNumber);
- this.branchId = branchId;
+ this.branchUuid = branchUuid;
this.comment = Strings.intern(comment);
this.time = time;
this.authorArtId = authorArtId;
@@ -51,11 +51,11 @@ public class TransactionRecord extends BaseIdentity<Integer> implements ITransac
}
public boolean exists() {
- return branchId != NON_EXISTING_BRANCH;
+ return branchUuid != NON_EXISTING_BRANCH;
}
public long getBranchId() {
- return branchId;
+ return branchUuid;
}
public Branch getBranch() throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/ITransactionDataAccessor.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/ITransactionDataAccessor.java
index b49cf3d22f..bd7d85008c 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/ITransactionDataAccessor.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/ITransactionDataAccessor.java
@@ -42,7 +42,7 @@ public interface ITransactionDataAccessor {
public void load(TransactionCache transactionCache) throws OseeCoreException;
- public TransactionRecord getOrLoadPriorTransaction(TransactionCache cache, int transactionNumber, long branchId) throws OseeCoreException;
+ public TransactionRecord getOrLoadPriorTransaction(TransactionCache cache, int transactionNumber, long branchUuid) throws OseeCoreException;
public TransactionRecord getHeadTransaction(TransactionCache cache, Branch branch) throws OseeCoreException;
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/ArtifactJoinQuery.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/ArtifactJoinQuery.java
index 4750a3acd7..49c3ea5b55 100644
--- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/ArtifactJoinQuery.java
+++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/ArtifactJoinQuery.java
@@ -22,23 +22,23 @@ public class ArtifactJoinQuery extends AbstractJoinQuery {
private final class Entry implements IJoinRow {
private final Integer artId;
- private final Long branchId;
+ private final Long branchUuid;
private final Integer transactionId;
- private Entry(Integer artId, Long branchId, Integer transactionId) {
+ private Entry(Integer artId, Long branchUuid, Integer transactionId) {
this.artId = artId;
- this.branchId = branchId;
+ this.branchUuid = branchUuid;
this.transactionId = transactionId;
}
@Override
public Object[] toArray() {
- return new Object[] {getQueryId(), getInsertTime(), artId, branchId, transactionId};
+ return new Object[] {getQueryId(), getInsertTime(), artId, branchUuid, transactionId};
}
@Override
public String toString() {
- return String.format("art_id=%s, branch_id=%s, transaction_id=%s", artId, branchId, transactionId);
+ return String.format("art_id=%s, branch_id=%s, transaction_id=%s", artId, branchUuid, transactionId);
}
@Override
@@ -63,11 +63,11 @@ public class ArtifactJoinQuery extends AbstractJoinQuery {
} else if (!artId.equals(other.artId)) {
return false;
}
- if (branchId == null) {
- if (other.branchId != null) {
+ if (branchUuid == null) {
+ if (other.branchUuid != null) {
return false;
}
- } else if (!branchId.equals(other.branchId)) {
+ } else if (!branchUuid.equals(other.branchUuid)) {
return false;
}
if (transactionId == null) {
@@ -86,7 +86,7 @@ public class ArtifactJoinQuery extends AbstractJoinQuery {
int result = 1;
result = prime * result + getOuterType().hashCode();
result = prime * result + ((artId == null) ? 0 : artId.hashCode());
- result = prime * result + ((branchId == null) ? 0 : branchId.hashCode());
+ result = prime * result + ((branchUuid == null) ? 0 : branchUuid.hashCode());
result = prime * result + ((transactionId == null) ? 0 : transactionId.hashCode());
return result;
}
@@ -101,8 +101,8 @@ public class ArtifactJoinQuery extends AbstractJoinQuery {
this.maxJoinSize = maxJoinSize;
}
- public void add(Integer art_id, Long branchId, Integer transactionId) {
- entries.add(new Entry(art_id, branchId, transactionId));
+ public void add(Integer art_id, Long branchUuid, Integer transactionId) {
+ entries.add(new Entry(art_id, branchUuid, transactionId));
if (entries.size() > maxJoinSize) {
throw new OseeDataStoreException("Exceeded max artifact join size of [%d]", maxJoinSize);
}
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/Address.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/Address.java
index 5d494c3b07..b96356c499 100644
--- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/Address.java
+++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/Address.java
@@ -17,7 +17,7 @@ import org.eclipse.osee.framework.core.enums.TxChange;
* @author Ryan D. Brooks
*/
public final class Address implements Comparable<Address> {
- private final long branchId;
+ private final long branchUuid;
private final int itemId;
private final int transactionId;
private final long gammaId;
@@ -27,9 +27,9 @@ public final class Address implements Comparable<Address> {
private TxChange correctedTxCurrent;
private boolean purge;
- public Address(boolean isBaseline, long branchId, int itemId, int transactionId, long gammaId, ModificationType modType, TxChange txCurrent) {
+ public Address(boolean isBaseline, long branchUuid, int itemId, int transactionId, long gammaId, ModificationType modType, TxChange txCurrent) {
super();
- this.branchId = branchId;
+ this.branchUuid = branchUuid;
this.itemId = itemId;
this.transactionId = transactionId;
this.gammaId = gammaId;
@@ -43,7 +43,7 @@ public final class Address implements Comparable<Address> {
}
public boolean isSimilar(Address other) {
- return other != null && other.itemId == itemId && other.branchId == branchId;
+ return other != null && other.itemId == itemId && other.branchUuid == branchUuid;
}
public boolean isSameTransaction(Address other) {
@@ -92,7 +92,7 @@ public final class Address implements Comparable<Address> {
}
public long getBranchId() {
- return branchId;
+ return branchUuid;
}
public int getItemId() {
@@ -125,7 +125,7 @@ public final class Address implements Comparable<Address> {
@Override
public String toString() {
- return "Address [branchId=" + branchId + ", gammaId=" + gammaId + ", itemId=" + itemId + ", modType=" + modType + ", transactionId=" + transactionId + ", txCurrent=" + txCurrent + "]";
+ return "Address [branchUuid=" + branchUuid + ", gammaId=" + gammaId + ", itemId=" + itemId + ", modType=" + modType + ", transactionId=" + transactionId + ", txCurrent=" + txCurrent + "]";
}
@Override
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/PurgeTransactionOperation.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/PurgeTransactionOperation.java
index 00203de6c2..da038ae3dc 100644
--- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/PurgeTransactionOperation.java
+++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/PurgeTransactionOperation.java
@@ -163,12 +163,12 @@ public class PurgeTransactionOperation extends AbstractDbTxOperation {
String query = String.format(FIND_NEW_TX_CURRENTS, tableName, itemId);
for (Entry<Long, IdJoinQuery> entry : affected.entrySet()) {
- Long branchId = entry.getKey();
+ Long branchUuid = entry.getKey();
IdJoinQuery joinQuery = entry.getValue();
IOseeStatement statement = ConnectionHandler.getStatement(connection);
try {
- statement.runPreparedQuery(MAX_FETCH, query, joinQuery.getQueryId(), branchId);
+ statement.runPreparedQuery(MAX_FETCH, query, joinQuery.getQueryId(), branchUuid);
int previousItem = -1;
while (statement.next()) {
int currentItem = statement.getInt("item_id");
@@ -178,7 +178,7 @@ public class PurgeTransactionOperation extends AbstractDbTxOperation {
TxChange txCurrent = TxChange.getCurrent(modType);
updateData.add(new Object[] {
txCurrent.getValue(),
- branchId,
+ branchUuid,
statement.getInt("transaction_id"),
statement.getLong("gamma_id")});
previousItem = currentItem;
@@ -197,11 +197,11 @@ public class PurgeTransactionOperation extends AbstractDbTxOperation {
try {
for (Object[] bindData : bindDataList) {
- Long branchId = (Long) bindData[0];
+ Long branchUuid = (Long) bindData[0];
String query = String.format(SELECT_AFFECTED_ITEMS, itemId, itemTable);
statement.runPreparedQuery(MAX_FETCH, query, bindData);
IdJoinQuery joinId = JoinUtility.createIdJoinQuery();
- items.put(branchId, joinId);
+ items.put(branchUuid, joinId);
while (statement.next()) {
Integer id = statement.getInt("item_id");
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchExchangeServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchExchangeServlet.java
index 72ef3a39e7..18994b95c2 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchExchangeServlet.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchExchangeServlet.java
@@ -105,8 +105,8 @@ public class BranchExchangeServlet extends SecureOseeHttpServlet {
StringBuffer message = new StringBuffer();
List<IOseeBranch> branches = new ArrayList<IOseeBranch>();
- for (Integer branchIds : exchangeInfo.getSelectedBranchIds()) {
- branches.add(orcsBranch.getBranchFromId(branchIds));
+ for (Integer branchUuids : exchangeInfo.getSelectedBranchIds()) {
+ branches.add(orcsBranch.getBranchFromId(branchUuids));
}
Callable<URI> callable =
@@ -153,8 +153,8 @@ public class BranchExchangeServlet extends SecureOseeHttpServlet {
private void executeImport(OrcsBranch orcsBranch, HttpBranchExchangeInfo exchangeInfo, HttpServletResponse response) throws Exception {
List<IOseeBranch> branches = new ArrayList<IOseeBranch>();
- for (Integer branchIds : exchangeInfo.getSelectedBranchIds()) {
- branches.add(orcsBranch.getBranchFromId(branchIds));
+ for (Integer branchUuids : exchangeInfo.getSelectedBranchIds()) {
+ branches.add(orcsBranch.getBranchFromId(branchUuids));
}
IResourceLocator locator = resourceManager.getResourceLocator(exchangeInfo.getPath());
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpBranchExchangeInfo.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpBranchExchangeInfo.java
index 8d8902476c..470a10cb48 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpBranchExchangeInfo.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpBranchExchangeInfo.java
@@ -58,7 +58,7 @@ public class HttpBranchExchangeInfo {
this.deleteExportFile = Boolean.valueOf(value);
} else if (name.equalsIgnoreCase("function")) {
isFunctionValid(value);
- } else if (name.equalsIgnoreCase("branchIds")) {
+ } else if (name.equalsIgnoreCase("branchUuids")) {
for (String entry : value.split(",")) {
selectedBranchIds.add(new Integer(entry));
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkParserTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkParserTest.java
index fc4ca82a36..07e6181198 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkParserTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkParserTest.java
@@ -32,10 +32,10 @@ public class OseeLinkParserTest {
public void testNewSchoolLink() throws Exception {
OseeLinkParser parser = new OseeLinkParser();
String guid = GUID.create();
- int branchId = 12;
- parser.parse(String.format("http://127.0.0.1:8081/Define?guid=%s&branchId=%s", guid, branchId));
+ int branchUuid = 12;
+ parser.parse(String.format("http://127.0.0.1:8081/Define?guid=%s&branchUuid=%s", guid, branchUuid));
Assert.assertEquals(guid, parser.getGuid());
- Assert.assertEquals(branchId, parser.getId());
+ Assert.assertEquals(branchUuid, parser.getId());
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCache.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCache.java
index 6b7ae5a249..ce94601d3e 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCache.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCache.java
@@ -93,8 +93,8 @@ public final class ArtifactCache {
* This method is called by attributes and relations when their dirty state changes. This way, when an artifact is
* dirty we can hold onto a strong reference and when it is not dirty we can have a weak reference.
*/
- public static void updateCachedArtifact(int artId, long branchId) {
- ACTIVE_CACHE.updateReferenceType(artId, branchId);
+ public static void updateCachedArtifact(int artId, long branchUuid) {
+ ACTIVE_CACHE.updateReferenceType(artId, branchUuid);
}
/**
@@ -175,8 +175,8 @@ public final class ArtifactCache {
return getActive(artId, branch.getUuid());
}
- public static Artifact getActive(Integer artId, Long branchId) {
- return ACTIVE_CACHE.getById(artId, branchId);
+ public static Artifact getActive(Integer artId, Long branchUuid) {
+ return ACTIVE_CACHE.getById(artId, branchUuid);
}
public static Artifact getActive(String artGuid, IOseeBranch branch) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java
index 26305e3743..4d2e0895a2 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java
@@ -73,9 +73,9 @@ public final class ArtifactLoader {
public static List<Artifact> loadArtifacts(Collection<Integer> artIds, IOseeBranch branch, LoadLevel loadLevel, LoadType reload, DeletionFlag allowDeleted, TransactionRecord transactionId) throws OseeCoreException {
List<Pair<Integer, Long>> toLoad = new LinkedList<Pair<Integer, Long>>();
- Long branchId = branch.getUuid();
+ Long branchUuid = branch.getUuid();
for (Integer artId : new HashSet<Integer>(artIds)) {
- toLoad.add(new Pair<Integer, Long>(artId, branchId));
+ toLoad.add(new Pair<Integer, Long>(artId, branchUuid));
}
List<Artifact> artifacts = loadSelectedArtifacts(toLoad, loadLevel, reload, allowDeleted, transactionId);
return artifacts;
@@ -105,17 +105,17 @@ public final class ArtifactLoader {
while (iterator.hasNext()) {
Pair<Integer, Long> next = iterator.next();
Integer artId = next.getFirst();
- Long branchId = next.getSecond();
+ Long branchUuid = next.getSecond();
Artifact active = null;
if (reload == LoadType.INCLUDE_CACHE) {
synchronized (ArtifactCache.class) {
- active = ArtifactCache.getActive(artId, branchId);
+ active = ArtifactCache.getActive(artId, branchUuid);
}
}
- boolean doNotLoad = determineIfIShouldLoad(artifacts, allowDeleted, locks, artId, branchId, active);
+ boolean doNotLoad = determineIfIShouldLoad(artifacts, allowDeleted, locks, artId, branchUuid, active);
if (doNotLoad) {
iterator.remove();
@@ -130,9 +130,9 @@ public final class ArtifactLoader {
if (artifacts.size() != numRequested) {
for (Pair<Integer, Long> loadPair : toLoad) {
Integer artId = loadPair.getFirst();
- Long branchId = loadPair.getSecond();
- removeAndUnlock(artId, branchId);
- locks.remove(artId, branchId);
+ Long branchUuid = loadPair.getSecond();
+ removeAndUnlock(artId, branchUuid);
+ locks.remove(artId, branchUuid);
}
}
}
@@ -140,30 +140,30 @@ public final class ArtifactLoader {
}
}
- private static void removeAndUnlock(Integer artId, Long branchId) {
+ private static void removeAndUnlock(Integer artId, Long branchUuid) {
ReentrantLock lock = null;
synchronized (loadingActiveMap) {
- lock = loadingActiveMap.remove(artId, branchId);
+ lock = loadingActiveMap.remove(artId, branchUuid);
}
if (lock != null && lock.isLocked()) {
lock.unlock();
}
}
- private static boolean determineIfIShouldLoad(Set<Artifact> artifacts, DeletionFlag allowDeleted, CompositeKeyHashMap<Integer, Long, ReentrantLock> locks, Integer artId, Long branchId, Artifact active) {
+ private static boolean determineIfIShouldLoad(Set<Artifact> artifacts, DeletionFlag allowDeleted, CompositeKeyHashMap<Integer, Long, ReentrantLock> locks, Integer artId, Long branchUuid, Artifact active) {
boolean doNotLoad = false;
//not in the cache
if (active == null) {
synchronized (loadingActiveMap) {
- ReentrantLock lock = loadingActiveMap.get(artId, branchId);
+ ReentrantLock lock = loadingActiveMap.get(artId, branchUuid);
// this thread should load the artifact
if (lock == null) {
lock = new ReentrantLock();
lock.lock();
- loadingActiveMap.put(artId, branchId, lock);
+ loadingActiveMap.put(artId, branchUuid, lock);
} else {
// another thread is loading the artifact, do not load it
- locks.put(artId, branchId, lock);
+ locks.put(artId, branchUuid, lock);
doNotLoad = true;
}
}
@@ -182,10 +182,10 @@ public final class ArtifactLoader {
while (iterator.hasNext()) {
Entry<Pair<Integer, Long>, ReentrantLock> entry = iterator.next();
Integer artId = entry.getKey().getFirst();
- Long branchId = entry.getKey().getSecond();
+ Long branchUuid = entry.getKey().getSecond();
entry.getValue().lock();
entry.getValue().unlock();
- Artifact active = ArtifactCache.getActive(artId, branchId);
+ Artifact active = ArtifactCache.getActive(artId, branchUuid);
if (active != null) {
artifacts.add(active);
}
@@ -215,9 +215,9 @@ public final class ArtifactLoader {
long previousBranchId = -1;
while (chStmt.next()) {
int artId = chStmt.getInt("art_id");
- long branchId = chStmt.getLong("branch_id");
+ long branchUuid = chStmt.getLong("branch_id");
// assumption: sql is returning rows ordered by branch_id, art_id, transaction_id in descending order
- if (previousArtId != artId || previousBranchId != branchId) {
+ if (previousArtId != artId || previousBranchId != branchUuid) {
// assumption: sql is returning unwanted deleted artifacts only in the historical case
if (!historical || allowDeleted == DeletionFlag.INCLUDE_DELETED || ModificationType.getMod(chStmt.getInt("mod_type")) != ModificationType.DELETED) {
Artifact shallowArtifact = retrieveShallowArtifact(chStmt, reload, historical);
@@ -225,7 +225,7 @@ public final class ArtifactLoader {
}
}
previousArtId = artId;
- previousBranchId = branchId;
+ previousBranchId = branchUuid;
}
} catch (OseeDataStoreException ex) {
OseeLog.logf(Activator.class, Level.SEVERE, ex, "%s - %s", sqlKey, sql == null ? "SQL unknown" : sql);
@@ -333,7 +333,7 @@ public final class ArtifactLoader {
}
/**
- * Determines the artIds and branchIds of artifacts to load based on sql and queryParameters
+ * Determines the artIds and branchUuids of artifacts to load based on sql and queryParameters
*/
private static List<Pair<Integer, Long>> selectArtifacts(String sql, Object[] queryParameters, int artifactCountEstimate) throws OseeCoreException {
IOseeStatement chStmt = ConnectionHandler.getStatement();
@@ -345,8 +345,8 @@ public final class ArtifactLoader {
chStmt.runPreparedQuery(artifactCountEstimate, sql, queryParameters);
while (chStmt.next()) {
int artId = chStmt.getInt("art_id");
- long branchId = chStmt.getLong("branch_id");
- toLoad.add(new Pair<Integer, Long>(artId, branchId));
+ long branchUuid = chStmt.getLong("branch_id");
+ toLoad.add(new Pair<Integer, Long>(artId, branchUuid));
}
} finally {
chStmt.close();
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/AttributeLoader.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/AttributeLoader.java
index ffced74e58..56f418ed08 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/AttributeLoader.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/AttributeLoader.java
@@ -76,7 +76,7 @@ public class AttributeLoader {
private static final class AttrData {
public int artifactId = -1;
- public long branchId = -1;
+ public long branchUuid = -1;
public int attrId = -1;
public int gammaId = -1;
public int modType = -1;
@@ -92,7 +92,7 @@ public class AttributeLoader {
public AttrData(IOseeStatement chStmt, boolean historical) throws OseeCoreException {
artifactId = chStmt.getInt("art_id");
- branchId = chStmt.getLong("branch_id");
+ branchUuid = chStmt.getLong("branch_id");
attrId = chStmt.getInt("attr_id");
gammaId = chStmt.getInt("gamma_id");
modType = chStmt.getInt("mod_type");
@@ -107,21 +107,21 @@ public class AttributeLoader {
}
public static boolean isDifferentArtifact(AttrData previous, AttrData current) {
- return current.branchId != previous.branchId || current.artifactId != previous.artifactId;
+ return current.branchUuid != previous.branchUuid || current.artifactId != previous.artifactId;
}
public static boolean multipleVersionsExist(AttrData current, AttrData previous) {
- return current.attrId == previous.attrId && current.branchId == previous.branchId && current.artifactId == previous.artifactId;
+ return current.attrId == previous.attrId && current.branchUuid == previous.branchUuid && current.artifactId == previous.artifactId;
}
}
private static Artifact getArtifact(AttrData current, boolean historical, CompositeKeyHashMap<Integer, Long, Artifact> tempCache) {
Artifact artifact = null;
- long key2 = historical ? current.stripeId : current.branchId;
+ long key2 = historical ? current.stripeId : current.branchUuid;
artifact = tempCache.get(current.artifactId, key2);
if (artifact == null) {
OseeLog.logf(ArtifactLoader.class, Level.WARNING, "Orphaned attribute id [%d] for artifact id[%d] branch[%d]",
- current.attrId, current.artifactId, current.branchId);
+ current.attrId, current.artifactId, current.branchUuid);
}
return artifact;
}
@@ -158,7 +158,7 @@ public class AttributeLoader {
Level.WARNING,
"multiple attribute version for attribute id [%d] artifact id[%d] branch[%d] previousGammaId[%s] currentGammaId[%s] previousModType[%s] currentModType[%s]",
- current.attrId, current.artifactId, current.branchId, previous.gammaId, current.gammaId, previous.modType,
+ current.attrId, current.artifactId, current.branchUuid, previous.gammaId, current.gammaId, previous.modType,
current.modType);
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeArtifactType.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeArtifactType.java
index c7296d9cfe..e2438d0e50 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeArtifactType.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeArtifactType.java
@@ -142,8 +142,8 @@ public class ChangeArtifactType {
while (chStmt.next()) {
int gammaId = chStmt.getInt("gamma_id");
- long branchId = chStmt.getLong("branch_id");
- IOseeBranch branch = BranchManager.getBranch(branchId);
+ long branchUuid = chStmt.getLong("branch_id");
+ IOseeBranch branch = BranchManager.getBranch(branchUuid);
int artId = gammaToArtId.get(gammaId);
Artifact artifact = ArtifactQuery.checkArtifactFromId(artId, branch, DeletionFlag.EXCLUDE_DELETED);
if (artifact != null) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java
index 8e59fb548c..02b6000160 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java
@@ -98,9 +98,9 @@ public class PurgeArtifacts extends AbstractDbTxOperation {
StringBuilder sb = new StringBuilder();
while (chStmt.next()) {
int artId = chStmt.getInt("art_id");
- long branchId = chStmt.getLong("branch_id");
+ long branchUuid = chStmt.getLong("branch_id");
if (recurseChildrenBranches) {
- Branch branch = BranchManager.getBranch(branchId);
+ Branch branch = BranchManager.getBranch(branchUuid);
Artifact artifactFromId = ArtifactQuery.getArtifactFromId(artId, branch);
artifactsToPurge.add(artifactFromId);
} else {
@@ -108,7 +108,7 @@ public class PurgeArtifacts extends AbstractDbTxOperation {
sb.append("ArtifactId[");
sb.append(artId);
sb.append("] BranchId[");
- sb.append(branchId);
+ sb.append(branchUuid);
sb.append("]\n");
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UpdateMergeBranch.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UpdateMergeBranch.java
index 4cd7097bcc..238ed32440 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UpdateMergeBranch.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UpdateMergeBranch.java
@@ -241,12 +241,12 @@ public class UpdateMergeBranch extends DbTransaction {
* will also be removed from the database only for the branch it is on).
*/
private static void purgeArtifactFromBranch(OseeConnection connection, Branch branch, int artId) throws OseeCoreException {
- long branchId = branch.getUuid();
+ long branchUuid = branch.getUuid();
//Remove from Baseline
- ConnectionHandler.runPreparedUpdate(connection, PURGE_ATTRIBUTE_FROM_MERGE_BRANCH, branchId, artId);
- ConnectionHandler.runPreparedUpdate(connection, PURGE_RELATION_FROM_MERGE_BRANCH, branchId, artId, artId);
- ConnectionHandler.runPreparedUpdate(connection, PURGE_ARTIFACT_FROM_MERGE_BRANCH, branchId, artId);
+ ConnectionHandler.runPreparedUpdate(connection, PURGE_ATTRIBUTE_FROM_MERGE_BRANCH, branchUuid, artId);
+ ConnectionHandler.runPreparedUpdate(connection, PURGE_RELATION_FROM_MERGE_BRANCH, branchUuid, artId, artId);
+ ConnectionHandler.runPreparedUpdate(connection, PURGE_ARTIFACT_FROM_MERGE_BRANCH, branchUuid, artId);
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/AbstractArtifactCache.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/AbstractArtifactCache.java
index bf7ec05e0f..3f502d88b1 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/AbstractArtifactCache.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/AbstractArtifactCache.java
@@ -113,8 +113,8 @@ public abstract class AbstractArtifactCache {
}
@SuppressWarnings("unchecked")
- public void updateReferenceType(int artId, long branchId) {
- Object obj = idCache.get(artId, branchId);
+ public void updateReferenceType(int artId, long branchUuid) {
+ Object obj = idCache.get(artId, branchUuid);
if (obj != null) {
if (obj instanceof Artifact) {
Artifact artifact = (Artifact) obj;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/ActiveArtifactCache.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/ActiveArtifactCache.java
index 79fce9d2a4..ca17b402a9 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/ActiveArtifactCache.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/ActiveArtifactCache.java
@@ -61,12 +61,12 @@ public class ActiveArtifactCache extends AbstractArtifactCache {
}
}
- public Artifact getById(Integer artId, Long branchId) {
- return asArtifact(getObjectById(artId, branchId));
+ public Artifact getById(Integer artId, Long branchUuid) {
+ return asArtifact(getObjectById(artId, branchUuid));
}
- public Artifact getByGuid(String artGuid, Long branchId) {
- return asArtifact(getObjectByGuid(artGuid, branchId));
+ public Artifact getByGuid(String artGuid, Long branchUuid) {
+ return asArtifact(getObjectByGuid(artGuid, branchUuid));
}
public List<Artifact> getByType(IArtifactType artifactType) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/HttpBranchExchange.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/HttpBranchExchange.java
index 7257ca53e9..63d23d0e19 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/HttpBranchExchange.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/HttpBranchExchange.java
@@ -30,17 +30,17 @@ public class HttpBranchExchange {
private static final String BRANCH_EXPORT = "exportBranch";
private static final String BRANCH_IMPORT = "importBranch";
- public static void exportBranches(String exportFileName, int... branchIds) throws OseeCoreException {
+ public static void exportBranches(String exportFileName, int... branchUuids) throws OseeCoreException {
Map<String, String> parameters = new HashMap<String, String>();
parameters.put("function", BRANCH_EXPORT);
if (Strings.isValid(exportFileName)) {
parameters.put("filename", exportFileName);
}
- addBranchIds(parameters, branchIds);
+ addBranchIds(parameters, branchUuids);
execute(parameters);
}
- public static void importBranches(String path, boolean cleanAllBeforeImport, boolean allAsRootBranches, int... branchIds) throws OseeCoreException {
+ public static void importBranches(String path, boolean cleanAllBeforeImport, boolean allAsRootBranches, int... branchUuids) throws OseeCoreException {
Map<String, String> parameters = new HashMap<String, String>();
parameters.put("sessionId", ClientSessionManager.getSessionId());
parameters.put("function", BRANCH_IMPORT);
@@ -54,7 +54,7 @@ public class HttpBranchExchange {
if (cleanAllBeforeImport) {
parameters.put("clean_before_import", Boolean.toString(cleanAllBeforeImport));
}
- addBranchIds(parameters, branchIds);
+ addBranchIds(parameters, branchUuids);
execute(parameters);
}
@@ -69,16 +69,16 @@ public class HttpBranchExchange {
}
}
- private static void addBranchIds(Map<String, String> parameters, int... branchIds) {
- if (branchIds != null && branchIds.length > 0) {
+ private static void addBranchIds(Map<String, String> parameters, int... branchUuids) {
+ if (branchUuids != null && branchUuids.length > 0) {
StringBuffer ids = new StringBuffer();
- for (int index = 0; index < branchIds.length; index++) {
- ids.append(branchIds[index]);
- if (index + 1 < branchIds.length) {
+ for (int index = 0; index < branchUuids.length; index++) {
+ ids.append(branchUuids[index]);
+ if (index + 1 < branchUuids.length) {
ids.append(",");
}
}
- parameters.put("branchIds", ids.toString());
+ parameters.put("branchUuids", ids.toString());
}
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/BaseArtifactLoopbackCmd.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/BaseArtifactLoopbackCmd.java
index d3600a7b9d..5dc5f193e7 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/BaseArtifactLoopbackCmd.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/BaseArtifactLoopbackCmd.java
@@ -31,13 +31,13 @@ public abstract class BaseArtifactLoopbackCmd implements IClientLoopbackCmd {
@Override
public void execute(final Map<String, String> parameters, final HttpResponse httpResponse) {
- final String branchId = parameters.get("branchId");
+ final String branchUuid = parameters.get("branchUuid");
final String guid = parameters.get("guid");
final boolean isDeleted = Boolean.valueOf(parameters.get("isDeleted"));
final DeletionFlag searchDeleted = isDeleted ? INCLUDE_DELETED : EXCLUDE_DELETED;
final String transactionIdStr = parameters.get("transactionId");
- boolean haveAValidBranchIdentifier = Strings.isValid(branchId);
+ boolean haveAValidBranchIdentifier = Strings.isValid(branchUuid);
if (!Strings.isValid(guid) || !haveAValidBranchIdentifier) {
httpResponse.outputStandardError(HttpURLConnection.HTTP_BAD_REQUEST,
String.format("Unable to process [%s]", parameters));
@@ -51,7 +51,7 @@ public abstract class BaseArtifactLoopbackCmd implements IClientLoopbackCmd {
branch = transactionId.getBranch();
artifact = ArtifactQuery.getHistoricalArtifactFromId(guid, transactionId, searchDeleted);
} else {
- branch = BranchManager.getBranch(Long.parseLong(branchId));
+ branch = BranchManager.getBranch(Long.parseLong(branchUuid));
artifact = ArtifactQuery.getArtifactFromId(guid, branch, searchDeleted);
}
if (artifact == null) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientTransactionAccessor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientTransactionAccessor.java
index 6bc0f5c0da..13aa790fa7 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientTransactionAccessor.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientTransactionAccessor.java
@@ -80,9 +80,9 @@ public class ClientTransactionAccessor implements ITransactionDataAccessor {
}
@Override
- public TransactionRecord getOrLoadPriorTransaction(TransactionCache cache, int transactionNumber, long branchId) throws OseeCoreException {
+ public TransactionRecord getOrLoadPriorTransaction(TransactionCache cache, int transactionNumber, long branchUuid) throws OseeCoreException {
int priorTransactionId =
- ConnectionHandler.runPreparedQueryFetchInt(transactionNumber, GET_PRIOR_TRANSACTION, branchId,
+ ConnectionHandler.runPreparedQueryFetchInt(transactionNumber, GET_PRIOR_TRANSACTION, branchUuid,
transactionNumber);
return cache.getOrLoad(priorTransactionId);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkBuilder.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkBuilder.java
index 1b24bbd059..96dea549fe 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkBuilder.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkBuilder.java
@@ -113,11 +113,11 @@ public class OseeLinkBuilder {
public String getUnknownArtifactLink(String guid, Branch branch) {
String processType = "unknown";
return getArtifactLinkWithMessage(processType, guid, branch,
- String.format("Invalid Link: artifact with guid:[%s] on branchId:[%s] does not exist", guid, branch.getUuid()));
+ String.format("Invalid Link: artifact with guid:[%s] on branchUuid:[%s] does not exist", guid, branch.getUuid()));
}
private String getArtifactLinkWithMessage(String processType, String guid, Branch branch, String message) {
- String internalLink = String.format("http://none/%s?guid=%s&amp;branchId=%s", processType, guid, branch.getUuid());
+ String internalLink = String.format("http://none/%s?guid=%s&amp;branchUuid=%s", processType, guid, branch.getUuid());
return String.format(WORDML_LINK_FORMAT, internalLink, message);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkParser.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkParser.java
index f1d15b51af..08d4156896 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkParser.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkParser.java
@@ -45,18 +45,18 @@ public final class OseeLinkParser {
}
public int getId() throws OseeCoreException {
- int branchId = -1;
+ int branchUuid = -1;
if (parameterMap != null) {
- String branchIdStr = parameterMap.get("branchId");
- if (Strings.isValid(branchIdStr)) {
+ String branchUuidStr = parameterMap.get("branchUuid");
+ if (Strings.isValid(branchUuidStr)) {
try {
- branchId = Integer.parseInt(branchIdStr);
+ branchUuid = Integer.parseInt(branchUuidStr);
} catch (Exception ex) {
OseeExceptions.wrapAndThrow(ex);
}
}
}
- return branchId;
+ return branchUuid;
}
public String getGuid() throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationCache.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationCache.java
index 7bbd635a6f..b29aa6f913 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationCache.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationCache.java
@@ -51,9 +51,9 @@ public class RelationCache {
return key.setKey(artifact);
}
- private ArtifactKey getKey(int artId, IOseeBranch branchId) {
+ private ArtifactKey getKey(int artId, IOseeBranch branchUuid) {
ArtifactKey key = THREAD_SHARED_KEY.get();
- return key.setKey(artId, branchId);
+ return key.setKey(artId, branchUuid);
}
public void deCache(IArtifact artifact) {
@@ -116,13 +116,13 @@ public class RelationCache {
return linksFound;
}
- private void findRelations(Collection<RelationLink> linksFound, int artId, IOseeBranch branchId, IRelationType relationType, RelationMatcher matcher) {
- List<RelationLink> sourceLink = relationsByType.get(getKey(artId, branchId), relationType);
+ private void findRelations(Collection<RelationLink> linksFound, int artId, IOseeBranch branchUuid, IRelationType relationType, RelationMatcher matcher) {
+ List<RelationLink> sourceLink = relationsByType.get(getKey(artId, branchUuid), relationType);
RelationFilterUtil.filter(sourceLink, linksFound, matcher);
}
- private void findRelations(Collection<RelationLink> linksFound, int artId, IOseeBranch branchId, RelationMatcher matcher) {
- ArtifactKey artifactKey = getKey(artId, branchId);
+ private void findRelations(Collection<RelationLink> linksFound, int artId, IOseeBranch branchUuid, RelationMatcher matcher) {
+ ArtifactKey artifactKey = getKey(artId, branchUuid);
findRelations(linksFound, artifactKey, matcher);
}
@@ -152,7 +152,7 @@ public class RelationCache {
Set<RelationLink> itemsFound = new HashSet<RelationLink>();
final int artifactId = artifact.getArtId();
- final IOseeBranch branchId = artifact.getBranch();
+ final IOseeBranch branchUuid = artifact.getBranch();
RelationMatcher artIdMatcher = new RelationMatcher() {
@Override
@@ -167,7 +167,7 @@ public class RelationCache {
};
RelationMatcher matcher = RelationFilterUtil.createMatcher(deletionFlag, artIdMatcher);
- findRelations(itemsFound, artifactId, branchId, relationType, matcher);
+ findRelations(itemsFound, artifactId, branchUuid, relationType, matcher);
List<RelationLink> relations = new ArrayList<RelationLink>();
for (RelationLink relation : itemsFound) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java
index 268b69ccac..fdc5e607de 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java
@@ -302,11 +302,11 @@ public class ConflictManagerInternal {
endTransactionNumber) == 0;
}
- private static void cleanUpConflictDB(Collection<Conflict> conflicts, long branchId, IProgressMonitor monitor) throws OseeCoreException {
+ private static void cleanUpConflictDB(Collection<Conflict> conflicts, long branchUuid, IProgressMonitor monitor) throws OseeCoreException {
monitor.subTask("Cleaning up old conflict data");
int queryId = ArtifactLoader.getNewQueryId();
try {
- if (conflicts != null && conflicts.size() != 0 && branchId != 0) {
+ if (conflicts != null && conflicts.size() != 0 && branchUuid != 0) {
Timestamp insertTime = GlobalTime.GreenwichMeanTimestamp();
List<Object[]> insertParameters = new LinkedList<Object[]>();
@@ -315,11 +315,11 @@ public class ConflictManagerInternal {
queryId,
insertTime,
conflict.getObjectId(),
- branchId,
+ branchUuid,
conflict.getConflictType().getValue()});
}
ArtifactLoader.insertIntoArtifactJoin(insertParameters);
- ConnectionHandler.runPreparedUpdate(CONFLICT_CLEANUP, branchId, queryId);
+ ConnectionHandler.runPreparedUpdate(CONFLICT_CLEANUP, branchUuid, queryId);
}
} finally {
ArtifactLoader.clearQuery(queryId);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManager.java
index f1acbb6442..a9c9a3b3eb 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManager.java
@@ -168,12 +168,12 @@ public final class TransactionManager {
* @return the largest (most recent) transaction on the given branch
*/
public static TransactionRecord getHeadTransaction(IOseeBranch branch) throws OseeCoreException {
- long branchId = branch.getUuid();
+ long branchUuid = branch.getUuid();
int transactionNumber =
ConnectionHandler.runPreparedQueryFetchInt(-1, ClientSessionManager.getSql(OseeSql.TX_GET_MAX_AS_LARGEST_TX),
- branchId);
+ branchUuid);
if (transactionNumber == -1) {
- throw new TransactionDoesNotExist("No transactions where found in the database for branch: %d", branchId);
+ throw new TransactionDoesNotExist("No transactions where found in the database for branch: %d", branchUuid);
}
return getTransactionId(transactionNumber);
}
@@ -208,13 +208,13 @@ public final class TransactionManager {
public static TransactionRecord getTransactionAtDate(IOseeBranch branch, Date maxDateExclusive) throws OseeCoreException {
Conditions.checkNotNull(branch, "branch");
Conditions.checkNotNull(maxDateExclusive, "max date exclusive");
- long branchId = branch.getUuid();
+ long branchUuid = branch.getUuid();
TransactionRecord txRecord = null;
IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
- chStmt.runPreparedQuery(SELECT_BRANCH_TRANSACTION_BY_DATE, branchId, new Timestamp(maxDateExclusive.getTime()));
+ chStmt.runPreparedQuery(SELECT_BRANCH_TRANSACTION_BY_DATE, branchUuid, new Timestamp(maxDateExclusive.getTime()));
if (chStmt.next()) {
int transactionId = chStmt.getInt("transaction_id");
if (chStmt.wasNull()) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactTransfer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactTransfer.java
index d09b5f9235..3660385270 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactTransfer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactTransfer.java
@@ -156,8 +156,8 @@ public class ArtifactTransfer extends ByteArrayTransfer {
*/
private Artifact readArtifact(DataInputStream dataIn) throws OseeCoreException, IOException {
int artID = dataIn.readInt();
- long branchId = dataIn.readLong();
- return ArtifactQuery.getArtifactFromId(artID, BranchManager.getBranch(branchId));
+ long branchUuid = dataIn.readLong();
+ return ArtifactQuery.getArtifactFromId(artID, BranchManager.getBranch(branchUuid));
}
/**
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java
index cd9b2bf643..9ec6ba3151 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java
@@ -80,13 +80,13 @@ public class FixTemplateContentArtifacts extends AbstractBlam {
private static final String AND_SPECIFIC_BRANCHES = " AND txs.branch_id = ?";
//@formatter:on
- private long branchId;
+ private long branchUuid;
public FixTemplateContentArtifacts() {
super(null,
"If branch not selected, this will scan through all NOT archived instances of WordTemplateContent attribute",
BlamUiSource.FILE);
- branchId = -1;
+ branchUuid = -1;
}
@Override
@@ -95,7 +95,7 @@ public class FixTemplateContentArtifacts extends AbstractBlam {
try {
monitor.setTaskName("Performing query");
- boolean allBranches = branchId == -1;
+ boolean allBranches = branchUuid == -1;
StringBuilder query = new StringBuilder();
query.append(GET_TRANS_DETAILS);
@@ -106,7 +106,7 @@ public class FixTemplateContentArtifacts extends AbstractBlam {
params[1] = TransactionDetailsType.NonBaselined.getId();
params[2] = CoreAttributeTypes.WordTemplateContent.getGuid();
if (!allBranches) {
- params[3] = branchId;
+ params[3] = branchUuid;
}
chStmt.runPreparedQuery(query.toString(), params);
@@ -180,7 +180,7 @@ public class FixTemplateContentArtifacts extends AbstractBlam {
Object data = xWidget.getData();
if (data instanceof IOseeBranch) {
Branch branch = (Branch) data;
- branchId = branch.getUuid();
+ branchUuid = branch.getUuid();
}
}
});
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeCompoundContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeCompoundContributionItem.java
index 7dc88764e0..2c5a59799e 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeCompoundContributionItem.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeCompoundContributionItem.java
@@ -78,8 +78,8 @@ public class MergeCompoundContributionItem extends CompoundContributionProvider
Command command = configCommandParameter(commandId);
CommandContributionItem contributionItem = null;
- for (Long branchId : destBranches) {
- contributionItem = createCommand(branchId, commandId);
+ for (Long branchUuid : destBranches) {
+ contributionItem = createCommand(branchUuid, commandId);
if (command != null && command.isEnabled()) {
contributionItems.add(contributionItem);
@@ -94,11 +94,11 @@ public class MergeCompoundContributionItem extends CompoundContributionProvider
return contributionItems.toArray(new IContributionItem[0]);
}
- private CommandContributionItem createCommand(Long branchId, String commandId) throws OseeCoreException {
+ private CommandContributionItem createCommand(Long branchUuid, String commandId) throws OseeCoreException {
Map<String, String> parameters = new HashMap<String, String>();
- parameters.put(BranchView.BRANCH_ID, Long.toString(branchId));
+ parameters.put(BranchView.BRANCH_ID, Long.toString(branchUuid));
CommandContributionItem contributionItem;
- String label = branchId == 0 ? "Can't Merge a Root Branch" : BranchManager.getBranch(branchId).getName();
+ String label = branchUuid == 0 ? "Can't Merge a Root Branch" : BranchManager.getBranch(branchUuid).getName();
contributionItem =
new CommandContributionItem(new CommandContributionItemParameter(
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/BranchStateHealthCheck.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/BranchStateHealthCheck.java
index 7652637baf..b312741e34 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/BranchStateHealthCheck.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/BranchStateHealthCheck.java
@@ -173,14 +173,14 @@ public class BranchStateHealthCheck extends DatabaseHealthOperation {
try {
chStmt.runPreparedQuery("select * from osee_branch");
while (chStmt.next()) {
- long branchId = chStmt.getLong("branch_id");
+ long branchUuid = chStmt.getLong("branch_id");
int branchType = chStmt.getInt("branch_type");
int branchState = chStmt.getInt("branch_state");
boolean isArchived = chStmt.getInt("archived") == 1 ? true : false;
int numberOfTxs =
ConnectionHandler.runPreparedQueryFetchInt(0,
- "select count(1) from osee_tx_details where branch_id = ?", branchId);
- data.put(branchId, new BranchData(branchId, chStmt.getString("branch_name"),
+ "select count(1) from osee_tx_details where branch_id = ?", branchUuid);
+ data.put(branchUuid, new BranchData(branchUuid, chStmt.getString("branch_name"),
BranchType.valueOf(branchType), BranchState.getBranchState(branchState), isArchived, numberOfTxs));
}
} finally {
@@ -190,8 +190,8 @@ public class BranchStateHealthCheck extends DatabaseHealthOperation {
try {
chStmt.runPreparedQuery("select * from osee_merge");
while (chStmt.next()) {
- Integer branchId = chStmt.getInt("merge_branch_id");
- BranchData branchData = data.get(branchId);
+ Integer branchUuid = chStmt.getInt("merge_branch_id");
+ BranchData branchData = data.get(branchUuid);
branchData.setHasCommitTransactionId(chStmt.getInt("commit_transaction_id") != -1);
}
} finally {
@@ -200,7 +200,7 @@ public class BranchStateHealthCheck extends DatabaseHealthOperation {
return data.values();
}
private final class BranchData {
- private final long branchId;
+ private final long branchUuid;
private final String branchName;
private final BranchType branchType;
private final BranchState originalBranchState;
@@ -210,9 +210,9 @@ public class BranchStateHealthCheck extends DatabaseHealthOperation {
private String reasonForChange;
private boolean hasCommitTransactionId;
- private BranchData(long branchId, String branchName, BranchType branchType, BranchState branchState, boolean isArchived, int numberOfTxs) {
+ private BranchData(long branchUuid, String branchName, BranchType branchType, BranchState branchState, boolean isArchived, int numberOfTxs) {
super();
- this.branchId = branchId;
+ this.branchUuid = branchUuid;
this.branchName = branchName;
this.branchType = branchType;
this.branchState = branchState;
@@ -224,7 +224,7 @@ public class BranchStateHealthCheck extends DatabaseHealthOperation {
}
public long getId() {
- return branchId;
+ return branchUuid;
}
public String getBranchName() {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ItemsDeletedWithNoOtherModification.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ItemsDeletedWithNoOtherModification.java
index 8423b22c70..9ac14f84ce 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ItemsDeletedWithNoOtherModification.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ItemsDeletedWithNoOtherModification.java
@@ -37,13 +37,13 @@ public class ItemsDeletedWithNoOtherModification extends DatabaseHealthOperation
public int attributeId;
public int gammaId;
public int transactionId;
- public long branchId;
+ public long branchUuid;
- public LocalValues(int artId, int attributeId, long branchId, int gammaId, int relLinkId, int transactionId) {
+ public LocalValues(int artId, int attributeId, long branchUuid, int gammaId, int relLinkId, int transactionId) {
super();
this.artId = artId;
this.attributeId = attributeId;
- this.branchId = branchId;
+ this.branchUuid = branchUuid;
this.gammaId = gammaId;
this.relLinkId = relLinkId;
this.transactionId = transactionId;
@@ -161,7 +161,7 @@ public class ItemsDeletedWithNoOtherModification extends DatabaseHealthOperation
sbFull.append(AHTML.addRowMultiColumnTable(new String[] {
String.valueOf(value.gammaId),
String.valueOf(value.transactionId),
- String.valueOf(value.branchId),
+ String.valueOf(value.branchUuid),
String.valueOf(value.artId),
String.valueOf(value.attributeId),
String.valueOf(value.relLinkId)}));
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/LocalRelationLink.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/LocalRelationLink.java
index b10e3301b1..e0ea0f1fca 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/LocalRelationLink.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/LocalRelationLink.java
@@ -12,12 +12,12 @@ package org.eclipse.osee.framework.ui.skynet.dbHealth;
public class LocalRelationLink {
public int relLinkId, gammaId, relTransId, aArtId, bArtId, transIdForArtifactDeletion, commitTrans, modType;
- public long branchId;
+ public long branchUuid;
- public LocalRelationLink(int relLinkId, int gammaId, int transactionId, long branchId, int aArtId, int bArtId, int transIdForArtifactDeletion, int commitTrans, int modType) {
+ public LocalRelationLink(int relLinkId, int gammaId, int transactionId, long branchUuid, int aArtId, int bArtId, int transIdForArtifactDeletion, int commitTrans, int modType) {
this.aArtId = aArtId;
this.bArtId = bArtId;
- this.branchId = branchId;
+ this.branchUuid = branchUuid;
this.gammaId = gammaId;
this.relLinkId = relLinkId;
this.relTransId = transactionId;
@@ -28,7 +28,7 @@ public class LocalRelationLink {
@Override
public String toString() {
- return String.format("%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s", gammaId, relTransId, relLinkId, branchId, aArtId,
+ return String.format("%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s", gammaId, relTransId, relLinkId, branchUuid, aArtId,
bArtId, transIdForArtifactDeletion, commitTrans, modType);
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/LocalTxData.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/LocalTxData.java
index 713085ed93..a644e04372 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/LocalTxData.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/LocalTxData.java
@@ -15,12 +15,12 @@ package org.eclipse.osee.framework.ui.skynet.dbHealth;
*/
public class LocalTxData {
public int dataId;
- public int branchId;
+ public int branchUuid;
public int number;
- public LocalTxData(int dataId, int branchId, int number) {
+ public LocalTxData(int dataId, int branchUuid, int number) {
super();
- this.branchId = branchId;
+ this.branchUuid = branchUuid;
this.dataId = dataId;
this.number = number;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationIntegrityCheck.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationIntegrityCheck.java
index 0ef9293069..251245e056 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationIntegrityCheck.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationIntegrityCheck.java
@@ -205,7 +205,7 @@ public class RelationIntegrityCheck extends DatabaseHealthOperation {
commitOfNewRelationOnDeletedArtifactCases.add(new Object[] {
relLink.gammaId,
relLink.relTransId,
- relLink.branchId});
+ relLink.branchUuid});
newRelationOnDeletedArtifact.add(relLink);
} else {
unExpectedCases.add(relLink);
@@ -218,7 +218,7 @@ public class RelationIntegrityCheck extends DatabaseHealthOperation {
insertArtifactDeleted.add(new Object[] {
relLink.gammaId,
relLink.transIdForArtifactDeletion,
- relLink.branchId});
+ relLink.branchUuid});
}
}
@@ -241,7 +241,7 @@ public class RelationIntegrityCheck extends DatabaseHealthOperation {
private void deleteInvalidRelationAddressing() throws OseeCoreException {
List<Object[]> rowsToDelete = new LinkedList<Object[]>();
for (LocalRelationLink relLink : deleteMap.allValues()) {
- rowsToDelete.add(new Object[] {relLink.gammaId, relLink.relTransId, relLink.branchId});
+ rowsToDelete.add(new Object[] {relLink.gammaId, relLink.relTransId, relLink.branchUuid});
}
monitor.subTask("Deleting Relation Addressing with " + TxChange.DELETED + " Artifact");
@@ -294,7 +294,7 @@ public class RelationIntegrityCheck extends DatabaseHealthOperation {
Integer.toString(relLink.relLinkId),
Integer.toString(relLink.gammaId),
Integer.toString(relLink.relTransId),
- Long.toString(relLink.branchId),
+ Long.toString(relLink.branchUuid),
Integer.toString(relLink.aArtId),
Integer.toString(relLink.bArtId),
Integer.toString(relLink.transIdForArtifactDeletion)}));
@@ -317,7 +317,7 @@ public class RelationIntegrityCheck extends DatabaseHealthOperation {
int gamma_id = chStmt.getInt("gamma_id");
int transactionId = chStmt.getInt("transaction_id");
int relationId = chStmt.getInt("rel_link_id");
- long branchId = chStmt.getLong("branch_id");
+ long branchUuid = chStmt.getLong("branch_id");
int a_sideArtifactId = chStmt.getInt("a_art_id");
int b_sideArtifactId = chStmt.getInt("b_art_id");
int deletedTransaction = chStmt.getInt("deleted_tran");
@@ -328,7 +328,7 @@ public class RelationIntegrityCheck extends DatabaseHealthOperation {
if (!map.containsKey(gamma_id, transactionId) && (forDelete || !deleteMap.containsKey(gamma_id,
transactionId))) {
- map.put(gamma_id, transactionId, new LocalRelationLink(relationId, gamma_id, transactionId, branchId,
+ map.put(gamma_id, transactionId, new LocalRelationLink(relationId, gamma_id, transactionId, branchUuid,
a_sideArtifactId, b_sideArtifactId, deletedTransaction, commitTransId, modType));
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java
index 501fb69a55..0b697cddb0 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java
@@ -445,7 +445,7 @@ public class GroupExplorer extends GenericViewPart implements IArtifactEventList
}
private static final String INPUT = "input";
- private static final String BRANCH_ID = "branchId";
+ private static final String BRANCH_ID = "branchUuid";
@Override
public void saveState(IMemento memento) {
@@ -464,15 +464,15 @@ public class GroupExplorer extends GenericViewPart implements IArtifactEventList
public void init(IViewSite site, IMemento memento) throws PartInitException {
super.init(site, memento);
try {
- Long branchId = null;
+ Long branchUuid = null;
if (memento != null) {
memento = memento.getChild(INPUT);
if (memento != null) {
- branchId = Long.parseLong(memento.getString(BRANCH_ID));
- if (branchId != null) {
+ branchUuid = Long.parseLong(memento.getString(BRANCH_ID));
+ if (branchUuid != null) {
try {
- branch = BranchManager.getBranch(branchId);
+ branch = BranchManager.getBranch(branchUuid);
if (branch.getBranchState().isDeleted() || branch.getArchiveState().isArchived()) {
branch = null;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java
index 24930d9110..0b543ac06a 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java
@@ -166,7 +166,7 @@ public class BranchSelectSimpleComposite extends Composite implements Listener {
}
}
- public void restoreWidgetValues(String[] branchIds, String lastSelected) {
+ public void restoreWidgetValues(String[] branchUuids, String lastSelected) {
Branch currentBranch = getCurrentBranch();
// Add stored directories into selector
@@ -174,27 +174,27 @@ public class BranchSelectSimpleComposite extends Composite implements Listener {
lastSelected = Long.toString(currentBranch.getUuid());
}
- if (branchIds == null) {
+ if (branchUuids == null) {
if (Strings.isValid(lastSelected)) {
- branchIds = new String[] {lastSelected};
+ branchUuids = new String[] {lastSelected};
} else {
- branchIds = new String[0];
+ branchUuids = new String[0];
}
}
- List<String> branchIdsToUse = new ArrayList<String>();
- for (String id : branchIds) {
+ List<String> branchUuidsToUse = new ArrayList<String>();
+ for (String id : branchUuids) {
try {
Branch branch = BranchManager.getBranch(Long.parseLong(id));
if (branch != null) {
- branchIdsToUse.add(id);
+ branchUuidsToUse.add(id);
}
} catch (Exception ex) {
// Do nothing
}
}
- setCombo(branchIdsToUse.toArray(new String[branchIdsToUse.size()]), lastSelected);
+ setCombo(branchUuidsToUse.toArray(new String[branchUuidsToUse.size()]), lastSelected);
}
private void setCombo(String[] values, String lastSelected) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataUI.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataUI.java
index 00c741cc23..0f0ba632a5 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataUI.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataUI.java
@@ -30,11 +30,11 @@ import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulatio
public class XResultDataUI {
/*
- * Creates hyperlink using name. Default editor will open guid for branchId given
+ * Creates hyperlink using name. Default editor will open guid for branchUuid given
*/
- public static String getHyperlink(String name, String guid, long branchId) {
+ public static String getHyperlink(String name, String guid, long branchUuid) {
return AHTML.getHyperlink(
- XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.openArtifactBranch, guid + "(" + branchId + ")"),
+ XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.openArtifactBranch, guid + "(" + branchUuid + ")"),
name);
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java
index eb0625ec55..6a915367b3 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java
@@ -66,8 +66,8 @@ public class XResultBrowserListener implements LocationListener {
java.util.regex.Matcher m = Pattern.compile("^(.*?)\\((.*?)\\)$").matcher(value);
if (m.find()) {
String guid = m.group(1);
- Long branchId = Long.parseLong(m.group(2));
- Artifact artifact = ArtifactQuery.getArtifactFromId(guid, BranchManager.getBranch(branchId));
+ Long branchUuid = Long.parseLong(m.group(2));
+ Artifact artifact = ArtifactQuery.getArtifactFromId(guid, BranchManager.getBranch(branchUuid));
RendererManager.openInJob(artifact, PresentationType.DEFAULT_OPEN);
}
} catch (Exception ex) {
@@ -81,8 +81,8 @@ public class XResultBrowserListener implements LocationListener {
break;
case openBranch:
event.doit = false;
- long branchId = new Long(value);
- Branch branch = BranchManager.getBranch(branchId);
+ long branchUuid = new Long(value);
+ Branch branch = BranchManager.getBranch(branchUuid);
BranchView.revealBranch(branch);
break;
case browserInternal:
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java
index ad1a5241f7..8eaff4c376 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java
@@ -142,7 +142,7 @@ public final class SkyWalkerOptions {
public String toXml() throws OseeCoreException {
StringBuffer sb = new StringBuffer();
sb.append(AXml.addTagData("guid", artifact.getGuid()));
- sb.append(AXml.addTagData("branchId", artifact.getFullBranch().getUuid() + ""));
+ sb.append(AXml.addTagData("branchUuid", artifact.getFullBranch().getUuid() + ""));
sb.append(AXml.addTagData("artTypes",
org.eclipse.osee.framework.jdk.core.util.Collections.toString(",", getSelectedArtTypes())));
sb.append(AXml.addTagData("relTypes",
@@ -159,8 +159,8 @@ public final class SkyWalkerOptions {
try {
String guid = AXml.getTagData(xml, "guid");
if (Strings.isValid(guid)) {
- String branchId = AXml.getTagData(xml, "branchId");
- Branch branch = BranchManager.getBranch(Long.parseLong(branchId));
+ String branchUuid = AXml.getTagData(xml, "branchUuid");
+ Branch branch = BranchManager.getBranch(Long.parseLong(branchUuid));
Artifact art = ArtifactQuery.getArtifactFromId(guid, branch);
if (art != null) {
setArtifact(art);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java
index 5de566e194..e144bbf4a1 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java
@@ -70,7 +70,7 @@ public class SkyWalkerView extends GenericViewPart {
protected GraphViewer viewer;
private static final String INPUT_KEY = "input";
private static final String GUID_KEY = "guid";
- private static final String BRANCHID_KEY = "branchId";
+ private static final String BRANCHID_KEY = "branchUuid";
private String storedGuid;
private String storedBrandId;
private final SkyWalkerOptions options = new SkyWalkerOptions();
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchOptionsEnum.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchOptionsEnum.java
index 4cc2a4d0cf..5ca23c7d65 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchOptionsEnum.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchOptionsEnum.java
@@ -19,7 +19,7 @@ public enum BranchOptionsEnum {
SHOW_MERGE_BRANCHES("show_merge_branches"),
SHOW_TRANSACTIONS("show_transactions"),
SHOW_ARCHIVED_BRANCHES("show_archived_branches"),
- BRANCH_ID("branchId"),
+ BRANCH_ID("branchUuid"),
SHOW_WORKING_BRANCHES_ONLY("show_working_branches");
public String origKeyName;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java
index 0845b72835..3139bdbadb 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java
@@ -66,7 +66,7 @@ import org.osgi.service.prefs.Preferences;
*/
public class BranchView extends GenericViewPart implements IBranchEventListener, ITransactionEventListener, ITransactionRecordSelectionProvider, IPartListener {
public static final String VIEW_ID = "org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchView";
- public static final String BRANCH_ID = "branchId";
+ public static final String BRANCH_ID = "branchUuid";
private final Clipboard clipboard = new Clipboard(null);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewerFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewerFactory.java
index b139767b6c..db4d892c31 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewerFactory.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewerFactory.java
@@ -38,8 +38,6 @@ public class BranchXViewerFactory extends SkynetXViewerFactory {
"Associated Artifact", 100, SWT.LEFT, false, SortDataType.String, false, null);
public final static XViewerColumn branchUuid = new XViewerColumn("framework.branch.uuid", "Branch UUID", 200,
SWT.LEFT, false, SortDataType.String, false, null);
- public final static XViewerColumn branchId = new XViewerColumn("framework.branch.id", "Branch Uuid", 80, SWT.LEFT,
- false, SortDataType.Integer, false, null);
public final static XViewerColumn parentBranch = new XViewerColumn("framework.branch.parentBranch", "Parent Branch",
100, SWT.LEFT, false, SortDataType.String, false, null);
public final static XViewerColumn archivedState = new XViewerColumn("framework.branch.archived", "Archived State",
@@ -53,7 +51,7 @@ public class BranchXViewerFactory extends SkynetXViewerFactory {
public BranchXViewerFactory() {
super(NAMESPACE);
registerColumns(branchName, branchType, branchState, timeStamp, author, comment, associatedArtifact,
- parentBranch, branchId, branchUuid, archivedState, inheritAccessControl);
+ parentBranch, branchUuid, branchUuid, archivedState, inheritAccessControl);
}
@Override
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java
index 343683032d..2222f604ed 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java
@@ -136,7 +136,7 @@ public class XBranchLabelProvider extends XViewerLabelProvider {
return branch.getBranchState().name();
} else if (cCol.equals(BranchXViewerFactory.branchType)) {
return branch.getBranchType().name();
- } else if (cCol.equals(BranchXViewerFactory.branchId)) {
+ } else if (cCol.equals(BranchXViewerFactory.branchUuid)) {
return String.valueOf(branch.getUuid());
} else if (cCol.equals(BranchXViewerFactory.branchUuid)) {
return String.valueOf(branch.getUuid());
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java
index dfb364830a..30246fe7c8 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java
@@ -95,7 +95,7 @@ public class HistoryView extends GenericViewPart implements IBranchEventListener
public static final String VIEW_ID = "org.eclipse.osee.framework.ui.skynet.widgets.xHistory.HistoryView";
private static final String INPUT = "input";
private static final String ART_GUID = "artifactGuid";
- private static final String BRANCH_ID = "branchId";
+ private static final String BRANCH_ID = "branchUuid";
private XHistoryWidget xHistoryWidget;
private Artifact artifact;
@@ -331,10 +331,10 @@ public class HistoryView extends GenericViewPart implements IBranchEventListener
if (memento != null) {
if (SkynetViews.isSourceValid(memento)) {
String guid = memento.getString(ART_GUID);
- String branchIdStr = memento.getString(BRANCH_ID);
- if (Strings.isValid(branchIdStr)) {
- Long branchId = Long.valueOf(branchIdStr);
- Artifact artifact = ArtifactQuery.getArtifactFromId(guid, BranchManager.getBranchByUuid(branchId));
+ String branchUuidStr = memento.getString(BRANCH_ID);
+ if (Strings.isValid(branchUuidStr)) {
+ Long branchUuid = Long.valueOf(branchUuidStr);
+ Artifact artifact = ArtifactQuery.getArtifactFromId(guid, BranchManager.getBranchByUuid(branchUuid));
openViewUpon(artifact, false);
}
} else {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
index d9ae585cfe..b7c2b918b4 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java
@@ -692,14 +692,14 @@ public class MergeXWidget extends GenericXWidget {
if (conflicts.length != 0) {
if (conflicts[0].getSourceBranch() != null) {
ArrayList<String> selections = new ArrayList<String>();
- ArrayList<Long> branchIds = new ArrayList<Long>();
+ ArrayList<Long> branchUuids = new ArrayList<Long>();
try {
Collection<Long> destBranches =
ConflictManagerInternal.getDestinationBranchesMerged(sourceBranch.getUuid());
- for (Long branchId : destBranches) {
- if (branchId.intValue() != destBranch.getUuid()) {
- selections.add(BranchManager.getBranch(branchId).getName());
- branchIds.add(branchId);
+ for (Long branchUuid : destBranches) {
+ if (branchUuid.intValue() != destBranch.getUuid()) {
+ selections.add(BranchManager.getBranch(branchUuid).getName());
+ branchUuids.add(branchUuid);
}
}
if (selections.size() > 0) {
@@ -710,8 +710,8 @@ public class MergeXWidget extends GenericXWidget {
"Apply",
"Cancel"}, 1);
if (dialog.open() == 0) {
- System.out.print("Applying the merge found for Branch " + branchIds.toArray()[dialog.getSelection()]);
- applyPreviousMerge(branchIds.get(dialog.getSelection()));
+ System.out.print("Applying the merge found for Branch " + branchUuids.toArray()[dialog.getSelection()]);
+ applyPreviousMerge(branchUuids.get(dialog.getSelection()));
}
}
if (selections.isEmpty()) {
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/TxOrcsData.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/TxOrcsData.java
index 5757ad4d39..9380d1d15d 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/TxOrcsData.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/TxOrcsData.java
@@ -41,7 +41,7 @@ public interface TxOrcsData extends TransactionReadable {
void setAuthorId(int authorId);
- void setBranchId(long branchId);
+ void setBranchId(long branchUuid);
void setComment(String comment);
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/VersionData.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/VersionData.java
index fc0b9f224c..39d947d2e3 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/VersionData.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/VersionData.java
@@ -29,7 +29,7 @@ public interface VersionData extends Cloneable {
long getBranchId();
- void setBranchId(long branchId);
+ void setBranchId(long branchUuid);
boolean isInStorage();
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaTxGetHead.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaTxGetHead.java
index ffa2ecf4e6..a78b4314ac 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaTxGetHead.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaTxGetHead.java
@@ -17,20 +17,20 @@ import org.eclipse.osee.orcs.core.ds.Criteria;
*/
public class CriteriaTxGetHead extends Criteria {
- private final long branchId;
+ private final long branchUuid;
- public CriteriaTxGetHead(long branchId) {
+ public CriteriaTxGetHead(long branchUuid) {
super();
- this.branchId = branchId;
+ this.branchUuid = branchUuid;
}
public long getBranchid() {
- return branchId;
+ return branchUuid;
}
@Override
public String toString() {
- return "CriteriaTxGetHead [branchId=" + branchId + "]";
+ return "CriteriaTxGetHead [branchUuid=" + branchUuid + "]";
}
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchExportCommand.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchExportCommand.java
index 1754ca264f..b08f66323e 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchExportCommand.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchExportCommand.java
@@ -124,16 +124,16 @@ public final class BranchExportCommand implements ConsoleCommand {
branches.add(branch);
}
} else {
- for (String branchIdString : includeBranchIds) {
- branches.add(branchQuery.andUuids(Long.valueOf(branchIdString)).getResults().getExactlyOne());
+ for (String branchUuidString : includeBranchIds) {
+ branches.add(branchQuery.andUuids(Long.valueOf(branchUuidString)).getResults().getExactlyOne());
}
}
branchQuery = orcsApi.getQueryFactory(null).branchQuery();
if (!excludeBranchIds.isEmpty()) {
- for (String branchIdString : excludeBranchIds) {
+ for (String branchUuidString : excludeBranchIds) {
BranchReadable toExclude =
- branchQuery.andUuids(Long.valueOf(branchIdString)).getResults().getExactlyOne();
+ branchQuery.andUuids(Long.valueOf(branchUuidString)).getResults().getExactlyOne();
branches.remove(toExclude);
}
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchImportCommand.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchImportCommand.java
index 957164d5b7..5aecfd15a1 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchImportCommand.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchImportCommand.java
@@ -55,13 +55,13 @@ public final class BranchImportCommand implements ConsoleCommand {
@Override
public String getUsage() {
- return "uri=<EXCHANGE_FILE_LOCATION,...> [branchIds=<BRANCH_IDS,...>] [minTx=<TX_ID>] [maxTx=<TX_ID>] [excludeBaselineTxs=<TRUE|FALSE>] [allAsRootBranches=<TRUE|FALSE>] [clean=<TRUE|FALSE>]";
+ return "uri=<EXCHANGE_FILE_LOCATION,...> [branchUuids=<BRANCH_IDS,...>] [minTx=<TX_ID>] [maxTx=<TX_ID>] [excludeBaselineTxs=<TRUE|FALSE>] [allAsRootBranches=<TRUE|FALSE>] [clean=<TRUE|FALSE>]";
}
@Override
public Callable<?> createCallable(Console console, ConsoleParameters params) {
List<String> importFiles = Arrays.asList(params.getArray("uri"));
- List<String> branchIds = Arrays.asList(params.getArray("branchIds"));
+ List<String> branchUuids = Arrays.asList(params.getArray("branchUuids"));
PropertyStore options = new PropertyStore();
if (params.exists("minTx")) {
@@ -76,7 +76,7 @@ public final class BranchImportCommand implements ConsoleCommand {
OrcsBranch orcsBranch = getOrcsApi().getBranchOps(null);
return new ImportBranchDelegateCallable(console, orcsBranch, getOrcsApi().getQueryFactory(null).branchQuery(),
- options, importFiles, branchIds);
+ options, importFiles, branchUuids);
}
private static final class ImportBranchDelegateCallable extends CancellableCallable<Boolean> {
@@ -86,16 +86,16 @@ public final class BranchImportCommand implements ConsoleCommand {
private final BranchQuery branchQuery;
private final PropertyStore options;
private final List<String> importFiles;
- private final List<String> branchIds;
+ private final List<String> branchUuids;
- public ImportBranchDelegateCallable(Console console, OrcsBranch orcsBranch, BranchQuery branchQuery, PropertyStore options, List<String> importFiles, List<String> branchIds) {
+ public ImportBranchDelegateCallable(Console console, OrcsBranch orcsBranch, BranchQuery branchQuery, PropertyStore options, List<String> importFiles, List<String> branchUuids) {
super();
this.console = console;
this.orcsBranch = orcsBranch;
this.branchQuery = branchQuery;
this.options = options;
this.importFiles = importFiles;
- this.branchIds = branchIds;
+ this.branchUuids = branchUuids;
}
@Override
@@ -105,8 +105,8 @@ public final class BranchImportCommand implements ConsoleCommand {
}
List<IOseeBranch> branches = new LinkedList<IOseeBranch>();
- for (String branchIdString : branchIds) {
- IOseeBranch branch = branchQuery.andUuids(Long.valueOf(branchIdString)).getResults().getExactlyOne();
+ for (String branchUuidString : branchUuids) {
+ IOseeBranch branch = branchQuery.andUuids(Long.valueOf(branchUuidString)).getResults().getExactlyOne();
branches.add(branch);
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionCriteriaFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionCriteriaFactory.java
index 1064134bc3..8098f13271 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionCriteriaFactory.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionCriteriaFactory.java
@@ -88,8 +88,8 @@ public class TransactionCriteriaFactory {
return new CriteriaCommitIds(ids);
}
- public Criteria newGetHead(long branchId) {
- return new CriteriaTxGetHead(branchId);
+ public Criteria newGetHead(long branchUuid) {
+ return new CriteriaTxGetHead(branchUuid);
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionQueryImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionQueryImpl.java
index 79798396df..bda9c6f648 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionQueryImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionQueryImpl.java
@@ -260,8 +260,8 @@ public class TransactionQueryImpl implements TransactionQuery {
}
@Override
- public TransactionQuery andIsHead(long branchId) throws OseeCoreException {
- Criteria criteria = criteriaFactory.newGetHead(branchId);
+ public TransactionQuery andIsHead(long branchUuid) throws OseeCoreException {
+ Criteria criteria = criteriaFactory.newGetHead(branchUuid);
addAndCheck(queryData, criteria);
return this;
}
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/TxQuerySqlContextFactoryImplTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/TxQuerySqlContextFactoryImplTest.java
index 5faa6dba56..935c97d26e 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/TxQuerySqlContextFactoryImplTest.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/TxQuerySqlContextFactoryImplTest.java
@@ -61,7 +61,7 @@ public class TxQuerySqlContextFactoryImplTest {
private static final Criteria COMMENT = comment("SimpleTemplateProviderTask", false);
private static final Criteria TYPES = type(Arrays.asList(TransactionDetailsType.Baselined,
TransactionDetailsType.NonBaselined));
- private static final Criteria BRANCHIDS = branchIds(1L, 2L, 3L, 4L, 5L);
+ private static final Criteria BRANCHIDS = branchUuids(1L, 2L, 3L, 4L, 5L);
private static final Criteria IDS_WITH_OPERATOR = idWithOperator(Operator.LESS_THAN, 1);
private static final Criteria DATE_WITH_OPERATOR = dateWithOperator(Operator.LESS_THAN,
Timestamp.valueOf("2013-05-06 12:34:56"));
@@ -279,7 +279,7 @@ public class TxQuerySqlContextFactoryImplTest {
return new CriteriaTxType(types);
}
- private static Criteria branchIds(Long... ids) {
+ private static Criteria branchUuids(Long... ids) {
return new CriteriaTxBranchIds(Arrays.asList(ids));
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseTransactionRecordAccessor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseTransactionRecordAccessor.java
index 717ba3984b..f48b8e81dc 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseTransactionRecordAccessor.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseTransactionRecordAccessor.java
@@ -137,7 +137,7 @@ public class DatabaseTransactionRecordAccessor implements ITransactionDataAccess
chStmt.runPreparedQuery(expectedCount, query, parameters);
while (chStmt.next()) {
count++;
- long branchId = chStmt.getLong("branch_id");
+ long branchUuid = chStmt.getLong("branch_id");
int transactionNumber = chStmt.getInt("transaction_id");
String comment = chStmt.getString("osee_comment");
Date timestamp = chStmt.getTimestamp("time");
@@ -146,7 +146,7 @@ public class DatabaseTransactionRecordAccessor implements ITransactionDataAccess
TransactionDetailsType txType = TransactionDetailsType.toEnum(chStmt.getInt("tx_type"));
record =
- prepareTransactionRecord(cache, transactionNumber, branchId, comment, timestamp, authorArtId,
+ prepareTransactionRecord(cache, transactionNumber, branchUuid, comment, timestamp, authorArtId,
commitArtId, txType);
}
numberLoaded.setValue(count);
@@ -156,9 +156,9 @@ public class DatabaseTransactionRecordAccessor implements ITransactionDataAccess
return record;
}
- private TransactionRecord prepareTransactionRecord(TransactionCache cache, int transactionNumber, long branchId, String comment, Date timestamp, int authorArtId, int commitArtId, TransactionDetailsType txType) throws OseeCoreException {
+ private TransactionRecord prepareTransactionRecord(TransactionCache cache, int transactionNumber, long branchUuid, String comment, Date timestamp, int authorArtId, int commitArtId, TransactionDetailsType txType) throws OseeCoreException {
TransactionRecord record =
- factory.createOrUpdate(cache, transactionNumber, branchId, comment, timestamp, authorArtId, commitArtId,
+ factory.createOrUpdate(cache, transactionNumber, branchUuid, comment, timestamp, authorArtId, commitArtId,
txType, branchCache);
record.clearDirty();
return record;
@@ -170,9 +170,9 @@ public class DatabaseTransactionRecordAccessor implements ITransactionDataAccess
}
@Override
- public TransactionRecord getOrLoadPriorTransaction(TransactionCache cache, int transactionNumber, long branchId) throws OseeCoreException {
+ public TransactionRecord getOrLoadPriorTransaction(TransactionCache cache, int transactionNumber, long branchUuid) throws OseeCoreException {
int priorTransactionId =
- oseeDatabaseService.runPreparedQueryFetchObject(-1, GET_PRIOR_TRANSACTION, branchId, transactionNumber);
+ oseeDatabaseService.runPreparedQueryFetchObject(-1, GET_PRIOR_TRANSACTION, branchUuid, transactionNumber);
return cache.getOrLoad(priorTransactionId);
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/UpdatePreviousTxCurrent.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/UpdatePreviousTxCurrent.java
index 481d9ecd5a..83c05ebe81 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/UpdatePreviousTxCurrent.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/UpdatePreviousTxCurrent.java
@@ -42,15 +42,15 @@ public class UpdatePreviousTxCurrent {
// @formatter:on
private final IOseeDatabaseService dbService;
- private final long branchId;
+ private final long branchUuid;
private final OseeConnection connection;
private IdJoinQuery artifactJoin;
private IdJoinQuery attributeJoin;
private IdJoinQuery relationJoin;
- public UpdatePreviousTxCurrent(IOseeDatabaseService dbService, OseeConnection connection, long branchId) {
+ public UpdatePreviousTxCurrent(IOseeDatabaseService dbService, OseeConnection connection, long branchUuid) {
this.dbService = dbService;
- this.branchId = branchId;
+ this.branchUuid = branchUuid;
this.connection = connection;
}
@@ -95,9 +95,9 @@ public class UpdatePreviousTxCurrent {
List<Object[]> updateData = new ArrayList<Object[]>();
IOseeStatement chStmt = dbService.getStatement(connection);
try {
- chStmt.runPreparedQuery(MAX_FETCH, query, queryId, branchId, TxChange.NOT_CURRENT.getValue());
+ chStmt.runPreparedQuery(MAX_FETCH, query, queryId, branchUuid, TxChange.NOT_CURRENT.getValue());
while (chStmt.next()) {
- updateData.add(new Object[] {branchId, chStmt.getLong("gamma_id"), chStmt.getInt("transaction_id")});
+ updateData.add(new Object[] {branchUuid, chStmt.getLong("gamma_id"), chStmt.getInt("transaction_id")});
}
} finally {
chStmt.close();
@@ -110,10 +110,10 @@ public class UpdatePreviousTxCurrent {
List<Object[]> updateData = new ArrayList<Object[]>();
IOseeStatement chStmt = dbService.getStatement(connection);
try {
- chStmt.runPreparedQuery(MAX_FETCH, SELECT_TXS_AND_GAMMAS_FROM_TXS, branchId, transaction_id, branchId,
+ chStmt.runPreparedQuery(MAX_FETCH, SELECT_TXS_AND_GAMMAS_FROM_TXS, branchUuid, transaction_id, branchUuid,
transaction_id, TxChange.NOT_CURRENT.getValue());
while (chStmt.next()) {
- updateData.add(new Object[] {branchId, chStmt.getLong("gamma_id"), chStmt.getInt("transaction_id")});
+ updateData.add(new Object[] {branchUuid, chStmt.getLong("gamma_id"), chStmt.getInt("transaction_id")});
}
} finally {
chStmt.close();
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ConsolidateArtifactVersionDatabaseTxCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ConsolidateArtifactVersionDatabaseTxCallable.java
index 98aab7059a..e80ec476da 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ConsolidateArtifactVersionDatabaseTxCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ConsolidateArtifactVersionDatabaseTxCallable.java
@@ -118,17 +118,17 @@ public class ConsolidateArtifactVersionDatabaseTxCallable extends AbstractDatast
chStmt.runPreparedQuery(MAX_FETCH, FIND_ARTIFACT_MODS, artifactJoinQuery.getQueryId());
while (chStmt.next()) {
int artifactId = chStmt.getInt("art_id");
- long branchId = chStmt.getLong("branch_id");
+ long branchUuid = chStmt.getLong("branch_id");
- if (previousArtifactId != artifactId || previousBranchId != branchId) {
+ if (previousArtifactId != artifactId || previousBranchId != branchUuid) {
if (!mods.isEmpty()) {
consolidateMods(mods);
mods.clear();
}
previousArtifactId = artifactId;
- previousBranchId = branchId;
+ previousBranchId = branchUuid;
}
- mods.add(new Address(false, branchId, artifactId, chStmt.getInt("transaction_id"),
+ mods.add(new Address(false, branchUuid, artifactId, chStmt.getInt("transaction_id"),
chStmt.getInt("gamma_id"), ModificationType.getMod(chStmt.getInt("mod_type")),
TxChange.getChangeType(chStmt.getInt("tx_current"))));
}
@@ -272,12 +272,12 @@ public class ConsolidateArtifactVersionDatabaseTxCallable extends AbstractDatast
while (chStmt.next()) {
long obsoleteGammaId = chStmt.getLong("gamma_id");
int transactionId = chStmt.getInt("transaction_id");
- long branchId = chStmt.getLong("branch_id");
+ long branchUuid = chStmt.getLong("branch_id");
long netGammaId = chStmt.getLong("net_gamma_id");
ModificationType modType = ModificationType.getMod(chStmt.getInt("mod_type"));
TxChange.getChangeType(chStmt.getInt("tx_current"));
- if (isNextArtifactGroup(netGammaId, branchId)) {
+ if (isNextArtifactGroup(netGammaId, branchUuid)) {
writeAddressingChanges(archived, false);
if (modType == MODIFIED) {
addToUpdateAddresssing(NEW, netGammaId, modType, transactionId, obsoleteGammaId);
@@ -299,7 +299,7 @@ public class ConsolidateArtifactVersionDatabaseTxCallable extends AbstractDatast
}
previousNetGammaId = netGammaId;
- previousBranchId = branchId;
+ previousBranchId = branchUuid;
previuosTransactionId = transactionId;
}
} finally {
@@ -315,8 +315,8 @@ public class ConsolidateArtifactVersionDatabaseTxCallable extends AbstractDatast
}
}
- private boolean isNextArtifactGroup(long netGammaId, long branchId) {
- return previousNetGammaId != netGammaId || previousBranchId != branchId;
+ private boolean isNextArtifactGroup(long netGammaId, long branchUuid) {
+ return previousNetGammaId != netGammaId || previousBranchId != branchUuid;
}
private String prepareSql(String sql, boolean archived) {
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CreateBranchDatabaseTxCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CreateBranchDatabaseTxCallable.java
index 04f1544192..85dfd943cc 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CreateBranchDatabaseTxCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CreateBranchDatabaseTxCallable.java
@@ -306,7 +306,7 @@ public class CreateBranchDatabaseTxCallable extends AbstractDatastoreTxCallable<
}
private void copyAccessRules(OseeConnection connection, int userArtId, Branch parentBranch, Branch destinationBranch) {
- Long branchId = destinationBranch.getUuid();
+ Long branchUuid = destinationBranch.getUuid();
int owner = PermissionEnum.OWNER.getPermId();
int deny = PermissionEnum.DENY.getPermId();
@@ -320,7 +320,7 @@ public class CreateBranchDatabaseTxCallable extends AbstractDatastoreTxCallable<
if (priviledgeId == userArtId && permissionId < owner && permissionId != deny) {
permissionId = owner;
}
- data.add(new Object[] {permissionId, priviledgeId, branchId});
+ data.add(new Object[] {permissionId, priviledgeId, branchUuid});
}
} finally {
Lib.close(chStmt);
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ExportBranchDatabaseCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ExportBranchDatabaseCallable.java
index 39a357f077..ccee876c6b 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ExportBranchDatabaseCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ExportBranchDatabaseCallable.java
@@ -112,8 +112,8 @@ public class ExportBranchDatabaseCallable extends AbstractDatastoreCallable<URI>
ExportImportJoinQuery joinQuery = JoinUtility.createExportImportJoinQuery(getDatabaseService());
for (IOseeBranch branch : branches) {
- long branchId = branch.getUuid();
- joinQuery.add(branchId, -1L);
+ long branchUuid = branch.getUuid();
+ joinQuery.add(branchUuid, -1L);
}
joinQuery.store();
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeBranchDatabaseCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeBranchDatabaseCallable.java
index e428428df2..6be7810028 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeBranchDatabaseCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeBranchDatabaseCallable.java
@@ -58,18 +58,18 @@ public class PurgeBranchDatabaseCallable extends AbstractDatastoreTxCallable<Bra
branch.getBranchType());
}
- long branchId = branch.getUuid();
+ long branchUuid = branch.getUuid();
String sql = String.format("DELETE FROM %s WHERE branch_id = ?", sourceTableName);
- purgeFromTable(connection, sql, 0.20, branchId);
+ purgeFromTable(connection, sql, 0.20, branchUuid);
- purgeFromTable(connection, DELETE_FROM_TX_DETAILS, 0.09, branchId);
- purgeFromTable(connection, DELETE_FROM_CONFLICT, 0.01, branchId);
+ purgeFromTable(connection, DELETE_FROM_TX_DETAILS, 0.09, branchUuid);
+ purgeFromTable(connection, DELETE_FROM_CONFLICT, 0.01, branchUuid);
if (branch.hasParentBranch()) {
- purgeFromTable(connection, DELETE_FROM_MERGE, 0.01, branchId, branch.getParentBranch().getUuid());
+ purgeFromTable(connection, DELETE_FROM_MERGE, 0.01, branchUuid, branch.getParentBranch().getUuid());
}
- purgeFromTable(connection, DELETE_FROM_BRANCH_TABLE, 0.01, branchId);
+ purgeFromTable(connection, DELETE_FROM_BRANCH_TABLE, 0.01, branchUuid);
- purgeAccessControlTables(branchId);
+ purgeAccessControlTables(branchUuid);
branch.setStorageState(StorageState.PURGED);
branchCache.storeItems(branch);
@@ -79,10 +79,10 @@ public class PurgeBranchDatabaseCallable extends AbstractDatastoreTxCallable<Bra
return branch;
}
- private void purgeAccessControlTables(long branchId) throws OseeCoreException {
- getDatabaseService().runPreparedUpdate(DELETE_ARTIFACT_ACL_FROM_BRANCH, branchId);
+ private void purgeAccessControlTables(long branchUuid) throws OseeCoreException {
+ getDatabaseService().runPreparedUpdate(DELETE_ARTIFACT_ACL_FROM_BRANCH, branchUuid);
checkForCancelled();
- getDatabaseService().runPreparedUpdate(DELETE_BRANCH_ACL_FROM_BRANCH, branchId);
+ getDatabaseService().runPreparedUpdate(DELETE_BRANCH_ACL_FROM_BRANCH, branchUuid);
checkForCancelled();
}
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 02f2944378..4e16518ca2 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
@@ -141,12 +141,12 @@ public class PurgeTransactionTxCallable extends AbstractDatastoreTxCallable<Inte
String query = String.format(FIND_NEW_TX_CURRENTS, tableName, itemId);
for (Entry<Integer, IdJoinQuery> entry : affected.entrySet()) {
- Integer branchId = entry.getKey();
+ Integer branchUuid = entry.getKey();
IdJoinQuery joinQuery = entry.getValue();
try {
IOseeStatement statement = getDatabaseService().getStatement(connection);
try {
- statement.runPreparedQuery(MAX_FETCH, query, joinQuery.getQueryId(), branchId);
+ statement.runPreparedQuery(MAX_FETCH, query, joinQuery.getQueryId(), branchUuid);
int previousItem = -1;
while (statement.next()) {
int currentItem = statement.getInt("item_id");
@@ -156,7 +156,7 @@ public class PurgeTransactionTxCallable extends AbstractDatastoreTxCallable<Inte
TxChange txCurrent = TxChange.getCurrent(modType);
updateData.add(new Object[] {
txCurrent.getValue(),
- branchId,
+ branchUuid,
statement.getInt("transaction_id"),
statement.getLong("gamma_id")});
previousItem = currentItem;
@@ -177,11 +177,11 @@ public class PurgeTransactionTxCallable extends AbstractDatastoreTxCallable<Inte
try {
for (Object[] bindData : bindDataList) {
- Integer branchId = (Integer) bindData[0];
+ Integer branchUuid = (Integer) bindData[0];
String query = String.format(SELECT_AFFECTED_ITEMS, itemId, itemTable);
statement.runPreparedQuery(MAX_FETCH, query, bindData);
IdJoinQuery joinId = JoinUtility.createIdJoinQuery();
- items.put(branchId, joinId);
+ items.put(branchUuid, joinId);
while (statement.next()) {
Integer id = statement.getInt("item_id");
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/ExchangeDb.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/ExchangeDb.java
index 35f9bded43..7fe783b7c8 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/ExchangeDb.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/ExchangeDb.java
@@ -72,11 +72,11 @@ public final class ExchangeDb {
artIdAliases.addAll(Arrays.asList(ARTIFACT_ID_NEG_ONE_ALIASES));
ARTIFACT_ID_ALIASES = artIdAliases.toArray(new String[artIdAliases.size()]);
- Set<String> branchIdAliases = new HashSet<String>();
- branchIdAliases.add(BRANCH_ID);
- branchIdAliases.addAll(Arrays.asList(BRANCH_ID_REG_ALIASES));
- branchIdAliases.addAll(Arrays.asList(BRANCH_ID_NEG_ONE_ALIASES));
- BRANCH_ID_ALIASES = branchIdAliases.toArray(new String[branchIdAliases.size()]);
+ Set<String> branchUuidAliases = new HashSet<String>();
+ branchUuidAliases.add(BRANCH_ID);
+ branchUuidAliases.addAll(Arrays.asList(BRANCH_ID_REG_ALIASES));
+ branchUuidAliases.addAll(Arrays.asList(BRANCH_ID_NEG_ONE_ALIASES));
+ BRANCH_ID_ALIASES = branchUuidAliases.toArray(new String[branchUuidAliases.size()]);
Set<String> gammaIdAliases = new HashSet<String>();
gammaIdAliases.add(GAMMA_ID);
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/handler/BranchDataSaxHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/handler/BranchDataSaxHandler.java
index 21fbfe757b..9c33d97c70 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/handler/BranchDataSaxHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/handler/BranchDataSaxHandler.java
@@ -74,11 +74,11 @@ public class BranchDataSaxHandler extends BaseDbSaxHandler {
return toReturn;
}
- public boolean areAvailable(long... branchIds) {
+ public boolean areAvailable(long... branchUuids) {
boolean toReturn = false;
- if (branchIds != null && branchIds.length > 0) {
+ if (branchUuids != null && branchUuids.length > 0) {
Set<Long> toCheck = new HashSet<Long>();
- for (long entry : branchIds) {
+ for (long entry : branchUuids) {
toCheck.add(entry);
}
toReturn = this.idToImportFileBranchData.keySet().containsAll(toCheck);
@@ -93,8 +93,8 @@ public class BranchDataSaxHandler extends BaseDbSaxHandler {
private List<BranchData> getSelectedBranchesToImport(long... branchesToImport) {
List<BranchData> toReturn = new ArrayList<BranchData>();
if (branchesToImport != null && branchesToImport.length > 0) {
- for (long branchId : branchesToImport) {
- BranchData data = this.idToImportFileBranchData.get(branchId);
+ for (long branchUuid : branchesToImport) {
+ BranchData data = this.idToImportFileBranchData.get(branchUuid);
if (data != null) {
toReturn.add(data);
}
@@ -154,7 +154,7 @@ public class BranchDataSaxHandler extends BaseDbSaxHandler {
List<BranchData> branches = getSelectedBranchesToImport(branchesStored);
List<Object[]> data = new ArrayList<Object[]>();
for (BranchData branchData : branches) {
- int branchId = branchData.getId();
+ int branchUuid = branchData.getId();
int parentTransactionId = translateId(ExchangeDb.TRANSACTION_ID, branchData.getParentTransactionId());
if (parentTransactionId == 0) {
parentTransactionId = 1;
@@ -164,7 +164,7 @@ public class BranchDataSaxHandler extends BaseDbSaxHandler {
if (baselineTransactionId == 0) {
baselineTransactionId = 1;
}
- data.add(new Object[] {parentTransactionId, baselineTransactionId, branchId});
+ data.add(new Object[] {parentTransactionId, baselineTransactionId, branchUuid});
}
if (!data.isEmpty()) {
String query =
@@ -195,10 +195,10 @@ public class BranchDataSaxHandler extends BaseDbSaxHandler {
chStmt.runPreparedQuery("select * from osee_branch");
while (chStmt.next()) {
String branchGuid = chStmt.getString(BranchData.BRANCH_GUID);
- Long branchId = chStmt.getLong(BranchData.BRANCH_ID);
+ Long branchUuid = chStmt.getLong(BranchData.BRANCH_ID);
BranchData branchData = guidToImportFileBranchData.get(branchGuid);
if (branchData != null) {
- getTranslator().checkIdMapping("branch_id", (long) branchData.getId(), branchId);
+ getTranslator().checkIdMapping("branch_id", (long) branchData.getId(), branchUuid);
// Remove from to store list so we don't store duplicate information
guidToImportFileBranchData.remove(branchGuid);
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/handler/DbTableSaxHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/handler/DbTableSaxHandler.java
index 7b33ee62fa..0f31cd036c 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/handler/DbTableSaxHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/handler/DbTableSaxHandler.java
@@ -68,11 +68,11 @@ public class DbTableSaxHandler extends BaseDbSaxHandler {
return identityService;
}
- public void setSelectedBranchIds(long... branchIds) {
- if (branchIds != null && branchIds.length > 0) {
+ public void setSelectedBranchIds(long... branchUuids) {
+ if (branchUuids != null && branchUuids.length > 0) {
this.branchesToImport.clear();
- for (long branchId : branchIds) {
- this.branchesToImport.add(branchId);
+ for (long branchUuid : branchUuids) {
+ this.branchesToImport.add(branchUuid);
}
}
}
@@ -110,9 +110,9 @@ public class DbTableSaxHandler extends BaseDbSaxHandler {
boolean process = true;
try {
if (!branchesToImport.isEmpty()) {
- String branchIdString = fieldMap.get(ExportImportXml.PART_OF_BRANCH);
- if (Strings.isValid(branchIdString)) {
- if (!branchesToImport.contains(new Integer(branchIdString))) {
+ String branchUuidString = fieldMap.get(ExportImportXml.PART_OF_BRANCH);
+ if (Strings.isValid(branchUuidString)) {
+ if (!branchesToImport.contains(new Integer(branchUuidString))) {
process = false;
}
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/transform/V0_9_2BranchTransformer.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/transform/V0_9_2BranchTransformer.java
index 3dcc821563..2c7188107d 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/transform/V0_9_2BranchTransformer.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/transform/V0_9_2BranchTransformer.java
@@ -29,8 +29,8 @@ public class V0_9_2BranchTransformer extends SaxTransformer {
public void startElementFound(String uri, String localName, String qName, Attributes attributes) throws XMLStreamException {
super.startElementFound(uri, localName, qName, attributes);
if (localName.equals("entry")) {
- Long branchId = Long.parseLong(attributes.getValue("branch_id"));
- Integer baselineTransactionId = branchToBaseTx.get(branchId);
+ Long branchUuid = Long.parseLong(attributes.getValue("branch_id"));
+ Integer baselineTransactionId = branchToBaseTx.get(branchUuid);
writer.writeAttribute("baseline_transaction_id", String.valueOf(baselineTransactionId));
}
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/transform/V0_9_2Transformer.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/transform/V0_9_2Transformer.java
index cc9b912542..a16a6936b9 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/transform/V0_9_2Transformer.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/transform/V0_9_2Transformer.java
@@ -60,10 +60,10 @@ public class V0_9_2Transformer implements IOseeExchangeVersionTransformer {
@Override
public Version applyTransform(ExchangeDataProcessor processor, OperationLogger logger) throws OseeCoreException {
- List<Long> branchIds = convertBranchTable(processor);
+ List<Long> branchUuids = convertBranchTable(processor);
Map<Long, Long> artifactGammaToNetGammaId = convertArtifactAndConflicts(processor);
- consolidateTxsAddressing(processor, ExportItem.OSEE_TXS_DATA, branchIds, artifactGammaToNetGammaId);
+ consolidateTxsAddressing(processor, ExportItem.OSEE_TXS_DATA, branchUuids, artifactGammaToNetGammaId);
HashCollection<String, String> tableToColumns = new HashCollection<String, String>();
tableToColumns.put("osee_artifact", "<column id=\"gamma_id\" type=\"NUMERIC\" />\n");
@@ -106,7 +106,7 @@ public class V0_9_2Transformer implements IOseeExchangeVersionTransformer {
return artifactGammaToNetGammaId;
}
- private void consolidateTxsAddressing(ExchangeDataProcessor processor, ExportItem exportItem, List<Long> branchIds, Map<Long, Long> artifactGammaToNetGammaId) throws OseeCoreException {
+ private void consolidateTxsAddressing(ExchangeDataProcessor processor, ExportItem exportItem, List<Long> branchUuids, Map<Long, Long> artifactGammaToNetGammaId) throws OseeCoreException {
File targetFile = processor.getDataProvider().getFile(exportItem);
File tempFile = new File(Lib.changeExtension(targetFile.getPath(), "temp"));
Writer fileWriter = null;
@@ -116,8 +116,8 @@ public class V0_9_2Transformer implements IOseeExchangeVersionTransformer {
fileWriter = processor.startTransform(targetFile, tempFile, transformer);
ExchangeUtil.readExchange(tempFile, transformer);
- for (long branchId : branchIds) {
- transformer.setBranchId(branchId);
+ for (long branchUuid : branchUuids) {
+ transformer.setBranchId(branchUuid);
ExchangeUtil.readExchange(tempFile, transformer);
for (Long gammaId : addressMap.keySet()) {
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/transform/V0_9_2TxDetailsHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/transform/V0_9_2TxDetailsHandler.java
index e5047ea248..1ef5119976 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/transform/V0_9_2TxDetailsHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/transform/V0_9_2TxDetailsHandler.java
@@ -36,9 +36,9 @@ public class V0_9_2TxDetailsHandler extends AbstractSaxHandler {
int txType = Integer.parseInt(attributes.getValue("tx_type"));
TransactionDetailsType detailsType = TransactionDetailsType.toEnum(txType);
if (detailsType.isBaseline()) {
- Long branchId = Long.parseLong(attributes.getValue("branch_id"));
+ Long branchUuid = Long.parseLong(attributes.getValue("branch_id"));
Integer baseTransaction = Integer.parseInt(attributes.getValue("transaction_id"));
- branchToBaseTx.put(branchId, baseTransaction);
+ branchToBaseTx.put(branchUuid, baseTransaction);
}
}
}
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 1a5f182668..139c7caa47 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
@@ -44,8 +44,8 @@ public class OrcsObjectFactoryImpl implements OrcsObjectFactory {
}
@Override
- public VersionData createVersion(long branchId, int txId, long gamma, boolean historical) {
- return createVersion(branchId, txId, gamma, historical, RelationalConstants.TRANSACTION_SENTINEL);
+ public VersionData createVersion(long branchUuid, int txId, long gamma, boolean historical) {
+ return createVersion(branchUuid, txId, gamma, historical, RelationalConstants.TRANSACTION_SENTINEL);
}
@Override
@@ -72,9 +72,9 @@ public class OrcsObjectFactoryImpl implements OrcsObjectFactory {
// @formatter:on
}
- private VersionData createVersion(long branchId, int txId, long gamma, boolean historical, int stripeId) {
+ private VersionData createVersion(long branchUuid, int txId, long gamma, boolean historical, int stripeId) {
VersionData version = new VersionDataImpl();
- version.setBranchId(branchId);
+ version.setBranchId(branchUuid);
version.setTransactionId(txId);
version.setGammaId(gamma);
version.setHistorical(historical);
@@ -201,13 +201,13 @@ public class OrcsObjectFactoryImpl implements OrcsObjectFactory {
}
@Override
- public TxOrcsData createTxData(int localId, TransactionDetailsType type, Date date, String comment, long branchId, int authorId, int commitId) {
+ public TxOrcsData createTxData(int localId, TransactionDetailsType type, Date date, String comment, long branchUuid, int authorId, int commitId) {
TxOrcsData data = new TransactionDataImpl();
data.setLocalId(localId);
data.setTxType(type);
data.setDate(date);
data.setComment(comment);
- data.setBranchId(branchId);
+ data.setBranchId(branchUuid);
data.setAuthorId(authorId);
data.setCommit(commitId);
return data;
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 79b9cb4d18..1a93af8771 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
@@ -21,7 +21,7 @@ import org.eclipse.osee.orcs.db.internal.sql.RelationalConstants;
public class TransactionDataImpl extends OrcsObjectImpl<Integer> implements TxOrcsData {
private int authorId = RelationalConstants.ART_ID_SENTINEL;
- private long branchId = RelationalConstants.BRANCH_SENTINEL;
+ private long branchUuid = RelationalConstants.BRANCH_SENTINEL;
private String comment = RelationalConstants.DEFAULT_COMMENT;
private int commitId = RelationalConstants.ART_ID_SENTINEL;
private TransactionDetailsType type = TransactionDetailsType.INVALID;
@@ -38,7 +38,7 @@ public class TransactionDataImpl extends OrcsObjectImpl<Integer> implements TxOr
@Override
public long getBranchId() {
- return branchId;
+ return branchUuid;
}
@Override
@@ -67,8 +67,8 @@ public class TransactionDataImpl extends OrcsObjectImpl<Integer> implements TxOr
}
@Override
- public void setBranchId(long branchId) {
- this.branchId = branchId;
+ public void setBranchId(long branchUuid) {
+ this.branchUuid = branchUuid;
}
@Override
@@ -93,7 +93,7 @@ public class TransactionDataImpl extends OrcsObjectImpl<Integer> implements TxOr
@Override
public String toString() {
- return "TransactionDataImpl [authorId=" + authorId + ", branchId=" + branchId + ", comment=" + comment + ", commitId=" + commitId + ", date=" + date + ", type=" + type + "]";
+ return "TransactionDataImpl [authorId=" + authorId + ", branchUuid=" + branchUuid + ", comment=" + comment + ", commitId=" + commitId + ", date=" + date + ", type=" + type + "]";
}
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/TransactionObjectFactory.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/TransactionObjectFactory.java
index 6afe1ab9c8..15affc25f6 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/TransactionObjectFactory.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/TransactionObjectFactory.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.orcs.core.ds.TxOrcsData;
*/
public interface TransactionObjectFactory extends OrcsDataFactory {
- TxOrcsData createTxData(int localId, TransactionDetailsType type, Date date, String comment, long branchId, int authorId, int commitId) throws OseeCoreException;
+ TxOrcsData createTxData(int localId, TransactionDetailsType type, Date date, String comment, long branchUuid, int authorId, int commitId) throws OseeCoreException;
TxOrcsData createCopy(TxOrcsData source) throws OseeCoreException;
}
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 89004c75d7..1b6a4e70b0 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
@@ -18,7 +18,7 @@ import org.eclipse.osee.orcs.db.internal.sql.RelationalConstants;
*/
public class VersionDataImpl implements VersionData {
- private Long branchId = RelationalConstants.BRANCH_SENTINEL;
+ private Long branchUuid = RelationalConstants.BRANCH_SENTINEL;
private int txId = RelationalConstants.TRANSACTION_SENTINEL;
private long gamma = RelationalConstants.GAMMA_SENTINEL;
private boolean historical = RelationalConstants.IS_HISTORICAL_DEFAULT;
@@ -60,12 +60,12 @@ public class VersionDataImpl implements VersionData {
@Override
public long getBranchId() {
- return branchId;
+ return branchUuid;
}
@Override
- public void setBranchId(long branchId) {
- this.branchId = branchId;
+ public void setBranchId(long branchUuid) {
+ this.branchUuid = branchUuid;
}
@Override
@@ -87,7 +87,7 @@ public class VersionDataImpl implements VersionData {
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + branchId.hashCode();
+ result = prime * result + branchUuid.hashCode();
result = prime * result + (int) (gamma ^ (gamma >>> 32));
result = prime * result + (historical ? 1231 : 1237);
result = prime * result + stripeId;
@@ -107,7 +107,7 @@ public class VersionDataImpl implements VersionData {
return false;
}
VersionDataImpl other = (VersionDataImpl) obj;
- if (branchId != other.branchId) {
+ if (branchUuid != other.branchUuid) {
return false;
}
if (gamma != other.gamma) {
@@ -127,7 +127,7 @@ public class VersionDataImpl implements VersionData {
@Override
public String toString() {
- return "Version [branchId=" + branchId + ", txId=" + txId + ", gamma=" + gamma + ", historical=" + historical + ", stripeId=" + stripeId + "]";
+ return "Version [branchUuid=" + branchUuid + ", txId=" + txId + ", gamma=" + gamma + ", historical=" + historical + ", stripeId=" + stripeId + "]";
}
@Override
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/VersionObjectFactory.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/VersionObjectFactory.java
index 6c3e637301..146d9e6923 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/VersionObjectFactory.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/VersionObjectFactory.java
@@ -20,7 +20,7 @@ public interface VersionObjectFactory extends OrcsDataFactory {
VersionData createDefaultVersionData();
- VersionData createVersion(long branchId, int txId, long gamma, boolean historical) throws OseeCoreException;
+ VersionData createVersion(long branchUuid, int txId, long gamma, boolean historical) throws OseeCoreException;
VersionData createCopy(VersionData other) throws OseeCoreException;
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/executors/ArtifactQueryContextLoadExecutor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/executors/ArtifactQueryContextLoadExecutor.java
index 980e0d0aa6..548b0029cc 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/executors/ArtifactQueryContextLoadExecutor.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/executors/ArtifactQueryContextLoadExecutor.java
@@ -78,8 +78,8 @@ public class ArtifactQueryContextLoadExecutor extends AbstractLoadExecutor {
while (chStmt.next()) {
checkCancelled(cancellation);
Integer artId = chStmt.getInt("art_id");
- Long branchId = chStmt.getLong("branch_id");
- artifactJoin.add(artId, branchId, transactionId);
+ Long branchUuid = chStmt.getLong("branch_id");
+ artifactJoin.add(artId, branchUuid, transactionId);
checkCancelled(cancellation);
}
} finally {
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/ArtifactLoadProcessor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/ArtifactLoadProcessor.java
index 894c488e57..16844dfdf7 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/ArtifactLoadProcessor.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/ArtifactLoadProcessor.java
@@ -33,10 +33,10 @@ public class ArtifactLoadProcessor extends LoadProcessor<ArtifactData, ArtifactO
ArtifactData toReturn = null;
int artifactId = chStmt.getInt("art_id");
- long branchId = chStmt.getLong("branch_id");
+ long branchUuid = chStmt.getLong("branch_id");
CreateConditions onCreate = asConditions(conditions);
- if (!onCreate.isSame(branchId, artifactId)) {
+ if (!onCreate.isSame(branchUuid, artifactId)) {
ModificationType modType = ModificationType.getMod(chStmt.getInt("mod_type"));
// assumption: SQL is returning unwanted deleted artifacts only in the historical case
@@ -45,7 +45,7 @@ public class ArtifactLoadProcessor extends LoadProcessor<ArtifactData, ArtifactO
long gamma = chStmt.getInt("gamma_id");
int txId = chStmt.getInt("transaction_id");
- VersionData version = factory.createVersion(branchId, txId, gamma, historical);
+ VersionData version = factory.createVersion(branchUuid, txId, gamma, historical);
if (historical) {
version.setStripeId(chStmt.getInt("stripe_transaction_id"));
@@ -55,7 +55,7 @@ public class ArtifactLoadProcessor extends LoadProcessor<ArtifactData, ArtifactO
String guid = chStmt.getString("guid");
toReturn = factory.createArtifactData(version, artifactId, typeId, modType, guid);
}
- onCreate.saveConditions(branchId, artifactId);
+ onCreate.saveConditions(branchUuid, artifactId);
}
return toReturn;
}
@@ -73,12 +73,12 @@ public class ArtifactLoadProcessor extends LoadProcessor<ArtifactData, ArtifactO
int previousArtId = -1;
long previousBranchId = -1;
- boolean isSame(long branchId, int artifactId) {
- return previousBranchId == branchId && previousArtId == artifactId;
+ boolean isSame(long branchUuid, int artifactId) {
+ return previousBranchId == branchUuid && previousArtId == artifactId;
}
- void saveConditions(long branchId, int artifactId) {
- previousBranchId = branchId;
+ void saveConditions(long branchUuid, int artifactId) {
+ previousBranchId = branchUuid;
previousArtId = artifactId;
}
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/AttributeLoadProcessor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/AttributeLoadProcessor.java
index 163e78cafd..917ea0fee6 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/AttributeLoadProcessor.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/AttributeLoadProcessor.java
@@ -36,7 +36,7 @@ public class AttributeLoadProcessor extends LoadProcessor<AttributeData, Attribu
protected AttributeData createData(Object conditions, AttributeObjectFactory factory, IOseeStatement chStmt, Options options) throws OseeCoreException {
AttributeData toReturn = null;
- long branchId = chStmt.getLong("branch_id");
+ long branchUuid = chStmt.getLong("branch_id");
int artId = chStmt.getInt("art_id");
int attrId = chStmt.getInt("attr_id");
long gammaId = chStmt.getInt("gamma_id");
@@ -45,12 +45,12 @@ public class AttributeLoadProcessor extends LoadProcessor<AttributeData, Attribu
boolean historical = OptionsUtil.isHistorical(options);
CreateConditions condition = asConditions(conditions);
- if (!condition.isSame(branchId, artId, attrId)) {
- condition.saveConditions(branchId, artId, attrId, gammaId, modType);
+ if (!condition.isSame(branchUuid, artId, attrId)) {
+ condition.saveConditions(branchUuid, artId, attrId, gammaId, modType);
int txId = chStmt.getInt("transaction_id");
- VersionData version = factory.createVersion(branchId, txId, gammaId, historical);
+ VersionData version = factory.createVersion(branchUuid, txId, gammaId, historical);
if (historical) {
version.setStripeId(chStmt.getInt("stripe_transaction_id"));
}
@@ -66,7 +66,7 @@ public class AttributeLoadProcessor extends LoadProcessor<AttributeData, Attribu
if (!historical) {
logger.warn(
"multiple attribute versions for attribute id [%d] artifact id[%d] branch[%d] previousGammaId[%s] currentGammaId[%s] previousModType[%s] currentModType[%s]",
- attrId, artId, branchId, condition.previousGammaId, gammaId, condition.previousModType, modType);
+ attrId, artId, branchUuid, condition.previousGammaId, gammaId, condition.previousModType, modType);
}
}
return toReturn;
@@ -88,12 +88,12 @@ public class AttributeLoadProcessor extends LoadProcessor<AttributeData, Attribu
long previousGammaId = -1;
ModificationType previousModType = null;
- boolean isSame(long branchId, int artifactId, int attrId) {
- return previousBranchId == branchId && previousArtId == artifactId && previousAttrId == attrId;
+ boolean isSame(long branchUuid, int artifactId, int attrId) {
+ return previousBranchId == branchUuid && previousArtId == artifactId && previousAttrId == attrId;
}
- void saveConditions(long branchId, int artifactId, int attrId, long gammaId, ModificationType modType) {
- previousBranchId = branchId;
+ void saveConditions(long branchUuid, int artifactId, int attrId, long gammaId, ModificationType modType) {
+ previousBranchId = branchUuid;
previousArtId = artifactId;
previousAttrId = attrId;
previousGammaId = gammaId;
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/BranchLoadProcessor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/BranchLoadProcessor.java
index 91bf5f996d..b4534eac9b 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/BranchLoadProcessor.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/BranchLoadProcessor.java
@@ -30,7 +30,7 @@ public class BranchLoadProcessor extends LoadProcessor<BranchData, BranchObjectF
@Override
protected BranchData createData(Object conditions, BranchObjectFactory factory, IOseeStatement chStmt, Options options) throws OseeCoreException {
- long branchId = chStmt.getLong("branch_id");
+ long branchUuid = chStmt.getLong("branch_id");
String branchName = chStmt.getString("branch_name");
BranchState branchState = BranchState.getBranchState(chStmt.getInt("branch_state"));
@@ -42,7 +42,7 @@ public class BranchLoadProcessor extends LoadProcessor<BranchData, BranchObjectF
int baseTx = chStmt.getInt("baseline_transaction_id");
int assocArtId = chStmt.getInt("associated_art_id");
- return factory.createBranchData(branchId, branchType, branchName, parentBranchId, baseTx, sourceTx, archiveState,
+ return factory.createBranchData(branchUuid, branchType, branchName, parentBranchId, baseTx, sourceTx, archiveState,
branchState, assocArtId);
}
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/RelationLoadProcessor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/RelationLoadProcessor.java
index f14e3ad3c6..692d4d05d9 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/RelationLoadProcessor.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/RelationLoadProcessor.java
@@ -36,7 +36,7 @@ public class RelationLoadProcessor extends LoadProcessor<RelationData, RelationO
protected RelationData createData(Object conditions, RelationObjectFactory factory, IOseeStatement chStmt, Options options) throws OseeCoreException {
RelationData toReturn = null;
- long branchId = chStmt.getLong("branch_id");
+ long branchUuid = chStmt.getLong("branch_id");
int aArtId = chStmt.getInt("a_art_id");
int bArtId = chStmt.getInt("b_art_id");
long typeId = chStmt.getLong("rel_link_type_id");
@@ -45,12 +45,12 @@ public class RelationLoadProcessor extends LoadProcessor<RelationData, RelationO
boolean historical = OptionsUtil.isHistorical(options);
CreateConditions condition = asConditions(conditions);
- if (!condition.isSame(branchId, aArtId, bArtId, typeId)) {
- condition.saveConditions(branchId, aArtId, bArtId, typeId, gammaId);
+ if (!condition.isSame(branchUuid, aArtId, bArtId, typeId)) {
+ condition.saveConditions(branchUuid, aArtId, bArtId, typeId, gammaId);
int txId = chStmt.getInt("transaction_id");
- VersionData version = factory.createVersion(branchId, txId, gammaId, historical);
+ VersionData version = factory.createVersion(branchUuid, txId, gammaId, historical);
if (historical) {
version.setStripeId(chStmt.getInt("stripe_transaction_id"));
}
@@ -66,7 +66,7 @@ public class RelationLoadProcessor extends LoadProcessor<RelationData, RelationO
if (!historical) {
logger.warn(
"multiple relation versions for branch[%d] rel_type [%d] a_artId[%d] b_artId[%s] previousGammaId[%s] currentGammaId[%s]",
- branchId, typeId, aArtId, bArtId, condition.previousGammaId, gammaId);
+ branchUuid, typeId, aArtId, bArtId, condition.previousGammaId, gammaId);
}
}
return toReturn;
@@ -88,12 +88,12 @@ public class RelationLoadProcessor extends LoadProcessor<RelationData, RelationO
long previousTypeId = -1;
long previousGammaId = -1;
- boolean isSame(long branchId, int aArtId, int bArtId, long typeId) {
- return previousBranchId == branchId && previousArtIdA == aArtId && previousArtIdB == bArtId && previousTypeId == typeId;
+ boolean isSame(long branchUuid, int aArtId, int bArtId, long typeId) {
+ return previousBranchId == branchUuid && previousArtIdA == aArtId && previousArtIdB == bArtId && previousTypeId == typeId;
}
- void saveConditions(long branchId, int aArtId, int bArtId, long typeId, long gammaId) {
- previousBranchId = branchId;
+ void saveConditions(long branchUuid, int aArtId, int bArtId, long typeId, long gammaId) {
+ previousBranchId = branchUuid;
previousArtIdA = aArtId;
previousArtIdB = bArtId;
previousTypeId = typeId;
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/TransactionLoadProcessor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/TransactionLoadProcessor.java
index 305e32d15d..5317bc6d1d 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/TransactionLoadProcessor.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/TransactionLoadProcessor.java
@@ -29,13 +29,13 @@ public class TransactionLoadProcessor extends LoadProcessor<TxOrcsData, Transact
@Override
protected TxOrcsData createData(Object conditions, TransactionObjectFactory factory, IOseeStatement chStmt, Options options) throws OseeCoreException {
- long branchId = chStmt.getLong("branch_id");
+ long branchUuid = chStmt.getLong("branch_id");
int localId = chStmt.getInt("transaction_id");
TransactionDetailsType type = TransactionDetailsType.toEnum(chStmt.getInt("tx_type"));
String comment = chStmt.getString("osee_comment");
Date date = chStmt.getTimestamp("time");
int authorId = chStmt.getInt("author");
int commitId = chStmt.getInt("commit_art_id");
- return factory.createTxData(localId, type, date, comment, branchId, authorId, commitId);
+ return factory.createTxData(localId, type, date, comment, branchUuid, authorId, commitId);
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ArtifactQuerySqlWriter.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ArtifactQuerySqlWriter.java
index a7c5e2749b..00a5073b6a 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ArtifactQuerySqlWriter.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ArtifactQuerySqlWriter.java
@@ -30,11 +30,11 @@ import org.eclipse.osee.orcs.db.internal.sql.TableEnum;
*/
public class ArtifactQuerySqlWriter extends AbstractSqlWriter {
- private final long branchId;
+ private final long branchUuid;
- public ArtifactQuerySqlWriter(Log logger, IOseeDatabaseService dbService, SqlProvider sqlProvider, SqlContext context, QueryType queryType, long branchId) {
+ public ArtifactQuerySqlWriter(Log logger, IOseeDatabaseService dbService, SqlProvider sqlProvider, SqlContext context, QueryType queryType, long branchUuid) {
super(logger, dbService, sqlProvider, context, queryType);
- this.branchId = branchId;
+ this.branchUuid = branchUuid;
}
private void writeSelectHelper() throws OseeCoreException {
@@ -89,11 +89,11 @@ public class ArtifactQuerySqlWriter extends AbstractSqlWriter {
StringBuilder sb = new StringBuilder();
writeTxFilter(txsAlias, sb, allowDeleted);
- if (branchId > 0) {
+ if (branchUuid > 0) {
sb.append(" AND ");
sb.append(txsAlias);
sb.append(".branch_id = ?");
- addParameter(branchId);
+ addParameter(branchUuid);
} else {
throw new OseeArgumentException("getTxBranchFilter: branch uuid must be > 0");
}
@@ -104,11 +104,11 @@ public class ArtifactQuerySqlWriter extends AbstractSqlWriter {
public String getTxBranchFilter(String txsAlias, boolean allowDeleted) {
StringBuilder sb = new StringBuilder();
writeTxFilter(txsAlias, sb, allowDeleted);
- if (branchId > 0) {
+ if (branchUuid > 0) {
sb.append(" AND ");
sb.append(txsAlias);
sb.append(".branch_id = ?");
- addParameter(branchId);
+ addParameter(branchUuid);
}
return sb.toString();
}
@@ -150,11 +150,11 @@ public class ArtifactQuerySqlWriter extends AbstractSqlWriter {
sb.append(".transaction_id <= ?");
addParameter(OptionsUtil.getFromTransaction(getOptions()));
}
- if (branchId > 0) {
+ if (branchUuid > 0) {
sb.append(" AND ");
sb.append(txsAlias);
sb.append(".branch_id = ?");
- addParameter(branchId);
+ addParameter(branchUuid);
}
return sb.toString();
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/producer/IndexBranchesDatabaseCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/producer/IndexBranchesDatabaseCallable.java
index c2ab1f47bf..c13a455349 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/producer/IndexBranchesDatabaseCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/producer/IndexBranchesDatabaseCallable.java
@@ -82,15 +82,15 @@ public final class IndexBranchesDatabaseCallable extends AbstractDatastoreCallab
public Integer call() throws Exception {
getLogger().info(getParamInfo());
- Set<Long> branchIds = new HashSet<Long>();
+ Set<Long> branchUuids = new HashSet<Long>();
for (BranchReadable branch : branches) {
- branchIds.add((long) branch.getLocalId());
+ branchUuids.add((long) branch.getLocalId());
}
IdJoinQuery branchJoin = JoinUtility.createIdJoinQuery();
IdJoinQuery typeJoin = JoinUtility.createIdJoinQuery();
try {
- Triplet<String, String, Object[]> data = createQueries(branchIds, branchJoin, typeJoin);
+ Triplet<String, String, Object[]> data = createQueries(branchUuids, branchJoin, typeJoin);
String countQuery = data.getFirst();
String searchQuery = data.getSecond();
Object[] params = data.getThird();
@@ -114,7 +114,7 @@ public final class IndexBranchesDatabaseCallable extends AbstractDatastoreCallab
typeJoin.delete();
branchJoin.delete();
}
- return branchIds.size();
+ return branchUuids.size();
}
public void storeAndAddQueryId(TagQueueJoinQuery joinQuery) throws Exception {
@@ -158,11 +158,11 @@ public final class IndexBranchesDatabaseCallable extends AbstractDatastoreCallab
return builder.toString();
}
- private Triplet<String, String, Object[]> createQueries(Collection<Long> branchIds, IdJoinQuery branchJoin, IdJoinQuery typeJoin) {
+ private Triplet<String, String, Object[]> createQueries(Collection<Long> branchUuids, IdJoinQuery branchJoin, IdJoinQuery typeJoin) {
Object[] params;
String countQuery;
String searchQuery;
- if (branchIds.isEmpty()) {
+ if (branchUuids.isEmpty()) {
params = new Object[] {typeJoin.getQueryId()};
if (tagOnlyMissingGammas) {
countQuery = COUNT_MISSING;
@@ -172,7 +172,7 @@ public final class IndexBranchesDatabaseCallable extends AbstractDatastoreCallab
searchQuery = FIND_ALL_TAGGABLE_ATTRIBUTES;
}
} else {
- for (Long id : branchIds) {
+ for (Long id : branchUuids) {
branchJoin.add(id);
}
params = new Object[] {branchJoin.getQueryId(), typeJoin.getQueryId()};
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TransactionWriter.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TransactionWriter.java
index a829ad5066..2d75fdb242 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TransactionWriter.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TransactionWriter.java
@@ -124,10 +124,10 @@ public class TransactionWriter {
}
sqlBuilder.updateAfterBinaryStorePersist();
- long branchId = tx.getBranch().getUuid();
+ long branchUuid = tx.getBranch().getUuid();
List<Object[]> txNotCurrentData = new ArrayList<Object[]>();
for (Entry<SqlOrderEnum, ? extends AbstractJoinQuery> entry : sqlBuilder.getTxNotCurrents()) {
- fetchTxNotCurrent(connection, branchId, txNotCurrentData, entry.getKey().getTxsNotCurrentQuery(),
+ fetchTxNotCurrent(connection, branchUuid, txNotCurrentData, entry.getKey().getTxsNotCurrentQuery(),
entry.getValue());
}
@@ -145,14 +145,14 @@ public class TransactionWriter {
}
}
- private void fetchTxNotCurrent(OseeConnection connection, long branchId, List<Object[]> results, String query, AbstractJoinQuery join) throws OseeCoreException {
+ private void fetchTxNotCurrent(OseeConnection connection, long branchUuid, List<Object[]> results, String query, AbstractJoinQuery join) throws OseeCoreException {
try {
join.store();
IOseeStatement chStmt = dbService.getStatement(connection);
try {
- chStmt.runPreparedQuery(query, join.getQueryId(), branchId);
+ chStmt.runPreparedQuery(query, join.getQueryId(), branchUuid);
while (chStmt.next()) {
- results.add(new Object[] {branchId, chStmt.getInt("transaction_id"), chStmt.getLong("gamma_id")});
+ results.add(new Object[] {branchUuid, chStmt.getInt("transaction_id"), chStmt.getLong("gamma_id")});
}
} finally {
chStmt.close();
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/UnsubscribeTransaction.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/UnsubscribeTransaction.java
index f88e9bc65c..dbd8015e50 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/UnsubscribeTransaction.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/UnsubscribeTransaction.java
@@ -72,13 +72,13 @@ public final class UnsubscribeTransaction extends DatabaseTxCallable<String> {
return completionMethod;
}
- private boolean getRelationTxData(long branchId) throws OseeCoreException {
+ private boolean getRelationTxData(long branchUuid) throws OseeCoreException {
long relationTypeId = CoreRelationTypes.Users_Artifact.getGuid();
IOseeStatement chStmt = getDatabaseService().getStatement();
try {
chStmt.runPreparedQuery(1, SELECT_RELATION_LINK, getGroup().getLocalId(), getUser().getLocalId(),
- relationTypeId, branchId, TxChange.NOT_CURRENT.getValue());
+ relationTypeId, branchUuid, TxChange.NOT_CURRENT.getValue());
if (chStmt.next()) {
currentGammaId = chStmt.getInt("gamma_id");
relationId = chStmt.getInt("rel_link_id");
diff --git a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/branch/BranchQueryOptions.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/branch/BranchQueryOptions.java
index b476a0c661..d7eec7bf6d 100644
--- a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/branch/BranchQueryOptions.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/branch/BranchQueryOptions.java
@@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.enums.BranchType;
*/
public class BranchQueryOptions {
- private List<Long> branchIds;
+ private List<Long> branchUuids;
private List<BranchType> branchTypes;
private List<BranchState> branchStates;
private boolean includeDeleted;
@@ -30,11 +30,11 @@ public class BranchQueryOptions {
private Long isAncestorOf = -1L;
public List<Long> getBranchIds() {
- return branchIds;
+ return branchUuids;
}
- public void setBranchIds(List<Long> branchIds) {
- this.branchIds = branchIds;
+ public void setBranchIds(List<Long> branchUuids) {
+ this.branchUuids = branchUuids;
}
public List<BranchType> getBranchTypes() {
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/branch/BranchQueryResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/branch/BranchQueryResource.java
index 05960f9c1f..004e6ff818 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/branch/BranchQueryResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/branch/BranchQueryResource.java
@@ -69,7 +69,7 @@ public class BranchQueryResource {
/**
* Perform a branch query based on the input query parameters
*
- * @param branchIds comma separated list of branch uuids
+ * @param branchUuids comma separated list of branch uuids
* @param branchTypes comma separated list of {@link org.eclipse.osee.framework.core.enums.BranchType BranchType}
* @param branchStates comma separated list of {@link org.eclipse.osee.framework.core.enums.BranchState BranchState}
* @param deleted to include deleted branches in the search
@@ -82,14 +82,14 @@ public class BranchQueryResource {
@Path("")
@GET
@Produces(MediaType.APPLICATION_JSON)
- public Response searchBranchesFromQuery(@QueryParam("branchIds") String branchIds, @QueryParam("branchTypes") String branchTypes, @QueryParam("branchStates") String branchStates, @QueryParam("deleted") boolean deleted, @QueryParam("archived") boolean archived, @QueryParam("nameEquals") String nameEquals, @QueryParam("namePattern") String namePattern, @QueryParam("childOf") Long childOf, @QueryParam("ancestorOf") Long ancestorOf, @QueryParam("pretty") boolean pretty) {
+ public Response searchBranchesFromQuery(@QueryParam("branchUuids") String branchUuids, @QueryParam("branchTypes") String branchTypes, @QueryParam("branchStates") String branchStates, @QueryParam("deleted") boolean deleted, @QueryParam("archived") boolean archived, @QueryParam("nameEquals") String nameEquals, @QueryParam("namePattern") String namePattern, @QueryParam("childOf") Long childOf, @QueryParam("ancestorOf") Long ancestorOf, @QueryParam("pretty") boolean pretty) {
BranchQueryOptions options = new BranchQueryOptions();
- if (Strings.isValid(branchIds)) {
- List<Long> branchIdVals = new LinkedList<Long>();
- for (String branchId : branchIds.split(",")) {
- branchIdVals.add(Long.parseLong(branchId));
+ if (Strings.isValid(branchUuids)) {
+ List<Long> branchUuidVals = new LinkedList<Long>();
+ for (String branchUuid : branchUuids.split(",")) {
+ branchUuidVals.add(Long.parseLong(branchUuid));
}
- options.setBranchIds(branchIdVals);
+ options.setBranchIds(branchUuidVals);
}
if (Strings.isValid(branchTypes)) {
@@ -182,9 +182,9 @@ public class BranchQueryResource {
query.andIsOfType(branchTypes.toArray(new BranchType[branchTypes.size()]));
}
- List<Long> branchIds = options.getBranchIds();
- if (Conditions.hasValues(branchIds)) {
- query.andUuids(branchIds);
+ List<Long> branchUuids = options.getBranchIds();
+ if (Conditions.hasValues(branchUuids)) {
+ query.andUuids(branchUuids);
}
if (options.isIncludeArchived()) {
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTxQueryTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTxQueryTest.java
index 6eedb12f48..34e3c719fd 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTxQueryTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTxQueryTest.java
@@ -636,14 +636,14 @@ public class OrcsTxQueryTest {
//@formatter:on
}
- private static void assertTx(TransactionReadable actual, Integer localId, TransactionDetailsType type, String date, String comment, int branchId, int authorId, int commitId) {
+ private static void assertTx(TransactionReadable actual, Integer localId, TransactionDetailsType type, String date, String comment, int branchUuid, int authorId, int commitId) {
assertEquals(localId, actual.getLocalId());
assertEquals(type, actual.getTxType());
assertEquals(date, DATE_FORMATTER.format(actual.getDate()));
assertEquals(comment, actual.getComment());
assertEquals(authorId, actual.getAuthorId());
- assertEquals(branchId, actual.getBranchId());
+ assertEquals(branchUuid, actual.getBranchId());
assertEquals(commitId, actual.getCommit());
}
}
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/TransactionQuery.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/TransactionQuery.java
index 9dc594f521..e69108eb71 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/TransactionQuery.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/TransactionQuery.java
@@ -78,7 +78,7 @@ public interface TransactionQuery {
TransactionQuery andNullCommitId() throws OseeCoreException;
- TransactionQuery andIsHead(long branchId) throws OseeCoreException;
+ TransactionQuery andIsHead(long branchUuid) throws OseeCoreException;
TransactionQuery andIsHead(IOseeBranch branch) throws OseeCoreException;
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java
index e7f1243912..38527b8467 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java
@@ -108,9 +108,9 @@ public class BranchComboDialog extends TitleAreaDialog implements Listener {
protected void restoreWidgetValues() {
IDialogSettings settings = OteUiDefinePlugin.getInstance().getDialogSettings();
if (settings != null) {
- String[] branchIds = settings.getArray(TestRunStorageKey.BRANCH_IDS);
+ String[] branchUuids = settings.getArray(TestRunStorageKey.BRANCH_IDS);
String lastSelected = settings.get(TestRunStorageKey.SELECTED_BRANCH_ID);
- branchSelectComposite.restoreWidgetValues(branchIds, lastSelected);
+ branchSelectComposite.restoreWidgetValues(branchUuids, lastSelected);
}
}
@@ -118,9 +118,9 @@ public class BranchComboDialog extends TitleAreaDialog implements Listener {
IDialogSettings settings = OteUiDefinePlugin.getInstance().getDialogSettings();
if (settings != null) {
// update source names history
- String[] branchIds = settings.getArray(TestRunStorageKey.BRANCH_IDS);
- if (branchIds == null) {
- branchIds = new String[0];
+ String[] branchUuids = settings.getArray(TestRunStorageKey.BRANCH_IDS);
+ if (branchUuids == null) {
+ branchUuids = new String[0];
}
try {
@@ -128,16 +128,16 @@ public class BranchComboDialog extends TitleAreaDialog implements Listener {
if (branch != null && branch.hasParentBranch()) {
String lastBranchSelected = Long.toString(branch.getUuid());
- List<String> history = new ArrayList<String>(Arrays.asList(branchIds));
+ List<String> history = new ArrayList<String>(Arrays.asList(branchUuids));
history.remove(lastBranchSelected);
history.add(0, lastBranchSelected);
if (history.size() > COMBO_HISTORY_LENGTH) {
history.remove(COMBO_HISTORY_LENGTH);
}
- branchIds = new String[history.size()];
- history.toArray(branchIds);
+ branchUuids = new String[history.size()];
+ history.toArray(branchUuids);
- settings.put(TestRunStorageKey.BRANCH_IDS, branchIds);
+ settings.put(TestRunStorageKey.BRANCH_IDS, branchUuids);
settings.put(TestRunStorageKey.SELECTED_BRANCH_ID, lastBranchSelected);
try {
settings.save(this.getClass().getName());
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java
index bfa6ce8bcf..2bec3e0a2b 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java
@@ -298,18 +298,18 @@ public class OutfileImportPage extends WizardDataTransferPage {
IDialogSettings settings = getDialogSettings();
if (settings != null) {
// update source names history
- String[] branchIds = settings.getArray(TestRunStorageKey.BRANCH_IDS);
- if (branchIds == null) {
- branchIds = new String[0];
+ String[] branchUuids = settings.getArray(TestRunStorageKey.BRANCH_IDS);
+ if (branchUuids == null) {
+ branchUuids = new String[0];
}
IOseeBranch branch = branchSelect.getData();
try {
if (branch != null && BranchManager.getBranch(branch).hasParentBranch()) {
String lastBranchSelected = Long.toString(branch.getUuid());
- branchIds = addToHistory(branchIds, lastBranchSelected);
+ branchUuids = addToHistory(branchUuids, lastBranchSelected);
- settings.put(TestRunStorageKey.BRANCH_IDS, branchIds);
+ settings.put(TestRunStorageKey.BRANCH_IDS, branchUuids);
settings.put(TestRunStorageKey.SELECTED_BRANCH_ID, lastBranchSelected);
try {
settings.save(this.getClass().getName());
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/panels/GrayableBranchSelectionComposite.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/panels/GrayableBranchSelectionComposite.java
index 5f2922f4d0..5de27bbc0c 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/panels/GrayableBranchSelectionComposite.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/panels/GrayableBranchSelectionComposite.java
@@ -177,9 +177,9 @@ public class GrayableBranchSelectionComposite extends Composite implements IAcce
return branchSelectComposite.getBranchIds();
}
- public void restoreWidgetValues(boolean saveAsArtifact, String[] branchIds, String lastSelected) {
+ public void restoreWidgetValues(boolean saveAsArtifact, String[] branchUuids, String lastSelected) {
branchSelectEnabled.setSelection(saveAsArtifact && ClientSessionManager.isSessionValid());
- branchSelectComposite.restoreWidgetValues(branchIds, lastSelected);
+ branchSelectComposite.restoreWidgetValues(branchUuids, lastSelected);
}
private void setSelectable(final boolean isSelectable) {
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/views/TestRunArtifactOptions.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/views/TestRunArtifactOptions.java
index c7de659105..32820f56dd 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/views/TestRunArtifactOptions.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/views/TestRunArtifactOptions.java
@@ -37,9 +37,9 @@ public class TestRunArtifactOptions implements IPropertyStoreBasedControl {
public void load(IPropertyStore propertyStore) {
boolean widgetEnabled = propertyStore.getBoolean(TestRunStorageKey.STORAGE_ENABLED);
String lastBranchSelected = propertyStore.get(TestRunStorageKey.SELECTED_BRANCH_ID);
- String[] branchIds = propertyStore.getArray(TestRunStorageKey.BRANCH_IDS);
+ String[] branchUuids = propertyStore.getArray(TestRunStorageKey.BRANCH_IDS);
- this.panel.restoreWidgetValues(widgetEnabled, branchIds, lastBranchSelected);
+ this.panel.restoreWidgetValues(widgetEnabled, branchUuids, lastBranchSelected);
}
@Override
@@ -48,11 +48,11 @@ public class TestRunArtifactOptions implements IPropertyStoreBasedControl {
propertyStore.put(TestRunStorageKey.BRANCH_IDS, this.panel.getBranchIds());
Branch branch = this.panel.getSelectedBranch();
- long branchId = -1;
+ long branchUuid = -1;
if (branch != null) {
- branchId = branch.getUuid();
+ branchUuid = branch.getUuid();
}
- propertyStore.put(TestRunStorageKey.SELECTED_BRANCH_ID, branchId);
+ propertyStore.put(TestRunStorageKey.SELECTED_BRANCH_ID, branchUuid);
}
@Override

Back to the top