diff options
author | Roberto E. Escobar | 2014-10-02 21:35:09 +0000 |
---|---|---|
committer | Roberto E. Escobar | 2014-10-02 22:40:12 +0000 |
commit | e523f0603859055d546303d5891a949a1a253168 (patch) | |
tree | 4c226473e111ce2aa0ece2fb2d49881132d65b48 | |
parent | 7e8ac5831af71812810a06ac4e743a504dfff492 (diff) | |
download | org.eclipse.osee-e523f0603859055d546303d5891a949a1a253168.tar.gz org.eclipse.osee-e523f0603859055d546303d5891a949a1a253168.tar.xz org.eclipse.osee-e523f0603859055d546303d5891a949a1a253168.zip |
refactor[ats_ATS46139]: Remove IdUtil/IdentityLocator dead code
Remove unused references to IdentityLocator
Change-Id: Ia9700c596d2d69b1c6de33cbde618409cb4de5e9
9 files changed, 11 insertions, 101 deletions
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/MissingChangeItemFactoryTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/MissingChangeItemFactoryTest.java index 72a84e15654..4a56566a0aa 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/MissingChangeItemFactoryTest.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/MissingChangeItemFactoryTest.java @@ -39,7 +39,6 @@ import org.eclipse.osee.orcs.core.ds.OrcsData; import org.eclipse.osee.orcs.core.ds.RelationData; import org.eclipse.osee.orcs.core.ds.VersionData; import org.eclipse.osee.orcs.data.TransactionReadable; -import org.eclipse.osee.orcs.db.internal.IdentityLocator; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -59,7 +58,6 @@ public class MissingChangeItemFactoryTest { // @formatter:off @Mock private DataLoaderFactory dataLoaderFactory; - @Mock private IdentityLocator identityService; @Mock private DataLoader sourceDataLoader; @Mock private DataLoader destDataLoader; @Mock private Branch sourceBranch; @@ -110,7 +108,7 @@ public class MissingChangeItemFactoryTest { destDataLoader); when(sourceTx.getBranchId()).thenReturn(sourceBranch.getGuid()); when(destTx.getBranchId()).thenReturn(destBranch.getGuid()); - changeItemFactory = new MissingChangeItemFactoryImpl(identityService, dataLoaderFactory); + changeItemFactory = new MissingChangeItemFactoryImpl(dataLoaderFactory); } @Test 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 9b52b607a59..71f69b737c7 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 @@ -10,5 +10,4 @@ <reference bind="setResourceManager" cardinality="1..1" interface="org.eclipse.osee.framework.resource.management.IResourceManager" name="IResourceManager" policy="static"/> <reference bind="setSystemPreferences" cardinality="1..1" interface="org.eclipse.osee.orcs.core.SystemPreferences" name="SystemPreferences" policy="static"/> <reference bind="setDataProxyFactoryProvider" cardinality="1..1" interface="org.eclipse.osee.orcs.db.internal.loader.DataProxyFactoryProvider" name="DataProxyFactoryProvider" policy="static"/> - <reference bind="setEventService" cardinality="1..1" interface="org.eclipse.osee.event.EventService" name="EventService" policy="static"/> </scr:component> 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 fce8021010d..b916742c3e9 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 @@ -10,14 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.orcs.db.internal; -import org.eclipse.osee.event.EventService; import org.eclipse.osee.executor.admin.ExecutorAdmin; import org.eclipse.osee.framework.database.IOseeDatabaseService; -import org.eclipse.osee.framework.jdk.core.type.BaseIdentity; -import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.resource.management.IResourceManager; import org.eclipse.osee.logger.Log; -import org.eclipse.osee.orcs.OrcsSession; import org.eclipse.osee.orcs.core.SystemPreferences; import org.eclipse.osee.orcs.core.ds.DataModule; import org.eclipse.osee.orcs.core.ds.OrcsDataStore; @@ -46,7 +42,6 @@ public class OrcsDataStoreImpl implements OrcsDataStore { private ExecutorAdmin executorAdmin; private IResourceManager resourceManager; private DataProxyFactoryProvider proxyProvider; - private EventService eventService; private OrcsTypesDataStore typesDataStore; private DataModuleFactory dataModuleFactory; @@ -78,14 +73,7 @@ public class OrcsDataStoreImpl implements OrcsDataStore { this.proxyProvider = proxyProvider; } - public void setEventService(EventService eventService) { - this.eventService = eventService; - } - public void start(BundleContext context) throws Exception { - String id = String.format("orcs_datastore_system_%s", GUID.create()); - OrcsSession session = new DatastoreSession(id); - sqlProvider = createSqlProvider(); idManager = new IdentityManagerImpl(dbService); @@ -135,9 +123,4 @@ public class OrcsDataStoreImpl implements OrcsDataStore { return queryModule.getQueryIndexer(); } - private static final class DatastoreSession extends BaseIdentity<String> implements OrcsSession { - public DatastoreSession(String id) { - super(id); - } - } } diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/branch/BranchModule.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/branch/BranchModule.java index a9833f92f3b..ae1c3973a04 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/branch/BranchModule.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/branch/BranchModule.java @@ -73,8 +73,7 @@ public class BranchModule { } public BranchDataStore createBranchDataStore(final DataLoaderFactory dataLoaderFactory) { - final MissingChangeItemFactory missingChangeItemFactory = - new MissingChangeItemFactoryImpl(identityService, dataLoaderFactory); + final MissingChangeItemFactory missingChangeItemFactory = new MissingChangeItemFactoryImpl(dataLoaderFactory); return new BranchDataStore() { @Override public Callable<Void> createBranch(OrcsSession session, CreateBranchData branchData) { @@ -105,10 +104,9 @@ public class BranchModule { @Override public Callable<URI> exportBranch(OrcsSession session, OrcsTypes orcsTypes, List<IOseeBranch> branches, PropertyStore options, String exportName) { - ExportItemFactory factory = - new ExportItemFactory(logger, dbService, identityService, resourceManager, orcsTypes); - return new ExportBranchDatabaseCallable(session, factory, preferences, executorAdmin, identityService, - branches, options, exportName); + ExportItemFactory factory = new ExportItemFactory(logger, dbService, resourceManager, orcsTypes); + return new ExportBranchDatabaseCallable(session, factory, preferences, executorAdmin, branches, options, + exportName); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ExportBranchDatabaseCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ExportBranchDatabaseCallable.java index ccee876c6ba..642b2e81ab8 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ExportBranchDatabaseCallable.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ExportBranchDatabaseCallable.java @@ -31,7 +31,6 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.orcs.ExportOptions; import org.eclipse.osee.orcs.OrcsSession; import org.eclipse.osee.orcs.core.SystemPreferences; -import org.eclipse.osee.orcs.db.internal.IdentityLocator; import org.eclipse.osee.orcs.db.internal.exchange.ExchangeUtil; import org.eclipse.osee.orcs.db.internal.exchange.ExportItemFactory; import org.eclipse.osee.orcs.db.internal.exchange.export.AbstractExportItem; @@ -48,18 +47,16 @@ public class ExportBranchDatabaseCallable extends AbstractDatastoreCallable<URI> private final SystemPreferences preferences; private final ExecutorAdmin executorAdmin; - private final IdentityLocator idLocator; private final List<IOseeBranch> branches; private final PropertyStore options; private String exportName; - public ExportBranchDatabaseCallable(OrcsSession session, ExportItemFactory factory, SystemPreferences preferences, ExecutorAdmin executorAdmin, IdentityLocator idLocator, List<IOseeBranch> branches, PropertyStore options, String exportName) { + public ExportBranchDatabaseCallable(OrcsSession session, ExportItemFactory factory, SystemPreferences preferences, ExecutorAdmin executorAdmin, List<IOseeBranch> branches, PropertyStore options, String exportName) { super(factory.getLogger(), session, factory.getDbService()); this.factory = factory; this.preferences = preferences; this.executorAdmin = executorAdmin; - this.idLocator = idLocator; this.branches = branches; this.options = options; this.exportName = exportName; 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 9696b5b99a9..669897f071a 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 @@ -35,7 +35,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.data.TransactionReadable; -import org.eclipse.osee.orcs.db.internal.IdentityLocator; import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.Multimap; @@ -45,11 +44,9 @@ import com.google.common.collect.Multimap; public class MissingChangeItemFactoryImpl implements MissingChangeItemFactory { private final DataLoaderFactory dataLoaderFactory; - private final IdentityLocator identityService; - public MissingChangeItemFactoryImpl(IdentityLocator identityService, DataLoaderFactory dataModuleFactory) { + public MissingChangeItemFactoryImpl(DataLoaderFactory dataModuleFactory) { super(); - this.identityService = identityService; this.dataLoaderFactory = dataModuleFactory; } diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/ExportItemFactory.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/ExportItemFactory.java index 30f732c8c92..4120a0c32ca 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/ExportItemFactory.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/ExportItemFactory.java @@ -25,7 +25,6 @@ import org.eclipse.osee.framework.resource.management.IResourceManager; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.ExportOptions; import org.eclipse.osee.orcs.OrcsTypes; -import org.eclipse.osee.orcs.db.internal.IdentityLocator; import org.eclipse.osee.orcs.db.internal.exchange.export.AbstractExportItem; import org.eclipse.osee.orcs.db.internal.exchange.export.DbTableExportItem; import org.eclipse.osee.orcs.db.internal.exchange.export.ManifestExportItem; @@ -70,14 +69,12 @@ public class ExportItemFactory { private final Log logger; private final IOseeDatabaseService dbService; - private final IdentityLocator identityService; private final IResourceManager resourceManager; private final OrcsTypes orcsTypes; - public ExportItemFactory(Log logger, IOseeDatabaseService dbService, IdentityLocator identityService, IResourceManager resourceManager, OrcsTypes orcsTypes) { + public ExportItemFactory(Log logger, IOseeDatabaseService dbService, IResourceManager resourceManager, OrcsTypes orcsTypes) { this.logger = logger; this.dbService = dbService; - this.identityService = identityService; this.resourceManager = resourceManager; this.orcsTypes = orcsTypes; } @@ -94,10 +91,6 @@ public class ExportItemFactory { return resourceManager; } - public IdentityLocator getIdentityService() { - return identityService; - } - private OrcsTypes getOrcsTypes() { return orcsTypes; } @@ -130,8 +123,8 @@ public class ExportItemFactory { private void addItem(List<AbstractExportItem> items, int exportJoinId, PropertyStore options, int gammaJoinId, ExportItem exportItem, String query) throws OseeCoreException { StringBuilder modifiedQuery = new StringBuilder(query); Object[] bindData = prepareQuery(exportItem, modifiedQuery, options, exportJoinId, gammaJoinId); - items.add(new DbTableExportItem(getLogger(), getDbService(), getIdentityService(), getResourceManager(), - exportItem, modifiedQuery.toString(), bindData)); + items.add(new DbTableExportItem(getLogger(), getDbService(), getResourceManager(), exportItem, + modifiedQuery.toString(), bindData)); } private void processTxOptions(PropertyStore options) throws OseeCoreException { 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 a35870a0cd0..6d166ba3aa5 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 @@ -24,7 +24,6 @@ import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.PropertyStore; -import org.eclipse.osee.framework.jdk.core.util.Conditions; import org.eclipse.osee.framework.jdk.core.util.HexUtil; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -33,7 +32,6 @@ import org.eclipse.osee.framework.resource.management.IResource; import org.eclipse.osee.framework.resource.management.IResourceLocator; import org.eclipse.osee.framework.resource.management.IResourceManager; import org.eclipse.osee.logger.Log; -import org.eclipse.osee.orcs.db.internal.IdentityLocator; import org.eclipse.osee.orcs.db.internal.exchange.ExportImportXml; import org.eclipse.osee.orcs.db.internal.exchange.handler.ExportItem; @@ -51,13 +49,11 @@ public class DbTableExportItem extends AbstractXmlExportItem { private final Object[] bindData; private final IOseeDatabaseService dbService; - private final IdentityLocator identityService; private final IResourceManager resourceManager; - public DbTableExportItem(Log logger, IOseeDatabaseService dbService, IdentityLocator identityService, IResourceManager resourceManager, ExportItem id, String query, Object[] bindData) { + public DbTableExportItem(Log logger, IOseeDatabaseService dbService, IResourceManager resourceManager, ExportItem id, String query, Object[] bindData) { super(logger, id); this.dbService = dbService; - this.identityService = identityService; this.resourceManager = resourceManager; this.query = query; this.bindData = bindData; diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/util/IdUtil.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/util/IdUtil.java deleted file mode 100644 index a65f38295a6..00000000000 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/util/IdUtil.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.orcs.db.internal.util; - -import org.eclipse.osee.framework.core.enums.BranchType; -import org.eclipse.osee.framework.core.model.TransactionRecord; -import org.eclipse.osee.framework.core.model.cache.BranchCache; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; -import org.eclipse.osee.framework.jdk.core.util.Conditions; -import org.eclipse.osee.orcs.data.CreateBranchData; -import org.eclipse.osee.orcs.db.internal.sql.RelationalConstants; - -/** - * @author John Misinco - */ -public class IdUtil { - - private IdUtil() { - // utility class - } - - public static int getSourceTxId(CreateBranchData branchData, BranchCache brCache) throws OseeCoreException { - Conditions.checkNotNull(branchData, "branchData"); - Conditions.checkNotNull(brCache, "brCache"); - int sourceTransactionId = RelationalConstants.TRANSACTION_SENTINEL; - - if (BranchType.SYSTEM_ROOT != branchData.getBranchType()) { - TransactionRecord sourceTx = brCache.getOrLoad(branchData.getFromTransaction().getGuid()); - sourceTransactionId = sourceTx.getId(); - } - return sourceTransactionId; - } - - public static long getParentBranchId(CreateBranchData newBranchData, BranchCache brCache) throws OseeCoreException { - long parentBranchId = RelationalConstants.BRANCH_SENTINEL; - if (BranchType.SYSTEM_ROOT != newBranchData.getBranchType()) { - TransactionRecord sourceTx = brCache.getOrLoad(newBranchData.getFromTransaction().getGuid()); - parentBranchId = sourceTx.getBranchId(); - } - return parentBranchId; - } - -} |