From c8164a62042005eb1c1c3313bf9c9f6bde2e494e Mon Sep 17 00:00:00 2001
From: jmisinco
Date: Wed, 20 Nov 2013 13:00:16 -0700
Subject: refactor[ats_ZFB9T]: Remove identity service
Change-Id: Icf991819768982768d2004ed6a98a32782f33463
---
.../OSGI-INF/access.control.service.xml | 1 -
.../access/internal/AccessControlService.java | 8 +-
.../access/internal/AccessControlServiceProxy.java | 8 +-
.../operations/OseeTypesImportOperation.java | 7 +-
.../operations/XtextOseeTypesHandler.java | 2 +-
.../core/message/test/mocks/DataAsserts.java | 1 -
.../OseeImportModelRequestTranslatorTest.java | 6 +-
.../OseeImportModelRequestTranslator.java | 5 +-
.../framework/core/model/OseeCachingService.java | 10 +-
.../core/model/OseeImportModelRequest.java | 8 +-
.../core/services/IOseeCachingService.java | 2 -
.../framework/core/services/IdentityService.java | 29 ----
.../init/internal/DatabaseInitActivator.java | 10 --
.../database/init/internal/DbBootstrapTask.java | 3 -
.../OSGI-INF/identity.service.xml | 8 --
.../framework/database/internal/ServiceUtil.java | 9 --
.../internal/core/IdentityServiceImpl.java | 156 ---------------------
.../OSGI-INF/legacy.servlets.xml | 1 -
.../manager/servlet/OseeCacheServlet.java | 27 ++--
.../manager/servlet/OseeModelServlet.java | 4 -
.../internal/ServletRegistrationHandler.java | 8 +-
.../OSGI-INF/osee.client.caching.service.xml | 1 -
.../skynet/core/artifact/ArtifactTypeManager.java | 4 +-
.../core/artifact/search/ArtifactTypeSearch.java | 5 +-
.../core/artifact/search/AttributeValueSearch.java | 5 +-
.../core/artifact/search/InRelationSearch.java | 5 +-
.../core/artifact/search/OrphanArtifactSearch.java | 7 +-
.../core/internal/ClientCachingServiceProxy.java | 17 +--
.../skynet/core/internal/ServiceUtil.java | 5 -
.../skynet/core/relation/RelationManager.java | 4 +-
.../osee/framework/skynet/core/word/WordUtil.java | 5 +-
.../operation/FixTemplateContentArtifacts.java | 2 +-
.../AbstractWordAttributeHealthOperation.java | 2 +-
.../framework/ui/skynet/internal/ServiceUtil.java | 5 -
.../osee/orcs/core/ds/OrcsTypesDataStore.java | 3 -
.../core/internal/types/impl/OrcsTypesImpl.java | 19 ---
.../org.eclipse.osee.orcs.db.mock/data/hsql.zip | Bin 63711 -> 64228 bytes
.../db/internal/loader/DataFactoryImplTest.java | 2 +-
.../internal/loader/DataLoaderFactoryImplTest.java | 11 --
.../ArtifactQuerySqlContextFactoryImplTest.java | 8 --
.../db/internal/transaction/TxSqlBuilderTest.java | 10 +-
.../fix.duplicate.attributes.console.command.xml | 1 -
.../OSGI-INF/orcs.data.store.impl.xml | 1 -
.../schema/SKYNET.VERSIONING.SCHEMA.xml | 4 +-
.../osee/orcs/db/internal/IdentityLocator.java | 7 -
.../osee/orcs/db/internal/IdentityManager.java | 5 +-
.../osee/orcs/db/internal/OrcsDataStoreImpl.java | 8 +-
.../callable/DeleteRelationDatabaseCallable.java | 2 +-
.../internal/callable/OrcsTypeLoaderCallable.java | 9 +-
.../PurgeAttributeTypeDatabaseTxCallable.java | 9 +-
.../PurgeRelationTypeDatabaseTxCallable.java | 2 +-
.../change/MissingChangeItemFactoryImpl.java | 16 +--
.../console/FixDuplicateAttributesCommand.java | 9 +-
.../exchange/export/DbTableExportItem.java | 5 +-
.../osee/orcs/db/internal/loader/LoaderModule.java | 2 +-
.../loader/data/ArtifactObjectFactory.java | 2 +-
.../loader/data/AttributeObjectFactory.java | 2 +-
.../loader/data/OrcsObjectFactoryImpl.java | 18 +--
.../loader/data/RelationObjectFactory.java | 2 +-
.../loader/handlers/AttributeSqlHandler.java | 2 +-
.../loader/handlers/RelationSqlHandler.java | 2 +-
.../search/handlers/ArtifactTypeSqlHandler.java | 3 +-
.../search/handlers/AttributeOtherSqlHandler.java | 2 +-
.../search/handlers/AttributeTokenSqlHandler.java | 6 +-
.../handlers/AttributeTypeExistsSqlHandler.java | 5 +-
.../search/handlers/RelatedToSqlHandler.java | 2 +-
.../handlers/RelationTypeExistsSqlHandler.java | 2 +-
.../producer/IndexBranchesDatabaseCallable.java | 3 +-
.../data/GammaQueueIndexerDataSourceLoader.java | 2 +-
.../osee/orcs/db/internal/sql/SqlHandler.java | 5 -
.../orcs/db/internal/transaction/TxModule.java | 2 +-
.../db/internal/transaction/TxSqlBuilderImpl.java | 13 +-
.../transaction/UnsubscribeTransaction.java | 8 +-
.../osee/orcs/db/internal/types/TypesModule.java | 21 +--
.../orcs/db/internal/util/IdentityManagerImpl.java | 31 +---
.../org/eclipse/osee/orcs/OrcsIntegrationRule.java | 2 -
.../src/org/eclipse/osee/orcs/OrcsTypes.java | 2 -
plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip | Bin 302019 -> 127681 bytes
78 files changed, 92 insertions(+), 558 deletions(-)
delete mode 100644 plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IdentityService.java
delete mode 100644 plugins/org.eclipse.osee.framework.database/OSGI-INF/identity.service.xml
delete mode 100644 plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/IdentityServiceImpl.java
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 @@
-
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 parameters = new HashMap();
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 translator = new OseeImportModelRequestTranslator();
List