Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2011-08-30 14:05:17 -0400
committerRyan D. Brooks2011-08-30 14:05:17 -0400
commitb3a73c6915c8e1f820bd6ef567e374041eff996e (patch)
tree3eb52a27e06d409e385751da51d8b1228f9e8acb
parent16a75dbee850b5b98d29aa6bfaeb8c590659b4a8 (diff)
downloadorg.eclipse.osee-b3a73c6915c8e1f820bd6ef567e374041eff996e.tar.gz
org.eclipse.osee-b3a73c6915c8e1f820bd6ef567e374041eff996e.tar.xz
org.eclipse.osee-b3a73c6915c8e1f820bd6ef567e374041eff996e.zip
feature[ats_M1Y56]: Type types use Long for guid
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/type/AtsArtifactTypes.java26
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/type/AtsAttributeTypes.java162
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/type/AtsRelationTypes.java52
-rw-r--r--plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/render/RendererManagerTest.java3
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsBranchAccessManager.java2
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItem.java7
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemGroup.java3
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java3
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageItem.java3
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackage.java3
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageUnit.java3
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageArtifactTypes.java6
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageAttributeTypes.java20
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageRelationTypes.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.datastore/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.core.datastore/OSGI-INF/core.osee.schema.resource.xml2
-rw-r--r--plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/DatastoreInitOperation.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseArtifactTypeAccessor.java275
-rw-r--r--plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseAttributeTypeAccessor.java199
-rw-r--r--plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseOseeEnumTypeAccessor.java197
-rw-r--r--plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseRelationTypeAccessor.java146
-rw-r--r--plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/ArtifactTypeDataAccessor.java153
-rw-r--r--plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/ModelingServiceProvider.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/OseeCachingServiceRegistrationHandler.java38
-rw-r--r--plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/ServerOseeCachingServiceFactory.java42
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java10
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactTypeRestrictionHandlerTest.java11
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AttributeTypeRestrictionHandlerTest.java19
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java21
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeUtilTest.java12
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ArtifactTypeCacheUpdateResponse.java22
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/OseeEnumTypeCacheUpdateResponse.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/RelationTypeCacheUpdateResponse.java10
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/TranslationUtil.java31
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ArtifactTypeCacheUpdateResponseTranslator.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/AttributeTypeCacheUpdateResponseTranslator.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/SearchRequestTranslator.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataQueryTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeTypeCacheTest.java11
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/ArtifactTypeCacheTest.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AttributeTypeCacheTest.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/OseeEnumTypeCacheTest.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/RelationTypeCacheTest.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockAbstractOseeType.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java24
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/ModelAsserts.java20
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/AbstractOseeTypeTest.java10
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/ArtifactTypeTest.java10
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/BaseOseeTypeTest.java7
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/OseeEnumTypeTest.java7
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/RelationTypeSide.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCache.java12
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/ArtifactTypeCache.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AttributeTypeCache.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/OseeEnumTypeCache.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/RelationTypeCache.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidArtifact.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidRelation.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidRelationReorder.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/IBasicGuidArtifact.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/IBasicGuidRelation.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/IBasicRelationReorder.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/ArtifactType.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/ArtifactTypeFactory.java9
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/AttributeType.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/AttributeTypeFactory.java9
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/OseeEnumType.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/OseeEnumTypeFactory.java13
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationType.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationTypeFactory.java11
-rw-r--r--plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/UserDataStore.java24
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IArtifactType.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IAttributeType.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationType.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java28
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java96
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreAttributeTypes.java168
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreRelationTypes.java70
-rw-r--r--plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/AddCommonBranch.java35
-rw-r--r--plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/DbBootstrapTask.java3
-rw-r--r--plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/OseeTypesSetup.java16
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/IOseeDatabaseService.java3
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/RemoteIdManager.java21
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeDatabaseServiceImpl.java8
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/RemoteIdManagerImpl.java117
-rw-r--r--plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/PurgeRelationType.java10
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/UserManagerTest.java7
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DuplicateHridTest.java3
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifactTest.java13
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidRelationTest.java13
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventChangeTypeBasicGuidArtifactTest.java5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/DataFactory.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationCacheTest.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java10
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java10
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/BootStrapUser.java3
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTypeManager.java7
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumTypeManager.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/AttributeChange.java10
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifact.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidRelation.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventChangeTypeBasicGuidArtifact.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventModifiedBasicGuidArtifact.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientArtifactTypeAccessor.java12
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientAttributeTypeAccessor.java10
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientOseeEnumTypeAccessor.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientRelationTypeAccessor.java10
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeManager.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/CrossBranchLink.java8
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java16
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java7
-rw-r--r--plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteAttributeTypes.java56
-rw-r--r--plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteRelationTypes.java4
-rw-r--r--plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoArtifactTypes.java6
120 files changed, 1120 insertions, 1507 deletions
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/type/AtsArtifactTypes.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/type/AtsArtifactTypes.java
index de0fff009b..b0f8a739d6 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/type/AtsArtifactTypes.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/type/AtsArtifactTypes.java
@@ -16,19 +16,19 @@ import org.eclipse.osee.framework.core.data.TokenFactory;
public final class AtsArtifactTypes {
// @formatter:off
- public static final IArtifactType Action = TokenFactory.createArtifactType("AAMFDhY_rns71KvX14QA", "Action");
- public static final IArtifactType ActionableItem = TokenFactory.createArtifactType("AAMFDhW2LmhtRFsVyzwA", "Actionable Item");
- public static final IArtifactType DecisionReview = TokenFactory.createArtifactType("AAMFDhfrdR7BGTL7H_wA", "Decision Review");
- public static final IArtifactType PeerToPeerReview = TokenFactory.createArtifactType("AAMFDhh_300dpgmNtRAA", "PeerToPeer Review");
- public static final IArtifactType Task = TokenFactory.createArtifactType("AAMFDhbTAAB6h+06fuAA", "Task");
- public static final IArtifactType AbstractWorkflowArtifact = TokenFactory.createArtifactType("ABMfXC+LFBn31ZZbvjAA", "Abstract State Machine Artifact");
- public static final IArtifactType ReviewArtifact = TokenFactory.createArtifactType("ABMa6P4TwzXA1b8K3RAA", "Abstract Review Artifact");
- public static final IArtifactType TeamDefinition = TokenFactory.createArtifactType("AAMFDhUrlytusKbaQGAA", "Team Definition");
- public static final IArtifactType TeamWorkflow = TokenFactory.createArtifactType("AAMFDhSiF2OD+wiUqugA", "Team Workflow");
- public static final IArtifactType Version = TokenFactory.createArtifactType("AAMFDhder0oETnv14xQA", "Version");
- public static final IArtifactType Goal = TokenFactory.createArtifactType("ABMgU119UjI_Q23Yu+gA", "Goal");
- public static final IArtifactType AtsArtifact = TokenFactory.createArtifactType("ABMaLS0jvw92SE+4ZJQA", "ats.Ats Artifact");
- public static final IArtifactType WorkDefinition = TokenFactory.createArtifactType("AGrU8fWa3AJ6uoWYP7wA", "Work Definition");
+ public static final IArtifactType Action = TokenFactory.createArtifactType(0x0000000000000043L, "Action");
+ public static final IArtifactType ActionableItem = TokenFactory.createArtifactType(0x0000000000000045L, "Actionable Item");
+ public static final IArtifactType DecisionReview = TokenFactory.createArtifactType(0x0000000000000042L, "Decision Review");
+ public static final IArtifactType PeerToPeerReview = TokenFactory.createArtifactType(0x0000000000000041L, "PeerToPeer Review");
+ public static final IArtifactType Task = TokenFactory.createArtifactType(0x000000000000004AL, "Task");
+ public static final IArtifactType AbstractWorkflowArtifact = TokenFactory.createArtifactType(0x0000000000000047L, "Abstract State Machine Artifact");
+ public static final IArtifactType ReviewArtifact = TokenFactory.createArtifactType(0x0000000000000040L, "Abstract Review Artifact");
+ public static final IArtifactType TeamDefinition = TokenFactory.createArtifactType(0x0000000000000044L, "Team Definition");
+ public static final IArtifactType TeamWorkflow = TokenFactory.createArtifactType(0x0000000000000049L, "Team Workflow");
+ public static final IArtifactType Version = TokenFactory.createArtifactType(0x0000000000000046L, "Version");
+ public static final IArtifactType Goal = TokenFactory.createArtifactType(0x0000000000000048L, "Goal");
+ public static final IArtifactType AtsArtifact = TokenFactory.createArtifactType(0x000000000000003FL, "ats.Ats Artifact");
+ public static final IArtifactType WorkDefinition = TokenFactory.createArtifactType(0x000000000000003EL, "Work Definition");
// @formatter:on
private AtsArtifactTypes() {
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/type/AtsAttributeTypes.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/type/AtsAttributeTypes.java
index 181816a1d5..cbcc2e99d0 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/type/AtsAttributeTypes.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/type/AtsAttributeTypes.java
@@ -24,107 +24,107 @@ public final class AtsAttributeTypes {
public static final Map<String, IAttributeType> nameToTypeMap = new HashMap<String, IAttributeType>();
// @formatter:off
- public static final IAttributeType Actionable = createType("AAMFEcvDtBiaJ3TMatAA", "Actionable", "True if item can have Action written against or assigned to.");
- public static final IAttributeType ActionableItem = createType("AAMFEdbcR2zpGzFOLOQA", "Actionable Item", "Actionable Items that are impacted by this change.");
- public static final IAttributeType ActionDetailsFormat = createType("Aij_PfM7wCsEA2Z720wA", "Action Details Format", "Format of string when push Action Details Copy button on SMA Workflow Editor.");
- public static final IAttributeType Active = createType("AAMFEclQOVmzkIvzyWwA", "Active", "Active ATS configuration object.");
- public static final IAttributeType AllowCommitBranch = createType("AAMFEbCZCkwgj73BsQgA", "Allow Commit Branch");
- public static final IAttributeType AllowCreateBranch = createType("AAMFEbARuQEvi6rtY5gA", "Allow Create Branch");
- public static final IAttributeType BaselineBranchGuid = createType("AAMFEdIjJ2za2fblEVgA", "Baseline Branch Guid", "Basline branch associated with ATS object.");
+ public static final IAttributeType Actionable = createType(0x10000000000000B8L, "Actionable", "True if item can have Action written against or assigned to.");
+ public static final IAttributeType ActionableItem = createType(0x10000000000000E0L, "Actionable Item", "Actionable Items that are impacted by this change.");
+ public static final IAttributeType ActionDetailsFormat = createType(0x10000000000000DFL, "Action Details Format", "Format of string when push Action Details Copy button on SMA Workflow Editor.");
+ public static final IAttributeType Active = createType(0x10000000000000B1L, "Active", "Active ATS configuration object.");
+ public static final IAttributeType AllowCommitBranch = createType(0x10000000000000BAL, "Allow Commit Branch");
+ public static final IAttributeType AllowCreateBranch = createType(0x10000000000000B9L, "Allow Create Branch");
+ public static final IAttributeType BaselineBranchGuid = createType(0x10000000000000A9L, "Baseline Branch Guid", "Basline branch associated with ATS object.");
- public static final IAttributeType Category1 = createType("AAMFEdrYniOQYrYUKKQA", "Category", "Open field for user to be able to enter text to use for categorizing/sorting.");
- public static final IAttributeType Category2 = createType("AAMFEdthBkolbJKLXuAA", "Category2", Category1.getDescription());
- public static final IAttributeType Category3 = createType("AAMFEd06oxr8LMzZxdgA", "Category3", Category1.getDescription());
+ public static final IAttributeType Category1 = createType(0x10000000000000ECL, "Category", "Open field for user to be able to enter text to use for categorizing/sorting.");
+ public static final IAttributeType Category2 = createType(0x10000000000000F1L, "Category2", Category1.getDescription());
+ public static final IAttributeType Category3 = createType(0x10000000000000F2L, "Category3", Category1.getDescription());
- public static final IAttributeType ChangeType = createType("AAMFEc+MwGHnPCv7HlgA", "Change Type", "Type of change.");
+ public static final IAttributeType ChangeType = createType(0x10000000000000CCL, "Change Type", "Type of change.");
- public static final IAttributeType CancelledDate = createType("AXnyKG1waCcPPHHGEFQA", "Cancelled Date", "Date the workflow was cancelled.");
- public static final IAttributeType CancelledBy = createType("AXpNsieBHnqaJJfduGgA", "Cancelled By", "UserId of the user who cancelled workflow.");
- public static final IAttributeType CancelledReason = createType("AXqJE0SmwRQzvzlqC9gA", "Cancelled Reason", "Explanation of why worklfow was cancelled.");
- public static final IAttributeType CancelledFromState = createType("AXrxlXOwGiAnlaUNX6AA", "Cancelled From State", "State workflow was in when cancelled.");
+ public static final IAttributeType CancelledDate = createType(0x10000000000000C1L, "Cancelled Date", "Date the workflow was cancelled.");
+ public static final IAttributeType CancelledBy = createType(0x10000000000000C2L, "Cancelled By", "UserId of the user who cancelled workflow.");
+ public static final IAttributeType CancelledReason = createType(0x10000000000000C3L, "Cancelled Reason", "Explanation of why worklfow was cancelled.");
+ public static final IAttributeType CancelledFromState = createType(0x10000000000000C4L, "Cancelled From State", "State workflow was in when cancelled.");
- public static final IAttributeType CreatedDate = createType("AXny90bBpmfNkLpNhqwA", "Created Date", "Date the workflow was created.");
- public static final IAttributeType CreatedBy = createType("AXpTVIExV1p0kp9IKKQA", "Created By", "UserId of the user who created the workflow.");
+ public static final IAttributeType CreatedDate = createType(0x10000000000000C5L, "Created Date", "Date the workflow was created.");
+ public static final IAttributeType CreatedBy = createType(0x10000000000000C6L, "Created By", "UserId of the user who created the workflow.");
- public static final IAttributeType CompletedDate = createType("AXnxSfRg6UhirNzaZnQA", "Completed Date", "Date the workflow was completed.");
- public static final IAttributeType CompletedBy = createType("AXo6tqxrOStgd9P16XQA", "Completed By", "UserId of the user who completed workflow.");
- public static final IAttributeType CompletedFromState = createType("AXr9OO909xRiI3MFNOwA", "Completed From State", "State workflow was in when completed.");
+ public static final IAttributeType CompletedDate = createType(0x10000000000000BEL, "Completed Date", "Date the workflow was completed.");
+ public static final IAttributeType CompletedBy = createType(0x10000000000000BFL, "Completed By", "UserId of the user who completed workflow.");
+ public static final IAttributeType CompletedFromState = createType(0x10000000000000C0L, "Completed From State", "State workflow was in when completed.");
- public static final IAttributeType CurrentState = createType("AAMFEdOWL3u6hmX2VbwA", "Current State", "Current state of workflow state machine.");
- public static final IAttributeType CurrentStateType = createType("ATOWheEyGUJmPmPuqyAA", "Current State Type", "Type of Current State: InWork, Completed or Cancelled.");
- public static final IAttributeType Decision = createType("AAMFEd7uDXcmqq_FrCQA", "Decision", "Option selected during decision review.");
+ public static final IAttributeType CurrentState = createType(0x10000000000000D8L, "Current State", "Current state of workflow state machine.");
+ public static final IAttributeType CurrentStateType = createType(0x10000000000000ABL, "Current State Type", "Type of Current State: InWork, Completed or Cancelled.");
+ public static final IAttributeType Decision = createType(0x10000000000000F5L, "Decision", "Option selected during decision review.");
- public static final IAttributeType DecisionReviewOptions = createType("AAMFEd5hRy1+SRJRqfwA", "Decision Review Options", "Options available for selection in review. Each line is a separate option. Format: <option name>;<state to transition to>;<assignee>");
- public static final IAttributeType Description = createType("AAMFEdWJ_ChxX6+YKbwA", "Description", "Detailed explanation.");
- public static final IAttributeType DslSheet = createType("AGrqojZDowPDaLh4kBAA", "DSL Sheet", "XText DSL Sheet for ATS");
- public static final IAttributeType EstimatedCompletionDate = createType("AAMFEc18k3Gh+GP7zqAA", "Estimated Completion Date", "Date the changes will be completed.");
- public static final IAttributeType EstimatedHours = createType("AAMFEdCSqBh+cPyadiwA", "Estimated Hours", "Hours estimated to implement the changes associated with this Action.\nIncludes estimated hours for workflows, tasks and reviews.");
- public static final IAttributeType EstimatedReleaseDate = createType("AAMFEcy6VB7Ble5SP1QA", "Estimated Release Date", "Date the changes will be made available to the users.");
- public static final IAttributeType FullName = createType("AAMFEdZI9XLT34cTonAA", "Full Name", "Expanded and descriptive name.");
- public static final IAttributeType GoalOrderVote = createType("Aiecsz9pP1CRoQdaYRAA", "Goal Order Vote", "Vote for order item belongs to within goal.");
- public static final IAttributeType HoursPerWorkDay = createType("AAMFEdGlqFsZp22RMdAA", "Hours Per Work Day");
- public static final IAttributeType LegacyPcrId = createType("AAMFEd3TakphMtQX1zgA", "Legacy PCR Id", "Field to register problem change report id from legacy items imported into ATS.");
- public static final IAttributeType Location = createType("AAMFEeAW4QBlesdfacwA", "Location", "Enter location of materials to review.");
- public static final IAttributeType LocChanged= createType("AQR27biJiQlOKTEKCvwA", "LOC Changed", "Total Lines of Code Changed");
- public static final IAttributeType LocReviewed = createType("AQR5ckRsrh4PpayYGAgA", "LOC Reviewed", "Total Lines of Code Reviewed");
- public static final IAttributeType Log = createType("AAMFEdgB1DX3eJSZb0wA", "Log");
+ public static final IAttributeType DecisionReviewOptions = createType(0x10000000000000F4L, "Decision Review Options", "Options available for selection in review. Each line is a separate option. Format: <option name>;<state to transition to>;<assignee>");
+ public static final IAttributeType Description = createType(0x10000000000000DCL, "Description", "Detailed explanation.");
+ public static final IAttributeType DslSheet = createType(0x10000000000000DDL, "DSL Sheet", "XText DSL Sheet for ATS");
+ public static final IAttributeType EstimatedCompletionDate = createType(0x10000000000000BDL, "Estimated Completion Date", "Date the changes will be completed.");
+ public static final IAttributeType EstimatedHours = createType(0x10000000000000CEL, "Estimated Hours", "Hours estimated to implement the changes associated with this Action.\nIncludes estimated hours for workflows, tasks and reviews.");
+ public static final IAttributeType EstimatedReleaseDate = createType(0x10000000000000BCL, "Estimated Release Date", "Date the changes will be made available to the users.");
+ public static final IAttributeType FullName = createType(0x10000000000000DEL, "Full Name", "Expanded and descriptive name.");
+ public static final IAttributeType GoalOrderVote = createType(0x10000000000000EBL, "Goal Order Vote", "Vote for order item belongs to within goal.");
+ public static final IAttributeType HoursPerWorkDay = createType(0x10000000000000D3L, "Hours Per Work Day");
+ public static final IAttributeType LegacyPcrId = createType(0x10000000000000F3L, "Legacy PCR Id", "Field to register problem change report id from legacy items imported into ATS.");
+ public static final IAttributeType Location = createType(0x10000000000000F7L, "Location", "Enter location of materials to review.");
+ public static final IAttributeType LocChanged= createType(0x10000000000000E7L, "LOC Changed", "Total Lines of Code Changed");
+ public static final IAttributeType LocReviewed = createType(0x10000000000000E8L, "LOC Reviewed", "Total Lines of Code Reviewed");
+ public static final IAttributeType Log = createType(0x10000000000000E2L, "Log");
- public static final IAttributeType MeetingLocation = createType("APom8wytSX0G3mcb3qQA", "Meeting Location", "Location meeting is held.");
- public static final IAttributeType MeetingAttendee = createType("APrZQQaOlFcX1CxbO6QA", "Meeting Attendee", "Attendee of meeting.");
- public static final IAttributeType MeetingLength = createType("APoxOFjXzV49ZmO3CfwA", "Meeting Length", "Length of meeting.");
+ public static final IAttributeType MeetingLocation = createType(0x10000000000000F8L, "Meeting Location", "Location meeting is held.");
+ public static final IAttributeType MeetingAttendee = createType(0x10000000000000F9L, "Meeting Attendee", "Attendee of meeting.");
+ public static final IAttributeType MeetingLength = createType(0x10000000000000D4L, "Meeting Length", "Length of meeting.");
- public static final IAttributeType NeedBy = createType("AAMFEcxAGzHAKfDNAIwA", "Need By", "Hard schedule date that workflow must be completed.");
- public static final IAttributeType NextVersion = createType("AAMFEcpH8Xb72hsF5AwA", "Next Version", "True if version artifact is \"Next\" version to be released.");
- public static final IAttributeType Numeric1 = createType("AABY2xxQsDm811kCViwA", "Numeric1", "Open field for user to be able to enter numbers for sorting.");
- public static final IAttributeType Numeric2 = createType("AABiRtvZsAEkU4BS9qwA", "Numeric2", Numeric1.getDescription());
- public static final IAttributeType OperationalImpact = createType("ADTfjCBpFxlyV3o1wLwA", "Operational Impact");
- public static final IAttributeType OperationalImpactDescription = createType("ADTfjCDvUF5PtiKdQ3wA", "Operational Impact Description");
- public static final IAttributeType OperationalImpactWorkaround = createType("AbMqFfIwQHRbmzT_VTAA", "Operational Impact Workaround");
- public static final IAttributeType OperationalImpactWorkaroundDescription = createType("AbMo7PoIukFDhQFJxKwA", "Operational Impact Workaround Description");
- public static final IAttributeType PagesChanged= createType("AQR8yMuv4W84UwvSJAQA", "Pages Changed", "Total Pages of Changed");
- public static final IAttributeType PagesReviewed = createType("AQR9qM8TTyCMb7sf4cQA", "Pages Reviewed", "Total Pages Reviewed");
- public static final IAttributeType PercentRework = createType("AAMFEdKfjl2TII9+tuwA", "Percent Rework");
- public static final IAttributeType PercentComplete = createType("AALLbOZiBBDN39YsRSAA", "Percent Complete");
+ public static final IAttributeType NeedBy = createType(0x10000000000000BBL, "Need By", "Hard schedule date that workflow must be completed.");
+ public static final IAttributeType NextVersion = createType(0x10000000000000B5L, "Next Version", "True if version artifact is \"Next\" version to be released.");
+ public static final IAttributeType Numeric1 = createType(0x10000000000000D0L, "Numeric1", "Open field for user to be able to enter numbers for sorting.");
+ public static final IAttributeType Numeric2 = createType(0x10000000000000D1L, "Numeric2", Numeric1.getDescription());
+ public static final IAttributeType OperationalImpact = createType(0x10000000000000EDL, "Operational Impact");
+ public static final IAttributeType OperationalImpactDescription = createType(0x10000000000000EEL, "Operational Impact Description");
+ public static final IAttributeType OperationalImpactWorkaround = createType(0x10000000000000EFL, "Operational Impact Workaround");
+ public static final IAttributeType OperationalImpactWorkaroundDescription = createType(0x10000000000000F0L, "Operational Impact Workaround Description");
+ public static final IAttributeType PagesChanged= createType(0x10000000000000E9L, "Pages Changed", "Total Pages of Changed");
+ public static final IAttributeType PagesReviewed = createType(0x10000000000000EAL, "Pages Reviewed", "Total Pages Reviewed");
+ public static final IAttributeType PercentRework = createType(0x10000000000000D5L, "Percent Rework");
+ public static final IAttributeType PercentComplete = createType(0x10000000000000CFL, "Percent Complete");
- public static final IAttributeType Points = createType("AY2EeqhzcDEGtXtREkAA", "Points", "Abstract value that describes risk, complexity, and size of Actions.");
- public static final IAttributeType PriorityType = createType("AAMFEc8JzH1U6XGD59QA", "Priority", "1 = High; 5 = Low");
- public static final IAttributeType Problem = createType("AAMFEdQUxRyevvTu+bwA", "Problem", "Problem found during analysis.");
- public static final IAttributeType ProposedResolution = createType("AAMFEdSSRDGgBQ5tctAA", "Proposed Resolution", "Recommended resolution.");
- public static final IAttributeType RelatedToState = createType("AAMFEdkwHULOmHbMbGgA", "Related To State", "State of parent workflow this object is related to.");
- public static final IAttributeType Released = createType("AAMFEcnMoUZMLA2zB1AA", "Released", "True if object is in a released state.");
- public static final IAttributeType ReleaseDate = createType("AAMFEc3+cGcMDOCdmdAA", "Release Date", "Date the changes were made available to the users.");
- public static final IAttributeType Resolution = createType("AAMFEdUMfV1KdbQNaKwA", "Resolution", "Implementation details.");
- public static final IAttributeType ReviewBlocks = createType("AAMFEc6G2A8jmRWJgagA", "Review Blocks", "Review Completion will block it's parent workflow in this manner.");
- public static final IAttributeType ReviewDefect = createType("AAMFEd+MSVAb8JQ6f5gA", "Review Defect");
- public static final IAttributeType ReviewFormalType = createType("AOwrClAkonFC_UKqyJAA", "Review Formal Type");
- public static final IAttributeType Role = createType("AAMFEeCqMz0XCSBJ+IQA", "Role");
- public static final IAttributeType RuleDefinition = createType("AEqAJNnkyW4_d5_WhpgA", "Rule Definition");
- public static final IAttributeType SmaNote = createType("AAMFEdm7ywte8qayfbAA", "SMA Note", "Notes applicable to ATS object");
- public static final IAttributeType State = createType("AAMFEdMa3wzVvp60xLQA", "State", "States of workflow state machine.");
- public static final IAttributeType StateNotes = createType("AAMFEdiWPm7M_xV1EswA", "State Notes");
- public static final IAttributeType SwEnhancement = createType("AAMFEgVmxCgOdP+DuNwA", "SW Enhancement");
- public static final IAttributeType TeamDefinition = createType("AAMFEdd5bFEe18bd0lQA", "Team Definition");
- public static final IAttributeType TeamUsesVersions = createType("AAMFEcrHnzPxQ7w3ligA", "Team Uses Versions", "True if Team Workflow uses versioning/releasing option.");
+ public static final IAttributeType Points = createType(0x10000000000000CAL, "Points", "Abstract value that describes risk, complexity, and size of Actions.");
+ public static final IAttributeType PriorityType = createType(0x10000000000000CBL, "Priority", "1 = High; 5 = Low");
+ public static final IAttributeType Problem = createType(0x10000000000000D9L, "Problem", "Problem found during analysis.");
+ public static final IAttributeType ProposedResolution = createType(0x10000000000000DAL, "Proposed Resolution", "Recommended resolution.");
+ public static final IAttributeType RelatedToState = createType(0x10000000000000E4L, "Related To State", "State of parent workflow this object is related to.");
+ public static final IAttributeType Released = createType(0x10000000000000B3L, "Released", "True if object is in a released state.");
+ public static final IAttributeType ReleaseDate = createType(0x10000000000000C7L, "Release Date", "Date the changes were made available to the users.");
+ public static final IAttributeType Resolution = createType(0x10000000000000DBL, "Resolution", "Implementation details.");
+ public static final IAttributeType ReviewBlocks = createType(0x10000000000000C8L, "Review Blocks", "Review Completion will block it's parent workflow in this manner.");
+ public static final IAttributeType ReviewDefect = createType(0x10000000000000F6L, "Review Defect");
+ public static final IAttributeType ReviewFormalType = createType(0x10000000000000C9L, "Review Formal Type");
+ public static final IAttributeType Role = createType(0x10000000000000FAL, "Role");
+ public static final IAttributeType RuleDefinition = createType(0x10000000000000AEL, "Rule Definition");
+ public static final IAttributeType SmaNote = createType(0x10000000000000E5L, "SMA Note", "Notes applicable to ATS object");
+ public static final IAttributeType State = createType(0x10000000000000D7L, "State", "States of workflow state machine.");
+ public static final IAttributeType StateNotes = createType(0x10000000000000E3L, "State Notes");
+ public static final IAttributeType SwEnhancement = createType(0x10000000000000FBL, "SW Enhancement");
+ public static final IAttributeType TeamDefinition = createType(0x10000000000000E1L, "Team Definition");
+ public static final IAttributeType TeamUsesVersions = createType(0x10000000000000B6L, "Team Uses Versions", "True if Team Workflow uses versioning/releasing option.");
public static final IAttributeType Title = createType(CoreAttributeTypes.Name.getGuid(), CoreAttributeTypes.Name.getName(), "Enter clear and consise title that can be generally understood.");
- public static final IAttributeType UserCommunity = createType("AAMFEdAPtAq1IEwiCQAA", "User Community", "If working in one of these communities resulted in the creation of this Action, please select. Otherwise, select Other.");
- public static final IAttributeType ValidationRequired = createType("AAMFEcjT0TwkD2R4w1QA", "Validation Required", "If selected, originator will be asked to validate the implementation.");
- public static final IAttributeType VersionLocked = createType("AAzRtEJXbjzR5jySOZgA", "Version Locked", "True if version artifact is locked.");
- public static final IAttributeType WeeklyBenefit = createType("AAMFEdEnEU9AecOHMOwA", "Weekly Benefit", "Estimated number of hours that will be saved over a single year if this change is completed.");
- public static final IAttributeType WorkflowDefinition = createType("AbksV06OrBP_ceKCeSQA", "Workflow Definition", "Specific work flow definition id used by this Workflow artifact");
- public static final IAttributeType RelatedTaskWorkflowDefinitionOld = createType("AdR02A0xcUq4arK58BAA", "Used in 0.9.8 - Unused in 0.9.9 - Related Task Workflow Definition", "Specific work flow definition id used by Tasks related to this Workflow");
- public static final IAttributeType RelatedTaskWorkDefinition = createType("AblApNMuhjVuyDRq6VgA", "Related Task Workflow Definition", "Specific work flow definition id used by Tasks related to this Workflow");
- public static final IAttributeType WorkPackage = createType("AAMFEdpJqRp2wvA2qvAA", "Work Package", "Designated accounting work package for completing workflow.");
+ public static final IAttributeType UserCommunity = createType(0x10000000000000CDL, "User Community", "If working in one of these communities resulted in the creation of this Action, please select. Otherwise, select Other.");
+ public static final IAttributeType ValidationRequired = createType(0x10000000000000AAL, "Validation Required", "If selected, originator will be asked to validate the implementation.");
+ public static final IAttributeType VersionLocked = createType(0x10000000000000B4L, "Version Locked", "True if version artifact is locked.");
+ public static final IAttributeType WeeklyBenefit = createType(0x10000000000000D2L, "Weekly Benefit", "Estimated number of hours that will be saved over a single year if this change is completed.");
+ public static final IAttributeType WorkflowDefinition = createType(0x10000000000000ADL, "Workflow Definition", "Specific work flow definition id used by this Workflow artifact");
+ public static final IAttributeType RelatedTaskWorkflowDefinitionOld = createType(0x10000000000000AFL, "Used in 0.9.8 - Unused in 0.9.9 - Related Task Workflow Definition", "Specific work flow definition id used by Tasks related to this Workflow");
+ public static final IAttributeType RelatedTaskWorkDefinition = createType(0x10000000000000B0L, "Related Task Workflow Definition", "Specific work flow definition id used by Tasks related to this Workflow");
+ public static final IAttributeType WorkPackage = createType(0x10000000000000E6L, "Work Package", "Designated accounting work package for completing workflow.");
// @formatter:on
- private static IAttributeType createType(String guid, String name) {
+ private static IAttributeType createType(Long guid, String name) {
IAttributeType type = TokenFactory.createAttributeType(guid, "ats." + name);
nameToTypeMap.put(type.getName(), type);
return type;
}
- private static IAttributeType createType(String guid, String name, String description) {
+ private static IAttributeType createType(Long guid, String name, String description) {
IAttributeType type = TokenFactory.createAttributeType(guid, "ats." + name, description);
nameToTypeMap.put(type.getName(), type);
return type;
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/type/AtsRelationTypes.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/type/AtsRelationTypes.java
index 0eae1e8b1c..b78fe82311 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/type/AtsRelationTypes.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/type/AtsRelationTypes.java
@@ -20,57 +20,57 @@ import org.eclipse.osee.framework.core.enums.RelationSide;
public final class AtsRelationTypes {
public static final IRelationTypeSide ActionToWorkflow_Action = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_A, "AAMFE953ixQThusHUPwA", "ActionToWorkflow");
+ RelationSide.SIDE_A, 0x200000000000016DL, "ActionToWorkflow");
public static final IRelationTypeSide ActionToWorkflow_WorkFlow = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_B, "AAMFE953ixQThusHUPwA", "ActionToWorkflow");
+ RelationSide.SIDE_B, 0x200000000000016DL, "ActionToWorkflow");
public static final IRelationTypeSide FavoriteUser_Artifact = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_A, "AAMFE+NegDLK1g2ph+AA", "FavoriteUser");
+ RelationSide.SIDE_A, 0x2000000000000173L, "FavoriteUser");
public static final IRelationTypeSide FavoriteUser_User = TokenFactory.createRelationTypeSide(RelationSide.SIDE_B,
- "AAMFE+NegDLK1g2ph+AA", "FavoriteUser");
+ 0x2000000000000173L, "FavoriteUser");
public static final IRelationTypeSide Goal_Goal = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A,
- "ABMn0wPKdyN+Mfo5nwgA", "Goal");
+ 0x2000000000000175L, "Goal");
public static final IRelationTypeSide Goal_Member = TokenFactory.createRelationTypeSide(RelationSide.SIDE_B,
- "ABMn0wPKdyN+Mfo5nwgA", "Goal");
+ 0x2000000000000175L, "Goal");
public static final IRelationTypeSide ParallelVersion_Child = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_B, "AAMFE_EJHSBGb9msPXQA", "ParallelVersion");
+ RelationSide.SIDE_B, 0x2000000000000174L, "ParallelVersion");
public static final IRelationTypeSide ParallelVersion_Parent = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_A, "AAMFE_EJHSBGb9msPXQA", "ParallelVersion");
+ RelationSide.SIDE_A, 0x2000000000000174L, "ParallelVersion");
public static final IRelationTypeSide PrivilegedMember_Member = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_B, "AAMFE9XfiibyK1x2FiwA", "PrivilegedMember");
+ RelationSide.SIDE_B, 0x200000000000016BL, "PrivilegedMember");
public static final IRelationTypeSide PrivilegedMember_Team = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_A, "AAMFE9XfiibyK1x2FiwA", "PrivilegedMember");
+ RelationSide.SIDE_A, 0x200000000000016BL, "PrivilegedMember");
public static final IRelationTypeSide SmaToTask_Sma = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A,
- "AAMFE97xw1BM5l+GxKAA", "SmaToTask");
+ 0x200000000000016EL, "SmaToTask");
public static final IRelationTypeSide SmaToTask_Task = TokenFactory.createRelationTypeSide(RelationSide.SIDE_B,
- "AAMFE97xw1BM5l+GxKAA", "SmaToTask");
+ 0x200000000000016EL, "SmaToTask");
public static final IRelationTypeSide SubscribedUser_Artifact = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_A, "AAMFE+LkSAkfUWoTHdwA", "SubscribedUser");
+ RelationSide.SIDE_A, 0x2000000000000172L, "SubscribedUser");
public static final IRelationTypeSide SubscribedUser_User = TokenFactory.createRelationTypeSide(RelationSide.SIDE_B,
- "AAMFE+LkSAkfUWoTHdwA", "SubscribedUser");
+ 0x2000000000000172L, "SubscribedUser");
public static final IRelationTypeSide TeamActionableItem_ActionableItem = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_B, "AAMFE939Ul9Oenq9wWgA", "TeamActionableItem");
+ RelationSide.SIDE_B, 0x200000000000016CL, "TeamActionableItem");
public static final IRelationTypeSide TeamActionableItem_Team = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_A, "AAMFE939Ul9Oenq9wWgA", "TeamActionableItem");
+ RelationSide.SIDE_A, 0x200000000000016CL, "TeamActionableItem");
public static final IRelationTypeSide TeamDefinitionToVersion_TeamDefinition = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_A, "AAMFE9_i7zG3lR1kGWQA", "TeamDefinitionToVersion");
+ RelationSide.SIDE_A, 0x2000000000000170L, "TeamDefinitionToVersion");
public static final IRelationTypeSide TeamDefinitionToVersion_Version = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_B, "AAMFE9_i7zG3lR1kGWQA", "TeamDefinitionToVersion");
+ RelationSide.SIDE_B, 0x2000000000000170L, "TeamDefinitionToVersion");
public static final IRelationTypeSide TeamLead_Lead = TokenFactory.createRelationTypeSide(RelationSide.SIDE_B,
- "AAMFE90HyTZPyHuQWOQA", "TeamLead");
+ 0x2000000000000169L, "TeamLead");
public static final IRelationTypeSide TeamLead_Team = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A,
- "AAMFE90HyTZPyHuQWOQA", "TeamLead");
+ 0x2000000000000169L, "TeamLead");
public static final IRelationTypeSide TeamMember_Member = TokenFactory.createRelationTypeSide(RelationSide.SIDE_B,
- "AAMFE92A6gCO9WJ2ijQA", "TeamMember");
+ 0x200000000000016AL, "TeamMember");
public static final IRelationTypeSide TeamMember_Team = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A,
- "AAMFE92A6gCO9WJ2ijQA", "TeamMember");
+ 0x200000000000016AL, "TeamMember");
public static final IRelationTypeSide TeamWorkflowTargetedForVersion_Version = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_B, "AAMFE99pzm4zSibDT9gA", "TeamWorkflowTargetedForVersion");
+ RelationSide.SIDE_B, 0x200000000000016FL, "TeamWorkflowTargetedForVersion");
public static final IRelationTypeSide TeamWorkflowTargetedForVersion_Workflow = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_A, "AAMFE99pzm4zSibDT9gA", "TeamWorkflowTargetedForVersion");
+ RelationSide.SIDE_A, 0x200000000000016FL, "TeamWorkflowTargetedForVersion");
public static final IRelationTypeSide TeamWorkflowToReview_Review = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_B, "AAMFE+JqDz+8tuRDdIwA", "TeamWorkflowToReview");
+ RelationSide.SIDE_B, 0x2000000000000171L, "TeamWorkflowToReview");
public static final IRelationTypeSide TeamWorkflowToReview_Team = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_A, "AAMFE+JqDz+8tuRDdIwA", "TeamWorkflowToReview");
+ RelationSide.SIDE_A, 0x2000000000000171L, "TeamWorkflowToReview");
private AtsRelationTypes() {
// Constants
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/render/RendererManagerTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/render/RendererManagerTest.java
index 2123f22b35..4c450c8dfb 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/render/RendererManagerTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/render/RendererManagerTest.java
@@ -32,6 +32,7 @@ import org.eclipse.osee.ats.editor.AtsWorkflowRenderer;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.skynet.core.UserManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
@@ -76,7 +77,7 @@ public class RendererManagerTest {
@Test
public void testGetBestRenderer() throws OseeCoreException {
- Artifact artifact = new Artifact(null, null, null, BranchManager.getCommonBranch(), artifactType);
+ Artifact artifact = new Artifact(null, GUID.create(), null, BranchManager.getCommonBranch(), artifactType);
if (defaultOption == Both) {
testGetBestRendererWithOption(artifact, On);
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 0e6874f48d..3d4504c154 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
@@ -67,7 +67,7 @@ public class AtsBranchAccessManager implements IArtifactEventListener, IAccessCo
private final Map<String, Collection<IAccessContextId>> branchGuidToContextIdCache =
new HashMap<String, Collection<IAccessContextId>>(50);
long cacheUpdated = 0;
- private static List<String> atsConfigArtifactTypes = Arrays.asList(AtsArtifactTypes.ActionableItem.getGuid(),
+ private static List<Long> atsConfigArtifactTypes = Arrays.asList(AtsArtifactTypes.ActionableItem.getGuid(),
AtsArtifactTypes.TeamDefinition.getGuid());
public AtsBranchAccessManager() {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItem.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItem.java
index 5efde5a29b..5581691204 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItem.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItem.java
@@ -15,6 +15,7 @@ import java.util.Collections;
import org.eclipse.osee.coverage.model.ICoverage;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.util.Result;
+import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.ui.swt.KeyedImage;
@@ -27,14 +28,14 @@ public class MergeItem extends MergeItemBase {
private final ICoverage importItem;
public MergeItem(MergeType mergeType, ICoverage packageItem, ICoverage importItem, boolean isCheckable) {
- super(importItem == null ? null : importItem.getGuid(), importItem == null ? String.format("Package [%s]",
- packageItem.getName()) : importItem.getName(), mergeType, isCheckable);
+ super(importItem == null ? GUID.create() : importItem.getGuid(), importItem == null ? String.format(
+ "Package [%s]", packageItem.getName()) : importItem.getName(), mergeType, isCheckable);
this.packageItem = packageItem;
this.importItem = importItem;
}
public MergeItem(MergeType mergeType, String name) {
- super(null, name, mergeType, false);
+ super(GUID.create(), name, mergeType, false);
this.packageItem = null;
this.importItem = null;
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemGroup.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemGroup.java
index 987fce3e0a..20c5425bac 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemGroup.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemGroup.java
@@ -17,6 +17,7 @@ import org.eclipse.osee.coverage.model.ICoverage;
import org.eclipse.osee.coverage.util.CoverageUtil;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.util.Result;
+import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.ui.swt.KeyedImage;
@@ -30,7 +31,7 @@ public class MergeItemGroup extends MergeItemBase {
public MergeItemGroup(MergeType mergeType, ICoverage parentCoverage, Collection<IMergeItem> mergeItems, boolean isCheckable) {
super(
- null,
+ GUID.create(),
mergeType.toString() + " - " + CoverageUtil.getFullPath(parentCoverage) + "[" + parentCoverage.getName() + "]",
mergeType, isCheckable);
this.parentCoverage = parentCoverage;
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java
index be9baebd07..5de4931d11 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java
@@ -18,6 +18,7 @@ import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.util.XResultData;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.jdk.core.util.DateUtil;
+import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.skynet.core.artifact.KeyValueArtifact;
@@ -39,7 +40,7 @@ public class CoverageImport extends CoveragePackageBase {
}
public CoverageImport(String name, Date runDate) {
- super(null, name, CoverageOptionManagerDefault.instance());
+ super(GUID.create(), name, CoverageOptionManagerDefault.instance());
this.runDate = runDate;
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageItem.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageItem.java
index e113f6bb93..033cb4db9e 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageItem.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageItem.java
@@ -23,6 +23,7 @@ import org.eclipse.osee.framework.core.util.Result;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
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.Strings;
import org.eclipse.osee.framework.ui.swt.KeyedImage;
@@ -42,7 +43,7 @@ public class CoverageItem extends NamedIdentity<String> implements ICoverage, IW
private ITestUnitProvider testUnitProvider;
public CoverageItem(CoverageUnit coverageUnit, CoverageOption coverageMethod, String orderNumber) {
- this(null, coverageUnit, coverageMethod, orderNumber);
+ this(GUID.create(), coverageUnit, coverageMethod, orderNumber);
}
public CoverageItem(String guid, CoverageUnit coverageUnit, CoverageOption coverageMethod, String orderNumber) {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackage.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackage.java
index 57413093c1..321769ce2d 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackage.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackage.java
@@ -14,6 +14,7 @@ import java.util.Date;
import org.eclipse.osee.framework.core.util.XResultData;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.jdk.core.util.DateUtil;
+import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.skynet.core.artifact.KeyValueArtifact;
@@ -27,7 +28,7 @@ public class CoveragePackage extends CoveragePackageBase {
}
public CoveragePackage(String name, CoverageOptionManager coverageOptionManager, IWorkProductTaskProvider workProductTaskProvider) {
- this(null, name, coverageOptionManager, workProductTaskProvider);
+ this(GUID.create(), name, coverageOptionManager, workProductTaskProvider);
}
public CoveragePackage(String guid, String name, Date runDate, CoverageOptionManager coverageOptionManager, IWorkProductTaskProvider workProductTaskProvider) {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageUnit.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageUnit.java
index afa07b2213..5ca59db39c 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageUnit.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageUnit.java
@@ -23,6 +23,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.core.util.Result;
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.Strings;
import org.eclipse.osee.framework.ui.swt.KeyedImage;
@@ -47,7 +48,7 @@ public class CoverageUnit extends NamedIdentity<String> implements IWorkProductR
ICoverageUnitFileContentsProvider fileContentsProvider;
public CoverageUnit(ICoverage parent, String name, String location, ICoverageUnitFileContentsProvider coverageUnitFileContentsProvider) {
- this(null, parent, name, location, coverageUnitFileContentsProvider);
+ this(GUID.create(), parent, name, location, coverageUnitFileContentsProvider);
}
public CoverageUnit(String guid, ICoverage parent, String name, String location, ICoverageUnitFileContentsProvider coverageUnitFileContentsProvider) {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageArtifactTypes.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageArtifactTypes.java
index f35ac25cd6..b2c36b6d21 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageArtifactTypes.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageArtifactTypes.java
@@ -19,9 +19,9 @@ import org.eclipse.osee.framework.core.data.TokenFactory;
public final class CoverageArtifactTypes {
// @formatter:off
- public static final IArtifactType CoveragePackage = TokenFactory.createArtifactType("AARFcyA9zyD3uEK8akgA", "Coverage Package");
- public static final IArtifactType CoverageUnit = TokenFactory.createArtifactType("ALZS3MQdCCIUvEYlZeAA", "Coverage Unit");
- public static final IArtifactType CoverageFolder = TokenFactory.createArtifactType("ALZR_AbpJTTf6QQn2iAA", "Coverage Folder");
+ public static final IArtifactType CoveragePackage = TokenFactory.createArtifactType(0x000000000000004B, "Coverage Package");
+ public static final IArtifactType CoverageUnit = TokenFactory.createArtifactType(0x000000000000004E, "Coverage Unit");
+ public static final IArtifactType CoverageFolder = TokenFactory.createArtifactType(0x000000000000004D, "Coverage Folder");
// @formatter:on
private CoverageArtifactTypes() {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageAttributeTypes.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageAttributeTypes.java
index 93a18bec33..256f860bcb 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageAttributeTypes.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageAttributeTypes.java
@@ -19,16 +19,16 @@ import org.eclipse.osee.framework.core.data.TokenFactory;
public final class CoverageAttributeTypes {
// @formatter:off
- public static final IAttributeType Assignees = TokenFactory.createAttributeType("AARCA+XjSyKjnh3sweQA", "coverage.Assignees");
- public static final IAttributeType Item = TokenFactory.createAttributeType("AARr8BmsQHKLOHNzOcQA", "coverage.Coverage Item");
- public static final IAttributeType Options = TokenFactory.createAttributeType("AAF+8+sqyELZ2mdVV_AA", "coverage.Coverage Options");
- public static final IAttributeType FileContents = TokenFactory.createAttributeType("AARDJK8YAT3SDnghjQgA", "coverage.File Contents");
- public static final IAttributeType Location = TokenFactory.createAttributeType("AARA2XwhNRddgQrd0iwA", "coverage.Location");
- public static final IAttributeType Namespace = TokenFactory.createAttributeType("AAQ_v6uUrh0j39+4D5gA", "coverage.Namespace");
- public static final IAttributeType WorkProductTaskGuid = TokenFactory.createAttributeType("A+m7Y2sV2z83QUlkzIAA", "coverage.WorkProductTaskGuid");
- public static final IAttributeType WorkProductPcrGuid = TokenFactory.createAttributeType("AWuQmRuq1gwrejEWRgAA", "coverage.WorkProductPcrGuid");
- public static final IAttributeType Notes = TokenFactory.createAttributeType("AARERmIjazD1udUwfLgA", "coverage.Notes");
- public static final IAttributeType Order = TokenFactory.createAttributeType("AD72opMBR1pFxB0hVpQA", "coverage.Order");
+ public static final IAttributeType Assignees = TokenFactory.createAttributeType(0x1000000000000101L, "coverage.Assignees");
+ public static final IAttributeType Item = TokenFactory.createAttributeType(0x1000000000000104L, "coverage.Coverage Item");
+ public static final IAttributeType Options = TokenFactory.createAttributeType(0x10000000000000FDL, "coverage.Coverage Options");
+ public static final IAttributeType FileContents = TokenFactory.createAttributeType(0x10000000000000FEL, "coverage.File Contents");
+ public static final IAttributeType Location = TokenFactory.createAttributeType(0x1000000000000103L, "coverage.Location");
+ public static final IAttributeType Namespace = TokenFactory.createAttributeType(0x1000000000000105L, "coverage.Namespace");
+ public static final IAttributeType WorkProductTaskGuid = TokenFactory.createAttributeType(0x10000000000000FFL, "coverage.WorkProductTaskGuid");
+ public static final IAttributeType WorkProductPcrGuid = TokenFactory.createAttributeType(0x1000000000000100L, "coverage.WorkProductPcrGuid");
+ public static final IAttributeType Notes = TokenFactory.createAttributeType(0x10000000000000FCL, "coverage.Notes");
+ public static final IAttributeType Order = TokenFactory.createAttributeType(0x1000000000000102L, "coverage.Order");
// @formatter:on
private CoverageAttributeTypes() {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageRelationTypes.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageRelationTypes.java
index 165cd7dcf8..e7e9eb062f 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageRelationTypes.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageRelationTypes.java
@@ -20,13 +20,13 @@ import org.eclipse.osee.framework.core.enums.RelationSide;
public final class CoverageRelationTypes {
public static final IRelationTypeSide TeamWorkflowTargetedForVersion_Version = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_B, "AAMFE99pzm4zSibDT9gA", "TeamWorkflowTargetedForVersion");
+ RelationSide.SIDE_B, 0x200000000000016FL, "TeamWorkflowTargetedForVersion");
public static final IRelationTypeSide TeamWorkflowTargetedForVersion_Workflow = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_A, "AAMFE99pzm4zSibDT9gA", "TeamWorkflowTargetedForVersion");
+ RelationSide.SIDE_A, 0x200000000000016FL, "TeamWorkflowTargetedForVersion");
public static final IRelationTypeSide ActionToWorkflow_Action = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_A, "AAMFE953ixQThusHUPwA", "ActionToWorkflow");
+ RelationSide.SIDE_A, 0x200000000000016DL, "ActionToWorkflow");
public static final IRelationTypeSide ActionToWorkflow_WorkFlow = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_B, "AAMFE953ixQThusHUPwA", "ActionToWorkflow");
+ RelationSide.SIDE_B, 0x200000000000016DL, "ActionToWorkflow");
private CoverageRelationTypes() {
// Constants
diff --git a/plugins/org.eclipse.osee.framework.core.datastore/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.datastore/META-INF/MANIFEST.MF
index a1ed3177ed..4051b5a078 100644
--- a/plugins/org.eclipse.osee.framework.core.datastore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core.datastore/META-INF/MANIFEST.MF
@@ -32,6 +32,7 @@ Import-Package: org.apache.commons.lang,
org.eclipse.osee.framework.jdk.core.util.time,
org.eclipse.osee.framework.jdk.core.util.xml,
org.eclipse.osee.framework.logging,
+ org.eclipse.osee.framework.resource.management,
org.osgi.framework,
org.osgi.util.tracker
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.osee.framework.core.datastore/OSGI-INF/core.osee.schema.resource.xml b/plugins/org.eclipse.osee.framework.core.datastore/OSGI-INF/core.osee.schema.resource.xml
index 1c294dd84a..e16e3dfa67 100644
--- a/plugins/org.eclipse.osee.framework.core.datastore/OSGI-INF/core.osee.schema.resource.xml
+++ b/plugins/org.eclipse.osee.framework.core.datastore/OSGI-INF/core.osee.schema.resource.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<component name="core.osee.schema.resource">
+<component name="core.osee.schema.resource" immediate="true" >
<implementation class="org.eclipse.osee.framework.core.datastore.internal.CoreOseeSchemaResource"/>
<service>
<provide interface="org.eclipse.osee.framework.core.datastore.IOseeSchemaResource"/>
diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/DatastoreInitOperation.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/DatastoreInitOperation.java
index 22e5549357..b491a65431 100644
--- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/DatastoreInitOperation.java
+++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/DatastoreInitOperation.java
@@ -64,6 +64,7 @@ public class DatastoreInitOperation extends AbstractOperation {
doSubWork(subOp, monitor, 0.30);
dbService.getSequence().clear();
+ dbService.getRemoteIdManager().clear();
appServerManager.executeLookupRegistration();
@@ -74,7 +75,7 @@ public class DatastoreInitOperation extends AbstractOperation {
OseeInfo.putValue(OseeInfo.DB_ID_KEY, GUID.create());
addDefaultPermissions();
- cachingService.clearAll();
+ // cachingService.clearAll();
subOp = branchService.createSystemRootBranch(monitor);
doSubWork(subOp, monitor, 0.30);
@@ -89,8 +90,7 @@ public class DatastoreInitOperation extends AbstractOperation {
private static void deleteBinaryBackingData() {
String binaryDataPath = OseeServerProperties.getOseeApplicationServerData();
- OseeLog.logf(Activator.class, Level.INFO,
- "Deleting application server binary data [%s]...", binaryDataPath);
+ OseeLog.logf(Activator.class, Level.INFO, "Deleting application server binary data [%s]...", binaryDataPath);
Lib.deleteDir(new File(binaryDataPath + File.separator + "attr"));
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseArtifactTypeAccessor.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseArtifactTypeAccessor.java
deleted file mode 100644
index be8d9da837..0000000000
--- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseArtifactTypeAccessor.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.datastore.cache;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.BranchToken;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.datastore.internal.Activator;
-import org.eclipse.osee.framework.core.enums.StorageState;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
-import org.eclipse.osee.framework.core.exception.OseeInvalidInheritanceException;
-import org.eclipse.osee.framework.core.model.AbstractOseeType;
-import org.eclipse.osee.framework.core.model.cache.ArtifactTypeCache;
-import org.eclipse.osee.framework.core.model.cache.AttributeTypeCache;
-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.type.ArtifactType;
-import org.eclipse.osee.framework.core.model.type.ArtifactTypeFactory;
-import org.eclipse.osee.framework.core.model.type.AttributeType;
-import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.database.core.IOseeStatement;
-import org.eclipse.osee.framework.jdk.core.type.CompositeKeyHashMap;
-import org.eclipse.osee.framework.jdk.core.type.HashCollection;
-import org.eclipse.osee.framework.jdk.core.type.Pair;
-import org.eclipse.osee.framework.logging.OseeLog;
-
-/**
- * @author Roberto E. Escobar
- */
-public class DatabaseArtifactTypeAccessor extends AbstractTypeDatabaseAccessor<ArtifactType> {
- protected static final int ABSTRACT_TYPE_INDICATOR = 1;
- protected static final int CONCRETE_TYPE_INDICATOR = 0;
-
- private static final String SELECT_ARTIFACT_TYPES = "select * from osee_artifact_type";
- private static final String INSERT_ARTIFACT_TYPE =
- "insert into osee_artifact_type (art_type_id, art_type_guid, name, is_abstract) VALUES (?,?,?,?)";
-
- private static final String UPDATE_ARTIFACT_TYPE =
- "update osee_artifact_type SET name = ?, is_abstract = ? where art_type_id = ?";
-
- private static final String SELECT_ARTIFACT_TYPE_INHERITANCE =
- "select * from osee_artifact_type_inheritance order by super_art_type_id, art_type_id";
- private static final String INSERT_ARTIFACT_TYPE_INHERITANCE =
- "insert into osee_artifact_type_inheritance (art_type_id, super_art_type_id) VALUES (?,?)";
- private static final String DELETE_ARTIFACT_TYPE_INHERITANCE =
- "delete from osee_artifact_type_inheritance where art_type_id = ?";
-
- private static final String SELECT_ARTIFACT_TYPE_ATTRIBUTES =
- "select * from osee_artifact_type_attributes order by art_type_id, branch_guid, attr_type_id";
- private static final String INSERT_ARTIFACT_TYPE_ATTRIBUTES =
- "insert into osee_artifact_type_attributes (art_type_id, attr_type_id, branch_guid) VALUES (?, ?, ?)";
- private static final String DELETE_ARTIFACT_TYPE_ATTRIBUTES =
- "delete from osee_artifact_type_attributes where art_type_id = ?";
-
- private final AttributeTypeCache attributeCache;
- private final BranchCache branchCache;
- private final ArtifactTypeFactory artifactTypeFactory;
-
- public DatabaseArtifactTypeAccessor(IOseeDatabaseService databaseService, BranchCache branchCache, AttributeTypeCache attributeCache, ArtifactTypeFactory artifactTypeFactory) {
- super(databaseService);
- this.attributeCache = attributeCache;
- this.branchCache = branchCache;
- this.artifactTypeFactory = artifactTypeFactory;
- }
-
- private ArtifactTypeFactory getArtifactTypeFactory() {
- return artifactTypeFactory;
- }
-
- @Override
- public void load(IOseeCache<String, ArtifactType> cache) throws OseeCoreException {
- attributeCache.ensurePopulated();
- Set<ArtifactType> loadedTypes = new HashSet<ArtifactType>();
- ArtifactTypeCache artCache = (ArtifactTypeCache) cache;
- loadArtifactTypes(artCache, loadedTypes);
- loadTypeInheritance(artCache);
- loadAllTypeValidity(artCache);
- for (ArtifactType type : loadedTypes) {
- type.clearDirty();
- }
- }
-
- private void loadArtifactTypes(ArtifactTypeCache cache, Set<ArtifactType> loadedTypes) throws OseeCoreException {
- ArtifactTypeFactory factory = getArtifactTypeFactory();
-
- IOseeStatement chStmt = getDatabaseService().getStatement();
- try {
- chStmt.runPreparedQuery(SELECT_ARTIFACT_TYPES);
-
- while (chStmt.next()) {
- try {
- int artTypeId = chStmt.getInt("art_type_id");
- boolean isAbstract = chStmt.getInt("is_abstract") == ABSTRACT_TYPE_INDICATOR;
- String artifactTypeName = chStmt.getString("name");
- String guid = chStmt.getString("art_type_guid");
-
- ArtifactType artifactType =
- factory.createOrUpdate(cache, artTypeId, StorageState.LOADED, guid, isAbstract, artifactTypeName);
- loadedTypes.add(artifactType);
- } catch (OseeDataStoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
- } finally {
- chStmt.close();
- }
- }
-
- private void loadTypeInheritance(ArtifactTypeCache cache) throws OseeCoreException {
- IOseeStatement chStmt2 = getDatabaseService().getStatement();
- try {
- chStmt2.runPreparedQuery(SELECT_ARTIFACT_TYPE_INHERITANCE);
- HashCollection<ArtifactType, ArtifactType> baseToSuperTypes =
- new HashCollection<ArtifactType, ArtifactType>(false, HashSet.class);
-
- while (chStmt2.next()) {
- int artTypeId = chStmt2.getInt("art_type_id");
- int superArtTypeId = chStmt2.getInt("super_art_type_id");
- ArtifactType baseArtType = cache.getById(artTypeId);
- ArtifactType superArtType = cache.getById(superArtTypeId);
-
- if (baseArtType == null) {
- throw new OseeInvalidInheritanceException("ArtifactType [%s] which inherits from [%s] is null",
- artTypeId, superArtType);
- }
- if (superArtType == null) {
- throw new OseeInvalidInheritanceException("ArtifactType [%s] which inherits from null artifact [%s]",
- artTypeId, superArtType);
- }
- baseToSuperTypes.put(baseArtType, superArtType);
- }
- for (ArtifactType artifactType : baseToSuperTypes.keySet()) {
- Set<ArtifactType> superTypes = (Set<ArtifactType>) baseToSuperTypes.getValues(artifactType);
- if (superTypes != null) {
- artifactType.setSuperTypes(superTypes);
- }
- }
- } finally {
- chStmt2.close();
- }
- }
-
- private void loadAllTypeValidity(ArtifactTypeCache cache) throws OseeCoreException {
- CompositeKeyHashMap<ArtifactType, IOseeBranch, Collection<AttributeType>> typeValidity =
- new CompositeKeyHashMap<ArtifactType, IOseeBranch, Collection<AttributeType>>();
- IOseeStatement chStmt = getDatabaseService().getStatement();
- try {
- chStmt.runPreparedQuery(2000, SELECT_ARTIFACT_TYPE_ATTRIBUTES);
- while (chStmt.next()) {
- try {
- ArtifactType artifactType = cache.getById(chStmt.getInt("art_type_id"));
- String branchGuid = chStmt.getString("branch_guid");
- IOseeBranch branchToken = branchCache.getByGuid(branchGuid);
- if (branchToken == null) {
- branchToken = new BranchToken(branchGuid, branchGuid);
- }
- AttributeType attributeType = attributeCache.getById(chStmt.getInt("attr_type_id"));
- Collection<AttributeType> attributes = typeValidity.get(artifactType, branchToken);
- if (attributes == null) {
- attributes = new HashSet<AttributeType>();
- typeValidity.put(artifactType, branchToken, attributes);
- }
- attributes.add(attributeType);
- } catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
- } finally {
- chStmt.close();
- }
- for (Entry<Pair<ArtifactType, IOseeBranch>, Collection<AttributeType>> entry : typeValidity.entrySet()) {
- try {
- Pair<ArtifactType, IOseeBranch> key = entry.getKey();
- key.getFirst().setAttributeTypes(entry.getValue(), key.getSecond());
- } catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
- }
-
- @Override
- public void store(Collection<ArtifactType> types) throws OseeCoreException {
- Set<ArtifactType> typeInheritanceChanges = new HashSet<ArtifactType>();
- Set<ArtifactType> typeValidityChanges = new HashSet<ArtifactType>();
- List<Object[]> insertData = new ArrayList<Object[]>();
- List<Object[]> updateData = new ArrayList<Object[]>();
-
- for (ArtifactType type : types) {
- if (isDataDirty(type)) {
- int abstractValue = type.isAbstract() ? ABSTRACT_TYPE_INDICATOR : CONCRETE_TYPE_INDICATOR;
- switch (type.getStorageState()) {
- case CREATED:
- type.setId(getSequence().getNextArtifactTypeId());
- insertData.add(new Object[] {type.getId(), type.getGuid(), type.getName(), abstractValue});
- break;
- case MODIFIED:
- updateData.add(new Object[] {type.getName(), abstractValue, type.getId()});
- break;
- default:
- break;
- }
- }
- if (type.isFieldDirty(ArtifactType.ARTIFACT_INHERITANCE_FIELD_KEY)) {
- typeInheritanceChanges.add(type);
-
- }
- if (type.isFieldDirty(ArtifactType.ARTIFACT_TYPE_ATTRIBUTES_FIELD_KEY)) {
- typeValidityChanges.add(type);
- }
- }
- getDatabaseService().runBatchUpdate(INSERT_ARTIFACT_TYPE, insertData);
- getDatabaseService().runBatchUpdate(UPDATE_ARTIFACT_TYPE, updateData);
-
- storeArtifactTypeInheritance(typeInheritanceChanges);
- storeAttributeTypeValidity(types);
-
- for (ArtifactType type : types) {
- type.clearDirty();
- }
- }
-
- private boolean isDataDirty(ArtifactType type) throws OseeCoreException {
- return type.areFieldsDirty(AbstractOseeType.NAME_FIELD_KEY, AbstractOseeType.UNIQUE_ID_FIELD_KEY,
- ArtifactType.ARTIFACT_IS_ABSTRACT_FIELD_KEY);
- }
-
- private void storeArtifactTypeInheritance(Collection<ArtifactType> types) throws OseeCoreException {
- List<Object[]> insertInheritanceData = new ArrayList<Object[]>();
- List<Object[]> deleteInheritanceData = new ArrayList<Object[]>();
- for (ArtifactType type : types) {
- deleteInheritanceData.add(new Object[] {type.getId()});
- for (ArtifactType superType : type.getSuperArtifactTypes()) {
- insertInheritanceData.add(new Object[] {type.getId(), superType.getId()});
- }
- }
- getDatabaseService().runBatchUpdate(DELETE_ARTIFACT_TYPE_INHERITANCE, deleteInheritanceData);
- getDatabaseService().runBatchUpdate(INSERT_ARTIFACT_TYPE_INHERITANCE, insertInheritanceData);
- }
-
- private void storeAttributeTypeValidity(Collection<ArtifactType> types) throws OseeCoreException {
- List<Object[]> insertData = new ArrayList<Object[]>();
- List<Object[]> deleteData = new ArrayList<Object[]>();
- for (ArtifactType artifactType : types) {
- deleteData.add(new Object[] {artifactType.getId()});
- Map<IOseeBranch, Collection<AttributeType>> entries = artifactType.getLocalAttributeTypes();
- if (entries != null) {
- for (Entry<IOseeBranch, Collection<AttributeType>> entry : entries.entrySet()) {
- IOseeBranch branch = entry.getKey();
- for (AttributeType attributeType : entry.getValue()) {
- insertData.add(new Object[] {artifactType.getId(), attributeType.getId(), branch.getGuid()});
- }
- }
- }
- }
- getDatabaseService().runBatchUpdate(DELETE_ARTIFACT_TYPE_ATTRIBUTES, deleteData);
- getDatabaseService().runBatchUpdate(INSERT_ARTIFACT_TYPE_ATTRIBUTES, insertData);
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseAttributeTypeAccessor.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseAttributeTypeAccessor.java
deleted file mode 100644
index 4429c5e3d8..0000000000
--- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseAttributeTypeAccessor.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.datastore.cache;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.core.datastore.internal.Activator;
-import org.eclipse.osee.framework.core.enums.StorageState;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.cache.IOseeCache;
-import org.eclipse.osee.framework.core.model.cache.OseeEnumTypeCache;
-import org.eclipse.osee.framework.core.model.type.AttributeType;
-import org.eclipse.osee.framework.core.model.type.AttributeTypeFactory;
-import org.eclipse.osee.framework.core.model.type.OseeEnumType;
-import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.database.core.IOseeStatement;
-import org.eclipse.osee.framework.database.core.SQL3DataType;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.logging.OseeLog;
-
-/**
- * @author Roberto E. Escobar
- */
-public class DatabaseAttributeTypeAccessor extends AbstractTypeDatabaseAccessor<AttributeType> {
-
- private static final String SELECT_ATTRIBUTE_TYPES =
- "SELECT * FROM osee_attribute_type aty1, osee_attribute_base_type aby1, osee_attribute_provider_type apy1 WHERE aty1.attr_base_type_id = aby1.attr_base_type_id AND aty1.attr_provider_type_id = apy1.attr_provider_type_id";
- private static final String INSERT_ATTRIBUTE_TYPE =
- "INSERT INTO osee_attribute_type (attr_type_id, attr_type_guid, attr_base_type_id, attr_provider_type_id, file_type_extension, name, default_value, enum_type_id, min_occurence, max_occurence, tip_text, tagger_id) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)";
- private static final String UPDATE_ATTRIBUTE_TYPE =
- "update osee_attribute_type SET attr_base_type_id=?, attr_provider_type_id=?, file_type_extension=?, name=?, default_value=?, enum_type_id=?, min_occurence=?, max_occurence=?, tip_text=?, tagger_id=? where attr_type_id = ?";
-
- private static final String INSERT_BASE_ATTRIBUTE_TYPE =
- "INSERT INTO osee_attribute_base_type (attr_base_type_id, attribute_class) VALUES (?, ?)";
- private static final String INSERT_ATTRIBUTE_PROVIDER_TYPE =
- "INSERT INTO osee_attribute_provider_type (attr_provider_type_id, attribute_provider_class) VALUES (?, ?)";
- private static final String SELECT_ATTRIBUTE_BASE_TYPE =
- "SELECT attr_base_type_id FROM osee_attribute_base_type WHERE attribute_class = ?";
- private static final String SELECT_ATTRIBUTE_PROVIDER_TYPE =
- "SELECT attr_provider_type_id FROM osee_attribute_provider_type WHERE attribute_provider_class = ?";
-
- private final OseeEnumTypeCache enumCache;
- private final AttributeTypeFactory attributeTypeFactory;
-
- public DatabaseAttributeTypeAccessor(IOseeDatabaseService databaseService, OseeEnumTypeCache enumCache, AttributeTypeFactory attributeTypeFactory) {
- super(databaseService);
- this.enumCache = enumCache;
- this.attributeTypeFactory = attributeTypeFactory;
- }
-
- @Override
- public void load(IOseeCache<String, AttributeType> cache) throws OseeCoreException {
- enumCache.ensurePopulated();
-
- IOseeStatement chStmt = getDatabaseService().getStatement();
-
- try {
- chStmt.runPreparedQuery(SELECT_ATTRIBUTE_TYPES);
-
- while (chStmt.next()) {
- int attributeTypeId = chStmt.getInt("attr_type_id");
- String baseAttributeTypeId = Strings.intern(chStmt.getString("attribute_class"));
- String attributeProviderNameId = Strings.intern(chStmt.getString("attribute_provider_class"));
- try {
- String guid = chStmt.getString("attr_type_guid");
- String typeName = chStmt.getString("name");
- String fileTypeExtension = Strings.intern(chStmt.getString("file_type_extension"));
- String defaultValue = chStmt.getString("default_value");
- int minOccurrences = chStmt.getInt("min_occurence");
- int maxOccurrences = chStmt.getInt("max_occurence");
- String description = chStmt.getString("tip_text");
- String taggerId = Strings.intern(chStmt.getString("tagger_id"));
-
- int enumTypeId = chStmt.getInt("enum_type_id");
- OseeEnumType oseeEnumType = enumCache.getById(enumTypeId);
-
- AttributeType attributeType =
- attributeTypeFactory.createOrUpdate(cache, attributeTypeId, StorageState.LOADED, guid, typeName,
- baseAttributeTypeId, attributeProviderNameId, fileTypeExtension, defaultValue, oseeEnumType,
- minOccurrences, maxOccurrences, description, taggerId);
-
- attributeType.clearDirty();
- } catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
- } finally {
- chStmt.close();
- }
- }
-
- @Override
- public void store(Collection<AttributeType> types) throws OseeCoreException {
- List<Object[]> insertData = new ArrayList<Object[]>();
- List<Object[]> updateData = new ArrayList<Object[]>();
- for (AttributeType type : types) {
- if (type.isDirty()) {
- switch (type.getStorageState()) {
- case CREATED:
- type.setId(getSequence().getNextAttributeTypeId());
- insertData.add(toInsertValues(type));
- break;
- case MODIFIED:
- updateData.add(toUpdateValues(type));
- break;
- default:
- break;
- }
- }
- }
- getDatabaseService().runBatchUpdate(INSERT_ATTRIBUTE_TYPE, insertData);
- getDatabaseService().runBatchUpdate(UPDATE_ATTRIBUTE_TYPE, updateData);
- for (AttributeType type : types) {
- type.clearDirty();
- }
- }
-
- private Object[] toInsertValues(AttributeType type) throws OseeCoreException {
- int attrBaseTypeId = getOrCreateAttributeBaseType(type.getBaseAttributeTypeId());
- int attrProviderTypeId = getOrCreateAttributeProviderType(type.getAttributeProviderId());
- return new Object[] {
- type.getId(),
- type.getGuid(),
- attrBaseTypeId,
- attrProviderTypeId,
- type.getFileTypeExtension() == null ? SQL3DataType.VARCHAR : type.getFileTypeExtension(),
- type.getName() == null ? SQL3DataType.VARCHAR : type.getName(),
- type.getDefaultValue() == null ? SQL3DataType.VARCHAR : type.getDefaultValue(),
- type.getOseeEnumTypeId(),
- type.getMinOccurrences(),
- type.getMaxOccurrences(),
- type.getDescription() == null ? SQL3DataType.VARCHAR : type.getDescription(),
- type.getTaggerId() == null ? SQL3DataType.VARCHAR : type.getTaggerId()};
- }
-
- private Object[] toUpdateValues(AttributeType type) throws OseeCoreException {
- int attrBaseTypeId = getOrCreateAttributeBaseType(type.getBaseAttributeTypeId());
- int attrProviderTypeId = getOrCreateAttributeProviderType(type.getAttributeProviderId());
- return new Object[] {
- attrBaseTypeId,
- attrProviderTypeId,
- type.getFileTypeExtension() == null ? SQL3DataType.VARCHAR : type.getFileTypeExtension(),
- type.getName() == null ? SQL3DataType.VARCHAR : type.getName(),
- type.getDefaultValue() == null ? SQL3DataType.VARCHAR : type.getDefaultValue(),
- type.getOseeEnumTypeId(),
- type.getMinOccurrences(),
- type.getMaxOccurrences(),
- type.getDescription() == null ? SQL3DataType.VARCHAR : type.getDescription(),
- type.getTaggerId() == null ? SQL3DataType.VARCHAR : type.getTaggerId(),
- type.getId()};
- }
-
- @SuppressWarnings("unchecked")
- private int getOrCreateAttributeProviderType(String attrProviderExtension) throws OseeCoreException {
- int attrBaseTypeId = -1;
- IOseeStatement chStmt = getDatabaseService().getStatement();
- try {
- chStmt.runPreparedQuery(SELECT_ATTRIBUTE_PROVIDER_TYPE, attrProviderExtension);
- if (chStmt.next()) {
- attrBaseTypeId = chStmt.getInt("attr_provider_type_id");
- } else {
- attrBaseTypeId = getSequence().getNextAttributeProviderTypeId();
- getDatabaseService().runPreparedUpdate(INSERT_ATTRIBUTE_PROVIDER_TYPE, attrBaseTypeId,
- attrProviderExtension);
- }
- } finally {
- chStmt.close();
- }
- return attrBaseTypeId;
- }
-
- @SuppressWarnings("unchecked")
- private int getOrCreateAttributeBaseType(String attrBaseExtension) throws OseeCoreException {
- int attrBaseTypeId = -1;
- IOseeStatement chStmt = getDatabaseService().getStatement();
- try {
- chStmt.runPreparedQuery(SELECT_ATTRIBUTE_BASE_TYPE, attrBaseExtension);
- if (chStmt.next()) {
- attrBaseTypeId = chStmt.getInt("attr_base_type_id");
- } else {
- attrBaseTypeId = getSequence().getNextAttributeBaseTypeId();
- getDatabaseService().runPreparedUpdate(INSERT_BASE_ATTRIBUTE_TYPE, attrBaseTypeId, attrBaseExtension);
- }
- } finally {
- chStmt.close();
- }
- return attrBaseTypeId;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseOseeEnumTypeAccessor.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseOseeEnumTypeAccessor.java
deleted file mode 100644
index afb7da6614..0000000000
--- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseOseeEnumTypeAccessor.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.datastore.cache;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.core.datastore.internal.Activator;
-import org.eclipse.osee.framework.core.enums.StorageState;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.AbstractOseeType;
-import org.eclipse.osee.framework.core.model.OseeEnumEntry;
-import org.eclipse.osee.framework.core.model.cache.IOseeCache;
-import org.eclipse.osee.framework.core.model.type.OseeEnumType;
-import org.eclipse.osee.framework.core.model.type.OseeEnumTypeFactory;
-import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.database.core.IOseeStatement;
-import org.eclipse.osee.framework.jdk.core.type.HashCollection;
-import org.eclipse.osee.framework.logging.OseeLog;
-
-/**
- * @author Roberto E. Escobar
- */
-public class DatabaseOseeEnumTypeAccessor extends AbstractTypeDatabaseAccessor<OseeEnumType> {
-
- private static final String SELECT_OSEE_ENUM_TYPES = "select * from osee_enum_type oet";
- private static final String SELECT_OSEE_ENUM_ENTRIES =
- "select * from osee_enum_type_def order by enum_type_id, ordinal";
-
- private static final String INSERT_ENUM_TYPE =
- "insert into osee_enum_type (enum_type_id, enum_type_guid, enum_type_name) values (?,?,?)";
- private static final String UPDATE_ENUM_TYPE = "update osee_enum_type set enum_type_name=? where enum_type_id=?";
- private static final String DELETE_ENUM_TYPE = "delete from osee_enum_type oet where enum_type_id = ?";
-
- private static final String INSERT_ENUM_TYPE_DEF =
- "insert into osee_enum_type_def (enum_type_id, enum_entry_guid, name, ordinal) values (?,?,?,?)";
- private static final String DELETE_ENUM_TYPE_DEF = "delete from osee_enum_type_def where enum_type_id = ?";
-
- private final OseeEnumTypeFactory factory;
-
- public DatabaseOseeEnumTypeAccessor(IOseeDatabaseService databaseService, OseeEnumTypeFactory factory) {
- super(databaseService);
- this.factory = factory;
- }
-
- private void loadEnumEntries(OseeEnumTypeFactory factory, HashCollection<Integer, OseeEnumEntry> entryTypes) throws OseeCoreException {
- IOseeStatement chStmt = getDatabaseService().getStatement();
- try {
- chStmt.runPreparedQuery(SELECT_OSEE_ENUM_ENTRIES);
- while (chStmt.next()) {
- try {
- Integer enumTypeId = chStmt.getInt("enum_type_id");
- String enumEntryGuid = chStmt.getString("enum_entry_guid");
- String enumEntryName = chStmt.getString("name");
- int ordinal = chStmt.getInt("ordinal");
-
- OseeEnumEntry entry = factory.createEnumEntry(enumEntryGuid, enumEntryName, ordinal);
- entry.setStorageState(StorageState.LOADED);
- entry.clearDirty();
- entryTypes.put(enumTypeId, entry);
- } catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
- } finally {
- chStmt.close();
- }
- }
-
- @Override
- public void load(IOseeCache<String, OseeEnumType> cache) throws OseeCoreException {
- HashCollection<Integer, OseeEnumEntry> entryTypes = new HashCollection<Integer, OseeEnumEntry>();
-
- loadEnumEntries(factory, entryTypes);
-
- IOseeStatement chStmt = getDatabaseService().getStatement();
- try {
- chStmt.runPreparedQuery(SELECT_OSEE_ENUM_TYPES);
- while (chStmt.next()) {
- try {
- Integer enumTypeId = chStmt.getInt("enum_type_id");
- String enumTypeGuid = chStmt.getString("enum_type_guid");
- String enumTypeName = chStmt.getString("enum_type_name");
-
- OseeEnumType oseeEnumType =
- factory.createOrUpdate(cache, enumTypeId, StorageState.LOADED, enumTypeGuid, enumTypeName);
-
- List<OseeEnumEntry> oseeEnumEntries = (List<OseeEnumEntry>) entryTypes.getValues(enumTypeId);
- if (oseeEnumEntries != null) {
- oseeEnumType.setEntries(oseeEnumEntries);
- oseeEnumType.clearDirty();
- }
- } catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
- } finally {
- chStmt.close();
- }
- }
-
- @Override
- public void store(Collection<OseeEnumType> oseeEnumTypes) throws OseeCoreException {
- Set<OseeEnumType> dirtyEntries = new HashSet<OseeEnumType>();
- List<Object[]> insertData = new ArrayList<Object[]>();
- List<Object[]> updateData = new ArrayList<Object[]>();
- List<Object[]> deleteData = new ArrayList<Object[]>();
- for (OseeEnumType oseeEnumType : oseeEnumTypes) {
- if (isDataDirty(oseeEnumType)) {
- switch (oseeEnumType.getStorageState()) {
- case CREATED:
- oseeEnumType.setId(getSequence().getNextOseeEnumTypeId());
- insertData.add(toInsertValues(oseeEnumType));
- break;
- case MODIFIED:
- updateData.add(toUpdateValues(oseeEnumType));
- break;
- case PURGED:
- deleteData.add(toDeleteValues(oseeEnumType));
- break;
- default:
- break;
- }
- }
- if (oseeEnumType.isFieldDirty(OseeEnumType.OSEE_ENUM_TYPE_ENTRIES_FIELD)) {
- dirtyEntries.add(oseeEnumType);
- }
- }
- getDatabaseService().runBatchUpdate(INSERT_ENUM_TYPE, insertData);
- getDatabaseService().runBatchUpdate(UPDATE_ENUM_TYPE, updateData);
- getDatabaseService().runBatchUpdate(DELETE_ENUM_TYPE, deleteData);
-
- storeOseeEnumEntries(dirtyEntries);
- for (OseeEnumType oseeEnumType : oseeEnumTypes) {
- oseeEnumType.clearDirty();
- for (OseeEnumEntry entry : oseeEnumType.values()) {
- entry.clearDirty();
- }
- }
- }
-
- private boolean isDataDirty(OseeEnumType type) throws OseeCoreException {
- return type.areFieldsDirty(AbstractOseeType.NAME_FIELD_KEY, AbstractOseeType.UNIQUE_ID_FIELD_KEY);
- }
-
- private void storeOseeEnumEntries(Collection<OseeEnumType> oseeEnumTypes) throws OseeCoreException {
- List<Object[]> insertData = new ArrayList<Object[]>();
- List<Object[]> deleteData = new ArrayList<Object[]>();
-
- for (OseeEnumType type : oseeEnumTypes) {
- // Delete all type entries that have been inserted into the DB before
- if (type.isIdValid()) {
- deleteData.add(toDeleteValues(type));
- }
-
- //Re-add only entries that are valid
- for (OseeEnumEntry entry : type.values()) {
- if (StorageState.PURGED != entry.getStorageState()) {
- if (!entry.isIdValid()) {
- entry.setId(type.getId());
- }
- insertData.add(toInsertValues(entry));
- }
- }
- }
-
- getDatabaseService().runBatchUpdate(DELETE_ENUM_TYPE_DEF, deleteData);
- getDatabaseService().runBatchUpdate(INSERT_ENUM_TYPE_DEF, insertData);
- }
-
- private Object[] toInsertValues(OseeEnumType type) {
- return new Object[] {type.getId(), type.getGuid(), type.getName()};
- }
-
- private Object[] toUpdateValues(OseeEnumType type) {
- return new Object[] {type.getName(), type.getId()};
- }
-
- private Object[] toDeleteValues(OseeEnumType type) {
- return new Object[] {type.getId()};
- }
-
- private Object[] toInsertValues(OseeEnumEntry type) {
- return new Object[] {type.getId(), type.getGuid(), type.getName(), type.ordinal()};
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseRelationTypeAccessor.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseRelationTypeAccessor.java
deleted file mode 100644
index c1a74e9f86..0000000000
--- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseRelationTypeAccessor.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.datastore.cache;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.datastore.internal.Activator;
-import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
-import org.eclipse.osee.framework.core.enums.StorageState;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.cache.ArtifactTypeCache;
-import org.eclipse.osee.framework.core.model.cache.IOseeCache;
-import org.eclipse.osee.framework.core.model.type.RelationType;
-import org.eclipse.osee.framework.core.model.type.RelationTypeFactory;
-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.logging.OseeLog;
-
-/**
- * @author Roberto E. Escobar
- */
-public class DatabaseRelationTypeAccessor extends AbstractTypeDatabaseAccessor<RelationType> {
- private static final String SELECT_LINK_TYPES = "SELECT * FROM osee_relation_link_type";
- private static final String INSERT_RELATION_TYPE =
- "INSERT INTO osee_relation_link_type (rel_link_type_id, rel_link_type_guid, type_name, a_name, b_name, a_art_type_id, b_art_type_id, multiplicity, default_order_type_guid) VALUES (?,?,?,?,?,?,?,?,?)";
- private static final String UPDATE_RELATION_TYPE =
- "update osee_relation_link_type SET type_name=?, a_name=?, b_name=?, a_art_type_id=?, b_art_type_id=?, multiplicity=?, default_order_type_guid=? where rel_link_type_id = ?";
-
- private final ArtifactTypeCache artifactTypeCache;
- private final RelationTypeFactory factory;
-
- public DatabaseRelationTypeAccessor(IOseeDatabaseService databaseService, ArtifactTypeCache artifactCache, RelationTypeFactory factory) {
- super(databaseService);
- this.artifactTypeCache = artifactCache;
- this.factory = factory;
- }
-
- @Override
- public void load(IOseeCache<String, RelationType> cache) throws OseeCoreException {
- artifactTypeCache.ensurePopulated();
- IOseeStatement chStmt = getDatabaseService().getStatement();
-
- try {
- chStmt.runPreparedQuery(SELECT_LINK_TYPES);
-
- while (chStmt.next()) {
- String typeName = chStmt.getString("type_name");
- int typeId = chStmt.getInt("rel_link_type_id");
- int aArtTypeId = chStmt.getInt("a_art_type_id");
- int bArtTypeId = chStmt.getInt("b_art_type_id");
- int multiplicityValue = chStmt.getInt("multiplicity");
- try {
- IArtifactType artifactTypeSideA = artifactTypeCache.getById(aArtTypeId);
- IArtifactType artifactTypeSideB = artifactTypeCache.getById(bArtTypeId);
- RelationTypeMultiplicity multiplicity =
- RelationTypeMultiplicity.getRelationMultiplicity(multiplicityValue);
- String sideAName = chStmt.getString("a_name");
- String sideBName = chStmt.getString("b_name");
- String defaultOrderTypeGuid = chStmt.getString("default_order_type_guid");
- String guid = chStmt.getString("rel_link_type_guid");
-
- RelationType relationType =
- factory.createOrUpdate(cache, typeId, StorageState.LOADED, guid, typeName, sideAName, sideBName,
- artifactTypeSideA, artifactTypeSideB, multiplicity, defaultOrderTypeGuid);
- relationType.clearDirty();
- } catch (OseeCoreException ex) {
- String message =
- String.format(
- "Error loading relation type - name:[%s] id:[%s] aArtTypeId:[%s] bArtTypeid:[%s] multiplicity:[%s]",
- typeName, typeId, aArtTypeId, bArtTypeId, multiplicityValue);
- OseeLog.log(Activator.class, Level.SEVERE, message, ex);
- }
- }
- } finally {
- chStmt.close();
- }
- }
-
- @Override
- public void store(Collection<RelationType> relationTypes) throws OseeCoreException {
- List<Object[]> insertData = new ArrayList<Object[]>();
- List<Object[]> updateData = new ArrayList<Object[]>();
- for (RelationType type : relationTypes) {
- if (type.isDirty()) {
- switch (type.getStorageState()) {
- case CREATED:
- type.setId(getSequence().getNextRelationTypeId());
- insertData.add(toInsertValues(type));
- break;
- case MODIFIED:
- updateData.add(toUpdateValues(type));
- break;
- default:
- break;
- }
- }
- }
- OseeConnection connection = getDatabaseService().getConnection();
- try {
- getDatabaseService().runBatchUpdate(connection, INSERT_RELATION_TYPE, insertData);
- getDatabaseService().runBatchUpdate(connection, UPDATE_RELATION_TYPE, updateData);
- } finally {
- connection.close();
- }
- for (RelationType type : relationTypes) {
- type.clearDirty();
- }
- }
-
- private Object[] toInsertValues(RelationType type) throws OseeCoreException {
- return new Object[] {
- type.getId(),
- type.getGuid(),
- type.getName(),
- type.getSideAName(),
- type.getSideBName(),
- artifactTypeCache.get(type.getArtifactTypeSideA()).getId(),
- artifactTypeCache.get(type.getArtifactTypeSideB()).getId(),
- type.getMultiplicity().getValue(),
- type.getDefaultOrderTypeGuid()};
- }
-
- private Object[] toUpdateValues(RelationType type) throws OseeCoreException {
- return new Object[] {
- type.getName(),
- type.getSideAName(),
- type.getSideBName(),
- artifactTypeCache.get(type.getArtifactTypeSideA()).getId(),
- artifactTypeCache.get(type.getArtifactTypeSideB()).getId(),
- type.getMultiplicity().getValue(),
- type.getDefaultOrderTypeGuid(),
- type.getId()};
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/ArtifactTypeDataAccessor.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/ArtifactTypeDataAccessor.java
new file mode 100644
index 0000000000..57b6f2abb4
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/ArtifactTypeDataAccessor.java
@@ -0,0 +1,153 @@
+/*
+ * Created on Aug 17, 2011
+ *
+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
+ */
+package org.eclipse.osee.framework.core.datastore.internal;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
+import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
+import org.eclipse.osee.framework.core.enums.CoreBranches;
+import org.eclipse.osee.framework.core.enums.TxChange;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.exception.OseeExceptions;
+import org.eclipse.osee.framework.core.message.OseeImportModelRequest;
+import org.eclipse.osee.framework.core.message.OseeImportModelResponse;
+import org.eclipse.osee.framework.core.model.AbstractOseeType;
+import org.eclipse.osee.framework.core.model.Branch;
+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.IOseeDataAccessor;
+import org.eclipse.osee.framework.database.IOseeDatabaseService;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
+import org.eclipse.osee.framework.database.core.RemoteIdManager;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
+import org.eclipse.osee.framework.jdk.core.util.Lib;
+import org.eclipse.osee.framework.resource.management.IResource;
+import org.eclipse.osee.framework.resource.management.IResourceLocator;
+import org.eclipse.osee.framework.resource.management.IResourceLocatorManager;
+import org.eclipse.osee.framework.resource.management.IResourceManager;
+import org.eclipse.osee.framework.resource.management.StandardOptions;
+
+public class ArtifactTypeDataAccessor<T extends AbstractOseeType<Long>> implements IOseeDataAccessor<Long, T> {
+
+ private static final String LOAD_OSEE_TYPE_DEF_URIS =
+ "select attr.uri from osee_txs txs1, osee_artifact art, osee_attribute attr, osee_txs txs2 where txs1.branch_id = ? and txs1.tx_current = ? and txs1.gamma_id = art.gamma_id and txs2.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 static volatile boolean wasLoaded;
+
+ private final ModelingServiceProvider modelService;
+ private final IOseeDatabaseService databaseService;
+ private final IResourceLocatorManager locatorManager;
+ private final IResourceManager resourceManager;
+ private final BranchCache branchCache;
+
+ public ArtifactTypeDataAccessor(ModelingServiceProvider modelService, IOseeDatabaseService databaseService, IResourceLocatorManager locatorManager, IResourceManager resourceManager, BranchCache branchCache) {
+ this.modelService = modelService;
+ this.databaseService = databaseService;
+ this.locatorManager = locatorManager;
+ this.resourceManager = resourceManager;
+ this.branchCache = branchCache;
+ }
+
+ @Override
+ public synchronized void load(IOseeCache<Long, T> cache) throws OseeCoreException {
+ if (!wasLoaded) {
+ wasLoaded = true;
+ Collection<String> uriPaths = findOseeTypeData();
+ if (!uriPaths.isEmpty()) {
+ List<IResource> resources = getTypeData(uriPaths);
+ String modelData = createCombinedFile(resources);
+ String modelName = String.format("osee.types.%s.osee", Lib.getDateTimeString());
+ OseeImportModelRequest request = new OseeImportModelRequest(modelName, modelData, false, false, true);
+ OseeImportModelResponse response = new OseeImportModelResponse();
+ modelService.getIOseeModelingService().importOseeTypes(new NullProgressMonitor(), true, request, response);
+ }
+ }
+ }
+
+ @Override
+ public void store(Collection<T> types) throws OseeCoreException {
+ RemoteIdManager manager = databaseService.getRemoteIdManager();
+ Collection<Long> remoteIds = new ArrayList<Long>();
+ for (T type : types) {
+ remoteIds.add(type.getGuid());
+ }
+ manager.store(remoteIds);
+ for (T type : types) {
+ type.setId(manager.getLocalId(type.getGuid()));
+ type.clearDirty();
+ }
+ }
+
+ private Collection<String> findOseeTypeData() throws OseeCoreException {
+ Collection<String> paths = new ArrayList<String>();
+
+ RemoteIdManager manager = databaseService.getRemoteIdManager();
+
+ // john: Which attribute type store type def binary data
+ Integer artifactTypeId = manager.getLocalId(CoreArtifactTypes.OseeTypeDefinition.getGuid());
+ Integer attributeTypeId = manager.getLocalId(CoreAttributeTypes.NativeContent.getGuid());
+
+ Branch commonBranch = branchCache.get(CoreBranches.COMMON);
+
+ if (commonBranch != null) {
+ IOseeStatement chStmt = null;
+ try {
+ chStmt = databaseService.getStatement();
+ chStmt.runPreparedQuery(LOAD_OSEE_TYPE_DEF_URIS, commonBranch.getId(), TxChange.CURRENT.getValue(),
+ commonBranch.getId(), TxChange.CURRENT.getValue(), artifactTypeId, attributeTypeId);
+ while (chStmt.next()) {
+ String uri = chStmt.getString("uri");
+ paths.add(uri);
+ }
+ } finally {
+ Lib.close(chStmt);
+ }
+ }
+ return paths;
+ }
+
+ private List<IResource> getTypeData(Collection<String> paths) throws OseeCoreException {
+ List<IResource> toReturn = new ArrayList<IResource>();
+
+ PropertyStore options = new PropertyStore();
+ options.put(StandardOptions.DecompressOnAquire.name(), "true");
+ for (String path : paths) {
+ IResourceLocator locator = locatorManager.getResourceLocator(path);
+ IResource resource = resourceManager.acquire(locator, options);
+ toReturn.add(resource);
+ }
+ return toReturn;
+ }
+
+ private String createCombinedFile(List<IResource> resources) throws OseeCoreException {
+ StringWriter writer = new StringWriter();
+ for (IResource resource : resources) {
+ InputStream inputStream = null;
+ try {
+ inputStream = resource.getContent();
+ String oseeTypeFragment = Lib.inputStreamToString(inputStream);
+ oseeTypeFragment = oseeTypeFragment.replaceAll("import\\s+\"", "// import \"");
+ writer.write("\n");
+ writer.write("////////////// ");
+ writer.write(resource.getName());
+ writer.write("\n");
+ writer.write("\n");
+ writer.write(oseeTypeFragment);
+ } catch (IOException ex) {
+ OseeExceptions.wrapAndThrow(ex);
+ } finally {
+ Lib.close(inputStream);
+ }
+ }
+ return writer.toString();
+ }
+}
diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/ModelingServiceProvider.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/ModelingServiceProvider.java
new file mode 100644
index 0000000000..b25429b4a7
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/ModelingServiceProvider.java
@@ -0,0 +1,8 @@
+package org.eclipse.osee.framework.core.datastore.internal;
+
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.message.IOseeModelingService;
+
+public interface ModelingServiceProvider {
+ IOseeModelingService getIOseeModelingService() throws OseeCoreException;
+}
diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/OseeCachingServiceRegistrationHandler.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/OseeCachingServiceRegistrationHandler.java
index a97585f83d..f005442324 100644
--- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/OseeCachingServiceRegistrationHandler.java
+++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/OseeCachingServiceRegistrationHandler.java
@@ -11,6 +11,9 @@
package org.eclipse.osee.framework.core.datastore.internal;
import java.util.Map;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.core.message.IOseeModelingService;
import org.eclipse.osee.framework.core.server.IApplicationServerLookup;
import org.eclipse.osee.framework.core.server.IApplicationServerManager;
import org.eclipse.osee.framework.core.services.IOseeCachingService;
@@ -19,8 +22,11 @@ import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
import org.eclipse.osee.framework.core.translation.IDataTranslationService;
import org.eclipse.osee.framework.core.util.AbstractTrackingHandler;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
+import org.eclipse.osee.framework.resource.management.IResourceLocatorManager;
+import org.eclipse.osee.framework.resource.management.IResourceManager;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
+import org.osgi.util.tracker.ServiceTracker;
/**
* @author Roberto E. Escobar
@@ -33,7 +39,10 @@ public class OseeCachingServiceRegistrationHandler extends AbstractTrackingHandl
IOseeModelFactoryService.class,
IDataTranslationService.class,
IApplicationServerLookup.class,
- IApplicationServerManager.class
+ IApplicationServerManager.class,
+// IOseeModelingService.class,
+ IResourceLocatorManager.class,
+ IResourceManager.class,
};
//@formatter:on
@@ -47,7 +56,7 @@ public class OseeCachingServiceRegistrationHandler extends AbstractTrackingHandl
@Override
public void onActivate(BundleContext context, Map<Class<?>, Object> services) {
- IOseeCachingServiceFactory factory = createCachingFactoryService(services);
+ IOseeCachingServiceFactory factory = createCachingFactoryService(context, services);
IOseeCachingService cachingService = factory.createCachingService();
factoryRegistration = context.registerService(IOseeCachingServiceFactory.class.getName(), factory, null);
@@ -64,13 +73,32 @@ public class OseeCachingServiceRegistrationHandler extends AbstractTrackingHandl
}
}
- private IOseeCachingServiceFactory createCachingFactoryService(Map<Class<?>, Object> services) {
+ private IOseeCachingServiceFactory createCachingFactoryService(final BundleContext context, Map<Class<?>, Object> services) {
final IOseeDatabaseService dbService = getService(IOseeDatabaseService.class, services);
- final IOseeModelFactoryService modelService = getService(IOseeModelFactoryService.class, services);
+ final IOseeModelFactoryService modelFactoryService = getService(IOseeModelFactoryService.class, services);
final IDataTranslationService translationService = getService(IDataTranslationService.class, services);
final IApplicationServerLookup lookupService = getService(IApplicationServerLookup.class, services);
final IApplicationServerManager appManager = getService(IApplicationServerManager.class, services);
+ final IResourceManager resourceManager = getService(IResourceManager.class, services);
+ final IResourceLocatorManager resourceLocatorManager = getService(IResourceLocatorManager.class, services);
- return new ServerOseeCachingServiceFactory(dbService, modelService, translationService, lookupService, appManager);
+ ModelingServiceProvider provider = new ModelingServiceProvider() {
+
+ @Override
+ public IOseeModelingService getIOseeModelingService() throws OseeCoreException {
+ ServiceTracker<IOseeModelingService, Object> tracker =
+ new ServiceTracker<IOseeModelingService, Object>(context, IOseeModelingService.class, null);
+ tracker.open(true);
+
+ IOseeModelingService toReturn = (IOseeModelingService) tracker.getService();
+ if (toReturn == null) {
+ throw new OseeStateException("IOseeModelingService could not be found");
+ }
+ return toReturn;
+ }
+ };
+
+ return new ServerOseeCachingServiceFactory(dbService, modelFactoryService, translationService, lookupService,
+ appManager, provider, resourceLocatorManager, resourceManager);
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/ServerOseeCachingServiceFactory.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/ServerOseeCachingServiceFactory.java
index ca1a7fcd64..68413770a9 100644
--- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/ServerOseeCachingServiceFactory.java
+++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/internal/ServerOseeCachingServiceFactory.java
@@ -11,22 +11,20 @@
package org.eclipse.osee.framework.core.datastore.internal;
import org.eclipse.osee.framework.core.datastore.cache.BranchUpdateEventImpl;
-import org.eclipse.osee.framework.core.datastore.cache.DatabaseArtifactTypeAccessor;
-import org.eclipse.osee.framework.core.datastore.cache.DatabaseAttributeTypeAccessor;
import org.eclipse.osee.framework.core.datastore.cache.DatabaseBranchAccessor;
-import org.eclipse.osee.framework.core.datastore.cache.DatabaseOseeEnumTypeAccessor;
-import org.eclipse.osee.framework.core.datastore.cache.DatabaseRelationTypeAccessor;
import org.eclipse.osee.framework.core.datastore.cache.DatabaseTransactionRecordAccessor;
import org.eclipse.osee.framework.core.datastore.cache.IBranchUpdateEvent;
import org.eclipse.osee.framework.core.model.OseeCachingService;
import org.eclipse.osee.framework.core.model.cache.ArtifactTypeCache;
import org.eclipse.osee.framework.core.model.cache.AttributeTypeCache;
import org.eclipse.osee.framework.core.model.cache.BranchCache;
-import org.eclipse.osee.framework.core.model.cache.IOseeDataAccessor;
import org.eclipse.osee.framework.core.model.cache.OseeEnumTypeCache;
import org.eclipse.osee.framework.core.model.cache.RelationTypeCache;
import org.eclipse.osee.framework.core.model.cache.TransactionCache;
+import org.eclipse.osee.framework.core.model.type.ArtifactType;
import org.eclipse.osee.framework.core.model.type.AttributeType;
+import org.eclipse.osee.framework.core.model.type.OseeEnumType;
+import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.core.server.IApplicationServerLookup;
import org.eclipse.osee.framework.core.server.IApplicationServerManager;
import org.eclipse.osee.framework.core.services.IOseeCachingService;
@@ -34,6 +32,8 @@ import org.eclipse.osee.framework.core.services.IOseeCachingServiceFactory;
import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
import org.eclipse.osee.framework.core.translation.IDataTranslationService;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
+import org.eclipse.osee.framework.resource.management.IResourceLocatorManager;
+import org.eclipse.osee.framework.resource.management.IResourceManager;
/**
* @author Roberto E. Escobar
@@ -45,26 +45,23 @@ public class ServerOseeCachingServiceFactory implements IOseeCachingServiceFacto
private final IDataTranslationService translationService;
private final IApplicationServerLookup serverLookUp;
private final IApplicationServerManager appManager;
+ private final ModelingServiceProvider modelingService;
+ private final IResourceLocatorManager locatorManager;
+ private final IResourceManager resourceManager;
- public ServerOseeCachingServiceFactory(IOseeDatabaseService databaseService, IOseeModelFactoryService factoryService, IDataTranslationService translationService, IApplicationServerLookup serverLookUp, IApplicationServerManager appManager) {
+ public ServerOseeCachingServiceFactory(IOseeDatabaseService databaseService, IOseeModelFactoryService factoryService, IDataTranslationService translationService, IApplicationServerLookup serverLookUp, IApplicationServerManager appManager, ModelingServiceProvider modelingService, IResourceLocatorManager locatorManager, IResourceManager resourceManager) {
this.databaseService = databaseService;
this.factoryService = factoryService;
this.translationService = translationService;
this.serverLookUp = serverLookUp;
this.appManager = appManager;
+ this.modelingService = modelingService;
+ this.locatorManager = locatorManager;
+ this.resourceManager = resourceManager;
}
@Override
public IOseeCachingService createCachingService() {
- OseeEnumTypeCache oseeEnumTypeCache =
- new OseeEnumTypeCache(new DatabaseOseeEnumTypeAccessor(databaseService,
- factoryService.getOseeEnumTypeFactory()));
-
- IOseeDataAccessor<String, AttributeType> attrAccessor =
- new DatabaseAttributeTypeAccessor(databaseService, oseeEnumTypeCache, factoryService.getAttributeTypeFactory());
-
- AttributeTypeCache attributeCache = new AttributeTypeCache(attrAccessor);
-
TransactionCache txCache = new TransactionCache();
IBranchUpdateEvent branchEventSender = new BranchUpdateEventImpl(translationService, appManager, serverLookUp);
BranchCache branchCache =
@@ -73,13 +70,18 @@ public class ServerOseeCachingServiceFactory implements IOseeCachingServiceFacto
txCache.setAccessor(new DatabaseTransactionRecordAccessor(databaseService, branchCache,
factoryService.getTransactionFactory()));
+ OseeEnumTypeCache oseeEnumTypeCache =
+ new OseeEnumTypeCache(new ArtifactTypeDataAccessor<OseeEnumType>(modelingService, databaseService,
+ locatorManager, resourceManager, branchCache));
+ AttributeTypeCache attributeCache =
+ new AttributeTypeCache(new ArtifactTypeDataAccessor<AttributeType>(modelingService, databaseService,
+ locatorManager, resourceManager, branchCache));
ArtifactTypeCache artifactCache =
- new ArtifactTypeCache(new DatabaseArtifactTypeAccessor(databaseService, branchCache, attributeCache,
- factoryService.getArtifactTypeFactory()));
-
+ new ArtifactTypeCache(new ArtifactTypeDataAccessor<ArtifactType>(modelingService, databaseService,
+ locatorManager, resourceManager, branchCache));
RelationTypeCache relationCache =
- new RelationTypeCache(new DatabaseRelationTypeAccessor(databaseService, artifactCache,
- factoryService.getRelationTypeFactory()));
+ new RelationTypeCache(new ArtifactTypeDataAccessor<RelationType>(modelingService, databaseService,
+ locatorManager, resourceManager, branchCache));
return new OseeCachingService(branchCache, txCache, artifactCache, attributeCache, relationCache,
oseeEnumTypeCache);
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 bacdef5850..f6f605927f 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
@@ -259,11 +259,6 @@ public class ArtifactMatchInterpreterTest {
return new ArtifactProxy() {
@Override
- public boolean matches(Identity... identities) {
- return false;
- }
-
- @Override
public String getUnqualifiedName() {
return null;
}
@@ -313,6 +308,11 @@ public class ArtifactMatchInterpreterTest {
return null;
}
+ @Override
+ public boolean matches(Identity<?>... identities) {
+ return false;
+ }
+
};
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactTypeRestrictionHandlerTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactTypeRestrictionHandlerTest.java
index 328082eb13..e40a981fc0 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactTypeRestrictionHandlerTest.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactTypeRestrictionHandlerTest.java
@@ -42,13 +42,14 @@ public class ArtifactTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
@Test
public void testProcessDataNotMatchesRestriction() throws OseeCoreException {
IArtifactType artifactType = CoreArtifactTypes.Requirement;
- XArtifactType artifactTypeRef = MockModel.createXArtifactType(artifactType.getGuid(), artifactType.getName());
+ XArtifactType artifactTypeRef =
+ MockModel.createXArtifactType(String.valueOf(artifactType.getGuid()), artifactType.getName());
ArtifactTypeRestriction restriction = MockModel.createArtifactTypeRestriction();
restriction.setPermission(AccessPermissionEnum.ALLOW);
restriction.setArtifactTypeRef(artifactTypeRef);
- ArtifactType artifactType2 = new ArtifactType(GUID.create(), "Some Artifact Type", false);
+ ArtifactType artifactType2 = new ArtifactType(0L, "Some Artifact Type", false);
MockArtifactProxy artData = new MockArtifactProxy(GUID.create(), artifactType2);
Scope expectedScope = new Scope().add("fail");
DslAsserts.assertNullAccessDetail(getRestrictionHandler(), restriction, artData, expectedScope);
@@ -57,7 +58,8 @@ public class ArtifactTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
@Test
public void testProcessCreateAccessDetail() throws OseeCoreException {
IArtifactType artifactType = CoreArtifactTypes.Requirement;
- XArtifactType artifactTypeRef = MockModel.createXArtifactType(artifactType.getGuid(), artifactType.getName());
+ XArtifactType artifactTypeRef =
+ MockModel.createXArtifactType(String.valueOf(artifactType.getGuid()), artifactType.getName());
ArtifactTypeRestriction restriction = MockModel.createArtifactTypeRestriction();
restriction.setPermission(AccessPermissionEnum.ALLOW);
@@ -74,7 +76,8 @@ public class ArtifactTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
@Test
public void testProcessArtifactTypeInheritance() throws OseeCoreException {
IArtifactType artifactType = CoreArtifactTypes.Artifact;
- XArtifactType artifactTypeRef = MockModel.createXArtifactType(artifactType.getGuid(), artifactType.getName());
+ XArtifactType artifactTypeRef =
+ MockModel.createXArtifactType(String.valueOf(artifactType.getGuid()), artifactType.getName());
ArtifactTypeRestriction restriction = MockModel.createArtifactTypeRestriction();
restriction.setPermission(AccessPermissionEnum.ALLOW);
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AttributeTypeRestrictionHandlerTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AttributeTypeRestrictionHandlerTest.java
index b68cb862ea..59086d2236 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AttributeTypeRestrictionHandlerTest.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AttributeTypeRestrictionHandlerTest.java
@@ -50,7 +50,7 @@ public class AttributeTypeRestrictionHandlerTest extends BaseRestrictionHandlerT
IAttributeType attributeType = CoreAttributeTypes.Name;
XAttributeType attributeTypeRef =
- MockModel.createXAttributeType(attributeType.getGuid(), attributeType.getName());
+ MockModel.createXAttributeType(String.valueOf(attributeType.getGuid()), attributeType.getName());
AttributeTypeRestriction restriction = MockModel.createAttributeTypeRestriction();
restriction.setPermission(AccessPermissionEnum.ALLOW);
@@ -68,7 +68,7 @@ public class AttributeTypeRestrictionHandlerTest extends BaseRestrictionHandlerT
IAttributeType attributeType = CoreAttributeTypes.Name;
XAttributeType attributeTypeRef =
- MockModel.createXAttributeType(attributeType.getGuid(), attributeType.getName());
+ MockModel.createXAttributeType(String.valueOf(attributeType.getGuid()), attributeType.getName());
AttributeTypeRestriction restriction = MockModel.createAttributeTypeRestriction();
restriction.setPermission(AccessPermissionEnum.ALLOW);
@@ -87,14 +87,15 @@ public class AttributeTypeRestrictionHandlerTest extends BaseRestrictionHandlerT
IAttributeType attributeType = CoreAttributeTypes.Name;
XAttributeType attributeTypeRef =
- MockModel.createXAttributeType(attributeType.getGuid(), attributeType.getName());
+ MockModel.createXAttributeType(String.valueOf(attributeType.getGuid()), attributeType.getName());
AttributeTypeRestriction restriction = MockModel.createAttributeTypeRestriction();
restriction.setPermission(AccessPermissionEnum.ALLOW);
restriction.setAttributeTypeRef(attributeTypeRef);
IArtifactType artifactType = CoreArtifactTypes.Artifact;
- XArtifactType artifactTypeRef = MockModel.createXArtifactType(artifactType.getGuid(), artifactType.getName());
+ XArtifactType artifactTypeRef =
+ MockModel.createXArtifactType(String.valueOf(artifactType.getGuid()), artifactType.getName());
restriction.setArtifactTypeRef(artifactTypeRef);
IArtifactType artifactType2 = CoreArtifactTypes.Requirement;
@@ -113,14 +114,15 @@ public class AttributeTypeRestrictionHandlerTest extends BaseRestrictionHandlerT
IAttributeType attributeType = CoreAttributeTypes.Name;
XAttributeType attributeTypeRef =
- MockModel.createXAttributeType(attributeType.getGuid(), attributeType.getName());
+ MockModel.createXAttributeType(String.valueOf(attributeType.getGuid()), attributeType.getName());
AttributeTypeRestriction restriction = MockModel.createAttributeTypeRestriction();
restriction.setPermission(AccessPermissionEnum.ALLOW);
restriction.setAttributeTypeRef(attributeTypeRef);
IArtifactType artifactType = CoreArtifactTypes.Requirement;
- XArtifactType artifactTypeRef = MockModel.createXArtifactType(artifactType.getGuid(), artifactType.getName());
+ XArtifactType artifactTypeRef =
+ MockModel.createXArtifactType(String.valueOf(artifactType.getGuid()), artifactType.getName());
restriction.setArtifactTypeRef(artifactTypeRef);
ArtifactType artArtifactType = new ArtifactType(artifactType.getGuid(), artifactType.getName(), false);
@@ -139,14 +141,15 @@ public class AttributeTypeRestrictionHandlerTest extends BaseRestrictionHandlerT
IAttributeType attributeType = CoreAttributeTypes.Name;
XAttributeType attributeTypeRef =
- MockModel.createXAttributeType(attributeType.getGuid(), attributeType.getName());
+ MockModel.createXAttributeType(String.valueOf(attributeType.getGuid()), attributeType.getName());
AttributeTypeRestriction restriction = MockModel.createAttributeTypeRestriction();
restriction.setPermission(AccessPermissionEnum.ALLOW);
restriction.setAttributeTypeRef(attributeTypeRef);
IArtifactType artifactType = CoreArtifactTypes.Artifact;
- XArtifactType artifactTypeRef = MockModel.createXArtifactType(artifactType.getGuid(), artifactType.getName());
+ XArtifactType artifactTypeRef =
+ MockModel.createXArtifactType(String.valueOf(artifactType.getGuid()), artifactType.getName());
restriction.setArtifactTypeRef(artifactTypeRef);
IArtifactType artifactType2 = CoreArtifactTypes.Requirement;
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java
index 73997d9a16..f1e2e00426 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java
@@ -59,7 +59,8 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
@Test
public void testProcessDataRelationTypeNoMatch() throws OseeCoreException {
IRelationType relationType = CoreRelationTypes.Default_Hierarchical__Child;
- XRelationType relationTypeRef = MockModel.createXRelationType(relationType.getGuid(), relationType.getName());
+ XRelationType relationTypeRef =
+ MockModel.createXRelationType(String.valueOf(relationType.getGuid()), relationType.getName());
RelationTypeRestriction restriction = MockModel.createRelationTypeRestriction();
restriction.setPermission(AccessPermissionEnum.ALLOW);
@@ -74,7 +75,8 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
@Test
public void testProcessDataRelationTypeMatchSideANoMatch() throws OseeCoreException {
IRelationType relationType = CoreRelationTypes.Default_Hierarchical__Child;
- XRelationType relationTypeRef = MockModel.createXRelationType(relationType.getGuid(), relationType.getName());
+ XRelationType relationTypeRef =
+ MockModel.createXRelationType(String.valueOf(relationType.getGuid()), relationType.getName());
RelationTypeRestriction restriction = MockModel.createRelationTypeRestriction();
restriction.setPermission(AccessPermissionEnum.ALLOW);
@@ -98,7 +100,8 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
@Test
public void testProcessDataRelationTypeMatchSideAMatch() throws OseeCoreException {
IRelationType relationType = CoreRelationTypes.Default_Hierarchical__Child;
- XRelationType relationTypeRef = MockModel.createXRelationType(relationType.getGuid(), relationType.getName());
+ XRelationType relationTypeRef =
+ MockModel.createXRelationType(String.valueOf(relationType.getGuid()), relationType.getName());
RelationTypeRestriction restriction = MockModel.createRelationTypeRestriction();
restriction.setPermission(AccessPermissionEnum.ALLOW);
@@ -125,7 +128,8 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
@Test
public void testProcessDataRelationTypeMatchSideBNoMatch() throws OseeCoreException {
IRelationType relationType = CoreRelationTypes.Default_Hierarchical__Child;
- XRelationType relationTypeRef = MockModel.createXRelationType(relationType.getGuid(), relationType.getName());
+ XRelationType relationTypeRef =
+ MockModel.createXRelationType(String.valueOf(relationType.getGuid()), relationType.getName());
RelationTypeRestriction restriction = MockModel.createRelationTypeRestriction();
restriction.setPermission(AccessPermissionEnum.ALLOW);
@@ -150,7 +154,8 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
@Test
public void testProcessDataRelationTypeMatchSideBMatch() throws OseeCoreException {
IRelationType relationType = CoreRelationTypes.Default_Hierarchical__Child;
- XRelationType relationTypeRef = MockModel.createXRelationType(relationType.getGuid(), relationType.getName());
+ XRelationType relationTypeRef =
+ MockModel.createXRelationType(String.valueOf(relationType.getGuid()), relationType.getName());
RelationTypeRestriction restriction = MockModel.createRelationTypeRestriction();
restriction.setPermission(AccessPermissionEnum.ALLOW);
@@ -177,7 +182,8 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
@Test
public void testProcessDataRelationTypeMatchBothMatch() throws OseeCoreException {
IRelationType relationType = CoreRelationTypes.Default_Hierarchical__Child;
- XRelationType relationTypeRef = MockModel.createXRelationType(relationType.getGuid(), relationType.getName());
+ XRelationType relationTypeRef =
+ MockModel.createXRelationType(String.valueOf(relationType.getGuid()), relationType.getName());
RelationTypeRestriction restriction = MockModel.createRelationTypeRestriction();
restriction.setPermission(AccessPermissionEnum.ALLOW);
@@ -222,7 +228,8 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
private void testProcessRelationWithArtifactHelper(String artifactName, String matcherArtifactName, Scope expectedScope) throws OseeCoreException {
IRelationType relationType = CoreRelationTypes.Default_Hierarchical__Child;
- XRelationType relationTypeRef = MockModel.createXRelationType(relationType.getGuid(), relationType.getName());
+ XRelationType relationTypeRef =
+ MockModel.createXRelationType(String.valueOf(relationType.getGuid()), relationType.getName());
RelationTypeRestriction restriction = MockModel.createRelationTypeRestriction();
restriction.setPermission(AccessPermissionEnum.ALLOW);
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeUtilTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeUtilTest.java
index a8149dd132..07f79181aa 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeUtilTest.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeUtilTest.java
@@ -78,7 +78,7 @@ public class OseeUtilTest {
}
@Test
- public void testToTokenArtifactType() {
+ public void testToTokenArtifactType() throws OseeCoreException {
XArtifactType type = OseeDslFactory.eINSTANCE.createXArtifactType();
IArtifactType expected = CoreArtifactTypes.GlobalPreferences;
@@ -93,7 +93,7 @@ public class OseeUtilTest {
}
@Test
- public void testToTokenAttributeType() {
+ public void testToTokenAttributeType() throws OseeCoreException {
XAttributeType type = OseeDslFactory.eINSTANCE.createXAttributeType();
IAttributeType expected = CoreAttributeTypes.Description;
@@ -108,7 +108,7 @@ public class OseeUtilTest {
}
@Test
- public void testToTokenRelationType() {
+ public void testToTokenRelationType() throws OseeCoreException {
XRelationType type = OseeDslFactory.eINSTANCE.createXRelationType();
IRelationType expected = CoreRelationTypes.Allocation__Component;
@@ -180,11 +180,11 @@ public class OseeUtilTest {
}
}
- private static void setupToToken(OseeType typeToCheck, Identity<String> expected) {
+ private static void setupToToken(OseeType typeToCheck, Identity<Long> expected) {
String name = "bogus name"; // This should not affect equality
- String guid = expected.getGuid();
+ Long guid = expected.getGuid();
typeToCheck.setName(name);
- typeToCheck.setTypeGuid(guid);
+ typeToCheck.setUuid(String.valueOf(guid));
Assert.assertEquals(name, typeToCheck.getName());
Assert.assertEquals(guid, typeToCheck.getTypeGuid());
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 cf739f5267..6e901f6a90 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
@@ -11,7 +11,6 @@
package org.eclipse.osee.framework.core.message.test.mocks;
import java.util.List;
-import org.junit.Assert;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.message.BranchCommitRequest;
import org.eclipse.osee.framework.core.message.BranchCommitResponse;
@@ -39,6 +38,7 @@ import org.eclipse.osee.framework.core.model.type.AttributeType;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.framework.jdk.core.util.Compare;
+import org.junit.Assert;
/**
* @author Roberto E. Escobar
@@ -82,7 +82,7 @@ public final class DataAsserts {
if (expected == null) {
Assert.assertNull(actual);
} else {
- assertEquals((AbstractOseeType) expected, (AbstractOseeType) actual);
+ assertEquals((AbstractOseeType<String>) expected, (AbstractOseeType<String>) actual);
Assert.assertEquals(expected.getShortName(), actual.getShortName());
Assert.assertEquals(expected.getAccessControlBranch(), actual.getAccessControlBranch());
Assert.assertEquals(expected.getAncestors(), actual.getAncestors());
@@ -151,7 +151,7 @@ public final class DataAsserts {
if (expected == null) {
Assert.assertNull(actual);
} else {
- assertEquals((AbstractOseeType) expected, (AbstractOseeType) actual);
+ assertEquals((AbstractOseeType<Long>) expected, (AbstractOseeType<Long>) actual);
Assert.assertEquals(expected.getSideAName(), actual.getSideAName());
Assert.assertEquals(expected.getSideBName(), actual.getSideBName());
Assert.assertEquals(expected.getMultiplicity(), actual.getMultiplicity());
@@ -161,7 +161,7 @@ public final class DataAsserts {
}
}
- public static void assertEquals(AbstractOseeType expected, AbstractOseeType actual) {
+ public static void assertEquals(AbstractOseeType<?> expected, AbstractOseeType<?> actual) {
if (expected == null) {
Assert.assertNull(actual);
} else {
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 a006fd522a..7606053a6d 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
@@ -30,9 +30,9 @@ public class ArtifactTypeCacheUpdateResponse {
private final List<ArtifactTypeRow> rows;
private final Map<Integer, Integer[]> baseToSuper;
- private final List<Triplet<String, String, String>> artAttrs;
+ private final List<Triplet<Long, String, Long>> artAttrs;
- public ArtifactTypeCacheUpdateResponse(List<ArtifactTypeRow> rows, Map<Integer, Integer[]> baseToSuper, List<Triplet<String, String, String>> artAttrs) {
+ public ArtifactTypeCacheUpdateResponse(List<ArtifactTypeRow> rows, Map<Integer, Integer[]> baseToSuper, List<Triplet<Long, String, Long>> artAttrs) {
this.rows = rows;
this.baseToSuper = baseToSuper;
this.artAttrs = artAttrs;
@@ -46,18 +46,18 @@ public class ArtifactTypeCacheUpdateResponse {
return baseToSuper;
}
- public List<Triplet<String, String, String>> getAttributeTypes() {
+ public List<Triplet<Long, String, Long>> getAttributeTypes() {
return artAttrs;
}
public static final class ArtifactTypeRow {
private final int id;
private final String name;
- private final String guid;
+ private final Long guid;
private final boolean isAbstract;
private StorageState storageState;
- protected ArtifactTypeRow(int id, String guid, String name, boolean isAbstract, StorageState storageState) {
+ protected ArtifactTypeRow(int id, Long guid, String name, boolean isAbstract, StorageState storageState) {
this.id = id;
this.guid = guid;
this.name = name;
@@ -73,7 +73,7 @@ public class ArtifactTypeCacheUpdateResponse {
return name;
}
- public String getGuid() {
+ public Long getGuid() {
return guid;
}
@@ -92,7 +92,7 @@ public class ArtifactTypeCacheUpdateResponse {
public String[] toArray() {
return new String[] {
String.valueOf(getId()),
- getGuid(),
+ String.valueOf(getGuid()),
getName(),
String.valueOf(isAbstract()),
getStorageState().name()};
@@ -100,11 +100,11 @@ public class ArtifactTypeCacheUpdateResponse {
public static ArtifactTypeRow fromArray(String[] data) {
int id = Integer.valueOf(data[0]);
- String guid = data[1];
+ long remoteId = Long.parseLong(data[1]);
String name = data[2];
boolean isAbstract = Boolean.valueOf(data[3]);
StorageState storageState = StorageState.valueOf(data[4]);
- return new ArtifactTypeRow(id, guid, name, isAbstract, storageState);
+ return new ArtifactTypeRow(id, remoteId, name, isAbstract, storageState);
}
@Override
@@ -116,7 +116,7 @@ public class ArtifactTypeCacheUpdateResponse {
public static ArtifactTypeCacheUpdateResponse fromCache(Collection<ArtifactType> types) throws OseeCoreException {
List<ArtifactTypeRow> rows = new ArrayList<ArtifactTypeRow>();
Map<Integer, Integer[]> baseToSuper = new HashMap<Integer, Integer[]>();
- List<Triplet<String, String, String>> artAttrs = new ArrayList<Triplet<String, String, String>>();
+ List<Triplet<Long, String, Long>> artAttrs = new ArrayList<Triplet<Long, String, Long>>();
for (ArtifactType artType : types) {
rows.add(new ArtifactTypeRow(artType.getId(), artType.getGuid(), artType.getName(), artType.isAbstract(),
artType.getStorageState()));
@@ -137,7 +137,7 @@ public class ArtifactTypeCacheUpdateResponse {
IOseeBranch branch = entry.getKey();
Collection<AttributeType> attrTypes = entry.getValue();
for (AttributeType type : attrTypes) {
- artAttrs.add(new Triplet<String, String, String>(artType.getGuid(), branch.getGuid(), type.getGuid()));
+ artAttrs.add(new Triplet<Long, String, Long>(artType.getGuid(), branch.getGuid(), type.getGuid()));
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/OseeEnumTypeCacheUpdateResponse.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/OseeEnumTypeCacheUpdateResponse.java
index bfbfafd2f5..709d03c550 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/OseeEnumTypeCacheUpdateResponse.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/OseeEnumTypeCacheUpdateResponse.java
@@ -45,11 +45,11 @@ public class OseeEnumTypeCacheUpdateResponse {
enumTypeRows.add(new String[] {
String.valueOf(type.getId()),
type.getStorageState().toString(),
- type.getGuid(),
+ String.valueOf(type.getGuid()),
type.getName()});
for (OseeEnumEntry entry : type.values()) {
enumEntryRows.add(new String[] {
- type.getGuid(),
+ String.valueOf(type.getGuid()),
entry.getGuid(),
entry.getName(),
String.valueOf(entry.ordinal())});
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/RelationTypeCacheUpdateResponse.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/RelationTypeCacheUpdateResponse.java
index 974ad9d240..07609a39ad 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/RelationTypeCacheUpdateResponse.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/RelationTypeCacheUpdateResponse.java
@@ -38,7 +38,7 @@ public class RelationTypeCacheUpdateResponse {
public static final class RelationTypeRow {
private final int id;
private final String name;
- private final String guid;
+ private final long guid;
private StorageState storageState;
private final String sideAName;
@@ -48,7 +48,7 @@ public class RelationTypeCacheUpdateResponse {
private final RelationTypeMultiplicity multiplicity;
private final String defaultOrderTypeGuid;
- public RelationTypeRow(int id, String name, String guid, StorageState storageState, String sideAName, String sideBName, int artifactTypeSideA, int artifactTypeSideB, RelationTypeMultiplicity multiplicity, String defaultOrderTypeGuid) {
+ public RelationTypeRow(int id, String name, long guid, StorageState storageState, String sideAName, String sideBName, int artifactTypeSideA, int artifactTypeSideB, RelationTypeMultiplicity multiplicity, String defaultOrderTypeGuid) {
super();
this.id = id;
this.name = name;
@@ -78,7 +78,7 @@ public class RelationTypeCacheUpdateResponse {
return name;
}
- public String getGuid() {
+ public long getGuid() {
return guid;
}
@@ -109,7 +109,7 @@ public class RelationTypeCacheUpdateResponse {
public String[] toArray() {
return new String[] {
String.valueOf(getId()),
- getGuid(),
+ String.valueOf(getGuid()),
getName(),
getStorageState().name(),
getSideAName(),
@@ -124,7 +124,7 @@ public class RelationTypeCacheUpdateResponse {
int index = 0;
int id = Integer.valueOf(data[index++]);
- String guid = data[index++];
+ long guid = Long.valueOf(data[index++]);
String name = data[index++];
StorageState storageState = StorageState.valueOf(data[index++]);
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 2f62fc65a5..ea91355d14 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
@@ -42,6 +42,10 @@ public final class TranslationUtil {
}
public static void loadTripletList(List<Triplet<String, String, String>> 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) {
storeToTripletList(data, store.getPropertyStore(key.name()));
}
@@ -49,6 +53,10 @@ public final class TranslationUtil {
store.put(key.name(), tripletListToStore(list));
}
+ public static void putTripletLongList(PropertyStore store, Enum<?> key, List<Triplet<Long, String, Long>> list) {
+ store.put(key.name(), tripletLongListToStore(list));
+ }
+
private static PropertyStore arrayMapToStore(Map<Integer, String[]> map) {
PropertyStore innerStore = new PropertyStore();
for (Entry<Integer, String[]> entry : map.entrySet()) {
@@ -106,7 +114,14 @@ public final class TranslationUtil {
}
}
- private static void storeToTripletList(List<Triplet<String, String, String>> data, PropertyStore innerStore) {
+ private static void storeToTripletList(List<Triplet<Long, String, 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])));
+ }
+ }
+
+ private static void storeToStringTripletList(List<Triplet<String, String, String>> 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]));
@@ -123,6 +138,19 @@ public final class TranslationUtil {
return innerStore;
}
+ private static PropertyStore tripletLongListToStore(List<Triplet<Long, String, 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())});
+ index++;
+ }
+ return innerStore;
+ }
+
public static void loadIntArrayMap(Map<Integer, Integer[]> map, PropertyStore store, Enum<?> key) {
storeToIntArrayMap(map, store.getPropertyStore(key.name()));
}
@@ -134,4 +162,5 @@ public final class TranslationUtil {
public static String createKey(Enum<?> prefix, int index) {
return prefix.name() + "_" + index;
}
+
}
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 b3a69e39b0..42a0d31229 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<Integer, Integer[]> baseToSuper = new HashMap<Integer, Integer[]>();
- List<Triplet<String, String, String>> artAttrs = new ArrayList<Triplet<String, String, String>>();
+ List<Triplet<Long, String, Long>> artAttrs = new ArrayList<Triplet<Long, String, Long>>();
int rowCount = store.getInt(Fields.ITEM_COUNT.name());
for (int index = 0; index < rowCount; index++) {
@@ -46,7 +46,7 @@ public class ArtifactTypeCacheUpdateResponseTranslator implements ITranslator<Ar
}
TranslationUtil.loadIntArrayMap(baseToSuper, store, Fields.BASE_TO_SUPER_TYPES);
- TranslationUtil.loadTripletList(artAttrs, store, Fields.BASE_BRANCH_ATTR);
+ TranslationUtil.loadTripletLongList(artAttrs, store, Fields.BASE_BRANCH_ATTR);
return new ArtifactTypeCacheUpdateResponse(rows, baseToSuper, artAttrs);
}
@@ -61,7 +61,7 @@ public class ArtifactTypeCacheUpdateResponseTranslator implements ITranslator<Ar
store.put(Fields.ITEM_COUNT.name(), rows.size());
TranslationUtil.putIntArrayMap(store, Fields.BASE_TO_SUPER_TYPES, object.getBaseToSuperTypes());
- TranslationUtil.putTripletList(store, Fields.BASE_BRANCH_ATTR, object.getAttributeTypes());
+ TranslationUtil.putTripletLongList(store, Fields.BASE_BRANCH_ATTR, object.getAttributeTypes());
return store;
}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/AttributeTypeCacheUpdateResponseTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/AttributeTypeCacheUpdateResponseTranslator.java
index cbb2e7149a..6d9dbd6c02 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/AttributeTypeCacheUpdateResponseTranslator.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/AttributeTypeCacheUpdateResponseTranslator.java
@@ -83,7 +83,7 @@ public class AttributeTypeCacheUpdateResponseTranslator implements ITranslator<A
type.getDefaultValue(),
type.getDescription(),
type.getFileTypeExtension(),
- type.getGuid(),
+ String.valueOf(type.getGuid()),
String.valueOf(type.getId()),
String.valueOf(type.getMaxOccurrences()),
String.valueOf(type.getMinOccurrences()),
@@ -98,7 +98,7 @@ public class AttributeTypeCacheUpdateResponseTranslator implements ITranslator<A
String defaultValue = data[2];
String description = data[3];
String fileTypeExtension = data[4];
- String guid = data[5];
+ long remoteId = Long.valueOf(data[5]);
int uniqueId = Integer.valueOf(data[6]);
int maxOccurrences = Integer.valueOf(data[7]);
int minOccurrences = Integer.valueOf(data[8]);
@@ -107,7 +107,7 @@ public class AttributeTypeCacheUpdateResponseTranslator implements ITranslator<A
String taggerId = data[11];
AttributeType type =
- factory.create(guid, name, baseAttributeTypeId, attributeProviderId, fileTypeExtension, defaultValue,
+ factory.create(remoteId, name, baseAttributeTypeId, attributeProviderId, fileTypeExtension, defaultValue,
minOccurrences, maxOccurrences, description, taggerId);
type.setId(uniqueId);
type.setStorageState(storageState);
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/SearchRequestTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/SearchRequestTranslator.java
index 69c92df90a..040b0fe15f 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/SearchRequestTranslator.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/SearchRequestTranslator.java
@@ -58,9 +58,9 @@ public class SearchRequestTranslator implements ITranslator<SearchRequest> {
String[] typeFilterNames = store.getArray(Entry.OPTION_ATTRIBUTE_TYPE_FILTER_NAMES.name());
if (typeFilterGuids.length > 0 && typeFilterNames.length > 0) {
for (int index = 0; index < typeFilterGuids.length; index++) {
- guid = typeFilterGuids[index];
+ long id = Long.valueOf(typeFilterGuids[index]);
name = index < typeFilterNames.length ? typeFilterNames[index] : Strings.emptyString();
- IAttributeType type = TokenFactory.createAttributeType(guid, name);
+ IAttributeType type = TokenFactory.createAttributeType(id, name);
options.addAttributeTypeFilter(type);
}
}
@@ -89,7 +89,7 @@ public class SearchRequestTranslator implements ITranslator<SearchRequest> {
String[] names = new String[types.size()];
int index = 0;
for (IAttributeType type : types) {
- guids[index] = type.getGuid();
+ guids[index] = String.valueOf(type.getGuid());
names[index] = type.getName();
index++;
}
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataQueryTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataQueryTest.java
index d8bc7847ba..440e669129 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataQueryTest.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataQueryTest.java
@@ -150,7 +150,7 @@ public class AccessDataQueryTest {
new MockArtifact(GUID.create(), "test2", branch, CoreArtifactTypes.Folder, 46);
IBasicArtifact<?> noAccessArtifact =
new MockArtifact(GUID.create(), "test3", branch, CoreArtifactTypes.Folder, 47);
- IArtifactType artType = TokenFactory.createArtifactType("AAMFDg_wmiYHHY5swJwA", "Folder");
+ IArtifactType artType = TokenFactory.createArtifactType(0x01L, "Folder");
AccessDetail<?> specificArtDetail =
MockDataFactory.createAccessDetails(accessArtifact, PermissionEnum.DENY, "",
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeTypeCacheTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeTypeCacheTest.java
index 91746b56c9..9f3e6151c0 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeTypeCacheTest.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeTypeCacheTest.java
@@ -7,17 +7,16 @@ package org.eclipse.osee.framework.core.model.cache;
import java.util.List;
import org.eclipse.osee.framework.core.model.AbstractOseeType;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
-public class AbstractOseeTypeCacheTest<T extends AbstractOseeType<String>> extends AbstractOseeCacheTest<String, T> {
+public class AbstractOseeTypeCacheTest<T extends AbstractOseeType<Long>> extends AbstractOseeCacheTest<Long, T> {
- // john chage String in template area
- public AbstractOseeTypeCacheTest(List<T> artifactTypes, AbstractOseeCache<String, T> typeCache) {
+ public AbstractOseeTypeCacheTest(List<T> artifactTypes, AbstractOseeCache<Long, T> typeCache) {
super(artifactTypes, typeCache);
}
@Override
- protected String createKey() {
- return GUID.create();
+ protected Long createKey() {
+ // john check what needs to happen here.
+ return 0x00L;
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/ArtifactTypeCacheTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/ArtifactTypeCacheTest.java
index e0d921cf18..a325d987e5 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/ArtifactTypeCacheTest.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/ArtifactTypeCacheTest.java
@@ -44,7 +44,7 @@ public class ArtifactTypeCacheTest extends AbstractOseeTypeCacheTest<ArtifactTyp
super(artifactTypes, artCache);
}
- private final static class ArtifactDataAccessor extends MockOseeDataAccessor<String, ArtifactType> {
+ private final static class ArtifactDataAccessor extends MockOseeDataAccessor<Long, ArtifactType> {
private final List<ArtifactType> artifactTypes;
public ArtifactDataAccessor(List<ArtifactType> artifactTypes) {
@@ -53,7 +53,7 @@ public class ArtifactTypeCacheTest extends AbstractOseeTypeCacheTest<ArtifactTyp
}
@Override
- public void load(IOseeCache<String, ArtifactType> cache) throws OseeCoreException {
+ public void load(IOseeCache<Long, ArtifactType> cache) throws OseeCoreException {
super.load(cache);
int typeId = 100;
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AttributeTypeCacheTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AttributeTypeCacheTest.java
index fdb536cc48..5b20d68785 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AttributeTypeCacheTest.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AttributeTypeCacheTest.java
@@ -44,7 +44,7 @@ public class AttributeTypeCacheTest extends AbstractOseeTypeCacheTest<AttributeT
super(attributeTypes, attrCache);
}
- private final static class AttributeDataAccessor extends MockOseeDataAccessor<String, AttributeType> {
+ private final static class AttributeDataAccessor extends MockOseeDataAccessor<Long, AttributeType> {
private final List<AttributeType> attributeTypes;
@@ -54,7 +54,7 @@ public class AttributeTypeCacheTest extends AbstractOseeTypeCacheTest<AttributeT
}
@Override
- public void load(IOseeCache<String, AttributeType> cache) throws OseeCoreException {
+ public void load(IOseeCache<Long, AttributeType> cache) throws OseeCoreException {
super.load(cache);
int typeId = 100;
for (int index = 0; index < 10; index++) {
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/OseeEnumTypeCacheTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/OseeEnumTypeCacheTest.java
index 2567edb23e..0b4cc50915 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/OseeEnumTypeCacheTest.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/OseeEnumTypeCacheTest.java
@@ -51,7 +51,7 @@ public class OseeEnumTypeCacheTest extends AbstractOseeTypeCacheTest<OseeEnumTyp
ModelAsserts.checkEnumType(expected, actual);
}
- private final static class EnumDataAccessor extends MockOseeDataAccessor<String, OseeEnumType> {
+ private final static class EnumDataAccessor extends MockOseeDataAccessor<Long, OseeEnumType> {
private final List<OseeEnumType> oseeEnumTypes;
public EnumDataAccessor(List<OseeEnumType> oseeEnumTypes) {
@@ -60,7 +60,7 @@ public class OseeEnumTypeCacheTest extends AbstractOseeTypeCacheTest<OseeEnumTyp
}
@Override
- public void load(IOseeCache<String, OseeEnumType> cache) throws OseeCoreException {
+ public void load(IOseeCache<Long, OseeEnumType> cache) throws OseeCoreException {
super.load(cache);
int typeId = 100;
for (int index = 0; index < 10; index++) {
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/RelationTypeCacheTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/RelationTypeCacheTest.java
index 9acde04edf..df515f661d 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/RelationTypeCacheTest.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/RelationTypeCacheTest.java
@@ -44,7 +44,7 @@ public class RelationTypeCacheTest extends AbstractOseeTypeCacheTest<RelationTyp
super(data, cache);
}
- private final static class RelationDataAccessor extends MockOseeDataAccessor<String, RelationType> {
+ private final static class RelationDataAccessor extends MockOseeDataAccessor<Long, RelationType> {
private final List<RelationType> relationTypes;
public RelationDataAccessor(List<RelationType> relationTypes) {
@@ -53,7 +53,7 @@ public class RelationTypeCacheTest extends AbstractOseeTypeCacheTest<RelationTyp
}
@Override
- public void load(IOseeCache<String, RelationType> cache) throws OseeCoreException {
+ public void load(IOseeCache<Long, RelationType> cache) throws OseeCoreException {
super.load(cache);
int typeId = 100;
for (int index = 0; index < 10; index++) {
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockAbstractOseeType.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockAbstractOseeType.java
index 0bb025c08c..55d4969f65 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockAbstractOseeType.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockAbstractOseeType.java
@@ -15,9 +15,9 @@ import org.eclipse.osee.framework.core.model.AbstractOseeType;
/**
* @author Roberto E. Escobar
*/
-public class MockAbstractOseeType extends AbstractOseeType {
+public class MockAbstractOseeType extends AbstractOseeType<Long> {
- public MockAbstractOseeType(String guid, String name) {
+ public MockAbstractOseeType(Long guid, String name) {
super(guid, name);
}
}
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 dd6056c73d..1eb7879652 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
@@ -11,6 +11,7 @@
package org.eclipse.osee.framework.core.model.mocks;
import java.util.Date;
+import java.util.Random;
import org.eclipse.osee.framework.core.data.IAccessContextId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.TokenFactory;
@@ -51,6 +52,8 @@ import org.junit.Assert;
*/
public final class MockDataFactory {
+ private static final Random random = new Random();
+
private MockDataFactory() {
// Utility Class
}
@@ -79,8 +82,9 @@ public final class MockDataFactory {
public static AttributeType createAttributeType() throws OseeCoreException {
OseeEnumTypeFactory oseeEnumTypeFactory = new OseeEnumTypeFactory();
AttributeType attributeType =
- new AttributeType(GUID.create(), "name", "baseType", "providerName", ".xml", "", 1, 1, "description", "tagger");
- attributeType.setOseeEnumType(oseeEnumTypeFactory.createEnumType(GUID.create(), "enum type name"));
+ new AttributeType(random.nextLong(), "name", "baseType", "providerName", ".xml", "", 1, 1, "description",
+ "tagger");
+ attributeType.setOseeEnumType(oseeEnumTypeFactory.createEnumType(0x01L, "enum type name"));
return attributeType;
}
@@ -106,19 +110,19 @@ public final class MockDataFactory {
}
public static OseeEnumType createEnumType(int index) {
- return new OseeEnumType(GUID.create(), "enum_" + index);
+ return new OseeEnumType(random.nextLong(), "enum_" + index);
}
public static AttributeType createAttributeType(int index, OseeEnumType oseeEnumType) throws OseeCoreException {
AttributeType type =
- new AttributeType(GUID.create(), "attrType_" + index, "baseClass_" + index, "providerId_" + index,
+ new AttributeType(random.nextLong(), "attrType_" + index, "baseClass_" + index, "providerId_" + index,
"ext_" + index, "default_" + index, index * 2, index * 7, "description_" + index, "tag_" + index);
type.setOseeEnumType(oseeEnumType);
return type;
}
public static ArtifactType createArtifactType(int index) {
- return new ArtifactType(GUID.create(), "art_" + index, index % 2 == 0);
+ return new ArtifactType(random.nextLong(), "art_" + index, index % 2 == 0);
}
public static ArtifactType createBaseArtifactType() {
@@ -129,7 +133,7 @@ public final class MockDataFactory {
RelationTypeMultiplicity multiplicity =
RelationTypeMultiplicity.values()[Math.abs(index % RelationTypeMultiplicity.values().length)];
String order = RelationOrderBaseTypes.values[index % RelationTypeMultiplicity.values().length].getGuid();
- return new RelationType(GUID.create(), "relType_" + index, "sideA_" + index, "sideB_" + index, artTypeA,
+ return new RelationType(random.nextLong(), "relType_" + index, "sideA_" + index, "sideB_" + index, artTypeA,
artTypeB, multiplicity, order);
}
@@ -137,10 +141,10 @@ public final class MockDataFactory {
BranchCache brCache = new BranchCache(new MockOseeDataAccessor<String, Branch>());
TransactionCache txCache = new TransactionCache();
txCache.setAccessor(new MockOseeTransactionDataAccessor());
- ArtifactTypeCache artCache = new ArtifactTypeCache(new MockOseeDataAccessor<String, ArtifactType>());
- AttributeTypeCache attrCache = new AttributeTypeCache(new MockOseeDataAccessor<String, AttributeType>());
- RelationTypeCache relCache = new RelationTypeCache(new MockOseeDataAccessor<String, RelationType>());
- OseeEnumTypeCache enumCache = new OseeEnumTypeCache(new MockOseeDataAccessor<String, OseeEnumType>());
+ ArtifactTypeCache artCache = new ArtifactTypeCache(new MockOseeDataAccessor<Long, ArtifactType>());
+ AttributeTypeCache attrCache = new AttributeTypeCache(new MockOseeDataAccessor<Long, AttributeType>());
+ RelationTypeCache relCache = new RelationTypeCache(new MockOseeDataAccessor<Long, RelationType>());
+ OseeEnumTypeCache enumCache = new OseeEnumTypeCache(new MockOseeDataAccessor<Long, OseeEnumType>());
IOseeCachingService service = new OseeCachingService(brCache, txCache, artCache, attrCache, relCache, enumCache);
return new MockOseeCachingServiceProvider(service);
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 9809f7c642..ccc86bae66 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
@@ -135,7 +135,7 @@ public class ModelAsserts {
}
}
- public static RelationType createRelationType(AbstractOseeCache<String, ArtifactType> artCache, String guid, String name, String aGUID, String bGUID, RelationTypeMultiplicity multiplicity) throws OseeCoreException {
+ public static RelationType createRelationType(AbstractOseeCache<Long, ArtifactType> artCache, Long guid, String name, Long aGUID, Long bGUID, RelationTypeMultiplicity multiplicity) throws OseeCoreException {
IArtifactType type1 = artCache.getByGuid(aGUID);
IArtifactType type2 = artCache.getByGuid(bGUID);
RelationType relationType =
@@ -155,7 +155,7 @@ public class ModelAsserts {
return branch;
}
- public static AttributeType createAttributeType(String guid, String name) {
+ public static AttributeType createAttributeType(Long guid, String name) {
AttributeType attributeType =
new AttributeType(guid, name, "DummyBase", "DummyProvider", "none", "none", 1, 1, "test data", null);
Assert.assertNotNull(attributeType);
@@ -174,7 +174,7 @@ public class ModelAsserts {
}
}
- public static OseeEnumType createEnumType(IOseeTypeFactory factory, String guid, String name, Object... entries) throws OseeCoreException {
+ public static OseeEnumType createEnumType(IOseeTypeFactory factory, Long guid, String name, Object... entries) throws OseeCoreException {
OseeEnumType type = new OseeEnumType(guid, name);
if (entries != null && entries.length > 0) {
List<OseeEnumEntry> items = new ArrayList<OseeEnumEntry>();
@@ -220,12 +220,12 @@ public class ModelAsserts {
Assert.assertEquals(expected.getGuid(), actual.getGuid());
}
- public static void checkInheritance(AbstractOseeCache<String, ArtifactType> artCache, String artTypeGuid, String... superTypeGuids) throws OseeCoreException {
+ public static void checkInheritance(AbstractOseeCache<Long, ArtifactType> artCache, Long artTypeGuid, Long... superTypeGuids) throws OseeCoreException {
ArtifactType target = artCache.getByGuid(artTypeGuid);
Assert.assertNotNull(target);
List<ArtifactType> expectedSuperTypes = new ArrayList<ArtifactType>();
- for (String superTyperGuid : superTypeGuids) {
+ for (Long superTyperGuid : superTypeGuids) {
ArtifactType superArtifactType = artCache.getByGuid(superTyperGuid);
Assert.assertNotNull(superArtifactType);
expectedSuperTypes.add(superArtifactType);
@@ -243,12 +243,12 @@ public class ModelAsserts {
}
}
- public static void checkDescendants(AbstractOseeCache<String, ArtifactType> artCache, String artTypeGuid, boolean isAllLevels, String... descendantGuids) throws OseeCoreException {
+ public static void checkDescendants(AbstractOseeCache<Long, ArtifactType> artCache, Long artTypeGuid, boolean isAllLevels, Long... descendantGuids) throws OseeCoreException {
ArtifactType target = artCache.getByGuid(artTypeGuid);
Assert.assertNotNull(target);
List<ArtifactType> expectedDescendants = new ArrayList<ArtifactType>();
- for (String type : descendantGuids) {
+ for (Long type : descendantGuids) {
ArtifactType childType = artCache.getByGuid(type);
Assert.assertNotNull(childType);
expectedDescendants.add(childType);
@@ -272,12 +272,12 @@ public class ModelAsserts {
}
}
- public static void checkAttributes(AbstractOseeCache<String, ArtifactType> artCache, AbstractOseeCache<String, AttributeType> attrCache, String artTypeGuid, Branch branch, String... attributeGuids) throws OseeCoreException {
+ public static void checkAttributes(AbstractOseeCache<Long, ArtifactType> artCache, AbstractOseeCache<Long, AttributeType> attrCache, Long artTypeGuid, Branch branch, Long... attributeGuids) throws OseeCoreException {
ArtifactType artifactType = artCache.getByGuid(artTypeGuid);
Assert.assertNotNull(artifactType);
List<IAttributeType> expectedAttributes = new ArrayList<IAttributeType>();
- for (String attrGuid : attributeGuids) {
+ for (Long attrGuid : attributeGuids) {
IAttributeType attributeType = attrCache.getByGuid(attrGuid);
Assert.assertNotNull(attributeType);
expectedAttributes.add(attributeType);
@@ -299,7 +299,7 @@ public class ModelAsserts {
artifactType.getName(), branch.getName(), typesNotFound), typesNotFound.isEmpty());
}
- public static void checkRelationTypeInheritance(AbstractOseeCache<String, RelationType> cache, AbstractOseeCache<String, ArtifactType> artCache, String relGuid, RelationSide relationSide, int maxValue, String... artifactTypesAllowed) throws OseeCoreException {
+ public static void checkRelationTypeInheritance(AbstractOseeCache<Long, RelationType> cache, AbstractOseeCache<Long, ArtifactType> artCache, String relGuid, RelationSide relationSide, int maxValue, String... artifactTypesAllowed) throws OseeCoreException {
RelationType relationType = cache.getByGuid(relGuid);
Assert.assertNotNull(relationType);
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/AbstractOseeTypeTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/AbstractOseeTypeTest.java
index 45f908f78a..9ee4848e08 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/AbstractOseeTypeTest.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/AbstractOseeTypeTest.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.model.type;
-import org.junit.Assert;
import org.eclipse.osee.framework.core.enums.StorageState;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
@@ -18,18 +17,19 @@ import org.eclipse.osee.framework.core.model.AbstractOseeType;
import org.eclipse.osee.framework.core.model.IOseeStorable;
import org.eclipse.osee.framework.core.model.mocks.ModelAsserts;
import org.eclipse.osee.framework.jdk.core.util.GUID;
+import org.junit.Assert;
import org.junit.Test;
/**
* @author Roberto E. Escobar
*/
-public class AbstractOseeTypeTest<T extends AbstractOseeType> {
+public class AbstractOseeTypeTest<K, T extends AbstractOseeType<K>> {
private final T type;
private final String name;
- private final String guid;
+ private final K guid;
- protected AbstractOseeTypeTest(T type, String guid, String name) {
+ protected AbstractOseeTypeTest(T type, K guid, String name) {
this.type = type;
this.name = name;
this.guid = guid;
@@ -43,7 +43,7 @@ public class AbstractOseeTypeTest<T extends AbstractOseeType> {
return name;
}
- protected String getExpectedGuid() {
+ protected K getExpectedGuid() {
return guid;
}
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/ArtifactTypeTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/ArtifactTypeTest.java
index 4bc641074a..86204ebb3d 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/ArtifactTypeTest.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/ArtifactTypeTest.java
@@ -12,10 +12,8 @@ package org.eclipse.osee.framework.core.model.type;
import java.util.ArrayList;
import java.util.Collection;
-import org.junit.Assert;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.type.ArtifactType;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
+import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -28,11 +26,11 @@ import org.junit.runners.Parameterized.Parameters;
* @author Roberto E. Escobar
*/
@RunWith(Parameterized.class)
-public class ArtifactTypeTest extends AbstractOseeTypeTest<ArtifactType> {
+public class ArtifactTypeTest extends AbstractOseeTypeTest<Long, ArtifactType> {
private final boolean isAbstract;
- public ArtifactTypeTest(ArtifactType type, String guid, String name, boolean isAbstract) {
+ public ArtifactTypeTest(ArtifactType type, Long guid, String name, boolean isAbstract) {
super(type, guid, name);
this.isAbstract = isAbstract;
}
@@ -88,7 +86,7 @@ public class ArtifactTypeTest extends AbstractOseeTypeTest<ArtifactType> {
Collection<Object[]> data = new ArrayList<Object[]>();
boolean isAbstract = true;
for (int index = 1; index <= 3; index++) {
- String guid = GUID.create();
+ Long guid = 0x00L;
String name = "index: " + index;
isAbstract ^= isAbstract;
data.add(new Object[] {new ArtifactType(guid, name, isAbstract), guid, name, isAbstract});
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/BaseOseeTypeTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/BaseOseeTypeTest.java
index 3e30921440..7da4c5d838 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/BaseOseeTypeTest.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/BaseOseeTypeTest.java
@@ -13,7 +13,6 @@ package org.eclipse.osee.framework.core.model.type;
import java.util.ArrayList;
import java.util.Collection;
import org.eclipse.osee.framework.core.model.mocks.MockAbstractOseeType;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -24,9 +23,9 @@ import org.junit.runners.Parameterized.Parameters;
* @author Roberto E. Escobar
*/
@RunWith(Parameterized.class)
-public class BaseOseeTypeTest extends AbstractOseeTypeTest<MockAbstractOseeType> {
+public class BaseOseeTypeTest extends AbstractOseeTypeTest<Long, MockAbstractOseeType> {
- public BaseOseeTypeTest(MockAbstractOseeType type, String guid, String name) {
+ public BaseOseeTypeTest(MockAbstractOseeType type, Long guid, String name) {
super(type, guid, name);
}
@@ -34,7 +33,7 @@ public class BaseOseeTypeTest extends AbstractOseeTypeTest<MockAbstractOseeType>
public static Collection<Object[]> getData() {
Collection<Object[]> data = new ArrayList<Object[]>();
for (int index = 1; index <= 2; index++) {
- String guid = GUID.create();
+ Long guid = (long) index;
String name = "index: " + index;
data.add(new Object[] {new MockAbstractOseeType(guid, name), guid, name});
}
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/OseeEnumTypeTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/OseeEnumTypeTest.java
index b4c3a7a960..31e5912c4a 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/OseeEnumTypeTest.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/OseeEnumTypeTest.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.framework.core.model.type;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.type.OseeEnumType;
import org.junit.Ignore;
import org.junit.Test;
@@ -23,19 +22,19 @@ public class OseeEnumTypeTest {
@Test(expected = OseeArgumentException.class)
public void enumNamesWithSpaces() throws OseeCoreException {
- OseeEnumType oseeEnum = new OseeEnumType("ABC", "Test");
+ OseeEnumType oseeEnum = new OseeEnumType(0x00L, "Test");
oseeEnum.valueOf(new String(" apple "));
}
@Test(expected = OseeArgumentException.class)
public void enumNamesWithGarbageData() throws OseeCoreException {
- OseeEnumType oseeEnum = new OseeEnumType("ABC", "Test");
+ OseeEnumType oseeEnum = new OseeEnumType(0x00L, "Test");
oseeEnum.valueOf(new String("#@Gbotkob!11233%20"));
}
@Test(expected = OseeArgumentException.class)
public void enumNamesWithNull() throws OseeCoreException {
- OseeEnumType oseeEnum = new OseeEnumType("ABC", "Test");
+ OseeEnumType oseeEnum = new OseeEnumType(0x00L, "Test");
oseeEnum.valueOf(null);
}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/RelationTypeSide.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/RelationTypeSide.java
index b4d8f7f527..2e7a127ddd 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/RelationTypeSide.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/RelationTypeSide.java
@@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.enums.RelationSide;
/**
* @author Andrew M. Finkbeiner
*/
-public class RelationTypeSide extends NamedIdentity<String> implements IRelationTypeSide {
+public class RelationTypeSide extends NamedIdentity<Long> implements IRelationTypeSide {
private final IRelationType type;
private final RelationSide side;
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCache.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCache.java
index 144523c697..f3d24fb240 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCache.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCache.java
@@ -26,6 +26,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
import org.eclipse.osee.framework.core.model.AbstractOseeType;
+import org.eclipse.osee.framework.core.model.IOseeStorable;
import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.jdk.core.util.GUID;
@@ -328,7 +329,14 @@ public abstract class AbstractOseeCache<K, T extends AbstractOseeType<K>> implem
}
}
- public final int getLocalId(Identity token) throws OseeCoreException {
- return get(token).getId();
+ public final int getLocalId(Identity<K> token) throws OseeCoreException {
+ T type = get(token);
+ return type != null ? type.getId() : IOseeStorable.UNPERSISTED_VALUE;
+ }
+
+ public void cacheFrom(AbstractOseeCache<K, T> source) throws OseeCoreException {
+ for (T type : source.getAll()) {
+ cache(type);
+ }
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/ArtifactTypeCache.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/ArtifactTypeCache.java
index f6fa364cdf..8a6df0c294 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/ArtifactTypeCache.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/ArtifactTypeCache.java
@@ -16,9 +16,9 @@ import org.eclipse.osee.framework.core.model.type.ArtifactType;
/**
* @author Roberto E. Escobar
*/
-public final class ArtifactTypeCache extends AbstractOseeCache<String, ArtifactType> {
+public final class ArtifactTypeCache extends AbstractOseeCache<Long, ArtifactType> {
- public ArtifactTypeCache(IOseeDataAccessor<String, ArtifactType> dataAccessor) {
+ public ArtifactTypeCache(IOseeDataAccessor<Long, ArtifactType> dataAccessor) {
super(OseeCacheEnum.ARTIFACT_TYPE_CACHE, dataAccessor, true);
}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AttributeTypeCache.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AttributeTypeCache.java
index caad99e70d..7f7f5fbd10 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AttributeTypeCache.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AttributeTypeCache.java
@@ -16,9 +16,9 @@ import org.eclipse.osee.framework.core.model.type.AttributeType;
/**
* @author Roberto E. Escobar
*/
-public final class AttributeTypeCache extends AbstractOseeCache<String, AttributeType> {
+public final class AttributeTypeCache extends AbstractOseeCache<Long, AttributeType> {
- public AttributeTypeCache(IOseeDataAccessor<String, AttributeType> dataAccessor) {
+ public AttributeTypeCache(IOseeDataAccessor<Long, AttributeType> dataAccessor) {
super(OseeCacheEnum.ATTRIBUTE_TYPE_CACHE, dataAccessor, true);
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/OseeEnumTypeCache.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/OseeEnumTypeCache.java
index fe5d9a8367..10ae72be66 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/OseeEnumTypeCache.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/OseeEnumTypeCache.java
@@ -16,9 +16,9 @@ import org.eclipse.osee.framework.core.model.type.OseeEnumType;
/**
* @author Roberto E. Escobar
*/
-public final class OseeEnumTypeCache extends AbstractOseeCache<String, OseeEnumType> {
+public final class OseeEnumTypeCache extends AbstractOseeCache<Long, OseeEnumType> {
- public OseeEnumTypeCache(IOseeDataAccessor<String, OseeEnumType> dataAccessor) {
+ public OseeEnumTypeCache(IOseeDataAccessor<Long, OseeEnumType> dataAccessor) {
super(OseeCacheEnum.OSEE_ENUM_TYPE_CACHE, dataAccessor, true);
}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/RelationTypeCache.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/RelationTypeCache.java
index a34ab1f0cc..3bc88b9522 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/RelationTypeCache.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/RelationTypeCache.java
@@ -16,9 +16,9 @@ import org.eclipse.osee.framework.core.model.type.RelationType;
/**
* @author Roberto E. Escobar
*/
-public final class RelationTypeCache extends AbstractOseeCache<String, RelationType> {
+public final class RelationTypeCache extends AbstractOseeCache<Long, RelationType> {
- public RelationTypeCache(IOseeDataAccessor<String, RelationType> dataAccessor) {
+ public RelationTypeCache(IOseeDataAccessor<Long, RelationType> dataAccessor) {
super(OseeCacheEnum.RELATION_TYPE_CACHE, dataAccessor, true);
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidArtifact.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidArtifact.java
index 51e6709cb2..9335bdd8a9 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidArtifact.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidArtifact.java
@@ -18,10 +18,10 @@ import org.eclipse.osee.framework.core.data.IArtifactType;
public class DefaultBasicGuidArtifact implements IBasicGuidArtifact {
private static final long serialVersionUID = -4997763989583925345L;
private final String branchGuid;
- private String artTypeGuid;
+ private Long artTypeGuid;
private final String artGuid;
- public DefaultBasicGuidArtifact(String branchGuid, String artTypeGuid, String guid) {
+ public DefaultBasicGuidArtifact(String branchGuid, Long artTypeGuid, String guid) {
this.branchGuid = branchGuid;
this.artTypeGuid = artTypeGuid;
this.artGuid = guid;
@@ -33,7 +33,7 @@ public class DefaultBasicGuidArtifact implements IBasicGuidArtifact {
}
@Override
- public String getArtTypeGuid() {
+ public Long getArtTypeGuid() {
return artTypeGuid;
}
@@ -82,7 +82,7 @@ public class DefaultBasicGuidArtifact implements IBasicGuidArtifact {
return artGuid;
}
- public void setArtTypeGuid(String artTypeGuid) {
+ public void setArtTypeGuid(Long artTypeGuid) {
this.artTypeGuid = artTypeGuid;
}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidRelation.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidRelation.java
index 5c3e27e2af..b38f593c5c 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidRelation.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidRelation.java
@@ -19,11 +19,11 @@ public class DefaultBasicGuidRelation implements IBasicGuidRelation {
DefaultBasicGuidArtifact artA, artB;
String branchGuid;
- String relTypeGuid;
+ Long relTypeGuid;
int gammaId;
int relationId;
- public DefaultBasicGuidRelation(String branchGuid, String relTypeGuid, int relationId, int gammaId, DefaultBasicGuidArtifact artA, DefaultBasicGuidArtifact artB) {
+ public DefaultBasicGuidRelation(String branchGuid, Long relTypeGuid, int relationId, int gammaId, DefaultBasicGuidArtifact artA, DefaultBasicGuidArtifact artB) {
this.branchGuid = branchGuid;
this.relTypeGuid = relTypeGuid;
this.relationId = relationId;
@@ -53,7 +53,7 @@ public class DefaultBasicGuidRelation implements IBasicGuidRelation {
}
@Override
- public String getRelTypeGuid() {
+ public Long getRelTypeGuid() {
return relTypeGuid;
}
@@ -69,7 +69,7 @@ public class DefaultBasicGuidRelation implements IBasicGuidRelation {
this.branchGuid = branchGuid;
}
- public void setRelTypeGuid(String relTypeGuid) {
+ public void setRelTypeGuid(Long relTypeGuid) {
this.relTypeGuid = relTypeGuid;
}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidRelationReorder.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidRelationReorder.java
index 6bf304b984..9a3c3a239a 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidRelationReorder.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidRelationReorder.java
@@ -19,10 +19,10 @@ public class DefaultBasicGuidRelationReorder implements IBasicRelationReorder {
private DefaultBasicGuidArtifact parentArt;
private String branchGuid;
- private String relTypeGuid;
+ private Long relTypeGuid;
private RelationOrderModType modType;
- public DefaultBasicGuidRelationReorder(RelationOrderModType modType, String branchGuid, String relTypeGuid, DefaultBasicGuidArtifact artA) {
+ public DefaultBasicGuidRelationReorder(RelationOrderModType modType, String branchGuid, Long relTypeGuid, DefaultBasicGuidArtifact artA) {
this.modType = modType;
this.branchGuid = branchGuid;
this.relTypeGuid = relTypeGuid;
@@ -40,7 +40,7 @@ public class DefaultBasicGuidRelationReorder implements IBasicRelationReorder {
}
@Override
- public String getRelTypeGuid() {
+ public Long getRelTypeGuid() {
return relTypeGuid;
}
@@ -52,7 +52,7 @@ public class DefaultBasicGuidRelationReorder implements IBasicRelationReorder {
this.branchGuid = branchGuid;
}
- public void setRelTypeGuid(String relTypeGuid) {
+ public void setRelTypeGuid(Long relTypeGuid) {
this.relTypeGuid = relTypeGuid;
}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/IBasicGuidArtifact.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/IBasicGuidArtifact.java
index fdaf704826..9d8c3c19cb 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/IBasicGuidArtifact.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/IBasicGuidArtifact.java
@@ -16,7 +16,7 @@ package org.eclipse.osee.framework.core.model.event;
public interface IBasicGuidArtifact {
public abstract String getGuid();
- public abstract String getArtTypeGuid();
+ public abstract Long getArtTypeGuid();
public abstract String getBranchGuid();
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/IBasicGuidRelation.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/IBasicGuidRelation.java
index 9b94c08397..f1d563bd74 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/IBasicGuidRelation.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/IBasicGuidRelation.java
@@ -19,7 +19,7 @@ public interface IBasicGuidRelation {
DefaultBasicGuidArtifact getArtB();
- String getRelTypeGuid();
+ Long getRelTypeGuid();
String getBranchGuid();
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/IBasicRelationReorder.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/IBasicRelationReorder.java
index da389cfa78..3979149af8 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/IBasicRelationReorder.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/IBasicRelationReorder.java
@@ -17,7 +17,7 @@ public interface IBasicRelationReorder {
DefaultBasicGuidArtifact getParentArt();
- String getRelTypeGuid();
+ Long getRelTypeGuid();
String getBranchGuid();
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/ArtifactType.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/ArtifactType.java
index 5ac1ca97f9..e41f1130ec 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/ArtifactType.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/ArtifactType.java
@@ -30,7 +30,7 @@ import org.eclipse.osee.framework.core.model.internal.fields.ArtifactTypeAttribu
/**
* @author Robert A. Fisher
*/
-public final class ArtifactType extends AbstractOseeType<String> implements IArtifactType {
+public final class ArtifactType extends AbstractOseeType<Long> implements IArtifactType {
public static final String ARTIFACT_IS_ABSTRACT_FIELD_KEY = "osee.artifact.type.is.abstract.field";
public static final String ARTIFACT_INHERITANCE_FIELD_KEY = "osee.artifact.type.inheritance.field";
@@ -41,7 +41,7 @@ public final class ArtifactType extends AbstractOseeType<String> implements IArt
private final Map<IOseeBranch, Collection<AttributeType>> attributes =
new HashMap<IOseeBranch, Collection<AttributeType>>();
- public ArtifactType(String guid, String name, boolean isAbstract) {
+ public ArtifactType(Long guid, String name, boolean isAbstract) {
super(guid, name);
initializeFields();
setAbstract(isAbstract);
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/ArtifactTypeFactory.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/ArtifactTypeFactory.java
index 5ae2690e57..95dfca2eaf 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/ArtifactTypeFactory.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/ArtifactTypeFactory.java
@@ -22,13 +22,12 @@ import org.eclipse.osee.framework.core.util.Conditions;
*/
public final class ArtifactTypeFactory implements IOseeTypeFactory {
- public ArtifactType create(String guid, boolean isAbstract, String name) throws OseeCoreException {
+ public ArtifactType create(Long guid, boolean isAbstract, String name) throws OseeCoreException {
Conditions.checkNotNullOrEmpty(name, "artifact type name");
- String checkedGuid = Conditions.checkGuidCreateIfNeeded(guid);
- return new ArtifactType(checkedGuid, name, isAbstract);
+ return new ArtifactType(guid, name, isAbstract);
}
- public ArtifactType createOrUpdate(ArtifactTypeCache cache, String guid, boolean isAbstract, String name) throws OseeCoreException {
+ public ArtifactType createOrUpdate(ArtifactTypeCache cache, Long guid, boolean isAbstract, String name) throws OseeCoreException {
ArtifactType artifactType = cache.getByGuid(guid);
if (artifactType == null) {
artifactType = create(guid, isAbstract, name);
@@ -41,7 +40,7 @@ public final class ArtifactTypeFactory implements IOseeTypeFactory {
return artifactType;
}
- public ArtifactType createOrUpdate(IOseeCache<String, ArtifactType> cache, int uniqueId, StorageState storageState, String guid, boolean isAbstract, String name) throws OseeCoreException {
+ public ArtifactType createOrUpdate(IOseeCache<Long, ArtifactType> cache, int uniqueId, StorageState storageState, Long guid, boolean isAbstract, String name) throws OseeCoreException {
ArtifactType artifactType = cache.getById(uniqueId);
if (artifactType == null) {
artifactType = create(guid, isAbstract, name);
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/AttributeType.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/AttributeType.java
index 966ddd1899..f1b3036642 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/AttributeType.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/AttributeType.java
@@ -22,7 +22,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings;
* @author Robert A. Fisher
* @author Ryan D. Brooks
*/
-public final class AttributeType extends AbstractOseeType<String> implements IAttributeType {
+public final class AttributeType extends AbstractOseeType<Long> implements IAttributeType {
private static final String ATTRIBUTE_BASE_TYPE_ID_FIELD_KEY = "osee.base.attribute.type.id.field";
private static final String ATTRIBUTE_PROVIDER_ID_FIELD_KEY = "osee.attribute.provider.id.field";
@@ -34,7 +34,7 @@ public final class AttributeType extends AbstractOseeType<String> implements IAt
private static final String ATTRIBUTE_FILE_EXTENSION_FIELD_KEY = "osee.attribute.file.type.extension.field";
private static final String ATTRIBUTE_TAGGER_ID_FIELD_KEY = "osee.attribute.tagger.id.field";
- public AttributeType(String guid, String typeName, String baseAttributeTypeId, String attributeProviderNameId, String fileTypeExtension, String defaultValue, int minOccurrences, int maxOccurrences, String description, String taggerId) {
+ public AttributeType(Long guid, String typeName, String baseAttributeTypeId, String attributeProviderNameId, String fileTypeExtension, String defaultValue, int minOccurrences, int maxOccurrences, String description, String taggerId) {
super(guid, typeName);
initializeFields();
setFields(typeName, baseAttributeTypeId, attributeProviderNameId, fileTypeExtension, defaultValue, null,
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/AttributeTypeFactory.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/AttributeTypeFactory.java
index 3159c37b72..2fc8c0153a 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/AttributeTypeFactory.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/AttributeTypeFactory.java
@@ -23,7 +23,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings;
*/
public class AttributeTypeFactory implements IOseeTypeFactory {
- public AttributeType create(String guid, String name, String baseAttributeTypeId, String attributeProviderNameId, String fileTypeExtension, String defaultValue, int minOccurrences, int maxOccurrences, String tipText, String taggerId) throws OseeCoreException {
+ public AttributeType create(long guid, String name, String baseAttributeTypeId, String attributeProviderNameId, String fileTypeExtension, String defaultValue, int minOccurrences, int maxOccurrences, String tipText, String taggerId) throws OseeCoreException {
Conditions.checkNotNullOrEmpty(name, "attribute type name");
// checkNameUnique(cache, name);
Conditions.checkNotNullOrEmpty(baseAttributeTypeId, "attribute base type id");
@@ -35,14 +35,13 @@ public class AttributeTypeFactory implements IOseeTypeFactory {
Conditions.checkExpressionFailOnTrue(maxOccurrences < minOccurrences,
"maxOccurences can not be less than minOccurences");
- String checkedGuid = Conditions.checkGuidCreateIfNeeded(guid);
- return new AttributeType(checkedGuid, name, Strings.intern(baseAttributeTypeId),
+ return new AttributeType(guid, name, Strings.intern(baseAttributeTypeId),
Strings.intern(attributeProviderNameId), Strings.intern(fileTypeExtension), defaultValue, minOccurrences,
maxOccurrences, tipText, Strings.intern(taggerId));
}
- public AttributeType createOrUpdate(AttributeTypeCache cache, String guid, String typeName, String baseAttributeTypeId, String attributeProviderNameId, String fileTypeExtension, String defaultValue, OseeEnumType oseeEnumType, int minOccurrences, int maxOccurrences, String description, String taggerId) throws OseeCoreException {
+ public AttributeType createOrUpdate(AttributeTypeCache cache, long guid, String typeName, String baseAttributeTypeId, String attributeProviderNameId, String fileTypeExtension, String defaultValue, OseeEnumType oseeEnumType, int minOccurrences, int maxOccurrences, String description, String taggerId) throws OseeCoreException {
AttributeType attributeType = cache.getByGuid(guid);
if (attributeType == null) {
@@ -59,7 +58,7 @@ public class AttributeTypeFactory implements IOseeTypeFactory {
return attributeType;
}
- public AttributeType createOrUpdate(IOseeCache<String, AttributeType> cache, int uniqueId, StorageState storageState, String guid, String typeName, String baseAttributeTypeId, String attributeProviderNameId, String fileTypeExtension, String defaultValue, OseeEnumType oseeEnumType, int minOccurrences, int maxOccurrences, String description, String taggerId) throws OseeCoreException {
+ public AttributeType createOrUpdate(IOseeCache<Long, AttributeType> cache, int uniqueId, StorageState storageState, Long guid, String typeName, String baseAttributeTypeId, String attributeProviderNameId, String fileTypeExtension, String defaultValue, OseeEnumType oseeEnumType, int minOccurrences, int maxOccurrences, String description, String taggerId) throws OseeCoreException {
AttributeType attributeType = cache.getById(uniqueId);
if (attributeType == null) {
attributeType =
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/OseeEnumType.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/OseeEnumType.java
index 166aa5cd5e..cb211a3f5e 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/OseeEnumType.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/OseeEnumType.java
@@ -29,13 +29,13 @@ import org.eclipse.osee.framework.core.model.internal.fields.EnumEntryField;
*
* @author Roberto E. Escobar
*/
-public class OseeEnumType extends AbstractOseeType<String> {
+public class OseeEnumType extends AbstractOseeType<Long> {
public static final String OSEE_ENUM_TYPE_ENTRIES_FIELD = "osee.enum.type.entries.field";
private final Collection<OseeEnumEntry> enumEntries = new HashSet<OseeEnumEntry>();
- public OseeEnumType(String guid, String enumTypeName) {
+ public OseeEnumType(Long guid, String enumTypeName) {
super(guid, enumTypeName);
addField(OSEE_ENUM_TYPE_ENTRIES_FIELD, new EnumEntryField(enumEntries));
}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/OseeEnumTypeFactory.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/OseeEnumTypeFactory.java
index 101cbfcc8c..a90445c113 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/OseeEnumTypeFactory.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/OseeEnumTypeFactory.java
@@ -24,10 +24,9 @@ import org.eclipse.osee.framework.core.util.Conditions;
*/
public class OseeEnumTypeFactory implements IOseeTypeFactory {
- public OseeEnumType createEnumType(String guid, String name) throws OseeCoreException {
+ public OseeEnumType createEnumType(Long guid, String name) throws OseeCoreException {
Conditions.checkNotNullOrEmpty(name, "osee enum type name");
- String checkedGuid = Conditions.checkGuidCreateIfNeeded(guid);
- return new OseeEnumType(checkedGuid, name);
+ return new OseeEnumType(guid, name);
}
public OseeEnumEntry createEnumEntry(String guid, String name, int ordinal) throws OseeCoreException {
@@ -37,7 +36,7 @@ public class OseeEnumTypeFactory implements IOseeTypeFactory {
return new OseeEnumEntry(checkedGuid, name, ordinal);
}
- public OseeEnumType createOrUpdate(IOseeCache<String, OseeEnumType> cache, int enumTypeId, StorageState storageState, String guid, String enumTypeName) throws OseeCoreException {
+ public OseeEnumType createOrUpdate(IOseeCache<Long, OseeEnumType> cache, int enumTypeId, StorageState storageState, Long guid, String enumTypeName) throws OseeCoreException {
OseeEnumType oseeEnumType = cache.getById(enumTypeId);
if (oseeEnumType == null) {
oseeEnumType = createEnumType(guid, enumTypeName);
@@ -51,7 +50,7 @@ public class OseeEnumTypeFactory implements IOseeTypeFactory {
return oseeEnumType;
}
- public OseeEnumType createOrUpdate(OseeEnumTypeCache cache, String guid, String enumTypeName) throws OseeCoreException {
+ public OseeEnumType createOrUpdate(OseeEnumTypeCache cache, Long guid, String enumTypeName) throws OseeCoreException {
OseeEnumType oseeEnumType = cache.getByGuid(guid);
if (oseeEnumType == null) {
oseeEnumType = createEnumType(guid, enumTypeName);
@@ -63,8 +62,8 @@ public class OseeEnumTypeFactory implements IOseeTypeFactory {
return oseeEnumType;
}
- public OseeEnumEntry createOrUpdate(IOseeCache<String, OseeEnumType> cache, String enumTypeGuid, String enumEntryGuid, String enumEntryName, int ordinal) throws OseeCoreException {
- OseeEnumType oseeEnumType = ((AbstractOseeCache<String, OseeEnumType>) cache).getByGuid(enumTypeGuid);
+ public OseeEnumEntry createOrUpdate(IOseeCache<Long, OseeEnumType> cache, Long enumTypeGuid, String enumEntryGuid, String enumEntryName, int ordinal) throws OseeCoreException {
+ OseeEnumType oseeEnumType = ((AbstractOseeCache<Long, OseeEnumType>) cache).getByGuid(enumTypeGuid);
OseeEnumEntry enumEntry = oseeEnumType.getEntryByGuid(enumEntryGuid);
if (enumEntry == null) {
enumEntry = createEnumEntry(enumEntryGuid, enumEntryName, ordinal);
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationType.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationType.java
index 5efbaa7cee..535f602df3 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationType.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationType.java
@@ -22,7 +22,7 @@ import org.eclipse.osee.framework.core.model.OseeField;
/**
* @author Robert A. Fisher
*/
-public final class RelationType extends AbstractOseeType<String> implements IRelationType {
+public final class RelationType extends AbstractOseeType<Long> implements IRelationType {
private static final String RELATION_SIDE_A_NAME_FIELD_KEY = "osee.relation.type.side.a.name.field";
private static final String RELATION_SIDE_B_NAME_FIELD_KEY = "osee.relation.type.side.b.name.field";
@@ -32,7 +32,7 @@ public final class RelationType extends AbstractOseeType<String> implements IRel
"osee.relation.type.default.order.type.guid.field";
private static final String RELATION_MULTIPLICITY_FIELD_KEY = "osee.relation.type.multiplicity.field";
- public RelationType(String guid, String relationTypeName, String sideAName, String sideBName, IArtifactType artifactTypeSideA, IArtifactType artifactTypeSideB, RelationTypeMultiplicity multiplicity, String defaultOrderTypeGuid) {
+ public RelationType(Long guid, String relationTypeName, String sideAName, String sideBName, IArtifactType artifactTypeSideA, IArtifactType artifactTypeSideB, RelationTypeMultiplicity multiplicity, String defaultOrderTypeGuid) {
super(guid, relationTypeName);
initializeFields();
setFields(relationTypeName, sideAName, sideBName, artifactTypeSideA, artifactTypeSideB, multiplicity,
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationTypeFactory.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationTypeFactory.java
index ffce5ca720..2f2c247955 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationTypeFactory.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationTypeFactory.java
@@ -24,19 +24,18 @@ import org.eclipse.osee.framework.core.util.Conditions;
*/
public class RelationTypeFactory implements IOseeTypeFactory {
- public RelationType create(String guid, String name, String sideAName, String sideBName, IArtifactType artifactTypeSideA, IArtifactType artifactTypeSideB, RelationTypeMultiplicity multiplicity, String defaultOrderTypeGuid) throws OseeCoreException {
+ public RelationType create(Long guid, String name, String sideAName, String sideBName, IArtifactType artifactTypeSideA, IArtifactType artifactTypeSideB, RelationTypeMultiplicity multiplicity, String defaultOrderTypeGuid) throws OseeCoreException {
Conditions.checkNotNullOrEmpty(name, "relation type name");
Conditions.checkNotNullOrEmpty(sideAName, "side A name");
Conditions.checkNotNullOrEmpty(sideBName, "side B name");
Conditions.checkNotNull(artifactTypeSideA, "artifact type A");
Conditions.checkNotNull(artifactTypeSideB, "relation type B");
Conditions.checkNotNull(multiplicity, "multiplicity");
- String checkedGuid = Conditions.checkGuidCreateIfNeeded(guid);
- return new RelationType(checkedGuid, name, sideAName, sideBName, artifactTypeSideA, artifactTypeSideB,
- multiplicity, defaultOrderTypeGuid);
+ return new RelationType(guid, name, sideAName, sideBName, artifactTypeSideA, artifactTypeSideB, multiplicity,
+ defaultOrderTypeGuid);
}
- public RelationType createOrUpdate(RelationTypeCache cache, String guid, String typeName, String sideAName, String sideBName, IArtifactType artifactTypeSideA, IArtifactType artifactTypeSideB, RelationTypeMultiplicity multiplicity, String defaultOrderTypeGuid) throws OseeCoreException {
+ public RelationType createOrUpdate(RelationTypeCache cache, Long guid, String typeName, String sideAName, String sideBName, IArtifactType artifactTypeSideA, IArtifactType artifactTypeSideB, RelationTypeMultiplicity multiplicity, String defaultOrderTypeGuid) throws OseeCoreException {
RelationType relationType = cache.getByGuid(guid);
if (relationType == null) {
relationType =
@@ -51,7 +50,7 @@ public class RelationTypeFactory implements IOseeTypeFactory {
return relationType;
}
- public RelationType createOrUpdate(IOseeCache<String, RelationType> cache, int typeId, StorageState storageState, String guid, String typeName, String sideAName, String sideBName, IArtifactType artifactTypeSideA, IArtifactType artifactTypeSideB, RelationTypeMultiplicity multiplicity, String defaultOrderTypeGuid) throws OseeCoreException {
+ public RelationType createOrUpdate(IOseeCache<Long, RelationType> cache, int typeId, StorageState storageState, Long guid, String typeName, String sideAName, String sideBName, IArtifactType artifactTypeSideA, IArtifactType artifactTypeSideB, RelationTypeMultiplicity multiplicity, String defaultOrderTypeGuid) throws OseeCoreException {
RelationType relationType = cache.getById(typeId);
if (relationType == null) {
relationType =
diff --git a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTest.java b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTest.java
index ca2b04762a..69b5b808a1 100644
--- a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTest.java
+++ b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTest.java
@@ -30,7 +30,7 @@ import org.junit.runners.Parameterized.Parameters;
* @author Roberto E. Escobar
*/
@RunWith(Parameterized.class)
-public class SessionTest extends AbstractOseeTypeTest<Session> {
+public class SessionTest extends AbstractOseeTypeTest<String, Session> {
private final int expectedId;
private final String expectedClientAddress;
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/UserDataStore.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/UserDataStore.java
index 6c775f1ead..84c44bc3f1 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/UserDataStore.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/UserDataStore.java
@@ -17,11 +17,14 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.core.enums.TxChange;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.server.internal.ServerActivator;
import org.eclipse.osee.framework.core.server.internal.ServiceProvider;
import org.eclipse.osee.framework.core.services.IOseeCachingService;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.IOseeStatement;
+import org.eclipse.osee.framework.jdk.core.util.GUID;
+import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.OseeLog;
/**
@@ -40,25 +43,30 @@ public final class UserDataStore {
IOseeStatement chStmt = null;
IOseeCachingService cachingService = ServiceProvider.getCachingService();
try {
+
int attributeTypeId = cachingService.getAttributeTypeCache().getLocalId(CoreAttributeTypes.UserId);
- int branchId = cachingService.getBranchCache().get(CoreBranches.COMMON).getId();
+ Branch branch = cachingService.getBranchCache().get(CoreBranches.COMMON);
+ if (branch != null) {
+ int branchId = branch.getId();
- chStmt = ConnectionHandler.getStatement();
- chStmt.runPreparedQuery(LOAD_OSEE_USER, attributeTypeId, branchId, TxChange.CURRENT.getValue(), userId);
- if (chStmt.next()) {
- // Only need the userId all other fields will be loaded by the client
- toReturn = TokenFactory.createUserToken(null, "-", "-", chStmt.getString("user_id"), true, false, false);
+ chStmt = ConnectionHandler.getStatement();
+ chStmt.runPreparedQuery(LOAD_OSEE_USER, attributeTypeId, branchId, TxChange.CURRENT.getValue(), userId);
+ if (chStmt.next()) {
+ toReturn =
+ TokenFactory.createUserToken(GUID.create(), "-", "-", chStmt.getString("user_id"), true, false, false);
+ }
}
} catch (OseeCoreException ex) {
OseeLog.logf(ServerActivator.class, Level.SEVERE, ex, "Unable to find userId [%s] in OSEE database.", userId);
} finally {
- chStmt.close();
+ Lib.close(chStmt);
}
return toReturn;
}
public static IUserToken createUserToken(boolean isCreationRequired, String userName, String userId, String userEmail, boolean isActive) {
- return TokenFactory.createUserToken(null, userName, userEmail, userId, isActive, false, isCreationRequired);
+ return TokenFactory.createUserToken(GUID.create(), userName, userEmail, userId, isActive, false,
+ isCreationRequired);
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IArtifactType.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IArtifactType.java
index a9443b4fb9..4a11d9d695 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IArtifactType.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IArtifactType.java
@@ -13,6 +13,6 @@ package org.eclipse.osee.framework.core.data;
/**
* @author Ryan D. Brooks
*/
-public interface IArtifactType extends Identity<String>, FullyNamed {
+public interface IArtifactType extends Identity<Long>, FullyNamed {
// composition interface requires no additional methods,fields
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IAttributeType.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IAttributeType.java
index cf56a1e4a1..ca0c5e061b 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IAttributeType.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IAttributeType.java
@@ -13,6 +13,6 @@ package org.eclipse.osee.framework.core.data;
/**
* @author Ryan D. Brooks
*/
-public interface IAttributeType extends Identity<String>, FullyNamed, HasDescription {
+public interface IAttributeType extends Identity<Long>, FullyNamed, HasDescription {
// composition interface requires no additional methods,fields
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationType.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationType.java
index e43c5353ba..929a5dab2e 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationType.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationType.java
@@ -13,6 +13,6 @@ package org.eclipse.osee.framework.core.data;
/**
* @author Ryan D. Brooks
*/
-public interface IRelationType extends Identity<String>, FullyNamed {
+public interface IRelationType extends Identity<Long>, FullyNamed {
// composition interface requires no additional methods,fields
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java
index f0041a30bb..dbcefcded4 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
@@ -19,23 +19,23 @@ public final class TokenFactory {
// Utility Class
}
- public static IArtifactType createArtifactType(String guid, String name) {
+ public static IArtifactType createArtifactType(long guid, String name) {
return new ArtifactTypeToken(guid, name);
}
- public static IAttributeType createAttributeType(String guid, String name) {
+ public static IAttributeType createAttributeType(long guid, String name) {
return new AttributeTypeToken(guid, name);
}
- public static IAttributeType createAttributeType(String guid, String name, String description) {
+ public static IAttributeType createAttributeType(long guid, String name, String description) {
return new AttributeTypeToken(guid, name, description);
}
- public static IRelationType createRelationType(String guid, String name) {
+ public static IRelationType createRelationType(long guid, String name) {
return new RelationTypeToken(guid, name);
}
- public static IRelationTypeSide createRelationTypeSide(RelationSide relationSide, String guid, String name) {
+ public static IRelationTypeSide createRelationTypeSide(RelationSide relationSide, long guid, String name) {
return new RelationTypeSideToken(guid, name, relationSide);
}
@@ -55,8 +55,8 @@ public final class TokenFactory {
return new BranchToken(guid, name);
}
- private final static class ArtifactTypeToken extends NamedIdentity<String> implements IArtifactType {
- public ArtifactTypeToken(String guid, String name) {
+ private final static class ArtifactTypeToken extends NamedIdentity<Long> implements IArtifactType {
+ public ArtifactTypeToken(Long guid, String name) {
super(guid, name);
}
}
@@ -67,18 +67,18 @@ public final class TokenFactory {
}
}
- private final static class AttributeTypeToken extends NamedIdentity<String> implements IAttributeType {
- public AttributeTypeToken(String guid, String name) {
+ private final static class AttributeTypeToken extends NamedIdentity<Long> implements IAttributeType {
+ public AttributeTypeToken(Long guid, String name) {
super(guid, name);
}
- public AttributeTypeToken(String guid, String name, String description) {
+ public AttributeTypeToken(Long guid, String name, String description) {
super(guid, name, description);
}
}
- private final static class RelationTypeToken extends NamedIdentity<String> implements IRelationType {
- public RelationTypeToken(String guid, String name) {
+ private final static class RelationTypeToken extends NamedIdentity<Long> implements IRelationType {
+ public RelationTypeToken(Long guid, String name) {
super(guid, name);
}
}
@@ -157,10 +157,10 @@ public final class TokenFactory {
}
}
- private final static class RelationTypeSideToken extends NamedIdentity<String> implements IRelationTypeSide {
+ private final static class RelationTypeSideToken extends NamedIdentity<Long> implements IRelationTypeSide {
private final RelationSide relationSide;
- private RelationTypeSideToken(String guid, String name, RelationSide relationSide) {
+ private RelationTypeSideToken(Long guid, String name, RelationSide relationSide) {
super(guid, name);
this.relationSide = relationSide;
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java
index 405e4c6216..9370b20c02 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java
@@ -19,54 +19,54 @@ import org.eclipse.osee.framework.core.data.TokenFactory;
public final class CoreArtifactTypes {
// @formatter:off
- public static final IArtifactType AccessControlModel = TokenFactory.createArtifactType("CJr1bPfZQkbiuTA4FewA", "Access Control Model");
- public static final IArtifactType AbstractSoftwareRequirement = TokenFactory.createArtifactType("ABNAYPwV6H4EkjQ3+QQA", "Abstract Software Requirement");
- public static final IArtifactType AbstractTestResult = TokenFactory.createArtifactType("ATkaanWmHH3PkhGNVjwA", "Abstract Test Result");
- public static final IArtifactType Artifact = TokenFactory.createArtifactType("AAMFDh6S7gRLupAMwywA", "Artifact");
- public static final IArtifactType CodeUnit = TokenFactory.createArtifactType("AAMFDkEh216dzK1mTZgA", "Code Unit");
- public static final IArtifactType Component = TokenFactory.createArtifactType("AAMFDkG6omAsD6dXPYgA", "Component");
- public static final IArtifactType DirectSoftwareRequirement = TokenFactory.createArtifactType("BtMwyalHkHkrRo7D0aAA", "Direct Software Requirement");
- public static final IArtifactType Folder = TokenFactory.createArtifactType("AAMFDg_wmiYHHY5swJwA", "Folder");
- public static final IArtifactType GeneralData = TokenFactory.createArtifactType("AAMFDhQXfyb2m+jCwlwA", "General Data");
- public static final IArtifactType GeneralDocument = TokenFactory.createArtifactType("AAMFDhCjkTvP+VBpBCQA", "General Document");
- public static final IArtifactType GlobalPreferences = TokenFactory.createArtifactType("AAMFDho2kBqyoOZEw+gA", "Global Preferences");
- public static final IArtifactType HardwareRequirement = TokenFactory.createArtifactType("AAMFDh8dhUflUdK9FdgA", "Hardware Requirement");
- public static final IArtifactType Heading = TokenFactory.createArtifactType("AAMFDhEzni8FpFb5yHwA", "Heading");
- public static final IArtifactType IndirectSoftwareRequirement = TokenFactory.createArtifactType("AAMFDiC7HRQMqr5S0QwA", "Indirect Software Requirement");
- public static final IArtifactType InterfaceRequirement = TokenFactory.createArtifactType("AAMFDjgcukv7xEsPf2QA", "Interface Requirement");
- public static final IArtifactType ImplementationDetails = TokenFactory.createArtifactType("AMyewS0I5ADnjgL63tQA", "Implementation Details");
- public static final IArtifactType OseeTypeDefinition = TokenFactory.createArtifactType("AFGVEpSssxutyEAP0twA", "Osee Type Definition");
- public static final IArtifactType RendererTemplate = TokenFactory.createArtifactType("AAMFDhvZnHKgSeFKMXgA", "Renderer Template");
- public static final IArtifactType Requirement = TokenFactory.createArtifactType("ABM_vxEEowY+8i2_q9gA", "Requirement");
- public static final IArtifactType RootArtifact = TokenFactory.createArtifactType("AAMFDhHDqlbzKcIxcsAA", "Root Artifact");
- public static final IArtifactType SoftwareDesign = TokenFactory.createArtifactType("AAMFDh+nBRDS2smKPLAA", "Software Design");
- public static final IArtifactType SoftwareRequirement = TokenFactory.createArtifactType("AAMFDiAwhRFXwIyapJAA", "Software Requirement");
- public static final IArtifactType SoftwareRequirementDrawing = TokenFactory.createArtifactType("ABNClhgUfwj6A3EAArQA", "Software Requirement Drawing");
- public static final IArtifactType SoftwareRequirementFunction = TokenFactory.createArtifactType("ABNBwZMdFgEDTVQ7pTAA", "Software Requirement Function");
- public static final IArtifactType SoftwareRequirementProcedure = TokenFactory.createArtifactType("ABNBLPY4LnIKtcON0mgA", "Software Requirement Procedure");
- public static final IArtifactType SubsystemDesign = TokenFactory.createArtifactType("AAMFDiHVwBo+Yx73BoQA", "Subsystem Design");
- public static final IArtifactType SubsystemFunction = TokenFactory.createArtifactType("AAMFDjk6pAAd3tpGEqwA", "Subsystem Function");
- public static final IArtifactType SubsystemRequirement = TokenFactory.createArtifactType("AAMFDiN9KiAkhuLqOhQA", "Subsystem Requirement");
- public static final IArtifactType SupportingContent = TokenFactory.createArtifactType("AAMFDiQI2QuheFY71jgA", "Supporting Content");
- public static final IArtifactType SystemDesign = TokenFactory.createArtifactType("AAMFDiFI+lLm46F3HdQA", "System Design");
- public static final IArtifactType SystemFunction = TokenFactory.createArtifactType("AAMFDjisx2s6BUTDo3wA", "System Function");
- public static final IArtifactType SystemRequirement = TokenFactory.createArtifactType("AAMFDiSTcDGdUd9+tHAA", "System Requirement");
- public static final IArtifactType TestCase = TokenFactory.createArtifactType("AAMFDikEi0TGK27TKPgA", "Test Case");
- public static final IArtifactType TestInformationSheet = TokenFactory.createArtifactType("AAMFDjnM3wQxCjwatKAA", "Test Information Sheet");
- public static final IArtifactType TestPlanElement = TokenFactory.createArtifactType("ATi_kUpvPBiW2upYC_wA", "Test Plan Element");
- public static final IArtifactType TestProcedure = TokenFactory.createArtifactType("AAMFDjsjiGhoWpqM4PQA", "Test Procedure");
- public static final IArtifactType TestProcedureNative = TokenFactory.createArtifactType("AAMFDiWs_HdDJTbPPQgA", "Test Procedure Native");
- public static final IArtifactType TestProcedureWML = TokenFactory.createArtifactType("AAMFDiUeCG3KWx5XqeQA", "Test Procedure WML");
- public static final IArtifactType TestResultNative = TokenFactory.createArtifactType("ATkaanWmHH3PkhGNVjwA", "Test Result Native");
- public static final IArtifactType TestResultWML = TokenFactory.createArtifactType("ATk6NKFFmD_zg1b_eaQA", "Test Result WML");
- public static final IArtifactType TestRun = TokenFactory.createArtifactType("AAMFDjqDHWo+orlSpaQA", "Test Run");
- public static final IArtifactType TestRunDisposition = TokenFactory.createArtifactType("AAMFDjeNxhi0KmXZcKQA", "Test Run Disposition");
- public static final IArtifactType TestSupport = TokenFactory.createArtifactType("AAMFDj+FW0f_Ut72ocQA", "Test Support");
- public static final IArtifactType TestUnit = TokenFactory.createArtifactType("ABM2d6uxUw66aSdo0LwA", "Test Unit");
- public static final IArtifactType UniversalGroup = TokenFactory.createArtifactType("AAMFDhLY2TnADPA_EQQA", "Universal Group");
- public static final IArtifactType User = TokenFactory.createArtifactType("AAMFDhmr+Dqqe5pn3kAA", "User");
- public static final IArtifactType UserGroup = TokenFactory.createArtifactType("AAMFDhrEbXqZKPfWkwAA", "User Group");
- public static final IArtifactType XViewerGlobalCustomization = TokenFactory.createArtifactType("AAMFDhtN7T4of30iYhAA", "XViewer Global Customization");
+ public static final IArtifactType AccessControlModel = TokenFactory.createArtifactType(0x0000000000000002L, "Access Control Model");
+ public static final IArtifactType AbstractSoftwareRequirement = TokenFactory.createArtifactType(0x0000000000000017L, "Abstract Software Requirement");
+ public static final IArtifactType AbstractTestResult = TokenFactory.createArtifactType(0x0000000000000026L, "Abstract Test Result");
+ public static final IArtifactType Artifact = TokenFactory.createArtifactType(0x0000000000000001L, "Artifact");
+ public static final IArtifactType CodeUnit = TokenFactory.createArtifactType(0x000000000000003AL, "Code Unit");
+ public static final IArtifactType Component = TokenFactory.createArtifactType(0x0000000000000039L, "Component");
+ public static final IArtifactType DirectSoftwareRequirement = TokenFactory.createArtifactType(0x0000000000000016L, "Direct Software Requirement");
+ public static final IArtifactType Folder = TokenFactory.createArtifactType(0x000000000000000BL, "Folder");
+ public static final IArtifactType GeneralData = TokenFactory.createArtifactType(0x000000000000000CL, "General Data");
+ public static final IArtifactType GeneralDocument = TokenFactory.createArtifactType(0x000000000000000EL, "General Document");
+ public static final IArtifactType GlobalPreferences = TokenFactory.createArtifactType(0x0000000000000003L, "Global Preferences");
+ public static final IArtifactType HardwareRequirement = TokenFactory.createArtifactType(0x0000000000000021L, "Hardware Requirement");
+ public static final IArtifactType Heading = TokenFactory.createArtifactType(0x0000000000000038L, "Heading");
+ public static final IArtifactType IndirectSoftwareRequirement = TokenFactory.createArtifactType(0x0000000000000019L, "Indirect Software Requirement");
+ public static final IArtifactType InterfaceRequirement = TokenFactory.createArtifactType(0x0000000000000020L, "Interface Requirement");
+ public static final IArtifactType ImplementationDetails = TokenFactory.createArtifactType(0x000000000000001AL, "Implementation Details");
+ public static final IArtifactType OseeTypeDefinition = TokenFactory.createArtifactType(0x000000000000003CL, "Osee Type Definition");
+ public static final IArtifactType RendererTemplate = TokenFactory.createArtifactType(0x0000000000000009L, "Renderer Template");
+ public static final IArtifactType Requirement = TokenFactory.createArtifactType(0x0000000000000015L, "Requirement");
+ public static final IArtifactType RootArtifact = TokenFactory.createArtifactType(0x000000000000000AL, "Root Artifact");
+ public static final IArtifactType SoftwareDesign = TokenFactory.createArtifactType(0x000000000000002DL, "Software Design");
+ public static final IArtifactType SoftwareRequirement = TokenFactory.createArtifactType(0x0000000000000018L, "Software Requirement");
+ public static final IArtifactType SoftwareRequirementDrawing = TokenFactory.createArtifactType(0x000000000000001DL, "Software Requirement Drawing");
+ public static final IArtifactType SoftwareRequirementFunction = TokenFactory.createArtifactType(0x000000000000001CL, "Software Requirement Function");
+ public static final IArtifactType SoftwareRequirementProcedure = TokenFactory.createArtifactType(0x000000000000001BL, "Software Requirement Procedure");
+ public static final IArtifactType SubsystemDesign = TokenFactory.createArtifactType(0x000000000000002BL, "Subsystem Design");
+ public static final IArtifactType SubsystemFunction = TokenFactory.createArtifactType(0x0000000000000024L, "Subsystem Function");
+ public static final IArtifactType SubsystemRequirement = TokenFactory.createArtifactType(0x000000000000001FL, "Subsystem Requirement");
+ public static final IArtifactType SupportingContent = TokenFactory.createArtifactType(0x0000000000000031L, "Supporting Content");
+ public static final IArtifactType SystemDesign = TokenFactory.createArtifactType(0x000000000000002CL, "System Design");
+ public static final IArtifactType SystemFunction = TokenFactory.createArtifactType(0x0000000000000023L, "System Function");
+ public static final IArtifactType SystemRequirement = TokenFactory.createArtifactType(0x000000000000001EL, "System Requirement");
+ public static final IArtifactType TestCase = TokenFactory.createArtifactType(0x0000000000000052L, "Test Case");
+ public static final IArtifactType TestInformationSheet = TokenFactory.createArtifactType(0x0000000000000029L, "Test Information Sheet");
+ public static final IArtifactType TestPlanElement = TokenFactory.createArtifactType(0x0000000000000025L, "Test Plan Element");
+ public static final IArtifactType TestProcedure = TokenFactory.createArtifactType(0x000000000000002EL, "Test Procedure");
+ public static final IArtifactType TestProcedureNative = TokenFactory.createArtifactType(0x0000000000000030L, "Test Procedure Native");
+ public static final IArtifactType TestProcedureWML = TokenFactory.createArtifactType(0x000000000000002FL, "Test Procedure WML");
+ public static final IArtifactType TestResultNative = TokenFactory.createArtifactType(0x0000000000000026L, "Test Result Native");
+ public static final IArtifactType TestResultWML = TokenFactory.createArtifactType(0x0000000000000028L, "Test Result WML");
+ public static final IArtifactType TestRun = TokenFactory.createArtifactType(0x0000000000000055L, "Test Run");
+ public static final IArtifactType TestRunDisposition = TokenFactory.createArtifactType(0x0000000000000054L, "Test Run Disposition");
+ public static final IArtifactType TestSupport = TokenFactory.createArtifactType(0x0000000000000053L, "Test Support");
+ public static final IArtifactType TestUnit = TokenFactory.createArtifactType(0x0000000000000004L, "Test Unit");
+ public static final IArtifactType UniversalGroup = TokenFactory.createArtifactType(0x0000000000000008L, "Universal Group");
+ public static final IArtifactType User = TokenFactory.createArtifactType(0x0000000000000005L, "User");
+ public static final IArtifactType UserGroup = TokenFactory.createArtifactType(0x0000000000000007L, "User Group");
+ public static final IArtifactType XViewerGlobalCustomization = TokenFactory.createArtifactType(0x0000000000000037L, "XViewer Global Customization");
// @formatter:on
private CoreArtifactTypes() {
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreAttributeTypes.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreAttributeTypes.java
index 92d03027a8..19ec5fac20 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreAttributeTypes.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreAttributeTypes.java
@@ -19,90 +19,90 @@ import org.eclipse.osee.framework.core.data.TokenFactory;
public final class CoreAttributeTypes {
// @formatter:off
- public static final IAttributeType Afha = TokenFactory.createAttributeType("AAMFEQGsxihCZXcrWtQA", "AFHA");
- public static final IAttributeType AccessContextId = TokenFactory.createAttributeType("AAFAgR3B7AN_g0NPCLAA", "Access Context Id");
- public static final IAttributeType Active = TokenFactory.createAttributeType("AAMFEbImQyR38BY8A5QA", "Active");
- public static final IAttributeType Annotation = TokenFactory.createAttributeType("AAMFEcWy0xc4e3tcemQA", "Annotation");
- public static final IAttributeType Category = TokenFactory.createAttributeType("AAMFEVfcEjwtly9djdgA", "Category");
- public static final IAttributeType City = TokenFactory.createAttributeType("AAMFEbkRZE1lIUmm_0AA", "City");
- public static final IAttributeType CommonNalRequirement = TokenFactory.createAttributeType("AAMFEQpKOwh5p+AgC8wA", "Common NAL Requirement");
- public static final IAttributeType Company = TokenFactory.createAttributeType("AAMFEbgTIG1iJuHoe6wA", "Company");
- public static final IAttributeType CompanyTitle = TokenFactory.createAttributeType("AAMFEbiRtwq7hoavdXwA", "Company Title");
- public static final IAttributeType Component = TokenFactory.createAttributeType("AAMFEVjkKR2EMfwWk4AA", "Component");
- public static final IAttributeType ContentUrl = TokenFactory.createAttributeType("AAMFEcIP+U+ML_gzH7AA", "Content URL");
- public static final IAttributeType Country = TokenFactory.createAttributeType("AAMFEbsk1xGUlmXk8zgA", "Country");
- public static final IAttributeType CrewInterfaceRequirement = TokenFactory.createAttributeType("AAMFEQrZMEwBcq2pQTgA", "Crew Interface Requirement");
- public static final IAttributeType CrossBranchLink = TokenFactory.createAttributeType("AXUR3KcbcVPqyNCdQmAA", "Cross Branch Link");
- public static final IAttributeType Csci = TokenFactory.createAttributeType("AAMFEXPEnnkY_07EbRgA", "CSCI");
- public static final IAttributeType DefaultMailServer = TokenFactory.createAttributeType("ABMuIC3FejpGilonfAgA", "osee.config.Default Mail Server");
- public static final IAttributeType DefaultGroup = TokenFactory.createAttributeType("AA37C8T6J1QyaT0+jBwA", "Default Group");
- public static final IAttributeType Description = TokenFactory.createAttributeType("AAMFEcK+kyOhG8GYvPgA", "Description");
- public static final IAttributeType DevelopmentAssuranceLevel = TokenFactory.createAttributeType("AAMFEVdW8Bdjtx4GvfwA", "Development Assurance Level");
- public static final IAttributeType Developmental = TokenFactory.createAttributeType("AAMFEP8lp3EupVzVp5QA", "Developmental");
- public static final IAttributeType Dictionary = TokenFactory.createAttributeType("AAMFEbcV9BXFKOqkVIwA", "Dictionary");
- public static final IAttributeType Effectivity = TokenFactory.createAttributeType("B1fqGH5hxBMylPX9VEQA", "Effectivity");
- public static final IAttributeType Email = TokenFactory.createAttributeType("AAMFEbaZjEVoecDFCCQA", "Email");
- public static final IAttributeType Extension = TokenFactory.createAttributeType("AAMFEcUbJEERZTnwJzAA", "Extension");
- public static final IAttributeType FtaResults = TokenFactory.createAttributeType("AAMFEQPomlhpBRRUceQA", "FTA Results");
- public static final IAttributeType FavoriteBranch = TokenFactory.createAttributeType("AAMFEbMnzS7P92knZKAA", "Favorite Branch");
- public static final IAttributeType FaxPhone = TokenFactory.createAttributeType("AAMFEbYdJAmEGg0TFhAA", "Fax Phone");
- public static final IAttributeType GeneralStringData = TokenFactory.createAttributeType("AAMFEca+MB5ssx+Ax5wA", "General String Data");
- public static final IAttributeType GfeCfe = TokenFactory.createAttributeType("AAMFEQR0SW+7bERFvXQA", "GFE / CFE");
- public static final IAttributeType Hazard = TokenFactory.createAttributeType("AAMFEQEe6XK8hGjJNxgA", "Hazard");
- public static final IAttributeType HazardSeverity = TokenFactory.createAttributeType("AAMFEQLLyEqgnjt85bwA", "Hazard Severity");
- public static final IAttributeType LegacyId = TokenFactory.createAttributeType("AAMFEQ5rrGxHTSvY73gA", "Legacy Id");
- public static final IAttributeType MobilePhone = TokenFactory.createAttributeType("AAMFEbWi7AIC1z82PxQA", "Mobile Phone");
- public static final IAttributeType Name = TokenFactory.createAttributeType("AAMFEcF1AzV7PKuHmxwA", "Name");
- public static final IAttributeType NativeContent = TokenFactory.createAttributeType("AAMFEcdBJGBK9nr9TTQA", "Native Content");
- public static final IAttributeType Notes = TokenFactory.createAttributeType("AAMFEbulnFZFQCiyvpAA", "Notes");
- public static final IAttributeType PageType = TokenFactory.createAttributeType("AAMFEcNiRF2N5xhkYyAA", "Page Type");
- public static final IAttributeType ParagraphNumber = TokenFactory.createAttributeType("AAMFEQ3boD3sp6VfArAA", "Imported Paragraph Number");
- public static final IAttributeType Partition = TokenFactory.createAttributeType("AAMFERHj9w6pmoLBCaQA", "Partition");
- public static final IAttributeType Phone = TokenFactory.createAttributeType("AAMFEbUkVSwKu4LSpWAA", "Phone");
- public static final IAttributeType PublishInline = TokenFactory.createAttributeType("ADpktgUh1xxE38Ht66QA", "PublishInline");
- public static final IAttributeType QualificationMethod = TokenFactory.createAttributeType("AAMFERMRKHkM9k_Rg2QA", "Qualification Method");
- public static final IAttributeType RelationOrder = TokenFactory.createAttributeType("ABM5kHa9cFsTbI_ooyQA", "Relation Order");
- public static final IAttributeType ReqType = TokenFactory.createAttributeType("AEQ9uyqjH3NpD0eThgAA", "Req Type");
- public static final IAttributeType Sfha = TokenFactory.createAttributeType("AAMFEQI800ecbF8oCPwA", "SFHA");
- public static final IAttributeType SafetyCriticality = TokenFactory.createAttributeType("AAMFERg99R51HIz45HAA", "Safety Criticality");
- public static final IAttributeType SafetyObjective = TokenFactory.createAttributeType("AAMFEQNYjjVjRoKuDsAA", "Safety Objective");
- public static final IAttributeType State = TokenFactory.createAttributeType("AAMFEbolfGTBLHnDCRQA", "State");
- public static final IAttributeType StaticId = TokenFactory.createAttributeType("AAMFEcY5DUbWyuIpZVwA", "Static Id");
- public static final IAttributeType Street = TokenFactory.createAttributeType("AAMFEbmjn19BhPhE2cwA", "Street");
- public static final IAttributeType Subsystem = TokenFactory.createAttributeType("AAMFERJ1GweNukuSd8QA", "Subsystem");
- public static final IAttributeType SystemSecurityRequirement = TokenFactory.createAttributeType("AAMFERC8OyWTMm8tMOQA", "System Security Requirement");
- public static final IAttributeType TechnicalPerformanceParameter = TokenFactory.createAttributeType("AAMFEVhhNTVx42mlvlQA", "Technical Performance Parameter");
- public static final IAttributeType TemplateMatchCriteria = TokenFactory.createAttributeType("AAMFEbeRRENHX5KTmxwA", "Template Match Criteria");
- public static final IAttributeType TestFrequency = TokenFactory.createAttributeType("AS7E+gDvsymdt28Aw3gA", "Test Frequency");
- public static final IAttributeType TestProcedureStatus = TokenFactory.createAttributeType("AKkUuN2K1ilSHnvIMPQA", "Test Procedure Status");
- public static final IAttributeType TestScriptGuid = TokenFactory.createAttributeType("AAMFEW5fEhinpcjeZ0wA", "Test Script GUID");
- public static final IAttributeType TisTestCategory = TokenFactory.createAttributeType("AAMFEVbEtV4QJQvA5eQA", "TIS Test Category");
- public static final IAttributeType TisTestNumber = TokenFactory.createAttributeType("AAMFERjRSDDgyyBh+OAA", "TIS Test Number");
- public static final IAttributeType TisTestType = TokenFactory.createAttributeType("AAMFEVXVuFcy8wCED5AA", "TIS Test Type");
- public static final IAttributeType TrainingEffectivity = TokenFactory.createAttributeType("AAMFERFJAm0_WZ0WQaQA", "Training Effectivity");
- public static final IAttributeType UriGeneralStringData = TokenFactory.createAttributeType("AFnIJbPBoQFQpTP2jfQA", "Uri General String Data");
- public static final IAttributeType UserId = TokenFactory.createAttributeType("AAMFEbKl8RCQr17bDAQA", "User Id");
- public static final IAttributeType UserSettings = TokenFactory.createAttributeType("AAMFEbOnewRpnYFgnHQA", "User Settings");
- public static final IAttributeType VerificationEvent = TokenFactory.createAttributeType("AAMFEXlt02WfQ0jcQtAA", "Verification Event");
- public static final IAttributeType VerificationLevel = TokenFactory.createAttributeType("AAMFEXRTkyKVIFqcMwQA", "Verification Level");
- public static final IAttributeType Website = TokenFactory.createAttributeType("AAMFEbwiBAmrHwSeMHgA", "Website");
- public static final IAttributeType WholeWordContent = TokenFactory.createAttributeType("AAMFEchZmAzZo2tHjVAA", "Whole Word Content");
- public static final IAttributeType WordOleData = TokenFactory.createAttributeType("AAMFEcP2rmoCzqmzJxQA", "Word Ole Data");
- public static final IAttributeType WordTemplateContent = TokenFactory.createAttributeType("AAMFEcfcGS2V3SqQN2wA", "Word Template Content");
- public static final IAttributeType WorkData = TokenFactory.createAttributeType("AAMFEbyhslOoQf3+hyAA", "osee.wi.Work Data");
- public static final IAttributeType WorkDescription = TokenFactory.createAttributeType("AAMFEb57TkhPHyzOLDwA", "osee.wi.Work Description");
- public static final IAttributeType WorkId = TokenFactory.createAttributeType("AAMFEb0hXw933Zrje2QA", "osee.wi.Work Id");
- public static final IAttributeType WorkPageType = TokenFactory.createAttributeType("ATTKEn8ob0KafAl5vuAA", "osee.wi.Work Page Type");
- public static final IAttributeType WorkPageName = TokenFactory.createAttributeType("AAMFEb+vCyCjKbzzHoQA", "osee.wi.Work Page Name");
- public static final IAttributeType WorkPageOrdinal = TokenFactory.createAttributeType("AGb3uHUiiFc2GkZc1bwA", "osee.wi.Work Page Ordinal");
- public static final IAttributeType WorkParentId = TokenFactory.createAttributeType("AAMFEb8R5y9WcjD5hcwA", "osee.wi.Work Parent Id");
- public static final IAttributeType WorkStartPage = TokenFactory.createAttributeType("AAMFEcDfggQLaAdLlpQA", "osee.wi.Start Page");
- public static final IAttributeType WorkTransition = TokenFactory.createAttributeType("AAMFEcBLGB5U+55hJrQA", "osee.wi.Transition");
- public static final IAttributeType WorkType = TokenFactory.createAttributeType("AAMFEb2f9nh42sjMHfAA", "osee.wi.Work Type");
- public static final IAttributeType WorkflowDefinition = TokenFactory.createAttributeType("AAMFEcSPdVbU8mGugOQA", "Workflow Definition");
- public static final IAttributeType XViewerCustomization = TokenFactory.createAttributeType("AAMFEbQk+hTB9fE3uNAA", "XViewer Customization");
- public static final IAttributeType XViewerDefaults = TokenFactory.createAttributeType("AAMFEbSjkAKRqLzkWpAA", "XViewer Defaults");
- public static final IAttributeType Zip = TokenFactory.createAttributeType("AAMFEbqmQUTrgrQ7rKgA", "Zip");
+ public static final IAttributeType Afha = TokenFactory.createAttributeType(0x10000000000000A3L, "AFHA");
+ public static final IAttributeType AccessContextId = TokenFactory.createAttributeType(0x100000000000007EL, "Access Context Id");
+ public static final IAttributeType Active = TokenFactory.createAttributeType(0x1000000000000059L, "Active");
+ public static final IAttributeType Annotation = TokenFactory.createAttributeType(0x1000000000000076L, "Annotation");
+ public static final IAttributeType Category = TokenFactory.createAttributeType(0x1000000000000091L, "Category");
+ public static final IAttributeType City = TokenFactory.createAttributeType(0x100000000000005CL, "City");
+ public static final IAttributeType CommonNalRequirement = TokenFactory.createAttributeType(0x1000000000000081L, "Common NAL Requirement");
+ public static final IAttributeType Company = TokenFactory.createAttributeType(0x100000000000005AL, "Company");
+ public static final IAttributeType CompanyTitle = TokenFactory.createAttributeType(0x100000000000005BL, "Company Title");
+ public static final IAttributeType Component = TokenFactory.createAttributeType(0x1000000000000095L, "Component");
+ public static final IAttributeType ContentUrl = TokenFactory.createAttributeType(0x100000000000007CL, "Content URL");
+ public static final IAttributeType Country = TokenFactory.createAttributeType(0x1000000000000060L, "Country");
+ public static final IAttributeType CrewInterfaceRequirement = TokenFactory.createAttributeType(0x1000000000000082L, "Crew Interface Requirement");
+ public static final IAttributeType CrossBranchLink = TokenFactory.createAttributeType(0x1000000000000056L, "Cross Branch Link");
+ public static final IAttributeType Csci = TokenFactory.createAttributeType(0x10000000000000A0L, "CSCI");
+ public static final IAttributeType DefaultMailServer = TokenFactory.createAttributeType(0x1000000000000057L, "osee.config.Default Mail Server");
+ public static final IAttributeType DefaultGroup = TokenFactory.createAttributeType(0x100000000000006EL, "Default Group");
+ public static final IAttributeType Description = TokenFactory.createAttributeType(0x1000000000000072L, "Description");
+ public static final IAttributeType DevelopmentAssuranceLevel = TokenFactory.createAttributeType(0x1000000000000090L, "Development Assurance Level");
+ public static final IAttributeType Developmental = TokenFactory.createAttributeType(0x10000000000000A1L, "Developmental");
+ public static final IAttributeType Dictionary = TokenFactory.createAttributeType(0x100000000000006BL, "Dictionary");
+ public static final IAttributeType Effectivity = TokenFactory.createAttributeType(0x1000000000000084L, "Effectivity");
+ public static final IAttributeType Email = TokenFactory.createAttributeType(0x100000000000006AL, "Email");
+ public static final IAttributeType Extension = TokenFactory.createAttributeType(0x1000000000000058L, "Extension");
+ public static final IAttributeType FtaResults = TokenFactory.createAttributeType(0x10000000000000A7L, "FTA Results");
+ public static final IAttributeType FavoriteBranch = TokenFactory.createAttributeType(0x1000000000000062L, "Favorite Branch");
+ public static final IAttributeType FaxPhone = TokenFactory.createAttributeType(0x1000000000000069L, "Fax Phone");
+ public static final IAttributeType GeneralStringData = TokenFactory.createAttributeType(0x1000000000000078L, "General String Data");
+ public static final IAttributeType GfeCfe = TokenFactory.createAttributeType(0x10000000000000A8L, "GFE / CFE");
+ public static final IAttributeType Hazard = TokenFactory.createAttributeType(0x10000000000000A2L, "Hazard");
+ public static final IAttributeType HazardSeverity = TokenFactory.createAttributeType(0x10000000000000A5L, "Hazard Severity");
+ public static final IAttributeType LegacyId = TokenFactory.createAttributeType(0x1000000000000083L, "Legacy Id");
+ public static final IAttributeType MobilePhone = TokenFactory.createAttributeType(0x1000000000000068L, "Mobile Phone");
+ public static final IAttributeType Name = TokenFactory.createAttributeType(0x1000000000000070L, "Name");
+ public static final IAttributeType NativeContent = TokenFactory.createAttributeType(0x1000000000000079L, "Native Content");
+ public static final IAttributeType Notes = TokenFactory.createAttributeType(0x100000000000006DL, "Notes");
+ public static final IAttributeType PageType = TokenFactory.createAttributeType(0x1000000000000073L, "Page Type");
+ public static final IAttributeType ParagraphNumber = TokenFactory.createAttributeType(0x100000000000007DL, "Imported Paragraph Number");
+ public static final IAttributeType Partition = TokenFactory.createAttributeType(0x1000000000000087L, "Partition");
+ public static final IAttributeType Phone = TokenFactory.createAttributeType(0x1000000000000067L, "Phone");
+ public static final IAttributeType PublishInline = TokenFactory.createAttributeType(0x1000000000000092L, "PublishInline");
+ public static final IAttributeType QualificationMethod = TokenFactory.createAttributeType(0x1000000000000089L, "Qualification Method");
+ public static final IAttributeType RelationOrder = TokenFactory.createAttributeType(0x1000000000000071L, "Relation Order");
+ public static final IAttributeType ReqType = TokenFactory.createAttributeType(0x1000000000000080L, "Req Type");
+ public static final IAttributeType Sfha = TokenFactory.createAttributeType(0x10000000000000A4L, "SFHA");
+ public static final IAttributeType SafetyCriticality = TokenFactory.createAttributeType(0x100000000000008AL, "Safety Criticality");
+ public static final IAttributeType SafetyObjective = TokenFactory.createAttributeType(0x10000000000000A6L, "Safety Objective");
+ public static final IAttributeType State = TokenFactory.createAttributeType(0x100000000000005EL, "State");
+ public static final IAttributeType StaticId = TokenFactory.createAttributeType(0x1000000000000077L, "Static Id");
+ public static final IAttributeType Street = TokenFactory.createAttributeType(0x100000000000005DL, "Street");
+ public static final IAttributeType Subsystem = TokenFactory.createAttributeType(0x1000000000000088L, "Subsystem");
+ public static final IAttributeType SystemSecurityRequirement = TokenFactory.createAttributeType(0x1000000000000085L, "System Security Requirement");
+ public static final IAttributeType TechnicalPerformanceParameter = TokenFactory.createAttributeType(0x1000000000000093L, "Technical Performance Parameter");
+ public static final IAttributeType TemplateMatchCriteria = TokenFactory.createAttributeType(0x100000000000006FL, "Template Match Criteria");
+ public static final IAttributeType TestFrequency = TokenFactory.createAttributeType(0x100000000000007FL, "Test Frequency");
+ public static final IAttributeType TestProcedureStatus = TokenFactory.createAttributeType(0x1000000000000063L, "Test Procedure Status");
+ public static final IAttributeType TestScriptGuid = TokenFactory.createAttributeType(0x1000000000000145L, "Test Script GUID");
+ public static final IAttributeType TisTestCategory = TokenFactory.createAttributeType(0x100000000000008FL, "TIS Test Category");
+ public static final IAttributeType TisTestNumber = TokenFactory.createAttributeType(0x100000000000008CL, "TIS Test Number");
+ public static final IAttributeType TisTestType = TokenFactory.createAttributeType(0x100000000000008EL, "TIS Test Type");
+ public static final IAttributeType TrainingEffectivity = TokenFactory.createAttributeType(0x1000000000000086L, "Training Effectivity");
+ public static final IAttributeType UserId = TokenFactory.createAttributeType(0x1000000000000061L, "User Id");
+ public static final IAttributeType UriGeneralStringData = TokenFactory.createAttributeType(0x1000000000000195L, "Uri General String Data");
+ public static final IAttributeType UserSettings = TokenFactory.createAttributeType(0x1000000000000064L, "User Settings");
+ public static final IAttributeType VerificationEvent = TokenFactory.createAttributeType(0x1000000000000094L, "Verification Event");
+ public static final IAttributeType VerificationLevel = TokenFactory.createAttributeType(0x100000000000008BL, "Verification Level");
+ public static final IAttributeType Website = TokenFactory.createAttributeType(0x100000000000006CL, "Website");
+ public static final IAttributeType WholeWordContent = TokenFactory.createAttributeType(0x100000000000007BL, "Whole Word Content");
+ public static final IAttributeType WordOleData = TokenFactory.createAttributeType(0x1000000000000074L, "Word Ole Data");
+ public static final IAttributeType WordTemplateContent = TokenFactory.createAttributeType(0x100000000000007AL, "Word Template Content");
+ public static final IAttributeType WorkData = TokenFactory.createAttributeType(0x1000000000000096L, "osee.wi.Work Data");
+ public static final IAttributeType WorkDescription = TokenFactory.createAttributeType(0x1000000000000099L, "osee.wi.Work Description");
+ public static final IAttributeType WorkId = TokenFactory.createAttributeType(0x1000000000000097L, "osee.wi.Work Id");
+ public static final IAttributeType WorkPageType = TokenFactory.createAttributeType(0x100000000000009EL, "osee.wi.Work Page Type");
+ public static final IAttributeType WorkPageName = TokenFactory.createAttributeType(0x100000000000009BL, "osee.wi.Work Page Name");
+ public static final IAttributeType WorkPageOrdinal = TokenFactory.createAttributeType(0x100000000000009CL, "osee.wi.Work Page Ordinal");
+ public static final IAttributeType WorkParentId = TokenFactory.createAttributeType(0x100000000000009AL, "osee.wi.Work Parent Id");
+ public static final IAttributeType WorkStartPage = TokenFactory.createAttributeType(0x100000000000009FL, "osee.wi.Start Page");
+ public static final IAttributeType WorkTransition = TokenFactory.createAttributeType(0x100000000000009DL, "osee.wi.Transition");
+ public static final IAttributeType WorkType = TokenFactory.createAttributeType(0x1000000000000098L, "osee.wi.Work Type");
+ public static final IAttributeType WorkflowDefinition = TokenFactory.createAttributeType(0x1000000000000075L, "Workflow Definition");
+ public static final IAttributeType XViewerCustomization = TokenFactory.createAttributeType(0x1000000000000065L, "XViewer Customization");
+ public static final IAttributeType XViewerDefaults = TokenFactory.createAttributeType(0x1000000000000066L, "XViewer Defaults");
+ public static final IAttributeType Zip = TokenFactory.createAttributeType(0x100000000000005FL, "Zip");
// @formatter:on
private CoreAttributeTypes() {
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreRelationTypes.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreRelationTypes.java
index 464b764e3d..f55fff37e1 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreRelationTypes.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreRelationTypes.java
@@ -18,73 +18,73 @@ import org.eclipse.osee.framework.core.data.TokenFactory;
public final class CoreRelationTypes {
public static final IRelationTypeSide Allocation__Requirement = TokenFactory.createRelationTypeSide(SIDE_A,
- "AAMFE+RS8gRV2BXaCtQA", "Allocation");
+ 0x2000000000000157L, "Allocation");
public static final IRelationTypeSide Allocation__Component = TokenFactory.createRelationTypeSide(SIDE_B,
- "AAMFE+RS8gRV2BXaCtQA", "Allocation");
+ 0x2000000000000157L, "Allocation");
public static final IRelationTypeSide CodeRequirement_Requirement = TokenFactory.createRelationTypeSide(SIDE_B,
- "AAMFE+TNKxG5ytcGHqgA", "Code-Requirement");
+ 0x2000000000000158L, "Code-Requirement");
public static final IRelationTypeSide CodeRequirement_CodeUnit = TokenFactory.createRelationTypeSide(SIDE_A,
- "AAMFE+TNKxG5ytcGHqgA", "Code-Requirement");
+ 0x2000000000000158L, "Code-Requirement");
public static final IRelationTypeSide Default_Hierarchical__Parent = TokenFactory.createRelationTypeSide(SIDE_A,
- "AAMFE9skWhPMi6I1WdAA", "Default Hierarchical");
+ 0x2000000000000154L, "Default Hierarchical");
public static final IRelationTypeSide Default_Hierarchical__Child = TokenFactory.createRelationTypeSide(SIDE_B,
- "AAMFE9skWhPMi6I1WdAA", "Default Hierarchical");
+ 0x2000000000000154L, "Default Hierarchical");
public static final IRelationTypeSide Dependency__Dependency = TokenFactory.createRelationTypeSide(SIDE_B,
- "AAMFE9uek34jqArVRuAA", "Dependency");
+ 0x2000000000000155L, "Dependency");
public static final IRelationTypeSide Dependency__Artifact = TokenFactory.createRelationTypeSide(SIDE_A,
- "AAMFE9uek34jqArVRuAA", "Dependency");
+ 0x2000000000000155L, "Dependency");
public static final IRelationTypeSide Design__Design = TokenFactory.createRelationTypeSide(SIDE_B,
- "AAMFE+XjcSaqnXfOXVQA", "Design");
+ 0x200000000000015AL, "Design");
public static final IRelationTypeSide Design__Requirement = TokenFactory.createRelationTypeSide(SIDE_A,
- "AAMFE+XjcSaqnXfOXVQA", "Design");
+ 0x200000000000015AL, "Design");
public static final IRelationTypeSide Executes__Test_Plan_Element = TokenFactory.createRelationTypeSide(SIDE_A,
- "AWo0+Hkh+2qNMeAlUwQA", "Executes");
+ 0x200000000000015EL, "Executes");
public static final IRelationTypeSide Executes__Test_Procedure = TokenFactory.createRelationTypeSide(SIDE_B,
- "AWo0+Hkh+2qNMeAlUwQA", "Executes");
+ 0x200000000000015EL, "Executes");
public static final IRelationTypeSide Requirement_Trace__Higher_Level = TokenFactory.createRelationTypeSide(SIDE_A,
- "AAMFE+dRBVFN6fAPXdwA", "Requirement Trace");
+ 0x200000000000015FL, "Requirement Trace");
public static final IRelationTypeSide Requirement_Trace__Lower_Level = TokenFactory.createRelationTypeSide(SIDE_B,
- "AAMFE+dRBVFN6fAPXdwA", "Requirement Trace");
+ 0x200000000000015FL, "Requirement Trace");
public static final IRelationTypeSide Supercedes_Supercedes = TokenFactory.createRelationTypeSide(SIDE_A,
- "AAMFE9qJZC_qegaByjgA", "Supercedes");
+ 0x2000000000000165L, "Supercedes");
public static final IRelationTypeSide Supercedes_Superceded = TokenFactory.createRelationTypeSide(SIDE_B,
- "AAMFE9qJZC_qegaByjgA", "Supercedes");
+ 0x2000000000000165L, "Supercedes");
public static final IRelationTypeSide SupportingInfo_SupportedBy = TokenFactory.createRelationTypeSide(SIDE_A,
- "AAMFE9wWnVhFW0wtOPAA", "Supporting Info");
+ 0x2000000000000166L, "Supporting Info");
public static final IRelationTypeSide SupportingInfo_SupportingInfo = TokenFactory.createRelationTypeSide(SIDE_B,
- "AAMFE9wWnVhFW0wtOPAA", "Supporting Info");
+ 0x2000000000000166L, "Supporting Info");
public static final IRelationTypeSide TeamMember_Team = TokenFactory.createRelationTypeSide(SIDE_A,
- "AAMFE92A6gCO9WJ2ijQA", "TeamMember");
+ 0x200000000000016AL, "TeamMember");
public static final IRelationTypeSide TeamMember_Member = TokenFactory.createRelationTypeSide(SIDE_B,
- "AAMFE92A6gCO9WJ2ijQA", "TeamMember");
+ 0x200000000000016AL, "TeamMember");
public static final IRelationTypeSide Test_Unit_Result__Test_Unit = TokenFactory.createRelationTypeSide(SIDE_A,
- "AQm9ouX6JwBD29WrFoAA", "Results Data");
+ 0x2000000000000168L, "Results Data");
public static final IRelationTypeSide Test_Unit_Result__Test_Result = TokenFactory.createRelationTypeSide(SIDE_B,
- "AQm9ouX6JwBD29WrFoAA", "Results Data");
+ 0x2000000000000168L, "Results Data");
public static final IRelationTypeSide Universal_Grouping__Members = TokenFactory.createRelationTypeSide(SIDE_B,
- "AAMFE9yOp2hIrXwZ13wA", "Universal Grouping");
+ 0x2000000000000156L, "Universal Grouping");
public static final IRelationTypeSide Universal_Grouping__Group = TokenFactory.createRelationTypeSide(SIDE_A,
- "AAMFE9yOp2hIrXwZ13wA", "Universal Grouping");
+ 0x2000000000000156L, "Universal Grouping");
public static final IRelationTypeSide Users_Artifact = TokenFactory.createRelationTypeSide(SIDE_A,
- "AAMFE9nibXSCqcoXkMAA", "Users");
- public static final IRelationTypeSide Users_User = TokenFactory.createRelationTypeSide(SIDE_B,
- "AAMFE9nibXSCqcoXkMAA", "Users");
+ 0x2000000000000164L, "Users");
+ public static final IRelationTypeSide Users_User = TokenFactory.createRelationTypeSide(SIDE_B, 0x2000000000000164L,
+ "Users");
public static final IRelationTypeSide Uses__Requirement = TokenFactory.createRelationTypeSide(SIDE_A,
- "AAMFE_GV43rvba32QqwA", "Uses");
+ 0x2000000000000177L, "Uses");
public static final IRelationTypeSide Uses__TestUnit = TokenFactory.createRelationTypeSide(SIDE_B,
- "AAMFE_GV43rvba32QqwA", "Uses");
+ 0x2000000000000177L, "Uses");
public static final IRelationTypeSide Validation__Requirement = TokenFactory.createRelationTypeSide(SIDE_A,
- "AAMFE+fMVRM8f9BUD0AA", "Validation");
+ 0x2000000000000160L, "Validation");
public static final IRelationTypeSide Validation__Validator = TokenFactory.createRelationTypeSide(SIDE_B,
- "AAMFE+fMVRM8f9BUD0AA", "Validation");
+ 0x2000000000000160L, "Validation");
public static final IRelationTypeSide Verification__Requirement = TokenFactory.createRelationTypeSide(SIDE_A,
- "AAMFE+ZdqgB+D5zP5+gA", "Verification");
+ 0x200000000000015BL, "Verification");
public static final IRelationTypeSide Verification__Verifier = TokenFactory.createRelationTypeSide(SIDE_B,
- "AAMFE+ZdqgB+D5zP5+gA", "Verification");
+ 0x200000000000015BL, "Verification");
public static final IRelationTypeSide Verification_Plan__Requirement = TokenFactory.createRelationTypeSide(SIDE_A,
- "ATmJsVc28wU57zFAi7AA", "Verification Plan");
+ 0x200000000000015CL, "Verification Plan");
public static final IRelationTypeSide Verification_Plan__Test_Plan_Element = TokenFactory.createRelationTypeSide(
- SIDE_B, "ATmJsVc28wU57zFAi7AA", "Verification Plan");
+ SIDE_B, 0x200000000000015CL, "Verification Plan");
private CoreRelationTypes() {
// Constants
diff --git a/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/AddCommonBranch.java b/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/AddCommonBranch.java
index d2a68022b1..91222a1da0 100644
--- a/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/AddCommonBranch.java
+++ b/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/AddCommonBranch.java
@@ -11,12 +11,22 @@
package org.eclipse.osee.framework.database.init;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Map;
+import java.util.Map.Entry;
import org.eclipse.osee.framework.core.data.IUserToken;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.core.enums.SystemUser;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.exception.OseeExceptions;
+import org.eclipse.osee.framework.jdk.core.util.GUID;
+import org.eclipse.osee.framework.jdk.core.util.HumanReadableId;
+import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.skynet.core.GlobalXViewerSettings;
import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
import org.eclipse.osee.framework.skynet.core.SystemGroup;
@@ -53,6 +63,31 @@ public abstract class AddCommonBranch implements IDbInitializationTask {
BranchManager.createTopLevelBranch(CoreBranches.COMMON);
+ OseeTypesSetup types = new OseeTypesSetup();
+ Map<String, URL> typeMap = types.getOseeTypeExtensions();
+
+ SkynetTransaction transaction1 =
+ new SkynetTransaction(BranchManager.getCommonBranch(), "Add Types to Common Branch");
+
+ for (Entry<String, URL> entry : typeMap.entrySet()) {
+ Artifact artifact =
+ ArtifactTypeManager.addArtifact(CoreArtifactTypes.OseeTypeDefinition, BranchManager.getCommonBranch(),
+ entry.getKey(), GUID.create(), HumanReadableId.generate());
+ artifact.setSoleAttributeFromString(CoreAttributeTypes.Extension, ".osee");
+ artifact.setSoleAttributeValue(CoreAttributeTypes.Active, true);
+ InputStream inputStream = null;
+ try {
+ inputStream = new BufferedInputStream(entry.getValue().openStream());
+ artifact.setSoleAttributeFromStream(CoreAttributeTypes.NativeContent, inputStream);
+ } catch (IOException ex) {
+ OseeExceptions.wrap(ex);
+ } finally {
+ Lib.close(inputStream);
+ }
+ transaction1.addArtifact(artifact);
+ }
+ transaction1.execute();
+
SkynetTransaction transaction = new SkynetTransaction(BranchManager.getCommonBranch(), "Add Common Branch");
//create everyone group
diff --git a/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/DbBootstrapTask.java b/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/DbBootstrapTask.java
index 3e5c7eea9c..2fb7c10264 100644
--- a/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/DbBootstrapTask.java
+++ b/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/DbBootstrapTask.java
@@ -69,6 +69,7 @@ public class DbBootstrapTask implements IDbInitializationTask {
IOseeDatabaseService databaseService = DatabaseInitActivator.getInstance().getDatabaseService();
databaseService.getSequence().clear();
+ databaseService.getRemoteIdManager().clear();
Branch systemRoot = BranchManager.getSystemRootBranch();
Conditions.checkNotNull(systemRoot, "System root was not created - ");
@@ -89,6 +90,8 @@ public class DbBootstrapTask implements IDbInitializationTask {
OseeTypesSetup oseeTypesSetup = new OseeTypesSetup();
oseeTypesSetup.execute(oseeTypes);
+
+ service.clearAll();
}
private void createOseeDatastore() throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/OseeTypesSetup.java b/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/OseeTypesSetup.java
index 8974334922..e3ee53a3af 100644
--- a/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/OseeTypesSetup.java
+++ b/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/OseeTypesSetup.java
@@ -70,6 +70,8 @@ public class OseeTypesSetup {
processOseeTypeData(combinedFile.toURI());
// Only delete file if no problems processing
combinedFile.delete();
+
+ //john - for each in map, create artifact (OseeTypeDefinition) and store xtext data in artifact
} catch (IOException ex) {
OseeExceptions.wrapAndThrow(ex);
}
@@ -117,14 +119,13 @@ public class OseeTypesSetup {
for (String idsToImport : uniqueIdsToImport) {
URL urlEntry = extensions.get(idsToImport);
if (urlEntry == null) {
- OseeLog.logf(DatabaseInitActivator.class, Level.SEVERE,
- "ExtensionUniqueId [%s] was not found", idsToImport);
+ OseeLog.logf(DatabaseInitActivator.class, Level.SEVERE, "ExtensionUniqueId [%s] was not found", idsToImport);
} else {
items.put(idsToImport, urlEntry);
}
}
- OseeLog.logf(DatabaseInitActivator.class, Level.INFO,
- "Importing:\n\t%s", items.keySet().toString().replaceAll(",", ",\n\t"));
+ OseeLog.logf(DatabaseInitActivator.class, Level.INFO, "Importing:\n\t%s",
+ items.keySet().toString().replaceAll(",", ",\n\t"));
return items;
}
@@ -133,11 +134,8 @@ public class OseeTypesSetup {
if (handler != null) {
handler.execute(new NullProgressMonitor(), uri);
} else {
- OseeLog.logf(
- DatabaseInitActivator.class,
- Level.SEVERE,
- "Unable to find handler for [%s] - handlers - %s", uri.toASCIIString(),
- this.extensionObjects.getObjects());
+ OseeLog.logf(DatabaseInitActivator.class, Level.SEVERE, "Unable to find handler for [%s] - handlers - %s",
+ uri.toASCIIString(), this.extensionObjects.getObjects());
}
}
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/IOseeDatabaseService.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/IOseeDatabaseService.java
index 736cba49a3..1141dcd06f 100644
--- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/IOseeDatabaseService.java
+++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/IOseeDatabaseService.java
@@ -17,12 +17,15 @@ import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.core.IOseeSequence;
import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.OseeConnection;
+import org.eclipse.osee.framework.database.core.RemoteIdManager;
/**
* @author Roberto E. Escobar
*/
public interface IOseeDatabaseService {
+ RemoteIdManager getRemoteIdManager();
+
IOseeSequence getSequence() throws OseeDataStoreException;
IOseeStatement getStatement() throws OseeDataStoreException;
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/RemoteIdManager.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/RemoteIdManager.java
new file mode 100644
index 0000000000..bd9c4e4278
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/RemoteIdManager.java
@@ -0,0 +1,21 @@
+/*
+ * Created on Aug 17, 2011
+ *
+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
+ */
+package org.eclipse.osee.framework.database.core;
+
+import java.util.Collection;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+
+public interface RemoteIdManager {
+
+ Integer getLocalId(Long remoteId) throws OseeCoreException;
+
+ Long getRemoteId(Integer localId) throws OseeCoreException;
+
+ void store(Collection<Long> remoteIds) throws OseeCoreException;
+
+ void clear();
+
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeDatabaseServiceImpl.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeDatabaseServiceImpl.java
index b0f080d9e6..c4475f62b4 100644
--- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeDatabaseServiceImpl.java
+++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeDatabaseServiceImpl.java
@@ -27,6 +27,7 @@ import org.eclipse.osee.framework.database.core.IDatabaseInfoProvider;
import org.eclipse.osee.framework.database.core.IOseeSequence;
import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.OseeConnection;
+import org.eclipse.osee.framework.database.core.RemoteIdManager;
import org.eclipse.osee.framework.database.internal.Activator;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -41,9 +42,11 @@ public class OseeDatabaseServiceImpl implements IOseeDatabaseService {
private final IOseeSequence oseeSequence;
private final ConnectionFactoryProvider dbConnectionFactory;
private final IDatabaseInfoProvider dbInfoProvider;
+ private final RemoteIdManager remoteIdManager;
public OseeDatabaseServiceImpl(IDatabaseInfoProvider dbInfoProvider, ConnectionFactoryProvider dbConnectionFactory) {
this.oseeSequence = new OseeSequenceImpl(this);
+ this.remoteIdManager = new RemoteIdManagerImpl(this);
this.dbInfoProvider = dbInfoProvider;
this.dbConnectionFactory = dbConnectionFactory;
}
@@ -226,4 +229,9 @@ public class OseeDatabaseServiceImpl implements IOseeDatabaseService {
public boolean isProduction() throws OseeCoreException {
return getDatabaseInfoProvider().isProduction();
}
+
+ @Override
+ public RemoteIdManager getRemoteIdManager() {
+ return remoteIdManager;
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/RemoteIdManagerImpl.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/RemoteIdManagerImpl.java
new file mode 100644
index 0000000000..37b3f4ae28
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/RemoteIdManagerImpl.java
@@ -0,0 +1,117 @@
+/*
+ * Created on Aug 17, 2011
+ *
+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
+ */
+package org.eclipse.osee.framework.database.internal.core;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.util.Conditions;
+import org.eclipse.osee.framework.database.IOseeDatabaseService;
+import org.eclipse.osee.framework.database.core.IOseeStatement;
+import org.eclipse.osee.framework.database.core.RemoteIdManager;
+import org.eclipse.osee.framework.jdk.core.util.Collections;
+import org.eclipse.osee.framework.jdk.core.util.Lib;
+
+public class RemoteIdManagerImpl implements RemoteIdManager {
+
+ private static final String SELECT_ALL = "select * from osee_type_id_map";
+ private static final String INSERT_SQL = "insert into osee_type_id_map (remote_id, local_id) values (?,?)";
+
+ private final Map<Long, Integer> remoteIdToLocalId = new ConcurrentHashMap<Long, Integer>();
+ private final Map<Integer, Long> localIdToRemoteId = new ConcurrentHashMap<Integer, Long>();
+ private final Set<Long> persistedIds = new ConcurrentSkipListSet<Long>();
+
+ private final IOseeDatabaseService service;
+ private volatile boolean ensurePopulatedRanOnce;
+
+ public RemoteIdManagerImpl(IOseeDatabaseService service) {
+ super();
+ this.service = service;
+ }
+
+ @Override
+ public Integer getLocalId(Long remoteId) throws OseeCoreException {
+ ensurePopulate();
+ Conditions.checkNotNull(remoteId, "remoteId");
+ Integer localId = remoteIdToLocalId.get(remoteId);
+ if (localId == null) {
+ reloadCache();
+ localId = remoteIdToLocalId.get(remoteId);
+ if (localId == null) {
+ localId = service.getSequence().getNextLocalTypeId();
+ cache(remoteId, localId);
+ }
+ }
+ return localId;
+ }
+
+ @Override
+ public Long getRemoteId(Integer localId) throws OseeCoreException {
+ ensurePopulate();
+ Conditions.checkNotNull(localId, "localId");
+ Long remoteId = localIdToRemoteId.get(localId);
+ if (remoteId == null) {
+ throw new OseeCoreException("Remote id for local id [%s] was not found", remoteId);
+ }
+ return remoteId;
+
+ }
+
+ private synchronized void reloadCache() throws OseeCoreException {
+ IOseeStatement chStmt = null;
+ try {
+ chStmt = service.getStatement();
+ chStmt.runPreparedQuery(1000, SELECT_ALL);
+ clear();
+ while (chStmt.next()) {
+ Long remoteId = chStmt.getLong("remote_id");
+ Integer localId = chStmt.getInt("local_id");
+ cache(remoteId, localId);
+ persistedIds.add(remoteId);
+ }
+ } finally {
+ Lib.close(chStmt);
+ }
+ }
+
+ @Override
+ public void clear() {
+ remoteIdToLocalId.clear();
+ localIdToRemoteId.clear();
+ persistedIds.clear();
+ }
+
+ private void cache(Long remoteId, Integer localId) {
+ remoteIdToLocalId.put(remoteId, localId);
+ localIdToRemoteId.put(localId, remoteId);
+ }
+
+ private synchronized void ensurePopulate() throws OseeCoreException {
+ if (!ensurePopulatedRanOnce) {
+ ensurePopulatedRanOnce = true;
+ reloadCache();
+ }
+ }
+
+ @Override
+ public void store(Collection<Long> remoteIds) throws OseeCoreException {
+ ensurePopulate();
+ List<Object[]> data = new ArrayList<Object[]>();
+ List<Long> toPersist = Collections.setComplement(remoteIds, persistedIds);
+ for (Long remoteId : toPersist) {
+ Integer localId = getLocalId(remoteId);
+ data.add(new Object[] {remoteId, localId});
+ }
+ service.runBatchUpdate(INSERT_SQL, data);
+ persistedIds.addAll(toPersist);
+ }
+
+}
diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/PurgeRelationType.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/PurgeRelationType.java
index fa3b5a857f..7cb4ddff7e 100644
--- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/PurgeRelationType.java
+++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/PurgeRelationType.java
@@ -68,14 +68,14 @@ public final class PurgeRelationType extends AbstractDbTxOperation {
private final RelationTypeCache cache;
private final String[] typesToPurge;
private final boolean forcePurge;
- private final List<String[]> relationTypeGuids;
+ private final List<Long[]> relationTypeGuids;
public PurgeRelationType(IOseeDatabaseService databaseService, IOseeCachingService cachingService, OperationLogger logger, boolean force, String... typesToPurge) {
super(databaseService, "Purge Relation Type", Activator.PLUGIN_ID, logger);
this.cache = cachingService.getRelationTypeCache();
this.forcePurge = force;
this.typesToPurge = typesToPurge;
- this.relationTypeGuids = new ArrayList<String[]>(typesToPurge.length);
+ this.relationTypeGuids = new ArrayList<Long[]>(typesToPurge.length);
}
@Override
@@ -97,13 +97,13 @@ public final class PurgeRelationType extends AbstractDbTxOperation {
private boolean collectInfo() throws OseeCoreException {
for (int i = 0; i < typesToPurge.length; i++) {
- String guid;
+ Long guid;
try {
RelationType type = cache.getBySoleName(typesToPurge[i]);
guid = type.getGuid();
logf("Type [%s] found. Guid: [%s]\n", typesToPurge[i], guid);
- relationTypeGuids.add(new String[] {guid});
+ relationTypeGuids.add(new Long[] {guid});
} catch (OseeArgumentException ex) {
logf("Type [%s] NOT found. \n", typesToPurge[i]);
log(ex);
@@ -119,7 +119,7 @@ public final class PurgeRelationType extends AbstractDbTxOperation {
IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
- for (String[] relationTypeId : relationTypeGuids) {
+ for (Long[] relationTypeId : relationTypeGuids) {
chStmt.runPreparedQuery(RETRIEVE_GAMMAS_OF_REL_LINK_TXS, cache.getByGuid(relationTypeId[0]).getId());
while (chStmt.next()) {
gammas.add(new Integer[] {chStmt.getInt("gamma_id")});
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/UserManagerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/UserManagerTest.java
index 16e4062171..c2d25b2e25 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/UserManagerTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/UserManagerTest.java
@@ -21,8 +21,7 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.User;
-import org.eclipse.osee.framework.skynet.core.UserManager;
+import org.eclipse.osee.framework.jdk.core.util.GUID;
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;
@@ -41,8 +40,8 @@ public final class UserManagerTest {
private User createUser(SkynetTransaction transaction, int index) throws OseeCoreException {
IUserToken token =
- TokenFactory.createUserToken(null, NEW_USER_NAMES[index], "this" + index + "@that.com", "9999999" + index,
- true, index % 2 == 0, true);
+ TokenFactory.createUserToken(GUID.create(), NEW_USER_NAMES[index], "this" + index + "@that.com",
+ "9999999" + index, true, index % 2 == 0, true);
User user = UserManager.createUser(token, transaction);
user.persist(transaction);
return user;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DuplicateHridTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DuplicateHridTest.java
index e9f4d1dee3..3c171df6d9 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DuplicateHridTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DuplicateHridTest.java
@@ -47,8 +47,7 @@ public class DuplicateHridTest {
return toReturn;
}
- private static final String GET_ARTIFACTS =
- "SELECT t1.human_readable_id FROM osee_artifact t1, osee_artifact_type t3";
+ private static final String GET_ARTIFACTS = "SELECT t1.human_readable_id FROM osee_artifact t1";
private static final char[][] chars = new char[][] {
{
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventTest.java
index 58c959f856..b6015cac66 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventTest.java
@@ -425,7 +425,7 @@ public class ArtifactEventTest {
DefaultBasicGuidRelationReorder guidReorder = resultEventReorders.iterator().next();
Assert.assertEquals(RelationOrderModType.Absolute, guidReorder.getModType());
Assert.assertEquals(parentRemGuidArt.getArtGuid(), guidReorder.getParentArt().getGuid());
- Assert.assertEquals(parentRemGuidArt.getArtTypeGuid(), guidReorder.getParentArt().getArtTypeGuid());
+ Assert.assertEquals(parentRemGuidArt.getArtTypeGuid(), (long) guidReorder.getParentArt().getArtTypeGuid());
Assert.assertEquals(parentRemGuidArt.getBranchGuid(), guidReorder.getParentArt().getBranchGuid());
Assert.assertEquals(CoreRelationTypes.Default_Hierarchical__Child.getGuid(), guidReorder.getRelTypeGuid());
Assert.assertEquals(injectArt.getBranch().getGuid(), guidReorder.getBranchGuid());
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifactTest.java
index 0a3386c118..33fb1fad1d 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifactTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifactTest.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.framework.skynet.core.event.model;
import java.util.HashSet;
import java.util.Set;
-
import org.eclipse.osee.framework.core.model.event.DefaultBasicGuidArtifact;
import org.eclipse.osee.framework.core.model.event.IBasicGuidArtifact;
import org.eclipse.osee.framework.jdk.core.util.GUID;
@@ -27,7 +26,7 @@ public class EventBasicGuidArtifactTest {
@Test
public void testEqualsEventBasicGuidArtifact() {
EventBasicGuidArtifact eventArt1 =
- new EventBasicGuidArtifact(EventModType.Added, GUID.create(), GUID.create(), GUID.create());
+ new EventBasicGuidArtifact(EventModType.Added, GUID.create(), 0x01L, GUID.create());
EventBasicGuidArtifact eventArt2 =
new EventBasicGuidArtifact(EventModType.Added, eventArt1.getBranchGuid(), eventArt1.getArtTypeGuid(),
eventArt1.getGuid());
@@ -46,8 +45,7 @@ public class EventBasicGuidArtifactTest {
Assert.assertNotSame(eventArt1, eventArt2);
- eventArt2 =
- new EventBasicGuidArtifact(EventModType.Added, eventArt1.getBranchGuid(), GUID.create(), eventArt1.getGuid());
+ eventArt2 = new EventBasicGuidArtifact(EventModType.Added, eventArt1.getBranchGuid(), 0x02L, eventArt1.getGuid());
Assert.assertNotSame(eventArt1, eventArt2);
@@ -75,7 +73,7 @@ public class EventBasicGuidArtifactTest {
@Test
public void testEqualsBasicGuidArtifact() {
EventBasicGuidArtifact eventArt1 =
- new EventBasicGuidArtifact(EventModType.Added, GUID.create(), GUID.create(), GUID.create());
+ new EventBasicGuidArtifact(EventModType.Added, GUID.create(), 0x01L, GUID.create());
DefaultBasicGuidArtifact eventArt2 =
new DefaultBasicGuidArtifact(eventArt1.getBranchGuid(), eventArt1.getArtTypeGuid(), eventArt1.getGuid());
@@ -93,8 +91,7 @@ public class EventBasicGuidArtifactTest {
Assert.assertNotSame(eventArt1, eventArt2);
- eventArt2 =
- new EventBasicGuidArtifact(EventModType.Added, eventArt1.getBranchGuid(), GUID.create(), eventArt1.getGuid());
+ eventArt2 = new EventBasicGuidArtifact(EventModType.Added, eventArt1.getBranchGuid(), 0x02L, eventArt1.getGuid());
Assert.assertNotSame(eventArt1, eventArt2);
@@ -122,7 +119,7 @@ public class EventBasicGuidArtifactTest {
@Test
public void testEventBasicGuidArtifactIs() {
EventBasicGuidArtifact eventArt1 =
- new EventBasicGuidArtifact(EventModType.Added, GUID.create(), GUID.create(), GUID.create());
+ new EventBasicGuidArtifact(EventModType.Added, GUID.create(), 0x01L, GUID.create());
Assert.assertTrue(eventArt1.is(EventModType.Added));
Assert.assertTrue(eventArt1.is(EventModType.Added, EventModType.ChangeType));
Assert.assertFalse(eventArt1.is(EventModType.ChangeType));
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidRelationTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidRelationTest.java
index a9ab550c88..aa7ad04b0e 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidRelationTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidRelationTest.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.framework.skynet.core.event.model;
import java.util.HashSet;
import java.util.Set;
-
import org.eclipse.osee.framework.core.model.event.DefaultBasicGuidArtifact;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.skynet.core.relation.RelationEventType;
@@ -26,13 +25,13 @@ public class EventBasicGuidRelationTest {
@Test
public void testEqualsEventBasicGuidRelation() {
- DefaultBasicGuidArtifact eventArt1 = new DefaultBasicGuidArtifact(GUID.create(), GUID.create(), GUID.create());
+ DefaultBasicGuidArtifact eventArt1 = new DefaultBasicGuidArtifact(GUID.create(), 0x01L, GUID.create());
DefaultBasicGuidArtifact eventArt2 =
new DefaultBasicGuidArtifact(eventArt1.getBranchGuid(), eventArt1.getArtTypeGuid(), eventArt1.getGuid());
EventBasicGuidRelation eventRel1 =
- new EventBasicGuidRelation(RelationEventType.Added, eventArt1.getBranchGuid(), GUID.create(), 234, 333, 34,
- eventArt1, 33, eventArt2);
+ new EventBasicGuidRelation(RelationEventType.Added, eventArt1.getBranchGuid(), 0x02L, 234, 333, 34, eventArt1,
+ 33, eventArt2);
EventBasicGuidRelation eventRel2 =
new EventBasicGuidRelation(RelationEventType.Added, eventRel1.getBranchGuid(), eventRel1.getRelTypeGuid(),
eventRel1.getRelationId(), eventRel1.getGammaId(), eventRel1.getArtAId(), eventRel1.getArtA(),
@@ -100,13 +99,13 @@ public class EventBasicGuidRelationTest {
@Test
public void testEventBasicGuidRelationIs() {
- DefaultBasicGuidArtifact eventArt1 = new DefaultBasicGuidArtifact(GUID.create(), GUID.create(), GUID.create());
+ DefaultBasicGuidArtifact eventArt1 = new DefaultBasicGuidArtifact(GUID.create(), 0x03L, GUID.create());
DefaultBasicGuidArtifact eventArt2 =
new DefaultBasicGuidArtifact(eventArt1.getBranchGuid(), eventArt1.getArtTypeGuid(), eventArt1.getGuid());
EventBasicGuidRelation eventRel1 =
- new EventBasicGuidRelation(RelationEventType.Added, eventArt1.getBranchGuid(), GUID.create(), 234, 333, 34,
- eventArt1, 33, eventArt2);
+ new EventBasicGuidRelation(RelationEventType.Added, eventArt1.getBranchGuid(), 0x04L, 234, 333, 34, eventArt1,
+ 33, eventArt2);
Assert.assertTrue(eventRel1.is(RelationEventType.Added));
Assert.assertTrue(eventRel1.is(RelationEventType.Added, RelationEventType.Purged));
Assert.assertFalse(eventRel1.is(RelationEventType.Purged));
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventChangeTypeBasicGuidArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventChangeTypeBasicGuidArtifactTest.java
index bb69f7e5af..7dfa70b1fa 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventChangeTypeBasicGuidArtifactTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/EventChangeTypeBasicGuidArtifactTest.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.framework.skynet.core.event.model;
import java.util.HashSet;
import java.util.Set;
-
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.junit.Assert;
import org.junit.Test;
@@ -25,7 +24,7 @@ public class EventChangeTypeBasicGuidArtifactTest {
@Test
public void testEquals() {
EventChangeTypeBasicGuidArtifact eventArt1 =
- new EventChangeTypeBasicGuidArtifact(GUID.create(), GUID.create(), GUID.create(), GUID.create());
+ new EventChangeTypeBasicGuidArtifact(GUID.create(), 1234L, 546L, GUID.create());
EventChangeTypeBasicGuidArtifact eventArt2 =
new EventChangeTypeBasicGuidArtifact(eventArt1.getBranchGuid(), eventArt1.getFromArtTypeGuid(),
eventArt1.getArtTypeGuid(), eventArt1.getGuid());
@@ -46,7 +45,7 @@ public class EventChangeTypeBasicGuidArtifactTest {
Assert.assertNotSame(eventArt1, eventArt2);
eventArt2 =
- new EventChangeTypeBasicGuidArtifact(eventArt1.getBranchGuid(), GUID.create(), eventArt1.getArtTypeGuid(),
+ new EventChangeTypeBasicGuidArtifact(eventArt1.getBranchGuid(), 111L, eventArt1.getArtTypeGuid(),
eventArt1.getGuid());
Assert.assertNotSame(eventArt1, eventArt2);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/DataFactory.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/DataFactory.java
index b52087c4d4..3998bf4b21 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/DataFactory.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/DataFactory.java
@@ -37,7 +37,7 @@ public final class DataFactory {
public static ArtifactType fromToken(IArtifactType artifactType) {
String name = artifactType.getName();
- String guid = artifactType.getGuid();
+ Long guid = artifactType.getGuid();
return new ArtifactType(guid, name, true);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationCacheTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationCacheTest.java
index 2ce27e9757..143b9007a0 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationCacheTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationCacheTest.java
@@ -360,8 +360,8 @@ public class RelationCacheTest {
IArtifact artifactB = createArtifact(55, testBranch);
RelationType type =
- new RelationType(GUID.create(), "type name", artifactA.getName(), artifactB.getName(),
- CoreArtifactTypes.Artifact, CoreArtifactTypes.Artifact, RelationTypeMultiplicity.MANY_TO_MANY, "");
+ new RelationType(0x00L, "type name", artifactA.getName(), artifactB.getName(), CoreArtifactTypes.Artifact,
+ CoreArtifactTypes.Artifact, RelationTypeMultiplicity.MANY_TO_MANY, "");
RelationLink link =
new RelationLink(new MockLinker("linker"), artifactA.getArtId(), artifactB.getArtId(), testBranch, type, 77,
88, "", ModificationType.MODIFIED);
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 2bd99ee383..b3567fdcce 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
@@ -210,7 +210,7 @@ public class RelationTypeSideSorterTest {
RelationSorterProvider provider = new RelationSorterProvider();
IRelationOrderAccessor accessor = new DoNothingAccessor();
- RelationTypeCache cache = new RelationTypeCache(new MockOseeDataAccessor<String, RelationType>());
+ RelationTypeCache cache = new RelationTypeCache(new MockOseeDataAccessor<Long, RelationType>());
RelationType relationType1 =
createRelationType(cache, "Rel 1", RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC.getGuid());
@@ -241,11 +241,11 @@ public class RelationTypeSideSorterTest {
}
private static RelationType createRelationType(RelationTypeCache cache, String name, String delationRelationOrderGuid) throws OseeCoreException {
- IArtifactType type1 = new ArtifactType(GUID.create(), "1", false);
- IArtifactType type2 = new ArtifactType(GUID.create(), "2", false);
+ IArtifactType type1 = new ArtifactType(0x01L, "1", false);
+ IArtifactType type2 = new ArtifactType(0x02L, "2", false);
RelationType relationType =
- new RelationType(GUID.create(), name, name + "_A", name + "_B", type1, type2,
- RelationTypeMultiplicity.MANY_TO_MANY, delationRelationOrderGuid);
+ new RelationType(0x03L, name, name + "_A", name + "_B", type1, type2, RelationTypeMultiplicity.MANY_TO_MANY,
+ delationRelationOrderGuid);
Assert.assertNotNull(relationType);
cache.cache(relationType);
return relationType;
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 ca9695beb0..7f5b81ad59 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
@@ -58,7 +58,7 @@ public class RelationOrderDataTest {
accessor = new MockRelationOrderAccessor();
data = new RelationOrderData(accessor, artifact);
- RelationTypeCache cache = new RelationTypeCache(new MockOseeDataAccessor<String, RelationType>());
+ RelationTypeCache cache = new RelationTypeCache(new MockOseeDataAccessor<Long, RelationType>());
relationType1 = createRelationType(cache, "Rel 1", RelationOrderBaseTypes.USER_DEFINED.getGuid());
relationType2 = createRelationType(cache, "Rel 2", RelationOrderBaseTypes.UNORDERED.getGuid());
@@ -275,11 +275,11 @@ public class RelationOrderDataTest {
}
private static RelationType createRelationType(RelationTypeCache cache, String name, String delationRelationOrderGuid) throws OseeCoreException {
- IArtifactType type1 = new ArtifactType(GUID.create(), "1", false);
- IArtifactType type2 = new ArtifactType(GUID.create(), "2", false);
+ IArtifactType type1 = new ArtifactType(0x01L, "1", false);
+ IArtifactType type2 = new ArtifactType(0x02L, "2", false);
RelationType relationType =
- new RelationType(GUID.create(), name, name + "_A", name + "_B", type1, type2,
- RelationTypeMultiplicity.MANY_TO_MANY, delationRelationOrderGuid);
+ new RelationType(0x03L, name, name + "_A", name + "_B", type1, type2, RelationTypeMultiplicity.MANY_TO_MANY,
+ delationRelationOrderGuid);
Assert.assertNotNull(relationType);
cache.cache(relationType);
return relationType;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/BootStrapUser.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/BootStrapUser.java
index de254e5c22..6127bb15a8 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/BootStrapUser.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/BootStrapUser.java
@@ -14,6 +14,7 @@ package org.eclipse.osee.framework.skynet.core;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.SystemUser;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.util.GUID;
/**
* @author Ryan D. Brooks
@@ -23,7 +24,7 @@ public class BootStrapUser extends User {
public static BootStrapUser instance;
private BootStrapUser() throws OseeCoreException {
- super(null, null, null, null, CoreArtifactTypes.User);
+ super(null, GUID.create(), null, null, CoreArtifactTypes.User);
}
public static BootStrapUser getInstance() throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
index 1949467d25..8f3ddf2d39 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
@@ -1628,7 +1628,7 @@ public class Artifact extends NamedIdentity<String> implements IArtifact, IAdapt
}
@Override
- public final String getArtTypeGuid() {
+ public final Long getArtTypeGuid() {
return getArtifactType().getGuid();
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java
index 886f6a0686..406e5f35b1 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java
@@ -35,7 +35,6 @@ import org.eclipse.osee.framework.core.services.IOseeCachingService;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.DbTransaction;
import org.eclipse.osee.framework.database.core.OseeConnection;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.skynet.core.artifact.factory.ArtifactFactoryManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
@@ -101,8 +100,8 @@ public class ArtifactTypeManager {
* @return Returns the artifact type matching the guid
* @param guid artifact type guid to match
*/
- public static ArtifactType getTypeByGuid(String guid) throws OseeCoreException {
- if (!GUID.isValid(guid)) {
+ public static ArtifactType getTypeByGuid(Long guid) throws OseeCoreException {
+ if (guid == null) {
throw new OseeArgumentException("[%s] is not a valid guid", guid);
}
ArtifactType artifactType = getCache().getByGuid(guid);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTypeManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTypeManager.java
index 9df45883af..2a5bead6ff 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTypeManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTypeManager.java
@@ -24,7 +24,6 @@ import org.eclipse.osee.framework.core.model.cache.AbstractOseeCache;
import org.eclipse.osee.framework.core.model.cache.BranchCache;
import org.eclipse.osee.framework.core.model.type.ArtifactType;
import org.eclipse.osee.framework.core.model.type.AttributeType;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
import org.eclipse.osee.framework.skynet.core.attribute.providers.IAttributeDataProvider;
@@ -35,7 +34,7 @@ import org.eclipse.osee.framework.skynet.core.internal.Activator;
*/
public class AttributeTypeManager {
- public static AbstractOseeCache<String, AttributeType> getCache() {
+ public static AbstractOseeCache<Long, AttributeType> getCache() {
return Activator.getInstance().getOseeCacheService().getAttributeTypeCache();
}
@@ -74,8 +73,8 @@ public class AttributeTypeManager {
* @return Returns the attribute type matching the guid
* @param guid attribute type guid to match
*/
- public static AttributeType getTypeByGuid(String guid) throws OseeCoreException {
- if (!GUID.isValid(guid)) {
+ public static AttributeType getTypeByGuid(Long guid) throws OseeCoreException {
+ if (guid == null) {
throw new OseeArgumentException("[%s] is not a valid guid", guid);
}
AttributeType attributeType = getCache().getByGuid(guid);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumTypeManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumTypeManager.java
index c3b3f8f8d8..d685d9fef5 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumTypeManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/OseeEnumTypeManager.java
@@ -24,7 +24,7 @@ import org.eclipse.osee.framework.skynet.core.internal.Activator;
*/
public class OseeEnumTypeManager {
- public static AbstractOseeCache<String, OseeEnumType> getCache() {
+ public static AbstractOseeCache<Long, OseeEnumType> getCache() {
return Activator.getInstance().getOseeCacheService().getEnumTypeCache();
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/AttributeChange.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/AttributeChange.java
index 9e9c8aff9e..71eb70a06c 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/AttributeChange.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/AttributeChange.java
@@ -44,7 +44,7 @@ import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
public class AttributeChange extends FrameworkEvent {
@XmlElement(required = true)
- protected String attrTypeGuid;
+ protected Long attrTypeGuid;
@XmlElement(required = true)
protected String modTypeGuid;
protected int attributeId;
@@ -55,18 +55,18 @@ public class AttributeChange extends FrameworkEvent {
/**
* Gets the value of the attrTypeGuid property.
*
- * @return possible object is {@link String }
+ * @return possible object is {@link Long }
*/
- public String getAttrTypeGuid() {
+ public Long getAttrTypeGuid() {
return attrTypeGuid;
}
/**
* Sets the value of the attrTypeGuid property.
*
- * @param value allowed object is {@link String }
+ * @param value allowed object is {@link Long }
*/
- public void setAttrTypeGuid(String value) {
+ public void setAttrTypeGuid(Long value) {
this.attrTypeGuid = value;
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifact.java
index 3378eb635a..2bae7bf99d 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifact.java
@@ -40,7 +40,7 @@ public class EventBasicGuidArtifact extends DefaultBasicGuidArtifact {
basicGuidArtifact.getGuid());
}
- public EventBasicGuidArtifact(EventModType eventModType, String branchGuid, String artTypeGuid, String guid) {
+ public EventBasicGuidArtifact(EventModType eventModType, String branchGuid, Long artTypeGuid, String guid) {
super(branchGuid, artTypeGuid, guid);
this.eventModType = eventModType;
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidRelation.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidRelation.java
index 815c8ecf09..afd6ee1706 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidRelation.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidRelation.java
@@ -29,7 +29,7 @@ public class EventBasicGuidRelation extends DefaultBasicGuidRelation {
guidRel.getGammaId(), artAId, guidRel.getArtA(), artBId, guidRel.getArtB());
}
- public EventBasicGuidRelation(RelationEventType relationEventType, String branchGuid, String relTypeGuid, int relationId, int gammaId, int artAId, DefaultBasicGuidArtifact artA, int artBId, DefaultBasicGuidArtifact artB) {
+ public EventBasicGuidRelation(RelationEventType relationEventType, String branchGuid, Long relTypeGuid, int relationId, int gammaId, int artAId, DefaultBasicGuidArtifact artA, int artBId, DefaultBasicGuidArtifact artB) {
super(branchGuid, relTypeGuid, relationId, gammaId, artA, artB);
this.relationEventType = relationEventType;
this.artAId = artAId;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventChangeTypeBasicGuidArtifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventChangeTypeBasicGuidArtifact.java
index 82d9a5f4b6..b4485c2d13 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventChangeTypeBasicGuidArtifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventChangeTypeBasicGuidArtifact.java
@@ -18,14 +18,14 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
*/
public class EventChangeTypeBasicGuidArtifact extends EventBasicGuidArtifact {
- private final String fromArtTypeGuid;
+ private final Long fromArtTypeGuid;
- public EventChangeTypeBasicGuidArtifact(String branchGuid, String fromArtTypeGuid, String artTypeGuid, String guid) {
+ public EventChangeTypeBasicGuidArtifact(String branchGuid, Long fromArtTypeGuid, Long artTypeGuid, String guid) {
super(EventModType.ChangeType, branchGuid, artTypeGuid, guid);
this.fromArtTypeGuid = fromArtTypeGuid;
}
- public String getFromArtTypeGuid() {
+ public Long getFromArtTypeGuid() {
return fromArtTypeGuid;
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventModifiedBasicGuidArtifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventModifiedBasicGuidArtifact.java
index cf48aeb773..4c27143248 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventModifiedBasicGuidArtifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventModifiedBasicGuidArtifact.java
@@ -25,7 +25,7 @@ public class EventModifiedBasicGuidArtifact extends EventBasicGuidArtifact {
this.attributeChanges = attributeChanges;
}
- public EventModifiedBasicGuidArtifact(String branchGuid, String artTypeGuid, String guid, Collection<AttributeChange> attributeChanges) {
+ public EventModifiedBasicGuidArtifact(String branchGuid, Long artTypeGuid, String guid, Collection<AttributeChange> attributeChanges) {
super(EventModType.Modified, branchGuid, artTypeGuid, guid);
this.attributeChanges = attributeChanges;
}
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 508dff03eb..afee879ebe 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
@@ -34,14 +34,14 @@ import org.eclipse.osee.framework.jdk.core.type.Triplet;
/**
* @author Roberto E. Escobar
*/
-public class ClientArtifactTypeAccessor extends AbstractClientDataAccessor<String, ArtifactType> {
+public class ClientArtifactTypeAccessor extends AbstractClientDataAccessor<Long, ArtifactType> {
- private final AbstractOseeCache<String, AttributeType> attrCache;
+ private final AbstractOseeCache<Long, AttributeType> attrCache;
private final AbstractOseeCache<String, Branch> branchCache;
private final ArtifactTypeFactory artifactTypeFactory;
- public ClientArtifactTypeAccessor(ArtifactTypeFactory artifactTypeFactory, AbstractOseeCache<String, AttributeType> attrCache, AbstractOseeCache<String, Branch> branchCache) {
+ public ClientArtifactTypeAccessor(ArtifactTypeFactory artifactTypeFactory, AbstractOseeCache<Long, AttributeType> attrCache, AbstractOseeCache<String, Branch> branchCache) {
this.artifactTypeFactory = artifactTypeFactory;
this.attrCache = attrCache;
this.branchCache = branchCache;
@@ -52,14 +52,14 @@ public class ClientArtifactTypeAccessor extends AbstractClientDataAccessor<Strin
}
@Override
- public void load(IOseeCache<String, ArtifactType> cache) throws OseeCoreException {
+ public void load(IOseeCache<Long, ArtifactType> cache) throws OseeCoreException {
attrCache.ensurePopulated();
branchCache.ensurePopulated();
super.load(cache);
}
@Override
- protected Collection<ArtifactType> updateCache(IOseeCache<String, ArtifactType> cache) throws OseeCoreException {
+ protected Collection<ArtifactType> updateCache(IOseeCache<Long, ArtifactType> cache) throws OseeCoreException {
List<ArtifactType> updatedItems = new ArrayList<ArtifactType>();
ArtifactTypeCacheUpdateResponse response =
@@ -88,7 +88,7 @@ public class ClientArtifactTypeAccessor extends AbstractClientDataAccessor<Strin
CompositeKeyHashMap<ArtifactType, IOseeBranch, Collection<AttributeType>> attrs =
new CompositeKeyHashMap<ArtifactType, IOseeBranch, Collection<AttributeType>>();
- for (Triplet<String, String, String> entry : response.getAttributeTypes()) {
+ for (Triplet<Long, String, Long> entry : response.getAttributeTypes()) {
ArtifactType key1 = cache.getByGuid(entry.getFirst());
IOseeBranch key2 = branchCache.getByGuid(entry.getSecond());
Collection<AttributeType> types = attrs.get(key1, key2);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientAttributeTypeAccessor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientAttributeTypeAccessor.java
index 92267b16b7..45603a048d 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientAttributeTypeAccessor.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientAttributeTypeAccessor.java
@@ -26,12 +26,12 @@ import org.eclipse.osee.framework.core.model.type.OseeEnumType;
/**
* @author Roberto E. Escobar
*/
-public class ClientAttributeTypeAccessor extends AbstractClientDataAccessor<String, AttributeType> {
+public class ClientAttributeTypeAccessor extends AbstractClientDataAccessor<Long, AttributeType> {
- private final AbstractOseeCache<String, OseeEnumType> enumCache;
+ private final AbstractOseeCache<Long, OseeEnumType> enumCache;
private final AttributeTypeFactory attributeTypeFactory;
- public ClientAttributeTypeAccessor(AttributeTypeFactory attributeTypeFactory, AbstractOseeCache<String, OseeEnumType> enumCache) {
+ public ClientAttributeTypeAccessor(AttributeTypeFactory attributeTypeFactory, AbstractOseeCache<Long, OseeEnumType> enumCache) {
super();
this.attributeTypeFactory = attributeTypeFactory;
this.enumCache = enumCache;
@@ -42,13 +42,13 @@ public class ClientAttributeTypeAccessor extends AbstractClientDataAccessor<Stri
}
@Override
- public void load(IOseeCache<String, AttributeType> cache) throws OseeCoreException {
+ public void load(IOseeCache<Long, AttributeType> cache) throws OseeCoreException {
enumCache.ensurePopulated();
super.load(cache);
}
@Override
- protected Collection<AttributeType> updateCache(IOseeCache<String, AttributeType> cache) throws OseeCoreException {
+ protected Collection<AttributeType> updateCache(IOseeCache<Long, AttributeType> cache) throws OseeCoreException {
List<AttributeType> updatedItems = new ArrayList<AttributeType>();
AttributeTypeCacheUpdateResponse response =
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientOseeEnumTypeAccessor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientOseeEnumTypeAccessor.java
index 449994497b..466ff892f1 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientOseeEnumTypeAccessor.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientOseeEnumTypeAccessor.java
@@ -24,7 +24,7 @@ import org.eclipse.osee.framework.core.model.type.OseeEnumTypeFactory;
/**
* @author Roberto E. Escobar
*/
-public class ClientOseeEnumTypeAccessor extends AbstractClientDataAccessor<String, OseeEnumType> {
+public class ClientOseeEnumTypeAccessor extends AbstractClientDataAccessor<Long, OseeEnumType> {
private final OseeEnumTypeFactory enumTypeFactory;
@@ -38,7 +38,7 @@ public class ClientOseeEnumTypeAccessor extends AbstractClientDataAccessor<Strin
}
@Override
- protected Collection<OseeEnumType> updateCache(IOseeCache<String, OseeEnumType> cache) throws OseeCoreException {
+ protected Collection<OseeEnumType> updateCache(IOseeCache<Long, OseeEnumType> cache) throws OseeCoreException {
List<OseeEnumType> enumTypes = new ArrayList<OseeEnumType>();
OseeEnumTypeCacheUpdateResponse response =
requestUpdateMessage(cache, CoreTranslatorId.OSEE_ENUM_TYPE_CACHE_UPDATE_RESPONSE);
@@ -47,11 +47,11 @@ public class ClientOseeEnumTypeAccessor extends AbstractClientDataAccessor<Strin
for (String[] enumTypeRow : response.getEnumTypeRows()) {
enumTypes.add(factory.createOrUpdate(cache, Integer.parseInt(enumTypeRow[0]),
- StorageState.valueOf(enumTypeRow[1]), enumTypeRow[2], enumTypeRow[3]));
+ StorageState.valueOf(enumTypeRow[1]), Long.valueOf(enumTypeRow[2]), enumTypeRow[3]));
}
for (String[] enumEntryRow : response.getEnumEntryRows()) {
- factory.createOrUpdate(cache, enumEntryRow[0], enumEntryRow[1], enumEntryRow[2],
+ factory.createOrUpdate(cache, Long.valueOf(enumEntryRow[0]), enumEntryRow[1], enumEntryRow[2],
Integer.parseInt(enumEntryRow[3]));
}
return enumTypes;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientRelationTypeAccessor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientRelationTypeAccessor.java
index 2291879799..b6fc2110f2 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientRelationTypeAccessor.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientRelationTypeAccessor.java
@@ -27,12 +27,12 @@ import org.eclipse.osee.framework.core.model.type.RelationTypeFactory;
/**
* @author Roberto E. Escobar
*/
-public class ClientRelationTypeAccessor extends AbstractClientDataAccessor<String, RelationType> {
+public class ClientRelationTypeAccessor extends AbstractClientDataAccessor<Long, RelationType> {
- private final AbstractOseeCache<String, ArtifactType> artCache;
+ private final AbstractOseeCache<Long, ArtifactType> artCache;
private final RelationTypeFactory relationTypeFactory;
- public ClientRelationTypeAccessor(RelationTypeFactory relationTypeFactory, AbstractOseeCache<String, ArtifactType> artCache) {
+ public ClientRelationTypeAccessor(RelationTypeFactory relationTypeFactory, AbstractOseeCache<Long, ArtifactType> artCache) {
super();
this.relationTypeFactory = relationTypeFactory;
this.artCache = artCache;
@@ -43,13 +43,13 @@ public class ClientRelationTypeAccessor extends AbstractClientDataAccessor<Strin
}
@Override
- public void load(IOseeCache<String, RelationType> cache) throws OseeCoreException {
+ public void load(IOseeCache<Long, RelationType> cache) throws OseeCoreException {
artCache.ensurePopulated();
super.load(cache);
}
@Override
- protected Collection<RelationType> updateCache(IOseeCache<String, RelationType> cache) throws OseeCoreException {
+ protected Collection<RelationType> updateCache(IOseeCache<Long, RelationType> cache) throws OseeCoreException {
List<RelationType> updatedItems = new ArrayList<RelationType>();
RelationTypeCacheUpdateResponse response =
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeManager.java
index f723afbba6..1bbaf57099 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeManager.java
@@ -30,11 +30,11 @@ import org.eclipse.osee.framework.skynet.core.internal.Activator;
*/
public class RelationTypeManager {
- public static AbstractOseeCache<String, RelationType> getCache() {
+ public static AbstractOseeCache<Long, RelationType> getCache() {
return Activator.getInstance().getOseeCacheService().getRelationTypeCache();
}
- public static AbstractOseeCache<String, ArtifactType> getArtifactTypeCache() {
+ public static AbstractOseeCache<Long, ArtifactType> getArtifactTypeCache() {
return Activator.getInstance().getOseeCacheService().getArtifactTypeCache();
}
@@ -84,7 +84,7 @@ public class RelationTypeManager {
return relationType;
}
- public static RelationType getTypeByGuid(String guid) throws OseeCoreException {
+ public static RelationType getTypeByGuid(Long guid) throws OseeCoreException {
RelationType relationType = getCache().getByGuid(guid);
if (relationType == null) {
throw new OseeTypeDoesNotExist("The relation with type guid [%s] does not exist", guid);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/CrossBranchLink.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/CrossBranchLink.java
index 90e8f2f2b0..be07f35d85 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/CrossBranchLink.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/CrossBranchLink.java
@@ -61,9 +61,9 @@ public class CrossBranchLink {
public String toXml() throws OseeCoreException {
RelationType relationType = RelationTypeManager.getType(relationEnum);
- StringBuffer sb = new StringBuffer(AXml.addTagData("relTypeGuid", relationType.getGuid()));
+ StringBuffer sb = new StringBuffer(AXml.addTagData("relTypeGuid", String.valueOf(relationType.getGuid())));
sb.append(AXml.addTagData("artGuid", artifact.getGuid()));
- sb.append(AXml.addTagData("artTypeGuid", artifact.getArtTypeGuid()));
+ sb.append(AXml.addTagData("artTypeGuid", String.valueOf(artifact.getArtTypeGuid())));
sb.append(AXml.addTagData("branchGuid", artifact.getBranchGuid()));
sb.append(AXml.addTagData("aSide", String.valueOf(relationEnum.getSide().isSideA())));
return sb.toString();
@@ -77,13 +77,13 @@ public class CrossBranchLink {
String artGuid = AXml.getTagData(xmlStr, "artGuid");
String branchGuid = AXml.getTagData(xmlStr, "branchGuid");
String artTypeGuid = AXml.getTagData(xmlStr, "artTypeGuid");
- String relTypeGuid = AXml.getTagData(xmlStr, "relTypeGuid");
+ Long relTypeGuid = Long.parseLong(AXml.getTagData(xmlStr, "relTypeGuid"));
aSide = AXml.getTagBooleanData(xmlStr, "aSide");
final RelationType relationType = RelationTypeManager.getTypeByGuid(relTypeGuid);
RelationSide side = aSide ? RelationSide.SIDE_A : RelationSide.SIDE_B;
relationEnum = TokenFactory.createRelationTypeSide(side, relationType.getGuid(), relationType.getName());
- guidArt = new DefaultBasicGuidArtifact(branchGuid, artTypeGuid, artGuid);
+ guidArt = new DefaultBasicGuidArtifact(branchGuid, Long.valueOf(artTypeGuid), artGuid);
}
private void unPack() throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java
index da621883bb..6e3e5c91b1 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java
@@ -54,8 +54,8 @@ public class RelationOrderRendererTest {
public static void prepareTest() throws Exception {
MockArtifactGuidResolver resolver = new MockArtifactGuidResolver(null);
- AbstractOseeCache<String, RelationType> typeCache =
- new RelationTypeCache(new MockOseeDataAccessor<String, RelationType>());
+ AbstractOseeCache<Long, RelationType> typeCache =
+ new RelationTypeCache(new MockOseeDataAccessor<Long, RelationType>());
addRelationTypeData(typeCache);
sorterProvider = new RelationSorterProvider();
renderer = new RelationOrderRenderer(typeCache, resolver, sorterProvider);
@@ -196,8 +196,8 @@ public class RelationOrderRendererTest {
Assert.assertEquals(expected, builder.toString());
}
- private final static void addRelationTypeData(AbstractOseeCache<String, RelationType> cache) throws OseeCoreException {
- ArtifactTypeCache artCache = new ArtifactTypeCache(new MockOseeDataAccessor<String, ArtifactType>());
+ private final static void addRelationTypeData(AbstractOseeCache<Long, RelationType> cache) throws OseeCoreException {
+ ArtifactTypeCache artCache = new ArtifactTypeCache(new MockOseeDataAccessor<Long, ArtifactType>());
IArtifactType artifactType1 = createArtifactType(artCache, "Artifact 2");
IArtifactType artifactType2 = createArtifactType(artCache, "Artifact 1");
@@ -206,15 +206,15 @@ public class RelationOrderRendererTest {
createRelationType(cache, "Relation 3", artifactType1, artifactType2);
}
- private final static ArtifactType createArtifactType(AbstractOseeCache<String, ArtifactType> artCache, String name) throws OseeCoreException {
- ArtifactType artifactType = new ArtifactType(GUID.create(), name, false);
+ private final static ArtifactType createArtifactType(AbstractOseeCache<Long, ArtifactType> artCache, String name) throws OseeCoreException {
+ ArtifactType artifactType = new ArtifactType(0x00L, name, false);
artCache.cache(artifactType);
return artifactType;
}
- private final static void createRelationType(AbstractOseeCache<String, RelationType> cache, String name, IArtifactType artifactType1, IArtifactType artifactType2) throws OseeCoreException {
+ private final static void createRelationType(AbstractOseeCache<Long, RelationType> cache, String name, IArtifactType artifactType1, IArtifactType artifactType2) throws OseeCoreException {
RelationType type =
- new RelationType(GUID.create(), name, name + "_A", name + "_B", artifactType1, artifactType2,
+ new RelationType(0x00L, name, name + "_A", name + "_B", artifactType1, artifactType2,
RelationTypeMultiplicity.MANY_TO_MANY, "");
cache.cache(type);
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java
index 1f40f9e5ae..d300a58764 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java
@@ -34,9 +34,9 @@ public class RelationOrderRenderer {
private static final String NO_DATA_TAG = "None";
private final ArtifactGuidToWordML guidResolver;
private final RelationSorterProvider sorterProvider;
- private final AbstractOseeCache<String, RelationType> relationCache;
+ private final AbstractOseeCache<Long, RelationType> relationCache;
- public RelationOrderRenderer(AbstractOseeCache<String, RelationType> relationCache, ArtifactGuidToWordML guidResolver, RelationSorterProvider sorterProvider) {
+ public RelationOrderRenderer(AbstractOseeCache<Long, RelationType> relationCache, ArtifactGuidToWordML guidResolver, RelationSorterProvider sorterProvider) {
this.relationCache = relationCache;
this.guidResolver = guidResolver;
this.sorterProvider = sorterProvider;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java
index 90a75ed191..e1eab6818a 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java
@@ -510,9 +510,10 @@ public class QuickSearchOptionComposite extends Composite {
configuration.clear();
for (String entry : items) {
try {
- AttributeType type = AttributeTypeManager.getTypeByGuid(entry);
+ Long id = Long.parseLong(entry);
+ AttributeType type = AttributeTypeManager.getTypeByGuid(id);
configuration.add(type);
- } catch (OseeCoreException ex) {
+ } catch (Exception ex) {
OseeLog.log(Activator.class, Level.SEVERE, ex);
}
}
@@ -541,7 +542,7 @@ public class QuickSearchOptionComposite extends Composite {
String[] guids = new String[configuration.size()];
int index = 0;
for (IAttributeType type : configuration) {
- guids[index++] = type.getGuid();
+ guids[index++] = String.valueOf(type.getGuid());
}
return guids;
}
diff --git a/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteAttributeTypes.java b/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteAttributeTypes.java
index 5e5b8ac878..7c9ea6ba5e 100644
--- a/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteAttributeTypes.java
+++ b/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteAttributeTypes.java
@@ -16,34 +16,34 @@ import org.eclipse.osee.framework.core.data.TokenFactory;
public final class OteAttributeTypes {
// @formatter:off
- public static final IAttributeType BUILD_ID = TokenFactory.createAttributeType("AAMFEXG6_W9diA9nUXAA", "Build Id");
- public static final IAttributeType CHECKSUM = TokenFactory.createAttributeType("AAMFEXJbaHt5uKG9kogA", "Checksum");
- public static final IAttributeType ELAPSED_DATE = TokenFactory.createAttributeType("AAMFEWuD6yH04y89M3wA", "Elapsed Date");
- public static final IAttributeType END_DATE = TokenFactory.createAttributeType("AAMFEWryxym0P9FFckgA", "End Date");
- public static final IAttributeType EXTENSION = TokenFactory.createAttributeType("AAMFEcUbJEERZTnwJzAA", "Extension");
- public static final IAttributeType FAILED = TokenFactory.createAttributeType("AAMFEWynSU+XeRG7nRAA", "Failed");
- public static final IAttributeType IS_BATCH_MODE_ALLOWED = TokenFactory.createAttributeType("AAMFEW+CcA6F5GEjsSgA", "Is Batch Mode Allowed");
- public static final IAttributeType LAST_AUTHOR = TokenFactory.createAttributeType("AAMFEWE83iPq3+2DGrQA", "Last Author");
- public static final IAttributeType LAST_DATE_UPLOADED = TokenFactory.createAttributeType("AAMFEXCm5ju5gvq142QA", "Last Date Uploaded");
- public static final IAttributeType LAST_MODIFIED_DATE = TokenFactory.createAttributeType("AAMFEWHw7V1uWv4IKcQA", "Last Modified Date");
- public static final IAttributeType MODIFIED_FLAG = TokenFactory.createAttributeType("AAMFEWCruiS26nCN68wA", "Modified Flag");
- public static final IAttributeType OSEE_SERVER_JAR_VERSION = TokenFactory.createAttributeType("AAMFEWV1OQtXL67OfOQA", "OSEE Server Jar Version");
- public static final IAttributeType OSEE_SERVER_TITLE = TokenFactory.createAttributeType("AAMFEWTnXGYRfdzY3gAA", "OSEE Server Title");
- public static final IAttributeType OSEE_VERSION = TokenFactory.createAttributeType("AAMFEWQ_TTkstJvjnGQA", "OSEE Version");
- public static final IAttributeType OS_ARCHITECTURE = TokenFactory.createAttributeType("AAMFEWKJtG+Jc8OkRYgA", "OS Architecture");
- public static final IAttributeType OS_NAME = TokenFactory.createAttributeType("AAMFEWMdBmP9aCgsysgA", "OS Name");
- public static final IAttributeType OS_VERSION = TokenFactory.createAttributeType("AAMFEWOvQWV6JJvh9NQA", "OS Version");
- public static final IAttributeType OUTFILE_URL = TokenFactory.createAttributeType("AAMFEVlyBndUvySg+gwA", "Outfile URL");
- public static final IAttributeType PASSED = TokenFactory.createAttributeType("AAMFEWwT92IzQp6Dh3gA", "Passed");
- public static final IAttributeType PROCESSOR_ID = TokenFactory.createAttributeType("AAMFEWYOAGkplo4RjTQA", "Processor ID");
- public static final IAttributeType QUALIFICATION_LEVEL = TokenFactory.createAttributeType("AAMFEXEvTztOWwoGyRAA", "Qualification Level");
- public static final IAttributeType RAN_IN_BATCH_MODE = TokenFactory.createAttributeType("AAMFEW7uBlg0KLp8mhQA", "Ran In Batch Mode");
- public static final IAttributeType REVISION = TokenFactory.createAttributeType("AAMFEWAal2I3j7EJligA", "Revision");
- public static final IAttributeType SCRIPT_ABORTED = TokenFactory.createAttributeType("AAMFEW3M12AqHsCve4AA", "Script Aborted");
- public static final IAttributeType START_DATE = TokenFactory.createAttributeType("AAMFEWpeXjfr2W5ZT5QA", "Start Date");
- public static final IAttributeType TEST_SCRIPT_URL = TokenFactory.createAttributeType("AAMFEVn0+mhxtCuACgAA", "Test Script URL");
- public static final IAttributeType TOTAL_TEST_POINTS = TokenFactory.createAttributeType("AAMFEW05hBfECFGfZkgA", "Total Test Points");
- public static final IAttributeType TestDisposition = TokenFactory.createAttributeType("AAMFEXfoPWRZHNiOR3gA", "Disposition");
+ public static final IAttributeType BUILD_ID = TokenFactory.createAttributeType(0x100000000000014AL, "Build Id");
+ public static final IAttributeType CHECKSUM = TokenFactory.createAttributeType(0x100000000000014BL, "Checksum");
+ public static final IAttributeType ELAPSED_DATE = TokenFactory.createAttributeType(0x1000000000000140L, "Elapsed Date");
+ public static final IAttributeType END_DATE = TokenFactory.createAttributeType(0x100000000000013FL, "End Date");
+ public static final IAttributeType EXTENSION = TokenFactory.createAttributeType(0x1000000000000058L, "Extension");
+ public static final IAttributeType FAILED = TokenFactory.createAttributeType(0x1000000000000142L, "Failed");
+ public static final IAttributeType IS_BATCH_MODE_ALLOWED = TokenFactory.createAttributeType(0x1000000000000147L, "Is Batch Mode Allowed");
+ public static final IAttributeType LAST_AUTHOR = TokenFactory.createAttributeType(0x1000000000000135L, "Last Author");
+ public static final IAttributeType LAST_DATE_UPLOADED = TokenFactory.createAttributeType(0x1000000000000148L, "Last Date Uploaded");
+ public static final IAttributeType LAST_MODIFIED_DATE = TokenFactory.createAttributeType(0x1000000000000136L, "Last Modified Date");
+ public static final IAttributeType MODIFIED_FLAG = TokenFactory.createAttributeType(0x1000000000000134L, "Modified Flag");
+ public static final IAttributeType OSEE_SERVER_JAR_VERSION = TokenFactory.createAttributeType(0x100000000000013CL, "OSEE Server Jar Version");
+ public static final IAttributeType OSEE_SERVER_TITLE = TokenFactory.createAttributeType(0x100000000000013BL, "OSEE Server Title");
+ public static final IAttributeType OSEE_VERSION = TokenFactory.createAttributeType(0x100000000000013AL, "OSEE Version");
+ public static final IAttributeType OS_ARCHITECTURE = TokenFactory.createAttributeType(0x1000000000000137L, "OS Architecture");
+ public static final IAttributeType OS_NAME = TokenFactory.createAttributeType(0x1000000000000138L, "OS Name");
+ public static final IAttributeType OS_VERSION = TokenFactory.createAttributeType(0x1000000000000139L, "OS Version");
+ public static final IAttributeType OUTFILE_URL = TokenFactory.createAttributeType(0x1000000000000131L, "Outfile URL");
+ public static final IAttributeType PASSED = TokenFactory.createAttributeType(0x1000000000000141L, "Passed");
+ public static final IAttributeType PROCESSOR_ID = TokenFactory.createAttributeType(0x100000000000013DL, "Processor ID");
+ public static final IAttributeType QUALIFICATION_LEVEL = TokenFactory.createAttributeType(0x1000000000000149L, "Qualification Level");
+ public static final IAttributeType RAN_IN_BATCH_MODE = TokenFactory.createAttributeType(0x1000000000000146L, "Ran In Batch Mode");
+ public static final IAttributeType REVISION = TokenFactory.createAttributeType(0x1000000000000133L, "Revision");
+ public static final IAttributeType SCRIPT_ABORTED = TokenFactory.createAttributeType(0x1000000000000144L, "Script Aborted");
+ public static final IAttributeType START_DATE = TokenFactory.createAttributeType(0x100000000000013EL, "Start Date");
+ public static final IAttributeType TEST_SCRIPT_URL = TokenFactory.createAttributeType(0x1000000000000132L, "Test Script URL");
+ public static final IAttributeType TOTAL_TEST_POINTS = TokenFactory.createAttributeType(0x1000000000000143L, "Total Test Points");
+ public static final IAttributeType TestDisposition = TokenFactory.createAttributeType(0x100000000000014CL, "Disposition");
// @formatter:on
private OteAttributeTypes() {
diff --git a/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteRelationTypes.java b/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteRelationTypes.java
index 37b678ee0d..4d0dc76d6a 100644
--- a/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteRelationTypes.java
+++ b/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteRelationTypes.java
@@ -17,9 +17,9 @@ import org.eclipse.osee.framework.core.enums.RelationSide;
public final class OteRelationTypes {
public static final IRelationTypeSide TEST_SCRIPT_TO_RUN_RELATION__TEST_SCRIPT =
- TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, "AAMFE+jMyBDK7CV479wA", "Test Case to Run Relation");
+ TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x2000000000000176L, "Test Case to Run Relation");
public static final IRelationTypeSide TEST_SCRIPT_TO_RUN_RELATION__TEST_RUN = TokenFactory.createRelationTypeSide(
- RelationSide.SIDE_B, "AAMFE+jMyBDK7CV479wA", "Test Case to Run Relation");
+ RelationSide.SIDE_B, 0x2000000000000176L, "Test Case to Run Relation");
private OteRelationTypes() {
// Constants
diff --git a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoArtifactTypes.java b/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoArtifactTypes.java
index 422c86a55c..c2f5e9351d 100644
--- a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoArtifactTypes.java
+++ b/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoArtifactTypes.java
@@ -19,9 +19,9 @@ import org.eclipse.osee.framework.core.data.TokenFactory;
public final class DemoArtifactTypes {
// @formatter:off
- public static final IArtifactType DemoCodeTeamWorkflow = TokenFactory.createArtifactType("ABRNqDKnpGEKAyUm49gA", "Demo Code Team Workflow");
- public static final IArtifactType DemoReqTeamWorkflow = TokenFactory.createArtifactType("ABRO5pC6kCmP35t06RwA", "Demo Req Team Workflow");
- public static final IArtifactType DemoTestTeamWorkflow = TokenFactory.createArtifactType("ABRPeQO1qlCd4J7Bv5AA", "Demo Test Team Workflow");
+ public static final IArtifactType DemoCodeTeamWorkflow = TokenFactory.createArtifactType(0x000000000000004FL, "Demo Code Team Workflow");
+ public static final IArtifactType DemoReqTeamWorkflow = TokenFactory.createArtifactType(0x0000000000000050L, "Demo Req Team Workflow");
+ public static final IArtifactType DemoTestTeamWorkflow = TokenFactory.createArtifactType(0x0000000000000051L, "Demo Test Team Workflow");
// @formatter:on
private DemoArtifactTypes() {

Back to the top