Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2014-03-28 11:48:55 -0400
committerdonald.g.dunne2014-04-09 11:32:55 -0400
commit1f8e94e66234595711ccb229869d8ca2b4ed9489 (patch)
tree6febe577cd4f1d9a548d942e626695fd7214f6bf
parent568a307e7e6655ada9a1638e2cb76cb9f79699b7 (diff)
downloadorg.eclipse.osee-1f8e94e66234595711ccb229869d8ca2b4ed9489.tar.gz
org.eclipse.osee-1f8e94e66234595711ccb229869d8ca2b4ed9489.tar.xz
org.eclipse.osee-1f8e94e66234595711ccb229869d8ca2b4ed9489.zip
feature[ats_ATS19845]: Convert IOseeBranch to Identity-Long
-rw-r--r--plugins/org.eclipse.osee.app/src/org/eclipse/osee/app/OseeAppletPage.java4
-rw-r--r--plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoCISBuilds.java6
-rw-r--r--plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoSawBuilds.java6
-rw-r--r--plugins/org.eclipse.osee.ats.client.demo/support/OseeTypes_Demo.osee2
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java6
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java2
-rw-r--r--plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.ats.impl/OSGI-INF/osee.database.service.ref.xml5
-rw-r--r--plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/OseeDatabaseService.java30
-rw-r--r--plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/AtsDatabaseConversions.java3
-rw-r--r--plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/ConvertBaselineGuidToBaselineUuid.java20
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsBranchAccessManager.java14
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/WorkingBranchGuidColumn.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorBranchEventManager.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsBranchManagerUpdateListener.java2
-rw-r--r--plugins/org.eclipse.osee.client.demo/src/org/eclipse/osee/client/demo/DemoBranches.java12
-rw-r--r--plugins/org.eclipse.osee.client.demo/support/OseeTypes_ClientDemo.osee2
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactEventTest.java14
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchEventTest.java50
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/FrameworkEventToRemoteEventListenerTest.java4
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationCacheTest.java10
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationFilterUtilTest.java2
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/TestUtil.java5
-rw-r--r--plugins/org.eclipse.osee.coverage.demo/src/org/eclipse/osee/coverage/demo/CoverageBranches.java3
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageEventManager.java4
-rw-r--r--plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SRSTraceReportResource.java7
-rw-r--r--plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SRSTraceReportStreamingOutput.java4
-rw-r--r--plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/SearchPresenterImpl.java2
-rw-r--r--plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoProgram.java2
-rw-r--r--plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoProgramImpl.java13
-rw-r--r--plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java2
-rw-r--r--plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionTestUtil.java4
-rw-r--r--plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/internal/DispositionApiTest.java1
-rw-r--r--plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResourceTest.java6
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoFactoryImpl.java8
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java6
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/util/DispoFactory.java2
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/util/HtmlWriter.java12
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlCacheHandler.java4
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java2
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessEventListener.java2
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/BranchAccessObject.java19
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.edit/src/org/eclipse/osee/framework/core/dsl/oseeDsl/provider/XAttributeTypeRefItemProvider.java117
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java40
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeDslSegmentParserTest.java38
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreter.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeDslSegmentParser.java44
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/AbstractOseeDslProposalProvider.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/OseeDslParser.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g24
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.tokens2
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDslLexer.java12
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDslParser.java84
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui/src/org/eclipse/osee/framework/core/dsl/ui/contentassist/OseeDslProposalProvider.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/OseeDsl.ecore4
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/OseeDsl.genmodel4
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/OseeDsl.xtextbinbin12346 -> 12346 bytes
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/MatchField.java20
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/OseeDslPackage.java16
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/XAttributeTypeRef.java22
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/impl/OseeDslPackageImpl.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/impl/XAttributeTypeRefImpl.java46
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parseTreeConstruction/OseeDslParsetreeConstructor.java34
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g20
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.tokens2
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDslLexer.java12
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDslParser.java60
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/services/OseeDslGrammarAccess.java44
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/src/org/eclipse/osee/framework/core/dsl/OseeDsl.xtext4
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/TransactionCacheUpdateResponseTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockRequestFactory.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitResponseTranslatorTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionRecordTranslatorTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/AbstractBranchCacheMessage.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ArtifactTypeCacheUpdateResponse.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateResponse.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java28
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationRequest.java10
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchRow.java22
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/TranslationUtil.java41
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ArtifactTypeCacheUpdateResponseTranslator.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationRequestTranslator.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataTest.java14
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/BranchCacheTest.java15
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java9
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/ModelAsserts.java38
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/Branch.java10
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/BranchFactory.java17
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/MergeBranch.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/BranchCache.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IOseeBranch.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java21
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreBranches.java5
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Conditions.java8
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java2
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/DataServlet.java4
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java4
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java2
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/DefaultOseeArtifact.java12
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpArtifactFileInfo.java17
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java1
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventListenerRegistryTest.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java12
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java85
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/ArtifactReferenceAttribute.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BranchReferenceAttribute.java7
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/IdentityReferenceAttribute.java7
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java11
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEvent.java20
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEvent.java30
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CreateBranchHttpRequestOperation.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchArchivedStateHttpRequestOperation.java14
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchStateHttpRequestOperation.java14
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchTypeHttpRequestOperation.java14
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientArtifactTypeAccessor.java10
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientBranchAccessor.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactEventHandler.java3
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchEventHandler.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchRemoteEventHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RenderingUtilTest.java11
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerEventManager.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorEventManager.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java10
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/PromptChangeUtil.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java12
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java16
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/.project6
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactoryTest.java38
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchUtilBranchTest.java24
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/provider/DeletedBranchProviderTest.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/provider/MockBranchProvider.java19
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java15
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/testTypeModel.osee4
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/BranchData.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaBranchUuids.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaTxBranchUuids.java46
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaTxGetHead.java34
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactory.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchPurgeCommand.java24
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/IndexerCommand.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCallableQueryFactory.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCriteriaFactory.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchQueryImpl.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionCriteriaFactory.java12
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionQueryImpl.java12
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java18
-rw-r--r--plugins/org.eclipse.osee.orcs.db.mock/data/binary_data.zipbin296506 -> 296546 bytes
-rw-r--r--plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/BranchQuerySqlContextFactoryImplTest.java25
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/OrcsDataStoreImpl.java51
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseBranchAccessor.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/BranchCopyTxCallable.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CreateBranchDatabaseTxCallable.java9
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/InitializeDatastoreCallable.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/OrcsTypeLoaderCallable.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderFactoryImpl.java18
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/SqlObjectLoader.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchDataImpl.java26
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchObjectFactory.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java11
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/BranchLoadProcessor.java5
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/LoadProcessor.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchAncestorOfSqlHandler.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchChildOfSqlHandler.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchGuidSqlHandler.java9
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/SqlHandlerFactoryUtil.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxBranchUuidsSqlHandler.java95
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxGetHeadSqlHandler.java27
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/OseeSql.java1
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/RelationalConstants.java1
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/artifact/SearchParameters.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/artifact/SearchRequest.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactResource.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactSearchResource.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactsResource.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributeResource.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributesResource.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchResource.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchesResource.java5
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TxResource.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TxsResource.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/VersionResource.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/VersionsResource.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/ArtifactSearch.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/ArtifactSearch_V1.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java41
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java7
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/TestBranches.java6
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/CreateBranchData.java13
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/BranchQuery.java4
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/TransactionQuery.java2
-rw-r--r--plugins/org.eclipse.osee.template.engine/src/org/eclipse/osee/template/engine/IdentifiableLongOptionsRule.java35
-rw-r--r--plugins/org.eclipse.osee.template.engine/src/org/eclipse/osee/template/engine/OptionsRule.java4
-rw-r--r--plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java4
-rw-r--r--plugins/org.eclipse.osee.x.server.p2/demo/binary_data.zipbin312479 -> 312515 bytes
205 files changed, 1103 insertions, 1363 deletions
diff --git a/plugins/org.eclipse.osee.app/src/org/eclipse/osee/app/OseeAppletPage.java b/plugins/org.eclipse.osee.app/src/org/eclipse/osee/app/OseeAppletPage.java
index 4a9568d76b..a1e27fa22b 100644
--- a/plugins/org.eclipse.osee.app/src/org/eclipse/osee/app/OseeAppletPage.java
+++ b/plugins/org.eclipse.osee.app/src/org/eclipse/osee/app/OseeAppletPage.java
@@ -22,7 +22,7 @@ import org.eclipse.osee.framework.jdk.core.type.ResourceToken;
import org.eclipse.osee.orcs.data.BranchReadable;
import org.eclipse.osee.orcs.search.BranchQuery;
import org.eclipse.osee.template.engine.CompositeRule;
-import org.eclipse.osee.template.engine.IdentifiableOptionsRule;
+import org.eclipse.osee.template.engine.IdentifiableLongOptionsRule;
import org.eclipse.osee.template.engine.PageCreator;
import org.eclipse.osee.template.engine.PageFactory;
@@ -60,7 +60,7 @@ public class OseeAppletPage {
if (listId.equals("baselineBranches") || listId.equals("workingAndBaselineBranches")) {
if (!dataListsRule.ruleExists(listId)) {
Iterable<BranchReadable> options = getBranchOptions(query, listId);
- dataListsRule.addRule(new IdentifiableOptionsRule<BranchReadable>("", options, listId));
+ dataListsRule.addRule(new IdentifiableLongOptionsRule<BranchReadable>("", options, listId));
}
}
}
diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoCISBuilds.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoCISBuilds.java
index 2351b5e9e5..15fecbaa45 100644
--- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoCISBuilds.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoCISBuilds.java
@@ -17,9 +17,9 @@ import org.eclipse.osee.framework.core.data.TokenFactory;
* @author Donald G. Dunne
*/
public final class DemoCISBuilds {
- public static final IOseeBranch CIS_Bld_1 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvDDD", 4, "CIS_Bld_1");
- public static final IOseeBranch CIS_Bld_2 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvEEE", 1001, "CIS_Bld_2");
- public static final IOseeBranch CIS_Bld_3 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvFFF", 1002, "CIS_Bld_3");
+ public static final IOseeBranch CIS_Bld_1 = TokenFactory.createBranch(4, "CIS_Bld_1");
+ public static final IOseeBranch CIS_Bld_2 = TokenFactory.createBranch(1001, "CIS_Bld_2");
+ public static final IOseeBranch CIS_Bld_3 = TokenFactory.createBranch(1002, "CIS_Bld_3");
private DemoCISBuilds() {
// Constants
diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoSawBuilds.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoSawBuilds.java
index 660941da62..f02b2e50ba 100644
--- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoSawBuilds.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoSawBuilds.java
@@ -18,9 +18,9 @@ import org.eclipse.osee.framework.core.data.TokenFactory;
*/
public final class DemoSawBuilds {
- public static final IOseeBranch SAW_Bld_1 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvAAA", 3, "SAW_Bld_1");
- public static final IOseeBranch SAW_Bld_2 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvBBB", 5, "SAW_Bld_2");
- public static final IOseeBranch SAW_Bld_3 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvCCC", 2002, "SAW_Bld_3");
+ public static final IOseeBranch SAW_Bld_1 = TokenFactory.createBranch(3, "SAW_Bld_1");
+ public static final IOseeBranch SAW_Bld_2 = TokenFactory.createBranch(5, "SAW_Bld_2");
+ public static final IOseeBranch SAW_Bld_3 = TokenFactory.createBranch(2002, "SAW_Bld_3");
private DemoSawBuilds() {
// Constants
diff --git a/plugins/org.eclipse.osee.ats.client.demo/support/OseeTypes_Demo.osee b/plugins/org.eclipse.osee.ats.client.demo/support/OseeTypes_Demo.osee
index 09be696795..105b871ecd 100644
--- a/plugins/org.eclipse.osee.ats.client.demo/support/OseeTypes_Demo.osee
+++ b/plugins/org.eclipse.osee.ats.client.demo/support/OseeTypes_Demo.osee
@@ -44,7 +44,7 @@ artifactType "Demo Code Team Workflow" extends "Team Workflow" {
attribute "demo.code.DP Effectivity"
attribute "demo.code.SP Effectivity"
attribute "demo.code.WP Effectivity"
- attribute "Partition" branchGuid "AyH_f2sSKy3l07fIvAAA"
+ attribute "Partition" branchUuid 3
}
artifactType "Demo Req Team Workflow" extends "Team Workflow" {
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java
index 34ae9f2d31..fef998a59f 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java
@@ -72,10 +72,8 @@ import org.junit.Before;
*/
public class AtsBranchConfigurationTest {
- public static final IOseeBranch BRANCH_VIA_TEAM_DEFINITION = TokenFactory.createBranch("AyH_e6damwQgvDhKfAAA", 8881,
- "BranchViaTeamDef");
- public static final IOseeBranch BRANCH_VIA_VERSIONS = TokenFactory.createBranch("AyH_e6damwQgvDhKfBBB", 8882,
- "BranchViaVersions");
+ public static final IOseeBranch BRANCH_VIA_TEAM_DEFINITION = TokenFactory.createBranch(8881, "BranchViaTeamDef");
+ public static final IOseeBranch BRANCH_VIA_VERSIONS = TokenFactory.createBranch(8882, "BranchViaVersions");
private final boolean DEBUG = false;
private static Collection<String> appendToName(IOseeBranch branch, String... postFixes) {
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java
index ae01af63b7..1a11311823 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java
@@ -673,7 +673,7 @@ public class AtsBranchManagerCore {
@Override
public IStatus run(IProgressMonitor monitor) throws OseeCoreException {
teamArt.setWorkingBranchCreationInProgress(true);
- BranchManager.createWorkingBranch(parentTransactionId, branchName, null, teamArt);
+ BranchManager.createWorkingBranch(parentTransactionId, branchName, teamArt);
teamArt.setWorkingBranchCreationInProgress(false);
performPostBranchCreationTasks(teamArt);
return Status.OK_STATUS;
diff --git a/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF
index 6a8e515a7b..8e4a3714b1 100644
--- a/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF
@@ -43,6 +43,7 @@ Import-Package: com.google.inject,
org.eclipse.osee.framework.core.model,
org.eclipse.osee.framework.core.model.cache,
org.eclipse.osee.framework.core.util,
+ org.eclipse.osee.framework.database,
org.eclipse.osee.framework.jdk.core.type,
org.eclipse.osee.framework.jdk.core.util,
org.eclipse.osee.framework.logging,
diff --git a/plugins/org.eclipse.osee.ats.impl/OSGI-INF/osee.database.service.ref.xml b/plugins/org.eclipse.osee.ats.impl/OSGI-INF/osee.database.service.ref.xml
new file mode 100644
index 0000000000..560deaaa1e
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.impl/OSGI-INF/osee.database.service.ref.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osee.ats.impl.internal.OseeDatabaseService">
+ <implementation class="org.eclipse.osee.ats.impl.internal.OseeDatabaseService"/>
+ <reference bind="setDatabaseService" cardinality="1..1" interface="org.eclipse.osee.framework.database.IOseeDatabaseService" name="IOseeDatabaseService" policy="static"/>
+</scr:component>
diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/OseeDatabaseService.java b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/OseeDatabaseService.java
new file mode 100644
index 0000000000..7ca802ac5c
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/OseeDatabaseService.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.ats.impl.internal;
+
+import org.eclipse.osee.framework.database.IOseeDatabaseService;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class OseeDatabaseService {
+
+ private static IOseeDatabaseService dbService;
+
+ public static IOseeDatabaseService getDbService() {
+ return dbService;
+ }
+
+ public void setDatabaseService(IOseeDatabaseService dbService) {
+ OseeDatabaseService.dbService = dbService;
+ }
+
+}
diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/AtsDatabaseConversions.java b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/AtsDatabaseConversions.java
index 3ca56a6a52..f2bbcd12ad 100644
--- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/AtsDatabaseConversions.java
+++ b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/AtsDatabaseConversions.java
@@ -13,6 +13,7 @@ package org.eclipse.osee.ats.impl.internal.convert;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.osee.ats.api.util.IAtsDatabaseConversion;
+import org.eclipse.osee.ats.impl.internal.OseeDatabaseService;
import org.eclipse.osee.orcs.OrcsApi;
/**
@@ -24,7 +25,7 @@ public class AtsDatabaseConversions {
public static List<IAtsDatabaseConversion> getConversions(OrcsApi orcsApi) {
List<IAtsDatabaseConversion> conversions = new ArrayList<IAtsDatabaseConversion>();
- conversions.add(new ConvertBaselineGuidToBaselineUuid(orcsApi));
+ conversions.add(new ConvertBaselineGuidToBaselineUuid(OseeDatabaseService.getDbService(), orcsApi));
return conversions;
}
}
diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/ConvertBaselineGuidToBaselineUuid.java b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/ConvertBaselineGuidToBaselineUuid.java
index aa1f4267ab..30cd749e6c 100644
--- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/ConvertBaselineGuidToBaselineUuid.java
+++ b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/ConvertBaselineGuidToBaselineUuid.java
@@ -20,6 +20,8 @@ import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.SystemUser;
import org.eclipse.osee.framework.core.util.XResultData;
+import org.eclipse.osee.framework.database.IOseeDatabaseService;
+import org.eclipse.osee.framework.jdk.core.util.Conditions;
import org.eclipse.osee.orcs.OrcsApi;
import org.eclipse.osee.orcs.data.ArtifactReadable;
import org.eclipse.osee.orcs.data.BranchReadable;
@@ -37,8 +39,10 @@ public class ConvertBaselineGuidToBaselineUuid implements IAtsDatabaseConversion
// Leave this attribute definition and conversion for other OSEE sites to convert
public static final IAttributeType BaselineBranchGuid = TokenFactory.createAttributeType(0x10000000000000A9L,
"ats.Baseline Branch Guid");
+ private final IOseeDatabaseService dbService;
- public ConvertBaselineGuidToBaselineUuid(OrcsApi orcsApi) {
+ public ConvertBaselineGuidToBaselineUuid(IOseeDatabaseService dbService, OrcsApi orcsApi) {
+ this.dbService = dbService;
this.orcsApi = orcsApi;
}
@@ -62,7 +66,8 @@ public class ConvertBaselineGuidToBaselineUuid implements IAtsDatabaseConversion
for (String guid : attributeValues) {
BranchReadable branch = null;
try {
- branch = orcsApi.getQueryFactory(null).branchQuery().andUuids(guid).getResults().getExactlyOne();
+ branch =
+ orcsApi.getQueryFactory(null).branchQuery().andUuids(getBranchIdLegacy(guid)).getResults().getExactlyOne();
} catch (Exception ex) {
// do nothing
}
@@ -96,6 +101,17 @@ public class ConvertBaselineGuidToBaselineUuid implements IAtsDatabaseConversion
}
}
+ private final String SELECT_BRANCH_ID_BY_GUID = "select branch_id from osee_branch where branch_guid = ?";
+
+ /**
+ * Temporary method till all code uses branch uuid. Remove after 0.17.0
+ */
+ public long getBranchIdLegacy(String branchGuid) {
+ Long longId = dbService.runPreparedQueryFetchObject(0L, SELECT_BRANCH_ID_BY_GUID, branchGuid);
+ Conditions.checkExpressionFailOnTrue(longId <= 0, "Error getting branch_id for branch: [%s]", branchGuid);
+ return longId;
+ }
+
@Override
public String getDescription() {
StringBuffer data = new StringBuffer();
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsBranchAccessManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsBranchAccessManager.java
index c13daf6c08..5584071bbd 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsBranchAccessManager.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsBranchAccessManager.java
@@ -68,8 +68,8 @@ import org.eclipse.osee.framework.skynet.core.event.model.Sender;
public class AtsBranchAccessManager implements IArtifactEventListener, IAccessControlEventListener {
// Cache to store artifact guid to context id list so don't have to re-compute
- private final Map<String, Collection<IAccessContextId>> branchGuidToContextIdCache =
- new HashMap<String, Collection<IAccessContextId>>(50);
+ private final Map<Long, Collection<IAccessContextId>> branchUuidToContextIdCache =
+ new HashMap<Long, Collection<IAccessContextId>>(50);
private static final List<Long> atsConfigArtifactTypes = Arrays.asList(AtsArtifactTypes.ActionableItem.getGuid(),
AtsArtifactTypes.TeamDefinition.getGuid());
@@ -124,12 +124,12 @@ public class AtsBranchAccessManager implements IArtifactEventListener, IAccessCo
}
public Collection<IAccessContextId> getContextId(IOseeBranch branch) {
- if (branchGuidToContextIdCache.containsKey(branch.getGuid())) {
- return branchGuidToContextIdCache.get(branch.getGuid());
+ if (branchUuidToContextIdCache.containsKey(branch.getGuid())) {
+ return branchUuidToContextIdCache.get(branch.getGuid());
}
Collection<IAccessContextId> contextIds = new ArrayList<IAccessContextId>();
- branchGuidToContextIdCache.put(branch.getGuid(), contextIds);
+ branchUuidToContextIdCache.put(branch.getGuid(), contextIds);
try {
// don't access control common branch artifacts...yet
if (!AtsUtilCore.getAtsBranch().equals(branch)) {
@@ -247,7 +247,7 @@ public class AtsBranchAccessManager implements IArtifactEventListener, IAccessCo
public synchronized void clearCache() {
long now = new Date().getTime();
if (now - cacheUpdated > 1000) {
- branchGuidToContextIdCache.clear();
+ branchUuidToContextIdCache.clear();
}
}
@@ -269,7 +269,7 @@ public class AtsBranchAccessManager implements IArtifactEventListener, IAccessCo
if (ArtifactTypeManager.getType(guidArt).inheritsFrom(AtsArtifactTypes.TeamWorkflow)) {
TeamWorkFlowArtifact teamArt = (TeamWorkFlowArtifact) ArtifactCache.getActive(guidArt);
if (teamArt != null && teamArt.getWorkingBranch() != null) {
- branchGuidToContextIdCache.remove(teamArt.getWorkingBranch().getGuid());
+ branchUuidToContextIdCache.remove(teamArt.getWorkingBranch().getGuid());
}
}
} catch (OseeCoreException ex) {
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/WorkingBranchGuidColumn.java
index de9e393a2e..0e9413657b 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/WorkingBranchGuidColumn.java
@@ -40,7 +40,7 @@ public class WorkingBranchGuidColumn extends AbstractBranchColumn {
@Override
String getColumnText(Branch branch) {
- return branch.getGuid();
+ return String.valueOf(branch.getGuid());
}
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorBranchEventManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorBranchEventManager.java
index 75abdfb9fb..735209f9b5 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorBranchEventManager.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorBranchEventManager.java
@@ -70,14 +70,14 @@ public class SMAEditorBranchEventManager implements IBranchEventListener {
}
for (final ISMAEditorEventHandler handler : handlers) {
try {
- safelyProcessHandler(branchEvent.getEventType(), branchEvent.getBranchGuid());
+ safelyProcessHandler(branchEvent.getEventType(), branchEvent.getBranchUuid());
} catch (Exception ex) {
OseeLog.log(Activator.class, Level.SEVERE, "Error processing event handler - " + handler, ex);
}
}
}
- private void safelyProcessHandler(BranchEventType branchEventType, String branchGuid) {
+ private void safelyProcessHandler(BranchEventType branchEventType, Long branchUuid) {
for (final ISMAEditorEventHandler handler : handlers) {
if (handler.isDisposed()) {
OseeLog.log(Activator.class, Level.SEVERE, "Unexpected handler disposed but not unregistered.");
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsBranchManagerUpdateListener.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsBranchManagerUpdateListener.java
index b31d46aebe..8073215392 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsBranchManagerUpdateListener.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsBranchManagerUpdateListener.java
@@ -48,7 +48,7 @@ public class AtsBranchManagerUpdateListener implements IBranchEventListener {
try {
Branch branch = null;
try {
- branch = BranchManager.getBranchByGuid(branchEvent.getBranchGuid());
+ branch = BranchManager.getBranchByGuid(branchEvent.getBranchUuid());
} catch (BranchDoesNotExist ex) {
return;
}
diff --git a/plugins/org.eclipse.osee.client.demo/src/org/eclipse/osee/client/demo/DemoBranches.java b/plugins/org.eclipse.osee.client.demo/src/org/eclipse/osee/client/demo/DemoBranches.java
index 5225f83c86..4b36093e41 100644
--- a/plugins/org.eclipse.osee.client.demo/src/org/eclipse/osee/client/demo/DemoBranches.java
+++ b/plugins/org.eclipse.osee.client.demo/src/org/eclipse/osee/client/demo/DemoBranches.java
@@ -18,13 +18,13 @@ import org.eclipse.osee.framework.core.data.TokenFactory;
*/
public final class DemoBranches {
- public static final IOseeBranch SAW_Bld_1 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvAAA", 3, "SAW_Bld_1");
- public static final IOseeBranch SAW_Bld_2 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvBBB", 5, "SAW_Bld_2");
- public static final IOseeBranch SAW_Bld_3 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvCCC", 2002, "SAW_Bld_3");
+ public static final IOseeBranch SAW_Bld_1 = TokenFactory.createBranch(3, "SAW_Bld_1");
+ public static final IOseeBranch SAW_Bld_2 = TokenFactory.createBranch(5, "SAW_Bld_2");
+ public static final IOseeBranch SAW_Bld_3 = TokenFactory.createBranch(2002, "SAW_Bld_3");
- public static final IOseeBranch CIS_Bld_1 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvDDD", 4, "CIS_Bld_1");
- public static final IOseeBranch CIS_Bld_2 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvEEE", 1001, "CIS_Bld_2");
- public static final IOseeBranch CIS_Bld_3 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvFFF", 1002, "CIS_Bld_3");
+ public static final IOseeBranch CIS_Bld_1 = TokenFactory.createBranch(4, "CIS_Bld_1");
+ public static final IOseeBranch CIS_Bld_2 = TokenFactory.createBranch(1001, "CIS_Bld_2");
+ public static final IOseeBranch CIS_Bld_3 = TokenFactory.createBranch(1002, "CIS_Bld_3");
private DemoBranches() {
// Constants
diff --git a/plugins/org.eclipse.osee.client.demo/support/OseeTypes_ClientDemo.osee b/plugins/org.eclipse.osee.client.demo/support/OseeTypes_ClientDemo.osee
index 0d2b1573f9..d858f43e3b 100644
--- a/plugins/org.eclipse.osee.client.demo/support/OseeTypes_ClientDemo.osee
+++ b/plugins/org.eclipse.osee.client.demo/support/OseeTypes_ClientDemo.osee
@@ -3,7 +3,7 @@ import
artifactType "Demo Artifact With Selective Partition" extends "Artifact" {
uuid 0x0000000000000056
- attribute "Partition" branchGuid "AyH_f2sSKy3l07fIvAAA"
+ attribute "Partition" branchUuid 3
}
artifactType "Demo DSL Artifact" extends "Artifact" {
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactEventTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactEventTest.java
index ab407b4742..e3daa7844c 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactEventTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactEventTest.java
@@ -342,11 +342,11 @@ public class ArtifactEventTest {
// Set sender to something other than this client so event system will think came from another client
remoteEvent.setNetworkSender(networkSender);
remoteEvent.setTransactionId(1000);
- remoteEvent.setBranchGuid(BranchManager.getCommonBranch().getGuid());
+ remoteEvent.setBranchGuid(String.valueOf(BranchManager.getCommonBranch().getGuid()));
RemoteBasicGuidArtifact1 remGuidArt = new RemoteBasicGuidArtifact1();
remGuidArt.setModTypeGuid(EventModType.Modified.getGuid());
- remGuidArt.setBranchGuid(BranchManager.getCommonBranch().getGuid());
+ remGuidArt.setBranchGuid(String.valueOf(String.valueOf(BranchManager.getCommonBranch().getGuid())));
remGuidArt.setArtTypeGuid(CoreArtifactTypes.GeneralData.getGuid());
remGuidArt.setArtGuid(modifiedArt.getGuid());
@@ -360,11 +360,11 @@ public class ArtifactEventTest {
// Set sender to something other than this client so event system will think came from another client
remoteEvent.setNetworkSender(networkSender);
remoteEvent.setTransactionId(1000);
- remoteEvent.setBranchGuid(BranchManager.getCommonBranch().getGuid());
+ remoteEvent.setBranchGuid(String.valueOf(BranchManager.getCommonBranch().getGuid()));
RemoteBasicGuidRelation1 remGuidRel = new RemoteBasicGuidRelation1();
remGuidRel.setModTypeGuid(relationEventType.getGuid());
- remGuidRel.setBranchGuid(BranchManager.getCommonBranch().getGuid());
+ remGuidRel.setBranchGuid(String.valueOf(BranchManager.getCommonBranch().getGuid()));
remGuidRel.setGammaId(incrementingGammaId++);
remGuidRel.setRelTypeGuid(relType.getGuid());
remGuidRel.setRelationId(relationId);
@@ -592,16 +592,16 @@ public class ArtifactEventTest {
// Set sender to something other than this client so event system will think came from another client
remoteEvent.setNetworkSender(networkSender);
remoteEvent.setTransactionId(1000);
- remoteEvent.setBranchGuid(BranchManager.getCommonBranch().getGuid());
+ remoteEvent.setBranchGuid(String.valueOf(BranchManager.getCommonBranch().getGuid()));
RemoteBasicGuidRelationReorder1 remoteReorder = new RemoteBasicGuidRelationReorder1();
- remoteReorder.setBranchGuid(BranchManager.getCommonBranch().getGuid());
+ remoteReorder.setBranchGuid(String.valueOf(BranchManager.getCommonBranch().getGuid()));
remoteReorder.setModTypeGuid(RelationOrderModType.Absolute.getGuid());
remoteReorder.setRelTypeGuid(CoreRelationTypes.Default_Hierarchical__Child.getGuid());
RemoteBasicGuidArtifact1 parentRemGuidArt = new RemoteBasicGuidArtifact1();
parentRemGuidArt.setModTypeGuid(EventModType.Modified.getGuid());
- parentRemGuidArt.setBranchGuid(BranchManager.getCommonBranch().getGuid());
+ parentRemGuidArt.setBranchGuid(String.valueOf(BranchManager.getCommonBranch().getGuid()));
parentRemGuidArt.setArtTypeGuid(CoreArtifactTypes.GeneralData.getGuid());
parentRemGuidArt.setArtGuid(GUID.create());
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchEventTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchEventTest.java
index 20a7b27083..d8189f4498 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchEventTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchEventTest.java
@@ -26,7 +26,6 @@ import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.Pair;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
@@ -131,12 +130,11 @@ public class BranchEventTest {
branchEventListener.reset();
Assert.assertNotNull(committedBranch);
- final String guid = committedBranch.getGuid();
+ final Long uuid = committedBranch.getGuid();
Assert.assertEquals(BranchArchivedState.ARCHIVED, committedBranch.getArchiveState());
- BranchManager.updateBranchArchivedState(null, committedBranch.getId(), committedBranch.getGuid(),
- BranchArchivedState.UNARCHIVED);
+ BranchManager.updateBranchArchivedState(null, committedBranch.getId(), BranchArchivedState.UNARCHIVED);
- verifyReceivedBranchStatesEvent(branchEventListener.getFirstResults(), BranchEventType.ArchiveStateUpdated, guid);
+ verifyReceivedBranchStatesEvent(branchEventListener.getFirstResults(), BranchEventType.ArchiveStateUpdated, uuid);
Assert.assertEquals(BranchArchivedState.UNARCHIVED, committedBranch.getArchiveState());
Assert.assertFalse(committedBranch.isEditable());
@@ -149,7 +147,7 @@ public class BranchEventTest {
Assert.assertNotNull(workingBranch);
- final String guid = workingBranch.getGuid();
+ final Long uuid = workingBranch.getUuid();
Assert.assertNotNull(workingBranch);
Artifact newArt = ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralData, workingBranch);
newArt.persist(getClass().getSimpleName());
@@ -157,8 +155,8 @@ public class BranchEventTest {
branchEventListener.reset();
BranchManager.commitBranch(null, conflictManager, true, true);
- verifyReceivedBranchStatesEvent(branchEventListener.getFirstResults(), BranchEventType.Committing, guid);
- verifyReceivedBranchStatesEvent(branchEventListener.getSecondResults(), BranchEventType.Committed, guid);
+ verifyReceivedBranchStatesEvent(branchEventListener.getFirstResults(), BranchEventType.Committing, uuid);
+ verifyReceivedBranchStatesEvent(branchEventListener.getSecondResults(), BranchEventType.Committed, uuid);
Assert.assertEquals(BranchState.COMMITTED, workingBranch.getBranchState());
Assert.assertFalse(workingBranch.isEditable());
@@ -171,32 +169,32 @@ public class BranchEventTest {
Assert.assertNotNull(workingBranch);
- final String guid = workingBranch.getGuid();
+ final Long uuid = workingBranch.getGuid();
Assert.assertNotNull(workingBranch);
branchEventListener.reset();
Operations.executeWorkAndCheckStatus(new PurgeBranchHttpRequestOperation(workingBranch, false));
- verifyReceivedBranchStatesEvent(branchEventListener.getFirstResults(), BranchEventType.Purging, guid);
- verifyReceivedBranchStatesEvent(branchEventListener.getSecondResults(), BranchEventType.Purged, guid);
+ verifyReceivedBranchStatesEvent(branchEventListener.getFirstResults(), BranchEventType.Purging, uuid);
+ verifyReceivedBranchStatesEvent(branchEventListener.getSecondResults(), BranchEventType.Purged, uuid);
Assert.assertEquals(BranchState.PURGED, workingBranch.getBranchState());
Assert.assertEquals(StorageState.PURGED, workingBranch.getStorageState());
Assert.assertFalse(workingBranch.isEditable());
- Assert.assertFalse("Branch should not exist", BranchManager.branchExists(guid));
+ Assert.assertFalse("Branch should not exist", BranchManager.branchExists(uuid));
return workingBranch;
}
private Branch testEvents__deleted(Branch workingBranch) throws Exception {
- final String guid = workingBranch.getGuid();
+ final Long uuid = workingBranch.getGuid();
Assert.assertNotNull(workingBranch);
Assert.assertNotSame(BranchState.DELETED, workingBranch.getBranchState());
branchEventListener.reset();
Operations.executeWorkAndCheckStatus(new DeleteBranchOperation(workingBranch));
- verifyReceivedBranchStatesEvent(branchEventListener.getFirstResults(), BranchEventType.Deleting, guid);
- verifyReceivedBranchStatesEvent(branchEventListener.getSecondResults(), BranchEventType.Deleted, guid);
+ verifyReceivedBranchStatesEvent(branchEventListener.getFirstResults(), BranchEventType.Deleting, uuid);
+ verifyReceivedBranchStatesEvent(branchEventListener.getSecondResults(), BranchEventType.Deleted, uuid);
Assert.assertEquals(BranchState.DELETED, workingBranch.getBranchState());
return workingBranch;
@@ -205,12 +203,12 @@ public class BranchEventTest {
private Branch testEvents__stateChange(Branch workingBranch) throws Exception {
branchEventListener.reset();
- final String guid = workingBranch.getGuid();
+ final Long uuid = workingBranch.getUuid();
Assert.assertNotNull(workingBranch);
Assert.assertEquals(BranchState.CREATED, workingBranch.getBranchState());
- BranchManager.updateBranchState(null, workingBranch.getId(), workingBranch.getGuid(), BranchState.MODIFIED);
+ BranchManager.updateBranchState(null, workingBranch.getId(), BranchState.MODIFIED);
- verifyReceivedBranchStatesEvent(branchEventListener.getFirstResults(), BranchEventType.StateUpdated, guid);
+ verifyReceivedBranchStatesEvent(branchEventListener.getFirstResults(), BranchEventType.StateUpdated, uuid);
Assert.assertEquals(BranchState.MODIFIED, workingBranch.getBranchState());
return workingBranch;
@@ -218,12 +216,12 @@ public class BranchEventTest {
private Branch testEvents__typeChange(Branch workingBranch) throws Exception {
branchEventListener.reset();
- final String guid = workingBranch.getGuid();
+ final Long uuid = workingBranch.getUuid();
Assert.assertNotNull(workingBranch);
Assert.assertEquals(BranchType.WORKING, workingBranch.getBranchType());
- BranchManager.updateBranchType(null, workingBranch.getId(), workingBranch.getGuid(), BranchType.BASELINE);
+ BranchManager.updateBranchType(null, workingBranch.getId(), BranchType.BASELINE);
- verifyReceivedBranchStatesEvent(branchEventListener.getFirstResults(), BranchEventType.TypeUpdated, guid);
+ verifyReceivedBranchStatesEvent(branchEventListener.getFirstResults(), BranchEventType.TypeUpdated, uuid);
Assert.assertEquals(BranchType.BASELINE, workingBranch.getBranchType());
return workingBranch;
@@ -232,13 +230,13 @@ public class BranchEventTest {
private Branch testEvents__workingRenamed(Branch workingBranch) throws Exception {
branchEventListener.reset();
- final String guid = workingBranch.getGuid();
+ final Long uuid = workingBranch.getUuid();
Assert.assertNotNull(workingBranch);
String newName = method.getQualifiedTestName() + " - working renamed";
workingBranch.setName(newName);
BranchManager.persist(workingBranch);
- verifyReceivedBranchStatesEvent(branchEventListener.getFirstResults(), BranchEventType.Renamed, guid);
+ verifyReceivedBranchStatesEvent(branchEventListener.getFirstResults(), BranchEventType.Renamed, uuid);
Assert.assertEquals(newName, workingBranch.getName());
Assert.assertNotNull(BranchManager.getBranchesByName(newName));
@@ -268,7 +266,7 @@ public class BranchEventTest {
return branch;
}
- private void verifyReceivedBranchStatesEvent(Pair<Sender, BranchEvent> eventPair, BranchEventType expectedEnumState, String expectedBranchGuid) {
+ private void verifyReceivedBranchStatesEvent(Pair<Sender, BranchEvent> eventPair, BranchEventType expectedEnumState, Long expectedBranchUuid) {
Sender receivedSender = eventPair.getFirst();
BranchEvent receivedBranchEvent = eventPair.getSecond();
@@ -279,8 +277,8 @@ public class BranchEventTest {
Assert.assertTrue(receivedSender.isLocal());
}
- if (Strings.isValid(expectedBranchGuid)) {
- Assert.assertEquals(expectedBranchGuid, receivedBranchEvent.getBranchGuid());
+ if (expectedBranchUuid != null) {
+ Assert.assertEquals(expectedBranchUuid, Long.valueOf(receivedBranchEvent.getBranchUuid()));
}
}
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/FrameworkEventToRemoteEventListenerTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/FrameworkEventToRemoteEventListenerTest.java
index d2d101aff8..41488b7bb5 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/FrameworkEventToRemoteEventListenerTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/FrameworkEventToRemoteEventListenerTest.java
@@ -113,10 +113,10 @@ public class FrameworkEventToRemoteEventListenerTest {
private RemotePersistEvent1 createRemoteEvent(Artifact modifiedArt) {
RemotePersistEvent1 remoteEvent = new RemotePersistEvent1();
remoteEvent.setNetworkSender(networkSender);
- remoteEvent.setBranchGuid(BRANCH.getGuid());
+ remoteEvent.setBranchGuid(String.valueOf(BRANCH.getGuid()));
RemoteBasicGuidArtifact1 remGuidArt = new RemoteBasicGuidArtifact1();
remGuidArt.setModTypeGuid(EventModType.Modified.getGuid());
- remGuidArt.setBranchGuid(BRANCH.getGuid());
+ remGuidArt.setBranchGuid(String.valueOf(BRANCH.getGuid()));
remGuidArt.setArtTypeGuid(modifiedArt.getArtTypeGuid());
remGuidArt.setArtGuid(modifiedArt.getGuid());
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationCacheTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationCacheTest.java
index 347b6b7981..505ba01eb1 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationCacheTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationCacheTest.java
@@ -71,11 +71,8 @@ public class RelationCacheTest {
@Before
public void setup() throws Exception {
- branch1 = TestUtil.createBranch(100);
- branch1.setId(100);
-
- branch2 = TestUtil.createBranch(200);
- branch2.setId(200);
+ branch1 = TestUtil.createBranch(100, 100);
+ branch2 = TestUtil.createBranch(200, 200);
artfact1 = createArtifact(111, branch1);
artfact2 = createArtifact(222, branch2);
@@ -365,8 +362,7 @@ public class RelationCacheTest {
@Test
public void testDeCache() throws OseeCoreException {
RelationCache relCache = new RelationCache();
- Branch testBranch = TestUtil.createBranch(777);
- testBranch.setId(777);
+ Branch testBranch = TestUtil.createBranch(777, 777);
IArtifact artifactA = createArtifact(54, testBranch);
IArtifact artifactB = createArtifact(55, testBranch);
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationFilterUtilTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationFilterUtilTest.java
index 3cc4c5d364..d8ded68692 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationFilterUtilTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationFilterUtilTest.java
@@ -48,7 +48,7 @@ public class RelationFilterUtilTest {
@Before
public void setUp() {
- branch1 = TestUtil.createBranch(100);
+ branch1 = TestUtil.createBranch(100, 100);
relationType = TestUtil.createRelationType(5);
}
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/TestUtil.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/TestUtil.java
index f8cd840a2f..842416c58d 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/TestUtil.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/TestUtil.java
@@ -30,7 +30,6 @@ import org.eclipse.osee.framework.core.model.type.ArtifactType;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
@@ -80,11 +79,11 @@ public final class TestUtil {
return ConnectionHandler.runPreparedQueryFetchInt(0, "SELECT count(1) FROM " + tableName);
}
- public static Branch createBranch(int index) {
+ public static Branch createBranch(int index, long branchUuid) {
BranchState branchState = BranchState.values()[Math.abs(index % BranchState.values().length)];
BranchType branchType = BranchType.values()[Math.abs(index % BranchType.values().length)];
boolean isArchived = index % 2 == 0 ? true : false;
- return new Branch(GUID.create(), "branch_" + index, branchType, branchState, isArchived);
+ return new Branch(branchUuid, "branch_" + index, branchType, branchState, isArchived);
}
public static RelationLink createRelationLink(int relationId, int artA, int artB, Branch branch, RelationType relationType) {
diff --git a/plugins/org.eclipse.osee.coverage.demo/src/org/eclipse/osee/coverage/demo/CoverageBranches.java b/plugins/org.eclipse.osee.coverage.demo/src/org/eclipse/osee/coverage/demo/CoverageBranches.java
index 889a8bc3ba..341ed4028d 100644
--- a/plugins/org.eclipse.osee.coverage.demo/src/org/eclipse/osee/coverage/demo/CoverageBranches.java
+++ b/plugins/org.eclipse.osee.coverage.demo/src/org/eclipse/osee/coverage/demo/CoverageBranches.java
@@ -18,8 +18,7 @@ import org.eclipse.osee.framework.core.data.TokenFactory;
*/
public final class CoverageBranches {
- public static final IOseeBranch COVERAGE_TEST_BRANCH = TokenFactory.createBranch("BbH4f2sSKy3l07fIfAAA", 8883,
- "Coverage Test Branch");
+ public static final IOseeBranch COVERAGE_TEST_BRANCH = TokenFactory.createBranch(8883, "Coverage Test Branch");
private CoverageBranches() {
// Constants
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageEventManager.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageEventManager.java
index 35a1082f23..86edea6033 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageEventManager.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageEventManager.java
@@ -155,7 +155,7 @@ public class CoverageEventManager implements IArtifactEventListener, OseeMessagi
public void handleArtifactEvent(ArtifactEvent artifactEvent, Sender sender) {
for (CoverageEditor editor : new CopyOnWriteArrayList<CoverageEditor>(editors)) {
try {
- if (ServiceProvider.getOseeCmService().getCmBranchToken().getGuid().equals(artifactEvent.getBranchGuid())) {
+ if (ServiceProvider.getOseeCmService().getCmBranchToken().getGuid().equals(artifactEvent.getBranchUuid())) {
boolean updatedWorkProductTab = false;
for (EventBasicGuidArtifact eventArt : artifactEvent.getArtifacts()) {
if (!updatedWorkProductTab) {
@@ -163,7 +163,7 @@ public class CoverageEventManager implements IArtifactEventListener, OseeMessagi
}
}
}
- if (!editor.getBranch().getGuid().equals(artifactEvent.getBranchGuid())) {
+ if (!editor.getBranch().getGuid().equals(artifactEvent.getBranchUuid())) {
return;
}
boolean updatedWorkProductCache = false;
diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SRSTraceReportResource.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SRSTraceReportResource.java
index d8c7231839..5b829929b9 100644
--- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SRSTraceReportResource.java
+++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SRSTraceReportResource.java
@@ -56,7 +56,7 @@ public final class SRSTraceReportResource {
/**
* Produce the SRS Trace Report
*
- * @param branch The Branch to run the SRS Trace Report on.
+ * @param branch The Branch uuid to run the SRS Trace Report on.
* @param codeRoot The root directory accessible on the server for the code traces.
* @param csci The desired CSCI.
* @param traceType The desired trace type.
@@ -65,7 +65,7 @@ public final class SRSTraceReportResource {
@Path("gen")
@GET
@Produces(MediaType.APPLICATION_XML)
- public Response getStdStpReport(@QueryParam("branch") String branchGuid, @QueryParam("code_root") String codeRoot, @QueryParam("csci") String csci, @QueryParam("traceType") String traceType) {
+ public Response getStdStpReport(@QueryParam("branch") String branchUuid, @QueryParam("code_root") String codeRoot, @QueryParam("csci") String csci, @QueryParam("traceType") String traceType) {
traceType = traceType.replace(' ', '_');
csci = csci.toUpperCase();
@@ -73,7 +73,8 @@ public final class SRSTraceReportResource {
new TraceAccumulator(".*\\.(java|ada|ads|adb|c|h)", getTraceMatchers(traceType));
StreamingOutput streamingOutput =
- new SRSTraceReportStreamingOutput(logger, orcsApi, branchGuid, codeRoot, traceAccumulator, csci, traceType);
+ new SRSTraceReportStreamingOutput(logger, orcsApi, Long.valueOf(branchUuid), codeRoot, traceAccumulator, csci,
+ traceType);
ResponseBuilder builder = Response.ok(streamingOutput);
String fileName = csci + "_" + traceType.replace(' ', '_') + "_SRS_Trace_Report.xml";
diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SRSTraceReportStreamingOutput.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SRSTraceReportStreamingOutput.java
index bd7ad9fb35..b59b88dead 100644
--- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SRSTraceReportStreamingOutput.java
+++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SRSTraceReportStreamingOutput.java
@@ -62,10 +62,10 @@ public final class SRSTraceReportStreamingOutput implements StreamingOutput {
private static final IArtifactType WCAFE = TokenFactory.createArtifactType(0x0000BA000000001FL, "WCAFE");
private final Log logger;
- public SRSTraceReportStreamingOutput(Log logger, OrcsApi orcsApi, String branchGuid, String codeRoot, TraceAccumulator traceAccumulator, String csci, String traceType) {
+ public SRSTraceReportStreamingOutput(Log logger, OrcsApi orcsApi, long branchUuid, String codeRoot, TraceAccumulator traceAccumulator, String csci, String traceType) {
this.queryFactory = orcsApi.getQueryFactory(null);
BranchQuery branchQuery = orcsApi.getQueryFactory(null).branchQuery();
- this.branch = branchQuery.andUuids(branchGuid).getResults().getExactlyOne();
+ this.branch = branchQuery.andUuids(branchUuid).getResults().getExactlyOne();
this.codeRoot = codeRoot.trim();
this.traceAccumulator = traceAccumulator;
this.csci = csci;
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 d885802c3b..333162c506 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
@@ -273,7 +273,7 @@ public class SearchPresenterImpl<T extends SearchHeaderComponent, K extends View
}
protected ViewArtifact convertToViewArtifact(ArtifactReadable artifact, boolean addAncestry) throws OseeCoreException {
- ViewId branch = new ViewId(artifact.getBranch().getGuid(), artifact.getBranch().getName());
+ ViewId branch = new ViewId(String.valueOf(artifact.getBranch().getGuid()), artifact.getBranch().getName());
List<ViewArtifact> ancestry = addAncestry ? getAncestry(artifact) : null;
ViewArtifact toReturn =
new ViewArtifact(artifact.getGuid(), artifact.getName(), artifact.getArtifactType().getName(), ancestry,
diff --git a/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoProgram.java b/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoProgram.java
index 0bbf314f2d..aa24b7e318 100644
--- a/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoProgram.java
+++ b/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoProgram.java
@@ -15,8 +15,6 @@ package org.eclipse.osee.disposition.model;
*/
public interface DispoProgram {
- public String getGuid();
-
public Long getUuid();
public String getName();
diff --git a/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoProgramImpl.java b/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoProgramImpl.java
index b040bacf5a..3212e6837a 100644
--- a/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoProgramImpl.java
+++ b/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoProgramImpl.java
@@ -16,12 +16,10 @@ package org.eclipse.osee.disposition.model;
public class DispoProgramImpl implements DispoProgram {
private String name;
- private String guid;
private Long uuid;
- public DispoProgramImpl(String name, String guid, Long uuid) {
+ public DispoProgramImpl(String name, Long uuid) {
this.name = name;
- this.guid = guid;
this.uuid = uuid;
}
@@ -35,15 +33,6 @@ public class DispoProgramImpl implements DispoProgram {
}
@Override
- public String getGuid() {
- return guid;
- }
-
- public void setGuid(String guid) {
- this.guid = guid;
- }
-
- @Override
public Long getUuid() {
return uuid;
}
diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java
index 6817ea67bd..92daa193c2 100644
--- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java
+++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java
@@ -72,7 +72,7 @@ public class DispositionInitializer {
TransactionBuilder tx =
orcsApi.getTransactionFactory(null).createTransaction(CoreBranches.COMMON, oseeSystem, "Create Dispo Config");
ArtifactId createArtifact = tx.createArtifact(CoreArtifactTypes.GeneralData, DispoStrings.Dispo_Config_Art);
- StringBuffer sb = new StringBuffer(SAW_Bld_1.getGuid());
+ StringBuffer sb = new StringBuffer(String.valueOf(SAW_Bld_1.getUuid()));
sb.append(":");
sb.append(SAW_Bld_1_FOR_DISPO.getGuid());
sb.append("\n");
diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionTestUtil.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionTestUtil.java
index 316ddfa9cd..401e0edc72 100644
--- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionTestUtil.java
+++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionTestUtil.java
@@ -26,8 +26,8 @@ public class DispositionTestUtil {
public static final IArtifactToken DISPO_ITEM_DEMO_ONE = TokenFactory.createArtifactToken("BJEiNETyAGTDpW4ZnrAA", "Dispo Item Demo One", DispoConstants.DispoItem);
public static final IOseeBranch SAW_Bld_1_FOR_DISPO =
- TokenFactory.createBranch("AyH_f2sSKy3l07fIvAVV", 2323, "SAW_Bld_1 - FOR_DISPOSITION");
- public static final IOseeBranch SAW_Bld_1 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvAAA", 3, "SAW_Bld_1");
+ TokenFactory.createBranch(2323, "SAW_Bld_1 - FOR_DISPOSITION");
+ public static final IOseeBranch SAW_Bld_1 = TokenFactory.createBranch(3, "SAW_Bld_1");
// @formatter:on
}
diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/internal/DispositionApiTest.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/internal/DispositionApiTest.java
index 63e149ba0a..30ea7b0755 100644
--- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/internal/DispositionApiTest.java
+++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/internal/DispositionApiTest.java
@@ -93,7 +93,6 @@ public class DispositionApiTest {
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- when(program.getGuid()).thenReturn("abcdef");
when(program.getUuid()).thenReturn(23L);
when(setId.getGuid()).thenReturn("ghijkl");
when(itemId.getGuid()).thenReturn("mnopqr");
diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResourceTest.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResourceTest.java
index e068fcf8a0..4c2dd51fe2 100644
--- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResourceTest.java
+++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResourceTest.java
@@ -49,9 +49,7 @@ public class DispoProgramResourceTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
resource = new DispoProgramResource(dispoApi, htmlWriter, dispoFactory);
- when(id1.getGuid()).thenReturn("abcdef");
when(id1.getUuid()).thenReturn(23L);
- when(id2.getGuid()).thenReturn("fedcba");
when(id2.getUuid()).thenReturn(25L);
}
@@ -65,7 +63,7 @@ public class DispoProgramResourceTest {
assertEquals(Response.Status.NOT_FOUND.getStatusCode(), noProgramsResponse.getStatus());
assertEquals(DispoMessages.Program_NoneFound, messageActual);
- IOseeBranch branch = TokenFactory.createBranch(id1.getGuid(), "testBranch");
+ IOseeBranch branch = TokenFactory.createBranch(id1.getUuid(), "testBranch");
ResultSet<IOseeBranch> branchList = ResultSets.singleton(branch);
when(dispoApi.getDispoPrograms()).thenReturn(branchList);
@@ -85,7 +83,7 @@ public class DispoProgramResourceTest {
assertEquals(Response.Status.NOT_FOUND.getStatusCode(), noSetsResponse.getStatus());
assertEquals(DispoMessages.Program_NotFound, messageActual);
- IOseeBranch testBranch = TokenFactory.createBranch(id1.getGuid(), id1.getUuid(), "testBranch");
+ IOseeBranch testBranch = TokenFactory.createBranch(id1.getUuid(), "testBranch");
when(dispoFactory.createProgram(String.valueOf(id1.getUuid()))).thenReturn(id1);
when(dispoApi.getDispoProgramById(id1)).thenReturn(testBranch);
String prefixPath = testBranch.getUuid() + "/set";
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoFactoryImpl.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoFactoryImpl.java
index dd6e8ba010..7b9b2250ce 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoFactoryImpl.java
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoFactoryImpl.java
@@ -22,16 +22,16 @@ public class DispoFactoryImpl implements DispoFactory {
@Override
public DispoProgram createProgram(String name) {
- return createProgram(name, name, new Long(name.hashCode()));
+ return createProgram(name, new Long(name.hashCode()));
}
@Override
- public DispoProgram createProgram(String name, String guid, Long uuid) {
- return new DispoProgramImpl(name, guid, uuid);
+ public DispoProgram createProgram(String name, Long uuid) {
+ return new DispoProgramImpl(name, uuid);
}
@Override
public DispoProgram createProgram(IOseeBranch branch) {
- return new DispoProgramImpl(branch.getName(), branch.getGuid(), branch.getUuid());
+ return new DispoProgramImpl(branch.getName(), branch.getUuid());
}
}
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java
index da498dfa15..f86e53b730 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java
@@ -155,7 +155,7 @@ public class OrcsStorageImpl implements Storage {
}
private IOseeBranch getProgramBranch(DispoProgram program) {
- return TokenFactory.createBranch(program.getGuid(), program.getUuid(), program.getName());
+ return TokenFactory.createBranch(program.getUuid(), program.getName());
}
@Override
@@ -371,7 +371,7 @@ public class OrcsStorageImpl implements Storage {
String configContents = configArt.getSoleAttributeAsString(CoreAttributeTypes.GeneralStringData);
- Pattern regex = Pattern.compile(program.getGuid() + "\\s*:\\s*.*");
+ Pattern regex = Pattern.compile(program.getUuid() + "\\s*:\\s*.*");
Matcher matcher = regex.matcher(configContents);
String guid = null;
if (matcher.find()) {
@@ -388,7 +388,7 @@ public class OrcsStorageImpl implements Storage {
String[] split = match.split(":");
uuid = Long.valueOf(split[1]);
}
- toReturn = TokenFactory.createBranch(guid, uuid, "");
+ toReturn = TokenFactory.createBranch(uuid, "");
return toReturn;
}
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/util/DispoFactory.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/util/DispoFactory.java
index 32f8952fcf..c461659c9a 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/util/DispoFactory.java
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/util/DispoFactory.java
@@ -20,7 +20,7 @@ public interface DispoFactory {
public DispoProgram createProgram(String name);
- public DispoProgram createProgram(String name, String guid, Long uuid);
+ public DispoProgram createProgram(String name, Long uuid);
public DispoProgram createProgram(IOseeBranch branch);
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/util/HtmlWriter.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/util/HtmlWriter.java
index 4288431225..c3ff365361 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/util/HtmlWriter.java
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/util/HtmlWriter.java
@@ -32,7 +32,7 @@ public class HtmlWriter {
this.registry = registry;
}
- public String createDispositionPage(String title, String path, Iterable<? extends Identifiable<String>> dispoEntities) {
+ public String createDispositionPage(String title, String path, Iterable<? extends Identifiable<?>> dispoEntities) {
PageCreator page = PageFactory.newPageCreator(registry, "title", title);
page.addSubstitution(new LinkListRule("disposition", path, false, dispoEntities));
@@ -84,12 +84,12 @@ public class HtmlWriter {
}
}
}
- private static final class LinkListRule extends AppendableRule<String> {
+ private static final class LinkListRule<D> extends AppendableRule<D> {
private final boolean ordered;
- private final Iterable<? extends Identifiable<String>> indentities;
+ private final Iterable<? extends Identifiable<D>> indentities;
private final String path;
- public LinkListRule(String ruleName, String path, boolean ordered, Iterable<? extends Identifiable<String>> indentities) {
+ public LinkListRule(String ruleName, String path, boolean ordered, Iterable<? extends Identifiable<D>> indentities) {
super(ruleName);
this.ordered = ordered;
this.indentities = indentities;
@@ -99,11 +99,11 @@ public class HtmlWriter {
@Override
public void applyTo(Appendable appendable) throws IOException {
appendable.append(ordered ? "<ol>" : "<ul>");
- for (Identifiable<String> indentity : indentities) {
+ for (Identifiable<D> indentity : indentities) {
appendable.append("<li>");
appendable.append("<a href=\"");
appendable.append(path);
- appendable.append(indentity.getGuid());
+ appendable.append(String.valueOf(indentity.getGuid()));
appendable.append("\">");
appendable.append(indentity.getName());
appendable.append("</a>");
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlCacheHandler.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlCacheHandler.java
index 255b8ebbce..fc7b3bfca4 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlCacheHandler.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlCacheHandler.java
@@ -21,8 +21,8 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
*/
public class AccessControlCacheHandler {
- public void updateAccessListForBranchObject(AccessControlService service, final String branchGuid) throws OseeCoreException {
- BranchAccessObject branchAccessObject = BranchAccessObject.getBranchAccessObject(branchGuid);
+ public void updateAccessListForBranchObject(AccessControlService service, final long branchUuid) throws OseeCoreException {
+ BranchAccessObject branchAccessObject = BranchAccessObject.getBranchAccessObject(branchUuid);
if (branchAccessObject != null) {
updateAccessList(service, branchAccessObject);
}
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 b2da2764de..35ff8c5f06 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
@@ -347,7 +347,7 @@ public class AccessControlService implements IAccessControlService {
List<String> key = new LinkedList<String>();
for (Object o : objectsToCheck) {
if (o instanceof Branch) {
- key.add(((Branch) o).getGuid());
+ key.add(String.valueOf(((Branch) o).getGuid()));
} else if (o instanceof Artifact) {
key.add(((Artifact) o).getGuid() + ((Artifact) o).getBranchUuid());
} else {
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessEventListener.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessEventListener.java
index 52d7c04145..c0b9bebdee 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessEventListener.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessEventListener.java
@@ -77,7 +77,7 @@ public final class AccessEventListener implements IBranchEventListener, IAccessC
public void handleBranchEvent(Sender sender, final BranchEvent branchEvent) {
try {
if (branchEvent.getEventType() == BranchEventType.Deleted) {
- accessControlCacheHandler.updateAccessListForBranchObject(service, branchEvent.getBranchGuid());
+ accessControlCacheHandler.updateAccessListForBranchObject(service, branchEvent.getBranchUuid());
}
} catch (OseeCoreException ex) {
OseeLog.log(AccessControlHelper.class, Level.SEVERE, ex);
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 0be3e9f5f9..4a8f48c7c4 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
@@ -14,7 +14,6 @@ import java.util.HashMap;
import java.util.Map;
import org.eclipse.osee.framework.access.AccessObject;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
@@ -57,21 +56,13 @@ public class BranchAccessObject extends AccessObject {
return getBranchAccessObject(BranchManager.getBranchId(branch));
}
- public static BranchAccessObject getBranchAccessObject(String branchGuid) throws OseeCoreException {
- if (BranchManager.branchExists(branchGuid)) {
- Branch branch = BranchManager.getBranchByGuid(branchGuid);
- return getBranchAccessObject(branch);
- }
- return null;
- }
-
- public static BranchAccessObject getBranchAccessObject(long branchId) {
+ public static BranchAccessObject getBranchAccessObject(long branchUuid) {
BranchAccessObject branchAccessObject;
- if (cache.containsKey(branchId)) {
- branchAccessObject = cache.get(branchId);
+ if (cache.containsKey(branchUuid)) {
+ branchAccessObject = cache.get(branchUuid);
} else {
- branchAccessObject = new BranchAccessObject(branchId);
- cache.put(branchId, branchAccessObject);
+ branchAccessObject = new BranchAccessObject(branchUuid);
+ cache.put(branchUuid, branchAccessObject);
}
return branchAccessObject;
}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.edit/src/org/eclipse/osee/framework/core/dsl/oseeDsl/provider/XAttributeTypeRefItemProvider.java b/plugins/org.eclipse.osee.framework.core.dsl.edit/src/org/eclipse/osee/framework/core/dsl/oseeDsl/provider/XAttributeTypeRefItemProvider.java
index 6ef76ae055..685cf9ef8e 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.edit/src/org/eclipse/osee/framework/core/dsl/oseeDsl/provider/XAttributeTypeRefItemProvider.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.edit/src/org/eclipse/osee/framework/core/dsl/oseeDsl/provider/XAttributeTypeRefItemProvider.java
@@ -6,15 +6,11 @@
*/
package org.eclipse.osee.framework.core.dsl.oseeDsl.provider;
-
import java.util.Collection;
import java.util.List;
-
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -25,28 +21,19 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
-
import org.eclipse.osee.framework.core.dsl.oseeDsl.OseeDslPackage;
import org.eclipse.osee.framework.core.dsl.oseeDsl.XAttributeTypeRef;
/**
* This is the item provider adapter for a {@link org.eclipse.osee.framework.core.dsl.oseeDsl.XAttributeTypeRef} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
-public class XAttributeTypeRefItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+public class XAttributeTypeRefItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public XAttributeTypeRefItemProvider(AdapterFactory adapterFactory) {
@@ -54,9 +41,8 @@ public class XAttributeTypeRefItemProvider
}
/**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -71,53 +57,39 @@ public class XAttributeTypeRefItemProvider
}
/**
- * This adds a property descriptor for the Valid Attribute Type feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds a property descriptor for the Valid Attribute Type feature. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
* @generated
*/
protected void addValidAttributeTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_XAttributeTypeRef_validAttributeType_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_XAttributeTypeRef_validAttributeType_feature", "_UI_XAttributeTypeRef_type"),
- OseeDslPackage.Literals.XATTRIBUTE_TYPE_REF__VALID_ATTRIBUTE_TYPE,
- true,
- false,
- true,
- null,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_XAttributeTypeRef_validAttributeType_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_XAttributeTypeRef_validAttributeType_feature",
+ "_UI_XAttributeTypeRef_type"), OseeDslPackage.Literals.XATTRIBUTE_TYPE_REF__VALID_ATTRIBUTE_TYPE, true,
+ false, true, null, null, null));
}
/**
- * This adds a property descriptor for the Branch Guid feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds a property descriptor for the Branch Guid feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addBranchGuidPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_XAttributeTypeRef_branchGuid_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_XAttributeTypeRef_branchGuid_feature", "_UI_XAttributeTypeRef_type"),
- OseeDslPackage.Literals.XATTRIBUTE_TYPE_REF__BRANCH_GUID,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_XAttributeTypeRef_branchGuid_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_XAttributeTypeRef_branchGuid_feature",
+ "_UI_XAttributeTypeRef_type"), OseeDslPackage.Literals.XATTRIBUTE_TYPE_REF__BRANCH_UUID, true, false,
+ false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
- * This returns XAttributeTypeRef.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This returns XAttributeTypeRef.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -126,24 +98,21 @@ public class XAttributeTypeRefItemProvider
}
/**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String getText(Object object) {
- String label = ((XAttributeTypeRef)object).getBranchGuid();
- return label == null || label.length() == 0 ?
- getString("_UI_XAttributeTypeRef_type") :
- getString("_UI_XAttributeTypeRef_type") + " " + label;
+ String label = String.valueOf(((XAttributeTypeRef) object).getBranchUuid());
+ return label == null || label.length() == 0 ? getString("_UI_XAttributeTypeRef_type") : getString("_UI_XAttributeTypeRef_type") + " " + label;
}
/**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+ * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
* @generated
*/
@Override
@@ -151,7 +120,7 @@ public class XAttributeTypeRefItemProvider
updateChildren(notification);
switch (notification.getFeatureID(XAttributeTypeRef.class)) {
- case OseeDslPackage.XATTRIBUTE_TYPE_REF__BRANCH_GUID:
+ case OseeDslPackage.XATTRIBUTE_TYPE_REF__BRANCH_UUID:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
@@ -159,10 +128,9 @@ public class XAttributeTypeRefItemProvider
}
/**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
+ * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -171,9 +139,8 @@ public class XAttributeTypeRefItemProvider
}
/**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java
index 15d397e4bb..1cb2d955e7 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java
@@ -29,9 +29,9 @@ import org.eclipse.osee.framework.core.model.IBasicArtifact;
import org.eclipse.osee.framework.core.model.type.ArtifactType;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.jdk.core.type.Identity;
-import org.eclipse.osee.framework.jdk.core.type.Named;
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.Lib;
import org.junit.Assert;
import org.junit.Test;
@@ -113,11 +113,11 @@ public class ArtifactMatchInterpreterTest {
DslAsserts.assertEquals(matcher.getConditions().iterator().next(), MatchField.BRANCH_NAME, CompareOp.EQ,
"branch1");
- ArtifactProxy proxy = createProxy(GUID.create(), "art1", GUID.create(), "branch2");
+ ArtifactProxy proxy = createProxy(GUID.create(), "art1", Lib.generateUuid(), "branch2");
boolean actual = interpreter.matches(matcher, proxy);
Assert.assertEquals(false, actual);
- proxy = createProxy(GUID.create(), "art1", GUID.create(), "branch1");
+ proxy = createProxy(GUID.create(), "art1", Lib.generateUuid(), "branch1");
actual = interpreter.matches(matcher, proxy);
Assert.assertEquals(true, actual);
}
@@ -130,31 +130,32 @@ public class ArtifactMatchInterpreterTest {
DslAsserts.assertEquals(matcher.getConditions().iterator().next(), MatchField.BRANCH_NAME, CompareOp.LIKE,
".*hello.*");
- ArtifactProxy proxy = createProxy(GUID.create(), "art1", GUID.create(), "this is the hello branch");
+ ArtifactProxy proxy = createProxy(GUID.create(), "art1", Lib.generateUuid(), "this is the hello branch");
boolean actual = interpreter.matches(matcher, proxy);
Assert.assertEquals(true, actual);
}
@Test
- public void testArtifactBranchGuidEq() throws OseeCoreException {
- String guid = GUID.create();
+ public void testArtifactBranchUuidEq() throws OseeCoreException {
+ long uuid = Lib.generateUuid();
XArtifactMatcher matcher =
- MockModel.createMatcher("artifactMatcher \"Test\" where branchGuid EQ \"" + guid + "\";");
+ MockModel.createMatcher("artifactMatcher \"Test\" where branchUuid EQ \"" + uuid + "\";");
- DslAsserts.assertEquals(matcher.getConditions().iterator().next(), MatchField.BRANCH_GUID, CompareOp.EQ, guid);
+ DslAsserts.assertEquals(matcher.getConditions().iterator().next(), MatchField.BRANCH_UUID, CompareOp.EQ,
+ String.valueOf(uuid));
- ArtifactProxy proxy = createProxy(GUID.create(), "art1", guid, "");
+ ArtifactProxy proxy = createProxy(GUID.create(), "art1", uuid, "");
boolean actual = interpreter.matches(matcher, proxy);
Assert.assertEquals(true, actual);
}
@Test
- public void testArtifactBranchGuidLike() throws OseeCoreException {
- XArtifactMatcher matcher = MockModel.createMatcher("artifactMatcher \"Test\" where branchGuid LIKE \"\\w+\";");
+ public void testArtifactBranchUuidLike() throws OseeCoreException {
+ XArtifactMatcher matcher = MockModel.createMatcher("artifactMatcher \"Test\" where branchUuid LIKE \"\\w+\";");
- DslAsserts.assertEquals(matcher.getConditions().iterator().next(), MatchField.BRANCH_GUID, CompareOp.LIKE, "\\w+");
+ DslAsserts.assertEquals(matcher.getConditions().iterator().next(), MatchField.BRANCH_UUID, CompareOp.LIKE, "\\w+");
- ArtifactProxy proxy = createProxy(GUID.create(), "art1", "ABCDEFGHIJK123456789", "");
+ ArtifactProxy proxy = createProxy(GUID.create(), "art1", Lib.generateUuid(), "");
boolean actual = interpreter.matches(matcher, proxy);
Assert.assertEquals(true, actual);
}
@@ -200,7 +201,7 @@ public class ArtifactMatchInterpreterTest {
@Test
public void testCompoundCondition2() throws OseeCoreException {
XArtifactMatcher matcher =
- MockModel.createMatcher("artifactMatcher \"Test\" where artifactGuid EQ \"ABCDEFGHIJK123456789\" AND (branchName EQ \"myArtifact\" OR branchGuid EQ \"123456789101112131415\");");
+ MockModel.createMatcher("artifactMatcher \"Test\" where artifactGuid EQ \"ABCDEFGHIJK123456789\" AND (branchName EQ \"myArtifact\" OR branchUuid EQ \"3456789101112131415\");");
Assert.assertEquals(2, matcher.getConditions().size());
Iterator<Condition> iterator = matcher.getConditions().iterator();
@@ -218,17 +219,18 @@ public class ArtifactMatchInterpreterTest {
Iterator<SimpleCondition> iterator2 = compoundCondition.getConditions().iterator();
DslAsserts.assertEquals(iterator2.next(), MatchField.BRANCH_NAME, CompareOp.EQ, "myArtifact");
- DslAsserts.assertEquals(iterator2.next(), MatchField.BRANCH_GUID, CompareOp.EQ, "123456789101112131415");
+ DslAsserts.assertEquals(iterator2.next(), MatchField.BRANCH_UUID, CompareOp.EQ,
+ String.valueOf(3456789101112131415L));
Assert.assertEquals(1, compoundCondition.getOperators().size());
Assert.assertEquals(XLogicOperator.OR, compoundCondition.getOperators().iterator().next());
String badArtGuid = "1BCDEFGHIJK123456789";
- String badBranchGuid = "ABCDEFGHIJK123456789";
+ long badBranchGuid = 333333333123456789L;
String badBranchName = "xArtifact";
String goodArtGuid = "ABCDEFGHIJK123456789";
- String goodBranchGuid = "123456789101112131415";
+ long goodBranchGuid = 3456789101112131415L;
String goodBranchName = "myArtifact";
ArtifactProxy proxy1 = createProxy(badArtGuid, "", badBranchGuid, badBranchName);
@@ -252,10 +254,10 @@ public class ArtifactMatchInterpreterTest {
}
private static ArtifactProxy createProxy(String artGuid, String artifactName) {
- return createProxy(artGuid, artifactName, GUID.create(), "dummy");
+ return createProxy(artGuid, artifactName, Lib.generateUuid(), "dummy");
}
- private static ArtifactProxy createProxy(final String artGuid, final String artifactName, final String branchGuid, final String branchName) {
+ private static ArtifactProxy createProxy(final String artGuid, final String artifactName, final long branchGuid, final String branchName) {
return new ArtifactProxy() {
@Override
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeDslSegmentParserTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeDslSegmentParserTest.java
index 7224ee5c80..0a811796ba 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeDslSegmentParserTest.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeDslSegmentParserTest.java
@@ -71,19 +71,19 @@ public class OseeDslSegmentParserTest {
final String artifactGuid = GUID.create();
final String artifactName = "artifactTest";
final String branchName = branch.getName();
- final String branchGuid = branch.getGuid();
+ final Long branchUuid = branch.getUuid();
IBasicArtifact<?> artifact = new MockArtifact(artifactGuid, artifactName, branch, CoreArtifactTypes.Artifact, 45);
String actual = parser.getStartTag(artifact);
String expected =
- String.format("//@start_artifact branch/%s/artifact/%s/ (%s:%s)", branchGuid, artifactGuid, branchName,
+ String.format("//@start_artifact branch/%d/artifact/%s/ (%s:%s)", branchUuid, artifactGuid, branchName,
artifactName);
Assert.assertEquals(expected, actual);
actual = parser.getEndTag(artifact);
expected =
- String.format("//@end_artifact branch/%s/artifact/%s/ (%s:%s)", branchGuid, artifactGuid, branchName,
+ String.format("//@end_artifact branch/%d/artifact/%s/ (%s:%s)", branchUuid, artifactGuid, branchName,
artifactName);
Assert.assertEquals(expected, actual);
}
@@ -96,16 +96,16 @@ public class OseeDslSegmentParserTest {
@Test
public void testGetLocations() throws OseeCoreException {
final String artifactGuid = GUID.create();
- final String branchGuid = CoreBranches.COMMON.getGuid();
+ final Long branchUuid = CoreBranches.COMMON.getUuid();
String data = null;
- data = String.format("//@start_artifact branch/%s/artifact/%s/ ()", branchGuid, artifactGuid);
- checkGetTagLocations(data, new TagLocation(true, branchGuid, artifactGuid, 0, data.length()));
+ data = String.format("//@start_artifact branch/%d/artifact/%s/ ()", branchUuid, artifactGuid);
+ checkGetTagLocations(data, new TagLocation(true, branchUuid, artifactGuid, 0, data.length()));
- data = String.format("//@end_artifact branch/%s/artifact/%s/ ()", branchGuid, artifactGuid);
- checkGetTagLocations(data, new TagLocation(false, branchGuid, artifactGuid, 0, data.length()));
+ data = String.format("//@end_artifact branch/%d/artifact/%s/ ()", branchUuid, artifactGuid);
+ checkGetTagLocations(data, new TagLocation(false, branchUuid, artifactGuid, 0, data.length()));
- data = String.format("//@end_artifact branch/%s/artifact/%s/", branchGuid, artifactGuid);
+ data = String.format("//@end_artifact branch/%d/artifact/%s/", branchUuid, artifactGuid);
checkGetTagLocations(data);
data = "//@end_artifact branch//artifact/";
@@ -124,8 +124,8 @@ public class OseeDslSegmentParserTest {
@Test(expected = OseeStateException.class)
public void testGetSegmentsUnMatched() throws OseeCoreException {
- TagLocation start = new TagLocation(true, "1", "2", 0, 2);
- TagLocation end = new TagLocation(false, "1", "2", 0, 2);
+ TagLocation start = new TagLocation(true, 1L, "2", 0, 2);
+ TagLocation end = new TagLocation(false, 1L, "2", 0, 2);
Collection<TagLocation> locations = Arrays.asList(start, start, end);
parser.getSegments(locations);
@@ -133,16 +133,16 @@ public class OseeDslSegmentParserTest {
@Test
public void testOrderedSegments() throws OseeCoreException {
- TagLocation start1 = new TagLocation(true, "branch_1", "art_1", 0, 6);
- TagLocation end1 = new TagLocation(false, "branch_1", "art_1", 10, 12);
+ TagLocation start1 = new TagLocation(true, 1L, "art_1", 0, 6);
+ TagLocation end1 = new TagLocation(false, 1L, "art_1", 10, 12);
- TagLocation start2 = new TagLocation(true, "branch_2", "art_2", 13, 56);
- TagLocation end2 = new TagLocation(false, "branch_2", "art_2", 79, 80);
+ TagLocation start2 = new TagLocation(true, 2L, "art_2", 13, 56);
+ TagLocation end2 = new TagLocation(false, 2L, "art_2", 79, 80);
// Segments should capture in-between data
- OseeDslSegment segment1 = new OseeDslSegment("branch_1", "art_1", 6, 10);
- OseeDslSegment segment2 = new OseeDslSegment("branch_2", "art_2", 56, 79);
+ OseeDslSegment segment1 = new OseeDslSegment(1L, "art_1", 6, 10);
+ OseeDslSegment segment2 = new OseeDslSegment(2L, "art_2", 56, 79);
Collection<TagLocation> locations = Arrays.asList(start1, end1, start2, end2);
Collection<OseeDslSegment> segments = parser.getSegments(locations);
@@ -195,7 +195,7 @@ public class OseeDslSegmentParserTest {
Assert.assertNull(actual);
} else {
Assert.assertEquals("isStartTag - " + index, expected.isStartTag(), actual.isStartTag());
- Assert.assertEquals("branchguid - " + index, expected.getBranchGuid(), actual.getBranchGuid());
+ Assert.assertEquals("branchguid - " + index, expected.getBranchUuid(), actual.getBranchUuid());
Assert.assertEquals("artguid - " + index, expected.getArtifactGuid(), actual.getArtifactGuid());
Assert.assertEquals("start - " + index, expected.start(), actual.start());
Assert.assertEquals("end - " + index, expected.end(), actual.end());
@@ -206,7 +206,7 @@ public class OseeDslSegmentParserTest {
if (expected == null) {
Assert.assertNull(actual);
} else {
- Assert.assertEquals("branchguid - " + index, expected.getBranchGuid(), actual.getBranchGuid());
+ Assert.assertEquals("branchguid - " + index, expected.getBranchUuid(), actual.getBranchUuid());
Assert.assertEquals("artguid - " + index, expected.getArtifactGuid(), actual.getArtifactGuid());
Assert.assertEquals("start - " + index, expected.start(), actual.start());
Assert.assertEquals("end - " + index, expected.end(), actual.end());
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreter.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreter.java
index cf43bc3d77..fa0121abe4 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreter.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreter.java
@@ -104,9 +104,11 @@ public class ArtifactMatchInterpreter {
input = proxy.getGuid();
Conditions.checkExpressionFailOnTrue(!GUID.isValid(input), "guid");
break;
- case BRANCH_GUID:
- input = proxy.getBranch().getGuid();
- Conditions.checkExpressionFailOnTrue(!GUID.isValid(input), "guid");
+ case BRANCH_UUID:
+ Long uuid = proxy.getBranch().getUuid();
+ Conditions.checkExpressionFailOnTrue(uuid <= 0L,
+ String.format("branchUuid should be > 0, but is [%d]", uuid));
+ input = String.valueOf(uuid);
break;
case ARTIFACT_NAME:
input = proxy.getName();
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeDslSegmentParser.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeDslSegmentParser.java
index a07a4a3ad2..3d33423091 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeDslSegmentParser.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeDslSegmentParser.java
@@ -68,7 +68,7 @@ public class OseeDslSegmentParser {
}
private void processData(Collection<OseeDslSegment> segments, TagLocation startSeg, TagLocation stopSeg) {
- String branchGuid = startSeg.getBranchGuid();
+ Long branchGuid = startSeg.getBranchUuid();
String artifactGuid = startSeg.getArtifactGuid();
int startAt = startSeg.end();
int endAt = stopSeg.start();
@@ -76,7 +76,7 @@ public class OseeDslSegmentParser {
}
private boolean matches(TagLocation seg1, TagLocation seg2) {
- return seg1.getBranchGuid().equals(seg2.getBranchGuid()) && seg1.getArtifactGuid().equals(seg2.getArtifactGuid());
+ return seg1.getBranchUuid() == seg2.getBranchUuid() && seg1.getArtifactGuid().equals(seg2.getArtifactGuid());
}
public Collection<TagLocation> getTagLocations(String source) throws OseeCoreException {
@@ -85,7 +85,7 @@ public class OseeDslSegmentParser {
Pattern pattern = Pattern.compile("\\s?//@(.*?)_artifact\\s+branch/(.*?)/artifact/(.*?)/\\s+\\(.*?\\)");
Matcher matcher = pattern.matcher(source);
- String branchGuid = null;
+ Long branchUuid = null;
String artifactGuid = null;
String tag = null;
int tagStart = -1;
@@ -95,11 +95,11 @@ public class OseeDslSegmentParser {
tagEnd = matcher.end();
tag = matcher.group(1);
- branchGuid = matcher.group(2);
+ branchUuid = Long.valueOf(matcher.group(2));
artifactGuid = matcher.group(3);
- if (Strings.isValid(tag) && Strings.isValid(branchGuid) && Strings.isValid(artifactGuid)) {
+ if (Strings.isValid(tag) && branchUuid > 0 && Strings.isValid(artifactGuid)) {
boolean isStartTag = tag.equalsIgnoreCase("start");
- segments.add(new TagLocation(isStartTag, branchGuid, artifactGuid, tagStart, tagEnd));
+ segments.add(new TagLocation(isStartTag, branchUuid, artifactGuid, tagStart, tagEnd));
}
}
return segments;
@@ -108,15 +108,15 @@ public class OseeDslSegmentParser {
public static final class TagLocation {
private final boolean isStartTag;
- private final String branchGuid;
+ private final Long branchUuid;
private final String artifactGuid;
private final int start;
private final int end;
- public TagLocation(boolean isStartTag, String branchGuid, String artifactGuid, int start, int end) {
+ public TagLocation(boolean isStartTag, Long branchUuid, String artifactGuid, int start, int end) {
super();
this.isStartTag = isStartTag;
- this.branchGuid = branchGuid;
+ this.branchUuid = branchUuid;
this.artifactGuid = artifactGuid;
this.start = start;
this.end = end;
@@ -126,8 +126,8 @@ public class OseeDslSegmentParser {
return isStartTag;
}
- public String getBranchGuid() {
- return branchGuid;
+ public long getBranchUuid() {
+ return branchUuid;
}
public String getArtifactGuid() {
@@ -144,28 +144,28 @@ public class OseeDslSegmentParser {
@Override
public String toString() {
- return "OseeDslSegment [isStartTag=" + isStartTag + ", branchGuid=" + branchGuid + ", artifactGuid=" + artifactGuid + ", start=" + start + ", end=" + end + "]";
+ return "OseeDslSegment [isStartTag=" + isStartTag + ", branchUuid=" + branchUuid + ", artifactGuid=" + artifactGuid + ", start=" + start + ", end=" + end + "]";
}
}
public static final class OseeDslSegment {
- private final String branchGuid;
+ private final Long branchUuid;
private final String artifactGuid;
private final int start;
private final int end;
- public OseeDslSegment(String branchGuid, String artifactGuid, int start, int end) {
+ public OseeDslSegment(Long branchUuid, String artifactGuid, int start, int end) {
super();
- this.branchGuid = branchGuid;
+ this.branchUuid = branchUuid;
this.artifactGuid = artifactGuid;
this.start = start;
this.end = end;
}
- public String getBranchGuid() {
- return branchGuid;
+ public Long getBranchUuid() {
+ return branchUuid;
}
public String getArtifactGuid() {
@@ -185,7 +185,7 @@ public class OseeDslSegmentParser {
final int prime = 31;
int result = 1;
result = prime * result + (artifactGuid == null ? 0 : artifactGuid.hashCode());
- result = prime * result + (branchGuid == null ? 0 : branchGuid.hashCode());
+ result = prime * result + (branchUuid == null ? 0 : branchUuid.hashCode());
result = prime * result + end;
result = prime * result + start;
return result;
@@ -210,11 +210,11 @@ public class OseeDslSegmentParser {
} else if (!artifactGuid.equals(other.artifactGuid)) {
return false;
}
- if (branchGuid == null) {
- if (other.branchGuid != null) {
+ if (branchUuid == null) {
+ if (other.branchUuid != null) {
return false;
}
- } else if (!branchGuid.equals(other.branchGuid)) {
+ } else if (!branchUuid.equals(other.branchUuid)) {
return false;
}
if (end != other.end) {
@@ -228,7 +228,7 @@ public class OseeDslSegmentParser {
@Override
public String toString() {
- return "OseeDslSegment [branchGuid=" + branchGuid + ", artifactGuid=" + artifactGuid + ", start=" + start + ", end=" + end + "]";
+ return "OseeDslSegment [branchGuid=" + branchUuid + ", artifactUuid=" + artifactGuid + ", start=" + start + ", end=" + end + "]";
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java
index 94d6c2f66a..839ae39887 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java
@@ -60,7 +60,7 @@ public class OseeDslArtifactUpdateOperation extends AbstractOperation {
int endAt = segment.end();
String data = source.substring(startAt, endAt);
- addChanges(transactionMap, segment.getBranchGuid(), segment.getArtifactGuid(), data);
+ addChanges(transactionMap, segment.getBranchUuid(), segment.getArtifactGuid(), data);
monitor.worked(workAmount);
}
monitor.setTaskName("Persist...");
@@ -75,8 +75,8 @@ public class OseeDslArtifactUpdateOperation extends AbstractOperation {
return Lib.fileToString(file);
}
- protected void addChanges(Map<Branch, SkynetTransaction> transactionMap, String branchGuid, String artifactGuid, String data) throws OseeCoreException {
- Branch branch = BranchManager.getBranchByGuid(branchGuid);
+ protected void addChanges(Map<Branch, SkynetTransaction> transactionMap, long branchUuid, String artifactGuid, String data) throws OseeCoreException {
+ Branch branch = BranchManager.getBranchByGuid(branchUuid);
SkynetTransaction transaction = transactionMap.get(branch);
if (transaction == null) {
transaction = TransactionManager.createTransaction(branch, "OseeDslArtifactUpdate");
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/AbstractOseeDslProposalProvider.java b/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/AbstractOseeDslProposalProvider.java
index 960d07fbc1..483faa4c31 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/AbstractOseeDslProposalProvider.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/AbstractOseeDslProposalProvider.java
@@ -70,7 +70,7 @@ public class AbstractOseeDslProposalProvider extends org.eclipse.xtext.common.ui
public void completeXAttributeTypeRef_ValidAttributeType(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
}
- public void completeXAttributeTypeRef_BranchGuid(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+ public void completeXAttributeTypeRef_BranchUuid(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeXAttributeType_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/OseeDslParser.java b/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/OseeDslParser.java
index 0c278de336..ebe662ce78 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/OseeDslParser.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/OseeDslParser.java
@@ -137,7 +137,7 @@ public class OseeDslParser extends AbstractContentAssistParser {
put(grammarAccess.getXArtifactTypeAccess().getUuidAssignment_7(), "rule__XArtifactType__UuidAssignment_7");
put(grammarAccess.getXArtifactTypeAccess().getValidAttributeTypesAssignment_8(), "rule__XArtifactType__ValidAttributeTypesAssignment_8");
put(grammarAccess.getXAttributeTypeRefAccess().getValidAttributeTypeAssignment_1(), "rule__XAttributeTypeRef__ValidAttributeTypeAssignment_1");
- put(grammarAccess.getXAttributeTypeRefAccess().getBranchGuidAssignment_2_1(), "rule__XAttributeTypeRef__BranchGuidAssignment_2_1");
+ put(grammarAccess.getXAttributeTypeRefAccess().getBranchUuidAssignment_2_1(), "rule__XAttributeTypeRef__BranchUuidAssignment_2_1");
put(grammarAccess.getXAttributeTypeAccess().getNameAssignment_1(), "rule__XAttributeType__NameAssignment_1");
put(grammarAccess.getXAttributeTypeAccess().getBaseAttributeTypeAssignment_2_1(), "rule__XAttributeType__BaseAttributeTypeAssignment_2_1");
put(grammarAccess.getXAttributeTypeAccess().getOverrideAssignment_3_1(), "rule__XAttributeType__OverrideAssignment_3_1");
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g b/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g
index b4e96c23ed..edcec9d859 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g
@@ -1918,10 +1918,10 @@ rule__MatchField__Alternatives
)
|(
-{ before(grammarAccess.getMatchFieldAccess().getBranchGuidEnumLiteralDeclaration_3()); }
-( 'branchGuid'
+{ before(grammarAccess.getMatchFieldAccess().getBranchUuidEnumLiteralDeclaration_3()); }
+( 'branchUuid'
)
-{ after(grammarAccess.getMatchFieldAccess().getBranchGuidEnumLiteralDeclaration_3()); }
+{ after(grammarAccess.getMatchFieldAccess().getBranchUuidEnumLiteralDeclaration_3()); }
)
;
@@ -2914,11 +2914,11 @@ rule__XAttributeTypeRef__Group_2__0__Impl
}
:
(
-{ before(grammarAccess.getXAttributeTypeRefAccess().getBranchGuidKeyword_2_0()); }
+{ before(grammarAccess.getXAttributeTypeRefAccess().getBranchUuidKeyword_2_0()); }
- 'branchGuid'
+ 'branchUuid'
-{ after(grammarAccess.getXAttributeTypeRefAccess().getBranchGuidKeyword_2_0()); }
+{ after(grammarAccess.getXAttributeTypeRefAccess().getBranchUuidKeyword_2_0()); }
)
;
@@ -2944,9 +2944,9 @@ rule__XAttributeTypeRef__Group_2__1__Impl
}
:
(
-{ before(grammarAccess.getXAttributeTypeRefAccess().getBranchGuidAssignment_2_1()); }
-(rule__XAttributeTypeRef__BranchGuidAssignment_2_1)
-{ after(grammarAccess.getXAttributeTypeRefAccess().getBranchGuidAssignment_2_1()); }
+{ before(grammarAccess.getXAttributeTypeRefAccess().getBranchUuidAssignment_2_1()); }
+(rule__XAttributeTypeRef__BranchUuidAssignment_2_1)
+{ after(grammarAccess.getXAttributeTypeRefAccess().getBranchUuidAssignment_2_1()); }
)
;
@@ -9266,14 +9266,14 @@ finally {
restoreStackSize(stackSize);
}
-rule__XAttributeTypeRef__BranchGuidAssignment_2_1
+rule__XAttributeTypeRef__BranchUuidAssignment_2_1
@init {
int stackSize = keepStackSize();
}
:
(
-{ before(grammarAccess.getXAttributeTypeRefAccess().getBranchGuidSTRINGTerminalRuleCall_2_1_0()); }
- RULE_STRING{ after(grammarAccess.getXAttributeTypeRefAccess().getBranchGuidSTRINGTerminalRuleCall_2_1_0()); }
+{ before(grammarAccess.getXAttributeTypeRefAccess().getBranchUuidWHOLE_NUM_STRTerminalRuleCall_2_1_0()); }
+ RULE_WHOLE_NUM_STR{ after(grammarAccess.getXAttributeTypeRefAccess().getBranchUuidWHOLE_NUM_STRTerminalRuleCall_2_1_0()); }
)
;
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.tokens b/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.tokens
index d64c0cee34..356f27ed93 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.tokens
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.tokens
@@ -142,7 +142,6 @@ RULE_WS=11
'DefaultAttributeTaggerProvider'=17
'DENY'=47
'JavaObjectAttribute'=25
-'branchGuid'=45
'oseeEnumType'=72
'sideAName'=81
'role'=92
@@ -177,6 +176,7 @@ RULE_WS=11
'UriAttributeDataProvider'=15
'attribute'=60
'min'=63
+'branchUuid'=45
'ALL'=13
'guid'=59
'fileExtension'=70
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDslLexer.java b/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDslLexer.java
index 0fdf708969..212ce21245 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDslLexer.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDslLexer.java
@@ -800,10 +800,10 @@ public class InternalOseeDslLexer extends Lexer {
try {
int _type = T__45;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:43:7: ( 'branchGuid' )
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:43:9: 'branchGuid'
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:43:7: ( 'branchUuid' )
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:43:9: 'branchUuid'
{
- match("branchGuid");
+ match("branchUuid");
}
@@ -3330,7 +3330,7 @@ public class InternalOseeDslLexer extends Lexer {
"\154\1\124\1\160\1\151\1\156\1\162\1\170\1\145\1\151\1\uffff\2\101"+
"\1\60\1\162\1\uffff\1\143\2\164\2\162\1\164\1\60\1\156\1\122\1\163"+
"\1\141\1\156\1\162\1\164\1\147\1\152\1\101\2\60\1\164\1\145\1\137"+
- "\1\117\1\143\1\165\1\103\1\143\1\107\1\60\1\164\1\163\1\160\1\165"+
+ "\1\117\1\143\1\165\1\103\1\143\1\116\1\60\1\164\1\163\1\160\1\165"+
"\1\uffff\1\157\1\160\1\164\1\171\1\154\1\144\1\165\1\111\1\164\1"+
"\60\1\157\1\141\1\162\1\141\1\162\1\uffff\1\145\1\164\1\101\1\162"+
"\1\151\2\145\1\uffff\1\101\1\145\1\163\1\164\1\147\1\101\2\162\1"+
@@ -3403,7 +3403,7 @@ public class InternalOseeDslLexer extends Lexer {
"\151\1\156\1\162\1\170\1\145\1\151\1\uffff\2\116\1\172\1\162\1\uffff"+
"\1\143\2\164\2\162\1\164\1\172\1\156\1\122\1\163\1\141\1\156\1\162"+
"\1\164\1\147\1\152\1\101\2\172\1\164\1\145\1\137\1\117\1\143\1\165"+
- "\1\103\1\143\1\116\1\172\1\164\1\163\1\160\1\165\1\uffff\1\157\1"+
+ "\1\103\1\143\1\125\1\172\1\164\1\163\1\160\1\165\1\uffff\1\157\1"+
"\160\1\164\1\171\1\154\1\144\1\165\1\111\1\164\1\172\1\157\1\141"+
"\1\162\1\141\1\162\1\uffff\1\145\1\164\1\101\1\162\1\151\2\145\1"+
"\uffff\1\101\1\145\1\163\1\164\1\147\1\101\2\162\1\145\1\164\2\uffff"+
@@ -3800,7 +3800,7 @@ public class InternalOseeDslLexer extends Lexer {
"\1\u0172",
"\1\u0173",
"\1\u0174",
- "\1\u0176\6\uffff\1\u0175",
+ "\1\u0175\6\uffff\1\u0176",
"\12\61\7\uffff\32\61\4\uffff\1\61\1\uffff\32\61",
"\1\u0178",
"\1\u0179",
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDslParser.java b/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDslParser.java
index bb08f0c89e..2571ac25b2 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDslParser.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDslParser.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
@SuppressWarnings("all")
public class InternalOseeDslParser extends AbstractInternalContentAssistParser {
public static final String[] tokenNames = new String[] {
- "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_WHOLE_NUM_STR", "RULE_ID", "RULE_STRING", "RULE_HEX_INT", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'ALL'", "'DefaultAttributeDataProvider'", "'UriAttributeDataProvider'", "'unlimited'", "'DefaultAttributeTaggerProvider'", "'BooleanAttribute'", "'CompressedContentAttribute'", "'DateAttribute'", "'EnumeratedAttribute'", "'FloatingPointAttribute'", "'IntegerAttribute'", "'LongAttribute'", "'JavaObjectAttribute'", "'StringAttribute'", "'ArtifactReferenceAttribute'", "'BranchReferenceAttribute'", "'WordAttribute'", "'OutlineNumberAttribute'", "'Lexicographical_Ascending'", "'Lexicographical_Descending'", "'Unordered'", "'ONE_TO_ONE'", "'ONE_TO_MANY'", "'MANY_TO_ONE'", "'MANY_TO_MANY'", "'EQ'", "'LIKE'", "'AND'", "'OR'", "'artifactName'", "'artifactGuid'", "'branchName'", "'branchGuid'", "'ALLOW'", "'DENY'", "'SIDE_A'", "'SIDE_B'", "'BOTH'", "'import'", "'.'", "'artifactType'", "'{'", "'uuid'", "'}'", "'extends'", "','", "'guid'", "'attribute'", "'attributeType'", "'dataProvider'", "'min'", "'max'", "'overrides'", "'taggerId'", "'enumType'", "'description'", "'defaultValue'", "'fileExtension'", "'mediaType'", "'oseeEnumType'", "'entry'", "'entryGuid'", "'overrides enum'", "'add'", "'remove'", "'overrides artifactType'", "'update'", "'relationType'", "'sideAName'", "'sideAArtifactType'", "'sideBName'", "'sideBArtifactType'", "'defaultOrderType'", "'multiplicity'", "'('", "')'", "'artifactMatcher'", "'where'", "';'", "'role'", "'accessContext'", "'childrenOf'", "'artifact'", "'edit'", "'of'", "'abstract'", "'inheritAll'"
+ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_WHOLE_NUM_STR", "RULE_ID", "RULE_STRING", "RULE_HEX_INT", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'ALL'", "'DefaultAttributeDataProvider'", "'UriAttributeDataProvider'", "'unlimited'", "'DefaultAttributeTaggerProvider'", "'BooleanAttribute'", "'CompressedContentAttribute'", "'DateAttribute'", "'EnumeratedAttribute'", "'FloatingPointAttribute'", "'IntegerAttribute'", "'LongAttribute'", "'JavaObjectAttribute'", "'StringAttribute'", "'ArtifactReferenceAttribute'", "'BranchReferenceAttribute'", "'WordAttribute'", "'OutlineNumberAttribute'", "'Lexicographical_Ascending'", "'Lexicographical_Descending'", "'Unordered'", "'ONE_TO_ONE'", "'ONE_TO_MANY'", "'MANY_TO_ONE'", "'MANY_TO_MANY'", "'EQ'", "'LIKE'", "'AND'", "'OR'", "'artifactName'", "'artifactGuid'", "'branchName'", "'branchUuid'", "'ALLOW'", "'DENY'", "'SIDE_A'", "'SIDE_B'", "'BOTH'", "'import'", "'.'", "'artifactType'", "'{'", "'uuid'", "'}'", "'extends'", "','", "'guid'", "'attribute'", "'attributeType'", "'dataProvider'", "'min'", "'max'", "'overrides'", "'taggerId'", "'enumType'", "'description'", "'defaultValue'", "'fileExtension'", "'mediaType'", "'oseeEnumType'", "'entry'", "'entryGuid'", "'overrides enum'", "'add'", "'remove'", "'overrides artifactType'", "'update'", "'relationType'", "'sideAName'", "'sideAArtifactType'", "'sideBName'", "'sideBArtifactType'", "'defaultOrderType'", "'multiplicity'", "'('", "')'", "'artifactMatcher'", "'where'", "';'", "'role'", "'accessContext'", "'childrenOf'", "'artifact'", "'edit'", "'of'", "'abstract'", "'inheritAll'"
};
public static final int RULE_ID=5;
public static final int T__29=29;
@@ -5676,13 +5676,13 @@ public class InternalOseeDslParser extends AbstractInternalContentAssistParser {
// $ANTLR start "rule__MatchField__Alternatives"
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:1894:1: rule__MatchField__Alternatives : ( ( ( 'artifactName' ) ) | ( ( 'artifactGuid' ) ) | ( ( 'branchName' ) ) | ( ( 'branchGuid' ) ) );
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:1894:1: rule__MatchField__Alternatives : ( ( ( 'artifactName' ) ) | ( ( 'artifactGuid' ) ) | ( ( 'branchName' ) ) | ( ( 'branchUuid' ) ) );
public final void rule__MatchField__Alternatives() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:1898:1: ( ( ( 'artifactName' ) ) | ( ( 'artifactGuid' ) ) | ( ( 'branchName' ) ) | ( ( 'branchGuid' ) ) )
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:1898:1: ( ( ( 'artifactName' ) ) | ( ( 'artifactGuid' ) ) | ( ( 'branchName' ) ) | ( ( 'branchUuid' ) ) )
int alt20=4;
switch ( input.LA(1) ) {
case 42:
@@ -5777,20 +5777,20 @@ public class InternalOseeDslParser extends AbstractInternalContentAssistParser {
}
break;
case 4 :
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:1920:6: ( ( 'branchGuid' ) )
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:1920:6: ( ( 'branchUuid' ) )
{
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:1920:6: ( ( 'branchGuid' ) )
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:1921:1: ( 'branchGuid' )
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:1920:6: ( ( 'branchUuid' ) )
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:1921:1: ( 'branchUuid' )
{
- before(grammarAccess.getMatchFieldAccess().getBranchGuidEnumLiteralDeclaration_3());
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:1922:1: ( 'branchGuid' )
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:1922:3: 'branchGuid'
+ before(grammarAccess.getMatchFieldAccess().getBranchUuidEnumLiteralDeclaration_3());
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:1922:1: ( 'branchUuid' )
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:1922:3: 'branchUuid'
{
match(input,45,FOLLOW_45_in_rule__MatchField__Alternatives4174);
}
- after(grammarAccess.getMatchFieldAccess().getBranchGuidEnumLiteralDeclaration_3());
+ after(grammarAccess.getMatchFieldAccess().getBranchUuidEnumLiteralDeclaration_3());
}
@@ -8501,21 +8501,21 @@ public class InternalOseeDslParser extends AbstractInternalContentAssistParser {
// $ANTLR start "rule__XAttributeTypeRef__Group_2__0__Impl"
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2911:1: rule__XAttributeTypeRef__Group_2__0__Impl : ( 'branchGuid' ) ;
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2911:1: rule__XAttributeTypeRef__Group_2__0__Impl : ( 'branchUuid' ) ;
public final void rule__XAttributeTypeRef__Group_2__0__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2915:1: ( ( 'branchGuid' ) )
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2916:1: ( 'branchGuid' )
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2915:1: ( ( 'branchUuid' ) )
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2916:1: ( 'branchUuid' )
{
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2916:1: ( 'branchGuid' )
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2917:1: 'branchGuid'
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2916:1: ( 'branchUuid' )
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2917:1: 'branchUuid'
{
- before(grammarAccess.getXAttributeTypeRefAccess().getBranchGuidKeyword_2_0());
+ before(grammarAccess.getXAttributeTypeRefAccess().getBranchUuidKeyword_2_0());
match(input,45,FOLLOW_45_in_rule__XAttributeTypeRef__Group_2__0__Impl6172);
- after(grammarAccess.getXAttributeTypeRefAccess().getBranchGuidKeyword_2_0());
+ after(grammarAccess.getXAttributeTypeRefAccess().getBranchUuidKeyword_2_0());
}
@@ -8571,31 +8571,31 @@ public class InternalOseeDslParser extends AbstractInternalContentAssistParser {
// $ANTLR start "rule__XAttributeTypeRef__Group_2__1__Impl"
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2941:1: rule__XAttributeTypeRef__Group_2__1__Impl : ( ( rule__XAttributeTypeRef__BranchGuidAssignment_2_1 ) ) ;
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2941:1: rule__XAttributeTypeRef__Group_2__1__Impl : ( ( rule__XAttributeTypeRef__BranchUuidAssignment_2_1 ) ) ;
public final void rule__XAttributeTypeRef__Group_2__1__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2945:1: ( ( ( rule__XAttributeTypeRef__BranchGuidAssignment_2_1 ) ) )
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2946:1: ( ( rule__XAttributeTypeRef__BranchGuidAssignment_2_1 ) )
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2945:1: ( ( ( rule__XAttributeTypeRef__BranchUuidAssignment_2_1 ) ) )
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2946:1: ( ( rule__XAttributeTypeRef__BranchUuidAssignment_2_1 ) )
{
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2946:1: ( ( rule__XAttributeTypeRef__BranchGuidAssignment_2_1 ) )
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2947:1: ( rule__XAttributeTypeRef__BranchGuidAssignment_2_1 )
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2946:1: ( ( rule__XAttributeTypeRef__BranchUuidAssignment_2_1 ) )
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2947:1: ( rule__XAttributeTypeRef__BranchUuidAssignment_2_1 )
{
- before(grammarAccess.getXAttributeTypeRefAccess().getBranchGuidAssignment_2_1());
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2948:1: ( rule__XAttributeTypeRef__BranchGuidAssignment_2_1 )
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2948:2: rule__XAttributeTypeRef__BranchGuidAssignment_2_1
+ before(grammarAccess.getXAttributeTypeRefAccess().getBranchUuidAssignment_2_1());
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2948:1: ( rule__XAttributeTypeRef__BranchUuidAssignment_2_1 )
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:2948:2: rule__XAttributeTypeRef__BranchUuidAssignment_2_1
{
- pushFollow(FOLLOW_rule__XAttributeTypeRef__BranchGuidAssignment_2_1_in_rule__XAttributeTypeRef__Group_2__1__Impl6230);
- rule__XAttributeTypeRef__BranchGuidAssignment_2_1();
+ pushFollow(FOLLOW_rule__XAttributeTypeRef__BranchUuidAssignment_2_1_in_rule__XAttributeTypeRef__Group_2__1__Impl6230);
+ rule__XAttributeTypeRef__BranchUuidAssignment_2_1();
state._fsp--;
}
- after(grammarAccess.getXAttributeTypeRefAccess().getBranchGuidAssignment_2_1());
+ after(grammarAccess.getXAttributeTypeRefAccess().getBranchUuidAssignment_2_1());
}
@@ -24920,22 +24920,22 @@ public class InternalOseeDslParser extends AbstractInternalContentAssistParser {
// $ANTLR end "rule__XAttributeTypeRef__ValidAttributeTypeAssignment_1"
- // $ANTLR start "rule__XAttributeTypeRef__BranchGuidAssignment_2_1"
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:9269:1: rule__XAttributeTypeRef__BranchGuidAssignment_2_1 : ( RULE_STRING ) ;
- public final void rule__XAttributeTypeRef__BranchGuidAssignment_2_1() throws RecognitionException {
+ // $ANTLR start "rule__XAttributeTypeRef__BranchUuidAssignment_2_1"
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:9269:1: rule__XAttributeTypeRef__BranchUuidAssignment_2_1 : ( RULE_WHOLE_NUM_STR ) ;
+ public final void rule__XAttributeTypeRef__BranchUuidAssignment_2_1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:9273:1: ( ( RULE_STRING ) )
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:9274:1: ( RULE_STRING )
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:9273:1: ( ( RULE_WHOLE_NUM_STR ) )
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:9274:1: ( RULE_WHOLE_NUM_STR )
{
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:9274:1: ( RULE_STRING )
- // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:9275:1: RULE_STRING
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:9274:1: ( RULE_WHOLE_NUM_STR )
+ // ../org.eclipse.osee.framework.core.dsl.ui/src-gen/org/eclipse/osee/framework/core/dsl/ui/contentassist/antlr/internal/InternalOseeDsl.g:9275:1: RULE_WHOLE_NUM_STR
{
- before(grammarAccess.getXAttributeTypeRefAccess().getBranchGuidSTRINGTerminalRuleCall_2_1_0());
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__XAttributeTypeRef__BranchGuidAssignment_2_119039);
- after(grammarAccess.getXAttributeTypeRefAccess().getBranchGuidSTRINGTerminalRuleCall_2_1_0());
+ before(grammarAccess.getXAttributeTypeRefAccess().getBranchUuidWHOLE_NUM_STRTerminalRuleCall_2_1_0());
+ match(input,RULE_WHOLE_NUM_STR,FOLLOW_RULE_WHOLE_NUM_STR_in_rule__XAttributeTypeRef__BranchUuidAssignment_2_119039);
+ after(grammarAccess.getXAttributeTypeRefAccess().getBranchUuidWHOLE_NUM_STRTerminalRuleCall_2_1_0());
}
@@ -24954,7 +24954,7 @@ public class InternalOseeDslParser extends AbstractInternalContentAssistParser {
}
return ;
}
- // $ANTLR end "rule__XAttributeTypeRef__BranchGuidAssignment_2_1"
+ // $ANTLR end "rule__XAttributeTypeRef__BranchUuidAssignment_2_1"
// $ANTLR start "rule__XAttributeType__NameAssignment_1"
@@ -28570,11 +28570,11 @@ public class InternalOseeDslParser extends AbstractInternalContentAssistParser {
public static final BitSet FOLLOW_rule__XAttributeTypeRef__ValidAttributeTypeAssignment_1_in_rule__XAttributeTypeRef__Group__1__Impl6047 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__XAttributeTypeRef__Group__2__Impl_in_rule__XAttributeTypeRef__Group__26077 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__XAttributeTypeRef__Group_2__0_in_rule__XAttributeTypeRef__Group__2__Impl6104 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__XAttributeTypeRef__Group_2__0__Impl_in_rule__XAttributeTypeRef__Group_2__06141 = new BitSet(new long[]{0x0000000000000040L});
+ public static final BitSet FOLLOW_rule__XAttributeTypeRef__Group_2__0__Impl_in_rule__XAttributeTypeRef__Group_2__06141 = new BitSet(new long[]{0x0000000000000010L});
public static final BitSet FOLLOW_rule__XAttributeTypeRef__Group_2__1_in_rule__XAttributeTypeRef__Group_2__06144 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_45_in_rule__XAttributeTypeRef__Group_2__0__Impl6172 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__XAttributeTypeRef__Group_2__1__Impl_in_rule__XAttributeTypeRef__Group_2__16203 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__XAttributeTypeRef__BranchGuidAssignment_2_1_in_rule__XAttributeTypeRef__Group_2__1__Impl6230 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_rule__XAttributeTypeRef__BranchUuidAssignment_2_1_in_rule__XAttributeTypeRef__Group_2__1__Impl6230 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__XAttributeType__Group__0__Impl_in_rule__XAttributeType__Group__06264 = new BitSet(new long[]{0x0000000000000040L});
public static final BitSet FOLLOW_rule__XAttributeType__Group__1_in_rule__XAttributeType__Group__06267 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_61_in_rule__XAttributeType__Group__0__Impl6295 = new BitSet(new long[]{0x0000000000000002L});
@@ -29115,7 +29115,7 @@ public class InternalOseeDslParser extends AbstractInternalContentAssistParser {
public static final BitSet FOLLOW_RULE_HEX_INT_in_rule__XArtifactType__UuidAssignment_718938 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleXAttributeTypeRef_in_rule__XArtifactType__ValidAttributeTypesAssignment_818969 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_RULE_STRING_in_rule__XAttributeTypeRef__ValidAttributeTypeAssignment_119004 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_STRING_in_rule__XAttributeTypeRef__BranchGuidAssignment_2_119039 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_WHOLE_NUM_STR_in_rule__XAttributeTypeRef__BranchUuidAssignment_2_119039 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_RULE_STRING_in_rule__XAttributeType__NameAssignment_119070 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleAttributeBaseType_in_rule__XAttributeType__BaseAttributeTypeAssignment_2_119101 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_RULE_STRING_in_rule__XAttributeType__OverrideAssignment_3_119136 = new BitSet(new long[]{0x0000000000000002L});
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui/src/org/eclipse/osee/framework/core/dsl/ui/contentassist/OseeDslProposalProvider.java b/plugins/org.eclipse.osee.framework.core.dsl.ui/src/org/eclipse/osee/framework/core/dsl/ui/contentassist/OseeDslProposalProvider.java
index 06b16f4e44..6ae64a91b7 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui/src/org/eclipse/osee/framework/core/dsl/ui/contentassist/OseeDslProposalProvider.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui/src/org/eclipse/osee/framework/core/dsl/ui/contentassist/OseeDslProposalProvider.java
@@ -35,8 +35,8 @@ public class OseeDslProposalProvider extends AbstractOseeDslProposalProvider {
}
@Override
- public void completeXAttributeTypeRef_BranchGuid(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- super.completeXAttributeTypeRef_BranchGuid(model, assignment, context, acceptor);
+ public void completeXAttributeTypeRef_BranchUuid(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+ super.completeXAttributeTypeRef_BranchUuid(model, assignment, context, acceptor);
completeGuidGeneration((RuleCall) assignment.getTerminal(), context, acceptor);
}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF
index 6de0d657a4..b9299ce07b 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF
@@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.3.0";visibility:=reexport,
org.eclipse.xtext.common.types,
org.eclipse.xtext.xbase.lib;bundle-version="2.3.0"
Import-Package: org.apache.commons.logging,
- org.apache.log4j;version="1.2.15"
+ org.apache.log4j;version="1.2.15",
+ org.slf4j
Export-Package: org.eclipse.osee.framework.core.dsl,
org.eclipse.osee.framework.core.dsl.conversion,
org.eclipse.osee.framework.core.dsl.oseeDsl,
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/OseeDsl.ecore b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/OseeDsl.ecore
index dc75a14199..1edbb09588 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/OseeDsl.ecore
+++ b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/OseeDsl.ecore
@@ -42,7 +42,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XAttributeTypeRef">
<eStructuralFeatures xsi:type="ecore:EReference" name="validAttributeType" eType="#//XAttributeType"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="branchGuid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="branchUuid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XAttributeType" eSuperTypes="#//OseeType">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="baseAttributeType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -128,7 +128,7 @@
<eLiterals name="artifactName" literal="artifactName"/>
<eLiterals name="artifactGuid" value="1" literal="artifactGuid"/>
<eLiterals name="branchName" value="2" literal="branchName"/>
- <eLiterals name="branchGuid" value="3" literal="branchGuid"/>
+ <eLiterals name="branchUuid" value="3" literal="branchUuid"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Condition"/>
<eClassifiers xsi:type="ecore:EClass" name="SimpleCondition" eSuperTypes="#//Condition">
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/OseeDsl.genmodel b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/OseeDsl.genmodel
index d23c91671d..99836d056f 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/OseeDsl.genmodel
+++ b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/OseeDsl.genmodel
@@ -25,7 +25,7 @@
<genEnumLiterals ecoreEnumLiteral="OseeDsl.ecore#//MatchField/artifactName"/>
<genEnumLiterals ecoreEnumLiteral="OseeDsl.ecore#//MatchField/artifactGuid"/>
<genEnumLiterals ecoreEnumLiteral="OseeDsl.ecore#//MatchField/branchName"/>
- <genEnumLiterals ecoreEnumLiteral="OseeDsl.ecore#//MatchField/branchGuid"/>
+ <genEnumLiterals ecoreEnumLiteral="OseeDsl.ecore#//MatchField/branchUuid"/>
</genEnums>
<genEnums typeSafeEnumCompatible="false" ecoreEnum="OseeDsl.ecore#//AccessPermissionEnum">
<genEnumLiterals ecoreEnumLiteral="OseeDsl.ecore#//AccessPermissionEnum/ALLOW"/>
@@ -67,7 +67,7 @@
</genClasses>
<genClasses ecoreClass="OseeDsl.ecore#//XAttributeTypeRef">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference OseeDsl.ecore#//XAttributeTypeRef/validAttributeType"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute OseeDsl.ecore#//XAttributeTypeRef/branchGuid"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute OseeDsl.ecore#//XAttributeTypeRef/branchUuid"/>
</genClasses>
<genClasses ecoreClass="OseeDsl.ecore#//XAttributeType">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute OseeDsl.ecore#//XAttributeType/baseAttributeType"/>
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/OseeDsl.xtextbin b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/OseeDsl.xtextbin
index 9ea79ae752..b4d411fa6d 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/OseeDsl.xtextbin
+++ b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/OseeDsl.xtextbin
Binary files differ
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/MatchField.java b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/MatchField.java
index e67e00a507..d791ff4085 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/MatchField.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/MatchField.java
@@ -50,14 +50,14 @@ public enum MatchField implements Enumerator
BRANCH_NAME(2, "branchName", "branchName"),
/**
- * The '<em><b>Branch Guid</b></em>' literal object.
+ * The '<em><b>Branch Uuid</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #BRANCH_GUID_VALUE
+ * @see #BRANCH_UUID_VALUE
* @generated
* @ordered
*/
- BRANCH_GUID(3, "branchGuid", "branchGuid");
+ BRANCH_UUID(3, "branchUuid", "branchUuid");
/**
* The '<em><b>Artifact Name</b></em>' literal value.
@@ -105,19 +105,19 @@ public enum MatchField implements Enumerator
public static final int BRANCH_NAME_VALUE = 2;
/**
- * The '<em><b>Branch Guid</b></em>' literal value.
+ * The '<em><b>Branch Uuid</b></em>' literal value.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of '<em><b>Branch Guid</b></em>' literal object isn't clear,
+ * If the meaning of '<em><b>Branch Uuid</b></em>' literal object isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @see #BRANCH_GUID
- * @model name="branchGuid"
+ * @see #BRANCH_UUID
+ * @model name="branchUuid"
* @generated
* @ordered
*/
- public static final int BRANCH_GUID_VALUE = 3;
+ public static final int BRANCH_UUID_VALUE = 3;
/**
* An array of all the '<em><b>Match Field</b></em>' enumerators.
@@ -131,7 +131,7 @@ public enum MatchField implements Enumerator
ARTIFACT_NAME,
ARTIFACT_GUID,
BRANCH_NAME,
- BRANCH_GUID,
+ BRANCH_UUID,
};
/**
@@ -193,7 +193,7 @@ public enum MatchField implements Enumerator
case ARTIFACT_NAME_VALUE: return ARTIFACT_NAME;
case ARTIFACT_GUID_VALUE: return ARTIFACT_GUID;
case BRANCH_NAME_VALUE: return BRANCH_NAME;
- case BRANCH_GUID_VALUE: return BRANCH_GUID;
+ case BRANCH_UUID_VALUE: return BRANCH_UUID;
}
return null;
}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/OseeDslPackage.java b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/OseeDslPackage.java
index f58e2e7ffc..e679eb6b20 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/OseeDslPackage.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/OseeDslPackage.java
@@ -352,13 +352,13 @@ public interface OseeDslPackage extends EPackage
int XATTRIBUTE_TYPE_REF__VALID_ATTRIBUTE_TYPE = 0;
/**
- * The feature id for the '<em><b>Branch Guid</b></em>' attribute.
+ * The feature id for the '<em><b>Branch Uuid</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int XATTRIBUTE_TYPE_REF__BRANCH_GUID = 1;
+ int XATTRIBUTE_TYPE_REF__BRANCH_UUID = 1;
/**
* The number of structural features of the '<em>XAttribute Type Ref</em>' class.
@@ -2053,15 +2053,15 @@ public interface OseeDslPackage extends EPackage
EReference getXAttributeTypeRef_ValidAttributeType();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.osee.framework.core.dsl.oseeDsl.XAttributeTypeRef#getBranchGuid <em>Branch Guid</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.osee.framework.core.dsl.oseeDsl.XAttributeTypeRef#getBranchUuid <em>Branch Uuid</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Branch Guid</em>'.
- * @see org.eclipse.osee.framework.core.dsl.oseeDsl.XAttributeTypeRef#getBranchGuid()
+ * @return the meta object for the attribute '<em>Branch Uuid</em>'.
+ * @see org.eclipse.osee.framework.core.dsl.oseeDsl.XAttributeTypeRef#getBranchUuid()
* @see #getXAttributeTypeRef()
* @generated
*/
- EAttribute getXAttributeTypeRef_BranchGuid();
+ EAttribute getXAttributeTypeRef_BranchUuid();
/**
* Returns the meta object for class '{@link org.eclipse.osee.framework.core.dsl.oseeDsl.XAttributeType <em>XAttribute Type</em>}'.
@@ -3463,12 +3463,12 @@ public interface OseeDslPackage extends EPackage
EReference XATTRIBUTE_TYPE_REF__VALID_ATTRIBUTE_TYPE = eINSTANCE.getXAttributeTypeRef_ValidAttributeType();
/**
- * The meta object literal for the '<em><b>Branch Guid</b></em>' attribute feature.
+ * The meta object literal for the '<em><b>Branch Uuid</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EAttribute XATTRIBUTE_TYPE_REF__BRANCH_GUID = eINSTANCE.getXAttributeTypeRef_BranchGuid();
+ EAttribute XATTRIBUTE_TYPE_REF__BRANCH_UUID = eINSTANCE.getXAttributeTypeRef_BranchUuid();
/**
* The meta object literal for the '{@link org.eclipse.osee.framework.core.dsl.oseeDsl.impl.XAttributeTypeImpl <em>XAttribute Type</em>}' class.
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/XAttributeTypeRef.java b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/XAttributeTypeRef.java
index 90934b132b..1f53857a57 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/XAttributeTypeRef.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/XAttributeTypeRef.java
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EObject;
* The following features are supported:
* <ul>
* <li>{@link org.eclipse.osee.framework.core.dsl.oseeDsl.XAttributeTypeRef#getValidAttributeType <em>Valid Attribute Type</em>}</li>
- * <li>{@link org.eclipse.osee.framework.core.dsl.oseeDsl.XAttributeTypeRef#getBranchGuid <em>Branch Guid</em>}</li>
+ * <li>{@link org.eclipse.osee.framework.core.dsl.oseeDsl.XAttributeTypeRef#getBranchUuid <em>Branch Uuid</em>}</li>
* </ul>
* </p>
*
@@ -50,29 +50,29 @@ public interface XAttributeTypeRef extends EObject
void setValidAttributeType(XAttributeType value);
/**
- * Returns the value of the '<em><b>Branch Guid</b></em>' attribute.
+ * Returns the value of the '<em><b>Branch Uuid</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Branch Guid</em>' attribute isn't clear,
+ * If the meaning of the '<em>Branch Uuid</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Branch Guid</em>' attribute.
- * @see #setBranchGuid(String)
- * @see org.eclipse.osee.framework.core.dsl.oseeDsl.OseeDslPackage#getXAttributeTypeRef_BranchGuid()
+ * @return the value of the '<em>Branch Uuid</em>' attribute.
+ * @see #setBranchUuid(String)
+ * @see org.eclipse.osee.framework.core.dsl.oseeDsl.OseeDslPackage#getXAttributeTypeRef_BranchUuid()
* @model
* @generated
*/
- String getBranchGuid();
+ String getBranchUuid();
/**
- * Sets the value of the '{@link org.eclipse.osee.framework.core.dsl.oseeDsl.XAttributeTypeRef#getBranchGuid <em>Branch Guid</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.osee.framework.core.dsl.oseeDsl.XAttributeTypeRef#getBranchUuid <em>Branch Uuid</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Branch Guid</em>' attribute.
- * @see #getBranchGuid()
+ * @param value the new value of the '<em>Branch Uuid</em>' attribute.
+ * @see #getBranchUuid()
* @generated
*/
- void setBranchGuid(String value);
+ void setBranchUuid(String value);
} // XAttributeTypeRef
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/impl/OseeDslPackageImpl.java b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/impl/OseeDslPackageImpl.java
index 63319f2b3f..85b3240313 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/impl/OseeDslPackageImpl.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/impl/OseeDslPackageImpl.java
@@ -681,7 +681,7 @@ public class OseeDslPackageImpl extends EPackageImpl implements OseeDslPackage
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getXAttributeTypeRef_BranchGuid()
+ public EAttribute getXAttributeTypeRef_BranchUuid()
{
return (EAttribute)xAttributeTypeRefEClass.getEStructuralFeatures().get(1);
}
@@ -1845,7 +1845,7 @@ public class OseeDslPackageImpl extends EPackageImpl implements OseeDslPackage
xAttributeTypeRefEClass = createEClass(XATTRIBUTE_TYPE_REF);
createEReference(xAttributeTypeRefEClass, XATTRIBUTE_TYPE_REF__VALID_ATTRIBUTE_TYPE);
- createEAttribute(xAttributeTypeRefEClass, XATTRIBUTE_TYPE_REF__BRANCH_GUID);
+ createEAttribute(xAttributeTypeRefEClass, XATTRIBUTE_TYPE_REF__BRANCH_UUID);
xAttributeTypeEClass = createEClass(XATTRIBUTE_TYPE);
createEAttribute(xAttributeTypeEClass, XATTRIBUTE_TYPE__BASE_ATTRIBUTE_TYPE);
@@ -2070,7 +2070,7 @@ public class OseeDslPackageImpl extends EPackageImpl implements OseeDslPackage
initEClass(xAttributeTypeRefEClass, XAttributeTypeRef.class, "XAttributeTypeRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getXAttributeTypeRef_ValidAttributeType(), this.getXAttributeType(), null, "validAttributeType", null, 0, 1, XAttributeTypeRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getXAttributeTypeRef_BranchGuid(), ecorePackage.getEString(), "branchGuid", null, 0, 1, XAttributeTypeRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getXAttributeTypeRef_BranchUuid(), ecorePackage.getEString(), "branchUuid", null, 0, 1, XAttributeTypeRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xAttributeTypeEClass, XAttributeType.class, "XAttributeType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXAttributeType_BaseAttributeType(), ecorePackage.getEString(), "baseAttributeType", null, 0, 1, XAttributeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2225,7 +2225,7 @@ public class OseeDslPackageImpl extends EPackageImpl implements OseeDslPackage
addEEnumLiteral(matchFieldEEnum, MatchField.ARTIFACT_NAME);
addEEnumLiteral(matchFieldEEnum, MatchField.ARTIFACT_GUID);
addEEnumLiteral(matchFieldEEnum, MatchField.BRANCH_NAME);
- addEEnumLiteral(matchFieldEEnum, MatchField.BRANCH_GUID);
+ addEEnumLiteral(matchFieldEEnum, MatchField.BRANCH_UUID);
initEEnum(accessPermissionEnumEEnum, AccessPermissionEnum.class, "AccessPermissionEnum");
addEEnumLiteral(accessPermissionEnumEEnum, AccessPermissionEnum.ALLOW);
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/impl/XAttributeTypeRefImpl.java b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/impl/XAttributeTypeRefImpl.java
index 915ec4d724..bc2152fcf6 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/impl/XAttributeTypeRefImpl.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/oseeDsl/impl/XAttributeTypeRefImpl.java
@@ -22,7 +22,7 @@ import org.eclipse.osee.framework.core.dsl.oseeDsl.XAttributeTypeRef;
* The following features are implemented:
* <ul>
* <li>{@link org.eclipse.osee.framework.core.dsl.oseeDsl.impl.XAttributeTypeRefImpl#getValidAttributeType <em>Valid Attribute Type</em>}</li>
- * <li>{@link org.eclipse.osee.framework.core.dsl.oseeDsl.impl.XAttributeTypeRefImpl#getBranchGuid <em>Branch Guid</em>}</li>
+ * <li>{@link org.eclipse.osee.framework.core.dsl.oseeDsl.impl.XAttributeTypeRefImpl#getBranchUuid <em>Branch Uuid</em>}</li>
* </ul>
* </p>
*
@@ -41,24 +41,24 @@ public class XAttributeTypeRefImpl extends MinimalEObjectImpl.Container implemen
protected XAttributeType validAttributeType;
/**
- * The default value of the '{@link #getBranchGuid() <em>Branch Guid</em>}' attribute.
+ * The default value of the '{@link #getBranchUuid() <em>Branch Uuid</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getBranchGuid()
+ * @see #getBranchUuid()
* @generated
* @ordered
*/
- protected static final String BRANCH_GUID_EDEFAULT = null;
+ protected static final String BRANCH_UUID_EDEFAULT = null;
/**
- * The cached value of the '{@link #getBranchGuid() <em>Branch Guid</em>}' attribute.
+ * The cached value of the '{@link #getBranchUuid() <em>Branch Uuid</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getBranchGuid()
+ * @see #getBranchUuid()
* @generated
* @ordered
*/
- protected String branchGuid = BRANCH_GUID_EDEFAULT;
+ protected String branchUuid = BRANCH_UUID_EDEFAULT;
/**
* <!-- begin-user-doc -->
@@ -129,9 +129,9 @@ public class XAttributeTypeRefImpl extends MinimalEObjectImpl.Container implemen
* <!-- end-user-doc -->
* @generated
*/
- public String getBranchGuid()
+ public String getBranchUuid()
{
- return branchGuid;
+ return branchUuid;
}
/**
@@ -139,12 +139,12 @@ public class XAttributeTypeRefImpl extends MinimalEObjectImpl.Container implemen
* <!-- end-user-doc -->
* @generated
*/
- public void setBranchGuid(String newBranchGuid)
+ public void setBranchUuid(String newBranchUuid)
{
- String oldBranchGuid = branchGuid;
- branchGuid = newBranchGuid;
+ String oldBranchUuid = branchUuid;
+ branchUuid = newBranchUuid;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, OseeDslPackage.XATTRIBUTE_TYPE_REF__BRANCH_GUID, oldBranchGuid, branchGuid));
+ eNotify(new ENotificationImpl(this, Notification.SET, OseeDslPackage.XATTRIBUTE_TYPE_REF__BRANCH_UUID, oldBranchUuid, branchUuid));
}
/**
@@ -160,8 +160,8 @@ public class XAttributeTypeRefImpl extends MinimalEObjectImpl.Container implemen
case OseeDslPackage.XATTRIBUTE_TYPE_REF__VALID_ATTRIBUTE_TYPE:
if (resolve) return getValidAttributeType();
return basicGetValidAttributeType();
- case OseeDslPackage.XATTRIBUTE_TYPE_REF__BRANCH_GUID:
- return getBranchGuid();
+ case OseeDslPackage.XATTRIBUTE_TYPE_REF__BRANCH_UUID:
+ return getBranchUuid();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -179,8 +179,8 @@ public class XAttributeTypeRefImpl extends MinimalEObjectImpl.Container implemen
case OseeDslPackage.XATTRIBUTE_TYPE_REF__VALID_ATTRIBUTE_TYPE:
setValidAttributeType((XAttributeType)newValue);
return;
- case OseeDslPackage.XATTRIBUTE_TYPE_REF__BRANCH_GUID:
- setBranchGuid((String)newValue);
+ case OseeDslPackage.XATTRIBUTE_TYPE_REF__BRANCH_UUID:
+ setBranchUuid((String)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -199,8 +199,8 @@ public class XAttributeTypeRefImpl extends MinimalEObjectImpl.Container implemen
case OseeDslPackage.XATTRIBUTE_TYPE_REF__VALID_ATTRIBUTE_TYPE:
setValidAttributeType((XAttributeType)null);
return;
- case OseeDslPackage.XATTRIBUTE_TYPE_REF__BRANCH_GUID:
- setBranchGuid(BRANCH_GUID_EDEFAULT);
+ case OseeDslPackage.XATTRIBUTE_TYPE_REF__BRANCH_UUID:
+ setBranchUuid(BRANCH_UUID_EDEFAULT);
return;
}
super.eUnset(featureID);
@@ -218,8 +218,8 @@ public class XAttributeTypeRefImpl extends MinimalEObjectImpl.Container implemen
{
case OseeDslPackage.XATTRIBUTE_TYPE_REF__VALID_ATTRIBUTE_TYPE:
return validAttributeType != null;
- case OseeDslPackage.XATTRIBUTE_TYPE_REF__BRANCH_GUID:
- return BRANCH_GUID_EDEFAULT == null ? branchGuid != null : !BRANCH_GUID_EDEFAULT.equals(branchGuid);
+ case OseeDslPackage.XATTRIBUTE_TYPE_REF__BRANCH_UUID:
+ return BRANCH_UUID_EDEFAULT == null ? branchUuid != null : !BRANCH_UUID_EDEFAULT.equals(branchUuid);
}
return super.eIsSet(featureID);
}
@@ -235,8 +235,8 @@ public class XAttributeTypeRefImpl extends MinimalEObjectImpl.Container implemen
if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (branchGuid: ");
- result.append(branchGuid);
+ result.append(" (branchUuid: ");
+ result.append(branchUuid);
result.append(')');
return result.toString();
}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parseTreeConstruction/OseeDslParsetreeConstructor.java b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parseTreeConstruction/OseeDslParsetreeConstructor.java
index de60dfc34f..47feebae4f 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parseTreeConstruction/OseeDslParsetreeConstructor.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parseTreeConstruction/OseeDslParsetreeConstructor.java
@@ -1586,11 +1586,11 @@ protected class XArtifactType_RightCurlyBracketKeyword_9 extends KeywordToken {
/************ begin Rule XAttributeTypeRef ****************
*
* XAttributeTypeRef:
- * "attribute" validAttributeType=[XAttributeType|STRING] ("branchGuid" branchGuid=STRING)?;
+ * "attribute" validAttributeType=[XAttributeType|STRING] ("branchUuid" branchUuid=WHOLE_NUM_STR)?;
*
**/
-// "attribute" validAttributeType=[XAttributeType|STRING] ("branchGuid" branchGuid=STRING)?
+// "attribute" validAttributeType=[XAttributeType|STRING] ("branchUuid" branchUuid=WHOLE_NUM_STR)?
protected class XAttributeTypeRef_Group extends GroupToken {
public XAttributeTypeRef_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -1678,7 +1678,7 @@ protected class XAttributeTypeRef_ValidAttributeTypeAssignment_1 extends Assignm
}
-// ("branchGuid" branchGuid=STRING)?
+// ("branchUuid" branchUuid=WHOLE_NUM_STR)?
protected class XAttributeTypeRef_Group_2 extends GroupToken {
public XAttributeTypeRef_Group_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -1693,23 +1693,23 @@ protected class XAttributeTypeRef_Group_2 extends GroupToken {
@Override
public AbstractToken createFollower(int index, IEObjectConsumer inst) {
switch(index) {
- case 0: return new XAttributeTypeRef_BranchGuidAssignment_2_1(lastRuleCallOrigin, this, 0, inst);
+ case 0: return new XAttributeTypeRef_BranchUuidAssignment_2_1(lastRuleCallOrigin, this, 0, inst);
default: return null;
}
}
}
-// "branchGuid"
-protected class XAttributeTypeRef_BranchGuidKeyword_2_0 extends KeywordToken {
+// "branchUuid"
+protected class XAttributeTypeRef_BranchUuidKeyword_2_0 extends KeywordToken {
- public XAttributeTypeRef_BranchGuidKeyword_2_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
+ public XAttributeTypeRef_BranchUuidKeyword_2_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
}
@Override
public Keyword getGrammarElement() {
- return grammarAccess.getXAttributeTypeRefAccess().getBranchGuidKeyword_2_0();
+ return grammarAccess.getXAttributeTypeRefAccess().getBranchUuidKeyword_2_0();
}
@Override
@@ -1722,33 +1722,33 @@ protected class XAttributeTypeRef_BranchGuidKeyword_2_0 extends KeywordToken {
}
-// branchGuid=STRING
-protected class XAttributeTypeRef_BranchGuidAssignment_2_1 extends AssignmentToken {
+// branchUuid=WHOLE_NUM_STR
+protected class XAttributeTypeRef_BranchUuidAssignment_2_1 extends AssignmentToken {
- public XAttributeTypeRef_BranchGuidAssignment_2_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
+ public XAttributeTypeRef_BranchUuidAssignment_2_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
}
@Override
public Assignment getGrammarElement() {
- return grammarAccess.getXAttributeTypeRefAccess().getBranchGuidAssignment_2_1();
+ return grammarAccess.getXAttributeTypeRefAccess().getBranchUuidAssignment_2_1();
}
@Override
public AbstractToken createFollower(int index, IEObjectConsumer inst) {
switch(index) {
- case 0: return new XAttributeTypeRef_BranchGuidKeyword_2_0(lastRuleCallOrigin, this, 0, inst);
+ case 0: return new XAttributeTypeRef_BranchUuidKeyword_2_0(lastRuleCallOrigin, this, 0, inst);
default: return null;
}
}
@Override
public IEObjectConsumer tryConsume() {
- if((value = eObjectConsumer.getConsumable("branchGuid",false)) == null) return null;
- IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("branchGuid");
- if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getXAttributeTypeRefAccess().getBranchGuidSTRINGTerminalRuleCall_2_1_0(), value, null)) {
+ if((value = eObjectConsumer.getConsumable("branchUuid",false)) == null) return null;
+ IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("branchUuid");
+ if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getXAttributeTypeRefAccess().getBranchUuidWHOLE_NUM_STRTerminalRuleCall_2_1_0(), value, null)) {
type = AssignmentType.TERMINAL_RULE_CALL;
- element = grammarAccess.getXAttributeTypeRefAccess().getBranchGuidSTRINGTerminalRuleCall_2_1_0();
+ element = grammarAccess.getXAttributeTypeRefAccess().getBranchUuidWHOLE_NUM_STRTerminalRuleCall_2_1_0();
return obj;
}
return null;
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g
index a44007cdc3..fc1e7614df 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g
+++ b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g
@@ -611,15 +611,15 @@ ruleXAttributeTypeRef returns [EObject current=null]
}
)
-)( otherlv_2='branchGuid'
+)( otherlv_2='branchUuid'
{
- newLeafNode(otherlv_2, grammarAccess.getXAttributeTypeRefAccess().getBranchGuidKeyword_2_0());
+ newLeafNode(otherlv_2, grammarAccess.getXAttributeTypeRefAccess().getBranchUuidKeyword_2_0());
}
(
(
- lv_branchGuid_3_0=RULE_STRING
+ lv_branchUuid_3_0=RULE_WHOLE_NUM_STR
{
- newLeafNode(lv_branchGuid_3_0, grammarAccess.getXAttributeTypeRefAccess().getBranchGuidSTRINGTerminalRuleCall_2_1_0());
+ newLeafNode(lv_branchUuid_3_0, grammarAccess.getXAttributeTypeRefAccess().getBranchUuidWHOLE_NUM_STRTerminalRuleCall_2_1_0());
}
{
if ($current==null) {
@@ -627,9 +627,9 @@ ruleXAttributeTypeRef returns [EObject current=null]
}
setWithLastConsumed(
$current,
- "branchGuid",
- lv_branchGuid_3_0,
- "STRING");
+ "branchUuid",
+ lv_branchUuid_3_0,
+ "WHOLE_NUM_STR");
}
)
@@ -3538,10 +3538,10 @@ ruleMatchField returns [Enumerator current=null]
newLeafNode(enumLiteral_2, grammarAccess.getMatchFieldAccess().getBranchNameEnumLiteralDeclaration_2());
}
)
- |( enumLiteral_3='branchGuid'
+ |( enumLiteral_3='branchUuid'
{
- $current = grammarAccess.getMatchFieldAccess().getBranchGuidEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
- newLeafNode(enumLiteral_3, grammarAccess.getMatchFieldAccess().getBranchGuidEnumLiteralDeclaration_3());
+ $current = grammarAccess.getMatchFieldAccess().getBranchUuidEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
+ newLeafNode(enumLiteral_3, grammarAccess.getMatchFieldAccess().getBranchUuidEnumLiteralDeclaration_3());
}
));
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.tokens b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.tokens
index 2061c7f8ec..d9027cdb60 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.tokens
+++ b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.tokens
@@ -141,7 +141,6 @@ RULE_WS=11
'overrides artifactType'=60
'DefaultAttributeTaggerProvider'=34
'DENY'=95
-'branchGuid'=24
'JavaObjectAttribute'=47
'oseeEnumType'=53
'sideAName'=63
@@ -177,6 +176,7 @@ RULE_WS=11
'UriAttributeDataProvider'=29
'attribute'=23
'min'=30
+'branchUuid'=24
'ALL'=96
'guid'=20
'artifactType'=16
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDslLexer.java b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDslLexer.java
index da652257ca..e981d4a7c5 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDslLexer.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDslLexer.java
@@ -355,10 +355,10 @@ public class InternalOseeDslLexer extends Lexer {
try {
int _type = T__24;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:22:7: ( 'branchGuid' )
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:22:9: 'branchGuid'
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:22:7: ( 'branchUuid' )
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:22:9: 'branchUuid'
{
- match("branchGuid");
+ match("branchUuid");
}
@@ -3328,7 +3328,7 @@ public class InternalOseeDslLexer extends Lexer {
"\1\162\1\170\1\141\1\150\1\uffff\1\145\1\162\1\151\1\145\1\164\1"+
"\157\1\uffff\1\142\1\147\1\101\1\141\1\60\1\164\1\156\1\117\1\145"+
"\1\151\1\uffff\2\101\1\60\1\162\1\124\1\60\1\164\2\143\1\165\1\103"+
- "\1\163\1\160\1\165\1\uffff\1\164\1\60\1\107\1\144\1\165\1\157\1"+
+ "\1\163\1\160\1\165\1\uffff\1\164\1\60\1\116\1\144\1\165\1\157\1"+
"\160\3\164\2\162\1\171\1\154\1\111\1\164\1\156\1\122\1\163\1\141"+
"\1\156\1\162\1\164\1\147\1\152\1\101\2\60\1\143\1\uffff\1\164\1"+
"\145\1\137\1\60\1\157\1\141\1\162\1\141\1\162\1\uffff\1\145\1\117"+
@@ -3400,7 +3400,7 @@ public class InternalOseeDslLexer extends Lexer {
"\145\1\162\1\151\1\145\1\164\1\157\1\uffff\1\142\1\147\1\102\1\141"+
"\1\172\1\164\1\156\1\117\1\145\1\151\1\uffff\2\116\1\172\1\162\1"+
"\124\1\172\1\164\2\143\1\165\1\103\1\163\1\160\1\165\1\uffff\1\164"+
- "\1\172\1\116\1\144\1\165\1\157\1\160\3\164\2\162\1\171\1\154\1\111"+
+ "\1\172\1\125\1\144\1\165\1\157\1\160\3\164\2\162\1\171\1\154\1\111"+
"\1\164\1\156\1\122\1\163\1\141\1\156\1\162\1\164\1\147\1\152\1\101"+
"\2\172\1\143\1\uffff\1\164\1\145\1\137\1\172\1\157\1\141\1\162\1"+
"\141\1\162\1\uffff\1\145\1\117\1\uffff\1\101\3\164\1\157\1\172\1"+
@@ -3782,7 +3782,7 @@ public class InternalOseeDslLexer extends Lexer {
"",
"\1\u0163",
"\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
- "\1\u0165\6\uffff\1\u0166",
+ "\1\u0166\6\uffff\1\u0165",
"\1\u0167",
"\1\u0168",
"\1\u0169",
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDslParser.java b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDslParser.java
index 28425b5999..54a73be8a2 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDslParser.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDslParser.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
@SuppressWarnings("all")
public class InternalOseeDslParser extends AbstractInternalAntlrParser {
public static final String[] tokenNames = new String[] {
- "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_ID", "RULE_HEX_INT", "RULE_WHOLE_NUM_STR", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'import'", "'.'", "'abstract'", "'artifactType'", "'extends'", "','", "'{'", "'guid'", "'uuid'", "'}'", "'attribute'", "'branchGuid'", "'attributeType'", "'overrides'", "'dataProvider'", "'DefaultAttributeDataProvider'", "'UriAttributeDataProvider'", "'min'", "'max'", "'unlimited'", "'taggerId'", "'DefaultAttributeTaggerProvider'", "'enumType'", "'description'", "'defaultValue'", "'fileExtension'", "'mediaType'", "'BooleanAttribute'", "'CompressedContentAttribute'", "'DateAttribute'", "'EnumeratedAttribute'", "'FloatingPointAttribute'", "'IntegerAttribute'", "'LongAttribute'", "'JavaObjectAttribute'", "'StringAttribute'", "'ArtifactReferenceAttribute'", "'BranchReferenceAttribute'", "'WordAttribute'", "'OutlineNumberAttribute'", "'oseeEnumType'", "'entry'", "'entryGuid'", "'overrides enum'", "'inheritAll'", "'add'", "'remove'", "'overrides artifactType'", "'update'", "'relationType'", "'sideAName'", "'sideAArtifactType'", "'sideBName'", "'sideBArtifactType'", "'defaultOrderType'", "'multiplicity'", "'Lexicographical_Ascending'", "'Lexicographical_Descending'", "'Unordered'", "'('", "')'", "'artifactMatcher'", "'where'", "';'", "'role'", "'accessContext'", "'childrenOf'", "'artifact'", "'edit'", "'of'", "'ONE_TO_ONE'", "'ONE_TO_MANY'", "'MANY_TO_ONE'", "'MANY_TO_MANY'", "'EQ'", "'LIKE'", "'AND'", "'OR'", "'artifactName'", "'artifactGuid'", "'branchName'", "'ALLOW'", "'DENY'", "'ALL'", "'SIDE_A'", "'SIDE_B'", "'BOTH'"
+ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_ID", "RULE_HEX_INT", "RULE_WHOLE_NUM_STR", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'import'", "'.'", "'abstract'", "'artifactType'", "'extends'", "','", "'{'", "'guid'", "'uuid'", "'}'", "'attribute'", "'branchUuid'", "'attributeType'", "'overrides'", "'dataProvider'", "'DefaultAttributeDataProvider'", "'UriAttributeDataProvider'", "'min'", "'max'", "'unlimited'", "'taggerId'", "'DefaultAttributeTaggerProvider'", "'enumType'", "'description'", "'defaultValue'", "'fileExtension'", "'mediaType'", "'BooleanAttribute'", "'CompressedContentAttribute'", "'DateAttribute'", "'EnumeratedAttribute'", "'FloatingPointAttribute'", "'IntegerAttribute'", "'LongAttribute'", "'JavaObjectAttribute'", "'StringAttribute'", "'ArtifactReferenceAttribute'", "'BranchReferenceAttribute'", "'WordAttribute'", "'OutlineNumberAttribute'", "'oseeEnumType'", "'entry'", "'entryGuid'", "'overrides enum'", "'inheritAll'", "'add'", "'remove'", "'overrides artifactType'", "'update'", "'relationType'", "'sideAName'", "'sideAArtifactType'", "'sideBName'", "'sideBArtifactType'", "'defaultOrderType'", "'multiplicity'", "'Lexicographical_Ascending'", "'Lexicographical_Descending'", "'Unordered'", "'('", "')'", "'artifactMatcher'", "'where'", "';'", "'role'", "'accessContext'", "'childrenOf'", "'artifact'", "'edit'", "'of'", "'ONE_TO_ONE'", "'ONE_TO_MANY'", "'MANY_TO_ONE'", "'MANY_TO_MANY'", "'EQ'", "'LIKE'", "'AND'", "'OR'", "'artifactName'", "'artifactGuid'", "'branchName'", "'ALLOW'", "'DENY'", "'ALL'", "'SIDE_A'", "'SIDE_B'", "'BOTH'"
};
public static final int RULE_ID=5;
public static final int T__29=29;
@@ -1520,23 +1520,23 @@ public class InternalOseeDslParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleXAttributeTypeRef"
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:593:1: ruleXAttributeTypeRef returns [EObject current=null] : (otherlv_0= 'attribute' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'branchGuid' ( (lv_branchGuid_3_0= RULE_STRING ) ) )? ) ;
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:593:1: ruleXAttributeTypeRef returns [EObject current=null] : (otherlv_0= 'attribute' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'branchUuid' ( (lv_branchUuid_3_0= RULE_WHOLE_NUM_STR ) ) )? ) ;
public final EObject ruleXAttributeTypeRef() throws RecognitionException {
EObject current = null;
Token otherlv_0=null;
Token otherlv_1=null;
Token otherlv_2=null;
- Token lv_branchGuid_3_0=null;
+ Token lv_branchUuid_3_0=null;
enterRule();
try {
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:596:28: ( (otherlv_0= 'attribute' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'branchGuid' ( (lv_branchGuid_3_0= RULE_STRING ) ) )? ) )
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:597:1: (otherlv_0= 'attribute' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'branchGuid' ( (lv_branchGuid_3_0= RULE_STRING ) ) )? )
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:596:28: ( (otherlv_0= 'attribute' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'branchUuid' ( (lv_branchUuid_3_0= RULE_WHOLE_NUM_STR ) ) )? ) )
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:597:1: (otherlv_0= 'attribute' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'branchUuid' ( (lv_branchUuid_3_0= RULE_WHOLE_NUM_STR ) ) )? )
{
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:597:1: (otherlv_0= 'attribute' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'branchGuid' ( (lv_branchGuid_3_0= RULE_STRING ) ) )? )
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:597:3: otherlv_0= 'attribute' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'branchGuid' ( (lv_branchGuid_3_0= RULE_STRING ) ) )?
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:597:1: (otherlv_0= 'attribute' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'branchUuid' ( (lv_branchUuid_3_0= RULE_WHOLE_NUM_STR ) ) )? )
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:597:3: otherlv_0= 'attribute' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'branchUuid' ( (lv_branchUuid_3_0= RULE_WHOLE_NUM_STR ) ) )?
{
otherlv_0=(Token)match(input,23,FOLLOW_23_in_ruleXAttributeTypeRef1189);
@@ -1563,7 +1563,7 @@ public class InternalOseeDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:614:2: (otherlv_2= 'branchGuid' ( (lv_branchGuid_3_0= RULE_STRING ) ) )?
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:614:2: (otherlv_2= 'branchUuid' ( (lv_branchUuid_3_0= RULE_WHOLE_NUM_STR ) ) )?
int alt11=2;
int LA11_0 = input.LA(1);
@@ -1572,21 +1572,21 @@ public class InternalOseeDslParser extends AbstractInternalAntlrParser {
}
switch (alt11) {
case 1 :
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:614:4: otherlv_2= 'branchGuid' ( (lv_branchGuid_3_0= RULE_STRING ) )
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:614:4: otherlv_2= 'branchUuid' ( (lv_branchUuid_3_0= RULE_WHOLE_NUM_STR ) )
{
otherlv_2=(Token)match(input,24,FOLLOW_24_in_ruleXAttributeTypeRef1222);
- newLeafNode(otherlv_2, grammarAccess.getXAttributeTypeRefAccess().getBranchGuidKeyword_2_0());
+ newLeafNode(otherlv_2, grammarAccess.getXAttributeTypeRefAccess().getBranchUuidKeyword_2_0());
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:618:1: ( (lv_branchGuid_3_0= RULE_STRING ) )
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:619:1: (lv_branchGuid_3_0= RULE_STRING )
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:618:1: ( (lv_branchUuid_3_0= RULE_WHOLE_NUM_STR ) )
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:619:1: (lv_branchUuid_3_0= RULE_WHOLE_NUM_STR )
{
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:619:1: (lv_branchGuid_3_0= RULE_STRING )
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:620:3: lv_branchGuid_3_0= RULE_STRING
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:619:1: (lv_branchUuid_3_0= RULE_WHOLE_NUM_STR )
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:620:3: lv_branchUuid_3_0= RULE_WHOLE_NUM_STR
{
- lv_branchGuid_3_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleXAttributeTypeRef1239);
+ lv_branchUuid_3_0=(Token)match(input,RULE_WHOLE_NUM_STR,FOLLOW_RULE_WHOLE_NUM_STR_in_ruleXAttributeTypeRef1239);
- newLeafNode(lv_branchGuid_3_0, grammarAccess.getXAttributeTypeRefAccess().getBranchGuidSTRINGTerminalRuleCall_2_1_0());
+ newLeafNode(lv_branchUuid_3_0, grammarAccess.getXAttributeTypeRefAccess().getBranchUuidWHOLE_NUM_STRTerminalRuleCall_2_1_0());
if (current==null) {
@@ -1594,9 +1594,9 @@ public class InternalOseeDslParser extends AbstractInternalAntlrParser {
}
setWithLastConsumed(
current,
- "branchGuid",
- lv_branchGuid_3_0,
- "STRING");
+ "branchUuid",
+ lv_branchUuid_3_0,
+ "WHOLE_NUM_STR");
}
@@ -8624,7 +8624,7 @@ public class InternalOseeDslParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleMatchField"
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:3520:1: ruleMatchField returns [Enumerator current=null] : ( (enumLiteral_0= 'artifactName' ) | (enumLiteral_1= 'artifactGuid' ) | (enumLiteral_2= 'branchName' ) | (enumLiteral_3= 'branchGuid' ) ) ;
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:3520:1: ruleMatchField returns [Enumerator current=null] : ( (enumLiteral_0= 'artifactName' ) | (enumLiteral_1= 'artifactGuid' ) | (enumLiteral_2= 'branchName' ) | (enumLiteral_3= 'branchUuid' ) ) ;
public final Enumerator ruleMatchField() throws RecognitionException {
Enumerator current = null;
@@ -8635,10 +8635,10 @@ public class InternalOseeDslParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:3522:28: ( ( (enumLiteral_0= 'artifactName' ) | (enumLiteral_1= 'artifactGuid' ) | (enumLiteral_2= 'branchName' ) | (enumLiteral_3= 'branchGuid' ) ) )
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:3523:1: ( (enumLiteral_0= 'artifactName' ) | (enumLiteral_1= 'artifactGuid' ) | (enumLiteral_2= 'branchName' ) | (enumLiteral_3= 'branchGuid' ) )
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:3522:28: ( ( (enumLiteral_0= 'artifactName' ) | (enumLiteral_1= 'artifactGuid' ) | (enumLiteral_2= 'branchName' ) | (enumLiteral_3= 'branchUuid' ) ) )
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:3523:1: ( (enumLiteral_0= 'artifactName' ) | (enumLiteral_1= 'artifactGuid' ) | (enumLiteral_2= 'branchName' ) | (enumLiteral_3= 'branchUuid' ) )
{
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:3523:1: ( (enumLiteral_0= 'artifactName' ) | (enumLiteral_1= 'artifactGuid' ) | (enumLiteral_2= 'branchName' ) | (enumLiteral_3= 'branchGuid' ) )
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:3523:1: ( (enumLiteral_0= 'artifactName' ) | (enumLiteral_1= 'artifactGuid' ) | (enumLiteral_2= 'branchName' ) | (enumLiteral_3= 'branchUuid' ) )
int alt51=4;
switch ( input.LA(1) ) {
case 91:
@@ -8721,15 +8721,15 @@ public class InternalOseeDslParser extends AbstractInternalAntlrParser {
}
break;
case 4 :
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:3541:6: (enumLiteral_3= 'branchGuid' )
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:3541:6: (enumLiteral_3= 'branchUuid' )
{
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:3541:6: (enumLiteral_3= 'branchGuid' )
- // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:3541:8: enumLiteral_3= 'branchGuid'
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:3541:6: (enumLiteral_3= 'branchUuid' )
+ // ../org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/parser/antlr/internal/InternalOseeDsl.g:3541:8: enumLiteral_3= 'branchUuid'
{
enumLiteral_3=(Token)match(input,24,FOLLOW_24_in_ruleMatchField7901);
- current = grammarAccess.getMatchFieldAccess().getBranchGuidEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
- newLeafNode(enumLiteral_3, grammarAccess.getMatchFieldAccess().getBranchGuidEnumLiteralDeclaration_3());
+ current = grammarAccess.getMatchFieldAccess().getBranchUuidEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
+ newLeafNode(enumLiteral_3, grammarAccess.getMatchFieldAccess().getBranchUuidEnumLiteralDeclaration_3());
}
@@ -9043,8 +9043,8 @@ public class InternalOseeDslParser extends AbstractInternalAntlrParser {
public static final BitSet FOLLOW_EOF_in_entryRuleXAttributeTypeRef1152 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_23_in_ruleXAttributeTypeRef1189 = new BitSet(new long[]{0x0000000000000010L});
public static final BitSet FOLLOW_RULE_STRING_in_ruleXAttributeTypeRef1209 = new BitSet(new long[]{0x0000000001000002L});
- public static final BitSet FOLLOW_24_in_ruleXAttributeTypeRef1222 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleXAttributeTypeRef1239 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_24_in_ruleXAttributeTypeRef1222 = new BitSet(new long[]{0x0000000000000080L});
+ public static final BitSet FOLLOW_RULE_WHOLE_NUM_STR_in_ruleXAttributeTypeRef1239 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleXAttributeType_in_entryRuleXAttributeType1282 = new BitSet(new long[]{0x0000000000000000L});
public static final BitSet FOLLOW_EOF_in_entryRuleXAttributeType1292 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_25_in_ruleXAttributeType1329 = new BitSet(new long[]{0x0000000000000010L});
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/services/OseeDslGrammarAccess.java b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/services/OseeDslGrammarAccess.java
index 499c186f03..d31a3e9257 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/services/OseeDslGrammarAccess.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl/src-gen/org/eclipse/osee/framework/core/dsl/services/OseeDslGrammarAccess.java
@@ -355,15 +355,15 @@ public class OseeDslGrammarAccess extends AbstractGrammarElementFinder {
private final CrossReference cValidAttributeTypeXAttributeTypeCrossReference_1_0 = (CrossReference)cValidAttributeTypeAssignment_1.eContents().get(0);
private final RuleCall cValidAttributeTypeXAttributeTypeSTRINGTerminalRuleCall_1_0_1 = (RuleCall)cValidAttributeTypeXAttributeTypeCrossReference_1_0.eContents().get(1);
private final Group cGroup_2 = (Group)cGroup.eContents().get(2);
- private final Keyword cBranchGuidKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);
- private final Assignment cBranchGuidAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);
- private final RuleCall cBranchGuidSTRINGTerminalRuleCall_2_1_0 = (RuleCall)cBranchGuidAssignment_2_1.eContents().get(0);
+ private final Keyword cBranchUuidKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);
+ private final Assignment cBranchUuidAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);
+ private final RuleCall cBranchUuidWHOLE_NUM_STRTerminalRuleCall_2_1_0 = (RuleCall)cBranchUuidAssignment_2_1.eContents().get(0);
//XAttributeTypeRef:
- // "attribute" validAttributeType=[XAttributeType|STRING] ("branchGuid" branchGuid=STRING)?;
+ // "attribute" validAttributeType=[XAttributeType|STRING] ("branchUuid" branchUuid=WHOLE_NUM_STR)?;
public ParserRule getRule() { return rule; }
- //"attribute" validAttributeType=[XAttributeType|STRING] ("branchGuid" branchGuid=STRING)?
+ //"attribute" validAttributeType=[XAttributeType|STRING] ("branchUuid" branchUuid=WHOLE_NUM_STR)?
public Group getGroup() { return cGroup; }
//"attribute"
@@ -378,17 +378,17 @@ public class OseeDslGrammarAccess extends AbstractGrammarElementFinder {
//STRING
public RuleCall getValidAttributeTypeXAttributeTypeSTRINGTerminalRuleCall_1_0_1() { return cValidAttributeTypeXAttributeTypeSTRINGTerminalRuleCall_1_0_1; }
- //("branchGuid" branchGuid=STRING)?
+ //("branchUuid" branchUuid=WHOLE_NUM_STR)?
public Group getGroup_2() { return cGroup_2; }
- //"branchGuid"
- public Keyword getBranchGuidKeyword_2_0() { return cBranchGuidKeyword_2_0; }
+ //"branchUuid"
+ public Keyword getBranchUuidKeyword_2_0() { return cBranchUuidKeyword_2_0; }
- //branchGuid=STRING
- public Assignment getBranchGuidAssignment_2_1() { return cBranchGuidAssignment_2_1; }
+ //branchUuid=WHOLE_NUM_STR
+ public Assignment getBranchUuidAssignment_2_1() { return cBranchUuidAssignment_2_1; }
- //STRING
- public RuleCall getBranchGuidSTRINGTerminalRuleCall_2_1_0() { return cBranchGuidSTRINGTerminalRuleCall_2_1_0; }
+ //WHOLE_NUM_STR
+ public RuleCall getBranchUuidWHOLE_NUM_STRTerminalRuleCall_2_1_0() { return cBranchUuidWHOLE_NUM_STRTerminalRuleCall_2_1_0; }
}
public class XAttributeTypeElements extends AbstractParserRuleElementFinder {
@@ -2346,14 +2346,14 @@ public class OseeDslGrammarAccess extends AbstractGrammarElementFinder {
private final Keyword cArtifactGuidArtifactGuidKeyword_1_0 = (Keyword)cArtifactGuidEnumLiteralDeclaration_1.eContents().get(0);
private final EnumLiteralDeclaration cBranchNameEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
private final Keyword cBranchNameBranchNameKeyword_2_0 = (Keyword)cBranchNameEnumLiteralDeclaration_2.eContents().get(0);
- private final EnumLiteralDeclaration cBranchGuidEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
- private final Keyword cBranchGuidBranchGuidKeyword_3_0 = (Keyword)cBranchGuidEnumLiteralDeclaration_3.eContents().get(0);
+ private final EnumLiteralDeclaration cBranchUuidEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
+ private final Keyword cBranchUuidBranchUuidKeyword_3_0 = (Keyword)cBranchUuidEnumLiteralDeclaration_3.eContents().get(0);
//enum MatchField:
- // artifactName | artifactGuid | branchName | branchGuid;
+ // artifactName | artifactGuid | branchName | branchUuid;
public EnumRule getRule() { return rule; }
- //artifactName | artifactGuid | branchName | branchGuid
+ //artifactName | artifactGuid | branchName | branchUuid
public Alternatives getAlternatives() { return cAlternatives; }
//artifactName
@@ -2374,11 +2374,11 @@ public class OseeDslGrammarAccess extends AbstractGrammarElementFinder {
//"branchName"
public Keyword getBranchNameBranchNameKeyword_2_0() { return cBranchNameBranchNameKeyword_2_0; }
- //branchGuid
- public EnumLiteralDeclaration getBranchGuidEnumLiteralDeclaration_3() { return cBranchGuidEnumLiteralDeclaration_3; }
+ //branchUuid
+ public EnumLiteralDeclaration getBranchUuidEnumLiteralDeclaration_3() { return cBranchUuidEnumLiteralDeclaration_3; }
- //"branchGuid"
- public Keyword getBranchGuidBranchGuidKeyword_3_0() { return cBranchGuidBranchGuidKeyword_3_0; }
+ //"branchUuid"
+ public Keyword getBranchUuidBranchUuidKeyword_3_0() { return cBranchUuidBranchUuidKeyword_3_0; }
}
public class AccessPermissionEnumElements extends AbstractEnumRuleElementFinder {
@@ -2638,7 +2638,7 @@ public class OseeDslGrammarAccess extends AbstractGrammarElementFinder {
}
//XAttributeTypeRef:
- // "attribute" validAttributeType=[XAttributeType|STRING] ("branchGuid" branchGuid=STRING)?;
+ // "attribute" validAttributeType=[XAttributeType|STRING] ("branchUuid" branchUuid=WHOLE_NUM_STR)?;
public XAttributeTypeRefElements getXAttributeTypeRefAccess() {
return (pXAttributeTypeRef != null) ? pXAttributeTypeRef : (pXAttributeTypeRef = new XAttributeTypeRefElements());
}
@@ -2855,7 +2855,7 @@ public class OseeDslGrammarAccess extends AbstractGrammarElementFinder {
}
//enum MatchField:
- // artifactName | artifactGuid | branchName | branchGuid;
+ // artifactName | artifactGuid | branchName | branchUuid;
public MatchFieldElements getMatchFieldAccess() {
return (unknownRuleMatchField != null) ? unknownRuleMatchField : (unknownRuleMatchField = new MatchFieldElements());
}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/src/org/eclipse/osee/framework/core/dsl/OseeDsl.xtext b/plugins/org.eclipse.osee.framework.core.dsl/src/org/eclipse/osee/framework/core/dsl/OseeDsl.xtext
index e4aed9882a..377247352a 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/src/org/eclipse/osee/framework/core/dsl/OseeDsl.xtext
+++ b/plugins/org.eclipse.osee.framework.core.dsl/src/org/eclipse/osee/framework/core/dsl/OseeDsl.xtext
@@ -41,7 +41,7 @@ XArtifactType:
(validAttributeTypes+=XAttributeTypeRef)* '}';
XAttributeTypeRef:
- 'attribute' validAttributeType=[XAttributeType|STRING] ('branchGuid' branchGuid=STRING)?;
+ 'attribute' validAttributeType=[XAttributeType|STRING] ('branchUuid' branchUuid=WHOLE_NUM_STR)?;
XAttributeType:
'attributeType' name=STRING ('extends' baseAttributeType=AttributeBaseType) ('overrides'
@@ -119,7 +119,7 @@ CONDITION_VALUE:
WHOLE_NUM_STR | STRING;
enum MatchField:
- artifactName | artifactGuid | branchName | branchGuid;
+ artifactName | artifactGuid | branchName | branchUuid;
Condition:
SimpleCondition | CompoundCondition;
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/TransactionCacheUpdateResponseTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/TransactionCacheUpdateResponseTest.java
index 322acb2e77..633032abe5 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/TransactionCacheUpdateResponseTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/TransactionCacheUpdateResponseTest.java
@@ -53,7 +53,7 @@ public class TransactionCacheUpdateResponseTest {
}
TransactionRecordFactory factory = new TransactionRecordFactory();
- BranchCache branchCache = new BranchCache(new MockOseeDataAccessor<String, Branch>());
+ BranchCache branchCache = new BranchCache(new MockOseeDataAccessor<Long, Branch>());
TransactionCacheUpdateResponse response = TransactionCacheUpdateResponse.fromCache(factory, data, branchCache);
List<TransactionRecord> actual = response.getTxRows();
Assert.assertEquals(data.size(), actual.size());
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java
index 123457c588..58395cfa60 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java
@@ -78,7 +78,7 @@ public final class DataAsserts {
if (expected == null) {
Assert.assertNull(actual);
} else {
- assertEquals((AbstractOseeType<String>) expected, (AbstractOseeType<String>) actual);
+ assertEquals((AbstractOseeType<Long>) expected, (AbstractOseeType<Long>) actual);
Assert.assertEquals(expected.getShortName(), actual.getShortName());
Assert.assertEquals(expected.getAccessControlBranch(), actual.getAccessControlBranch());
Assert.assertEquals(expected.getAncestors(), actual.getAncestors());
@@ -175,7 +175,7 @@ public final class DataAsserts {
} else {
Assert.assertEquals(expected.getAssociatedArtifactId(), actual.getAssociatedArtifactId());
Assert.assertEquals(expected.getAuthorId(), actual.getAuthorId());
- Assert.assertEquals(expected.getBranchGuid(), actual.getBranchGuid());
+ Assert.assertEquals(expected.getBranchUuid(), actual.getBranchUuid());
Assert.assertEquals(expected.getBranchName(), actual.getBranchName());
Assert.assertEquals(expected.getCreationComment(), actual.getCreationComment());
Assert.assertEquals(expected.getMergeDestinationBranchId(), actual.getMergeDestinationBranchId());
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 61ceeb8de8..4566a6902b 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
@@ -91,8 +91,8 @@ public final class MockRequestFactory {
int mergeFromAddressingQueryId = -1;
int destinationBranchId = -1;
- return new BranchCreationRequest(branchType, sourceTransactionId, parentBranchId, branchGuid, branchName,
- branchUuid, associatedArtifactId, authorId, creationComment, mergeFromAddressingQueryId, destinationBranchId);
+ return new BranchCreationRequest(branchType, sourceTransactionId, parentBranchId, branchName, branchUuid,
+ associatedArtifactId, authorId, creationComment, mergeFromAddressingQueryId, destinationBranchId);
}
public static Object createBranchCreateResponse(int index) {
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitResponseTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitResponseTranslatorTest.java
index 7e9a213c98..634a5dc81c 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitResponseTranslatorTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitResponseTranslatorTest.java
@@ -54,7 +54,7 @@ public class BranchCommitResponseTranslatorTest extends BaseTranslatorTest<Branc
List<Object[]> data = new ArrayList<Object[]>();
IDataTranslationService service = new DataTranslationService();
- BranchCache branchCache = new BranchCache(new MockOseeDataAccessor<String, Branch>());
+ BranchCache branchCache = new BranchCache(new MockOseeDataAccessor<Long, Branch>());
service.addTranslator(new TransactionRecordTranslator(new TransactionRecordFactory(), branchCache),
CoreTranslatorId.TRANSACTION_RECORD);
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java
index db474da107..d4ad862df9 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java
@@ -53,7 +53,7 @@ public class TransactionCacheUpdateResponseTranslatorTest extends BaseTranslator
@Parameters
public static Collection<Object[]> data() {
- BranchCache branchCache = new BranchCache(new MockOseeDataAccessor<String, Branch>());
+ BranchCache branchCache = new BranchCache(new MockOseeDataAccessor<Long, Branch>());
ITranslator<TransactionCacheUpdateResponse> translator =
new TransactionCacheUpdateResponseTranslator(new TransactionRecordFactory(), branchCache);
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionRecordTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionRecordTranslatorTest.java
index 0545bfb265..afc6dec643 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionRecordTranslatorTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionRecordTranslatorTest.java
@@ -47,7 +47,7 @@ public class TransactionRecordTranslatorTest extends BaseTranslatorTest<Transact
@Parameters
public static Collection<Object[]> data() {
- BranchCache branchCache = new BranchCache(new MockOseeDataAccessor<String, Branch>());
+ BranchCache branchCache = new BranchCache(new MockOseeDataAccessor<Long, Branch>());
ITranslator<TransactionRecord> translator =
new TransactionRecordTranslator(new TransactionRecordFactory(), branchCache);
List<Object[]> data = new ArrayList<Object[]>();
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/AbstractBranchCacheMessage.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/AbstractBranchCacheMessage.java
index 09cba7ce78..90b2dbe511 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/AbstractBranchCacheMessage.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/AbstractBranchCacheMessage.java
@@ -27,7 +27,7 @@ public abstract class AbstractBranchCacheMessage {
private final Map<Long, Integer> branchToSourceTx;
private final Map<Long, Integer> branchToAssocArt;
private final Map<Long, String[]> branchToAliases;
- private final List<Triplet<String, String, String>> srcDestMerge;
+ private final List<Triplet<Long, Long, Long>> srcDestMerge;
protected AbstractBranchCacheMessage() {
this.rows = new ArrayList<BranchRow>();
@@ -36,7 +36,7 @@ public abstract class AbstractBranchCacheMessage {
this.branchToSourceTx = new HashMap<Long, Integer>();
this.branchToAssocArt = new HashMap<Long, Integer>();
this.branchToAliases = new HashMap<Long, String[]>();
- this.srcDestMerge = new ArrayList<Triplet<String, String, String>>();
+ this.srcDestMerge = new ArrayList<Triplet<Long, Long, Long>>();
}
public List<BranchRow> getBranchRows() {
@@ -63,7 +63,7 @@ public abstract class AbstractBranchCacheMessage {
return branchToAliases;
}
- public List<Triplet<String, String, String>> getMergeBranches() {
+ public List<Triplet<Long, Long, Long>> getMergeBranches() {
return srcDestMerge;
}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ArtifactTypeCacheUpdateResponse.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ArtifactTypeCacheUpdateResponse.java
index fd8e99d567..1d868d8fb3 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ArtifactTypeCacheUpdateResponse.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ArtifactTypeCacheUpdateResponse.java
@@ -22,9 +22,9 @@ public class ArtifactTypeCacheUpdateResponse {
private final List<ArtifactTypeRow> rows;
private final Map<Long, Long[]> baseToSuper;
- private final List<Triplet<Long, String, Long>> artAttrs;
+ private final List<Triplet<Long, Long, Long>> artAttrs;
- public ArtifactTypeCacheUpdateResponse(List<ArtifactTypeRow> rows, Map<Long, Long[]> baseToSuper, List<Triplet<Long, String, Long>> artAttrs) {
+ public ArtifactTypeCacheUpdateResponse(List<ArtifactTypeRow> rows, Map<Long, Long[]> baseToSuper, List<Triplet<Long, Long, Long>> artAttrs) {
this.rows = rows;
this.baseToSuper = baseToSuper;
this.artAttrs = artAttrs;
@@ -38,7 +38,7 @@ public class ArtifactTypeCacheUpdateResponse {
return baseToSuper;
}
- public List<Triplet<Long, String, Long>> getAttributeTypes() {
+ public List<Triplet<Long, Long, Long>> getAttributeTypes() {
return artAttrs;
}
@@ -49,7 +49,7 @@ public class ArtifactTypeCacheUpdateResponse {
private final boolean isAbstract;
private StorageState storageState;
- public ArtifactTypeRow(long id, Long guid, String name, boolean isAbstract, StorageState storageState) {
+ public ArtifactTypeRow(long id, long guid, String name, boolean isAbstract, StorageState storageState) {
this.id = id;
this.guid = guid;
this.name = name;
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateResponse.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateResponse.java
index bb0f8adf53..4371b7ced9 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateResponse.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateResponse.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
*/
public class BranchCacheUpdateResponse extends AbstractBranchCacheMessage {
- public static BranchCacheUpdateResponse fromCache(IOseeCache<String, Branch> cache, Collection<Branch> types) throws OseeCoreException {
+ public static BranchCacheUpdateResponse fromCache(IOseeCache<Long, Branch> cache, Collection<Branch> types) throws OseeCoreException {
BranchCacheUpdateResponse response = new BranchCacheUpdateResponse();
BranchCacheUpdateUtil.loadFromCache(response, types);
return response;
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 428686c92f..0e884791ee 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
@@ -27,7 +27,6 @@ import org.eclipse.osee.framework.core.model.cache.TransactionCache;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.jdk.core.type.Triplet;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
/**
* @author Megumi Telles
@@ -53,7 +52,7 @@ public final class BranchCacheUpdateUtil {
this.txCache = txCache;
}
- public Collection<Branch> updateCache(AbstractBranchCacheMessage cacheMessage, IOseeCache<String, Branch> cache) throws OseeCoreException {
+ public Collection<Branch> updateCache(AbstractBranchCacheMessage cacheMessage, IOseeCache<Long, Branch> cache) throws OseeCoreException {
List<Branch> updatedItems = new ArrayList<Branch>();
Map<Long, Integer> branchToAssocArt = cacheMessage.getBranchToAssocArt();
@@ -63,9 +62,8 @@ public final class BranchCacheUpdateUtil {
for (BranchRow srcItem : cacheMessage.getBranchRows()) {
long branchId = srcItem.getBranchId();
Branch updated =
- factory.createOrUpdate(cache, srcItem.getBranchGuid(), srcItem.getBranchId(), srcItem.getBranchName(),
- srcItem.getBranchType(), srcItem.getBranchState(), srcItem.getBranchArchived().isArchived(),
- srcItem.getStorageState());
+ factory.createOrUpdate(cache, branchId, srcItem.getBranchName(), srcItem.getBranchType(),
+ srcItem.getBranchState(), srcItem.getBranchArchived().isArchived(), srcItem.getStorageState());
updatedItems.add(updated);
Integer artifactId = branchToAssocArt.get(branchId);
@@ -86,9 +84,9 @@ public final class BranchCacheUpdateUtil {
}
}
}
- for (Triplet<String, String, String> entry : cacheMessage.getMergeBranches()) {
- IOseeBranch sourceBranch = Strings.isValid(entry.getFirst()) ? cache.getByGuid(entry.getFirst()) : null;
- IOseeBranch destinationBranch = Strings.isValid(entry.getSecond()) ? cache.getByGuid(entry.getSecond()) : null;
+ for (Triplet<Long, Long, Long> entry : cacheMessage.getMergeBranches()) {
+ IOseeBranch sourceBranch = entry.getFirst() > 0 ? cache.getByGuid(entry.getFirst()) : null;
+ IOseeBranch destinationBranch = entry.getSecond() > 0 ? cache.getByGuid(entry.getSecond()) : null;
Branch branch = cache.getByGuid(entry.getThird());
MergeBranch mergeBranch = null;
@@ -132,8 +130,8 @@ public final class BranchCacheUpdateUtil {
for (Branch br : types) {
Long branchId = br.getId();
message.getBranchRows().add(
- new BranchRow(br.getId(), br.getGuid(), br.getName(), br.getBranchType(), br.getBranchState(),
- br.getArchiveState(), br.getStorageState()));
+ new BranchRow(br.getId(), br.getName(), br.getBranchType(), br.getBranchState(), br.getArchiveState(),
+ br.getStorageState()));
if (br.hasParentBranch()) {
message.getChildToParent().put(branchId, br.getParentBranch().getId());
}
@@ -154,11 +152,11 @@ public final class BranchCacheUpdateUtil {
}
}
- private static void addMergeBranches(List<Triplet<String, String, String>> srcDestMerge, MergeBranch mergeBranch) throws OseeCoreException {
- String src = mergeBranch.getSourceBranch() != null ? mergeBranch.getSourceBranch().getGuid() : null;
- String dest = mergeBranch.getDestinationBranch() != null ? mergeBranch.getDestinationBranch().getGuid() : null;
- String merge = mergeBranch.getGuid();
- srcDestMerge.add(new Triplet<String, String, String>(src, dest, merge));
+ private static void addMergeBranches(List<Triplet<Long, Long, Long>> srcDestMerge, MergeBranch mergeBranch) throws OseeCoreException {
+ Long src = mergeBranch.getSourceBranch() != null ? mergeBranch.getSourceBranch().getGuid() : null;
+ Long dest = mergeBranch.getDestinationBranch() != null ? mergeBranch.getDestinationBranch().getGuid() : null;
+ Long merge = mergeBranch.getGuid();
+ srcDestMerge.add(new Triplet<Long, Long, Long>(src, dest, merge));
}
private static void addTxRecord(Map<Long, Integer> map, Long branchId, TransactionRecord toAdd) {
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationRequest.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationRequest.java
index a9ae76618f..59563e03ff 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationRequest.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationRequest.java
@@ -23,7 +23,6 @@ public class BranchCreationRequest {
private final BranchType branchType;
private final int sourceTransactionId;
- private final String branchGuid;
private final int authorId;
@@ -33,7 +32,7 @@ public class BranchCreationRequest {
private boolean isTxCopyBranchType;
private final long branchUuid;
- public BranchCreationRequest(BranchType branchType, int sourceTransactionId, long parentBranchId, String branchGuid, String branchName, long branchUuid, int associatedArtifactId, int authorId, String creationComment, int mergeAddressingQueryId, long destinationBranchId) {
+ public BranchCreationRequest(BranchType branchType, int sourceTransactionId, long parentBranchId, String branchName, long branchUuid, int associatedArtifactId, int authorId, String creationComment, int mergeAddressingQueryId, long destinationBranchId) {
this.parentBranchId = parentBranchId;
this.branchName = branchName;
if (branchUuid <= 0) {
@@ -43,7 +42,6 @@ public class BranchCreationRequest {
this.associatedArtifactId = associatedArtifactId;
this.branchType = branchType;
this.sourceTransactionId = sourceTransactionId;
- this.branchGuid = branchGuid;
this.authorId = authorId;
this.creationComment = creationComment;
this.mergeAddressingQueryId = mergeAddressingQueryId;
@@ -71,10 +69,6 @@ public class BranchCreationRequest {
return sourceTransactionId;
}
- public String getBranchGuid() {
- return branchGuid;
- }
-
public int getAuthorId() {
return authorId;
}
@@ -101,7 +95,7 @@ public class BranchCreationRequest {
@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 + "]";
}
public long getBranchUuid() {
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 bd17e50eec..2d6b3d45fc 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
@@ -17,7 +17,6 @@ import org.eclipse.osee.framework.core.enums.StorageState;
public final class BranchRow {
private final long branchId;
- private final String branchGuid;
private final String branchName;
private final BranchType branchType;
@@ -30,9 +29,8 @@ public final class BranchRow {
this.storageState = storageState;
}
- public BranchRow(long branchId, String branchGuid, String branchName, BranchType branchType, BranchState branchState, BranchArchivedState branchArchived, StorageState storageState) {
+ public BranchRow(long branchId, String branchName, BranchType branchType, BranchState branchState, BranchArchivedState branchArchived, StorageState storageState) {
this.branchId = branchId;
- this.branchGuid = branchGuid;
this.branchName = branchName;
this.branchType = branchType;
this.branchState = branchState;
@@ -44,10 +42,6 @@ public final class BranchRow {
return branchId;
}
- public String getBranchGuid() {
- return branchGuid;
- }
-
public String getBranchName() {
return branchName;
}
@@ -71,7 +65,6 @@ public final class BranchRow {
public String[] toArray() {
return new String[] {
getBranchArchived().name(),
- getBranchGuid(),
String.valueOf(getBranchId()),
getBranchName(),
getBranchState().name(),
@@ -81,12 +74,11 @@ public final class BranchRow {
public static BranchRow fromArray(String[] data) {
BranchArchivedState archived = BranchArchivedState.valueOf(data[0]);
- String branchGuid = data[1];
- long branchId = Long.valueOf(data[2]);
- String branchName = data[3];
- BranchState branchState = BranchState.valueOf(data[4]);
- BranchType branchType = BranchType.valueOf(data[5]);
- StorageState storageState = StorageState.valueOf(data[6]);
- return new BranchRow(branchId, branchGuid, branchName, branchType, branchState, archived, storageState);
+ long branchId = 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]);
+ return new BranchRow(branchId, branchName, branchType, branchState, archived, storageState);
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/TranslationUtil.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/TranslationUtil.java
index d3249606fb..708485f32b 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/TranslationUtil.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/TranslationUtil.java
@@ -49,19 +49,19 @@ public final class TranslationUtil {
store.put(key.name(), arrayMapToStore(map));
}
- public static void loadTripletList(List<Triplet<String, String, String>> data, PropertyStore store, Enum<?> key) {
+ public static void loadTripletList(List<Triplet<Long, Long, Long>> data, PropertyStore store, Enum<?> key) {
storeToStringTripletList(data, store.getPropertyStore(key.name()));
}
- public static void loadTripletLongList(List<Triplet<Long, String, Long>> data, PropertyStore store, Enum<?> key) {
+ public static void loadTripletLongList(List<Triplet<Long, Long, Long>> data, PropertyStore store, Enum<?> key) {
storeToTripletList(data, store.getPropertyStore(key.name()));
}
- public static void putTripletList(PropertyStore store, Enum<?> key, List<Triplet<String, String, String>> list) {
+ public static void putTripletList(PropertyStore store, Enum<?> key, List<Triplet<Long, Long, Long>> list) {
store.put(key.name(), tripletListToStore(list));
}
- public static void putTripletLongList(PropertyStore store, Enum<?> key, List<Triplet<Long, String, Long>> list) {
+ public static void putTripletLongList(PropertyStore store, Enum<?> key, List<Triplet<Long, Long, Long>> list) {
store.put(key.name(), tripletLongListToStore(list));
}
@@ -138,38 +138,45 @@ public final class TranslationUtil {
}
}
- private static void storeToTripletList(List<Triplet<Long, String, Long>> data, PropertyStore innerStore) {
+ private static void storeToTripletList(List<Triplet<Long, Long, Long>> data, PropertyStore innerStore) {
for (String strKey : innerStore.arrayKeySet()) {
String[] value = innerStore.getArray(strKey);
- data.add(new Triplet<Long, String, Long>(Long.valueOf(value[0]), value[1], Long.valueOf(value[2])));
+ data.add(new Triplet<Long, Long, Long>(Long.valueOf(value[0]), Long.valueOf(value[1]), Long.valueOf(value[2])));
}
}
- private static void storeToStringTripletList(List<Triplet<String, String, String>> data, PropertyStore innerStore) {
+ private static void storeToStringTripletList(List<Triplet<Long, Long, Long>> data, PropertyStore innerStore) {
for (String strKey : innerStore.arrayKeySet()) {
String[] value = innerStore.getArray(strKey);
- data.add(new Triplet<String, String, String>(value[0], value[1], value[2]));
+ data.add(new Triplet<Long, Long, Long>(Long.valueOf(value[0]), Long.valueOf(value[1]), Long.valueOf(value[2])));
}
}
- private static PropertyStore tripletListToStore(List<Triplet<String, String, String>> list) {
+ private static PropertyStore tripletListToStore(List<Triplet<Long, Long, Long>> list) {
PropertyStore innerStore = new PropertyStore();
int index = 0;
- for (Triplet<String, String, String> entry : list) {
- innerStore.put(String.valueOf(index), new String[] {entry.getFirst(), entry.getSecond(), entry.getThird()});
+ for (Triplet<Long, Long, Long> entry : list) {
+ innerStore.put(
+ String.valueOf(index),
+ new String[] {
+ String.valueOf(entry.getFirst()),
+ String.valueOf(entry.getSecond()),
+ String.valueOf(entry.getThird())});
index++;
}
return innerStore;
}
- private static PropertyStore tripletLongListToStore(List<Triplet<Long, String, Long>> list) {
+ private static PropertyStore tripletLongListToStore(List<Triplet<Long, Long, Long>> list) {
PropertyStore innerStore = new PropertyStore();
int index = 0;
- for (Triplet<Long, String, Long> entry : list) {
- innerStore.put(String.valueOf(index), new String[] {
- String.valueOf(entry.getFirst()),
- entry.getSecond(),
- String.valueOf(entry.getThird())});
+ for (Triplet<Long, Long, Long> entry : list) {
+ innerStore.put(
+ String.valueOf(index),
+ new String[] {
+ String.valueOf(entry.getFirst()),
+ String.valueOf(entry.getSecond()),
+ String.valueOf(entry.getThird())});
index++;
}
return innerStore;
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ArtifactTypeCacheUpdateResponseTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ArtifactTypeCacheUpdateResponseTranslator.java
index 70e57dff81..fd67c6bd35 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ArtifactTypeCacheUpdateResponseTranslator.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ArtifactTypeCacheUpdateResponseTranslator.java
@@ -37,7 +37,7 @@ public class ArtifactTypeCacheUpdateResponseTranslator implements ITranslator<Ar
public ArtifactTypeCacheUpdateResponse convert(PropertyStore store) {
List<ArtifactTypeRow> rows = new ArrayList<ArtifactTypeRow>();
Map<Long, Long[]> baseToSuper = new HashMap<Long, Long[]>();
- List<Triplet<Long, String, Long>> artAttrs = new ArrayList<Triplet<Long, String, Long>>();
+ List<Triplet<Long, Long, Long>> artAttrs = new ArrayList<Triplet<Long, Long, Long>>();
int rowCount = store.getInt(Fields.ITEM_COUNT.name());
for (int index = 0; index < rowCount; index++) {
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationRequestTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationRequestTranslator.java
index 0ebecc5273..15c83637c9 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationRequestTranslator.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationRequestTranslator.java
@@ -27,7 +27,6 @@ public class BranchCreationRequestTranslator implements ITranslator<BranchCreati
BRANCH_TYPE,
SOURCE_TX_ID,
- BRANCH_GUID,
BRANCH_UUID,
AUTHOR_ID,
@@ -46,7 +45,6 @@ public class BranchCreationRequestTranslator implements ITranslator<BranchCreati
BranchType branchType = BranchType.valueOf(store.get(Fields.BRANCH_TYPE.name()));
int sourceTransactionId = store.getInt(Fields.SOURCE_TX_ID.name());
- String branchGuid = store.get(Fields.BRANCH_GUID.name());
int authorId = store.getInt(Fields.AUTHOR_ID.name());
@@ -59,7 +57,7 @@ public class BranchCreationRequestTranslator implements ITranslator<BranchCreati
long branchUuid = store.getLong(Fields.BRANCH_UUID.name());
BranchCreationRequest branchCreationRequest =
- new BranchCreationRequest(branchType, sourceTransactionId, parentBranchId, branchGuid, branchName, branchUuid,
+ new BranchCreationRequest(branchType, sourceTransactionId, parentBranchId, branchName, branchUuid,
associatedArtifactId, authorId, creationComment, mergeAddressingQueryId, destinationBranchId);
branchCreationRequest.setTxIsCopied(isTxCopy);
@@ -75,7 +73,6 @@ public class BranchCreationRequestTranslator implements ITranslator<BranchCreati
store.put(Fields.ASSOCIATED_ART_ID.name(), object.getAssociatedArtifactId());
store.put(Fields.BRANCH_TYPE.name(), object.getBranchType().name());
store.put(Fields.SOURCE_TX_ID.name(), object.getSourceTransactionId());
- store.put(Fields.BRANCH_GUID.name(), object.getBranchGuid());
store.put(Fields.BRANCH_UUID.name(), object.getBranchUuid());
store.put(Fields.AUTHOR_ID.name(), object.getAuthorId());
store.put(Fields.CREATION_COMMENT.name(), object.getCreationComment());
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataTest.java
index 9ac4576368..f7b6241d84 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataTest.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataTest.java
@@ -239,12 +239,14 @@ public class AccessDataTest {
data.add(branchToCheck1, detail1);
data.add(branchToCheck2, detail2);
- String message =
- "accessData [\n" + //
- "\tCommon - AccessDetail [permission=WRITE, scope=/scope_2, accessObject=RelationTypeSide [type=[sideA_2]<-[relType_2]->[sideB_2], side=SIDE_A], reason=item 2 - write],\n" + //
- "\tSystem Root Branch - AccessDetail [permission=DENY, scope=/scope_1, accessObject=RelationTypeSide [type=[sideA_2]<-[relType_2]->[sideB_2], side=SIDE_A], reason=item 1 - deny],\n" + //
- "]";
- Assert.assertEquals(message, data.toString());
+ String branch1 =
+ "System Root Branch - AccessDetail [permission=DENY, scope=/scope_1, accessObject=RelationTypeSide [type=[sideA_2]<-[relType_2]->[sideB_2], side=SIDE_A], reason=item 1 - deny]";
+ String branch2 =
+ "Common - AccessDetail [permission=WRITE, scope=/scope_2, accessObject=RelationTypeSide [type=[sideA_2]<-[relType_2]->[sideB_2], side=SIDE_A], reason=item 2 - write]";
+ String message = "accessData [\n\t%s,\n\t%s,\n]";
+ String forward = String.format(message, branch1, branch2);
+ String backward = String.format(message, branch2, branch1);
+ Assert.assertTrue(data.toString().equals(forward) || data.toString().equals(backward));
}
private static AccessDetail<?> findObject(AccessDetail<?> item, Collection<AccessDetail<?>> details) {
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/BranchCacheTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/BranchCacheTest.java
index 85265f8ff5..444f41fc8b 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/BranchCacheTest.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/BranchCacheTest.java
@@ -16,7 +16,7 @@ import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.model.mocks.MockDataFactory;
import org.eclipse.osee.framework.core.model.mocks.MockOseeDataAccessor;
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.Lib;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -25,7 +25,7 @@ import org.junit.BeforeClass;
*
* @author Roberto E. Escobar
*/
-public class BranchCacheTest extends AbstractOseeCacheTest<String, Branch> {
+public class BranchCacheTest extends AbstractOseeCacheTest<Long, Branch> {
private static List<Branch> branchData;
private static BranchCache cache;
@@ -46,7 +46,7 @@ public class BranchCacheTest extends AbstractOseeCacheTest<String, Branch> {
super(branchData, cache);
}
- private final static class BranchDataAccessor extends MockOseeDataAccessor<String, Branch> {
+ private final static class BranchDataAccessor extends MockOseeDataAccessor<Long, Branch> {
private final List<Branch> data;
@@ -56,20 +56,19 @@ public class BranchCacheTest extends AbstractOseeCacheTest<String, Branch> {
}
@Override
- public void load(IOseeCache<String, Branch> cache) throws OseeCoreException {
+ public void load(IOseeCache<Long, Branch> cache) throws OseeCoreException {
super.load(cache);
int typeId = 100;
for (int index = 0; index < 10; index++) {
- Branch item = MockDataFactory.createBranch(index);
+ Branch item = MockDataFactory.createBranch(typeId++, index);
data.add(item);
- item.setId(typeId++);
cache.cache(item);
}
}
}
@Override
- protected String createKey() {
- return GUID.create();
+ protected Long createKey() {
+ return Lib.generateUuid();
}
}
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 13c39ccac2..cd7830ed55 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
@@ -37,6 +37,7 @@ import org.eclipse.osee.framework.core.model.type.OseeEnumTypeFactory;
import org.eclipse.osee.framework.core.model.type.RelationType;
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.Lib;
import org.junit.Assert;
/**
@@ -81,10 +82,14 @@ public final class MockDataFactory {
}
public static Branch createBranch(int index) {
+ return createBranch(Lib.generateUuid(), index);
+ }
+
+ public static Branch createBranch(long uuid, int index) {
BranchState branchState = BranchState.values()[Math.abs(index % BranchState.values().length)];
BranchType branchType = BranchType.values()[Math.abs(index % BranchType.values().length)];
boolean isArchived = index % 2 == 0 ? true : false;
- return new Branch(GUID.create(), "branch_" + index, branchType, branchState, isArchived);
+ return new Branch(uuid, "branch_" + index, branchType, branchState, isArchived);
}
public static TransactionRecord createTransaction(int index, int branchId) {
@@ -94,7 +99,7 @@ public final class MockDataFactory {
if (value == 0) {
value++;
}
- MockOseeDataAccessor<String, Branch> accessor = new MockOseeDataAccessor<String, Branch>();
+ 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,
cache);
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/ModelAsserts.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/ModelAsserts.java
index 569b37c662..409493e03c 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/ModelAsserts.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/ModelAsserts.java
@@ -70,34 +70,28 @@ public class ModelAsserts {
type.clearDirty();
}
- public static void createAlias(BranchCache cache, String branchGuid, String... aliases) throws OseeCoreException {
- Branch branch = cache.getByGuid(branchGuid);
- Assert.assertNotNull(branch);
- // cache.setAliases(branch, Arrays.asList(aliases));
- }
-
- public static void checkMergeBranch(BranchCache cache, String expectedMergeBranchGuid, String sourceBranchGuid, String destinationBranchGuid) throws OseeCoreException {
- Branch sourceBranch = cache.getByGuid(sourceBranchGuid);
+ public static void checkMergeBranch(BranchCache cache, Long expectedMergeBranchUuid, Long sourceBranchUuid, Long destinationBranchUuid) throws OseeCoreException {
+ Branch sourceBranch = cache.getByGuid(sourceBranchUuid);
Assert.assertNotNull(sourceBranch);
- Branch destionationBranch = cache.getByGuid(destinationBranchGuid);
+ Branch destionationBranch = cache.getByGuid(destinationBranchUuid);
Assert.assertNotNull(destionationBranch);
Branch actualMergeBranch = cache.findMergeBranch(sourceBranch, destionationBranch);
- if (expectedMergeBranchGuid == null) {
+ if (expectedMergeBranchUuid == null) {
Assert.assertNull(actualMergeBranch);
} else {
- Branch mergeBranch = cache.getByGuid(expectedMergeBranchGuid);
+ Branch mergeBranch = cache.getByGuid(expectedMergeBranchUuid);
Assert.assertNotNull(mergeBranch);
Assert.assertEquals(mergeBranch, actualMergeBranch);
}
}
- public static void createMergeBranch(BranchCache cache, String mergeBranchGuid, String sourceBranchGuid, String destinationBranchGuid) throws OseeCoreException {
- Branch mergeBranch = cache.getByGuid(mergeBranchGuid);
+ public static void createMergeBranch(BranchCache cache, Long mergeBranchUuid, Long sourceBranchUuid, Long destinationBranchUuid) throws OseeCoreException {
+ Branch mergeBranch = cache.getByGuid(mergeBranchUuid);
Assert.assertNotNull(mergeBranch);
- Branch sourceBranch = cache.getByGuid(sourceBranchGuid);
+ Branch sourceBranch = cache.getByGuid(sourceBranchUuid);
Assert.assertNotNull(sourceBranch);
- Branch destionationBranch = cache.getByGuid(destinationBranchGuid);
+ Branch destionationBranch = cache.getByGuid(destinationBranchUuid);
Assert.assertNotNull(destionationBranch);
Assert.assertTrue(mergeBranch instanceof MergeBranch);
MergeBranch mBranch = (MergeBranch) mergeBranch;
@@ -105,8 +99,8 @@ public class ModelAsserts {
mBranch.setDestinationBranch(destionationBranch);
}
- public static void checkHierarchy(BranchCache cache, String parentGuid, String... expected) throws OseeCoreException {
- Branch parentBranch = cache.getByGuid(parentGuid);
+ public static void checkHierarchy(BranchCache cache, Long parentUuid, Long... expected) throws OseeCoreException {
+ Branch parentBranch = cache.getByGuid(parentUuid);
Assert.assertNotNull(parentBranch);
Collection<Branch> children = parentBranch.getChildren();
Assert.assertEquals(expected.length, children.size());
@@ -120,12 +114,12 @@ public class ModelAsserts {
}
}
- public static void createBranchHierarchy(BranchCache cache, String parentGuid, String... childrenGuids) throws OseeCoreException {
- Branch parentBranch = cache.getByGuid(parentGuid);
+ public static void createBranchHierarchy(BranchCache cache, Long parentUuid, Long... childrenUuids) throws OseeCoreException {
+ Branch parentBranch = cache.getByGuid(parentUuid);
Assert.assertNotNull(parentBranch);
- Assert.assertNotNull(childrenGuids);
- Assert.assertTrue(childrenGuids.length > 0);
- for (String childGuid : childrenGuids) {
+ Assert.assertNotNull(childrenUuids);
+ Assert.assertTrue(childrenUuids.length > 0);
+ for (Long childGuid : childrenUuids) {
Branch childBranch = cache.getByGuid(childGuid);
Assert.assertNotNull(childBranch);
childBranch.setParentBranch(parentBranch);
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/Branch.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/Branch.java
index 2b19b54ab7..9f3a0e4c7f 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/Branch.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/Branch.java
@@ -33,22 +33,18 @@ import org.eclipse.osee.framework.jdk.core.util.Strings;
/**
* @author Roberto E. Escobar
*/
-public class Branch extends AbstractOseeType<String> implements WriteableBranch, IAdaptable {
+public class Branch extends AbstractOseeType<Long> implements WriteableBranch, IAdaptable {
private static final int SHORT_NAME_LIMIT = 35;
private final Collection<Branch> childBranches = new HashSet<Branch>();
- public Branch(String guid, String name, BranchType branchType, BranchState branchState, boolean isArchived) {
- super(guid, name);
+ public Branch(Long uuid, String name, BranchType branchType, BranchState branchState, boolean isArchived) {
+ super(uuid, name);
initializeFields();
setFieldLogException(BranchField.BRANCH_TYPE_FIELD_KEY, branchType);
setFieldLogException(BranchField.BRANCH_STATE_FIELD_KEY, branchState);
setFieldLogException(BranchField.BRANCH_ARCHIVED_STATE_FIELD_KEY, BranchArchivedState.fromBoolean(isArchived));
- }
-
- public Branch(String guid, long uuid, String name, BranchType branchType, BranchState branchState, boolean isArchived) {
- this(guid, name, branchType, branchState, isArchived);
if (uuid <= 0) {
throw new OseeStateException("uuid [%d] must be > 0", uuid);
}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/BranchFactory.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/BranchFactory.java
index e0b31e28aa..7876808774 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/BranchFactory.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/BranchFactory.java
@@ -24,26 +24,25 @@ import org.eclipse.osee.framework.jdk.core.util.Conditions;
*/
public class BranchFactory implements IOseeTypeFactory {
- public Branch create(String guid, long uuid, String name, BranchType branchType, BranchState branchState, boolean isArchived) throws OseeCoreException {
+ public Branch create(long uuid, String name, BranchType branchType, BranchState branchState, boolean isArchived) throws OseeCoreException {
Conditions.checkNotNullOrEmpty(name, "branch name");
Conditions.checkNotNull(branchType, "branch type");
Conditions.checkNotNull(branchState, "branch state");
- String checkedGuid = Conditions.checkGuidCreateIfNeeded(guid);
Branch toReturn;
if (branchType.isMergeBranch()) {
- toReturn = new MergeBranch(checkedGuid, uuid, name, branchType, branchState, isArchived);
+ toReturn = new MergeBranch(uuid, name, branchType, branchState, isArchived);
} else {
- toReturn = new Branch(checkedGuid, uuid, name, branchType, branchState, isArchived);
+ toReturn = new Branch(uuid, name, branchType, branchState, isArchived);
}
return toReturn;
}
- public Branch createOrUpdate(AbstractOseeCache<String, Branch> cache, String guid, long uuid, String name, BranchType branchType, BranchState branchState, boolean isArchived) throws OseeCoreException {
+ public Branch createOrUpdate(AbstractOseeCache<Long, Branch> cache, long uuid, String name, BranchType branchType, BranchState branchState, boolean isArchived) throws OseeCoreException {
Conditions.checkNotNull(cache, "BranchCache");
- Branch branch = cache.getByGuid(guid);
+ Branch branch = cache.getByGuid(uuid);
if (branch == null) {
- branch = create(guid, uuid, name, branchType, branchState, isArchived);
+ branch = create(uuid, name, branchType, branchState, isArchived);
cache.cache(branch);
} else {
branch.setName(name);
@@ -54,11 +53,11 @@ public class BranchFactory implements IOseeTypeFactory {
return branch;
}
- public Branch createOrUpdate(IOseeCache<String, Branch> cache, String guid, long uuid, String name, BranchType branchType, BranchState branchState, boolean isArchived, StorageState storageState) throws OseeCoreException {
+ public Branch createOrUpdate(IOseeCache<Long, Branch> cache, long uuid, String name, BranchType branchType, BranchState branchState, boolean isArchived, StorageState storageState) throws OseeCoreException {
Conditions.checkNotNull(cache, "BranchCache");
Branch branch = cache.getById(uuid);
if (branch == null) {
- branch = create(guid, uuid, name, branchType, branchState, isArchived);
+ branch = create(uuid, name, branchType, branchState, isArchived);
branch.setStorageState(storageState);
cache.cache(branch);
} else {
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/MergeBranch.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/MergeBranch.java
index 70425943da..767a2178f5 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/MergeBranch.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/MergeBranch.java
@@ -21,8 +21,8 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
*/
public final class MergeBranch extends Branch {
- public MergeBranch(String guid, long uuid, String name, BranchType branchType, BranchState branchState, boolean isArchived) {
- super(guid, uuid, name, branchType, branchState, isArchived);
+ public MergeBranch(long uuid, String name, BranchType branchType, BranchState branchState, boolean isArchived) {
+ super(uuid, name, branchType, branchState, isArchived);
}
@Override
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/BranchCache.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/BranchCache.java
index d1cf9f12ae..68e3f5cb06 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/BranchCache.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/BranchCache.java
@@ -26,9 +26,9 @@ import org.eclipse.osee.framework.jdk.core.util.Conditions;
* @author Roberto E. Escobar
* @author Ryan D. Brooks
*/
-public class BranchCache extends AbstractOseeCache<String, Branch> {
+public class BranchCache extends AbstractOseeCache<Long, Branch> {
- public BranchCache(IOseeDataAccessor<String, Branch> dataAccessor) {
+ public BranchCache(IOseeDataAccessor<Long, Branch> dataAccessor) {
super(OseeCacheEnum.BRANCH_CACHE, dataAccessor, false);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IOseeBranch.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IOseeBranch.java
index 27fe76f404..a45a5253bc 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IOseeBranch.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IOseeBranch.java
@@ -15,10 +15,7 @@ import org.eclipse.osee.framework.jdk.core.type.Identifiable;
/**
* @author Ryan D. Brooks
*/
-public interface IOseeBranch extends Identifiable<String> {
-
- @Override
- String getGuid();
+public interface IOseeBranch extends Identifiable<Long> {
long getUuid();
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java
index 0ec5af4e78..106ea545a4 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java
@@ -15,7 +15,6 @@ import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.jdk.core.type.BaseIdentity;
import org.eclipse.osee.framework.jdk.core.type.FullyNamedIdentity;
import org.eclipse.osee.framework.jdk.core.type.NamedIdentity;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.Lib;
public final class TokenFactory {
@@ -57,19 +56,19 @@ public final class TokenFactory {
}
public static IOseeBranch createBranch(String name) {
- return createBranch(GUID.create(), Lib.generateUuid(), name);
+ return createBranch(Lib.generateUuid(), name);
}
public static IOseeBranch createBranch(String guid, String name) {
- return createBranch(guid, Lib.generateUuid(), name);
+ return createBranch(Lib.generateUuid(), name);
}
public static IOseeBranch createBranch(Long uuid, String name) {
- return createBranch(GUID.create(), uuid, name);
+ return new BranchToken(uuid, name);
}
- public static IOseeBranch createBranch(String guid, long uuid, String name) {
- return new BranchToken(guid, uuid, name);
+ public static IOseeBranch createBranch(long uuid, String name) {
+ return new BranchToken(uuid, name);
}
public static IRelationSorterId createSorterId(String guid, String name) {
@@ -104,17 +103,15 @@ public final class TokenFactory {
}
}
- private static final class BranchToken extends NamedIdentity<String> implements IOseeBranch {
- private final long uuid;
+ private static final class BranchToken extends NamedIdentity<Long> implements IOseeBranch {
- public BranchToken(String guid, long uuid, String name) {
- super(guid, name);
- this.uuid = uuid;
+ public BranchToken(long uuid, String name) {
+ super(uuid, name);
}
@Override
public long getUuid() {
- return uuid;
+ return getGuid();
}
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreBranches.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreBranches.java
index 6065fe227f..8bed028c47 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreBranches.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreBranches.java
@@ -18,9 +18,8 @@ import org.eclipse.osee.framework.core.data.TokenFactory;
*/
public final class CoreBranches {
- public static final IOseeBranch COMMON = TokenFactory.createBranch("AyH_fDpMERA+zDfML4gA", 570, "Common");
- public static final IOseeBranch SYSTEM_ROOT = TokenFactory.createBranch("AyH_fDnM2RFEhyybolQA", 1,
- "System Root Branch");
+ public static final IOseeBranch COMMON = TokenFactory.createBranch(570, "Common");
+ public static final IOseeBranch SYSTEM_ROOT = TokenFactory.createBranch(1, "System Root Branch");
public CoreBranches() {
// Constants
diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Conditions.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Conditions.java
index 6ac81ffe0d..0361a954b6 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Conditions.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Conditions.java
@@ -135,14 +135,6 @@ public final class Conditions {
}
}
- public static String checkGuidCreateIfNeeded(String guid) {
- String toReturn = guid;
- if (guid == null) {
- toReturn = GUID.create();
- }
- return toReturn;
- }
-
public static void checkDoesNotContainNulls(Object object, String message, Object... data) throws OseeCoreException {
checkNotNull(object, message);
Collection<?> toCheck = null;
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 bd69a92ed8..45c7d9cbed 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
@@ -57,7 +57,7 @@ public class ArtifactFileServlet extends UnsecuredOseeHttpServlet {
String servletPath = request.getServletPath();
if (!Strings.isValid(servletPath) || "/".equals(servletPath) || "/index".equals(servletPath)) {
- Pair<String, String> defaultArtifact = DefaultOseeArtifact.get();
+ Pair<String, Long> defaultArtifact = DefaultOseeArtifact.get();
if (defaultArtifact != null) {
artifactFileInfo =
new HttpArtifactFileInfo(defaultArtifact.getFirst(), null, defaultArtifact.getSecond());
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/DataServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/DataServlet.java
index 9b618b49a4..78f1ddb2ff 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/DataServlet.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/DataServlet.java
@@ -60,9 +60,9 @@ public class DataServlet extends UnsecuredOseeHttpServlet {
public static void handleUriRequest(IResourceManager resourceManager, String urlRequest, HttpServletResponse response, BranchCache branchCache) throws OseeCoreException {
UrlParser parser = new UrlParser();
parser.parse(urlRequest);
- String branchGuid = parser.getAttribute("branch");
+ Long branchUuid = Long.valueOf(parser.getAttribute("branch"));
String artifactGuid = parser.getAttribute("artifact");
- String uri = ArtifactUtil.getUri(artifactGuid, branchCache.getByGuid(branchGuid));
+ String uri = ArtifactUtil.getUri(artifactGuid, branchCache.getByGuid(branchUuid));
ArtifactFileServlet.handleArtifactUri(resourceManager, urlRequest, uri, response);
}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java
index 4d9fb6ca2d..c2a43c5a2f 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java
@@ -266,7 +266,7 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
private ArtifactTypeCacheUpdateResponse createArtifactTypeCacheUpdateResponse(OrcsTypes orcsTypes) throws OseeCoreException {
List<ArtifactTypeRow> rows = new ArrayList<ArtifactTypeRow>();
Map<Long, Long[]> baseToSuper = new HashMap<Long, Long[]>();
- List<Triplet<Long, String, Long>> artAttrs = new ArrayList<Triplet<Long, String, Long>>();
+ List<Triplet<Long, Long, Long>> artAttrs = new ArrayList<Triplet<Long, Long, Long>>();
ArtifactTypes artTypes = orcsTypes.getArtifactTypes();
for (IArtifactType artType : artTypes.getAll()) {
long artTypeId = artType.getGuid();
@@ -289,7 +289,7 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
IOseeBranch branch = entry.getKey();
Collection<IAttributeType> attrTypes = entry.getValue();
for (IAttributeType type : attrTypes) {
- artAttrs.add(new Triplet<Long, String, Long>(artType.getGuid(), branch.getGuid(), type.getGuid()));
+ artAttrs.add(new Triplet<Long, Long, Long>(artType.getGuid(), branch.getGuid(), type.getGuid()));
}
}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java
index bc5c3d4035..79c2c8679a 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java
@@ -38,7 +38,7 @@ public class CreateBranchCallable extends AbstractBranchCallable<BranchCreationR
protected BranchCreationResponse executeCall(BranchCreationRequest request) throws Exception {
CreateBranchData createData = new CreateBranchData();
- createData.setGuid(request.getBranchGuid());
+ createData.setUuid(request.getBranchUuid());
createData.setName(request.getBranchName());
if (Long.valueOf(request.getBranchUuid()) > 0) {
createData.setUuid(request.getBranchUuid());
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/DefaultOseeArtifact.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/DefaultOseeArtifact.java
index 5401f563a3..c7ada75b55 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/DefaultOseeArtifact.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/DefaultOseeArtifact.java
@@ -23,18 +23,18 @@ import org.eclipse.osee.framework.jdk.core.util.Strings;
public class DefaultOseeArtifact {
private static String OSEE_DEFAULT_SERVER_PAGE_GUID_KEY = "osee.default.server.page.guid";
- private static String OSEE_DEFAULT_SERVER_PAGE_BRANCH_GUID = "osee.default.server.page.branch.guid";
+ private static String OSEE_DEFAULT_SERVER_PAGE_BRANCH_UUID = "osee.default.server.page.branch.uuid";
- public static Pair<String, String> get() throws Exception {
+ public static Pair<String, Long> get() throws Exception {
final String artifactGuid = OseeInfo.getValue(OSEE_DEFAULT_SERVER_PAGE_GUID_KEY);
- final String defaultBranchGuidId = OseeInfo.getValue(OSEE_DEFAULT_SERVER_PAGE_BRANCH_GUID);
+ final String defaultBranchUuidId = OseeInfo.getValue(OSEE_DEFAULT_SERVER_PAGE_BRANCH_UUID);
- if (!Strings.isValid(artifactGuid) || !Strings.isValid(defaultBranchGuidId)) {
+ if (!Strings.isValid(artifactGuid) || !Strings.isValid(defaultBranchUuidId)) {
throw new OseeStateException(
"OSEE default server page not found. Ensure values exist in OseeInfo table for [%s] and [%s] keys.",
- OSEE_DEFAULT_SERVER_PAGE_GUID_KEY, OSEE_DEFAULT_SERVER_PAGE_BRANCH_GUID);
+ OSEE_DEFAULT_SERVER_PAGE_GUID_KEY, OSEE_DEFAULT_SERVER_PAGE_BRANCH_UUID);
}
- return new Pair<String, String>(artifactGuid, defaultBranchGuidId);
+ return new Pair<String, Long>(artifactGuid, Long.valueOf(defaultBranchUuidId));
}
}
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 d40d42ac30..dc8bc33868 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
@@ -19,20 +19,21 @@ import org.eclipse.osee.framework.jdk.core.util.Strings;
public class HttpArtifactFileInfo {
private static final String GUID_KEY = "guid";
private static final String BRANCH_NAME_KEY = "branch";
- private static final String BRANCH_GUID_KEY = "branchGuid";
+ private static final String BRANCH_UUID_KEY = "branchUuid";
private final String guid;
private final String branchName;
- private final String branchGuid;
+ private final Long branchUuid;
- public HttpArtifactFileInfo(String guid, String branchName, String branchGuid) {
+ public HttpArtifactFileInfo(String guid, String branchName, Long branchUuid) {
this.guid = guid;
this.branchName = branchName;
- this.branchGuid = branchGuid;
+ this.branchUuid = branchUuid;
}
public HttpArtifactFileInfo(HttpServletRequest request) {
- this(request.getParameter(GUID_KEY), request.getParameter(BRANCH_NAME_KEY), request.getParameter(BRANCH_GUID_KEY));
+ this(request.getParameter(GUID_KEY), request.getParameter(BRANCH_NAME_KEY),
+ Long.valueOf(request.getParameter(BRANCH_UUID_KEY)));
}
public String getGuid() {
@@ -47,12 +48,12 @@ public class HttpArtifactFileInfo {
return branchName;
}
- public String getBranchGuid() {
- return branchGuid;
+ public Long getBranchGuid() {
+ return branchUuid;
}
public boolean isBranchGuidValid() {
- return Strings.isValid(branchGuid);
+ return branchUuid != null && branchUuid > 0;
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java
index 9c9e236a92..5b50ba4004 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java
@@ -109,6 +109,7 @@ public class RemoteBranchEvent1 extends RemoteEvent {
*
* @return possible object is {@link RemoteNetworkSender1 }
*/
+ @Override
public RemoteNetworkSender1 getNetworkSender() {
return networkSender;
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventListenerRegistryTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventListenerRegistryTest.java
index 42805dce3f..dbe5ce14cb 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventListenerRegistryTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventListenerRegistryTest.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.framework.skynet.core.internal.event;
import java.util.Collection;
import java.util.List;
-import org.junit.Assert;
import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.skynet.core.event.filter.IEventFilter;
import org.eclipse.osee.framework.skynet.core.event.listener.EventQosType;
@@ -27,6 +26,7 @@ import org.eclipse.osee.framework.skynet.core.event.model.BranchEvent;
import org.eclipse.osee.framework.skynet.core.event.model.BranchEventType;
import org.eclipse.osee.framework.skynet.core.event.model.Sender;
import org.eclipse.osee.framework.skynet.core.event.model.TransactionEvent;
+import org.junit.Assert;
import org.junit.Test;
/**
@@ -67,7 +67,7 @@ public class EventListenerRegistryTest {
Assert.assertEquals(delegate1, listener2.iterator().next());
Collection<IEventListener> listener3 =
- registry.getListeners(EventQosType.NORMAL, new BranchEvent(BranchEventType.Added, "x"));
+ registry.getListeners(EventQosType.NORMAL, new BranchEvent(BranchEventType.Added, 3L));
Assert.assertEquals(1, listener3.size());
Assert.assertEquals(delegate2, listener3.iterator().next());
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java
index d9e5e94cdf..8aa94c2d1a 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java
@@ -38,6 +38,7 @@ import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.jdk.core.util.GUID;
+import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.skynet.core.mocks.DataFactory;
import org.eclipse.osee.framework.skynet.core.mocks.MockIArtifact;
import org.eclipse.osee.framework.skynet.core.mocks.MockOseeDataAccessor;
@@ -239,7 +240,8 @@ public class RelationTypeSideSorterTest {
private static IArtifact createArtifact(String name, String guid) {
int uniqueId = randomGenerator.nextInt();
- Branch branch = new Branch(GUID.create(), name + " - branch", BranchType.WORKING, BranchState.MODIFIED, false);
+ Branch branch =
+ new Branch(Lib.generateUuid(), name + " - branch", BranchType.WORKING, BranchState.MODIFIED, false);
return new MockArtifactWithRelations(uniqueId, name, guid, branch, CoreArtifactTypes.Artifact);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java
index 4d05402225..c82674063c 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java
@@ -31,6 +31,7 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.framework.jdk.core.util.GUID;
+import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.skynet.core.mocks.DataFactory;
import org.eclipse.osee.framework.skynet.core.mocks.MockOseeDataAccessor;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
@@ -270,7 +271,8 @@ public class RelationOrderDataTest {
private static IArtifact createArtifact(String name, String guid) {
int uniqueId = randomGenerator.nextInt();
- Branch branch = new Branch(GUID.create(), name + " - branch", BranchType.WORKING, BranchState.MODIFIED, false);
+ Branch branch =
+ new Branch(Lib.generateUuid(), name + " - branch", BranchType.WORKING, BranchState.MODIFIED, false);
return DataFactory.createArtifact(uniqueId, name, guid, branch);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java
index 073fff0ea0..6c8cc5ced6 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java
@@ -90,17 +90,17 @@ public class User extends Artifact {
}
public void toggleFavoriteBranch(Branch favoriteBranch) throws OseeCoreException {
- HashSet<String> branchGuids = new HashSet<String>();
+ HashSet<Long> branchUuids = new HashSet<Long>();
for (Branch branch : BranchManager.getBranches(BranchArchivedState.UNARCHIVED, BranchType.WORKING,
BranchType.BASELINE)) {
- branchGuids.add(branch.getGuid());
+ branchUuids.add(branch.getGuid());
}
boolean found = false;
Collection<Attribute<String>> attributes = getAttributes(CoreAttributeTypes.FavoriteBranch);
for (Attribute<String> attribute : attributes) {
// Remove attributes that are no longer valid
- if (!branchGuids.contains(attribute.getValue())) {
+ if (!branchUuids.contains(attribute.getValue())) {
attribute.delete();
} else if (favoriteBranch.getGuid().equals(attribute.getValue())) {
attribute.delete();
@@ -140,6 +140,12 @@ public class User extends Artifact {
}
+ public void setSetting(String key, Long value) throws OseeCoreException {
+ ensureUserSettingsAreLoaded();
+ userSettings.put(key, value);
+
+ }
+
public void saveSettings() throws OseeCoreException {
saveSettings(null);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java
index 984ea298ec..dac0bf88dc 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java
@@ -176,6 +176,10 @@ public final class UserManager {
return getUser().getSetting(key);
}
+ public static String getSetting(Long key) throws OseeCoreException {
+ return getUser().getSetting(String.valueOf(key));
+ }
+
public static boolean getBooleanSetting(String key) throws OseeCoreException {
return getUser().getBooleanSetting(key);
}
@@ -184,4 +188,8 @@ public final class UserManager {
getUser().setSetting(key, value);
}
+ public static void setSetting(String key, Long value) throws OseeCoreException {
+ getUser().setSetting(key, String.valueOf(value));
+ }
+
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java
index 3115d9b480..199c65e482 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java
@@ -27,7 +27,7 @@ public class ArtifactURL {
public static URL getExternalArtifactLink(final Artifact artifact) throws OseeCoreException {
Map<String, String> parameters = new HashMap<String, String>();
parameters.put("guid", artifact.getGuid());
- parameters.put("branchGuid", artifact.getBranch().getGuid());
+ parameters.put("branchUuid", String.valueOf(artifact.getBranch().getUuid()));
String urlString =
HttpUrlBuilderClient.getInstance().getPermanentLinkBaseUrl(OseeServerContext.ARTIFACT_CONTEXT, parameters);
URL url = null;
@@ -44,7 +44,7 @@ public class ArtifactURL {
parameters.put("sessionId", ClientSessionManager.getSessionId());
parameters.put("context", "osee/loopback");
parameters.put("guid", artifact.getGuid());
- parameters.put("branchGuid", artifact.getBranch().getGuid());
+ parameters.put("branchUuid", String.valueOf(artifact.getBranch().getGuid()));
parameters.put("isDeleted", String.valueOf(artifact.isDeleted()));
if (artifact.isHistorical()) {
parameters.put("transactionId", String.valueOf(artifact.getTransactionNumber()));
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 e4f99c67be..a8a3df78f6 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
@@ -81,7 +81,7 @@ import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
public class BranchManager {
private static final BranchManager instance = new BranchManager();
- private static final String LAST_DEFAULT_BRANCH = "LastDefaultBranch";
+ private static final String LAST_DEFAULT_BRANCH = "LastDefaultBranchUuid";
public static final String COMMIT_COMMENT = "Commit Branch ";
private static final BranchFactory branchFactory = new BranchFactory();
@@ -168,29 +168,19 @@ public class BranchManager {
if (branch instanceof Branch) {
return (Branch) branch;
} else {
- return getBranchByGuid(branch.getGuid());
+ return getBranchByUuid(branch.getUuid());
}
}
/**
* Do not call this method unless absolutely neccessary due to performance impacts.
*/
- public static synchronized void checkAndReload(String guid) throws OseeCoreException {
- if (!branchExists(guid)) {
- loadBranchToCache(guid);
- }
- }
-
public static synchronized void checkAndReload(Long id) throws OseeCoreException {
if (!branchExists(id)) {
loadBranchToCache(id);
}
}
- private static void loadBranchToCache(String guid) {
- loadBranchToCache("select * from osee_branch where branch_guid = ?", guid);
- }
-
private static void loadBranchToCache(long id) {
loadBranchToCache("select * from osee_branch where branch_id = ?", id);
}
@@ -216,7 +206,7 @@ public class BranchManager {
int assocArtId = chStmt.getInt("associated_art_id");
Branch created =
- branchFactory.createOrUpdate(getCache(), branchGuid, branchId, branchName, branchType, branchState,
+ branchFactory.createOrUpdate(getCache(), branchId, branchName, branchType, branchState,
archiveState.isArchived(), StorageState.LOADED);
created.setBaseTransaction(TransactionManager.getTransactionId(baseTx));
created.setSourceTransaction(TransactionManager.getTransactionId(sourceTx));
@@ -229,11 +219,11 @@ public class BranchManager {
}
- public static Branch getBranchByGuid(String guid) throws OseeCoreException {
- checkAndReload(guid);
- Branch branch = getCache().getByGuid(guid);
+ public static Branch getBranchByGuid(Long uuid) throws OseeCoreException {
+ checkAndReload(uuid);
+ Branch branch = getCache().getByGuid(uuid);
if (branch == null) {
- throw new BranchDoesNotExist("Branch with guid [%s] does not exist", guid);
+ throw new BranchDoesNotExist("Branch with guid [%s] does not exist", uuid);
}
return branch;
}
@@ -242,10 +232,6 @@ public class BranchManager {
return getCache().get(branchToken) != null;
}
- public static boolean branchExists(String branchGuid) throws OseeCoreException {
- return getCache().getByGuid(branchGuid) != null;
- }
-
public static boolean branchExists(Long id) throws OseeCoreException {
return getCache().getById(id) != null;
}
@@ -335,18 +321,18 @@ public class BranchManager {
Operations.executeWorkAndCheckStatus(new PurgeBranchHttpRequestOperation(branch, false));
}
- public static void updateBranchType(IProgressMonitor monitor, final long branchId, String branchGuid, final BranchType type) throws OseeCoreException {
- IOperation operation = new UpdateBranchTypeHttpRequestOperation(branchId, branchGuid, type);
+ public static void updateBranchType(IProgressMonitor monitor, final long branchId, final BranchType type) throws OseeCoreException {
+ IOperation operation = new UpdateBranchTypeHttpRequestOperation(branchId, type);
Operations.executeWorkAndCheckStatus(operation, monitor);
}
- public static void updateBranchState(IProgressMonitor monitor, final long branchId, String branchGuid, final BranchState state) throws OseeCoreException {
- IOperation operation = new UpdateBranchStateHttpRequestOperation(branchId, branchGuid, state);
+ public static void updateBranchState(IProgressMonitor monitor, final long branchId, final BranchState state) throws OseeCoreException {
+ IOperation operation = new UpdateBranchStateHttpRequestOperation(branchId, state);
Operations.executeWorkAndCheckStatus(operation, monitor);
}
- public static void updateBranchArchivedState(IProgressMonitor monitor, final long branchId, String branchGuid, final BranchArchivedState state) throws OseeCoreException {
- IOperation operation = new UpdateBranchArchivedStateHttpRequestOperation(branchId, branchGuid, state);
+ public static void updateBranchArchivedState(IProgressMonitor monitor, final long branchId, final BranchArchivedState state) throws OseeCoreException {
+ IOperation operation = new UpdateBranchArchivedStateHttpRequestOperation(branchId, state);
Operations.executeWorkAndCheckStatus(operation, monitor);
}
@@ -444,7 +430,7 @@ public class BranchManager {
destBranch.getName());
String branchName = "Merge " + sourceBranch.getShortName() + " <=> " + destBranch.getShortName();
mergeBranch =
- (MergeBranch) createBranch(BranchType.MERGE, sourceBranch.getBaseTransaction(), branchName, null,
+ (MergeBranch) createBranch(BranchType.MERGE, sourceBranch.getBaseTransaction(), branchName,
Lib.generateUuid(), UserManager.getUser(), creationComment, mergeAddressingQueryId, destBranch.getId());
mergeBranch.setSourceBranch(sourceBranch);
mergeBranch.setDestinationBranch(destBranch);
@@ -454,20 +440,19 @@ public class BranchManager {
return mergeBranch;
}
- public static Branch createWorkingBranch(TransactionRecord parentTransactionId, String childBranchName, String childBranchGuid, Artifact associatedArtifact) throws OseeCoreException {
- return createWorkingBranch(parentTransactionId, childBranchName, childBranchGuid, Lib.generateUuid(),
- associatedArtifact);
+ public static Branch createWorkingBranch(TransactionRecord parentTransactionId, String childBranchName, Artifact associatedArtifact) throws OseeCoreException {
+ return createWorkingBranch(parentTransactionId, childBranchName, Lib.generateUuid(), associatedArtifact);
}
- public static Branch createWorkingBranch(TransactionRecord parentTransactionId, String childBranchName, String childBranchGuid, Long childBranchUuid, Artifact associatedArtifact) throws OseeCoreException {
+ public static Branch createWorkingBranch(TransactionRecord parentTransactionId, String childBranchName, Long childBranchUuid, Artifact associatedArtifact) throws OseeCoreException {
Conditions.notNull(childBranchUuid, "childBranchUuid");
String creationComment =
String.format("New Branch from %s (%s)", parentTransactionId.getBranch().getName(),
parentTransactionId.getId());
final String truncatedName = Strings.truncate(childBranchName, 195, true);
- return createBranch(BranchType.WORKING, parentTransactionId, truncatedName, childBranchGuid, childBranchUuid,
- associatedArtifact, creationComment, -1, -1);
+ return createBranch(BranchType.WORKING, parentTransactionId, truncatedName, childBranchUuid, associatedArtifact,
+ creationComment, -1, -1);
}
/**
@@ -481,7 +466,7 @@ public class BranchManager {
final String truncatedName = Strings.truncate(childBranchName, 195, true);
CreateBranchHttpRequestOperation operation =
- new CreateBranchHttpRequestOperation(BranchType.WORKING, parentTransactionId, truncatedName, null, -1,
+ new CreateBranchHttpRequestOperation(BranchType.WORKING, parentTransactionId, truncatedName, -1,
associatedArtifact, creationComment, -1, -1);
operation.setTxCopyBranchType(true);
Operations.executeWorkAndCheckStatus(operation);
@@ -496,7 +481,7 @@ public class BranchManager {
final String truncatedName = Strings.truncate(childBranchName, 195, true);
CreateBranchHttpRequestOperation operation =
- new CreateBranchHttpRequestOperation(BranchType.PORT, parentTransactionId, truncatedName, null, -1,
+ new CreateBranchHttpRequestOperation(BranchType.PORT, parentTransactionId, truncatedName, -1,
associatedArtifact, creationComment, -1, -1);
operation.setTxCopyBranchType(true);
Operations.executeWorkAndCheckStatus(operation);
@@ -512,7 +497,7 @@ public class BranchManager {
Conditions.checkNotNull(childBranchName, "Child Branch Name");
Conditions.checkNotNull(associatedArtifact, "Associated Artifact");
TransactionRecord parentTransactionId = TransactionManager.getHeadTransaction(parentBranch);
- return createWorkingBranch(parentTransactionId, childBranchName, null, Lib.generateUuid(), associatedArtifact);
+ return createWorkingBranch(parentTransactionId, childBranchName, Lib.generateUuid(), associatedArtifact);
}
public static Branch createWorkingBranch(IOseeBranch parentBranch, IOseeBranch childBranch) throws OseeCoreException {
@@ -521,8 +506,7 @@ public class BranchManager {
public static Branch createWorkingBranch(IOseeBranch parentBranch, IOseeBranch childBranch, Artifact associatedArtifact) throws OseeCoreException {
TransactionRecord parentTransactionId = TransactionManager.getHeadTransaction(parentBranch);
- return createWorkingBranch(parentTransactionId, childBranch.getName(), childBranch.getGuid(),
- childBranch.getUuid(), associatedArtifact);
+ return createWorkingBranch(parentTransactionId, childBranch.getName(), childBranch.getUuid(), associatedArtifact);
}
/**
@@ -535,13 +519,13 @@ public class BranchManager {
public static Branch createBaselineBranch(IOseeBranch parentBranch, IOseeBranch childBranch, Artifact associatedArtifact) throws OseeCoreException {
TransactionRecord parentTransactionId = TransactionManager.getHeadTransaction(parentBranch);
String creationComment = String.format("Branch Creation for %s", childBranch.getName());
- return createBranch(BranchType.BASELINE, parentTransactionId, childBranch.getName(), childBranch.getGuid(),
- childBranch.getUuid(), associatedArtifact, creationComment, -1, -1);
+ return createBranch(BranchType.BASELINE, parentTransactionId, childBranch.getName(), childBranch.getUuid(),
+ associatedArtifact, creationComment, -1, -1);
}
- private static Branch createBranch(BranchType branchType, TransactionRecord parentTransaction, String branchName, String branchGuid, long branchUuid, Artifact associatedArtifact, String creationComment, int mergeAddressingQueryId, long destinationBranchId) throws OseeCoreException {
+ private static Branch createBranch(BranchType branchType, TransactionRecord parentTransaction, String branchName, long branchUuid, Artifact associatedArtifact, String creationComment, int mergeAddressingQueryId, long destinationBranchId) throws OseeCoreException {
CreateBranchHttpRequestOperation operation =
- new CreateBranchHttpRequestOperation(branchType, parentTransaction, branchName, branchGuid, branchUuid,
+ new CreateBranchHttpRequestOperation(branchType, parentTransaction, branchName, branchUuid,
associatedArtifact, creationComment, mergeAddressingQueryId, destinationBranchId);
Operations.executeWorkAndCheckStatus(operation);
return operation.getNewBranch();
@@ -567,7 +551,7 @@ public class BranchManager {
private void initializeLastBranchValue() {
try {
- String branchGuid = UserManager.getSetting(LAST_DEFAULT_BRANCH);
+ Long branchGuid = Long.valueOf(UserManager.getSetting(LAST_DEFAULT_BRANCH));
lastBranch = getBranchByGuid(branchGuid);
} catch (Exception ex) {
try {
@@ -724,8 +708,17 @@ public class BranchManager {
return ((Branch) branch).getBranchType();
}
- public static Branch getBranchByUuid(Long branchUuid) {
- return getBranchByGuid(BranchManager.getBranchGuidLegacy(branchUuid));
+ public static Branch getBranchByUuid(Long uuid) {
+ checkAndReload(uuid);
+ Branch branch = getCache().getByGuid(uuid);
+ if (branch == null) {
+ throw new BranchDoesNotExist("Branch with guid [%s] does not exist", uuid);
+ }
+ return branch;
+ }
+
+ public static Branch getBranchByGuid(String branchGuid) {
+ return getBranchByGuid(getBranchIdLegacy(branchGuid));
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/ArtifactReferenceAttribute.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/ArtifactReferenceAttribute.java
index 9eff7f2fe8..e2dbd78540 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/ArtifactReferenceAttribute.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/ArtifactReferenceAttribute.java
@@ -10,8 +10,14 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.attribute;
+import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
public class ArtifactReferenceAttribute extends IdentityReferenceAttribute<Artifact> {
- //
+
+ @Override
+ protected boolean subClassSetValue(Artifact value) throws OseeCoreException {
+ return getAttributeDataProvider().setValue(value == null ? "" : value.getGuid());
+ }
+
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BranchReferenceAttribute.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BranchReferenceAttribute.java
index 1e381af236..4c24d359e4 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BranchReferenceAttribute.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BranchReferenceAttribute.java
@@ -11,7 +11,12 @@
package org.eclipse.osee.framework.skynet.core.attribute;
import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
public class BranchReferenceAttribute extends IdentityReferenceAttribute<IOseeBranch> {
- //
+ @Override
+ protected boolean subClassSetValue(IOseeBranch value) throws OseeCoreException {
+ return getAttributeDataProvider().setValue(value == null ? "" : String.valueOf(value.getGuid()));
+ }
+
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/IdentityReferenceAttribute.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/IdentityReferenceAttribute.java
index b8806212b3..ce27f48081 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/IdentityReferenceAttribute.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/IdentityReferenceAttribute.java
@@ -16,7 +16,7 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.attribute.service.AttributeAdapterService;
import org.eclipse.osee.framework.skynet.core.internal.ServiceUtil;
-public abstract class IdentityReferenceAttribute<T extends Identity<String>> extends CharacterBackedAttribute<T> {
+public abstract class IdentityReferenceAttribute<T extends Identity<?>> extends CharacterBackedAttribute<T> {
@Override
public T getValue() throws OseeCoreException {
@@ -24,11 +24,6 @@ public abstract class IdentityReferenceAttribute<T extends Identity<String>> ext
}
@Override
- protected boolean subClassSetValue(T value) throws OseeCoreException {
- return getAttributeDataProvider().setValue(value == null ? "" : value.getGuid());
- }
-
- @Override
protected T convertStringToValue(String value) throws OseeCoreException {
AttributeAdapterService service = getAttributeAdapter();
T identity = service.adapt(this, new BaseIdentity<String>(value));
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java
index 50913baa78..1b0d1aca60 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java
@@ -130,8 +130,8 @@ public final class FrameworkEventUtil {
public static RemoteBranchEvent1 getRemoteBranchEvent(BranchEvent branchEvent) {
RemoteBranchEvent1 event = new RemoteBranchEvent1();
event.setEventTypeGuid(branchEvent.getEventType().getGuid());
- event.setBranchGuid(branchEvent.getBranchGuid());
- event.setDestinationBranchGuid(branchEvent.getDestinationBranchGuid());
+ event.setBranchGuid(String.valueOf(branchEvent.getBranchUuid()));
+ event.setDestinationBranchGuid(String.valueOf(branchEvent.getDestinationBranchUuid()));
event.setNetworkSender(getRemoteNetworkSender(branchEvent.getNetworkSender()));
return event;
}
@@ -140,7 +140,8 @@ public final class FrameworkEventUtil {
BranchEventType branchEventType = BranchEventType.getByGuid(branchEvent.getEventTypeGuid());
if (branchEventType != null) {
BranchEvent event =
- new BranchEvent(branchEventType, branchEvent.getBranchGuid(), branchEvent.getDestinationBranchGuid());
+ new BranchEvent(branchEventType, Long.valueOf(branchEvent.getBranchGuid()),
+ Long.valueOf(branchEvent.getDestinationBranchGuid()));
event.setNetworkSender(getNetworkSender(branchEvent.getNetworkSender()));
return event;
} else {
@@ -186,7 +187,7 @@ public final class FrameworkEventUtil {
public static RemotePersistEvent1 getRemotePersistEvent(ArtifactEvent transEvent) {
RemotePersistEvent1 event = new RemotePersistEvent1();
event.setNetworkSender(getRemoteNetworkSender(transEvent.getNetworkSender()));
- event.setBranchGuid(transEvent.getBranchGuid());
+ event.setBranchGuid(String.valueOf(transEvent.getBranchUuid()));
event.setTransactionId(transEvent.getTransactionId());
for (EventBasicGuidArtifact guidArt : transEvent.getArtifacts()) {
if (guidArt.getModType() == EventModType.Modified) {
@@ -215,7 +216,7 @@ public final class FrameworkEventUtil {
}
public static ArtifactEvent getPersistEvent(RemotePersistEvent1 remEvent) {
- ArtifactEvent event = new ArtifactEvent(remEvent.getBranchGuid());
+ ArtifactEvent event = new ArtifactEvent(Long.valueOf(remEvent.getBranchGuid()));
event.setNetworkSender(getNetworkSender(remEvent.getNetworkSender()));
event.setTransactionId(remEvent.getTransactionId());
for (RemoteBasicGuidArtifact1 remGuidArt : remEvent.getArtifacts()) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEvent.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEvent.java
index 616033b11f..5b52513c2b 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEvent.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEvent.java
@@ -36,7 +36,7 @@ public class ArtifactEvent implements FrameworkEvent, HasNetworkSender {
UPDATE_ARTIFACTS;
}
- private final String branchGuid;
+ private final Long branchUuid;
private int transactionId;
private NetworkSender networkSender;
private final List<EventBasicGuidArtifact> artifacts = new ArrayList<EventBasicGuidArtifact>();
@@ -49,21 +49,21 @@ public class ArtifactEvent implements FrameworkEvent, HasNetworkSender {
this(branch.getGuid());
}
- public ArtifactEvent(String branchGuid) {
- this(branchGuid, ArtifactEventType.UPDATE_ARTIFACTS);
+ public ArtifactEvent(Long branchUuid) {
+ this(branchUuid, ArtifactEventType.UPDATE_ARTIFACTS);
}
- public ArtifactEvent(String branchGuid, ArtifactEventType reloadEvent) {
+ public ArtifactEvent(Long branchUuid, ArtifactEventType reloadEvent) {
this.reloadEvent = reloadEvent;
- this.branchGuid = branchGuid;
+ this.branchUuid = branchUuid;
}
public boolean isReloadEvent() {
return ArtifactEventType.RELOAD_ARTIFACTS == reloadEvent;
}
- public String getBranchGuid() {
- return branchGuid;
+ public Long getBranchUuid() {
+ return branchUuid;
}
public Set<DefaultBasicUuidRelationReorder> getRelationOrderRecords() {
@@ -71,7 +71,7 @@ public class ArtifactEvent implements FrameworkEvent, HasNetworkSender {
}
public boolean isForBranch(IOseeBranch branch) {
- return getBranchGuid().equals(branch.getGuid());
+ return getBranchUuid().equals(branch.getGuid());
}
public int getTransactionId() {
@@ -263,7 +263,7 @@ public class ArtifactEvent implements FrameworkEvent, HasNetworkSender {
@Override
public String toString() {
try {
- return String.format("ArtifactEvent: BG[%s] TrId[%d] ARTS[%s] RELS[%s] Sender[%s]", branchGuid, transactionId,
+ return String.format("ArtifactEvent: BG[%s] TrId[%d] ARTS[%s] RELS[%s] Sender[%s]", branchUuid, transactionId,
getArtifactsString(artifacts), getRelationsString(relations), networkSender);
} catch (Exception ex) {
return String.format("ArtifactEvent exception: " + ex.getLocalizedMessage());
@@ -287,7 +287,7 @@ public class ArtifactEvent implements FrameworkEvent, HasNetworkSender {
}
private boolean isOnCachedBranch() {
- return BranchManager.branchExists(getBranchGuid());
+ return BranchManager.branchExists(getBranchUuid());
}
}
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 7d575b073d..e284623ce7 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
@@ -12,19 +12,19 @@ package org.eclipse.osee.framework.skynet.core.event.model;
public class BranchEvent implements FrameworkEvent, HasNetworkSender {
- private String branchGuid;
- private String destinationBranchGuid;
+ private long branchUuid;
+ private long destinationBranchUuid;
private BranchEventType eventType;
private NetworkSender networkSender;
- public BranchEvent(BranchEventType branchEventType, String branchGuid) {
- this.branchGuid = branchGuid;
+ public BranchEvent(BranchEventType branchEventType, long branchGuid) {
+ this.branchUuid = branchGuid;
this.eventType = branchEventType;
}
- public BranchEvent(BranchEventType branchEventType, String sourceBranchGuid, String destinationBranchGuid) {
- this.branchGuid = sourceBranchGuid;
- this.destinationBranchGuid = destinationBranchGuid;
+ public BranchEvent(BranchEventType branchEventType, long sourceBranchUuid, long destinationBranchUuid) {
+ this.branchUuid = sourceBranchUuid;
+ this.destinationBranchUuid = destinationBranchUuid;
this.eventType = branchEventType;
}
@@ -33,8 +33,8 @@ public class BranchEvent implements FrameworkEvent, HasNetworkSender {
*
* @return possible object is {@link String }
*/
- public String getBranchGuid() {
- return branchGuid;
+ public long getBranchUuid() {
+ return branchUuid;
}
// TODO: add comment to describe purpose of destinationBranch
@@ -43,8 +43,8 @@ public class BranchEvent implements FrameworkEvent, HasNetworkSender {
*
* @return possible object is {@link String }
*/
- public String getDestinationBranchGuid() {
- return destinationBranchGuid;
+ public long getDestinationBranchUuid() {
+ return destinationBranchUuid;
}
/**
@@ -52,8 +52,8 @@ public class BranchEvent implements FrameworkEvent, HasNetworkSender {
*
* @param value allowed object is {@link String }
*/
- public void setBranchGuid(String value) {
- this.branchGuid = value;
+ public void setBranchUuid(long value) {
+ this.branchUuid = value;
}
/**
@@ -61,8 +61,8 @@ public class BranchEvent implements FrameworkEvent, HasNetworkSender {
*
* @param value allowed object is {@link String }
*/
- public void setDestinationBranchGuid(String value) {
- this.destinationBranchGuid = value;
+ public void setDestinationBranchUuid(long value) {
+ this.destinationBranchUuid = value;
}
/**
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CreateBranchHttpRequestOperation.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CreateBranchHttpRequestOperation.java
index c525d833fe..00513ec794 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CreateBranchHttpRequestOperation.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CreateBranchHttpRequestOperation.java
@@ -42,7 +42,6 @@ public final class CreateBranchHttpRequestOperation extends AbstractOperation {
private final BranchType branchType;
private final TransactionRecord parentTransaction;
private final String branchName;
- private final String branchGuid;
private final Artifact associatedArtifact;
private final String creationComment;
private final int mergeAddressingQueryId;
@@ -51,12 +50,11 @@ public final class CreateBranchHttpRequestOperation extends AbstractOperation {
private boolean txCopyBranchType;
private final long branchUuid;
- public CreateBranchHttpRequestOperation(BranchType branchType, TransactionRecord parentTransaction, String branchName, String branchGuid, long branchUuid, Artifact associatedArtifact, String creationComment, int mergeAddressingQueryId, long destinationBranchId) {
+ public CreateBranchHttpRequestOperation(BranchType branchType, TransactionRecord parentTransaction, String branchName, long branchUuid, Artifact associatedArtifact, String creationComment, int mergeAddressingQueryId, long destinationBranchId) {
super("Create branch " + branchName, Activator.PLUGIN_ID);
this.branchType = branchType;
this.parentTransaction = parentTransaction;
this.branchName = branchName;
- this.branchGuid = branchGuid;
this.branchUuid = branchUuid;
this.associatedArtifact = associatedArtifact;
this.creationComment = creationComment;
@@ -71,7 +69,7 @@ public final class CreateBranchHttpRequestOperation extends AbstractOperation {
parameters.put("function", Function.CREATE_BRANCH.name());
BranchCreationRequest request =
- new BranchCreationRequest(branchType, parentTransaction.getId(), parentTransaction.getBranchId(), branchGuid,
+ new BranchCreationRequest(branchType, parentTransaction.getId(), parentTransaction.getBranchId(),
branchName, branchUuid, getAssociatedArtifactId(associatedArtifact), getAuthorId(), creationComment,
mergeAddressingQueryId, destinationBranchId);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchArchivedStateHttpRequestOperation.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchArchivedStateHttpRequestOperation.java
index ebae7827ed..d537396ae8 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchArchivedStateHttpRequestOperation.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchArchivedStateHttpRequestOperation.java
@@ -33,14 +33,12 @@ import org.eclipse.osee.framework.skynet.core.internal.Activator;
* @author Ryan D. Brooks
*/
public final class UpdateBranchArchivedStateHttpRequestOperation extends AbstractOperation {
- private final long branchId;
- private final String branchGuid;
+ private final long branchUuid;
private final BranchArchivedState branchState;
- public UpdateBranchArchivedStateHttpRequestOperation(long branchId, String branchGuid, BranchArchivedState branchState) {
- super("Update branch archived state " + branchGuid, Activator.PLUGIN_ID);
- this.branchId = branchId;
- this.branchGuid = branchGuid;
+ public UpdateBranchArchivedStateHttpRequestOperation(long branchUuid, BranchArchivedState branchState) {
+ super("Update branch archived state " + branchUuid, Activator.PLUGIN_ID);
+ this.branchUuid = branchUuid;
this.branchState = branchState;
}
@@ -49,14 +47,14 @@ public final class UpdateBranchArchivedStateHttpRequestOperation extends Abstrac
Map<String, String> parameters = new HashMap<String, String>();
parameters.put("function", Function.UPDATE_ARCHIVE_STATE.name());
- ChangeBranchArchiveStateRequest requestData = new ChangeBranchArchiveStateRequest(branchId, branchState);
+ ChangeBranchArchiveStateRequest requestData = new ChangeBranchArchiveStateRequest(branchUuid, branchState);
AcquireResult response =
HttpClientMessage.send(OseeServerContext.BRANCH_CONTEXT, parameters,
CoreTranslatorId.CHANGE_BRANCH_ARCHIVE_STATE, requestData, null);
if (response.wasSuccessful()) {
BranchManager.refreshBranches();
- OseeEventManager.kickBranchEvent(getClass(), new BranchEvent(BranchEventType.ArchiveStateUpdated, branchGuid));
+ OseeEventManager.kickBranchEvent(getClass(), new BranchEvent(BranchEventType.ArchiveStateUpdated, branchUuid));
}
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchStateHttpRequestOperation.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchStateHttpRequestOperation.java
index 0488535b1f..6089719f82 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchStateHttpRequestOperation.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchStateHttpRequestOperation.java
@@ -33,14 +33,12 @@ import org.eclipse.osee.framework.skynet.core.internal.Activator;
* @author Ryan D. Brooks
*/
public class UpdateBranchStateHttpRequestOperation extends AbstractOperation {
- private final long branchId;
- private final String branchGuid;
+ private final long branchUuid;
private final BranchState branchState;
- public UpdateBranchStateHttpRequestOperation(long branchId, String branchGuid, BranchState branchState) {
- super("Update branch state " + branchGuid, Activator.PLUGIN_ID);
- this.branchId = branchId;
- this.branchGuid = branchGuid;
+ public UpdateBranchStateHttpRequestOperation(long branchUuid, BranchState branchState) {
+ super("Update branch state " + branchUuid, Activator.PLUGIN_ID);
+ this.branchUuid = branchUuid;
this.branchState = branchState;
}
@@ -49,14 +47,14 @@ public class UpdateBranchStateHttpRequestOperation extends AbstractOperation {
Map<String, String> parameters = new HashMap<String, String>();
parameters.put("function", Function.UPDATE_BRANCH_STATE.name());
- ChangeBranchStateRequest requestData = new ChangeBranchStateRequest(branchId, branchState);
+ ChangeBranchStateRequest requestData = new ChangeBranchStateRequest(branchUuid, branchState);
AcquireResult response =
HttpClientMessage.send(OseeServerContext.BRANCH_CONTEXT, parameters, CoreTranslatorId.CHANGE_BRANCH_STATE,
requestData, null);
if (response.wasSuccessful()) {
BranchManager.refreshBranches();
- OseeEventManager.kickBranchEvent(getClass(), new BranchEvent(BranchEventType.StateUpdated, branchGuid));
+ OseeEventManager.kickBranchEvent(getClass(), new BranchEvent(BranchEventType.StateUpdated, branchUuid));
}
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchTypeHttpRequestOperation.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchTypeHttpRequestOperation.java
index a7f9baa4ce..e07af5e278 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchTypeHttpRequestOperation.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchTypeHttpRequestOperation.java
@@ -33,14 +33,12 @@ import org.eclipse.osee.framework.skynet.core.internal.Activator;
* @author Ryan D. Brooks
*/
public final class UpdateBranchTypeHttpRequestOperation extends AbstractOperation {
- private final long branchId;
- private final String branchGuid;
+ private final long branchUuid;
private final BranchType type;
- public UpdateBranchTypeHttpRequestOperation(long branchId, String branchGuid, BranchType type) {
- super("Update branch type" + branchGuid, Activator.PLUGIN_ID);
- this.branchId = branchId;
- this.branchGuid = branchGuid;
+ public UpdateBranchTypeHttpRequestOperation(long branchUuid, BranchType type) {
+ super("Update branch type" + branchUuid, Activator.PLUGIN_ID);
+ this.branchUuid = branchUuid;
this.type = type;
}
@@ -49,14 +47,14 @@ public final class UpdateBranchTypeHttpRequestOperation extends AbstractOperatio
Map<String, String> parameters = new HashMap<String, String>();
parameters.put("function", Function.UPDATE_BRANCH_TYPE.name());
- ChangeBranchTypeRequest requestData = new ChangeBranchTypeRequest(branchId, type);
+ ChangeBranchTypeRequest requestData = new ChangeBranchTypeRequest(branchUuid, type);
AcquireResult response =
HttpClientMessage.send(OseeServerContext.BRANCH_CONTEXT, parameters, CoreTranslatorId.CHANGE_BRANCH_TYPE,
requestData, null);
if (response.wasSuccessful()) {
BranchManager.refreshBranches();
- OseeEventManager.kickBranchEvent(getClass(), new BranchEvent(BranchEventType.TypeUpdated, branchGuid));
+ OseeEventManager.kickBranchEvent(getClass(), new BranchEvent(BranchEventType.TypeUpdated, branchUuid));
}
}
}
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 8be8cfd6d6..bcc6e93a3f 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
@@ -38,11 +38,11 @@ import org.eclipse.osee.framework.jdk.core.type.Triplet;
public class ClientArtifactTypeAccessor extends AbstractClientDataAccessor<Long, ArtifactType> {
private final AbstractOseeCache<Long, AttributeType> attrCache;
- private final AbstractOseeCache<String, Branch> branchCache;
+ private final AbstractOseeCache<Long, Branch> branchCache;
private final ArtifactTypeFactory artifactTypeFactory;
- public ClientArtifactTypeAccessor(ArtifactTypeFactory artifactTypeFactory, AbstractOseeCache<Long, AttributeType> attrCache, AbstractOseeCache<String, Branch> branchCache) {
+ public ClientArtifactTypeAccessor(ArtifactTypeFactory artifactTypeFactory, AbstractOseeCache<Long, AttributeType> attrCache, AbstractOseeCache<Long, Branch> branchCache) {
this.artifactTypeFactory = artifactTypeFactory;
this.attrCache = attrCache;
this.branchCache = branchCache;
@@ -89,12 +89,12 @@ public class ClientArtifactTypeAccessor extends AbstractClientDataAccessor<Long,
CompositeKeyHashMap<ArtifactType, IOseeBranch, Collection<AttributeType>> attrs =
new CompositeKeyHashMap<ArtifactType, IOseeBranch, Collection<AttributeType>>();
- for (Triplet<Long, String, Long> entry : response.getAttributeTypes()) {
+ for (Triplet<Long, Long, Long> entry : response.getAttributeTypes()) {
ArtifactType key1 = cache.getByGuid(entry.getFirst());
- String branchGuid = entry.getSecond();
+ Long branchGuid = entry.getSecond();
IOseeBranch branchToken = branchCache.getByGuid(branchGuid);
if (branchToken == null) {
- branchToken = TokenFactory.createBranch(branchGuid, branchGuid);
+ branchToken = TokenFactory.createBranch(branchGuid, String.valueOf(branchGuid));
}
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/accessors/ClientBranchAccessor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientBranchAccessor.java
index 7e9d8e48d5..3bb88af7a3 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientBranchAccessor.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientBranchAccessor.java
@@ -38,7 +38,7 @@ import org.eclipse.osee.framework.skynet.core.internal.Activator;
/**
* @author Roberto E. Escobar
*/
-public class ClientBranchAccessor extends AbstractClientDataAccessor<String, Branch> {
+public class ClientBranchAccessor extends AbstractClientDataAccessor<Long, Branch> {
private final TransactionCache transactionCache;
private BranchCache branchCache;
@@ -58,13 +58,13 @@ public class ClientBranchAccessor extends AbstractClientDataAccessor<String, Bra
}
@Override
- public void load(IOseeCache<String, Branch> cache) throws OseeCoreException {
+ public void load(IOseeCache<Long, Branch> cache) throws OseeCoreException {
transactionCache.ensurePopulated();
super.load(cache);
}
@Override
- protected Collection<Branch> updateCache(IOseeCache<String, Branch> cache) throws OseeCoreException {
+ protected Collection<Branch> updateCache(IOseeCache<Long, Branch> cache) throws OseeCoreException {
BranchCacheUpdateResponse response = requestUpdateMessage(cache, CoreTranslatorId.BRANCH_CACHE_UPDATE_RESPONSE);
return new BranchCacheUpdateUtil(getFactory(), transactionCache).updateCache(response, cache);
}
@@ -74,7 +74,7 @@ public class ClientBranchAccessor extends AbstractClientDataAccessor<String, Bra
store(branchCache, types);
}
- public void store(IOseeCache<String, Branch> cache, Collection<Branch> branches) throws OseeCoreException {
+ public void store(IOseeCache<Long, Branch> cache, Collection<Branch> branches) throws OseeCoreException {
Map<String, String> parameters = new HashMap<String, String>();
parameters.put("function", CacheOperation.STORE.name());
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactEventHandler.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactEventHandler.java
index ef2b99e9e6..6a7b38e660 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactEventHandler.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactEventHandler.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.framework.skynet.core.internal.event.handlers;
import java.util.List;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.event.EventUtil;
import org.eclipse.osee.framework.skynet.core.event.FrameworkEventUtil;
import org.eclipse.osee.framework.skynet.core.event.filter.IEventFilter;
@@ -36,7 +35,7 @@ public class ArtifactEventHandler implements EventHandlerLocal<IArtifactEventLis
if (filters != null) {
for (IEventFilter eventFilter : filters) {
// If this branch doesn't match, don't pass events through
- if (!eventFilter.isMatch(BranchManager.getBranchIdLegacy(event.getBranchGuid()))) {
+ if (!eventFilter.isMatch(event.getBranchUuid())) {
return;
}
// Process artifacts and relations only if there were any in this ArtifactEvent
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchEventHandler.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchEventHandler.java
index befcac0bf1..5fd043e90b 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchEventHandler.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchEventHandler.java
@@ -34,15 +34,15 @@ public class BranchEventHandler implements EventHandlerLocal<IBranchEventListene
List<? extends IEventFilter> filters = ((IEventFilteredListener) listener).getEventFilters();
if (filters != null) {
for (IEventFilter eventFilter : filters) {
- long branchUuid = BranchManager.getBranchIdLegacy(event.getBranchGuid());
- if (!eventFilter.isMatch(branchUuid) && !eventFilter.isMatch(BranchManager.getBranchIdLegacy(event.getDestinationBranchGuid()))) {
+ long branchUuid = event.getBranchUuid();
+ if (!eventFilter.isMatch(branchUuid) && !eventFilter.isMatch(event.getDestinationBranchUuid())) {
return;
}
}
}
if (event.getEventType() == BranchEventType.Added) {
try {
- BranchManager.checkAndReload(event.getBranchGuid());
+ BranchManager.checkAndReload(event.getBranchUuid());
} catch (OseeCoreException ex) {
EventUtil.eventLog("IEM: updateBranches", ex);
}
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 786938e324..78ed4a5bc7 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,7 +42,7 @@ public class BranchRemoteEventHandler implements EventHandlerRemote<RemoteBranch
private void updateBranches(Sender sender, BranchEvent branchEvent) {
BranchEventType eventType = branchEvent.getEventType();
- String branchGuid = branchEvent.getBranchGuid();
+ Long branchGuid = branchEvent.getBranchUuid();
try {
if (BranchManager.branchExists(branchGuid)) {
Branch branch = BranchManager.getBranchByGuid(branchGuid);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RenderingUtilTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RenderingUtilTest.java
index 598f74a775..eed0871112 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RenderingUtilTest.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RenderingUtilTest.java
@@ -19,7 +19,6 @@ import org.eclipse.osee.framework.core.model.BranchFactory;
import org.eclipse.osee.framework.core.model.cache.AbstractOseeCache;
import org.eclipse.osee.framework.core.model.cache.BranchCache;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -30,13 +29,13 @@ import org.junit.Test;
*/
public class RenderingUtilTest {
- private static AbstractOseeCache<String, Branch> cache;
+ private static AbstractOseeCache<Long, Branch> cache;
private static Branch branch;
@BeforeClass
public static void setUpOnce() throws OseeCoreException {
- cache = new BranchCache(new MockOseeDataAccessor<String, Branch>());
- branch = createBranch(cache, GUID.create(), "Test 1", 1);
+ cache = new BranchCache(new MockOseeDataAccessor<Long, Branch>());
+ branch = createBranch(cache, "Test 1", 1);
}
@Test
@@ -98,8 +97,8 @@ public class RenderingUtilTest {
return URLEncoder.encode(guid, "UTF-8");
}
- private static Branch createBranch(AbstractOseeCache<String, Branch> cache, String guid, String name, long uuid) throws OseeCoreException {
- Branch branch = new BranchFactory().create(guid, uuid, name, BranchType.WORKING, BranchState.MODIFIED, false);
+ private static Branch createBranch(AbstractOseeCache<Long, Branch> cache, String name, long uuid) throws OseeCoreException {
+ Branch branch = new BranchFactory().create(uuid, name, BranchType.WORKING, BranchState.MODIFIED, false);
Assert.assertNotNull(branch);
return branch;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java
index c4c4e56284..2695ad92f6 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java
@@ -1417,13 +1417,13 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor
if (branch == null) {
return;
}
- if (branch.getGuid().equals(branchEvent.getBranchGuid())) {
+ if (branch.getGuid().equals(branchEvent.getBranchUuid())) {
if ((branchEvent.getEventType() == BranchEventType.Committing || branchEvent.getEventType() == BranchEventType.Committed)) {
SkynetViews.closeView(VIEW_ID, getViewSite().getSecondaryId());
} else {
refreshBranchWarning();
}
- } else if (branch.getGuid().equals(branchEvent.getDestinationBranchGuid())) {
+ } else if (branch.getGuid().equals(branchEvent.getDestinationBranchUuid())) {
if ((branchEvent.getEventType() == BranchEventType.Committed)) {
Displays.ensureInDisplayThread(new Runnable() {
@Override
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerEventManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerEventManager.java
index 8716d50d4b..f7a45b8fdb 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerEventManager.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerEventManager.java
@@ -67,12 +67,12 @@ public class ArtifactExplorerEventManager implements IArtifactEventListener {
/**
* @return true if branch is not null, matches the branch for the event and is not deleted or purged
*/
- private boolean isArtifactExplorerValidForEvents(ArtifactExplorer artifactExplorer, String branchGuidFromEvent) {
+ private boolean isArtifactExplorerValidForEvents(ArtifactExplorer artifactExplorer, Long branchUuidFromEvent) {
boolean toReturn = false;
if (artifactExplorer != null) {
Branch branch = artifactExplorer.getBranch();
toReturn =
- branch != null && branch.getGuid().equals(branchGuidFromEvent) && !branch.isDeleted() && !branch.isPurged();
+ branch != null && branchUuidFromEvent.equals(branch.getUuid()) && !branch.isDeleted() && !branch.isPurged();
}
return toReturn;
}
@@ -89,7 +89,7 @@ public class ArtifactExplorerEventManager implements IArtifactEventListener {
for (IArtifactExplorerEventHandler handler : new CopyOnWriteArrayList<IArtifactExplorerEventHandler>(handlers)) {
if (handler.isDisposed()) {
handlers.remove(handler);
- } else if (isArtifactExplorerValidForEvents(handler.getArtifactExplorer(), artifactEvent.getBranchGuid())) {
+ } else if (isArtifactExplorerValidForEvents(handler.getArtifactExplorer(), artifactEvent.getBranchUuid())) {
handlersToProcess.add(handler);
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorEventManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorEventManager.java
index 51e0ba001e..8000fe7ed8 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorEventManager.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorEventManager.java
@@ -138,7 +138,7 @@ public class ArtifactEditorEventManager implements IArtifactEventListener, IBran
for (IArtifactEditorEventHandler handler : handlers) {
if (!handler.isDisposed()) {
if (branchEvent.getEventType() == BranchEventType.Committing || branchEvent.getEventType() == BranchEventType.Committed) {
- if (handler.getArtifactFromEditorInput().getBranch().getGuid() == branchEvent.getBranchGuid()) {
+ if (handler.getArtifactFromEditorInput().getBranch().getGuid() == branchEvent.getBranchUuid()) {
handler.closeEditor();
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java
index 0cc656d211..ed6bd6e7a8 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java
@@ -149,7 +149,7 @@ public class ChangeReportEditor extends FormEditor implements IChangeReportView
OseeLog.log(Activator.class, Level.SEVERE, "Error obtaining change report branches for branch event", ex);
}
for (Branch branch : branches) {
- if (branch != null && branch.getGuid().equals(branchEvent.getBranchGuid())) {
+ if (branch != null && branch.getGuid().equals(branchEvent.getBranchUuid())) {
switch (branchEvent.getEventType()) {
case Deleting:
case Deleted:
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java
index c25941de21..3a7c7a297b 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java
@@ -72,7 +72,7 @@ public class BranchCreationHandler extends CommandHandler {
if (dialog.isChecked()) {
BranchManager.createWorkingBranchFromTx(parentTransactionId, dialog.getEntry(), null);
} else {
- BranchManager.createWorkingBranch(parentTransactionId, dialog.getEntry(), null, null);
+ BranchManager.createWorkingBranch(parentTransactionId, dialog.getEntry(), null);
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java
index 073816f81c..e27ab5365b 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java
@@ -67,7 +67,7 @@ public class QuickSearchView extends GenericViewPart {
private static final String ENTRY_SEPARATOR = "##";
private static final String LAST_QUERY_KEY_ID = "lastQuery";
- private static final String LAST_BRANCH_GUID = "lastBranch";
+ private static final String LAST_BRANCH_GUID = "lastBranchUuid";
private static final String QUERY_HISTORY_KEY_ID = "queryHistory";
private Label branchLabel;
@@ -96,7 +96,7 @@ public class QuickSearchView extends GenericViewPart {
memento.putString(LAST_QUERY_KEY_ID, attrSearchComposite.getQuery());
IOseeBranch branch = branchSelect.getData();
if (branch != null) {
- memento.putString(LAST_BRANCH_GUID, branch.getGuid());
+ memento.putString(LAST_BRANCH_GUID, String.valueOf(branch.getGuid()));
}
StringBuilder builder = new StringBuilder();
String[] queries = attrSearchComposite.getQueryHistory();
@@ -140,10 +140,10 @@ public class QuickSearchView extends GenericViewPart {
optionsComposite.loadState(memento);
}
if (branchSelect != null) {
- String guid = memento.getString(LAST_BRANCH_GUID);
- if (Strings.isValid(guid)) {
+ Long value = Long.valueOf(memento.getString(LAST_BRANCH_GUID));
+ if (value != null) {
try {
- Branch branch = BranchManager.getBranchByGuid(guid);
+ Branch branch = BranchManager.getBranchByUuid(Long.valueOf(value));
branchSelect.setSelection(branch);
} catch (OseeCoreException ex) {
// do nothing
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/PromptChangeUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/PromptChangeUtil.java
index 839b63426f..a893663819 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/PromptChangeUtil.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/PromptChangeUtil.java
@@ -35,7 +35,7 @@ public class PromptChangeUtil {
BranchType type = ld.getSelection();
for (TreeItem item : branches) {
Branch branch = (Branch) item.getData();
- BranchManager.updateBranchType(null, branch.getId(), branch.getGuid(), type);
+ BranchManager.updateBranchType(null, branch.getId(), type);
}
return true;
}
@@ -49,7 +49,7 @@ public class PromptChangeUtil {
BranchState state = ld.getSelection();
for (TreeItem item : branches) {
Branch branch = (Branch) item.getData();
- BranchManager.updateBranchState(null, branch.getId(), branch.getGuid(), state);
+ BranchManager.updateBranchState(null, branch.getId(), state);
}
return true;
}
@@ -63,7 +63,7 @@ public class PromptChangeUtil {
BranchArchivedState state = ld.getSelection();
for (TreeItem item : branches) {
Branch branch = (Branch) item.getData();
- BranchManager.updateBranchArchivedState(null, branch.getId(), branch.getGuid(), state);
+ BranchManager.updateBranchArchivedState(null, branch.getId(), state);
}
return true;
}
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 18905e73a1..dfb364830a 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
@@ -34,6 +34,7 @@ import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.help.ui.OseeHelpContext;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
+import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
@@ -316,7 +317,7 @@ public class HistoryView extends GenericViewPart implements IBranchEventListener
memento = memento.createChild(INPUT);
if (artifact != null) {
memento.putString(ART_GUID, artifact.getGuid());
- memento.putString(BRANCH_ID, artifact.getBranch().getGuid());
+ memento.putString(BRANCH_ID, String.valueOf(artifact.getBranch().getGuid()));
SkynetViews.addDatabaseSourceId(memento);
}
}
@@ -330,9 +331,12 @@ public class HistoryView extends GenericViewPart implements IBranchEventListener
if (memento != null) {
if (SkynetViews.isSourceValid(memento)) {
String guid = memento.getString(ART_GUID);
- String branchId = memento.getString(BRANCH_ID);
- Artifact artifact = ArtifactQuery.getArtifactFromId(guid, BranchManager.getBranchByGuid(branchId));
- openViewUpon(artifact, false);
+ String branchIdStr = memento.getString(BRANCH_ID);
+ if (Strings.isValid(branchIdStr)) {
+ Long branchId = Long.valueOf(branchIdStr);
+ Artifact artifact = ArtifactQuery.getArtifactFromId(guid, BranchManager.getBranchByUuid(branchId));
+ openViewUpon(artifact, false);
+ }
} else {
closeView();
}
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 18310d97ec..54e5f7b4a2 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
@@ -269,11 +269,11 @@ public class MergeView extends GenericViewPart implements IBranchEventListener,
showConflicts = show;
}
- private boolean isApplicableEvent(String branchGuid, Branch mergeBranch) {
- return Conditions.in(branchGuid, mergeBranch.getGuid()) || isApplicableSourceOrDestEvent(branchGuid);
+ private boolean isApplicableEvent(Long branchUuid, Branch mergeBranch) {
+ return Conditions.in(branchUuid, mergeBranch.getGuid()) || isApplicableSourceOrDestEvent(branchUuid);
}
- private boolean isApplicableSourceOrDestEvent(String branchGuid) {
+ private boolean isApplicableSourceOrDestEvent(Long branchGuid) {
return Conditions.notNull(sourceBranch, destBranch) && Conditions.in(branchGuid, sourceBranch.getGuid(),
destBranch.getGuid());
}
@@ -295,16 +295,16 @@ public class MergeView extends GenericViewPart implements IBranchEventListener,
case Deleted:
break;
case Purged:
- if (mergeBranch.getGuid().equals(branchEvent.getBranchGuid())) {
+ if (mergeBranch.getGuid().equals(branchEvent.getBranchUuid())) {
close();
}
case Committed:
- if (isApplicableSourceOrDestEvent(branchEvent.getBranchGuid())) {
+ if (isApplicableSourceOrDestEvent(branchEvent.getBranchUuid())) {
getSite().getPage().hideView(MergeView.this);
}
break;
default:
- if (isApplicableSourceOrDestEvent(branchEvent.getBranchGuid()) && mergeXWidget != null && Widgets.isAccessible(mergeXWidget.getXViewer().getTree())) {
+ if (isApplicableSourceOrDestEvent(branchEvent.getBranchUuid()) && mergeXWidget != null && Widgets.isAccessible(mergeXWidget.getXViewer().getTree())) {
mergeXWidget.refresh();
}
break;
@@ -345,10 +345,10 @@ public class MergeView extends GenericViewPart implements IBranchEventListener,
Branch mergeBranch = null;
try {
mergeBranch = BranchManager.getMergeBranch(sourceBranch, destBranch);
- if (mergeBranch == null || !mergeBranch.getGuid().equals(artifactEvent.getBranchGuid())) {
+ if (mergeBranch == null || !mergeBranch.getGuid().equals(artifactEvent.getBranchUuid())) {
return;
}
- if (!isApplicableEvent(artifactEvent.getBranchGuid(), mergeBranch)) {
+ if (!isApplicableEvent(artifactEvent.getBranchUuid(), mergeBranch)) {
return;
}
} catch (OseeCoreException ex1) {
diff --git a/plugins/org.eclipse.osee.orcs.core.test/.project b/plugins/org.eclipse.osee.orcs.core.test/.project
index 9fd31b1bc4..341ac87cb4 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/.project
+++ b/plugins/org.eclipse.osee.orcs.core.test/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
@@ -24,5 +29,6 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
</natures>
</projectDescription>
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactoryTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactoryTest.java
index 1af5b0ce89..b0322e9edd 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactoryTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactoryTest.java
@@ -22,7 +22,7 @@ import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.core.model.cache.BranchCache;
import org.eclipse.osee.framework.core.model.cache.TransactionCache;
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.Lib;
import org.eclipse.osee.orcs.data.ArtifactReadable;
import org.eclipse.osee.orcs.data.CreateBranchData;
import org.junit.Before;
@@ -64,9 +64,9 @@ public class BranchDataFactoryTest {
@Test
public void testDataForTopLevelBranch() throws OseeCoreException {
String branchName = "testDataForTopLevelBranch";
- String guid = GUID.create();
+ Long branchUuid = Lib.generateUuid();
when(branch.getName()).thenReturn(branchName);
- when(branch.getGuid()).thenReturn(guid);
+ when(branch.getGuid()).thenReturn(branchUuid);
when(branchCache.getSystemRootBranch()).thenReturn(parent);
when(txCache.getHeadTransaction(parent)).thenReturn(txRecord);
@@ -77,15 +77,15 @@ public class BranchDataFactoryTest {
verify(txCache).getHeadTransaction(parent);
String comment = "Branch Creation for " + branchName;
- assertData(result, branchName, guid, BranchType.BASELINE, comment, txRecord, author, null, false);
+ assertData(result, branchName, branchUuid, BranchType.BASELINE, comment, txRecord, author, null, false);
}
@Test
public void testDataForBaselineBranch() throws OseeCoreException {
String branchName = "testDataForBaselineBranch";
- String guid = GUID.create();
+ Long branchUuid = Lib.generateUuid();
when(branch.getName()).thenReturn(branchName);
- when(branch.getGuid()).thenReturn(guid);
+ when(branch.getGuid()).thenReturn(branchUuid);
when(branchCache.get(parentToken)).thenReturn(parent);
when(txCache.getHeadTransaction(parent)).thenReturn(txRecord);
@@ -96,16 +96,17 @@ public class BranchDataFactoryTest {
verify(txCache).getHeadTransaction(parent);
String comment = "Branch Creation for " + branchName;
- assertData(result, branchName, guid, BranchType.BASELINE, comment, txRecord, author, associatedArtifact, false);
+ assertData(result, branchName, branchUuid, BranchType.BASELINE, comment, txRecord, author, associatedArtifact,
+ false);
}
@Test
public void testDataForWorkingBranch() throws OseeCoreException {
String branchName = "testDataForWorkingBranch";
String parentName = "testParentBranchName";
- String guid = GUID.create();
+ Long branchUuid = Lib.generateUuid();
when(branch.getName()).thenReturn(branchName);
- when(branch.getGuid()).thenReturn(guid);
+ when(branch.getGuid()).thenReturn(branchUuid);
when(parent.getName()).thenReturn(parentName);
@@ -118,16 +119,17 @@ public class BranchDataFactoryTest {
verify(txCache).getHeadTransaction(parent);
String comment = String.format("New Branch from %s (%s)", parentName, txRecord.getId());
- assertData(result, branchName, guid, BranchType.WORKING, comment, txRecord, author, associatedArtifact, false);
+ assertData(result, branchName, branchUuid, BranchType.WORKING, comment, txRecord, author, associatedArtifact,
+ false);
}
@Test
public void testDataForCopyTxBranch() throws OseeCoreException {
String branchName = "testDataForCopyTxBranch";
String parentName = "testParentBranchName";
- String guid = GUID.create();
+ Long branchUuid = Lib.generateUuid();
when(branch.getName()).thenReturn(branchName);
- when(branch.getGuid()).thenReturn(guid);
+ when(branch.getGuid()).thenReturn(branchUuid);
when(parent.getName()).thenReturn(parentName);
@@ -142,16 +144,16 @@ public class BranchDataFactoryTest {
verify(txRecord).getBranch();
String comment = String.format("Transaction %d copied from %s to create Branch %s", 99, parentName, branchName);
- assertData(result, branchName, guid, BranchType.WORKING, comment, txRecord, author, null, true);
+ assertData(result, branchName, branchUuid, BranchType.WORKING, comment, txRecord, author, null, true);
}
@Test
public void testDataForPortBranch() throws OseeCoreException {
String branchName = "testDataForPortBranch";
String parentName = "testParentBranchName";
- String guid = GUID.create();
+ Long branchUuid = Lib.generateUuid();
when(branch.getName()).thenReturn(branchName);
- when(branch.getGuid()).thenReturn(guid);
+ when(branch.getGuid()).thenReturn(branchUuid);
when(parent.getName()).thenReturn(parentName);
@@ -166,12 +168,12 @@ public class BranchDataFactoryTest {
verify(txRecord).getBranch();
String comment = String.format("Transaction %d ported from %s to create Branch %s", 99, parentName, branchName);
- assertData(result, branchName, guid, BranchType.PORT, comment, txRecord, author, null, true);
+ assertData(result, branchName, branchUuid, BranchType.PORT, comment, txRecord, author, null, true);
}
- private static void assertData(CreateBranchData actual, String branchName, String branchGuid, BranchType type, String comment, TransactionRecord fromTx, ArtifactReadable author, ArtifactReadable associatedArtifact, boolean isCopyFromTx) {
+ private static void assertData(CreateBranchData actual, String branchName, Long branchUuid, BranchType type, String comment, TransactionRecord fromTx, ArtifactReadable author, ArtifactReadable associatedArtifact, boolean isCopyFromTx) {
assertEquals(branchName, actual.getName());
- assertEquals(branchGuid, actual.getGuid());
+ assertEquals(branchUuid, actual.getGuid());
assertEquals(type, actual.getBranchType());
assertEquals(comment, actual.getCreationComment());
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchUtilBranchTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchUtilBranchTest.java
index 278a53a860..73f12dd9cd 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchUtilBranchTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchUtilBranchTest.java
@@ -15,7 +15,7 @@ import java.util.List;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
+import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.junit.Assert;
import org.junit.Test;
@@ -24,17 +24,17 @@ import org.junit.Test;
*/
public class BranchUtilBranchTest {
- private final Branch one = new Branch(GUID.create(), "one", BranchType.WORKING, BranchState.COMMITTED, true);
- private final Branch two = new Branch(GUID.create(), "two", BranchType.WORKING, BranchState.COMMITTED, true);
- private final Branch three = new Branch(GUID.create(), "three", BranchType.WORKING, BranchState.COMMITTED, true);
- private final Branch four = new Branch(GUID.create(), "four", BranchType.WORKING, BranchState.COMMITTED, true);
- private final Branch five = new Branch(GUID.create(), "five", BranchType.WORKING, BranchState.COMMITTED, true);
- private final Branch six = new Branch(GUID.create(), "six", BranchType.WORKING, BranchState.COMMITTED, true);
- private final Branch seven = new Branch(GUID.create(), "seven", BranchType.WORKING, BranchState.COMMITTED, true);
- private final Branch eight = new Branch(GUID.create(), "eight", BranchType.WORKING, BranchState.COMMITTED, true);
- private final Branch nine = new Branch(GUID.create(), "nine", BranchType.WORKING, BranchState.COMMITTED, true);
- private final Branch ten = new Branch(GUID.create(), "ten", BranchType.WORKING, BranchState.COMMITTED, true);
- private final Branch outside = new Branch(GUID.create(), "outside", BranchType.WORKING, BranchState.COMMITTED, true);
+ private final Branch one = new Branch(Lib.generateUuid(), "one", BranchType.WORKING, BranchState.COMMITTED, true);
+ private final Branch two = new Branch(Lib.generateUuid(), "two", BranchType.WORKING, BranchState.COMMITTED, true);
+ private final Branch three = new Branch(Lib.generateUuid(), "three", BranchType.WORKING, BranchState.COMMITTED, true);
+ private final Branch four = new Branch(Lib.generateUuid(), "four", BranchType.WORKING, BranchState.COMMITTED, true);
+ private final Branch five = new Branch(Lib.generateUuid(), "five", BranchType.WORKING, BranchState.COMMITTED, true);
+ private final Branch six = new Branch(Lib.generateUuid(), "six", BranchType.WORKING, BranchState.COMMITTED, true);
+ private final Branch seven = new Branch(Lib.generateUuid(), "seven", BranchType.WORKING, BranchState.COMMITTED, true);
+ private final Branch eight = new Branch(Lib.generateUuid(), "eight", BranchType.WORKING, BranchState.COMMITTED, true);
+ private final Branch nine = new Branch(Lib.generateUuid(), "nine", BranchType.WORKING, BranchState.COMMITTED, true);
+ private final Branch ten = new Branch(Lib.generateUuid(), "ten", BranchType.WORKING, BranchState.COMMITTED, true);
+ private final Branch outside = new Branch(Lib.generateUuid(), "outside", BranchType.WORKING, BranchState.COMMITTED, true);
private void initBranchParentageList() {
two.setParentBranch(one);
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/provider/DeletedBranchProviderTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/provider/DeletedBranchProviderTest.java
index bb320cef4c..0217ce1a2d 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/provider/DeletedBranchProviderTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/provider/DeletedBranchProviderTest.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.orcs.core.internal.branch.provider;
import java.util.Collection;
-import org.junit.Assert;
import org.eclipse.osee.framework.core.enums.BranchArchivedState;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
@@ -19,6 +18,7 @@ import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.model.cache.BranchCache;
import org.eclipse.osee.framework.core.model.mocks.MockOseeDataAccessor;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.junit.Assert;
import org.junit.Test;
/**
@@ -38,7 +38,7 @@ public final class DeletedBranchProviderTest {
@Test
public void testGetBranches() throws OseeCoreException {
- BranchCache mockCache = new BranchCache(new MockOseeDataAccessor<String, Branch>());
+ BranchCache mockCache = new BranchCache(new MockOseeDataAccessor<Long, Branch>());
Collection<Branch> branches = MockBranchProvider.createTestBranches();
mockCache.cache(branches.toArray(new Branch[branches.size()]));
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/provider/MockBranchProvider.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/provider/MockBranchProvider.java
index adb127b06b..99b99ee1cb 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/provider/MockBranchProvider.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/provider/MockBranchProvider.java
@@ -16,7 +16,7 @@ import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.model.Branch;
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.Lib;
/**
* @author John R. Misinco
@@ -28,37 +28,38 @@ public final class MockBranchProvider implements BranchProvider {
public static Collection<Branch> createTestBranches() throws OseeCoreException {
Collection<Branch> branches = new ArrayList<Branch>();
//create a root branch
- Branch root = new Branch(GUID.create(), ROOT_BRANCH_NAME, BranchType.SYSTEM_ROOT, BranchState.COMMITTED, false);
+ Branch root =
+ new Branch(Lib.generateUuid(), ROOT_BRANCH_NAME, BranchType.SYSTEM_ROOT, BranchState.COMMITTED, false);
//add a child to root (parent)
- Branch parent = new Branch(GUID.create(), "parent", BranchType.SYSTEM_ROOT, BranchState.CREATED, false);
+ Branch parent = new Branch(Lib.generateUuid(), "parent", BranchType.SYSTEM_ROOT, BranchState.CREATED, false);
parent.setParentBranch(root);
//add children branches to parent
- Branch child1 = new Branch(GUID.create(), "child1", BranchType.SYSTEM_ROOT, BranchState.MODIFIED, false);
+ Branch child1 = new Branch(Lib.generateUuid(), "child1", BranchType.SYSTEM_ROOT, BranchState.MODIFIED, false);
child1.setParentBranch(parent);
child1.setArchived(true);
child1.setBranchState(BranchState.DELETED);
//this branch should get deleted
- Branch child2 = new Branch(GUID.create(), "child2", BranchType.WORKING, BranchState.DELETED, true);
+ Branch child2 = new Branch(Lib.generateUuid(), "child2", BranchType.WORKING, BranchState.DELETED, true);
child2.setParentBranch(parent);
- Branch child3 = new Branch(GUID.create(), "child3", BranchType.SYSTEM_ROOT, BranchState.CREATED, false);
+ Branch child3 = new Branch(Lib.generateUuid(), "child3", BranchType.SYSTEM_ROOT, BranchState.CREATED, false);
//make one a merge branch
child3.setBranchType(BranchType.MERGE);
child3.setParentBranch(parent);
- Branch grandChild1 = new Branch(GUID.create(), "grandChild1", BranchType.MERGE, BranchState.DELETED, false);
+ Branch grandChild1 = new Branch(Lib.generateUuid(), "grandChild1", BranchType.MERGE, BranchState.DELETED, false);
grandChild1.setArchived(true);
grandChild1.setParentBranch(child1);
Branch grandChild2 =
- new Branch(GUID.create(), "grandChild2", BranchType.SYSTEM_ROOT, BranchState.MODIFIED, false);
+ new Branch(Lib.generateUuid(), "grandChild2", BranchType.SYSTEM_ROOT, BranchState.MODIFIED, false);
grandChild2.setParentBranch(child1);
//this branch should get deleted
- Branch grandChild3 = new Branch(GUID.create(), "grandChild3", BranchType.WORKING, BranchState.DELETED, true);
+ Branch grandChild3 = new Branch(Lib.generateUuid(), "grandChild3", BranchType.WORKING, BranchState.DELETED, true);
grandChild3.setParentBranch(child2);
//add branches in a random order
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java
index a6f57803b7..a263c07654 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java
@@ -36,7 +36,6 @@ import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
import org.eclipse.osee.framework.jdk.core.type.Identity;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.resource.management.IResource;
import org.eclipse.osee.logger.Log;
import org.eclipse.osee.orcs.OrcsSession;
@@ -91,11 +90,13 @@ public class OrcsTypesTest {
private static final IRelationType REQUIREMENT_REL = TokenFactory.createRelationType(0x2000000000000157L, "Requirement Relation");
private static final IRelationType ANOTHER_REL = TokenFactory.createRelationType(0x2000000000000158L, "Another Relation");
- private static final IOseeBranch BRANCH_A = TokenFactory.createBranch("AU2FErW1QwSXWPiP4cwA", "Branch A");
- private static final IOseeBranch BRANCH_B = TokenFactory.createBranch("AU2JKsKQAQAvzkTkk+gA", "Branch B");
- private static final IOseeBranch BRANCH_C = TokenFactory.createBranch( "Branch C");
- private static final IOseeBranch BRANCH_D = TokenFactory.createBranch( "Branch D");
- private static final IOseeBranch BRANCH_E = TokenFactory.createBranch( "Branch E");
+ static long BRANCH_A_UUID = 3458234234L;
+ static long BRANCH_B_UUID = 9993245332L;
+ private static final IOseeBranch BRANCH_A = TokenFactory.createBranch(BRANCH_A_UUID, "Branch A");
+ private static final IOseeBranch BRANCH_B = TokenFactory.createBranch(BRANCH_B_UUID, "Branch B");
+ private static final IOseeBranch BRANCH_C = TokenFactory.createBranch("Branch C");
+ private static final IOseeBranch BRANCH_D = TokenFactory.createBranch("Branch D");
+ private static final IOseeBranch BRANCH_E = TokenFactory.createBranch("Branch E");
@Mock private Log logger;
@Mock private OrcsTypesDataStore dataStore;
@@ -412,7 +413,7 @@ public class OrcsTypesTest {
String overrideArtTypes =
"\n overrides artifactType \"Artifact\" {\n" +
" inheritAll \n" +
- " update attribute \"Annotation\" branchGuid \"AU2FErW1QwSXWPiP4cwA\"\n" +
+ " update attribute \"Annotation\" branchUuid "+BRANCH_A_UUID+"\n" +
"}\n" +
"\n overrides artifactType \"Other Artifact\" {\n" +
" inheritAll \n" +
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/testTypeModel.osee b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/testTypeModel.osee
index 4ef968c528..18165813da 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/testTypeModel.osee
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/testTypeModel.osee
@@ -129,11 +129,11 @@ artifactType "Other Artifact" extends "Artifact" {
artifactType "SubSystem Requirement" extends "Requirement" , "Other Artifact" {
guid "BOnBhJ1XAFGKcrku3LgA"
uuid 0x000000000000001D
- attribute "Field 1" branchGuid "AU2FErW1QwSXWPiP4cwA"
+ attribute "Field 1" branchUuid 3458234234
}
abstract artifactType "Last Artifact" extends "SubSystem Requirement" {
guid "AUqqRktDXW9r6YXq0WQA"
uuid 0x0000000000000021
- attribute "Field 2" branchGuid "AU2JKsKQAQAvzkTkk+gA"
+ attribute "Field 2" branchUuid 9993245332
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/BranchData.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/BranchData.java
index d3b4f556a5..1597996f82 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/BranchData.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/BranchData.java
@@ -20,11 +20,9 @@ import org.eclipse.osee.orcs.data.HasLocalId;
*/
public interface BranchData extends HasLocalId<Long> {
- void setLocalId(Long id);
+ void setUuid(Long id);
- String getGuid();
-
- void setGuid(String guid);
+ long getUuid();
String getName();
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaBranchUuids.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaBranchUuids.java
index 3d60c5de38..a3a1cf5645 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaBranchUuids.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaBranchUuids.java
@@ -21,14 +21,14 @@ import org.eclipse.osee.orcs.core.ds.Options;
*/
public class CriteriaBranchUuids extends Criteria {
- private final Collection<String> ids;
+ private final Collection<Long> ids;
- public CriteriaBranchUuids(Collection<String> ids) {
+ public CriteriaBranchUuids(Collection<Long> ids) {
super();
this.ids = ids;
}
- public Collection<String> getIds() {
+ public Collection<Long> getIds() {
return ids;
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaTxBranchUuids.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaTxBranchUuids.java
deleted file mode 100644
index 5bf160a122..0000000000
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaTxBranchUuids.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.orcs.core.ds.criteria;
-
-import java.util.Collection;
-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.Conditions;
-import org.eclipse.osee.orcs.core.ds.Criteria;
-import org.eclipse.osee.orcs.core.ds.Options;
-
-/**
- * @author Roberto E. Escobar
- */
-public class CriteriaTxBranchUuids extends Criteria {
-
- private final Collection<? extends IOseeBranch> ids;
-
- public CriteriaTxBranchUuids(Collection<? extends IOseeBranch> ids) {
- super();
- this.ids = ids;
- }
-
- public Collection<? extends IOseeBranch> getIds() {
- return ids;
- }
-
- @Override
- public void checkValid(Options options) throws OseeCoreException {
- Conditions.checkExpressionFailOnTrue(getIds().isEmpty(), "Branch Ids cannot be empty");
- }
-
- @Override
- public String toString() {
- return "CriteriaTxBranchUuids [ids=" + ids + "]";
- }
-
-}
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 ee1143496a..ffa2ecf4e6 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
@@ -10,51 +10,27 @@
*******************************************************************************/
package org.eclipse.osee.orcs.core.ds.criteria;
-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.Conditions;
import org.eclipse.osee.orcs.core.ds.Criteria;
-import org.eclipse.osee.orcs.core.ds.Options;
/**
* @author Roberto E. Escobar
*/
public class CriteriaTxGetHead extends Criteria {
- private final IOseeBranch branch;
- private final int branchId;
+ private final long branchId;
- public CriteriaTxGetHead(IOseeBranch branch) {
- super();
- this.branch = branch;
- this.branchId = -1;
- }
-
- public CriteriaTxGetHead(int branchId) {
+ public CriteriaTxGetHead(long branchId) {
super();
this.branchId = branchId;
- this.branch = null;
- }
-
- @Override
- public void checkValid(Options options) throws OseeCoreException {
- Conditions.checkExpressionFailOnTrue(branch == null && branchId < 0, "Missing valid branch");
}
- public boolean hasBranchToken() {
- return branch != null;
- }
-
- public IOseeBranch getBranch() {
- return branch;
- }
-
- public int getBranchid() {
+ public long getBranchid() {
return branchId;
}
@Override
public String toString() {
- return "CriteriaGetHead";
+ return "CriteriaTxGetHead [branchId=" + branchId + "]";
}
+
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactory.java
index f1d80eb87d..aa7585b0e9 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactory.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactory.java
@@ -82,7 +82,7 @@ public class BranchDataFactory {
private CreateBranchData createBranchData(IOseeBranch branch, BranchType branchType, String creationComment, ITransaction fromTx, ArtifactReadable author, ArtifactReadable associatedArtifact, boolean bCopyTx) {
CreateBranchData createData = new CreateBranchData();
- createData.setGuid(branch.getGuid());
+ createData.setUuid(branch.getGuid());
createData.setName(branch.getName());
if (branch.getUuid() > 0) {
createData.setUuid(branch.getUuid());
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchPurgeCommand.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchPurgeCommand.java
index 8269daf15d..ab45bd4d16 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchPurgeCommand.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchPurgeCommand.java
@@ -29,7 +29,6 @@ import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.orcs.OrcsApi;
import org.eclipse.osee.orcs.OrcsBranch;
import org.eclipse.osee.orcs.core.internal.branch.BranchUtil;
@@ -68,7 +67,7 @@ public final class BranchPurgeCommand implements ConsoleCommand {
public String getUsage() {
// includeChildren excludes baseline branches
StringBuilder sb = new StringBuilder();
- sb.append("Usage: branch_purge [-R] [-D] [-A] [-B] [-P] branchGuids=<BRANCH_GUID,..>\n");
+ sb.append("Usage: branch_purge [-R] [-D] [-A] [-B] [-P] branchUuids=<BRANCH_UUID,..>\n");
sb.append("Synopsis:\n");
sb.append("\tCAUTION: This command will permanently remove branches from the datastore!\n");
sb.append("\tThis command has no effect unless the [P] option is specified, otherwise it\n");
@@ -87,9 +86,10 @@ public final class BranchPurgeCommand implements ConsoleCommand {
@Override
public Callable<?> createCallable(Console console, ConsoleParameters params) {
- List<String> branchGuids = Arrays.asList(params.getArray("branchGuids"));
+ List<Long> branchUuids = new ArrayList<Long>();
+ Arrays.asList(params.getArray("branchUuids"));
- if (branchGuids.isEmpty()) {
+ if (branchUuids.isEmpty()) {
console.writeln("No branch guids where specified");
}
@@ -101,7 +101,7 @@ public final class BranchPurgeCommand implements ConsoleCommand {
boolean runPurge = options.contains("P");
OrcsBranch orcsBranch = getOrcsApi().getBranchOps(null);
- return new PurgeBranchCallable(console, orcsBranch, getOrcsApi().getQueryFactory(null), branchGuids, recurse,
+ return new PurgeBranchCallable(console, orcsBranch, getOrcsApi().getQueryFactory(null), branchUuids, recurse,
unArchived, unDeleted, baseline, runPurge);
}
@@ -109,7 +109,7 @@ public final class BranchPurgeCommand implements ConsoleCommand {
private final Console console;
private final OrcsBranch orcsBranch;
- private final List<String> branchGuids;
+ private final List<Long> branchUuids;
private final boolean recurse;
private final boolean includeUnarchived;
private final boolean includeUndeleted;
@@ -117,11 +117,11 @@ public final class BranchPurgeCommand implements ConsoleCommand {
private final boolean runPurge;
private final QueryFactory queryFactory;
- public PurgeBranchCallable(Console console, OrcsBranch orcsBranch, QueryFactory queryFactory, List<String> branchGuids, boolean recurse, boolean unArchived, boolean unDeleted, boolean baseline, boolean runPurge) {
+ public PurgeBranchCallable(Console console, OrcsBranch orcsBranch, QueryFactory queryFactory, List<Long> branchUuids, boolean recurse, boolean unArchived, boolean unDeleted, boolean baseline, boolean runPurge) {
this.console = console;
this.orcsBranch = orcsBranch;
this.queryFactory = queryFactory;
- this.branchGuids = branchGuids;
+ this.branchUuids = branchUuids;
this.recurse = recurse;
this.includeUnarchived = unArchived;
this.includeUndeleted = unDeleted;
@@ -145,11 +145,11 @@ public final class BranchPurgeCommand implements ConsoleCommand {
private Collection<BranchReadable> getBranchesToPurge() throws OseeCoreException {
Set<BranchReadable> specifiedBranches = new HashSet<BranchReadable>();
- for (String guid : branchGuids) {
- if (!GUID.isValid(guid)) {
- console.write("GUID listed %s is not a valid GUID", guid);
+ for (Long uuid : branchUuids) {
+ if (uuid > 0) {
+ console.write("UUID listed %s is not a valid UUID", uuid);
} else {
- BranchReadable cached = queryFactory.branchQuery().andUuids(guid).getResults().getExactlyOne();
+ BranchReadable cached = queryFactory.branchQuery().andUuids(uuid).getResults().getExactlyOne();
if (cached != null) {
specifiedBranches.add(cached);
}
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 258f44ceaf..7f87222bf6 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
@@ -109,10 +109,10 @@ public class IndexerCommand implements ConsoleCommand {
boolean indexOnlyMissingitems = false;
Set<BranchReadable> branches = new HashSet<BranchReadable>();
- String[] guids = params.getArray("branchGuids");
- if (guids != null & guids.length > 0) {
- for (String guid : guids) {
- branches.add(getOrcsApi().getQueryFactory(null).branchQuery().andUuids(guid).getResults().getExactlyOne());
+ String[] uuids = params.getArray("branchUuids");
+ if (uuids != null & uuids.length > 0) {
+ for (String uuid : uuids) {
+ branches.add(getOrcsApi().getQueryFactory(null).branchQuery().andUuids(Long.valueOf(uuid)).getResults().getExactlyOne());
}
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCallableQueryFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCallableQueryFactory.java
index 46b3b97918..9ec6507b73 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCallableQueryFactory.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCallableQueryFactory.java
@@ -90,7 +90,7 @@ public class BranchCallableQueryFactory {
@Override
public IOseeBranch createBranch(BranchData data) {
- return TokenFactory.createBranch(data.getGuid(), data.getName());
+ return TokenFactory.createBranch(data.getUuid(), data.getName());
}
};
@@ -105,13 +105,13 @@ public class BranchCallableQueryFactory {
private abstract class BranchBuilder<T extends IOseeBranch> extends LoadDataHandlerAdapter {
- private Map<String, T> branchMap;
+ private Map<Long, T> branchMap;
private List<T> results;
@Override
public void onLoadStart() throws OseeCoreException {
super.onLoadStart();
- branchMap = new LinkedHashMap<String, T>();
+ branchMap = new LinkedHashMap<Long, T>();
}
@Override
@@ -123,7 +123,7 @@ public class BranchCallableQueryFactory {
@Override
public void onData(BranchData data) throws OseeCoreException {
- String key = data.getGuid();
+ Long key = data.getUuid();
T branch = branchMap.get(key);
if (branch == null) {
branch = createBranch(data);
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCriteriaFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCriteriaFactory.java
index 4e61f2fd72..bd2b86d068 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCriteriaFactory.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCriteriaFactory.java
@@ -29,7 +29,7 @@ public class BranchCriteriaFactory {
return new CriteriaBranchIds(ids);
}
- public Criteria createBranchUuidsCriteria(Collection<String> ids) {
+ public Criteria createBranchUuidsCriteria(Collection<Long> ids) {
return new CriteriaBranchUuids(ids);
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchQueryImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchQueryImpl.java
index 77dafe2404..b62c7f6303 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchQueryImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchQueryImpl.java
@@ -125,12 +125,12 @@ public class BranchQueryImpl implements BranchQuery {
}
@Override
- public BranchQuery andUuids(String... ids) throws OseeCoreException {
+ public BranchQuery andUuids(Long... ids) throws OseeCoreException {
return andUuids(Arrays.asList(ids));
}
@Override
- public BranchQuery andUuids(Collection<String> ids) throws OseeCoreException {
+ public BranchQuery andUuids(Collection<Long> ids) throws OseeCoreException {
Criteria criteria = criteriaFactory.createBranchUuidsCriteria(ids);
return addAndCheck(getQueryData(), criteria);
}
@@ -142,7 +142,7 @@ public class BranchQueryImpl implements BranchQuery {
@Override
public BranchQuery andIds(Collection<? extends IOseeBranch> ids) throws OseeCoreException {
- Set<String> allIds = new HashSet<String>();
+ Set<Long> allIds = new HashSet<Long>();
for (IOseeBranch token : ids) {
allIds.add(token.getGuid());
}
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 895537dbbc..1064134bc3 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
@@ -13,7 +13,6 @@ package org.eclipse.osee.orcs.core.internal.search;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Collection;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
import org.eclipse.osee.orcs.core.ds.Criteria;
import org.eclipse.osee.orcs.core.ds.criteria.CriteriaAllTxs;
@@ -23,7 +22,6 @@ import org.eclipse.osee.orcs.core.ds.criteria.CriteriaDateRange;
import org.eclipse.osee.orcs.core.ds.criteria.CriteriaDateWithOperator;
import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxArtifactGuids;
import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxBranchIds;
-import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxBranchUuids;
import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxComment;
import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxGetHead;
import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxIdWithOperator;
@@ -58,10 +56,6 @@ public class TransactionCriteriaFactory {
return new CriteriaTxBranchIds(ids);
}
- public Criteria newTxBranchUuidCriteria(Collection<? extends IOseeBranch> ids) {
- return new CriteriaTxBranchUuids(ids);
- }
-
public Criteria newByIdWithOperator(Operator op, int id) {
return new CriteriaTxIdWithOperator(op, id);
}
@@ -94,12 +88,8 @@ public class TransactionCriteriaFactory {
return new CriteriaCommitIds(ids);
}
- public Criteria newGetHead(int branchId) {
+ public Criteria newGetHead(long branchId) {
return new CriteriaTxGetHead(branchId);
}
- public Criteria newGetHead(IOseeBranch branch) {
- return new CriteriaTxGetHead(branch);
- }
-
} \ 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 cbc330a259..79798396df 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
@@ -120,7 +120,11 @@ public class TransactionQueryImpl implements TransactionQuery {
@Override
public TransactionQuery andBranch(Collection<? extends IOseeBranch> ids) throws OseeCoreException {
- Criteria criteria = criteriaFactory.newTxBranchUuidCriteria(ids);
+ Set<Long> values = new LinkedHashSet<Long>();
+ for (IOseeBranch value : ids) {
+ values.add(value.getUuid());
+ }
+ Criteria criteria = criteriaFactory.newTxBranchIdCriteria(values);
addAndCheck(queryData, criteria);
return this;
}
@@ -252,13 +256,11 @@ public class TransactionQueryImpl implements TransactionQuery {
@Override
public TransactionQuery andIsHead(IOseeBranch branch) throws OseeCoreException {
- Criteria criteria = criteriaFactory.newGetHead(branch);
- addAndCheck(queryData, criteria);
- return this;
+ return andIsHead(branch.getUuid());
}
@Override
- public TransactionQuery andIsHead(int branchId) throws OseeCoreException {
+ public TransactionQuery andIsHead(long branchId) throws OseeCoreException {
Criteria criteria = criteriaFactory.newGetHead(branchId);
addAndCheck(queryData, criteria);
return this;
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java
index d8d0971de2..34c7a126c0 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.orcs.core.internal.types.impl;
+import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.Collection;
import java.util.Collections;
@@ -82,6 +83,7 @@ public class OrcsTypesIndexer {
InputStream inputStream = null;
try {
inputStream = source.getContent();
+ inputStream = upConvertTo17(inputStream);
resource = OseeDslResourceUtil.loadModel(source.getLocation().toASCIIString(), inputStream);
} finally {
Lib.close(inputStream);
@@ -130,6 +132,14 @@ public class OrcsTypesIndexer {
return index;
}
+ private InputStream upConvertTo17(InputStream inputStream) throws Exception {
+ String typesStr = Lib.inputStreamToString(inputStream);
+ typesStr = typesStr.replaceAll("branchGuid \"AyH_fAj8lhQGmQw2iBAA\"", "branchUuid 423");
+ typesStr = typesStr.replaceAll("branchGuid \"AyH_e5wAblOqTdLkxqQA\"", "branchUuid 714");
+ typesStr = typesStr.replaceAll("branchGuid \"GyoL_rFqqBYbOcuGYzQA\"", "branchUuid 4312");
+ return new ByteArrayInputStream(typesStr.getBytes("UTF-8"));
+ }
+
private void indexSuperTypes(ArtifactTypeIndex artifactTypeIndex, IArtifactType token, XArtifactType dslType) throws OseeCoreException {
Set<IArtifactType> tokenSuperTypes = Sets.newLinkedHashSet();
for (XArtifactType superTypes : dslType.getSuperArtifactTypes()) {
@@ -228,9 +238,11 @@ public class OrcsTypesIndexer {
private IOseeBranch getAttributeBranch(XAttributeTypeRef xAttributeTypeRef) {
IOseeBranch branchToken = CoreBranches.SYSTEM_ROOT;
- String branchGuid = xAttributeTypeRef.getBranchGuid();
- if (branchGuid != null) {
- branchToken = TokenFactory.createBranch(branchGuid, branchGuid);
+ if (Strings.isValid(xAttributeTypeRef.getBranchUuid())) {
+ long branchUuid = Long.valueOf(xAttributeTypeRef.getBranchUuid());
+ if (branchUuid > 0) {
+ branchToken = TokenFactory.createBranch(branchUuid, String.valueOf(branchUuid));
+ }
}
return branchToken;
}
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/data/binary_data.zip b/plugins/org.eclipse.osee.orcs.db.mock/data/binary_data.zip
index 256a358543..8150c76c7f 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/data/binary_data.zip
+++ b/plugins/org.eclipse.osee.orcs.db.mock/data/binary_data.zip
Binary files differ
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/BranchQuerySqlContextFactoryImplTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/BranchQuerySqlContextFactoryImplTest.java
index c14c700d03..8795366772 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/BranchQuerySqlContextFactoryImplTest.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/BranchQuerySqlContextFactoryImplTest.java
@@ -30,6 +30,7 @@ import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.database.core.AbstractJoinQuery;
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.Lib;
import org.eclipse.osee.logger.Log;
import org.eclipse.osee.orcs.OrcsSession;
import org.eclipse.osee.orcs.core.ds.Criteria;
@@ -64,7 +65,7 @@ import org.mockito.MockitoAnnotations;
*/
public class BranchQuerySqlContextFactoryImplTest {
- private static final Criteria GUIDS = uuid(GUID.create(), GUID.create());
+ private static final Criteria UUIDS = uuid(Lib.generateUuid(), Lib.generateUuid());
private static final Criteria IDS = id(1, 2, 3, 4, 5);
private static final Criteria TYPES = type(WORKING, SYSTEM_ROOT);
@@ -110,11 +111,11 @@ public class BranchQuerySqlContextFactoryImplTest {
" WHERE \n" + //
"br1.branch_id = jid1.id AND jid1.query_id = ?\n" + //
" AND \n" + //
- "br1.branch_guid = jch1.id AND jch1.query_id = ?\n" + //
+ "br1.branch_id = jch1.id AND jch1.query_id = ?\n" + //
" AND \n" + //
"br1.branch_type = jid2.id AND jid2.query_id = ?";
- queryData.addCriteria(GUIDS, IDS, TYPES);
+ queryData.addCriteria(UUIDS, IDS, TYPES);
QuerySqlContext context = queryEngine.createCountContext(session, queryData);
@@ -142,12 +143,12 @@ public class BranchQuerySqlContextFactoryImplTest {
" WHERE \n" + //
"br1.branch_id = jid1.id AND jid1.query_id = ?\n" + //
" AND \n" + //
- "br1.branch_guid = jch1.id AND jch1.query_id = ?\n" + //
+ "br1.branch_id = jch1.id AND jch1.query_id = ?\n" + //
" AND \n" + //
"br1.branch_type = jid2.id AND jid2.query_id = ?\n" + //
" ORDER BY br1.branch_id";
- queryData.addCriteria(GUIDS, IDS, TYPES);
+ queryData.addCriteria(UUIDS, IDS, TYPES);
QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
@@ -194,12 +195,12 @@ public class BranchQuerySqlContextFactoryImplTest {
" WHERE \n" + //
"br1.branch_id = ?\n" + //
" AND \n" + //
- "br1.branch_guid = ?\n" + //
+ "br1.branch_id = ?\n" + //
" AND \n" + //
"br1.branch_type = ?\n" + //
" ORDER BY br1.branch_id";
- queryData.addCriteria(uuid("12313123"), id(2), type(SYSTEM_ROOT));
+ queryData.addCriteria(uuid(12313123L), id(2), type(SYSTEM_ROOT));
QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
@@ -212,7 +213,7 @@ public class BranchQuerySqlContextFactoryImplTest {
Iterator<Object> iterator = parameters.iterator();
assertEquals(2, iterator.next());
- assertEquals("12313123", iterator.next());
+ assertEquals(12313123L, iterator.next());
assertEquals(SYSTEM_ROOT.getValue(), iterator.next());
}
@@ -325,7 +326,7 @@ public class BranchQuerySqlContextFactoryImplTest {
public void testQueryChildOf() throws OseeCoreException {
String expected =
"WITH chof1 (child_id, branch_level) AS ( SELECT anch_br1.branch_id, 0 as branch_level FROM osee_branch anch_br1, osee_branch anch_br2\n" + //
- " WHERE anch_br1.parent_branch_id = anch_br2.branch_id AND anch_br2.branch_guid = ?\n" + //
+ " WHERE anch_br1.parent_branch_id = anch_br2.branch_id AND anch_br2.branch_id = ?\n" + //
" UNION ALL \n" + //
" SELECT branch_id, branch_level + 1 FROM chof1 recurse, osee_branch br WHERE recurse.child_id = br.parent_branch_id\n" + //
")\n" + //
@@ -355,7 +356,7 @@ public class BranchQuerySqlContextFactoryImplTest {
public void testQueryAncestorOf() throws OseeCoreException {
String expected =
"WITH anstrof1 (parent_id, branch_level) AS ( SELECT anch_br1.parent_branch_id, 0 as branch_level FROM osee_branch anch_br1\n" + //
- " WHERE anch_br1.branch_guid = ?\n" + //
+ " WHERE anch_br1.branch_id = ?\n" + //
" UNION ALL \n" + //
" SELECT parent_branch_id, branch_level - 1 FROM anstrof1 recurse, osee_branch br WHERE br.branch_id = recurse.parent_id\n" + //
")\n" + //
@@ -385,7 +386,7 @@ public class BranchQuerySqlContextFactoryImplTest {
public void testMultiples() throws OseeCoreException {
String expected =
"WITH chof1 (child_id, branch_level) AS ( SELECT anch_br1.branch_id, 0 as branch_level FROM osee_branch anch_br1, osee_branch anch_br2\n" + //
- " WHERE anch_br1.parent_branch_id = anch_br2.branch_id AND anch_br2.branch_guid = ?\n" + //
+ " WHERE anch_br1.parent_branch_id = anch_br2.branch_id AND anch_br2.branch_id = ?\n" + //
" UNION ALL \n" + //
" SELECT branch_id, branch_level + 1 FROM chof1 recurse, osee_branch br WHERE recurse.child_id = br.parent_branch_id\n" + //
")\n" + //
@@ -435,7 +436,7 @@ public class BranchQuerySqlContextFactoryImplTest {
return new CriteriaBranchChildOf(parent);
}
- private static Criteria uuid(String... values) {
+ private static Criteria uuid(Long... values) {
return new CriteriaBranchUuids(Arrays.asList(values));
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/OrcsDataStoreImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/OrcsDataStoreImpl.java
index f2aeec8ee8..6d95128ee6 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/OrcsDataStoreImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/OrcsDataStoreImpl.java
@@ -14,20 +14,13 @@ import java.util.Collection;
import org.eclipse.osee.event.EventService;
import org.eclipse.osee.executor.admin.ExecutorAdmin;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.enums.BranchArchivedState;
-import org.eclipse.osee.framework.core.enums.BranchState;
-import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.OseeCacheEnum;
-import org.eclipse.osee.framework.core.enums.StorageState;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.core.model.cache.BranchCache;
import org.eclipse.osee.framework.core.model.cache.IOseeCache;
import org.eclipse.osee.framework.core.model.cache.TransactionCache;
import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
import org.eclipse.osee.framework.core.services.TempCachingService;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.type.BaseIdentity;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.GUID;
@@ -160,49 +153,7 @@ public class OrcsDataStoreImpl implements OrcsDataStore, TempCachingService {
@Override
public long getBranchId(IOseeBranch branch) {
- BranchCache branchCache = cacheService.getBranchCache();
- Branch cached = branchCache.get(branch);
- long localId = -1;
- if (cached != null) {
- localId = cached.getId();
- } else {
- IOseeStatement chStmt = dbService.getStatement();
- try {
- chStmt.runPreparedQuery(1, "select * from osee_branch where branch_guid = ?", branch.getGuid());
- if (chStmt.next()) {
- try {
- localId = 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");
- Branch created =
- modelFactory.getBranchFactory().createOrUpdate(branchCache, branchGuid, localId,
- branchName, branchType, branchState, isArchived, StorageState.LOADED);
-
- Integer parentBranchId = chStmt.getInt("parent_branch_id");
- if (parentBranchId != -1) {
- created.setParentBranch(branchCache.getById(parentBranchId));
- }
-
- TransactionCache txCache = cacheService.getTransactionCache();
- TransactionRecord parentTx = txCache.getOrLoad(chStmt.getInt("parent_transaction_id"));
- created.setSourceTransaction(parentTx);
- TransactionRecord baseTx = txCache.getOrLoad(chStmt.getInt("baseline_transaction_id"));
- created.setBaseTransaction(baseTx);
- created.setAssociatedArtifactId(chStmt.getInt("associated_art_id"));
- } catch (OseeCoreException ex) {
- logger.error(ex, "Error loading branch with guid [%s] and name [%s]", branch.getGuid(),
- branch.getName());
- }
- }
- } finally {
- chStmt.close();
- }
- }
- return localId;
+ return branch.getUuid();
}
};
return dataModuleFactory.createDataModule(branchIdProvider, artifactTypes, attributeTypes);
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 16a68815e8..90cccd3c84 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
@@ -47,7 +47,7 @@ import org.eclipse.osee.orcs.db.internal.callable.StoreBranchDatabaseCallable;
/**
* @author Roberto E. Escobar
*/
-public class DatabaseBranchAccessor implements IOseeDataAccessor<String, Branch> {
+public class DatabaseBranchAccessor implements IOseeDataAccessor<Long, Branch> {
private static final int NULL_PARENT_BRANCH_ID = -1;
private static final String SELECT_BRANCHES = "SELECT * FROM osee_branch";
@@ -89,7 +89,7 @@ public class DatabaseBranchAccessor implements IOseeDataAccessor<String, Branch>
}
@Override
- public void load(IOseeCache<String, Branch> cache) throws OseeCoreException {
+ public void load(IOseeCache<Long, Branch> cache) throws OseeCoreException {
long startTime = System.currentTimeMillis();
Map<Branch, Integer> childToParent = new HashMap<Branch, Integer>();
Map<Branch, Integer> branchToBaseTx = new HashMap<Branch, Integer>();
@@ -123,8 +123,8 @@ public class DatabaseBranchAccessor implements IOseeDataAccessor<String, Branch>
boolean isArchived = BranchArchivedState.valueOf(chStmt.getInt("archived")).isArchived();
String branchGuid = chStmt.getString("branch_guid");
Branch branch =
- branchFactory.createOrUpdate(cache, branchGuid, branchId, branchName, branchType,
- branchState, isArchived, StorageState.LOADED);
+ branchFactory.createOrUpdate(cache, branchId, branchName, branchType, branchState, isArchived,
+ StorageState.LOADED);
Integer parentBranchId = chStmt.getInt("parent_branch_id");
if (parentBranchId != NULL_PARENT_BRANCH_ID) {
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/BranchCopyTxCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/BranchCopyTxCallable.java
index 3010935327..62ed0edf4d 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/BranchCopyTxCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/BranchCopyTxCallable.java
@@ -30,7 +30,6 @@ 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.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.time.GlobalTime;
import org.eclipse.osee.logger.Log;
import org.eclipse.osee.orcs.OrcsSession;
@@ -103,11 +102,6 @@ public final class BranchCopyTxCallable extends AbstractDatastoreTxCallable<Bran
// TODO figure out if this call is "stackable", is the data passed in above
// still valid after the branch creation, or do I need to get it all from the new branch???
- String guid = branchData.getGuid();
- if (!GUID.isValid(guid)) {
- guid = GUID.create();
- }
-
Timestamp timestamp = GlobalTime.GreenwichMeanTimestamp();
int nextTransactionId = getDatabaseService().getSequence().getNextTransactionId();
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 54de9f0e0d..9667707908 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
@@ -35,7 +35,6 @@ import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.jdk.core.util.time.GlobalTime;
@@ -176,16 +175,12 @@ public class CreateBranchDatabaseTxCallable extends AbstractDatastoreTxCallable<
checkPreconditions(parentBranch, destinationBranch);
passedPreConditions = true;
- String guid = newBranchData.getGuid();
- if (!GUID.isValid(guid)) {
- guid = GUID.create();
- }
long uuid = newBranchData.getUuid();
final String truncatedName = Strings.truncate(newBranchData.getName(), 195, true);
branch =
- branchFactory.create(guid, uuid, truncatedName, newBranchData.getBranchType(),
- BranchState.CREATION_IN_PROGRESS, false);
+ branchFactory.create(uuid, truncatedName, newBranchData.getBranchType(), BranchState.CREATION_IN_PROGRESS,
+ false);
branch.setParentBranch(parentBranch);
branch.setAssociatedArtifactId(newBranchData.getAssociatedArtifactId());
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/InitializeDatastoreCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/InitializeDatastoreCallable.java
index d02e0dc090..01bb58bf60 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/InitializeDatastoreCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/InitializeDatastoreCallable.java
@@ -102,7 +102,7 @@ public class InitializeDatastoreCallable extends AbstractDatastoreCallable<DataS
private CreateBranchData getSystemRootData() {
CreateBranchData data = new CreateBranchData();
- data.setGuid(CoreBranches.SYSTEM_ROOT.getGuid());
+ data.setUuid(CoreBranches.SYSTEM_ROOT.getGuid());
data.setName(CoreBranches.SYSTEM_ROOT.getName());
data.setUuid(CoreBranches.SYSTEM_ROOT.getUuid());
data.setBranchType(BranchType.SYSTEM_ROOT);
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/OrcsTypeLoaderCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/OrcsTypeLoaderCallable.java
index 6607e17522..52f04f016f 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/OrcsTypeLoaderCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/OrcsTypeLoaderCallable.java
@@ -40,7 +40,7 @@ import org.eclipse.osee.orcs.OrcsSession;
public class OrcsTypeLoaderCallable extends AbstractDatastoreCallable<IResource> {
private static final String LOAD_OSEE_TYPE_DEF_URIS =
- "select attr.uri from osee_branch br, osee_txs txs1, osee_artifact art, osee_attribute attr, osee_txs txs2 where br.branch_guid = ? and txs1.branch_id = br.branch_id and txs1.tx_current = ? and txs1.gamma_id = art.gamma_id and txs2.branch_id = br.branch_id and txs2.tx_current = ? and txs2.gamma_id = attr.gamma_id and art.art_type_id = ? and art.art_id = attr.art_id and attr.attr_type_id = ?";
+ "select attr.uri from osee_branch br, osee_txs txs1, osee_artifact art, osee_attribute attr, osee_txs txs2 where br.branch_id = ? and txs1.branch_id = br.branch_id and txs1.tx_current = ? and txs1.gamma_id = art.gamma_id and txs2.branch_id = br.branch_id and txs2.tx_current = ? and txs2.gamma_id = attr.gamma_id and art.art_type_id = ? and art.art_id = attr.art_id and attr.attr_type_id = ?";
private final IResourceManager resourceManager;
@@ -69,7 +69,7 @@ public class OrcsTypeLoaderCallable extends AbstractDatastoreCallable<IResource>
try {
chStmt = getDatabaseService().getStatement();
- chStmt.runPreparedQuery(LOAD_OSEE_TYPE_DEF_URIS, CoreBranches.COMMON.getGuid(), TxChange.CURRENT.getValue(),
+ chStmt.runPreparedQuery(LOAD_OSEE_TYPE_DEF_URIS, CoreBranches.COMMON.getUuid(), TxChange.CURRENT.getValue(),
TxChange.CURRENT.getValue(), artifactTypeId, attributeTypeId);
while (chStmt.next()) {
String uri = chStmt.getString("uri");
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderFactoryImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderFactoryImpl.java
index dce58af9cd..ef9ea2e789 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderFactoryImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderFactoryImpl.java
@@ -12,8 +12,6 @@ package org.eclipse.osee.orcs.db.internal.loader;
import java.util.Arrays;
import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
import org.eclipse.osee.executor.admin.HasCancellation;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
@@ -139,20 +137,4 @@ public class DataLoaderFactoryImpl implements DataLoaderFactory {
return toReturn;
}
- private static Collection<String> toCollection(String... ids) {
- Set<String> toReturn = new HashSet<String>();
- for (String id : ids) {
- toReturn.add(id);
- }
- return toReturn;
- }
-
- private static Collection<Integer> toCollection(int... ids) {
- Set<Integer> toReturn = new HashSet<Integer>();
- for (Integer id : ids) {
- toReturn.add(id);
- }
- return toReturn;
- }
-
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/SqlObjectLoader.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/SqlObjectLoader.java
index 2190444db0..7785ed15bd 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/SqlObjectLoader.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/SqlObjectLoader.java
@@ -209,9 +209,9 @@ public class SqlObjectLoader {
}
protected int loadHeadTransactionId(IOseeBranch branch) throws OseeCoreException {
- String sql = sqlProvider.getSql(OseeSql.TX_GET_MAX_AS_LARGEST_TX_WITH_BRANCH_GUID);
+ String sql = sqlProvider.getSql(OseeSql.TX_GET_MAX_AS_LARGEST_TX);
return getDatabaseService().runPreparedQueryFetchObject(RelationalConstants.TRANSACTION_SENTINEL, sql,
- branch.getGuid());
+ branch.getUuid());
}
protected <D extends HasLocalId, F extends OrcsDataFactory> void load(LoadProcessor<D, F> processor, OrcsDataHandler<D> handler, SqlContext loadContext, int fetchSize) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchDataImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchDataImpl.java
index 2616bd348a..4d9178a199 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchDataImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchDataImpl.java
@@ -23,7 +23,7 @@ import org.eclipse.osee.orcs.db.internal.sql.RelationalConstants;
*/
public class BranchDataImpl extends OrcsObjectImpl<Long> implements BranchData, BranchReadable {
- private String guid = RelationalConstants.DEFAULT_GUID;
+ private long uuid = RelationalConstants.DEFAULT_UUID;
private String name = "";
private int associatedArtifactId = RelationalConstants.ART_ID_SENTINEL;
private int baseTransaction = RelationalConstants.TRANSACTION_SENTINEL;
@@ -38,13 +38,8 @@ public class BranchDataImpl extends OrcsObjectImpl<Long> implements BranchData,
}
@Override
- public String getGuid() {
- return guid;
- }
-
- @Override
- public void setGuid(String guid) {
- this.guid = guid;
+ public Long getGuid() {
+ return getUuid();
}
@Override
@@ -136,21 +131,23 @@ public class BranchDataImpl extends OrcsObjectImpl<Long> implements BranchData,
public int hashCode() {
final int prime = 31;
int result = super.hashCode();
- result = prime * result + ((guid == null) ? 0 : guid.hashCode());
+ result = prime * result + (int) (uuid ^ (uuid >>> 32));
return result;
}
@Override
public boolean equals(Object obj) {
if (obj instanceof Identity) {
- return getGuid().equals(((Identity<?>) obj).getGuid());
+ Identity<?> id = (Identity<?>) obj;
+ return id.equals(this);
}
return false;
+
}
@Override
public String toString() {
- return "BranchData [guid=" + guid + super.toString() + "]";
+ return "BranchData [uuid=" + uuid + ", " + super.toString() + "]";
}
@Override
@@ -165,7 +162,12 @@ public class BranchDataImpl extends OrcsObjectImpl<Long> implements BranchData,
@Override
public long getUuid() {
- return getLocalId();
+ return uuid;
+ }
+
+ @Override
+ public void setUuid(Long uuid) {
+ this.uuid = uuid;
}
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchObjectFactory.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchObjectFactory.java
index c3cb5e335f..76ba22dd4d 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchObjectFactory.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchObjectFactory.java
@@ -21,7 +21,7 @@ import org.eclipse.osee.orcs.core.ds.BranchData;
*/
public interface BranchObjectFactory extends OrcsDataFactory {
- BranchData createBranchData(Long localId, String guid, BranchType branchType, String name, long parentBranch, int baseTransaction, int sourceTransaction, BranchArchivedState archiveState, BranchState branchState, int associatedArtifactId) throws OseeCoreException;
+ BranchData createBranchData(Long branchUuid, BranchType branchType, String name, long parentBranch, int baseTransaction, int sourceTransaction, BranchArchivedState archiveState, BranchState branchState, int associatedArtifactId) throws OseeCoreException;
BranchData createCopy(BranchData source) throws OseeCoreException;
}
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 d13ccbd011..1a5f182668 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
@@ -179,15 +179,14 @@ public class OrcsObjectFactoryImpl implements OrcsObjectFactory {
}
@Override
- public BranchData createBranchData(Long localId, String guid, BranchType branchType, String name, long parentBranch, int baseTransaction, int sourceTransaction, BranchArchivedState archiveState, BranchState branchState, int associatedArtifactId) {
+ public BranchData createBranchData(Long branchUuid, BranchType branchType, String name, long parentBranch, int baseTransaction, int sourceTransaction, BranchArchivedState archiveState, BranchState branchState, int associatedArtifactId) {
BranchData data = new BranchDataImpl();
data.setArchiveState(archiveState);
data.setAssociatedArtifactId(associatedArtifactId);
data.setBaseTransaction(baseTransaction);
data.setBranchState(branchState);
data.setBranchType(branchType);
- data.setGuid(guid);
- data.setLocalId(localId);
+ data.setUuid(branchUuid);
data.setName(name);
data.setParentBranch(parentBranch);
data.setSourceTransaction(sourceTransaction);
@@ -196,9 +195,9 @@ public class OrcsObjectFactoryImpl implements OrcsObjectFactory {
@Override
public BranchData createCopy(BranchData source) {
- return createBranchData(source.getLocalId(), source.getGuid(), source.getBranchType(), source.getName(),
- source.getParentBranch(), source.getBaseTransaction(), source.getSourceTransaction(),
- source.getArchiveState(), source.getBranchState(), source.getAssociatedArtifactId());
+ return createBranchData(source.getLocalId(), source.getBranchType(), source.getName(), source.getParentBranch(),
+ source.getBaseTransaction(), source.getSourceTransaction(), source.getArchiveState(), source.getBranchState(),
+ source.getAssociatedArtifactId());
}
@Override
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 7b04290989..91bf5f996d 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
@@ -36,14 +36,13 @@ public class BranchLoadProcessor extends LoadProcessor<BranchData, BranchObjectF
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");
int parentBranchId = chStmt.getInt("parent_branch_id");
int sourceTx = chStmt.getInt("parent_transaction_id");
int baseTx = chStmt.getInt("baseline_transaction_id");
int assocArtId = chStmt.getInt("associated_art_id");
- return factory.createBranchData(branchId, branchGuid, branchType, branchName, parentBranchId, baseTx, sourceTx,
- archiveState, branchState, assocArtId);
+ return factory.createBranchData(branchId, 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/LoadProcessor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/LoadProcessor.java
index a5ec34da71..75d280fdd6 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/LoadProcessor.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/LoadProcessor.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.orcs.db.internal.loader.data.OrcsDataFactory;
/**
* @author Roberto E. Escobar
*/
-public abstract class LoadProcessor<D extends HasLocalId, F extends OrcsDataFactory> {
+public abstract class LoadProcessor<D extends HasLocalId<?>, F extends OrcsDataFactory> {
private final F factory;
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchAncestorOfSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchAncestorOfSqlHandler.java
index 42a483a2c3..8c2be1271b 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchAncestorOfSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchAncestorOfSqlHandler.java
@@ -42,12 +42,12 @@ public class BranchAncestorOfSqlHandler extends SqlHandler<CriteriaBranchAncesto
withAlias = writer.getNextAlias(ANCESTOR_OF_ENTRY);
final StringBuilder body = new StringBuilder();
body.append(" SELECT anch_br1.parent_branch_id, 0 as branch_level FROM osee_branch anch_br1\n");
- body.append(" WHERE anch_br1.branch_guid = ?");
+ body.append(" WHERE anch_br1.branch_id = ?");
body.append("\n UNION ALL \n");
body.append(" SELECT parent_branch_id, branch_level - 1 FROM ").append(withAlias);
body.append(" recurse, osee_branch br");
body.append(" WHERE br.branch_id = recurse.parent_id\n");
- writer.addParameter(criteria.getChild().getGuid());
+ writer.addParameter(criteria.getChild().getUuid());
writer.addWithClause(newRecursiveWithClause(withAlias, "(parent_id, branch_level)", body.toString()));
writer.addTable(withAlias);
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchChildOfSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchChildOfSqlHandler.java
index f66cd90595..62448fe83c 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchChildOfSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchChildOfSqlHandler.java
@@ -42,11 +42,11 @@ public class BranchChildOfSqlHandler extends SqlHandler<CriteriaBranchChildOf> {
withAlias = writer.getNextAlias(CHILDREN_OF_ENTRY);
final StringBuilder body = new StringBuilder();
body.append(" SELECT anch_br1.branch_id, 0 as branch_level FROM osee_branch anch_br1, osee_branch anch_br2\n");
- body.append(" WHERE anch_br1.parent_branch_id = anch_br2.branch_id AND anch_br2.branch_guid = ?");
+ body.append(" WHERE anch_br1.parent_branch_id = anch_br2.branch_id AND anch_br2.branch_id = ?");
body.append("\n UNION ALL \n");
body.append(" SELECT branch_id, branch_level + 1 FROM ").append(withAlias).append(" recurse, osee_branch br");
body.append(" WHERE recurse.child_id = br.parent_branch_id\n");
- writer.addParameter(criteria.getParent().getGuid());
+ writer.addParameter(criteria.getParent().getUuid());
writer.addWithClause(newRecursiveWithClause(withAlias, "(child_id, branch_level)", body.toString()));
writer.addTable(withAlias);
}
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/BranchGuidSqlHandler.java
index 5d27f35ba2..729c53fc00 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/BranchGuidSqlHandler.java
@@ -51,11 +51,12 @@ public class BranchGuidSqlHandler extends SqlHandler<CriteriaBranchUuids> {
@Override
public boolean addPredicates(AbstractSqlWriter writer) throws OseeCoreException {
- Collection<String> ids = criteria.getIds();
+
+ Collection<Long> ids = criteria.getIds();
if (ids.size() > 1) {
- joinQuery = writer.writeCharJoin(ids);
+ joinQuery = writer.writeIdJoin(ids);
writer.write(brAlias);
- writer.write(".branch_guid = ");
+ writer.write(".branch_id = ");
writer.write(jguidAlias);
writer.write(".id AND ");
writer.write(jguidAlias);
@@ -63,7 +64,7 @@ public class BranchGuidSqlHandler extends SqlHandler<CriteriaBranchUuids> {
writer.addParameter(joinQuery.getQueryId());
} else {
writer.write(brAlias);
- writer.write(".branch_guid = ?");
+ writer.write(".branch_id = ?");
writer.addParameter(ids.iterator().next());
}
return true;
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 4845467a28..88ff9624ec 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
@@ -42,7 +42,6 @@ import org.eclipse.osee.orcs.core.ds.criteria.CriteriaRelationTypeSideExists;
import org.eclipse.osee.orcs.core.ds.criteria.CriteriaRelationTypeSideNotExists;
import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxArtifactGuids;
import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxBranchIds;
-import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxBranchUuids;
import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxComment;
import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxGetHead;
import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxIdWithOperator;
@@ -107,7 +106,6 @@ public final class SqlHandlerFactoryUtil {
handleMap.put(CriteriaTxIds.class, TxIdsSqlHandler.class);
handleMap.put(CriteriaTxBranchIds.class, TxBranchIdsSqlHandler.class);
- handleMap.put(CriteriaTxBranchUuids.class, TxBranchUuidsSqlHandler.class);
handleMap.put(CriteriaTxType.class, TxTypesSqlHandler.class);
handleMap.put(CriteriaTxComment.class, TxCommentSqlHandler.class);
handleMap.put(CriteriaAllTxs.class, AllTxsSqlHandler.class);
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxBranchUuidsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxBranchUuidsSqlHandler.java
deleted file mode 100644
index 2c995196d4..0000000000
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxBranchUuidsSqlHandler.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.orcs.db.internal.search.handlers;
-
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.database.core.AbstractJoinQuery;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxBranchUuids;
-import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter;
-import org.eclipse.osee.orcs.db.internal.sql.SqlHandler;
-import org.eclipse.osee.orcs.db.internal.sql.TableEnum;
-
-/**
- * @author Roberto E. Escobar
- */
-public class TxBranchUuidsSqlHandler extends SqlHandler<CriteriaTxBranchUuids> {
-
- private CriteriaTxBranchUuids criteria;
-
- private String txAlias;
- private String jCharIdAlias;
- private String brAlias;
-
- @Override
- public void setData(CriteriaTxBranchUuids criteria) {
- this.criteria = criteria;
- }
-
- @Override
- public void addTables(AbstractSqlWriter writer) {
- if (criteria.getIds().size() > 1) {
- jCharIdAlias = writer.addTable(TableEnum.CHAR_JOIN_TABLE);
- }
-
- List<String> brAliases = writer.getAliases(TableEnum.BRANCH_TABLE);
- if (brAliases.isEmpty()) {
- brAlias = writer.addTable(TableEnum.BRANCH_TABLE);
- } else {
- brAlias = brAliases.iterator().next();
- }
-
- List<String> aliases = writer.getAliases(TableEnum.TX_DETAILS_TABLE);
- if (aliases.isEmpty()) {
- txAlias = writer.addTable(TableEnum.TX_DETAILS_TABLE);
- } else {
- txAlias = aliases.iterator().next();
- }
- }
-
- @Override
- public boolean addPredicates(AbstractSqlWriter writer) throws OseeCoreException {
- Collection<? extends IOseeBranch> ids = criteria.getIds();
- if (ids.size() > 1) {
- Set<String> guids = new LinkedHashSet<String>();
- for (IOseeBranch branch : ids) {
- guids.add(branch.getGuid());
- }
- AbstractJoinQuery joinQuery = writer.writeCharJoin(guids);
- writer.write(brAlias);
- writer.write(".branch_guid = ");
- writer.write(jCharIdAlias);
- writer.write(".id AND ");
- writer.write(jCharIdAlias);
- writer.write(".query_id = ?");
- writer.addParameter(joinQuery.getQueryId());
- } else {
- writer.write(brAlias);
- writer.write(".branch_guid = ?");
- writer.addParameter(ids.iterator().next().getGuid());
- }
- writer.writeAndLn();
- writer.write(txAlias);
- writer.write(".branch_id = ");
- writer.write(brAlias);
- writer.write(".branch_id");
- return true;
- }
-
- @Override
- public int getPriority() {
- return TxSqlHandlerPriority.BRANCH_ID.ordinal();
- }
-}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxGetHeadSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxGetHeadSqlHandler.java
index 5618769e91..bdf4e72495 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxGetHeadSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxGetHeadSqlHandler.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.orcs.db.internal.search.handlers;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxGetHead;
import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter;
@@ -46,24 +45,14 @@ public class TxGetHeadSqlHandler extends SqlHandler<CriteriaTxGetHead> {
public boolean addPredicates(AbstractSqlWriter writer) throws OseeCoreException {
writer.write(txdAlias);
writer.write(".transaction_id = ");
- if (criteria.hasBranchToken()) {
- IOseeBranch branch = criteria.getBranch();
- writer.write("(SELECT max(txdi.transaction_id) FROM ");
- writer.write(TableEnum.BRANCH_TABLE.getName());
- writer.write(" obi, ");
- writer.write(TableEnum.TX_DETAILS_TABLE.getName());
- writer.write(" txdi WHERE ");
- writer.write("obi.branch_id = txdi.branch_id AND ");
- writer.write("obi.branch_guid = ?)");
- writer.addParameter(branch.getGuid());
- } else {
- int branch = criteria.getBranchid();
- writer.write("(SELECT max(transaction_id) FROM ");
- writer.write(TableEnum.TX_DETAILS_TABLE.getName());
- writer.write(" WHERE ");
- writer.write("branch_id = ?)");
- writer.addParameter(branch);
- }
+
+ writer.write("(SELECT max(transaction_id) FROM ");
+ writer.write(TableEnum.TX_DETAILS_TABLE.getName());
+ writer.write(" WHERE ");
+ writer.write("branch_id = ?)");
+
+ long branch = criteria.getBranchid();
+ writer.addParameter(branch);
return true;
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/OseeSql.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/OseeSql.java
index 4e3d9e8fdf..aefacc319b 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/OseeSql.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/OseeSql.java
@@ -21,7 +21,6 @@ public enum OseeSql {
TX_GET_ALL_TRANSACTIONS("SELECT * FROM osee_tx_details WHERE transaction_id = ?"),
TX_GET_MAX_AS_LARGEST_TX("SELECT max(transaction_id) as largest_transaction_id FROM osee_tx_details WHERE branch_id = ?"),
- TX_GET_MAX_AS_LARGEST_TX_WITH_BRANCH_GUID("SELECT max(txd.transaction_id) as largest_transaction_id FROM osee_tx_details txd, osee_branch ob WHERE ob.branch_guid = ? AND txd.branch_id = ob.branch_id"),
MERGE_GET_ARTIFACTS_FOR_BRANCH("SELECT art.art_id FROM osee_txs txs, osee_artifact art WHERE txs.branch_id = ? and txs.gamma_id = art.gamma_id"),
MERGE_GET_ATTRIBUTES_FOR_BRANCH("SELECT atr.art_id, atr.attr_id FROM osee_txs txs, osee_attribute atr WHERE txs.branch_id = ? and txs.gamma_id = atr.gamma_id"),
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/RelationalConstants.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/RelationalConstants.java
index 480ed5a167..9af3bf8d8c 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/RelationalConstants.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/RelationalConstants.java
@@ -37,6 +37,7 @@ public final class RelationalConstants {
public static final ModificationType DEFAULT_MODIFICATION_TYPE = ModificationType.NEW;
public static final String DEFAULT_GUID = null;
+ public static final Long DEFAULT_UUID = -1L;
public static final int MIN_FETCH_SIZE = 10;
public static final int MAX_FETCH_SIZE = 10000;
diff --git a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/artifact/SearchParameters.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/artifact/SearchParameters.java
index 0e267b7265..6e63241f6d 100644
--- a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/artifact/SearchParameters.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/artifact/SearchParameters.java
@@ -18,7 +18,7 @@ import java.util.List;
*/
public interface SearchParameters {
- String getBranchUuid();
+ Long getBranchUuid();
List<Predicate> getPredicates();
diff --git a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/artifact/SearchRequest.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/artifact/SearchRequest.java
index d7aab48d2d..598c8050a0 100644
--- a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/artifact/SearchRequest.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/artifact/SearchRequest.java
@@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlTransient;
@XmlRootElement(name = "SearchRequest")
public class SearchRequest implements SearchParameters {
- private String branchUuid;
+ private Long branchUuid;
private String alt;
private String fields;
private int fromTx;
@@ -36,7 +36,7 @@ public class SearchRequest implements SearchParameters {
super();
}
- public SearchRequest(String branchUuid, List<Predicate> predicates, String alt, String fields, int fromTx, boolean includeDeleted) {
+ public SearchRequest(Long branchUuid, List<Predicate> predicates, String alt, String fields, int fromTx, boolean includeDeleted) {
super();
this.branchUuid = branchUuid;
this.predicates = predicates;
@@ -47,7 +47,7 @@ public class SearchRequest implements SearchParameters {
}
@Override
- public String getBranchUuid() {
+ public Long getBranchUuid() {
return branchUuid;
}
@@ -68,7 +68,7 @@ public class SearchRequest implements SearchParameters {
return fields;
}
- public void setBranchUuid(String uuid) {
+ public void setBranchUuid(Long uuid) {
this.branchUuid = uuid;
}
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactResource.java
index 1db9e3ad5c..47d4bc1d57 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactResource.java
@@ -34,10 +34,10 @@ public class ArtifactResource {
@Context
Request request;
- String branchUuid;
+ Long branchUuid;
String artifactUuid;
- public ArtifactResource(UriInfo uriInfo, Request request, String branchUuid, String artifactUuid) {
+ public ArtifactResource(UriInfo uriInfo, Request request, Long branchUuid, String artifactUuid) {
this.uriInfo = uriInfo;
this.request = request;
this.branchUuid = branchUuid;
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactSearchResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactSearchResource.java
index b7c5ed2604..65e4115af1 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactSearchResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactSearchResource.java
@@ -28,9 +28,9 @@ public class ArtifactSearchResource {
@Context
Request request;
- String branchUuid;
+ Long branchUuid;
- public ArtifactSearchResource(UriInfo uriInfo, Request request, String branchUuid) {
+ public ArtifactSearchResource(UriInfo uriInfo, Request request, Long branchUuid) {
this.uriInfo = uriInfo;
this.request = request;
this.branchUuid = branchUuid;
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactsResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactsResource.java
index 124ade5259..d09863aab0 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactsResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactsResource.java
@@ -37,9 +37,9 @@ public class ArtifactsResource {
@Context
private final Request request;
- private final String branchUuid;
+ private final Long branchUuid;
- public ArtifactsResource(UriInfo uriInfo, Request request, String branchUuid) {
+ public ArtifactsResource(UriInfo uriInfo, Request request, Long branchUuid) {
this.uriInfo = uriInfo;
this.request = request;
this.branchUuid = branchUuid;
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributeResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributeResource.java
index 3eac7ae73c..b0bd080e11 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributeResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributeResource.java
@@ -36,11 +36,11 @@ public class AttributeResource {
@Context
private final Request request;
- private final String branchUuid;
+ private final Long branchUuid;
private final String artifactUuid;
private final int attrId;
- public AttributeResource(UriInfo uriInfo, Request request, String branchUuid, String artifactUuid, int attrId) {
+ public AttributeResource(UriInfo uriInfo, Request request, Long branchUuid, String artifactUuid, int attrId) {
this.uriInfo = uriInfo;
this.request = request;
this.branchUuid = branchUuid;
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributesResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributesResource.java
index 555b7fc9e6..f83439e1bc 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributesResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributesResource.java
@@ -37,10 +37,10 @@ public class AttributesResource {
@Context
private final Request request;
- private final String branchUuid;
+ private final Long branchUuid;
private final String artifactUuid;
- public AttributesResource(UriInfo uriInfo, Request request, String branchUuid, String artifactUuid) {
+ public AttributesResource(UriInfo uriInfo, Request request, Long branchUuid, String artifactUuid) {
this.uriInfo = uriInfo;
this.request = request;
this.branchUuid = branchUuid;
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchResource.java
index 2d51fd4be3..59c36f818c 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchResource.java
@@ -32,9 +32,9 @@ public class BranchResource {
@Context
Request request;
- String branchUuid;
+ Long branchUuid;
- public BranchResource(UriInfo uriInfo, Request request, String branchUuid) {
+ public BranchResource(UriInfo uriInfo, Request request, Long branchUuid) {
this.uriInfo = uriInfo;
this.request = request;
this.branchUuid = branchUuid;
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchesResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchesResource.java
index 5696dd5055..11c4e96868 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchesResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchesResource.java
@@ -38,7 +38,7 @@ public class BranchesResource {
Request request;
@Path("{uuid}")
- public BranchResource getBranch(@PathParam("uuid") String id) {
+ public BranchResource getBranch(@PathParam("uuid") Long id) {
return new BranchResource(uriInfo, request, id);
}
@@ -46,8 +46,7 @@ public class BranchesResource {
@Produces(MediaType.TEXT_HTML)
public String getAsHtml() throws OseeCoreException {
BranchQuery query = OrcsApplication.getOrcsApi().getQueryFactory(null).branchQuery();
- ResultSet<BranchReadable> results =
- query.andIsOfType(BranchType.BASELINE, BranchType.WORKING).getResults();
+ ResultSet<BranchReadable> results = query.andIsOfType(BranchType.BASELINE, BranchType.WORKING).getResults();
HtmlWriter writer = new HtmlWriter(uriInfo);
return writer.toHtml(results);
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TxResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TxResource.java
index 17b6d8c9be..ba33505db5 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TxResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TxResource.java
@@ -33,10 +33,10 @@ public class TxResource {
@Context
Request request;
- String branchUuid;
+ Long branchUuid;
int txId;
- public TxResource(UriInfo uriInfo2, Request request2, String branchUuid, int txId) {
+ public TxResource(UriInfo uriInfo2, Request request2, Long branchUuid, int txId) {
this.uriInfo = uriInfo;
this.request = request;
this.branchUuid = branchUuid;
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TxsResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TxsResource.java
index 33c2814470..554dcda005 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TxsResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TxsResource.java
@@ -37,9 +37,9 @@ public class TxsResource {
@Context
Request request;
- String branchUuid;
+ Long branchUuid;
- public TxsResource(UriInfo uriInfo, Request request, String branchUuid) {
+ public TxsResource(UriInfo uriInfo, Request request, Long branchUuid) {
this.uriInfo = uriInfo;
this.request = request;
this.branchUuid = branchUuid;
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/VersionResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/VersionResource.java
index e08717964d..2c486d2288 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/VersionResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/VersionResource.java
@@ -27,11 +27,11 @@ public class VersionResource {
@Context
Request request;
- String branchUuid;
+ Long branchUuid;
String artifactUuid;
int transactionId;
- public VersionResource(UriInfo uriInfo, Request request, String branchUuid, String artifactUuid, int transactionId) {
+ public VersionResource(UriInfo uriInfo, Request request, Long branchUuid, String artifactUuid, int transactionId) {
this.uriInfo = uriInfo;
this.request = request;
this.branchUuid = branchUuid;
@@ -42,6 +42,6 @@ public class VersionResource {
@GET
@Produces(MediaType.TEXT_PLAIN)
public String getAsText() {
- return String.format("BranchUuid [%s] ArtifactUuid [%s] Version [%s]", branchUuid, artifactUuid, transactionId);
+ return String.format("BranchUuid [%s] ArtifactUuid [%d] Version [%s]", branchUuid, artifactUuid, transactionId);
}
}
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/VersionsResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/VersionsResource.java
index 40dfbc2ba5..f0be229374 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/VersionsResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/VersionsResource.java
@@ -32,10 +32,10 @@ public class VersionsResource {
@Context
Request request;
- String branchUuid;
+ Long branchUuid;
String artifactUuid;
- public VersionsResource(UriInfo uriInfo, Request request, String branchUuid, String artifactUuid) {
+ public VersionsResource(UriInfo uriInfo, Request request, Long branchUuid, String artifactUuid) {
this.uriInfo = uriInfo;
this.request = request;
this.branchUuid = branchUuid;
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/ArtifactSearch.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/ArtifactSearch.java
index bc84bcee67..824207229c 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/ArtifactSearch.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/ArtifactSearch.java
@@ -21,9 +21,9 @@ public abstract class ArtifactSearch {
private final UriInfo uriInfo;
private final Request request;
- private final String branchUuid;
+ private final Long branchUuid;
- public ArtifactSearch(UriInfo uriInfo, Request request, String branchUuid) {
+ public ArtifactSearch(UriInfo uriInfo, Request request, Long branchUuid) {
this.uriInfo = uriInfo;
this.request = request;
this.branchUuid = branchUuid;
@@ -37,7 +37,7 @@ public abstract class ArtifactSearch {
return request;
}
- public String getBranchUuid() {
+ public Long getBranchUuid() {
return branchUuid;
}
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/ArtifactSearch_V1.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/ArtifactSearch_V1.java
index bf71aa63ef..1a0d4cce8f 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/ArtifactSearch_V1.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/ArtifactSearch_V1.java
@@ -46,7 +46,7 @@ public class ArtifactSearch_V1 extends ArtifactSearch {
private final SearchQueryBuilder searchQueryBuilder;
- public ArtifactSearch_V1(UriInfo uriInfo, Request request, String branchUuid) {
+ public ArtifactSearch_V1(UriInfo uriInfo, Request request, Long branchUuid) {
super(uriInfo, request, branchUuid);
searchQueryBuilder = DslFactory.createQueryBuilder();
}
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java
index f637d32dc1..74e5955628 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java
@@ -84,12 +84,12 @@ public class OrcsBranchQueryTest {
BranchReadable branch4 = iterator.next();
BranchReadable branch5 = iterator.next();
- // actual, IOseeBranch, localId, type, state, isArchived, parentId, baseTx, sourceTx, assocArtId
- assertBranch(branch1, SYS_ROOT, 1L, SYSTEM_ROOT, MODIFIED, false, -1, 1, 1, -1);
- assertBranch(branch2, SAW_Bld_1, 3L, BASELINE, MODIFIED, false, 1, 15, 3, -1);
- assertBranch(branch3, CIS_Bld_1, 4L, BASELINE, MODIFIED, false, 1, 17, 3, -1);
- assertBranch(branch4, SAW_Bld_2, 5L, BASELINE, CREATED, false, 3, 23, 22, 9);
- assertBranch(branch5, COMMON, 570L, BASELINE, MODIFIED, false, 1, 4, 3, -1);
+ // actual, IOseeBranch, BranchType, BranchState, isArchived, parentId, baseTx, sourceTx, assocArtId
+ assertBranch(branch1, SYS_ROOT, SYSTEM_ROOT, MODIFIED, false, -1, 1, 1, -1);
+ assertBranch(branch2, SAW_Bld_1, BASELINE, MODIFIED, false, 1, 15, 3, -1);
+ assertBranch(branch3, CIS_Bld_1, BASELINE, MODIFIED, false, 1, 17, 3, -1);
+ assertBranch(branch4, SAW_Bld_2, BASELINE, CREATED, false, 3, 23, 22, 9);
+ assertBranch(branch5, COMMON, BASELINE, MODIFIED, false, 1, 4, 3, -1);
}
@Test
@@ -122,24 +122,6 @@ public class OrcsBranchQueryTest {
@Test
public void testGetByUuid() throws OseeCoreException {
BranchQuery query = factory.branchQuery();
- query.andUuids(COMMON.getGuid(), SAW_Bld_2.getGuid());
-
- ResultSet<BranchReadable> results = query.getResults();
- assertEquals(2, results.size());
- assertEquals(2, query.getCount());
-
- Iterator<BranchReadable> iterator = results.iterator();
- BranchReadable branch1 = iterator.next();
- BranchReadable branch2 = iterator.next();
-
- assertEquals(SAW_Bld_2, branch1);
- assertEquals(COMMON, branch2);
-
- }
-
- @Test
- public void testGetByLocalId() throws OseeCoreException {
- BranchQuery query = factory.branchQuery();
query.andLocalId(5, 3);
ResultSet<BranchReadable> results = query.getResults();
@@ -320,16 +302,15 @@ public class OrcsBranchQueryTest {
return orcsApi.getBranchOps(null);
}
- private static void assertBranch(BranchReadable actual, IOseeBranch token, Long localId, BranchType type, BranchState state, boolean isArchived, int parent, int baseTx, int sourceTx, int assocArtId) {
+ private static void assertBranch(BranchReadable actual, IOseeBranch token, BranchType type, BranchState state, boolean isArchived, int parent, int baseTx, int sourceTx, int assocArtId) {
assertEquals(token, actual);
- assertBranch(actual, token.getName(), token.getGuid(), localId, type, state, isArchived, parent, baseTx,
- sourceTx, assocArtId);
+ assertBranch(actual, token.getName(), token.getGuid(), type, state, isArchived, parent, baseTx, sourceTx,
+ assocArtId);
}
- private static void assertBranch(BranchReadable actual, String name, String guid, Long localId, BranchType type, BranchState state, boolean isArchived, int parent, int baseTx, int sourceTx, int assocArtId) {
- assertEquals(guid, actual.getGuid());
+ private static void assertBranch(BranchReadable actual, String name, Long localId, BranchType type, BranchState state, boolean isArchived, int parent, int baseTx, int sourceTx, int assocArtId) {
assertEquals(name, actual.getName());
- assertEquals(localId, actual.getLocalId());
+ assertEquals(localId.longValue(), actual.getUuid());
assertEquals(type, actual.getBranchType());
assertEquals(state, actual.getBranchState());
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java
index c200ade083..221e95ef4c 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java
@@ -42,7 +42,6 @@ import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.ResultSet;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.orcs.ApplicationContext;
import org.eclipse.osee.orcs.OrcsApi;
@@ -219,7 +218,7 @@ public class OrcsTransactionTest {
assertEquals(SystemUser.Guest.getName(), guestUserDup.getName());
// duplicate on different branch
- IOseeBranch branchToken = TokenFactory.createBranch( "DuplicateArtifact tests");
+ IOseeBranch branchToken = TokenFactory.createBranch("DuplicateArtifact tests");
Callable<BranchReadable> callableBranch = orcsBranch.createTopLevelBranch(branchToken, userArtifact);
BranchReadable topLevelBranch = callableBranch.call();
@@ -239,7 +238,7 @@ public class OrcsTransactionTest {
ArtifactReadable guestUser =
query.fromBranch(CoreBranches.COMMON).andIds(SystemUser.Guest).getResults().getExactlyOne();
- IOseeBranch branchToken = TokenFactory.createBranch( "IntroduceArtifact tests");
+ IOseeBranch branchToken = TokenFactory.createBranch("IntroduceArtifact tests");
BranchReadable topLevelBranch = orcsBranch.createTopLevelBranch(branchToken, userArtifact).call();
TransactionBuilder transaction =
@@ -991,7 +990,7 @@ public class OrcsTransactionTest {
private void checkTransaction(TransactionReadable previousTx, TransactionReadable newTx, org.eclipse.osee.orcs.data.BranchReadable branch, String comment, ArtifactReadable user) throws OseeCoreException {
assertTrue(previousTx.getLocalId() < newTx.getLocalId());
assertEquals(comment, newTx.getComment());
- assertEquals(branch.getLocalId().longValue(), newTx.getBranchId());
+ assertEquals(branch.getUuid(), newTx.getBranchId());
assertEquals(TransactionDetailsType.NonBaselined, newTx.getTxType());
assertEquals(user.getLocalId().intValue(), newTx.getAuthorId());
assertEquals(0, newTx.getCommit());
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/TestBranches.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/TestBranches.java
index 2550ec4da2..1d9ea840a7 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/TestBranches.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/TestBranches.java
@@ -22,8 +22,8 @@ public final class TestBranches {
// Constants class
}
- public static final IOseeBranch SAW_Bld_1 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvAAA", 3, "SAW_Bld_1");
- public static final IOseeBranch SAW_Bld_2 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvBBB", 5, "SAW_Bld_2");
+ public static final IOseeBranch SAW_Bld_1 = TokenFactory.createBranch(3, "SAW_Bld_1");
+ public static final IOseeBranch SAW_Bld_2 = TokenFactory.createBranch(5, "SAW_Bld_2");
- public static final IOseeBranch CIS_Bld_1 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvDDD", 4, "CIS_Bld_1");
+ public static final IOseeBranch CIS_Bld_1 = TokenFactory.createBranch(4, "CIS_Bld_1");
}
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/CreateBranchData.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/CreateBranchData.java
index f98e5b3b04..9bc7eda984 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/CreateBranchData.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/CreateBranchData.java
@@ -20,13 +20,12 @@ import org.eclipse.osee.framework.jdk.core.util.Lib;
/**
* @author Roberto E. Escobar
*/
-public class CreateBranchData implements Identifiable<String> {
+public class CreateBranchData implements Identifiable<Long> {
private static final int NULL_ARTIFACT_ID = -1;
private final long MERGE_DESTINATION_BRANCH_ID = -1; // only used on merge branches
private final int MERGE_ADDRESSING_QUERY_ID = -1; // only used on merge branches
- private String branchGuid;
private String branchName;
private long branchUuid;
private BranchType branchType;
@@ -50,8 +49,8 @@ public class CreateBranchData implements Identifiable<String> {
}
@Override
- public String getGuid() {
- return branchGuid;
+ public Long getGuid() {
+ return branchUuid;
}
public int getAssociatedArtifactId() {
@@ -70,10 +69,6 @@ public class CreateBranchData implements Identifiable<String> {
return result;
}
- public void setGuid(String branchUuid) {
- this.branchGuid = branchUuid;
- }
-
@Override
public String getName() {
return branchName;
@@ -172,7 +167,7 @@ public class CreateBranchData implements Identifiable<String> {
@Override
public String toString() {
- return "CreateBranchData [branchUuid=" + branchGuid + ", branchName=" + branchName + ", branchType=" + branchType + ", creationComment=" + creationComment + ", fromTransaction=" + fromTransaction + ", associatedArtifact=" + associatedArtifact + ", userArtifact=" + userArtifact + ", mergeAddressingQueryId=" + mergeAddressingQueryId + ", destinationBranchId=" + mergeDestinationBranchId + "]";
+ return "CreateBranchData [branchUuid=" + branchUuid + ", branchName=" + branchName + ", branchType=" + branchType + ", creationComment=" + creationComment + ", fromTransaction=" + fromTransaction + ", associatedArtifact=" + associatedArtifact + ", userArtifact=" + userArtifact + ", mergeAddressingQueryId=" + mergeAddressingQueryId + ", destinationBranchId=" + mergeDestinationBranchId + "]";
}
public long getUuid() {
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/BranchQuery.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/BranchQuery.java
index 33d58051f7..28cc468cc4 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/BranchQuery.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/BranchQuery.java
@@ -45,9 +45,9 @@ public interface BranchQuery {
BranchQuery andLocalIds(Collection<Integer> ids) throws OseeCoreException;
- BranchQuery andUuids(String... ids) throws OseeCoreException;
+ BranchQuery andUuids(Long... ids) throws OseeCoreException;
- BranchQuery andUuids(Collection<String> ids) throws OseeCoreException;
+ BranchQuery andUuids(Collection<Long> ids) throws OseeCoreException;
BranchQuery andIds(Collection<? extends IOseeBranch> ids) throws OseeCoreException;
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 fa0869123a..9dc594f521 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(int branchId) throws OseeCoreException;
+ TransactionQuery andIsHead(long branchId) throws OseeCoreException;
TransactionQuery andIsHead(IOseeBranch branch) throws OseeCoreException;
diff --git a/plugins/org.eclipse.osee.template.engine/src/org/eclipse/osee/template/engine/IdentifiableLongOptionsRule.java b/plugins/org.eclipse.osee.template.engine/src/org/eclipse/osee/template/engine/IdentifiableLongOptionsRule.java
new file mode 100644
index 0000000000..b48da4444a
--- /dev/null
+++ b/plugins/org.eclipse.osee.template.engine/src/org/eclipse/osee/template/engine/IdentifiableLongOptionsRule.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.template.engine;
+
+import org.eclipse.osee.framework.jdk.core.type.Identity;
+import org.eclipse.osee.framework.jdk.core.type.Named;
+
+/**
+ * @author Donald G. Dunne
+ */
+public final class IdentifiableLongOptionsRule<T extends Identity<Long> & Named> extends OptionsRule<T> {
+ Iterable<T> options;
+
+ public IdentifiableLongOptionsRule(String ruleName, Iterable<T> options) {
+ this(ruleName, options, null);
+ }
+
+ public IdentifiableLongOptionsRule(String ruleName, Iterable<T> options, String listId) {
+ super(ruleName, listId);
+ this.options = options;
+ }
+
+ @Override
+ public Iterable<T> getOptions() {
+ return options;
+ }
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.template.engine/src/org/eclipse/osee/template/engine/OptionsRule.java b/plugins/org.eclipse.osee.template.engine/src/org/eclipse/osee/template/engine/OptionsRule.java
index 0cc540a058..0d24e1166b 100644
--- a/plugins/org.eclipse.osee.template.engine/src/org/eclipse/osee/template/engine/OptionsRule.java
+++ b/plugins/org.eclipse.osee.template.engine/src/org/eclipse/osee/template/engine/OptionsRule.java
@@ -17,7 +17,7 @@ import org.eclipse.osee.framework.jdk.core.type.Named;
/**
* @author Ryan D. Brooks
*/
-public abstract class OptionsRule<T extends Identity<String> & Named> extends AppendableRule<T> {
+public abstract class OptionsRule<T extends Identity<?> & Named> extends AppendableRule<T> {
private final String listId;
protected String getListId() {
@@ -62,7 +62,7 @@ public abstract class OptionsRule<T extends Identity<String> & Named> extends Ap
appendable.append("<option value=\"");
appendable.append(option.getName());
appendable.append("\" guid=\"");
- appendable.append(option.getGuid());
+ appendable.append(String.valueOf(option.getGuid()));
appendable.append("\">\n");
}
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java
index 900693a1db..c44a506361 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java
+++ b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java
@@ -46,8 +46,8 @@ public class OseeClientQueryTest {
private static final IOseeBranch SAW_1 = new IOseeBranch() {
@Override
- public String getGuid() {
- return "AyH_f2sSKy3l07fIvAAA";
+ public Long getGuid() {
+ return 3L;
}
@Override
diff --git a/plugins/org.eclipse.osee.x.server.p2/demo/binary_data.zip b/plugins/org.eclipse.osee.x.server.p2/demo/binary_data.zip
index 8484790c5e..2c2ae545ee 100644
--- a/plugins/org.eclipse.osee.x.server.p2/demo/binary_data.zip
+++ b/plugins/org.eclipse.osee.x.server.p2/demo/binary_data.zip
Binary files differ

Back to the top