diff options
30 files changed, 86 insertions, 138 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/WorkingBranchGuidColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/WorkingBranchUuidColumn.java index 0e9413657bf..f5e8b5112e6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/WorkingBranchGuidColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/WorkingBranchUuidColumn.java @@ -15,16 +15,16 @@ import org.eclipse.osee.framework.core.model.Branch; /** * @author Donald G. Dunne */ -public class WorkingBranchGuidColumn extends AbstractBranchColumn { +public class WorkingBranchUuidColumn extends AbstractBranchColumn { - public static WorkingBranchGuidColumn instance = new WorkingBranchGuidColumn(); + public static WorkingBranchUuidColumn instance = new WorkingBranchUuidColumn(); - public static WorkingBranchGuidColumn getInstance() { + public static WorkingBranchUuidColumn getInstance() { return instance; } - private WorkingBranchGuidColumn() { - super(".workBranchGuid", "Working Branch Guid"); + private WorkingBranchUuidColumn() { + super(".workBranchUuid", "Working Branch Uuid"); } /** @@ -32,8 +32,8 @@ public class WorkingBranchGuidColumn extends AbstractBranchColumn { * XViewerValueColumn MUST extend this constructor so the correct sub-class is created */ @Override - public WorkingBranchGuidColumn copy() { - WorkingBranchGuidColumn newXCol = new WorkingBranchGuidColumn(); + public WorkingBranchUuidColumn copy() { + WorkingBranchUuidColumn newXCol = new WorkingBranchUuidColumn(); super.copy(this, newXCol); return newXCol; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java index 6bdb4be5981..0414d1d1704 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java @@ -792,32 +792,6 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { results.logTestTimeSpent(date, "testAtsBranchManager"); } - public static void validateBranchGuid(IAtsConfigObject name, String parentBranchGuid, ValidateResults results) { - Date date = new Date(); - try { - Branch branch = BranchManager.getBranchByGuid(parentBranchGuid); - if (branch.getArchiveState().isArchived()) { - results.log("validateBranchGuid", String.format( - "Error: [%s][%s][%s] has Parent Branch Id attribute set to Archived Branch [%s] named [%s]", - name.getName(), name.getGuid(), name, parentBranchGuid, branch)); - } else if (!branch.getBranchType().isBaselineBranch()) { - results.log( - "validateBranchGuid", - String.format( - "Error: [%s][%s][%s] has Parent Branch Id attribute [%s][%s] that is a [%s] branch; should be a BASELINE branch", - name.getName(), name.getGuid(), name, branch.getBranchType().name(), parentBranchGuid, branch)); - } - } catch (BranchDoesNotExist ex) { - results.log("validateBranchGuid", String.format( - "Error: [%s][%s][%s] has Parent Branch Id attribute [%s] that references a non-existant", name.getName(), - name.getGuid(), name, parentBranchGuid)); - } catch (Exception ex) { - results.log("validateBranchGuid", - "Error: " + name.getName() + " [" + name.toStringWithId() + "] exception: " + ex.getLocalizedMessage()); - } - results.logTestTimeSpent(date, "validateBranchGuid"); - } - public static void validateBranchUuid(IAtsConfigObject name, long parentBranchUuid, ValidateResults results) { Date date = new Date(); try { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java index fcdc7568c01..0d439c5c8b0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java @@ -103,7 +103,7 @@ import org.eclipse.osee.ats.column.WeeklyBenefitHrsColumn; import org.eclipse.osee.ats.column.WorkDaysNeededColumn; import org.eclipse.osee.ats.column.WorkPackageColumn; import org.eclipse.osee.ats.column.WorkingBranchArchivedColumn; -import org.eclipse.osee.ats.column.WorkingBranchGuidColumn; +import org.eclipse.osee.ats.column.WorkingBranchUuidColumn; import org.eclipse.osee.ats.column.WorkingBranchStateColumn; import org.eclipse.osee.ats.column.WorkingBranchTypeColumn; import org.eclipse.osee.ats.column.ev.ActivityIdColumnUI; @@ -160,7 +160,7 @@ public class WorldXViewerFactory extends SkynetXViewerFactory { EstimatedCompletionDateColumn.getInstance(), ReleaseDateColumn.getInstance(), WorkPackageColumn.getInstance(), - WorkingBranchGuidColumn.getInstance(), + WorkingBranchUuidColumn.getInstance(), WorkingBranchArchivedColumn.getInstance(), WorkingBranchStateColumn.getInstance(), WorkingBranchTypeColumn.getInstance(), diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactTest.java index 847089a666c..87deb0ead50 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactTest.java @@ -113,15 +113,15 @@ public final class ArtifactTest { new DefaultBasicGuidArtifact(Lib.generateUuid(), CoreArtifactTypes.GeneralData.getGuid(), art.getGuid()); Assert.assertEquals(art.hashCode(), equalGuidArtType.hashCode()); - DefaultBasicGuidArtifact equalGuidArtTypeBranchGuid = + DefaultBasicGuidArtifact equalGuidArtTypeBranchUuid = new DefaultBasicGuidArtifact(BranchManager.getCommonBranch().getUuid(), CoreArtifactTypes.GeneralData.getGuid(), art.getGuid()); - Assert.assertEquals(art.hashCode(), equalGuidArtTypeBranchGuid.hashCode()); + Assert.assertEquals(art.hashCode(), equalGuidArtTypeBranchUuid.hashCode()); - DefaultBasicGuidArtifact equalArtTypeBranchGuidNotGuid = + DefaultBasicGuidArtifact equalArtTypeBranchUuidNotGuid = new DefaultBasicGuidArtifact(BranchManager.getCommonBranch().getUuid(), CoreArtifactTypes.GeneralData.getGuid(), GUID.create()); - Assert.assertNotSame(art.hashCode(), equalArtTypeBranchGuidNotGuid.hashCode()); + Assert.assertNotSame(art.hashCode(), equalArtTypeBranchUuidNotGuid.hashCode()); } @Test @@ -139,15 +139,15 @@ public final class ArtifactTest { new DefaultBasicGuidArtifact(Lib.generateUuid(), CoreArtifactTypes.GeneralData.getGuid(), art.getGuid()); Assert.assertNotSame(art, equalGuidArtType); - DefaultBasicGuidArtifact equalGuidArtTypeBranchGuid = + DefaultBasicGuidArtifact equalGuidArtTypeBranchUuid = new DefaultBasicGuidArtifact(BranchManager.getCommonBranch().getUuid(), CoreArtifactTypes.GeneralData.getGuid(), art.getGuid()); - Assert.assertEquals(art, equalGuidArtTypeBranchGuid); + Assert.assertEquals(art, equalGuidArtTypeBranchUuid); - DefaultBasicGuidArtifact equalArtTypeBranchGuidNotGuid = + DefaultBasicGuidArtifact equalArtTypeBranchUuidNotGuid = new DefaultBasicGuidArtifact(BranchManager.getCommonBranch().getUuid(), CoreArtifactTypes.GeneralData.getGuid(), GUID.create()); - Assert.assertNotSame(art, equalArtTypeBranchGuidNotGuid); + Assert.assertNotSame(art, equalArtTypeBranchUuidNotGuid); } } diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/FixEmbeddedLinksBlam.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/FixEmbeddedLinksBlam.java index c23caf80ca4..993a159c55f 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/FixEmbeddedLinksBlam.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/FixEmbeddedLinksBlam.java @@ -42,7 +42,7 @@ public class FixEmbeddedLinksBlam extends AbstractBlam { @Override public String getDescriptionUsage() { - return "For a given branch, locate all WholeWordContent attributes and replace branchGuids with that of the selected branch"; + return "For a given branch, locate all WholeWordContent attributes and replace branchUuids with that of the selected branch"; } @Override diff --git a/plugins/org.eclipse.osee.framework.branch.gantt/src/org/eclipse/osee/branch/gantt/views/BranchVisualizationView.java b/plugins/org.eclipse.osee.framework.branch.gantt/src/org/eclipse/osee/branch/gantt/views/BranchVisualizationView.java index 248762e7e8c..7cb92b40021 100644 --- a/plugins/org.eclipse.osee.framework.branch.gantt/src/org/eclipse/osee/branch/gantt/views/BranchVisualizationView.java +++ b/plugins/org.eclipse.osee.framework.branch.gantt/src/org/eclipse/osee/branch/gantt/views/BranchVisualizationView.java @@ -102,7 +102,7 @@ public class BranchVisualizationView extends ViewPart { IOseeBranch selectedBranch = xBranchSelectWidget.getData(); if (selectedBranch != null) { try { - UserManager.getUser().setSetting(BRANCH_KEY, selectedBranch.getGuid()); + UserManager.getUser().setSetting(BRANCH_KEY, selectedBranch.getUuid()); UserManager.getUser().persist("Store Branch Visualization Default Branch"); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); @@ -129,11 +129,16 @@ public class BranchVisualizationView extends ViewPart { private void loadLastSelectedBranch() { try { - String branchGuid = UserManager.getUser().getSetting(BRANCH_KEY); - if (Strings.isValid(branchGuid)) { - Branch branch = BranchManager.getBranchByGuid(branchGuid); - if (branch != null) { - xBranchSelectWidget.setSelection(branch); + String branchUuid = UserManager.getUser().getSetting(BRANCH_KEY); + if (Strings.isValid(branchUuid)) { + try { + Long uuid = Long.valueOf(branchUuid); + Branch branch = BranchManager.getBranchByUuid(uuid); + if (branch != null) { + xBranchSelectWidget.setSelection(branch); + } + } catch (Exception ex) { + // do nothing } } } catch (OseeCoreException ex) { diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockRequestFactory.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockRequestFactory.java index 4566a6902bc..295480cace9 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockRequestFactory.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockRequestFactory.java @@ -29,7 +29,6 @@ import org.eclipse.osee.framework.core.model.type.OseeEnumTypeFactory; import org.eclipse.osee.framework.core.model.type.RelationTypeFactory; import org.eclipse.osee.framework.core.services.IOseeModelFactoryService; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; -import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.jdk.core.util.Lib; public final class MockRequestFactory { @@ -81,7 +80,6 @@ public final class MockRequestFactory { int parentBranchId = index; int associatedArtifactId = index * 3; int sourceTransactionId = index * 7; - String branchGuid = GUID.create(); long branchUuid = Lib.generateUuid(); int authorId = index * 7; diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicUuidRelationReorder.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicUuidRelationReorder.java index d8c30ea8588..7defd831ea8 100644 --- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicUuidRelationReorder.java +++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicUuidRelationReorder.java @@ -48,7 +48,7 @@ public class DefaultBasicUuidRelationReorder implements IBasicRelationReorder { this.parentArt = artA; } - public void setBranchGuid(Long branchUuid) { + public void setBranchUuid(Long branchUuid) { this.branchUuid = branchUuid; } diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java index 45c7d9cbedc..4b24cac2006 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java @@ -71,8 +71,8 @@ public class ArtifactFileServlet extends UnsecuredOseeHttpServlet { Branch branch = null; if (artifactFileInfo.isBranchNameValid()) { branch = branchCache.getBySoleName(artifactFileInfo.getBranchName()); - } else if (artifactFileInfo.isBranchGuidValid()) { - branch = branchCache.getByGuid(artifactFileInfo.getBranchGuid()); + } else if (artifactFileInfo.isBranchUuidValid()) { + branch = branchCache.getByGuid(artifactFileInfo.getBranchUuid()); } Conditions.checkNotNull(branch, "branch", "Unable to determine branch"); uri = ArtifactUtil.getUri(artifactFileInfo.getGuid(), branch); diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpArtifactFileInfo.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpArtifactFileInfo.java index dc8bc33868d..9a5cf139278 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpArtifactFileInfo.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpArtifactFileInfo.java @@ -48,11 +48,11 @@ public class HttpArtifactFileInfo { return branchName; } - public Long getBranchGuid() { + public Long getBranchUuid() { return branchUuid; } - public boolean isBranchGuidValid() { + public boolean isBranchUuidValid() { return branchUuid != null && branchUuid > 0; } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java index da2b01470fb..963132ca63a 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java @@ -198,8 +198,6 @@ public class BranchManager { BranchState branchState = BranchState.getBranchState(chStmt.getInt("branch_state")); BranchType branchType = BranchType.valueOf(chStmt.getInt("branch_type")); BranchArchivedState archiveState = BranchArchivedState.valueOf(chStmt.getInt("archived")); - String branchGuid = chStmt.getString("branch_guid"); - long parentBranchId = chStmt.getLong("parent_branch_id"); int sourceTx = chStmt.getInt("parent_transaction_id"); int baseTx = chStmt.getInt("baseline_transaction_id"); @@ -551,8 +549,8 @@ public class BranchManager { private void initializeLastBranchValue() { try { - Long branchGuid = Long.valueOf(UserManager.getSetting(LAST_DEFAULT_BRANCH)); - lastBranch = getBranchByGuid(branchGuid); + Long branchUuid = Long.valueOf(UserManager.getSetting(LAST_DEFAULT_BRANCH)); + lastBranch = getBranchByUuid(branchUuid); } catch (Exception ex) { try { lastBranch = getDefaultInitialBranch(); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ErrorChange.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ErrorChange.java index 4d6c9e21a65..509ad9d7fdb 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ErrorChange.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ErrorChange.java @@ -26,8 +26,8 @@ public final class ErrorChange extends Change { super(branch, 0, artId, null, null, false, null, null); this.errorMessage = String.format("%s %s", ERROR_STRING, exception); this.name = - String.format("%s ArtID: %s BranchGuid: %s - %s", ERROR_STRING, getArtId(), - (branch == null ? null : branch.getGuid()), exception); + String.format("%s ArtID: %s BranchUuid: %s - %s", ERROR_STRING, getArtId(), + (branch == null ? null : branch.getUuid()), exception); } @Override diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/actions/CatchTrackedChanges.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/actions/CatchTrackedChanges.java index 6980ef3cec4..e1ec1dbed4f 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/actions/CatchTrackedChanges.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/commit/actions/CatchTrackedChanges.java @@ -83,7 +83,7 @@ public class CatchTrackedChanges implements CommitAction { } private String getArtifactErrorMessage(Artifact artifact) { - return String.format("Error validating: [(%s)(%s) - %s] on branchGuid:[%s]", artifact.getArtId(), - artifact.getGuid(), artifact.getName(), artifact.getBranch().getGuid()); + return String.format("Error validating: [(%s)(%s) - %s] on branchUuid:[%s]", artifact.getArtId(), + artifact.getGuid(), artifact.getName(), artifact.getBranch().getUuid()); } } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEvent.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEvent.java index e284623ce79..fee6300a041 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEvent.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEvent.java @@ -17,8 +17,8 @@ public class BranchEvent implements FrameworkEvent, HasNetworkSender { private BranchEventType eventType; private NetworkSender networkSender; - public BranchEvent(BranchEventType branchEventType, long branchGuid) { - this.branchUuid = branchGuid; + public BranchEvent(BranchEventType branchEventType, long branchUuid) { + this.branchUuid = branchUuid; this.eventType = branchEventType; } @@ -29,7 +29,7 @@ public class BranchEvent implements FrameworkEvent, HasNetworkSender { } /** - * Gets the value of the branchGuid property. + * Gets the value of the branchUuid property. * * @return possible object is {@link String } */ @@ -39,7 +39,7 @@ public class BranchEvent implements FrameworkEvent, HasNetworkSender { // TODO: add comment to describe purpose of destinationBranch /** - * Gets the value of the destinationBranchGuid property. + * Gets the value of the destinationBranchUuid property. * * @return possible object is {@link String } */ @@ -48,7 +48,7 @@ public class BranchEvent implements FrameworkEvent, HasNetworkSender { } /** - * Sets the value of the BranchGuid property. + * Sets the value of the BranchUuid property. * * @param value allowed object is {@link String } */ @@ -57,7 +57,7 @@ public class BranchEvent implements FrameworkEvent, HasNetworkSender { } /** - * Sets the value of the destinationBranchGuid property. + * Sets the value of the destinationBranchUuid property. * * @param value allowed object is {@link String } */ 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 b6564b35c66..d3600a7b9dc 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,14 +31,13 @@ public abstract class BaseArtifactLoopbackCmd implements IClientLoopbackCmd { @Override public void execute(final Map<String, String> parameters, final HttpResponse httpResponse) { - final String branchGuid = parameters.get("branchGuid"); final String branchId = parameters.get("branchId"); 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(branchGuid) || Strings.isValid(branchId); + boolean haveAValidBranchIdentifier = Strings.isValid(branchId); if (!Strings.isValid(guid) || !haveAValidBranchIdentifier) { httpResponse.outputStandardError(HttpURLConnection.HTTP_BAD_REQUEST, String.format("Unable to process [%s]", parameters)); @@ -52,11 +51,7 @@ public abstract class BaseArtifactLoopbackCmd implements IClientLoopbackCmd { branch = transactionId.getBranch(); artifact = ArtifactQuery.getHistoricalArtifactFromId(guid, transactionId, searchDeleted); } else { - if (Strings.isValid(branchGuid)) { - branch = BranchManager.getBranchByGuid(branchGuid); - } else { - branch = BranchManager.getBranch(Long.parseLong(branchId)); - } + branch = BranchManager.getBranch(Long.parseLong(branchId)); 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/ClientArtifactTypeAccessor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientArtifactTypeAccessor.java index bcc6e93a3f4..d7bb717c9ed 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientArtifactTypeAccessor.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientArtifactTypeAccessor.java @@ -91,10 +91,10 @@ public class ClientArtifactTypeAccessor extends AbstractClientDataAccessor<Long, for (Triplet<Long, Long, Long> entry : response.getAttributeTypes()) { ArtifactType key1 = cache.getByGuid(entry.getFirst()); - Long branchGuid = entry.getSecond(); - IOseeBranch branchToken = branchCache.getByGuid(branchGuid); + Long branchUuid = entry.getSecond(); + IOseeBranch branchToken = branchCache.getByGuid(branchUuid); if (branchToken == null) { - branchToken = TokenFactory.createBranch(branchGuid, String.valueOf(branchGuid)); + branchToken = TokenFactory.createBranch(branchUuid, String.valueOf(branchUuid)); } Collection<AttributeType> types = attrs.get(key1, branchToken); if (types == null) { diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchRemoteEventHandler.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchRemoteEventHandler.java index 78ed4a5bc79..dc8424f36ce 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchRemoteEventHandler.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchRemoteEventHandler.java @@ -42,10 +42,10 @@ public class BranchRemoteEventHandler implements EventHandlerRemote<RemoteBranch private void updateBranches(Sender sender, BranchEvent branchEvent) { BranchEventType eventType = branchEvent.getEventType(); - Long branchGuid = branchEvent.getBranchUuid(); + Long branchUuid = branchEvent.getBranchUuid(); try { - if (BranchManager.branchExists(branchGuid)) { - Branch branch = BranchManager.getBranchByGuid(branchGuid); + if (BranchManager.branchExists(branchUuid)) { + Branch branch = BranchManager.getBranchByUuid(branchUuid); if (eventType == Committed) { Artifact artifact = BranchManager.getAssociatedArtifact(branch); TransactionManager.clearCommitArtifactCacheForAssociatedArtifact(artifact); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java index 0b051498975..81314a04266 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java @@ -14,7 +14,6 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; -import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; @@ -31,13 +30,9 @@ public abstract class XTypeListViewer extends XListViewer { setSorter(new ViewerSorter()); } - public IOseeBranch resolveBranch(String branchGuid) { + public IOseeBranch resolveBranch(long branchUuid) { try { - if (GUID.isValid(branchGuid)) { - return BranchManager.getBranchByGuid(branchGuid); - } else if (branchGuid != null) { - return BranchManager.getBranch(branchGuid); - } + return BranchManager.getBranchByUuid(branchUuid); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/FrameworkXWidgetProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/FrameworkXWidgetProvider.java index 4b76a50b098..f90a3d951cb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/FrameworkXWidgetProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/FrameworkXWidgetProvider.java @@ -21,7 +21,6 @@ import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; -import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -376,9 +375,14 @@ public final class FrameworkXWidgetProvider { widget.setToolTip(xWidgetLayoutData.getToolTip()); try { - String branchGuid = xWidgetLayoutData.getDefaultValue(); - if (GUID.isValid(branchGuid)) { - widget.setSelection(BranchManager.getBranchByGuid(branchGuid)); + String branchUuid = xWidgetLayoutData.getDefaultValue(); + if (Strings.isValid(branchUuid)) { + try { + Long uuid = Long.valueOf(branchUuid); + widget.setSelection(BranchManager.getBranchByUuid(uuid)); + } catch (Exception ex) { + // do nothing + } } } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); 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 ee1a4c8013f..a02c6ddbbf4 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 @@ -36,7 +36,7 @@ public class BranchXViewerFactory extends SkynetXViewerFactory { true, SortDataType.String, false, null); public final static XViewerColumn associatedArtifact = new XViewerColumn("framework.branch.assocArt", "Associated Artifact", 100, SWT.LEFT, false, SortDataType.String, false, null); - public final static XViewerColumn branchGuid = new XViewerColumn("framework.branch.guid", "Branch GUID", 200, + 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 Id", 80, SWT.LEFT, false, SortDataType.Integer, false, null); @@ -50,7 +50,7 @@ public class BranchXViewerFactory extends SkynetXViewerFactory { public BranchXViewerFactory() { super(NAMESPACE); registerColumns(branchName, branchType, branchState, timeStamp, author, comment, associatedArtifact, - parentBranch, branchId, branchGuid, archivedState); + parentBranch, branchId, branchUuid, archivedState); } @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 6165d97dc1e..17cfcbc5eca 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 @@ -138,8 +138,8 @@ public class XBranchLabelProvider extends XViewerLabelProvider { return branch.getBranchType().name(); } else if (cCol.equals(BranchXViewerFactory.branchId)) { return String.valueOf(branch.getId()); - } else if (cCol.equals(BranchXViewerFactory.branchGuid)) { - return String.valueOf(branch.getGuid()); + } else if (cCol.equals(BranchXViewerFactory.branchUuid)) { + return String.valueOf(branch.getUuid()); } else if (cCol.equals(BranchXViewerFactory.parentBranch)) { try { return branch.hasParentBranch() ? branch.getParentBranch().getName() : "none"; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java index 54e5f7b4a24..217cc46c713 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java @@ -273,9 +273,9 @@ public class MergeView extends GenericViewPart implements IBranchEventListener, return Conditions.in(branchUuid, mergeBranch.getGuid()) || isApplicableSourceOrDestEvent(branchUuid); } - private boolean isApplicableSourceOrDestEvent(Long branchGuid) { - return Conditions.notNull(sourceBranch, destBranch) && Conditions.in(branchGuid, sourceBranch.getGuid(), - destBranch.getGuid()); + private boolean isApplicableSourceOrDestEvent(Long branchUuid) { + return Conditions.notNull(sourceBranch, destBranch) && Conditions.in(branchUuid, sourceBranch.getUuid(), + destBranch.getUuid()); } protected MergeBranch getMergeBranchForView() { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/CreateBranchCallable.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/CreateBranchCallable.java index 6f29e91295b..0beff4daebf 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/CreateBranchCallable.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/CreateBranchCallable.java @@ -33,7 +33,7 @@ public class CreateBranchCallable extends AbstractBranchCallable<BranchReadable> protected BranchReadable innerCall() throws Exception { Conditions.checkNotNull(branchData, "branchData"); - Conditions.checkNotNull(branchData.getGuid(), "branchGuid"); + Conditions.checkNotNull(branchData.getUuid(), "branchUuid"); Conditions.checkNotNull(branchData.getName(), "branchName"); Conditions.checkNotNull(branchData.getBranchType(), "branchType"); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/IndexerCommand.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/IndexerCommand.java index 7f87222bf6b..48dab9e3c71 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/IndexerCommand.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/IndexerCommand.java @@ -75,7 +75,7 @@ public class IndexerCommand implements ConsoleCommand { } cnt++; } - builder.append("> [branchGuids=<BRANCH_GUID,..>]\n"); + builder.append("> [branchUuids=<BRANCH_UUID,..>]\n"); builder.append("op=ITEM_IDS ids=<GAMMA_IDS,..> debug=<TRUE|FALSE>"); return builder.toString(); } diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseBranchAccessor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseBranchAccessor.java index 90cccd3c84d..539d07c4984 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseBranchAccessor.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseBranchAccessor.java @@ -115,15 +115,13 @@ public class DatabaseBranchAccessor implements IOseeDataAccessor<Long, Branch> { chStmt.runPreparedQuery(2000, SELECT_BRANCHES); while (chStmt.next()) { try { - long branchId = chStmt.getLong("branch_id"); - String branchName = chStmt.getString("branch_name"); BranchState branchState = BranchState.getBranchState(chStmt.getInt("branch_state")); BranchType branchType = BranchType.valueOf(chStmt.getInt("branch_type")); boolean isArchived = BranchArchivedState.valueOf(chStmt.getInt("archived")).isArchived(); - String branchGuid = chStmt.getString("branch_guid"); + long branchUuid = chStmt.getLong("branch_id"); Branch branch = - branchFactory.createOrUpdate(cache, branchId, branchName, branchType, branchState, isArchived, + branchFactory.createOrUpdate(cache, branchUuid, branchName, branchType, branchState, isArchived, StorageState.LOADED); Integer parentBranchId = chStmt.getInt("parent_branch_id"); diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/branch/CreateDatabaseBranch.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/branch/CreateDatabaseBranch.java index bcee7799bd5..c94de12a625 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/branch/CreateDatabaseBranch.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/branch/CreateDatabaseBranch.java @@ -22,7 +22,7 @@ public class CreateDatabaseBranch { private final BranchType branchType; private final int sourceTransactionId; - private final String branchGuid; + private final long branchUuid; private final int authorId; @@ -30,13 +30,13 @@ public class CreateDatabaseBranch { private final int mergeAddressingQueryId; private final int mergeDestinationBranchId; - public CreateDatabaseBranch(BranchType branchType, int sourceTransactionId, int parentBranchId, String branchGuid, String branchName, int associatedArtifactId, int authorId, String creationComment, int mergeAddressingQueryId, int mergeDestinationBranchId) { + public CreateDatabaseBranch(BranchType branchType, int sourceTransactionId, int parentBranchId, long branchUuid, String branchName, int associatedArtifactId, int authorId, String creationComment, int mergeAddressingQueryId, int mergeDestinationBranchId) { this.parentBranchId = parentBranchId; this.branchName = branchName; this.associatedArtifactId = associatedArtifactId; this.branchType = branchType; this.sourceTransactionId = sourceTransactionId; - this.branchGuid = branchGuid; + this.branchUuid = branchUuid; this.authorId = authorId; this.creationComment = creationComment; this.mergeAddressingQueryId = mergeAddressingQueryId; @@ -63,8 +63,8 @@ public class CreateDatabaseBranch { return sourceTransactionId; } - public String getBranchGuid() { - return branchGuid; + public long getBranchUuid() { + return branchUuid; } public int getAuthorId() { @@ -85,6 +85,6 @@ public class CreateDatabaseBranch { @Override public String toString() { - return "Branch [associatedArtifactId=" + associatedArtifactId + ", branchGuid=" + branchGuid + ", branchType=" + branchType + ", name=" + branchName + ", parentBranchId=" + parentBranchId + ", parentTransactionId=" + sourceTransactionId + "]"; + return "Branch [associatedArtifactId=" + associatedArtifactId + ", branchUuid=" + branchUuid + ", branchType=" + branchType + ", name=" + branchName + ", parentBranchId=" + parentBranchId + ", parentTransactionId=" + sourceTransactionId + "]"; } } diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ImportBranchDatabaseCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ImportBranchDatabaseCallable.java index b033932308c..fb434bef915 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ImportBranchDatabaseCallable.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ImportBranchDatabaseCallable.java @@ -19,14 +19,11 @@ import java.net.URL; import java.sql.Timestamp; import java.util.Collection; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.database.IOseeDatabaseService; -import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.database.core.OseeConnection; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -125,24 +122,8 @@ public class ImportBranchDatabaseCallable extends AbstractDatastoreCallable<URI> branchesToImport = new long[selectedBranches.size()]; int index = 0; - - if (!selectedBranches.isEmpty()) { - Map<String, Long> branchGuidToLocalId = new HashMap<String, Long>(); - IOseeStatement chStmt = getDatabaseService().getStatement(); - try { - chStmt.runPreparedQuery("select branch_guid, branch_id from osee_branch"); - while (chStmt.next()) { - String guid = chStmt.getString("branch_guid"); - Long localId = chStmt.getLong("branch_id"); - branchGuidToLocalId.put(guid, localId); - } - } finally { - chStmt.close(); - } - - for (IOseeBranch branch : selectedBranches) { - branchesToImport[index++] = branchGuidToLocalId.get(branch.getGuid()); - } + for (IOseeBranch branch : selectedBranches) { + branchesToImport[index++] = branch.getUuid(); } processImportFiles(branchesToImport, manifestHandler.getImportFiles()); 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 b2f1468d0c2..e0bba73926f 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 @@ -54,7 +54,7 @@ public class PurgeBranchDatabaseCallable extends AbstractDatastoreTxCallable<Bra if (branch.getStorageState() != StorageState.PURGED) { if (!branch.getAllChildBranches(false).isEmpty()) { throw new OseeArgumentException( - "Unable to purge a branch containing children: branchGuid[%s] branchType[%s]", branch.getGuid(), + "Unable to purge a branch containing children: branchUuid[%s] branchType[%s]", branch.getUuid(), branch.getBranchType()); } diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchGuidSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchUuidSqlHandler.java index 729c53fc00d..37fa988ef77 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchGuidSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchUuidSqlHandler.java @@ -22,7 +22,7 @@ import org.eclipse.osee.orcs.db.internal.sql.TableEnum; /** * @author Roberto E. Escobar */ -public class BranchGuidSqlHandler extends SqlHandler<CriteriaBranchUuids> { +public class BranchUuidSqlHandler extends SqlHandler<CriteriaBranchUuids> { private CriteriaBranchUuids criteria; diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/SqlHandlerFactoryUtil.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/SqlHandlerFactoryUtil.java index 88ff9624ec2..013c62c168a 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/SqlHandlerFactoryUtil.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/SqlHandlerFactoryUtil.java @@ -88,7 +88,7 @@ public final class SqlHandlerFactoryUtil { new HashMap<Class<? extends Criteria>, Class<? extends SqlHandler<?>>>(); handleMap.put(CriteriaBranchArchived.class, BranchArchivedSqlHandler.class); - handleMap.put(CriteriaBranchUuids.class, BranchGuidSqlHandler.class); + handleMap.put(CriteriaBranchUuids.class, BranchUuidSqlHandler.class); handleMap.put(CriteriaBranchIds.class, BranchIdsSqlHandler.class); handleMap.put(CriteriaBranchName.class, BranchNameSqlHandler.class); handleMap.put(CriteriaBranchState.class, BranchStateSqlHandler.class); |