Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2013-11-20 20:00:16 +0000
committerGerrit Code Review @ Eclipse.org2013-12-03 15:29:58 +0000
commitc8164a62042005eb1c1c3313bf9c9f6bde2e494e (patch)
tree8b3c152c3eac998a2ef5053eb41a973a474e8a56
parent6ff162945d3f4ddfa1dd7bab80e1b4321eda1cb9 (diff)
downloadorg.eclipse.osee-c8164a62042005eb1c1c3313bf9c9f6bde2e494e.tar.gz
org.eclipse.osee-c8164a62042005eb1c1c3313bf9c9f6bde2e494e.tar.xz
org.eclipse.osee-c8164a62042005eb1c1c3313bf9c9f6bde2e494e.zip
refactor[ats_ZFB9T]: Remove identity service
-rw-r--r--plugins/org.eclipse.osee.framework.access/OSGI-INF/access.control.service.xml1
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java8
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlServiceProxy.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesImportOperation.java7
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/XtextOseeTypesHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java1
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelRequestTranslatorTest.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/OseeImportModelRequestTranslator.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeCachingService.java10
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeImportModelRequest.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IOseeCachingService.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IdentityService.java29
-rw-r--r--plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/internal/DatabaseInitActivator.java10
-rw-r--r--plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/internal/DbBootstrapTask.java3
-rw-r--r--plugins/org.eclipse.osee.framework.database/OSGI-INF/identity.service.xml8
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/ServiceUtil.java9
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/IdentityServiceImpl.java156
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/OSGI-INF/legacy.servlets.xml1
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java27
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeModelServlet.java4
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/OSGI-INF/osee.client.caching.service.xml1
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactTypeSearch.java5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeValueSearch.java5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/InRelationSearch.java5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/OrphanArtifactSearch.java7
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ClientCachingServiceProxy.java17
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ServiceUtil.java5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/word/WordUtil.java5
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AbstractWordAttributeHealthOperation.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/ServiceUtil.java5
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/OrcsTypesDataStore.java3
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesImpl.java19
-rw-r--r--plugins/org.eclipse.osee.orcs.db.mock/data/hsql.zipbin63711 -> 64228 bytes
-rw-r--r--plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataFactoryImplTest.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderFactoryImplTest.java11
-rw-r--r--plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/ArtifactQuerySqlContextFactoryImplTest.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/transaction/TxSqlBuilderTest.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.db/OSGI-INF/fix.duplicate.attributes.console.command.xml1
-rw-r--r--plugins/org.eclipse.osee.orcs.db/OSGI-INF/orcs.data.store.impl.xml1
-rw-r--r--plugins/org.eclipse.osee.orcs.db/schema/SKYNET.VERSIONING.SCHEMA.xml4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/IdentityLocator.java7
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/IdentityManager.java5
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/OrcsDataStoreImpl.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/DeleteRelationDatabaseCallable.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/OrcsTypeLoaderCallable.java9
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeAttributeTypeDatabaseTxCallable.java9
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeRelationTypeDatabaseTxCallable.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/change/MissingChangeItemFactoryImpl.java16
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/console/FixDuplicateAttributesCommand.java9
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/export/DbTableExportItem.java5
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/LoaderModule.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/ArtifactObjectFactory.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/AttributeObjectFactory.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java18
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/RelationObjectFactory.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/AttributeSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/RelationSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactTypeSqlHandler.java3
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeOtherSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTokenSqlHandler.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTypeExistsSqlHandler.java5
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeExistsSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/producer/IndexBranchesDatabaseCallable.java3
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/data/GammaQueueIndexerDataSourceLoader.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/SqlHandler.java5
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxModule.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxSqlBuilderImpl.java13
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/UnsubscribeTransaction.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/types/TypesModule.java21
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/util/IdentityManagerImpl.java31
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationRule.java2
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/OrcsTypes.java2
-rw-r--r--plugins/org.eclipse.osee.x.server.p2/demo/hsql.zipbin302019 -> 127681 bytes
78 files changed, 92 insertions, 558 deletions
diff --git a/plugins/org.eclipse.osee.framework.access/OSGI-INF/access.control.service.xml b/plugins/org.eclipse.osee.framework.access/OSGI-INF/access.control.service.xml
index 75dc5aedf51..ee31194aaf3 100644
--- a/plugins/org.eclipse.osee.framework.access/OSGI-INF/access.control.service.xml
+++ b/plugins/org.eclipse.osee.framework.access/OSGI-INF/access.control.service.xml
@@ -6,7 +6,6 @@
</service>
<reference bind="setDbService" cardinality="1..1" interface="org.eclipse.osee.framework.database.IOseeDatabaseService" name="IOseeDatabaseService" policy="static"/>
<reference bind="setCachingService" cardinality="1..1" interface="org.eclipse.osee.framework.core.services.IOseeCachingService" name="IOseeCachingService" policy="static"/>
- <reference bind="setIdentityService" cardinality="1..1" interface="org.eclipse.osee.framework.core.services.IdentityService" name="IdentityService" policy="static"/>
<reference bind="setEventService" cardinality="1..1" interface="org.eclipse.osee.framework.skynet.core.event.OseeEventService" name="OseeEventService" policy="static"/>
<reference bind="setLifecycleService" cardinality="1..1" interface="org.eclipse.osee.framework.lifecycle.ILifecycleService" name="ILifecycleService" policy="static"/>
<reference bind="addAccessProvider" cardinality="1..n" interface="org.eclipse.osee.framework.access.IAccessProvider" name="IAccessProvider" policy="dynamic" unbind="removeAccessProvider"/>
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java
index 276a9d769e4..e3c05b068ab 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java
@@ -49,7 +49,6 @@ import org.eclipse.osee.framework.core.model.type.ArtifactType;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.core.services.IAccessControlService;
import org.eclipse.osee.framework.core.services.IOseeCachingService;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.database.core.IOseeStatement;
@@ -131,19 +130,17 @@ public class AccessControlService implements IAccessControlService {
private final IOseeCachingService cachingService;
private final IOseeDatabaseService databaseService;
- private final IdentityService identityService;
private final OseeEventService eventService;
private IArtifactEventListener listener1;
private IArtifactEventListener listener2;
private final AtomicBoolean ensurePopulated = new AtomicBoolean(false);
+ public AccessControlService(IOseeDatabaseService databaseService, IOseeCachingService cachingService, OseeEventService eventService) {
- public AccessControlService(IOseeDatabaseService databaseService, IOseeCachingService cachingService, IdentityService identityService, OseeEventService eventService) {
super();
this.databaseService = databaseService;
this.cachingService = cachingService;
- this.identityService = identityService;
this.eventService = eventService;
}
@@ -268,8 +265,7 @@ public class AccessControlService implements IAccessControlService {
IOseeStatement chStmt = getDatabaseService().getStatement();
try {
- chStmt.runPreparedQuery(USER_GROUP_MEMBERS, groupId,
- identityService.getLocalId(CoreRelationTypes.Users_User));
+ chStmt.runPreparedQuery(USER_GROUP_MEMBERS, groupId, CoreRelationTypes.Users_User.getGuid());
// get group members and populate subjectToGroupCache
while (chStmt.next()) {
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlServiceProxy.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlServiceProxy.java
index 3915f7a7238..ac1672bfa64 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlServiceProxy.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlServiceProxy.java
@@ -21,7 +21,6 @@ import org.eclipse.osee.framework.core.model.IBasicArtifact;
import org.eclipse.osee.framework.core.model.access.AccessDataQuery;
import org.eclipse.osee.framework.core.services.IAccessControlService;
import org.eclipse.osee.framework.core.services.IOseeCachingService;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -43,7 +42,6 @@ public final class AccessControlServiceProxy implements IAccessControlService {
private IOseeDatabaseService dbService;
private IOseeCachingService cachingService;
- private IdentityService identityService;
private OseeEventService eventService;
private ILifecycleService lifecycleService;
@@ -59,10 +57,6 @@ public final class AccessControlServiceProxy implements IAccessControlService {
this.cachingService = cachingService;
}
- public void setIdentityService(IdentityService identityService) {
- this.identityService = identityService;
- }
-
public void setEventService(OseeEventService eventService) {
this.eventService = eventService;
}
@@ -140,7 +134,7 @@ public final class AccessControlServiceProxy implements IAccessControlService {
}
public void start() {
- accessService = new AccessControlService(dbService, cachingService, identityService, eventService);
+ accessService = new AccessControlService(dbService, cachingService, eventService);
accessEventListener = new AccessEventListener(accessService, new AccessControlCacheHandler());
eventService.addListener(EventQosType.PRIORITY, accessEventListener);
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesImportOperation.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesImportOperation.java
index 234dfc5938a..b84a6e68f05 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesImportOperation.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesImportOperation.java
@@ -37,14 +37,12 @@ import org.eclipse.osee.framework.skynet.core.artifact.HttpClientMessage;
public class OseeTypesImportOperation extends AbstractOperation {
private final IOseeCachingService cacheService;
private final URI model;
- private final boolean isPersistAllowed;
private final boolean createTypeChangeReport;
- public OseeTypesImportOperation(IOseeCachingService cacheService, URI model, boolean createTypeChangeReport, boolean isPersistAllowed) {
+ public OseeTypesImportOperation(IOseeCachingService cacheService, URI model, boolean createTypeChangeReport) {
super("Import Osee Types Model", DslUiIntegrationConstants.PLUGIN_ID);
this.cacheService = cacheService;
this.model = model;
- this.isPersistAllowed = isPersistAllowed;
this.createTypeChangeReport = createTypeChangeReport;
}
@@ -72,8 +70,7 @@ public class OseeTypesImportOperation extends AbstractOperation {
Map<String, String> parameters = new HashMap<String, String>();
OseeImportModelRequest modelRequest =
- new OseeImportModelRequest(getName(model), getModel(model.toURL()), createTypeChangeReport, false,
- isPersistAllowed);
+ new OseeImportModelRequest(getName(model), getModel(model.toURL()), createTypeChangeReport, false);
OseeImportModelResponse response =
HttpClientMessage.send(OseeServerContext.OSEE_MODEL_CONTEXT, parameters,
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/XtextOseeTypesHandler.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/XtextOseeTypesHandler.java
index b53b47f499e..5d83822655a 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/XtextOseeTypesHandler.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/XtextOseeTypesHandler.java
@@ -32,7 +32,7 @@ public class XtextOseeTypesHandler implements IOseeTypesHandler {
@Override
public void execute(IProgressMonitor monitor, URI uri) throws OseeCoreException {
IOseeCachingService cacheService = getCachingService();
- IOperation operation = new OseeTypesImportOperation(cacheService, uri, false, true);
+ IOperation operation = new OseeTypesImportOperation(cacheService, uri, false);
Operations.executeWorkAndCheckStatus(operation, monitor);
}
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 849c079ce9d..eabb0d73963 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
@@ -217,7 +217,6 @@ public final class DataAsserts {
Assert.assertEquals(expected.getModelName(), actual.getModelName());
Assert.assertEquals(expected.isCreateCompareReport(), actual.isCreateCompareReport());
Assert.assertEquals(expected.isCreateTypeChangeReport(), actual.isCreateTypeChangeReport());
- Assert.assertEquals(expected.isPersistAllowed(), actual.isPersistAllowed());
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelRequestTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelRequestTranslatorTest.java
index 2779af32fa0..334ec75b999 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelRequestTranslatorTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelRequestTranslatorTest.java
@@ -13,11 +13,11 @@ package org.eclipse.osee.framework.core.message.test.translation;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.junit.Assert;
import org.eclipse.osee.framework.core.message.internal.translation.OseeImportModelRequestTranslator;
import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
import org.eclipse.osee.framework.core.model.OseeImportModelRequest;
import org.eclipse.osee.framework.core.translation.ITranslator;
+import org.junit.Assert;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -45,9 +45,7 @@ public class OseeImportModelRequestTranslatorTest extends BaseTranslatorTest<Ose
ITranslator<OseeImportModelRequest> translator = new OseeImportModelRequestTranslator();
List<Object[]> data = new ArrayList<Object[]>();
- data.add(new Object[] {
- new OseeImportModelRequest("dummy:/model.osee", "dummy model", false, true, false),
- translator});
+ data.add(new Object[] {new OseeImportModelRequest("dummy:/model.osee", "dummy model", false, true), translator});
return data;
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/OseeImportModelRequestTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/OseeImportModelRequestTranslator.java
index 8cc98bb20c6..3556f715eeb 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/OseeImportModelRequestTranslator.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/OseeImportModelRequestTranslator.java
@@ -20,7 +20,6 @@ import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
public class OseeImportModelRequestTranslator implements ITranslator<OseeImportModelRequest> {
private static enum Fields {
- PERSIST,
GENERATE_EMF_COMPARE,
GENERATE_DIRTY_REPORT,
MODEL_NAME,
@@ -33,9 +32,8 @@ public class OseeImportModelRequestTranslator implements ITranslator<OseeImportM
String modelName = store.get(Fields.MODEL_NAME.name());
boolean createTypeChangeReport = store.getBoolean(Fields.GENERATE_DIRTY_REPORT.name());
boolean createCompareReport = store.getBoolean(Fields.GENERATE_EMF_COMPARE.name());
- boolean isPersistAllowed = store.getBoolean(Fields.PERSIST.name());
- return new OseeImportModelRequest(modelName, model, createTypeChangeReport, createCompareReport, isPersistAllowed);
+ return new OseeImportModelRequest(modelName, model, createTypeChangeReport, createCompareReport);
}
@Override
@@ -45,7 +43,6 @@ public class OseeImportModelRequestTranslator implements ITranslator<OseeImportM
store.put(Fields.MODEL.name(), object.getModel());
store.put(Fields.GENERATE_DIRTY_REPORT.name(), object.isCreateTypeChangeReport());
store.put(Fields.GENERATE_EMF_COMPARE.name(), object.isCreateCompareReport());
- store.put(Fields.PERSIST.name(), object.isPersistAllowed());
return store;
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeCachingService.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeCachingService.java
index 809fd5fec22..1bbfe9f317b 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeCachingService.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeCachingService.java
@@ -21,7 +21,6 @@ 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.services.IOseeCachingService;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -38,17 +37,15 @@ public class OseeCachingService implements IOseeCachingService {
private final AttributeTypeCache attributeTypeCache;
private final RelationTypeCache relationTypeCache;
private final OseeEnumTypeCache oseeEnumTypeCache;
- public final IdentityService identityService;
private final Collection<IOseeCache<?, ?>> caches;
- public OseeCachingService(BranchCache branchCache, TransactionCache transactionCache, ArtifactTypeCache artifactTypeCache, AttributeTypeCache attributeTypeCache, RelationTypeCache relationTypeCache, OseeEnumTypeCache oseeEnumTypeCache, IdentityService identityService) {
+ public OseeCachingService(BranchCache branchCache, TransactionCache transactionCache, ArtifactTypeCache artifactTypeCache, AttributeTypeCache attributeTypeCache, RelationTypeCache relationTypeCache, OseeEnumTypeCache oseeEnumTypeCache) {
this.branchCache = branchCache;
this.transactionCache = transactionCache;
this.artifactTypeCache = artifactTypeCache;
this.attributeTypeCache = attributeTypeCache;
this.relationTypeCache = relationTypeCache;
this.oseeEnumTypeCache = oseeEnumTypeCache;
- this.identityService = identityService;
caches = new HashSet<IOseeCache<?, ?>>();
caches.add(branchCache);
caches.add(transactionCache);
@@ -108,7 +105,6 @@ public class OseeCachingService implements IOseeCachingService {
public synchronized void reloadAll() throws OseeCoreException {
getBranchCache().reloadCache();
getTransactionCache().reloadCache();
- getIdentityService().clear();
getArtifactTypeCache().reloadCache();
//reloading the artifactTypeCache will reload these:
@@ -127,8 +123,4 @@ public class OseeCachingService implements IOseeCachingService {
getRelationTypeCache().decacheAll();
}
- @Override
- public IdentityService getIdentityService() {
- return identityService;
- }
}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeImportModelRequest.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeImportModelRequest.java
index f48cc9eca96..8041fd2e1bc 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeImportModelRequest.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeImportModelRequest.java
@@ -17,14 +17,12 @@ public class OseeImportModelRequest {
private final String model;
private final String modelName;
- private final boolean isPersistAllowed;
private final boolean createTypeChangeReport;
private final boolean createCompareReport;
- public OseeImportModelRequest(String modelName, String model, boolean createTypeChangeReport, boolean createCompareReport, boolean isPersistAllowed) {
+ public OseeImportModelRequest(String modelName, String model, boolean createTypeChangeReport, boolean createCompareReport) {
this.modelName = modelName;
this.model = model;
- this.isPersistAllowed = isPersistAllowed;
this.createCompareReport = createCompareReport;
this.createTypeChangeReport = createTypeChangeReport;
}
@@ -41,10 +39,6 @@ public class OseeImportModelRequest {
return createCompareReport;
}
- public boolean isPersistAllowed() {
- return isPersistAllowed;
- }
-
public String getModelName() {
return modelName;
}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IOseeCachingService.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IOseeCachingService.java
index e1e11df0133..29449b56d9f 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IOseeCachingService.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IOseeCachingService.java
@@ -28,6 +28,4 @@ public interface IOseeCachingService extends TempCachingService {
OseeEnumTypeCache getEnumTypeCache();
- IdentityService getIdentityService();
-
}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IdentityService.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IdentityService.java
deleted file mode 100644
index 1ad2cde7d1a..00000000000
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IdentityService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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.services;
-
-import java.util.Collection;
-import org.eclipse.osee.framework.jdk.core.type.Identity;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-
-public interface IdentityService {
-
- Long getLocalId(Long universalId) throws OseeCoreException;
-
- Long getUniversalId(Long localId) throws OseeCoreException;
-
- Long getLocalId(Identity<Long> identity) throws OseeCoreException;
-
- void store(Collection<Long> universalIds) throws OseeCoreException;
-
- void clear();
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/internal/DatabaseInitActivator.java b/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/internal/DatabaseInitActivator.java
index 7ae485ab1f9..d2423bb6b91 100644
--- a/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/internal/DatabaseInitActivator.java
+++ b/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/internal/DatabaseInitActivator.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.framework.database.init.internal;
import org.eclipse.osee.framework.core.services.IOseeCachingService;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.core.translation.IDataTranslationService;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.osgi.framework.BundleActivator;
@@ -26,7 +25,6 @@ public class DatabaseInitActivator implements BundleActivator {
private ServiceTracker<IDataTranslationService, IDataTranslationService> serviceTracker;
private ServiceTracker<IOseeCachingService, IOseeCachingService> serviceTracker2;
private ServiceTracker<IOseeDatabaseService, IOseeDatabaseService> serviceTracker3;
- private ServiceTracker<IdentityService, IdentityService> serviceTracker4;
@Override
public void start(BundleContext context) throws Exception {
@@ -44,8 +42,6 @@ public class DatabaseInitActivator implements BundleActivator {
new ServiceTracker<IOseeDatabaseService, IOseeDatabaseService>(context, IOseeDatabaseService.class, null);
serviceTracker3.open(true);
- serviceTracker4 = new ServiceTracker<IdentityService, IdentityService>(context, IdentityService.class, null);
- serviceTracker4.open(true);
}
@Override
@@ -59,9 +55,6 @@ public class DatabaseInitActivator implements BundleActivator {
if (serviceTracker3 != null) {
serviceTracker3.close();
}
- if (serviceTracker4 != null) {
- serviceTracker4.close();
- }
}
public static DatabaseInitActivator getInstance() {
@@ -80,7 +73,4 @@ public class DatabaseInitActivator implements BundleActivator {
return serviceTracker3.getService();
}
- public IdentityService getIdentityService() {
- return serviceTracker4.getService();
- }
}
diff --git a/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/internal/DbBootstrapTask.java b/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/internal/DbBootstrapTask.java
index 5032cb07497..58eb563b241 100644
--- a/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/internal/DbBootstrapTask.java
+++ b/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/internal/DbBootstrapTask.java
@@ -25,7 +25,6 @@ import org.eclipse.osee.framework.core.enums.SystemUser;
import org.eclipse.osee.framework.core.message.DatastoreInitRequest;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.services.IOseeCachingService;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.core.translation.IDataTranslationService;
import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.core.util.HttpMessage;
@@ -71,8 +70,6 @@ public class DbBootstrapTask implements IDbInitializationTask {
IOseeDatabaseService databaseService = DatabaseInitActivator.getInstance().getDatabaseService();
databaseService.getSequence().clear();
- IdentityService identityService = DatabaseInitActivator.getInstance().getIdentityService();
- identityService.clear();
Branch systemRoot = BranchManager.getSystemRootBranch();
Conditions.checkNotNull(systemRoot, "System root was not created - ");
diff --git a/plugins/org.eclipse.osee.framework.database/OSGI-INF/identity.service.xml b/plugins/org.eclipse.osee.framework.database/OSGI-INF/identity.service.xml
deleted file mode 100644
index 7039bb36401..00000000000
--- a/plugins/org.eclipse.osee.framework.database/OSGI-INF/identity.service.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" name="org.eclipse.osee.framework.IdentityService">
- <implementation class="org.eclipse.osee.framework.database.internal.core.IdentityServiceImpl"/>
- <reference bind="setOseeDatabaseService" cardinality="1..1" interface="org.eclipse.osee.framework.database.IOseeDatabaseService" name="IOseeDatabaseService" policy="static"/>
- <service>
- <provide interface="org.eclipse.osee.framework.core.services.IdentityService"/>
- </service>
-</scr:component>
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/ServiceUtil.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/ServiceUtil.java
index 4a9fec1834c..b2ef56ecc24 100644
--- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/ServiceUtil.java
+++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/ServiceUtil.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.framework.database.internal;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -55,12 +54,4 @@ public final class ServiceUtil {
}
}
- public static IdentityService getIdentityService() throws OseeDataStoreException {
- try {
- return getService(IdentityService.class);
- } catch (OseeCoreException ex) {
- throw new OseeDataStoreException(ex);
- }
- }
-
}
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/IdentityServiceImpl.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/IdentityServiceImpl.java
deleted file mode 100644
index 5ed3adcc07b..00000000000
--- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/IdentityServiceImpl.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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.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.services.IdentityService;
-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.OseeInfo;
-import org.eclipse.osee.framework.jdk.core.type.Identity;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.Collections;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
-
-public class IdentityServiceImpl implements IdentityService {
-
- private static final String USE_LONG_TYPE_IDS = "use.long.type.ids";
- 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, Long> universalIdToLocalId = new ConcurrentHashMap<Long, Long>();
- private final Map<Long, Long> localIdToUniversalId = new ConcurrentHashMap<Long, Long>();
- private final Set<Long> persistedIds = new ConcurrentSkipListSet<Long>();
-
- private IOseeDatabaseService service;
- private volatile boolean ensurePopulatedRanOnce;
- private boolean useLongTypeIds = false;
-
- public void start() {
- //nothing to do
- }
-
- public void stop() {
- //nothing to do
- }
-
- public void setOseeDatabaseService(IOseeDatabaseService service) {
- this.service = service;
- }
-
- @Override
- public Long getLocalId(Long universalId) throws OseeCoreException {
- ensurePopulate();
- Conditions.checkNotNull(universalId, "universalId");
-
- Long localId;
- if (useLongTypeIds) {
- localId = universalId;
- } else {
- localId = universalIdToLocalId.get(universalId);
- }
-
- if (localId == null) {
- reloadCache();
- localId = universalIdToLocalId.get(universalId);
- if (localId == null) {
- localId = (long) service.getSequence().getNextLocalTypeId();
- cache(universalId, localId);
- }
- }
- return localId;
- }
-
- @Override
- public Long getUniversalId(Long localId) throws OseeCoreException {
- ensurePopulate();
- Conditions.checkNotNull(localId, "localId");
-
- Long remoteId;
- if (useLongTypeIds) {
- remoteId = localId;
- } else {
- remoteId = localIdToUniversalId.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);
- while (chStmt.next()) {
- Long remoteId = chStmt.getLong("remote_id");
- Long localId = chStmt.getLong("local_id");
- cache(remoteId, localId);
- persistedIds.add(remoteId);
- }
- } finally {
- Lib.close(chStmt);
- }
- }
-
- @Override
- public synchronized void clear() {
- universalIdToLocalId.clear();
- localIdToUniversalId.clear();
- persistedIds.clear();
- ensurePopulatedRanOnce = false;
- }
-
- private void cache(Long remoteId, Long localId) {
- universalIdToLocalId.put(remoteId, localId);
- localIdToUniversalId.put(localId, remoteId);
- }
-
- private synchronized void ensurePopulate() throws OseeCoreException {
- if (!ensurePopulatedRanOnce) {
- clear();
- ensurePopulatedRanOnce = true;
- reloadCache();
- useLongTypeIds = OseeInfo.isCacheEnabled(USE_LONG_TYPE_IDS);
- }
- }
-
- @Override
- public void store(Collection<Long> universalIds) throws OseeCoreException {
- ensurePopulate();
- List<Object[]> data = new ArrayList<Object[]>();
- List<Long> toPersist = Collections.setComplement(universalIds, persistedIds);
- for (Long remoteId : toPersist) {
- Long localId = getLocalId(remoteId);
- data.add(new Object[] {remoteId, localId});
- }
- if (!data.isEmpty() && !toPersist.isEmpty()) {
- service.runBatchUpdate(INSERT_SQL, data);
- persistedIds.addAll(toPersist);
- }
- }
-
- @Override
- public Long getLocalId(Identity<Long> identity) throws OseeCoreException {
- return getLocalId(identity.getGuid());
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/OSGI-INF/legacy.servlets.xml b/plugins/org.eclipse.osee.framework.manager.servlet/OSGI-INF/legacy.servlets.xml
index 97aac56c0f8..2b9f306d243 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/OSGI-INF/legacy.servlets.xml
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/OSGI-INF/legacy.servlets.xml
@@ -13,6 +13,5 @@
<reference bind="setFactoryService" cardinality="1..1" interface="org.eclipse.osee.framework.core.services.IOseeModelFactoryService" name="IOseeModelFactoryService" policy="static"/>
<reference bind="setResourceManager" cardinality="1..1" interface="org.eclipse.osee.framework.resource.management.IResourceManager" name="IResourceManager" policy="static"/>
<reference bind="setOrcsApi" cardinality="1..1" interface="org.eclipse.osee.orcs.OrcsApi" name="OrcsApi" policy="static"/>
- <reference bind="setIdentityService" cardinality="1..1" interface="org.eclipse.osee.framework.core.services.IdentityService" name="IdentityService" policy="static"/>
</scr:component>
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java
index 0127e465ae1..2f483627dcf 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java
@@ -49,7 +49,6 @@ import org.eclipse.osee.framework.core.model.cache.TransactionCache;
import org.eclipse.osee.framework.core.model.type.AttributeType;
import org.eclipse.osee.framework.core.server.UnsecuredOseeHttpServlet;
import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.core.services.TempCachingService;
import org.eclipse.osee.framework.core.translation.IDataTranslationService;
import org.eclipse.osee.framework.core.translation.ITranslatorId;
@@ -81,17 +80,15 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
private final BranchCache branchCache;
private final TransactionCache txCache;
private final OrcsApi orcsApi;
- private final IdentityService identityService;
private static final StorageState DEFAULT_STORAGE_STATE = StorageState.CREATED;
- public OseeCacheServlet(Log logger, IDataTranslationService translationService, TempCachingService cachingService, OrcsApi orcsApi, IOseeModelFactoryService factoryService, IdentityService identityService) {
+ public OseeCacheServlet(Log logger, IDataTranslationService translationService, TempCachingService cachingService, OrcsApi orcsApi, IOseeModelFactoryService factoryService) {
super(logger);
this.translationService = translationService;
this.branchCache = cachingService.getBranchCache();
this.txCache = cachingService.getTransactionCache();
this.orcsApi = orcsApi;
this.factoryService = factoryService;
- this.identityService = identityService;
}
public IDataTranslationService getTranslationService() {
@@ -272,7 +269,7 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
List<Triplet<Long, String, Long>> artAttrs = new ArrayList<Triplet<Long, String, Long>>();
ArtifactTypes artTypes = orcsTypes.getArtifactTypes();
for (IArtifactType artType : artTypes.getAll()) {
- long artTypeId = identityService.getLocalId(artType.getGuid());
+ long artTypeId = artType.getGuid();
boolean isAbstract = artTypes.isAbstract(artType);
rows.add(new ArtifactTypeRow(artTypeId, artType.getGuid(), artType.getName(), isAbstract,
DEFAULT_STORAGE_STATE));
@@ -282,7 +279,7 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
Long[] intSuperTypes = new Long[superTypes.size()];
int index = 0;
for (IArtifactType superType : superTypes) {
- intSuperTypes[index++] = identityService.getLocalId(superType.getGuid());
+ intSuperTypes[index++] = superType.getGuid();
}
baseToSuper.put(artTypeId, intSuperTypes);
}
@@ -318,14 +315,13 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
new AttributeType(item.getGuid(), item.getName(), baseAttributeTypeId, attributeProviderNameId,
fileTypeExtension, defaultValue, minOccurrances, maxOccurrences, description, taggerId, mediaType);
- long localId = identityService.getLocalId(item);
- type.setId(localId);
+ long typeId = item.getGuid();
+ type.setId(typeId);
rows.add(type);
if (attrTypes.isEnumerated(item)) {
EnumType enumType = attrTypes.getEnumType(item);
- long enumId = identityService.getLocalId(enumType);
- attrToEnum.put(localId, enumId);
+ attrToEnum.put(typeId, enumType.getGuid());
}
}
@@ -338,18 +334,14 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
for (IRelationType item : relTypes.getAll()) {
IArtifactType sideAType = relTypes.getArtifactTypeSideA(item);
IArtifactType sideBType = relTypes.getArtifactTypeSideB(item);
- long artifactTypeSideA = identityService.getLocalId(sideAType);
- long artifactTypeSideB = identityService.getLocalId(sideBType);
-
- long localId = identityService.getLocalId(item);
String sideAName = relTypes.getSideAName(item);
String sideBName = relTypes.getSideBName(item);
RelationTypeMultiplicity multiplicity = relTypes.getMultiplicity(item);
String defaultOrderTypeGuid = relTypes.getDefaultOrderTypeGuid(item);
- rows.add(new RelationTypeRow(localId, item.getName(), item.getGuid(), DEFAULT_STORAGE_STATE, sideAName,
- sideBName, artifactTypeSideA, artifactTypeSideB, multiplicity, defaultOrderTypeGuid));
+ rows.add(new RelationTypeRow(item.getGuid(), item.getName(), item.getGuid(), DEFAULT_STORAGE_STATE, sideAName,
+ sideBName, sideAType.getGuid(), sideBType.getGuid(), multiplicity, defaultOrderTypeGuid));
}
return new RelationTypeCacheUpdateResponse(rows);
}
@@ -359,9 +351,8 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
List<String[]> enumEntryRows = new ArrayList<String[]>();
EnumTypes enumTypes = orcsTypes.getEnumTypes();
for (EnumType type : enumTypes.getAll()) {
- long localId = identityService.getLocalId(type);
enumTypeRows.add(new String[] {
- String.valueOf(localId),
+ String.valueOf(type.getGuid()),
DEFAULT_STORAGE_STATE.toString(),
String.valueOf(type.getGuid()),
type.getName()});
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeModelServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeModelServlet.java
index cbfb6d38754..5edff660955 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeModelServlet.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeModelServlet.java
@@ -133,10 +133,6 @@ public class OseeModelServlet extends SecureOseeHttpServlet {
getOrcsTypes().loadTypes(resource, isInitializing(req)).call();
- if (modelRequest.isPersistAllowed()) {
- getOrcsTypes().save().call();
- }
-
resp.setStatus(HttpServletResponse.SC_ACCEPTED);
resp.setContentType("text/xml");
resp.setCharacterEncoding("UTF-8");
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java
index 5f709580a67..fdbcc3b455e 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java
@@ -20,7 +20,6 @@ import org.eclipse.osee.framework.core.server.IAuthenticationManager;
import org.eclipse.osee.framework.core.server.ISessionManager;
import org.eclipse.osee.framework.core.server.OseeHttpServlet;
import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.core.services.TempCachingService;
import org.eclipse.osee.framework.core.translation.IDataTranslationService;
import org.eclipse.osee.framework.manager.servlet.AdminServlet;
@@ -62,7 +61,6 @@ public class ServletRegistrationHandler {
private IOseeModelFactoryService factoryService;
private IResourceManager resourceManager;
private OrcsApi orcsApi;
- private IdentityService identityService;
private final Set<String> contexts = new HashSet<String>();
@@ -70,10 +68,6 @@ public class ServletRegistrationHandler {
this.sessionManager = sessionManager;
}
- public void setIdentityService(IdentityService identityService) {
- this.identityService = identityService;
- }
-
public void setServerLookup(IApplicationServerLookup serverLookup) {
this.serverLookup = serverLookup;
}
@@ -147,7 +141,7 @@ public class ServletRegistrationHandler {
register(new SessionManagementServlet(logger, sessionManager, authenticationManager),
OseeServerContext.SESSION_CONTEXT);
register(new SessionClientLoopbackServlet(logger, sessionManager), OseeServerContext.CLIENT_LOOPBACK_CONTEXT);
- register(new OseeCacheServlet(logger, translationService, caching, orcsApi, factoryService, identityService),
+ register(new OseeCacheServlet(logger, translationService, caching, orcsApi, factoryService),
OseeServerContext.CACHE_CONTEXT);
register(new OseeModelServlet(logger, sessionManager, translationService, orcsApi),
OseeServerContext.OSEE_MODEL_CONTEXT);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/OSGI-INF/osee.client.caching.service.xml b/plugins/org.eclipse.osee.framework.skynet.core/OSGI-INF/osee.client.caching.service.xml
index f2337423cd7..f3583772dc2 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/OSGI-INF/osee.client.caching.service.xml
+++ b/plugins/org.eclipse.osee.framework.skynet.core/OSGI-INF/osee.client.caching.service.xml
@@ -5,6 +5,5 @@
<provide interface="org.eclipse.osee.framework.core.services.IOseeCachingService"/>
<provide interface="org.eclipse.osee.framework.core.services.TempCachingService"/>
</service>
- <reference bind="setIdentityService" cardinality="1..1" interface="org.eclipse.osee.framework.core.services.IdentityService" name="IdentityService" policy="static"/>
<reference bind="setModelFactory" cardinality="1..1" interface="org.eclipse.osee.framework.core.services.IOseeModelFactoryService" name="IOseeModelFactoryService" policy="static"/>
</scr:component>
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 c091a65f6cd..cb258f020e1 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
@@ -173,8 +173,8 @@ public class ArtifactTypeManager {
"select count(1) from (select DISTINCT(art_id) FROM osee_artifact where art_type_id = ?) t1";
public static void purgeArtifactType(IArtifactType artifactType) throws OseeCoreException {
- final long artifactTypeId = ServiceUtil.getIdentityService().getLocalId(artifactType);
- int artifactCount = ConnectionHandler.runPreparedQueryFetchInt(0, COUNT_ARTIFACT_OCCURRENCE, artifactTypeId);
+ int artifactCount =
+ ConnectionHandler.runPreparedQueryFetchInt(0, COUNT_ARTIFACT_OCCURRENCE, artifactType.getGuid());
if (artifactCount != 0) {
throw new OseeArgumentException(
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactTypeSearch.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactTypeSearch.java
index 43a706223ef..c2b7375d5c2 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactTypeSearch.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactTypeSearch.java
@@ -12,11 +12,9 @@ package org.eclipse.osee.framework.skynet.core.artifact.search;
import java.util.List;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.jdk.core.type.BaseIdentity;
import org.eclipse.osee.framework.jdk.core.type.Identity;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.internal.ServiceUtil;
/**
* @author Robert A. Fisher
@@ -41,8 +39,7 @@ public class ArtifactTypeSearch implements ISearchPrimitive {
@Override
public String getCriteriaSql(List<Object> dataList, IOseeBranch branch) throws OseeCoreException {
String sql = "osee_artifact.art_type_id = ?";
- IdentityService remoteIdManager = ServiceUtil.getIdentityService();
- dataList.add(remoteIdManager.getLocalId(artifactType));
+ dataList.add(artifactType.getGuid());
return sql;
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeValueSearch.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeValueSearch.java
index 6528081c646..8777fbaaa5c 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeValueSearch.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeValueSearch.java
@@ -13,12 +13,10 @@ package org.eclipse.osee.framework.skynet.core.artifact.search;
import static org.eclipse.osee.framework.skynet.core.artifact.search.DeprecatedOperator.IS;
import java.util.List;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.jdk.core.type.BaseIdentity;
import org.eclipse.osee.framework.jdk.core.type.Identity;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.internal.ServiceUtil;
/**
* @author Robert A. Fisher
@@ -61,8 +59,7 @@ public class AttributeValueSearch implements ISearchPrimitive {
sql.append(" attr_1.attr_type_id = ? AND attr_1.gamma_id = txs.gamma_id AND txs.tx_current = 1 and txs.branch_id = ?");
- IdentityService remoteIdManager = ServiceUtil.getIdentityService();
- dataList.add(remoteIdManager.getLocalId(attributeType));
+ dataList.add(attributeType.getGuid());
dataList.add(BranchManager.getBranchId(branch));
if (attributeValue != null) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/InRelationSearch.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/InRelationSearch.java
index 90651896e3c..41f140c3ad8 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/InRelationSearch.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/InRelationSearch.java
@@ -13,12 +13,10 @@ package org.eclipse.osee.framework.skynet.core.artifact.search;
import java.util.List;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.enums.ModificationType;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.jdk.core.type.BaseIdentity;
import org.eclipse.osee.framework.jdk.core.type.Identity;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.internal.ServiceUtil;
/**
* @author Robert A. Fisher
@@ -41,8 +39,7 @@ public class InRelationSearch implements ISearchPrimitive {
@Override
public String getCriteriaSql(List<Object> dataList, IOseeBranch branch) throws OseeCoreException {
- IdentityService remoteIdManager = ServiceUtil.getIdentityService();
- dataList.add(remoteIdManager.getLocalId(relationType));
+ dataList.add(relationType.getGuid());
dataList.add(BranchManager.getBranchId(branch));
dataList.add(ModificationType.DELETED.getValue());
return "rel_1.rel_link_type_id = ? AND rel_1.gamma_id = txs1.gamma_id AND txs1.transaction_id = (SELECT max(txs1.transaction_id) FROM osee_relation_link rel2, osee_txs txs1 WHERE rel2.rel_link_id = rel_1.rel_link_id AND rel2.gamma_id = txs1.gamma_id AND txs1.branch_id = ? AND txs1.mod_type <>?)";
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/OrphanArtifactSearch.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/OrphanArtifactSearch.java
index d03920b533c..dc2be820335 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/OrphanArtifactSearch.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/OrphanArtifactSearch.java
@@ -16,11 +16,9 @@ import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.model.type.ArtifactType;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.internal.ServiceUtil;
/**
* @author Jeff C. Phillips
@@ -35,13 +33,12 @@ public class OrphanArtifactSearch implements ISearchPrimitive {
public OrphanArtifactSearch(IArtifactType aritfactType) throws OseeCoreException {
this.aritfactType = aritfactType;
- this.relationTypeId = ServiceUtil.getIdentityService().getLocalId(CoreRelationTypes.Default_Hierarchical__Child);
+ this.relationTypeId = CoreRelationTypes.Default_Hierarchical__Child.getGuid();
}
@Override
public String getCriteriaSql(List<Object> dataList, IOseeBranch branch) throws OseeCoreException {
- IdentityService identityService = ServiceUtil.getIdentityService();
- dataList.add(identityService.getLocalId(aritfactType));
+ dataList.add(aritfactType.getGuid());
dataList.add(BranchManager.getBranchId(branch));
dataList.add(relationTypeId);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ClientCachingServiceProxy.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ClientCachingServiceProxy.java
index 6995f854854..d6d347bbb7f 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ClientCachingServiceProxy.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ClientCachingServiceProxy.java
@@ -23,7 +23,6 @@ import org.eclipse.osee.framework.core.model.cache.RelationTypeCache;
import org.eclipse.osee.framework.core.model.cache.TransactionCache;
import org.eclipse.osee.framework.core.services.IOseeCachingService;
import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.internal.accessors.ClientArtifactTypeAccessor;
import org.eclipse.osee.framework.skynet.core.internal.accessors.ClientAttributeTypeAccessor;
@@ -37,21 +36,16 @@ import org.eclipse.osee.framework.skynet.core.internal.accessors.ClientTransacti
*/
public class ClientCachingServiceProxy implements IOseeCachingService {
- private IdentityService identityService;
private IOseeModelFactoryService modelFactory;
private IOseeCachingService proxiedService;
- public void setIdentityService(IdentityService identityService) {
- this.identityService = identityService;
- }
-
public void setModelFactory(IOseeModelFactoryService modelFactory) {
this.modelFactory = modelFactory;
}
public void start() {
- proxiedService = createService(modelFactory, identityService);
+ proxiedService = createService(modelFactory);
}
public void stop() {
@@ -95,11 +89,6 @@ public class ClientCachingServiceProxy implements IOseeCachingService {
}
@Override
- public IdentityService getIdentityService() {
- return getProxiedService().getIdentityService();
- }
-
- @Override
public Collection<?> getCaches() {
return getProxiedService().getCaches();
}
@@ -119,7 +108,7 @@ public class ClientCachingServiceProxy implements IOseeCachingService {
getProxiedService().clearAll();
}
- private IOseeCachingService createService(IOseeModelFactoryService factory, IdentityService identityService) {
+ private IOseeCachingService createService(IOseeModelFactoryService factory) {
TransactionCache transactionCache = new TransactionCache();
ClientBranchAccessor clientBranchAccessor =
new ClientBranchAccessor(factory.getBranchFactory(), transactionCache);
@@ -143,6 +132,6 @@ public class ClientCachingServiceProxy implements IOseeCachingService {
new RelationTypeCache(new ClientRelationTypeAccessor(factory.getRelationTypeFactory(), artifactTypeCache));
return new OseeCachingService(branchCache, transactionCache, artifactTypeCache, attributeTypeCache,
- relationTypeCache, oseeEnumTypeCache, identityService);
+ relationTypeCache, oseeEnumTypeCache);
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ServiceUtil.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ServiceUtil.java
index e8499727bdb..bad941c0041 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ServiceUtil.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ServiceUtil.java
@@ -16,7 +16,6 @@ import org.eclipse.osee.cache.admin.CacheAdmin;
import org.eclipse.osee.framework.core.model.TransactionRecordFactory;
import org.eclipse.osee.framework.core.services.IOseeCachingService;
import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.core.translation.IDataTranslationService;
import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
@@ -62,10 +61,6 @@ public final class ServiceUtil {
return getService(OseeEventService.class);
}
- public static IdentityService getIdentityService() throws OseeCoreException {
- return getService(IdentityService.class);
- }
-
public static IOseeCachingService getOseeCacheService() throws OseeCoreException {
return getService(IOseeCachingService.class);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java
index 0695d48674e..1f039b9f707 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java
@@ -46,7 +46,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
-import org.eclipse.osee.framework.skynet.core.internal.ServiceUtil;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink.ArtifactLinker;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData;
import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderFactory;
@@ -251,8 +250,7 @@ public class RelationManager {
IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
String sql = String.format(GET_DELETED_ARTIFACT, formatArgs);
- chStmt.runPreparedQuery(sql, artifact.getFullBranch().getId(),
- ServiceUtil.getIdentityService().getLocalId(relationType), artifact.getArtId());
+ chStmt.runPreparedQuery(sql, artifact.getFullBranch().getId(), relationType.getGuid(), artifact.getArtId());
while (chStmt.next()) {
int artId = chStmt.getInt(formatArgs[0] + "_art_id");
artIds.add(artId);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/word/WordUtil.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/word/WordUtil.java
index 46fa9ef562d..cef3d220a8a 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/word/WordUtil.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/word/WordUtil.java
@@ -39,7 +39,6 @@ import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.jdk.core.util.io.Streams;
import org.eclipse.osee.framework.jdk.core.util.xml.Xml;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.internal.ServiceUtil;
/**
* Provides utility methods for parsing wordML.
@@ -130,8 +129,8 @@ public class WordUtil {
IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
- long localId = ServiceUtil.getIdentityService().getLocalId(CoreAttributeTypes.WordTemplateContent);
- chStmt.runPreparedQuery(SELECT_WORD_VALUES, artId, localId, branch.getId());
+ chStmt.runPreparedQuery(SELECT_WORD_VALUES, artId, CoreAttributeTypes.WordTemplateContent.getGuid(),
+ branch.getId());
List<Pair<String, Integer>> values = new LinkedList<Pair<String, Integer>>();
while (chStmt.next()) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java
index 90dd7352b35..3a28d2a2124 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java
@@ -104,7 +104,7 @@ public class FixTemplateContentArtifacts extends AbstractBlam {
Object[] params = new Object[allBranches ? 3 : 4];
params[0] = TxChange.CURRENT.getValue();
params[1] = TransactionDetailsType.NonBaselined.getId();
- params[2] = ServiceUtil.getIdentityService().getLocalId(CoreAttributeTypes.WordTemplateContent);
+ params[2] = CoreAttributeTypes.WordTemplateContent.getGuid();
if (!allBranches) {
params[3] = branchId;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AbstractWordAttributeHealthOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AbstractWordAttributeHealthOperation.java
index 911c5c15b6b..6a1741e8c8e 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AbstractWordAttributeHealthOperation.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AbstractWordAttributeHealthOperation.java
@@ -156,7 +156,7 @@ public abstract class AbstractWordAttributeHealthOperation extends DatabaseHealt
List<AttrData> attrData = new ArrayList<AttrData>();
IOseeStatement chStmt = ServiceUtil.getOseeDatabaseService().getStatement();
try {
- chStmt.runPreparedQuery(GET_ATTRS, ServiceUtil.getIdentityService().getLocalId(attributeType));
+ chStmt.runPreparedQuery(GET_ATTRS, attributeType.getGuid());
while (chStmt.next()) {
checkForCancelledStatus(monitor);
String uri = chStmt.getString("uri");
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/ServiceUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/ServiceUtil.java
index 27a7ac3f681..a3296e69ea8 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/ServiceUtil.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/ServiceUtil.java
@@ -13,7 +13,6 @@ package org.eclipse.osee.framework.ui.skynet.internal;
import java.util.logging.Level;
import org.eclipse.core.runtime.Platform;
import org.eclipse.osee.framework.core.services.IOseeCachingService;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -45,10 +44,6 @@ public final class ServiceUtil {
return service;
}
- public static IdentityService getIdentityService() throws OseeCoreException {
- return getService(IdentityService.class);
- }
-
public static IOseeCachingService getOseeCacheService() throws OseeCoreException {
return getService(IOseeCachingService.class);
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/OrcsTypesDataStore.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/OrcsTypesDataStore.java
index 0d7e983f853..8c8f76e3d1a 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/OrcsTypesDataStore.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/OrcsTypesDataStore.java
@@ -15,7 +15,6 @@ import java.util.concurrent.Callable;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.jdk.core.type.Identity;
import org.eclipse.osee.framework.resource.management.IResource;
import org.eclipse.osee.orcs.OrcsSession;
@@ -32,6 +31,4 @@ public interface OrcsTypesDataStore {
Callable<Void> purgeRelationsByRelationType(OrcsSession session, Collection<? extends IRelationType> relationTypes);
- Callable<Void> persistTypeIdentities(OrcsSession session, Collection<Identity<Long>> types);
-
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesImpl.java
index 72408931d04..f476a246874 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesImpl.java
@@ -13,14 +13,12 @@ package org.eclipse.osee.orcs.core.internal.types.impl;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Collection;
-import java.util.LinkedList;
import java.util.concurrent.Callable;
import org.eclipse.osee.executor.admin.CancellableCallable;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
-import org.eclipse.osee.framework.jdk.core.type.Identity;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.resource.management.IResource;
import org.eclipse.osee.logger.Log;
@@ -146,21 +144,4 @@ public class OrcsTypesImpl implements OrcsTypes {
return dataStore.purgeRelationsByRelationType(session, relationTypes);
}
- @Override
- public Callable<Void> save() {
- return new Callable<Void>() {
-
- @Override
- public Void call() throws Exception {
- Collection<Identity<Long>> types = new LinkedList<Identity<Long>>();
- types.addAll(artifactTypes.getAll());
- types.addAll(attributeTypes.getAll());
- types.addAll(relationTypes.getAll());
- types.addAll(enumTypes.getAll());
- dataStore.persistTypeIdentities(session, types).call();
- return null;
- }
- };
- }
-
}
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/data/hsql.zip b/plugins/org.eclipse.osee.orcs.db.mock/data/hsql.zip
index c8fa6cf0e43..b4d836248c4 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/data/hsql.zip
+++ b/plugins/org.eclipse.osee.orcs.db.mock/data/hsql.zip
Binary files differ
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataFactoryImplTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataFactoryImplTest.java
index c2f06b07321..fc579259392 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataFactoryImplTest.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataFactoryImplTest.java
@@ -79,7 +79,7 @@ public class DataFactoryImplTest {
guid = GUID.create();
- OrcsObjectFactory objectFactory = new OrcsObjectFactoryImpl(proxyFactory, identityService);
+ OrcsObjectFactory objectFactory = new OrcsObjectFactoryImpl(proxyFactory);
dataFactory = new DataFactoryImpl(idFactory, objectFactory, artifactCache);
// VERSION
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderFactoryImplTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderFactoryImplTest.java
index 9b05707df86..ab3d4c29550 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderFactoryImplTest.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderFactoryImplTest.java
@@ -113,17 +113,6 @@ public class DataLoaderFactoryImplTest {
when(branchCache.getLocalId(BRANCH)).thenReturn(EXPECTED_BRANCH_ID);
when(sqlProvider.getSql(OseeSql.QUERY_BUILDER)).thenReturn("/*+ ordered */");
- when(identityService.getLocalId(CoreAttributeTypes.Annotation)).thenReturn(
- CoreAttributeTypes.Annotation.getGuid());
-
- when(identityService.getLocalId(CoreAttributeTypes.Category)).thenReturn(CoreAttributeTypes.Category.getGuid());
-
- when(identityService.getLocalId(CoreRelationTypes.Default_Hierarchical__Child)).thenReturn(
- CoreRelationTypes.Default_Hierarchical__Child.getGuid());
-
- when(identityService.getLocalId(CoreRelationTypes.Dependency__Artifact)).thenReturn(
- CoreRelationTypes.Dependency__Artifact.getGuid());
-
when(dbService.getStatement()).thenReturn(chStmt);
when(dbService.runPreparedQueryFetchObject(eq(-1), Matchers.anyString(), eq(BRANCH.getGuid()))).thenReturn(
EXPECTED_HEAD_TX_ID);
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/ArtifactQuerySqlContextFactoryImplTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/ArtifactQuerySqlContextFactoryImplTest.java
index 116496867ed..7090dbf88ad 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/ArtifactQuerySqlContextFactoryImplTest.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/ArtifactQuerySqlContextFactoryImplTest.java
@@ -17,10 +17,8 @@ import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.when;
-
import java.util.Iterator;
import java.util.List;
-
import org.eclipse.osee.executor.admin.ExecutorAdmin;
import org.eclipse.osee.framework.core.enums.CaseType;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
@@ -138,12 +136,6 @@ public class ArtifactQuerySqlContextFactoryImplTest {
queryData = new QueryData(criteriaSet, options);
when(branchCache.getLocalId(CoreBranches.COMMON)).thenReturn(EXPECTED_BRANCH_ID);
- when(identityService.getLocalId(CoreArtifactTypes.CodeUnit)).thenReturn(CoreArtifactTypes.CodeUnit.getGuid());
- when(identityService.getLocalId(CoreAttributeTypes.Name)).thenReturn(CoreAttributeTypes.Name.getGuid());
-
- when(identityService.getLocalId(CoreRelationTypes.Default_Hierarchical__Child)).thenReturn(
- CoreRelationTypes.Default_Hierarchical__Child.getGuid());
-
when(sqlProvider.getSql(OseeSql.QUERY_BUILDER)).thenReturn("/*+ ordered */");
doAnswer(new Answer<Void>() {
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/transaction/TxSqlBuilderTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/transaction/TxSqlBuilderTest.java
index 6fff2b82fbc..bf6c8619a14 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/transaction/TxSqlBuilderTest.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/transaction/TxSqlBuilderTest.java
@@ -78,7 +78,6 @@ public class TxSqlBuilderTest {
private static final int ITEM_ID = 789;
private static final String EXP_GUID = GUID.create();
private static final long TYPE_UUID = 72132144189L;
- private static final long TYPE_ID = 567;
private static final long NEXT_GAMMA_ID = 751382L;
@@ -154,7 +153,6 @@ public class TxSqlBuilderTest {
when(tx.getTimeStamp()).thenReturn(EXPECTED_TX_TIME);
when(tx.getTxType()).thenReturn(EXPECTED_TX_TYPE);
- when(idManager.getLocalId(TYPE_UUID)).thenReturn(TYPE_ID);
when(idManager.getNextGammaId()).thenReturn(NEXT_GAMMA_ID);
}
@@ -199,7 +197,7 @@ public class TxSqlBuilderTest {
verifyEmpty(allExcept(SqlOrderEnum.TXS_DETAIL, SqlOrderEnum.TXS, SqlOrderEnum.ARTIFACTS));
// @formatter:off
- verifyRow(SqlOrderEnum.ARTIFACTS, ITEM_ID, TYPE_ID, NEXT_GAMMA_ID, EXP_GUID);
+ verifyRow(SqlOrderEnum.ARTIFACTS, ITEM_ID, TYPE_UUID, NEXT_GAMMA_ID, EXP_GUID);
verifyRow(SqlOrderEnum.TXS, EXPECTED_TX_ID, NEXT_GAMMA_ID, modType.getValue(), TxChange.CURRENT.getValue(), EXPECTED_BRANCH_ID);
verifyQuery(SqlOrderEnum.ARTIFACTS);
// @formatter:on
@@ -269,7 +267,7 @@ public class TxSqlBuilderTest {
verifyEmpty(allExcept(SqlOrderEnum.TXS_DETAIL, SqlOrderEnum.TXS, SqlOrderEnum.RELATIONS));
// @formatter:off
- verifyRow(SqlOrderEnum.RELATIONS, ITEM_ID, TYPE_ID, NEXT_GAMMA_ID, A_ART_ID, B_ART_ID, RATIONALE);
+ verifyRow(SqlOrderEnum.RELATIONS, ITEM_ID, TYPE_UUID, NEXT_GAMMA_ID, A_ART_ID, B_ART_ID, RATIONALE);
verifyRow(SqlOrderEnum.TXS, EXPECTED_TX_ID, NEXT_GAMMA_ID, modType.getValue(), TxChange.CURRENT.getValue(), EXPECTED_BRANCH_ID);
verifyQuery(SqlOrderEnum.RELATIONS);
// @formatter:on
@@ -313,7 +311,7 @@ public class TxSqlBuilderTest {
verifyEmpty(allExcept(SqlOrderEnum.TXS_DETAIL, SqlOrderEnum.TXS, SqlOrderEnum.ATTRIBUTES));
// @formatter:off
- verifyRow(SqlOrderEnum.ATTRIBUTES, ITEM_ID, TYPE_ID, NEXT_GAMMA_ID, ATTR_ARTIFACT_ID, ATTR_VALUE, ATTR_URI);
+ verifyRow(SqlOrderEnum.ATTRIBUTES, ITEM_ID, TYPE_UUID, NEXT_GAMMA_ID, ATTR_ARTIFACT_ID, ATTR_VALUE, ATTR_URI);
verifyRow(SqlOrderEnum.TXS, EXPECTED_TX_ID, NEXT_GAMMA_ID, modType.getValue(), TxChange.CURRENT.getValue(), EXPECTED_BRANCH_ID);
verifyQuery(SqlOrderEnum.ATTRIBUTES);
// @formatter:on
@@ -328,7 +326,7 @@ public class TxSqlBuilderTest {
when(dataProxy.getData()).thenReturn(new Object[] {"aValue", "aURI"});
builder.updateAfterBinaryStorePersist();
- verifyRow(SqlOrderEnum.ATTRIBUTES, ITEM_ID, TYPE_ID, NEXT_GAMMA_ID, ATTR_ARTIFACT_ID, "aValue", "aURI");
+ verifyRow(SqlOrderEnum.ATTRIBUTES, ITEM_ID, TYPE_UUID, NEXT_GAMMA_ID, ATTR_ARTIFACT_ID, "aValue", "aURI");
reset(attrData);
}
diff --git a/plugins/org.eclipse.osee.orcs.db/OSGI-INF/fix.duplicate.attributes.console.command.xml b/plugins/org.eclipse.osee.orcs.db/OSGI-INF/fix.duplicate.attributes.console.command.xml
index b46cfeee5d5..b47c17199f1 100644
--- a/plugins/org.eclipse.osee.orcs.db/OSGI-INF/fix.duplicate.attributes.console.command.xml
+++ b/plugins/org.eclipse.osee.orcs.db/OSGI-INF/fix.duplicate.attributes.console.command.xml
@@ -6,6 +6,5 @@
</service>
<reference bind="setLogger" cardinality="1..1" interface="org.eclipse.osee.logger.Log" name="Log" policy="static"/>
<reference bind="setDatabaseService" cardinality="1..1" interface="org.eclipse.osee.framework.database.IOseeDatabaseService" name="IOseeDatabaseService" policy="static"/>
- <reference bind="setIdentityService" cardinality="1..1" interface="org.eclipse.osee.framework.core.services.IdentityService" name="IdentityService" policy="static"/>
<reference bind="setOrcsApi" cardinality="1..1" interface="org.eclipse.osee.orcs.OrcsApi" name="OrcsApi" policy="static"/>
</scr:component>
diff --git a/plugins/org.eclipse.osee.orcs.db/OSGI-INF/orcs.data.store.impl.xml b/plugins/org.eclipse.osee.orcs.db/OSGI-INF/orcs.data.store.impl.xml
index 8dddec5085a..53e4692351f 100644
--- a/plugins/org.eclipse.osee.orcs.db/OSGI-INF/orcs.data.store.impl.xml
+++ b/plugins/org.eclipse.osee.orcs.db/OSGI-INF/orcs.data.store.impl.xml
@@ -6,7 +6,6 @@
<provide interface="org.eclipse.osee.framework.core.services.TempCachingService"/>
</service>
<reference bind="setLogger" cardinality="1..1" interface="org.eclipse.osee.logger.Log" name="Log" policy="static"/>
- <reference bind="setIdentityService" cardinality="1..1" interface="org.eclipse.osee.framework.core.services.IdentityService" name="IdentityService" policy="static"/>
<reference bind="setDatabaseService" cardinality="1..1" interface="org.eclipse.osee.framework.database.IOseeDatabaseService" name="IOseeDatabaseService" policy="static"/>
<reference bind="setExecutorAdmin" cardinality="1..1" interface="org.eclipse.osee.executor.admin.ExecutorAdmin" name="ExecutorAdmin" policy="static"/>
<reference bind="setResourceManager" cardinality="1..1" interface="org.eclipse.osee.framework.resource.management.IResourceManager" name="IResourceManager" policy="static"/>
diff --git a/plugins/org.eclipse.osee.orcs.db/schema/SKYNET.VERSIONING.SCHEMA.xml b/plugins/org.eclipse.osee.orcs.db/schema/SKYNET.VERSIONING.SCHEMA.xml
index 87babf422c5..49a2fb4f29e 100644
--- a/plugins/org.eclipse.osee.orcs.db/schema/SKYNET.VERSIONING.SCHEMA.xml
+++ b/plugins/org.eclipse.osee.orcs.db/schema/SKYNET.VERSIONING.SCHEMA.xml
@@ -568,7 +568,7 @@
<Table name="OSEE_JOIN_ID" schema="OSEE" tablespace="osee_data">
<Column id="QUERY_ID" defaultValue="not null" type="INTEGER" />
- <Column id="ID" type="INTEGER" />
+ <Column id="ID" type="BIGINT" />
<Column id="INSERT_TIME" type="TIMESTAMP" />
<Index id="OSEE_JOIN_ID__Q_I_IDX" type="UNIQUE" tablespace="osee_index">
<AppliesTo id="QUERY_ID"/>
@@ -579,7 +579,7 @@
<TableDescription referenceTable="OSEE_JOIN_ID">
<Note purpose="Temporary working table to improve performance of joins"/>
<Column id="QUERY_ID" description="randomly generated identifier for this short-lived join"/>
- <Column id="ID" description="application specific INTEGER identifier"/>
+ <Column id="ID" description="application specific NUMBER identifier"/>
<Column id="INSERT_TIME" description="time this join query was started"/>
</TableDescription>
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/IdentityLocator.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/IdentityLocator.java
index 0d33acdb199..a511aee924a 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/IdentityLocator.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/IdentityLocator.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.orcs.db.internal;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.jdk.core.type.Identity;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
/**
@@ -23,12 +22,6 @@ public interface IdentityLocator {
Long parseToLocalId(String value) throws OseeCoreException;
- Long getLocalId(Long universalId) throws OseeCoreException;
-
- Long getUniversalId(Long localId) throws OseeCoreException;
-
- long getLocalId(Identity<Long> identity) throws OseeCoreException;
-
IOseeBranch getBranch(long branchId) throws OseeCoreException;
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/IdentityManager.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/IdentityManager.java
index 5bea89746f4..d7c6743a210 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/IdentityManager.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/IdentityManager.java
@@ -10,9 +10,8 @@
*******************************************************************************/
package org.eclipse.osee.orcs.db.internal;
-import java.util.List;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
/**
* @author Roberto E. Escobar
@@ -29,8 +28,6 @@ public interface IdentityManager extends IdentityLocator {
long getNextGammaId() throws OseeCoreException;
- void store(List<Long> toPersist) throws OseeCoreException;
-
void invalidateIds() throws OseeDataStoreException;
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/OrcsDataStoreImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/OrcsDataStoreImpl.java
index dfc9c5d7dc0..deb25a3a714 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/OrcsDataStoreImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/OrcsDataStoreImpl.java
@@ -18,7 +18,6 @@ import org.eclipse.osee.framework.core.model.cache.BranchCache;
import org.eclipse.osee.framework.core.model.cache.IOseeCache;
import org.eclipse.osee.framework.core.model.cache.TransactionCache;
import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.core.services.TempCachingService;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.jdk.core.type.BaseIdentity;
@@ -52,7 +51,6 @@ public class OrcsDataStoreImpl implements OrcsDataStore, TempCachingService {
private Log logger;
private IOseeDatabaseService dbService;
- private IdentityService identityService;
private SystemPreferences preferences;
private ExecutorAdmin executorAdmin;
private IResourceManager resourceManager;
@@ -72,10 +70,6 @@ public class OrcsDataStoreImpl implements OrcsDataStore, TempCachingService {
this.logger = logger;
}
- public void setIdentityService(IdentityService identityService) {
- this.identityService = identityService;
- }
-
public void setDatabaseService(IOseeDatabaseService dbService) {
this.dbService = dbService;
}
@@ -114,7 +108,7 @@ public class OrcsDataStoreImpl implements OrcsDataStore, TempCachingService {
sqlProvider = createSqlProvider();
- idManager = new IdentityManagerImpl(dbService, identityService);
+ idManager = new IdentityManagerImpl(dbService);
TypesModule typesModule = new TypesModule(logger, dbService, idManager, resourceManager);
typesDataStore = typesModule.createTypesDataStore();
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/DeleteRelationDatabaseCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/DeleteRelationDatabaseCallable.java
index ef5ab81e5aa..232b3e36c53 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/DeleteRelationDatabaseCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/DeleteRelationDatabaseCallable.java
@@ -90,7 +90,7 @@ public class DeleteRelationDatabaseCallable extends AbstractDatastoreTxCallable<
}
private Triplet<Integer, Integer, Integer> getRelationModAndGammaTxData(Branch commonBranch, IRelationTypeSide relationType, int aArtId, int bArtId) throws OseeCoreException {
- long relationTypeId = identityService.getLocalId(relationType);
+ long relationTypeId = relationType.getGuid();
IOseeStatement chStmt = getDatabaseService().getStatement();
try {
chStmt.runPreparedQuery(1, SELECT_RELATION_LINK, relationTypeId, aArtId, bArtId, commonBranch.getId(),
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/OrcsTypeLoaderCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/OrcsTypeLoaderCallable.java
index 155792f0671..d71156a559f 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/OrcsTypeLoaderCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/OrcsTypeLoaderCallable.java
@@ -33,7 +33,6 @@ import org.eclipse.osee.framework.resource.management.IResourceManager;
import org.eclipse.osee.framework.resource.management.StandardOptions;
import org.eclipse.osee.logger.Log;
import org.eclipse.osee.orcs.OrcsSession;
-import org.eclipse.osee.orcs.db.internal.IdentityLocator;
/**
* @author Roberto E. Escobar
@@ -43,12 +42,10 @@ public class OrcsTypeLoaderCallable extends AbstractDatastoreCallable<IResource>
private static final String LOAD_OSEE_TYPE_DEF_URIS =
"select attr.uri from osee_branch br, osee_txs txs1, osee_artifact art, osee_attribute attr, osee_txs txs2 where br.branch_guid = ? and txs1.branch_id = br.branch_id and txs1.tx_current = ? and txs1.gamma_id = art.gamma_id and txs2.branch_id = br.branch_id and txs2.tx_current = ? and txs2.gamma_id = attr.gamma_id and art.art_type_id = ? and art.art_id = attr.art_id and attr.attr_type_id = ?";
- private final IdentityLocator identityService;
private final IResourceManager resourceManager;
- public OrcsTypeLoaderCallable(Log logger, OrcsSession session, IOseeDatabaseService dbService, IdentityLocator identityService, IResourceManager resourceManager) {
+ public OrcsTypeLoaderCallable(Log logger, OrcsSession session, IOseeDatabaseService dbService, IResourceManager resourceManager) {
super(logger, session, dbService);
- this.identityService = identityService;
this.resourceManager = resourceManager;
}
@@ -65,8 +62,8 @@ public class OrcsTypeLoaderCallable extends AbstractDatastoreCallable<IResource>
private Collection<String> findOseeTypeData() throws OseeCoreException {
Collection<String> paths = new LinkedHashSet<String>();
- Long artifactTypeId = identityService.getLocalId(CoreArtifactTypes.OseeTypeDefinition);
- Long attributeTypeId = identityService.getLocalId(CoreAttributeTypes.UriGeneralStringData);
+ Long artifactTypeId = CoreArtifactTypes.OseeTypeDefinition.getGuid();
+ Long attributeTypeId = CoreAttributeTypes.UriGeneralStringData.getGuid();
IOseeStatement chStmt = null;
try {
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeAttributeTypeDatabaseTxCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeAttributeTypeDatabaseTxCallable.java
index c4086fc3c94..b2a823d0fbb 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeAttributeTypeDatabaseTxCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeAttributeTypeDatabaseTxCallable.java
@@ -70,10 +70,10 @@ public final class PurgeAttributeTypeDatabaseTxCallable extends AbstractDatastor
IdJoinQuery joinQuery = JoinUtility.createIdJoinQuery();
try {
if (types.size() == 1) {
- chStmt.runPreparedQuery(RETRIEVE_GAMMAS_OF_ATTR_TYPE, identityService.getLocalId(types.iterator().next()));
+ chStmt.runPreparedQuery(RETRIEVE_GAMMAS_OF_ATTR_TYPE, types.iterator().next().getGuid());
} else {
for (IAttributeType type : types) {
- joinQuery.add(identityService.getLocalId(type));
+ joinQuery.add(type.getGuid());
}
joinQuery.store(connection);
chStmt.runPreparedQuery(RETRIEVE_GAMMAS_OF_ATTR_MULT_TYPES, joinQuery.getQueryId());
@@ -94,11 +94,10 @@ public final class PurgeAttributeTypeDatabaseTxCallable extends AbstractDatastor
IdJoinQuery joinQuery = JoinUtility.createIdJoinQuery();
try {
if (types.size() == 1) {
- chStmt.runPreparedQuery(RETRIEVE_GAMMAS_WITH_BRANCH_IDS,
- identityService.getLocalId(types.iterator().next()));
+ chStmt.runPreparedQuery(RETRIEVE_GAMMAS_WITH_BRANCH_IDS, types.iterator().next().getGuid());
} else {
for (IAttributeType type : types) {
- joinQuery.add(identityService.getLocalId(type));
+ joinQuery.add(type.getGuid());
}
chStmt.runPreparedQuery(RETRIEVE_GAMMAS_WITH_BRANCH_IDS_MULT_TYPES, joinQuery.getQueryId());
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeRelationTypeDatabaseTxCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeRelationTypeDatabaseTxCallable.java
index 38a38922957..71472b3d58e 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeRelationTypeDatabaseTxCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeRelationTypeDatabaseTxCallable.java
@@ -65,7 +65,7 @@ public final class PurgeRelationTypeDatabaseTxCallable extends AbstractDatastore
IOseeStatement chStmt = getDatabaseService().getStatement(connection);
try {
for (IRelationType type : types) {
- chStmt.runPreparedQuery(RETRIEVE_GAMMAS_OF_REL_LINK_TXS, identityService.getLocalId(type));
+ chStmt.runPreparedQuery(RETRIEVE_GAMMAS_OF_REL_LINK_TXS, type.getGuid());
while (chStmt.next()) {
gammas.add(new Integer[] {chStmt.getInt("gamma_id")});
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/change/MissingChangeItemFactoryImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/change/MissingChangeItemFactoryImpl.java
index 0d2645246f3..56bae834bef 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/change/MissingChangeItemFactoryImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/change/MissingChangeItemFactoryImpl.java
@@ -16,7 +16,6 @@ import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-
import org.eclipse.osee.executor.admin.HasCancellation;
import org.eclipse.osee.framework.core.enums.LoadLevel;
import org.eclipse.osee.framework.core.enums.ModificationType;
@@ -35,7 +34,6 @@ import org.eclipse.osee.orcs.core.ds.LoadDataHandlerAdapter;
import org.eclipse.osee.orcs.core.ds.OrcsData;
import org.eclipse.osee.orcs.core.ds.RelationData;
import org.eclipse.osee.orcs.db.internal.IdentityLocator;
-
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Multimap;
@@ -189,24 +187,22 @@ public class MissingChangeItemFactoryImpl implements MissingChangeItemFactory {
private ArtifactChangeItem createArtifactChangeItem(ArtifactData data) throws OseeCoreException {
ArtifactChangeItem artChange =
- new ArtifactChangeItem(data.getLocalId(), identityService.getLocalId(data.getTypeUuid()),
- data.getVersion().getGammaId(), determineModType(data));
+ new ArtifactChangeItem(data.getLocalId(), data.getTypeUuid(), data.getVersion().getGammaId(),
+ determineModType(data));
return artChange;
}
private AttributeChangeItem createAttributeChangeItem(AttributeData data) throws OseeCoreException {
AttributeChangeItem attrChange =
- new AttributeChangeItem(data.getLocalId(), identityService.getLocalId(data.getTypeUuid()),
- data.getArtifactId(), data.getVersion().getGammaId(), determineModType(data),
- data.getDataProxy().getDisplayableString());
+ new AttributeChangeItem(data.getLocalId(), data.getTypeUuid(), data.getArtifactId(),
+ data.getVersion().getGammaId(), determineModType(data), data.getDataProxy().getDisplayableString());
attrChange.getNetChange().copy(attrChange.getCurrentVersion());
return attrChange;
}
private RelationChangeItem createRelationChangeItem(RelationData data) throws OseeCoreException {
- return new RelationChangeItem(data.getLocalId(), identityService.getLocalId(data.getTypeUuid()),
- data.getVersion().getGammaId(), determineModType(data), data.getArtIdA(), data.getArtIdB(),
- data.getRationale());
+ return new RelationChangeItem(data.getLocalId(), data.getTypeUuid(), data.getVersion().getGammaId(),
+ determineModType(data), data.getArtIdA(), data.getArtIdB(), data.getRationale());
}
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/console/FixDuplicateAttributesCommand.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/console/FixDuplicateAttributesCommand.java
index 42c2e36183f..29933a95bd7 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/console/FixDuplicateAttributesCommand.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/console/FixDuplicateAttributesCommand.java
@@ -16,7 +16,6 @@ import org.eclipse.osee.console.admin.Console;
import org.eclipse.osee.console.admin.ConsoleParameters;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.enums.TxChange;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.database.core.ExportImportJoinQuery;
import org.eclipse.osee.framework.database.core.IOseeStatement;
@@ -36,16 +35,11 @@ import org.eclipse.osee.orcs.db.internal.callable.AbstractDatastoreTxCallable;
public class FixDuplicateAttributesCommand extends AbstractDatastoreConsoleCommand {
private OrcsApi orcsApi;
- private IdentityService identityService;
public void setOrcsApi(OrcsApi orcsApi) {
this.orcsApi = orcsApi;
}
- public void setIdentityService(IdentityService identityService) {
- this.identityService = identityService;
- }
-
@Override
public String getName() {
return "db_fix_duplicate_attributes";
@@ -129,8 +123,7 @@ public class FixDuplicateAttributesCommand extends AbstractDatastoreConsoleComma
AttributeTypes types = orcsApi.getOrcsTypes(null).getAttributeTypes();
for (IAttributeType attributeType : types.getAll()) {
if (types.getMaxOccurrences(attributeType) == 1) {
- Long localId = identityService.getLocalId(attributeType.getGuid());
- typeJoin.add(localId);
+ typeJoin.add(attributeType.getGuid());
}
}
typeJoin.store();
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/export/DbTableExportItem.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/export/DbTableExportItem.java
index 1625aa74bf6..fe9efd55335 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/export/DbTableExportItem.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/export/DbTableExportItem.java
@@ -20,7 +20,6 @@ import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.sql.Timestamp;
-import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.core.util.HexUtil;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.database.core.IOseeStatement;
@@ -224,9 +223,7 @@ public class DbTableExportItem extends AbstractXmlExportItem {
} else {
throw new OseeCoreException("Undefined Type [%s]", value != null ? value.getClass().getSimpleName() : value);
}
- Long uuid = identityService.getUniversalId(typeId);
- Conditions.checkNotNull(uuid, "abstartOseeType", "localId[%s] for [%s]", typeId, getSource());
- String uuidString = HexUtil.toString(uuid);
+ String uuidString = HexUtil.toString(typeId);
ExportImportXml.addXmlAttribute(appendable, ExportImportXml.TYPE_GUID, uuidString);
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/LoaderModule.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/LoaderModule.java
index c2c4260041f..bec64a60949 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/LoaderModule.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/LoaderModule.java
@@ -46,7 +46,7 @@ public class LoaderModule {
public OrcsObjectFactory createOrcsObjectFactory(AttributeTypes attributeTypes) {
ProxyDataFactory proxyFactory = new AttributeDataProxyFactory(proxyProvider, attributeTypes);
- return new OrcsObjectFactoryImpl(proxyFactory, idFactory);
+ return new OrcsObjectFactoryImpl(proxyFactory);
}
public DataFactory createDataFactory(OrcsObjectFactory factory, ArtifactTypes artifactTypes) {
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/ArtifactObjectFactory.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/ArtifactObjectFactory.java
index 65791f98f5a..9e40a4db872 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/ArtifactObjectFactory.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/ArtifactObjectFactory.java
@@ -21,7 +21,7 @@ import org.eclipse.osee.orcs.core.ds.VersionData;
*/
public interface ArtifactObjectFactory extends VersionObjectFactory {
- ArtifactData createArtifactData(VersionData version, int localId, long localTypeID, ModificationType modType, String guid) throws OseeCoreException;
+ ArtifactData createArtifactData(VersionData version, int localId, long typeID, ModificationType modType, String guid) throws OseeCoreException;
ArtifactData createArtifactData(VersionData version, int generateArtId, IArtifactType type, ModificationType modType, String guidToSet);
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/AttributeObjectFactory.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/AttributeObjectFactory.java
index f3671ab13fd..b433a398a93 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/AttributeObjectFactory.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/AttributeObjectFactory.java
@@ -21,7 +21,7 @@ import org.eclipse.osee.orcs.core.ds.VersionData;
*/
public interface AttributeObjectFactory extends VersionObjectFactory {
- AttributeData createAttributeData(VersionData version, int localId, long localTypeID, ModificationType modType, int artId, String value, String uri) throws OseeCoreException;
+ AttributeData createAttributeData(VersionData version, int localId, long typeID, ModificationType modType, int artId, String value, String uri) throws OseeCoreException;
AttributeData createAttributeData(VersionData version, int localId, IAttributeType type, ModificationType modType, int artId) throws OseeCoreException;
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java
index 2a405644244..b0e01808b15 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java
@@ -27,7 +27,6 @@ import org.eclipse.osee.orcs.core.ds.DataProxy;
import org.eclipse.osee.orcs.core.ds.RelationData;
import org.eclipse.osee.orcs.core.ds.TxOrcsData;
import org.eclipse.osee.orcs.core.ds.VersionData;
-import org.eclipse.osee.orcs.db.internal.IdentityLocator;
import org.eclipse.osee.orcs.db.internal.OrcsObjectFactory;
import org.eclipse.osee.orcs.db.internal.loader.ProxyDataFactory;
import org.eclipse.osee.orcs.db.internal.sql.RelationalConstants;
@@ -38,16 +37,10 @@ import org.eclipse.osee.orcs.db.internal.sql.RelationalConstants;
public class OrcsObjectFactoryImpl implements OrcsObjectFactory {
private final ProxyDataFactory proxyFactory;
- private final IdentityLocator identityService;
- public OrcsObjectFactoryImpl(ProxyDataFactory proxyFactory, IdentityLocator identityService) {
+ public OrcsObjectFactoryImpl(ProxyDataFactory proxyFactory) {
super();
this.proxyFactory = proxyFactory;
- this.identityService = identityService;
- }
-
- private long toUuid(long localId) throws OseeCoreException {
- return identityService.getUniversalId(localId);
}
@Override
@@ -90,8 +83,7 @@ public class OrcsObjectFactoryImpl implements OrcsObjectFactory {
}
@Override
- public ArtifactData createArtifactData(VersionData version, int localId, long localTypeID, ModificationType modType, String guid) throws OseeCoreException {
- long typeUuid = toUuid(localTypeID);
+ public ArtifactData createArtifactData(VersionData version, int localId, long typeUuid, ModificationType modType, String guid) throws OseeCoreException {
return createArtifactFromRow(version, localId, typeUuid, modType, typeUuid, modType, guid);
}
@@ -109,8 +101,7 @@ public class OrcsObjectFactoryImpl implements OrcsObjectFactory {
}
@Override
- public AttributeData createAttributeData(VersionData version, int localId, long localTypeID, ModificationType modType, int artifactId, String value, String uri) throws OseeCoreException {
- long typeId = toUuid(localTypeID);
+ public AttributeData createAttributeData(VersionData version, int localId, long typeId, ModificationType modType, int artifactId, String value, String uri) throws OseeCoreException {
DataProxy proxy = proxyFactory.createProxy(typeId, value, uri);
return createAttributeFromRow(version, localId, typeId, modType, typeId, modType, artifactId, proxy);
}
@@ -133,8 +124,7 @@ public class OrcsObjectFactoryImpl implements OrcsObjectFactory {
}
@Override
- public RelationData createRelationData(VersionData version, int localId, long localTypeID, ModificationType modType, int aArtId, int bArtId, String rationale) throws OseeCoreException {
- long typeId = toUuid(localTypeID);
+ public RelationData createRelationData(VersionData version, int localId, long typeId, ModificationType modType, int aArtId, int bArtId, String rationale) throws OseeCoreException {
return createRelationData(version, localId, typeId, modType, typeId, modType, aArtId, bArtId, rationale);
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/RelationObjectFactory.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/RelationObjectFactory.java
index 665053ea341..125cc407b18 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/RelationObjectFactory.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/RelationObjectFactory.java
@@ -21,7 +21,7 @@ import org.eclipse.osee.orcs.core.ds.VersionData;
*/
public interface RelationObjectFactory extends VersionObjectFactory {
- RelationData createRelationData(VersionData version, int localId, long localTypeID, ModificationType modType, int aArtId, int bArtId, String rationale) throws OseeCoreException;
+ RelationData createRelationData(VersionData version, int localId, long typeID, ModificationType modType, int aArtId, int bArtId, String rationale) throws OseeCoreException;
RelationData createRelationData(VersionData version, int localId, IRelationType type, ModificationType modType, int aArtId, int bArtId, String rationale) throws OseeCoreException;
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/AttributeSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/AttributeSqlHandler.java
index 89c50dbd999..040ae718a38 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/AttributeSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/AttributeSqlHandler.java
@@ -71,7 +71,7 @@ public class AttributeSqlHandler extends SqlHandler<CriteriaAttribute> {
private Collection<Long> getLocalTypeIds() throws OseeCoreException {
Collection<Long> toReturn = new HashSet<Long>();
for (Identity<Long> type : criteria.getTypes()) {
- toReturn.add(toLocalId(type));
+ toReturn.add(type.getGuid());
}
return toReturn;
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/RelationSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/RelationSqlHandler.java
index 9c24c163fba..000a37bbac7 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/RelationSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/RelationSqlHandler.java
@@ -71,7 +71,7 @@ public class RelationSqlHandler extends SqlHandler<CriteriaRelation> {
private Collection<Long> getLocalTypeIds() throws OseeCoreException {
Collection<Long> toReturn = new HashSet<Long>();
for (Identity<Long> type : criteria.getTypes()) {
- toReturn.add(toLocalId(type));
+ toReturn.add(type.getGuid());
}
return toReturn;
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactTypeSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactTypeSqlHandler.java
index 29580250622..bde8a467037 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactTypeSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactTypeSqlHandler.java
@@ -66,8 +66,7 @@ public class ArtifactTypeSqlHandler extends SqlHandler<CriteriaArtifactType> {
Collection<? extends IArtifactType> types = criteria.getTypes();
Collection<Long> toReturn = new HashSet<Long>();
for (IArtifactType type : types) {
- long localId = getIdentityService().getLocalId(type);
- toReturn.add(localId);
+ toReturn.add(type.getGuid());
}
return toReturn;
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeOtherSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeOtherSqlHandler.java
index 0cdb0833014..39c424c7f94 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeOtherSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeOtherSqlHandler.java
@@ -77,7 +77,7 @@ public class AttributeOtherSqlHandler extends SqlHandler<CriteriaAttributeOther>
if (attributeType != null) {
writer.write(attrAlias);
writer.write(".attr_type_id = ?");
- writer.addParameter(toLocalId(attributeType));
+ writer.addParameter(attributeType.getGuid());
}
if (value != null) {
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTokenSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTokenSqlHandler.java
index f32874bbf32..97f1aa0663c 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTokenSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTokenSqlHandler.java
@@ -110,12 +110,12 @@ public class AttributeTokenSqlHandler extends SqlHandler<CriteriaAttributeKeywor
attrSb.append(" AND att.attr_type_id = ");
if (types.size() == 1) {
attrSb.append("?");
- long localId = toLocalId(criteria.getTypes().iterator().next());
- writer.addParameter(localId);
+ long typeId = criteria.getTypes().iterator().next().getGuid();
+ writer.addParameter(typeId);
} else {
Set<Long> typeIds = new HashSet<Long>();
for (IAttributeType type : types) {
- typeIds.add(toLocalId(type));
+ typeIds.add(type.getGuid());
}
AbstractJoinQuery joinQuery = writer.writeIdJoin(typeIds);
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTypeExistsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTypeExistsSqlHandler.java
index d89d6366182..550ade029b2 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTypeExistsSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTypeExistsSqlHandler.java
@@ -59,7 +59,7 @@ public class AttributeTypeExistsSqlHandler extends SqlHandler<CriteriaAttributeT
if (types.size() > 1) {
Set<Long> typeIds = new HashSet<Long>();
for (IAttributeType type : types) {
- typeIds.add(toLocalId(type));
+ typeIds.add(type.getGuid());
}
joinQuery = writer.writeIdJoin(typeIds);
@@ -73,10 +73,9 @@ public class AttributeTypeExistsSqlHandler extends SqlHandler<CriteriaAttributeT
} else {
IAttributeType type = types.iterator().next();
- long localId = toLocalId(type);
writer.write(attrAlias);
writer.write(".attr_type_id = ?");
- writer.addParameter(localId);
+ writer.addParameter(type.getGuid());
}
List<String> aliases = writer.getAliases(TableEnum.ARTIFACT_TABLE);
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java
index e14403c9bcb..c7d65749b06 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java
@@ -55,7 +55,7 @@ public class RelatedToSqlHandler extends SqlHandler<CriteriaRelatedTo> {
IRelationTypeSide typeSide = criteria.getType();
writer.write(relAlias);
writer.write(".rel_link_type_id = ?");
- writer.addParameter(toLocalId(typeSide));
+ writer.addParameter(typeSide.getGuid());
Collection<Integer> ids = criteria.getIds();
if (!ids.isEmpty()) {
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeExistsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeExistsSqlHandler.java
index 7fea80ce377..18c3420853d 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeExistsSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeExistsSqlHandler.java
@@ -48,7 +48,7 @@ public class RelationTypeExistsSqlHandler extends SqlHandler<CriteriaRelationTyp
IRelationType type = criteria.getType();
writer.write(relAlias);
writer.write(".rel_link_type_id = ?");
- writer.addParameter(toLocalId(type));
+ writer.addParameter(type.getGuid());
List<String> aliases = writer.getAliases(TableEnum.ARTIFACT_TABLE);
if (!aliases.isEmpty()) {
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/producer/IndexBranchesDatabaseCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/producer/IndexBranchesDatabaseCallable.java
index 2bfb3a5a068..85358ab0e62 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/producer/IndexBranchesDatabaseCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/producer/IndexBranchesDatabaseCallable.java
@@ -97,8 +97,7 @@ public final class IndexBranchesDatabaseCallable extends AbstractDatastoreCallab
for (IAttributeType attributeType : typesToTag) {
if (types.isTaggable(attributeType)) {
- long typeLocalId = idService.getLocalId(attributeType);
- typeJoin.add(typeLocalId);
+ typeJoin.add(attributeType.getGuid());
}
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/data/GammaQueueIndexerDataSourceLoader.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/data/GammaQueueIndexerDataSourceLoader.java
index f25fa7dfdf4..83f024b1644 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/data/GammaQueueIndexerDataSourceLoader.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/data/GammaQueueIndexerDataSourceLoader.java
@@ -50,7 +50,7 @@ public class GammaQueueIndexerDataSourceLoader implements IndexedResourceLoader
loaded = true;
int itemId = chStmt.getInt("attr_id");
- long typeUuid = idService.getUniversalId(chStmt.getLong("attr_type_id"));
+ long typeUuid = chStmt.getLong("attr_type_id");
long gammaId = chStmt.getLong("gamma_id");
String uri = chStmt.getString("uri");
String value = chStmt.getString("value");
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/SqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/SqlHandler.java
index a383eaf452a..9da84da9323 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/SqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/SqlHandler.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.orcs.db.internal.sql;
import org.eclipse.osee.framework.jdk.core.type.HasPriority;
-import org.eclipse.osee.framework.jdk.core.type.Identity;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.logger.Log;
import org.eclipse.osee.orcs.core.ds.Criteria;
@@ -33,10 +32,6 @@ public abstract class SqlHandler<T extends Criteria> implements HasPriority {
return idService;
}
- public long toLocalId(Identity<Long> identity) throws OseeCoreException {
- return idService.getLocalId(identity);
- }
-
public void setLogger(Log logger) {
this.logger = logger;
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxModule.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxModule.java
index a2c09704dfd..6d982cb6986 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxModule.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxModule.java
@@ -65,7 +65,7 @@ public class TxModule {
@Override
public Callable<String> createUnsubscribeTx(ArtifactReadable userArtifact, ArtifactReadable groupArtifact) {
- return new UnsubscribeTransaction(logger, dbService, idManager, userArtifact, groupArtifact);
+ return new UnsubscribeTransaction(logger, dbService, userArtifact, groupArtifact);
}
@Override
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxSqlBuilderImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxSqlBuilderImpl.java
index 627033a318b..ec524642374 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxSqlBuilderImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxSqlBuilderImpl.java
@@ -104,8 +104,7 @@ public class TxSqlBuilderImpl implements OrcsVisitor, TxSqlBuilder {
updateTxValues(data);
if (isRowAllowed) {
updateGamma(data);
- long localTypeId = getLocalTypeId(data.getTypeUuid());
- addRow(SqlOrderEnum.ARTIFACTS, data.getLocalId(), localTypeId, data.getVersion().getGammaId(),
+ addRow(SqlOrderEnum.ARTIFACTS, data.getLocalId(), data.getTypeUuid(), data.getVersion().getGammaId(),
data.getGuid());
}
addTxs(SqlOrderEnum.ARTIFACTS, data);
@@ -129,8 +128,7 @@ public class TxSqlBuilderImpl implements OrcsVisitor, TxSqlBuilder {
int localId = idManager.getNextAttributeId();
data.setLocalId(localId);
}
- long localTypeId = getLocalTypeId(data.getTypeUuid());
- addRow(SqlOrderEnum.ATTRIBUTES, data.getLocalId(), localTypeId, data.getVersion().getGammaId(),
+ addRow(SqlOrderEnum.ATTRIBUTES, data.getLocalId(), data.getTypeUuid(), data.getVersion().getGammaId(),
data.getArtifactId(), daoToSql.getValue(), daoToSql.getUri());
}
addTxs(SqlOrderEnum.ATTRIBUTES, data);
@@ -160,8 +158,7 @@ public class TxSqlBuilderImpl implements OrcsVisitor, TxSqlBuilder {
int localId = idManager.getNextRelationId();
data.setLocalId(localId);
}
- long localTypeId = getLocalTypeId(data.getTypeUuid());
- addRow(SqlOrderEnum.RELATIONS, data.getLocalId(), localTypeId, data.getVersion().getGammaId(),
+ addRow(SqlOrderEnum.RELATIONS, data.getLocalId(), data.getTypeUuid(), data.getVersion().getGammaId(),
data.getArtIdA(), data.getArtIdB(), data.getRationale());
}
addTxs(SqlOrderEnum.RELATIONS, data);
@@ -227,8 +224,4 @@ public class TxSqlBuilderImpl implements OrcsVisitor, TxSqlBuilder {
binaryStores.add(binaryTx);
}
- private long getLocalTypeId(long typeUuidId) throws OseeCoreException {
- return idManager.getLocalId(typeUuidId);
- }
-
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/UnsubscribeTransaction.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/UnsubscribeTransaction.java
index 3bcaf855908..f7008e3d82d 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/UnsubscribeTransaction.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/UnsubscribeTransaction.java
@@ -27,7 +27,6 @@ import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.time.GlobalTime;
import org.eclipse.osee.logger.Log;
import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.db.internal.IdentityLocator;
import org.eclipse.osee.orcs.db.internal.accessor.UpdatePreviousTxCurrent;
public final class UnsubscribeTransaction extends DatabaseTxCallable<String> {
@@ -40,15 +39,12 @@ public final class UnsubscribeTransaction extends DatabaseTxCallable<String> {
private int relationId;
private int currentGammaId;
- private final IdentityLocator identityService;
private final ArtifactReadable groupArtifact;
private final ArtifactReadable userArtifact;
private String completionMethod;
- public UnsubscribeTransaction(Log logger, IOseeDatabaseService databaseService, IdentityLocator identityService, ArtifactReadable userArtifact, ArtifactReadable groupArtifact) {
+ public UnsubscribeTransaction(Log logger, IOseeDatabaseService databaseService, ArtifactReadable userArtifact, ArtifactReadable groupArtifact) {
super(logger, databaseService, "Delete Relation");
- this.identityService = identityService;
-
this.groupArtifact = groupArtifact;
this.userArtifact = userArtifact;
}
@@ -79,7 +75,7 @@ public final class UnsubscribeTransaction extends DatabaseTxCallable<String> {
}
private boolean getRelationTxData(long branchId) throws OseeCoreException {
- long relationTypeId = identityService.getLocalId(CoreRelationTypes.Users_Artifact);
+ long relationTypeId = CoreRelationTypes.Users_Artifact.getGuid();
IOseeStatement chStmt = getDatabaseService().getStatement();
try {
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/types/TypesModule.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/types/TypesModule.java
index e95a0cc6147..bfb2be2071f 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/types/TypesModule.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/types/TypesModule.java
@@ -11,14 +11,11 @@
package org.eclipse.osee.orcs.db.internal.types;
import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
import java.util.concurrent.Callable;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.jdk.core.type.Identity;
import org.eclipse.osee.framework.resource.management.IResource;
import org.eclipse.osee.framework.resource.management.IResourceManager;
import org.eclipse.osee.logger.Log;
@@ -53,7 +50,7 @@ public class TypesModule {
@Override
public Callable<IResource> getOrcsTypesLoader(OrcsSession session) {
- return new OrcsTypeLoaderCallable(logger, session, dbService, identityService, resourceManager);
+ return new OrcsTypeLoaderCallable(logger, session, dbService, resourceManager);
}
@Override
@@ -71,22 +68,6 @@ public class TypesModule {
return new PurgeRelationTypeDatabaseTxCallable(logger, session, dbService, identityService, typesToPurge);
}
- @Override
- public Callable<Void> persistTypeIdentities(OrcsSession session, final Collection<Identity<Long>> types) {
- return new Callable<Void>() {
-
- @Override
- public Void call() throws Exception {
- List<Long> toPersist = new LinkedList<Long>();
- for (Identity<Long> type : types) {
- toPersist.add(type.getGuid());
- }
- identityService.store(toPersist);
- return null;
- }
- };
- }
-
};
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/util/IdentityManagerImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/util/IdentityManagerImpl.java
index 52f41e176fb..e9823ffd337 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/util/IdentityManagerImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/util/IdentityManagerImpl.java
@@ -10,17 +10,14 @@
*******************************************************************************/
package org.eclipse.osee.orcs.db.internal.util;
-import java.util.List;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.core.util.HexUtil;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.database.core.IOseeSequence;
import org.eclipse.osee.framework.database.core.IOseeStatement;
-import org.eclipse.osee.framework.jdk.core.type.Identity;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.orcs.db.internal.IdentityManager;
@@ -36,12 +33,10 @@ public class IdentityManagerImpl implements IdentityManager {
private static final String SELECT_BRANCH_ID_BY_GUID = "select branch_id from osee_branch where branch_guid = ?";
private final IOseeDatabaseService dbService;
- private final IdentityService idService;
- public IdentityManagerImpl(IOseeDatabaseService dbService, IdentityService idService) {
+ public IdentityManagerImpl(IOseeDatabaseService dbService) {
super();
this.dbService = dbService;
- this.idService = idService;
}
private IOseeSequence getSequence() throws OseeDataStoreException {
@@ -79,34 +74,12 @@ public class IdentityManagerImpl implements IdentityManager {
@Override
public Long parseToLocalId(String value) throws OseeCoreException {
- Long uuid = HexUtil.toLong(value);
- return getLocalId(uuid);
- }
-
- @Override
- public Long getLocalId(Long universalId) throws OseeCoreException {
- return idService.getLocalId(universalId);
- }
-
- @Override
- public Long getUniversalId(Long localId) throws OseeCoreException {
- return idService.getUniversalId(localId);
- }
-
- @Override
- public long getLocalId(Identity<Long> identity) throws OseeCoreException {
- return idService.getLocalId(identity);
- }
-
- @Override
- public void store(List<Long> toPersist) throws OseeCoreException {
- idService.store(toPersist);
+ return HexUtil.toLong(value);
}
@Override
public void invalidateIds() throws OseeDataStoreException {
getSequence().clear();
- idService.clear();
}
@Override
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationRule.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationRule.java
index affc9c72da4..1673adb83c0 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationRule.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationRule.java
@@ -13,7 +13,6 @@ package org.eclipse.osee.orcs;
import org.eclipse.osee.event.EventService;
import org.eclipse.osee.executor.admin.ExecutorAdmin;
import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.logger.Log;
import org.eclipse.osee.orcs.db.mock.OseeDatabase;
@@ -42,7 +41,6 @@ public final class OrcsIntegrationRule extends OsgiRule {
@OsgiService public EventAdmin eventAdmin;
@OsgiService public EventService eventService;
@OsgiService public ExecutorAdmin executorAdmin;
- @OsgiService public IdentityService idService;
@OsgiService public IOseeDatabaseService dbService;
@OsgiService public IOseeModelFactoryService modelFactory;
// @formatter:on
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/OrcsTypes.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/OrcsTypes.java
index 54cf45580d8..ae02a4599d7 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/OrcsTypes.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/OrcsTypes.java
@@ -47,6 +47,4 @@ public interface OrcsTypes {
void invalidateAll();
- Callable<Void> save();
-
}
diff --git a/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip b/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip
index f487f562e14..d313ecafba8 100644
--- a/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip
+++ b/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip
Binary files differ

Back to the top