Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2014-10-02 18:35:25 -0400
committerRoberto E. Escobar2014-10-02 18:40:16 -0400
commit6d69d568a5ed86c91762d92a15912870aa3a91a8 (patch)
tree863fb49d4b5705fe74a50f50c4fed85821fcdd6b
parente523f0603859055d546303d5891a949a1a253168 (diff)
downloadorg.eclipse.osee-6d69d568a5ed86c91762d92a15912870aa3a91a8.tar.gz
org.eclipse.osee-6d69d568a5ed86c91762d92a15912870aa3a91a8.tar.xz
org.eclipse.osee-6d69d568a5ed86c91762d92a15912870aa3a91a8.zip
refactor[ats_ATS46139]: Clean-up caching service references
Remove dead code and unused dependencies after cache removal Change-Id: I03f78951512cee8ee0aaad7ae3fe960ec04a145b
-rw-r--r--plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionIntegrationRule.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationService.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java3
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IOseeCachingService.java19
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/TempCachingService.java36
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/OSGI-INF/osee.client.caching.service.xml1
-rw-r--r--plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsIntegrationRule.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseBranchAccessor.java228
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseTransactionRecordAccessor.java185
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/MoveBranchDatabaseCallable.java71
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/StoreBranchDatabaseCallable.java195
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationRule.java2
14 files changed, 20 insertions, 731 deletions
diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionIntegrationRule.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionIntegrationRule.java
index 3e3bc8c057..98e1bf5321 100644
--- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionIntegrationRule.java
+++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionIntegrationRule.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.disposition.rest.integration.util;
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.database.IOseeDatabaseService;
import org.eclipse.osee.logger.Log;
import org.eclipse.osee.orcs.OrcsApi;
@@ -43,7 +42,6 @@ public final class DispositionIntegrationRule extends OsgiRule {
@OsgiService public EventService eventService;
@OsgiService public ExecutorAdmin executorAdmin;
@OsgiService public IOseeDatabaseService dbService;
- @OsgiService public IOseeModelFactoryService modelFactory;
@OsgiService public OrcsApi orcsApi;
// @formatter:on
}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationService.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationService.java
index 8dab3ffc46..9f570c9e58 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationService.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationService.java
@@ -18,7 +18,6 @@ import java.util.HashSet;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
-import org.eclipse.osee.framework.core.model.TransactionRecordFactory;
import org.eclipse.osee.framework.core.model.type.AttributeTypeFactory;
import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
import org.eclipse.osee.framework.core.translation.IDataTranslationService;
@@ -45,11 +44,10 @@ public class DataTranslationService implements IDataTranslationService {
}
public void start() throws OseeCoreException {
- TransactionRecordFactory txFactory = modelFactory.getTransactionFactory();
AttributeTypeFactory attributeTypeFactory = modelFactory.getAttributeTypeFactory();
translators.clear();
- factoryConfigurator.configureService(this, txFactory, attributeTypeFactory);
+ factoryConfigurator.configureService(this, attributeTypeFactory);
}
public void stop() {
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java
index e7268c1046..02010a6996 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java
@@ -30,7 +30,6 @@ import org.eclipse.osee.framework.core.message.internal.translation.OseeImportMo
import org.eclipse.osee.framework.core.message.internal.translation.PurgeBranchRequestTranslator;
import org.eclipse.osee.framework.core.message.internal.translation.RelationTypeCacheUpdateResponseTranslator;
import org.eclipse.osee.framework.core.message.internal.translation.TableDataTranslator;
-import org.eclipse.osee.framework.core.model.TransactionRecordFactory;
import org.eclipse.osee.framework.core.model.type.AttributeTypeFactory;
import org.eclipse.osee.framework.core.translation.IDataTranslationService;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -45,7 +44,7 @@ public class DataTranslationServiceFactory {
//
}
- public void configureService(IDataTranslationService service, TransactionRecordFactory txRecordFactory, AttributeTypeFactory attributeTypeFactory) throws OseeCoreException {
+ public void configureService(IDataTranslationService service, AttributeTypeFactory attributeTypeFactory) throws OseeCoreException {
service.addTranslator(new BranchCreationRequestTranslator(), CoreTranslatorId.BRANCH_CREATION_REQUEST);
service.addTranslator(new BranchCreationResponseTranslator(), CoreTranslatorId.BRANCH_CREATION_RESPONSE);
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 29449b56d9..b892f3ce3c 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
@@ -10,15 +10,21 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.services;
+import java.util.Collection;
+import org.eclipse.osee.framework.core.enums.OseeCacheEnum;
import org.eclipse.osee.framework.core.model.cache.ArtifactTypeCache;
import org.eclipse.osee.framework.core.model.cache.AttributeTypeCache;
+import org.eclipse.osee.framework.core.model.cache.BranchCache;
+import org.eclipse.osee.framework.core.model.cache.IOseeCache;
import org.eclipse.osee.framework.core.model.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.jdk.core.type.OseeCoreException;
/**
* @author Roberto E. Escobar
*/
-public interface IOseeCachingService extends TempCachingService {
+public interface IOseeCachingService {
ArtifactTypeCache getArtifactTypeCache();
@@ -28,4 +34,15 @@ public interface IOseeCachingService extends TempCachingService {
OseeEnumTypeCache getEnumTypeCache();
+ BranchCache getBranchCache();
+
+ TransactionCache getTransactionCache();
+
+ Collection<?> getCaches();
+
+ IOseeCache<?, ?> getCache(OseeCacheEnum cacheId) throws OseeCoreException;
+
+ void reloadAll() throws OseeCoreException;
+
+ void clearAll();
}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/TempCachingService.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/TempCachingService.java
deleted file mode 100644
index 2f36e587f1..0000000000
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/TempCachingService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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.core.enums.OseeCacheEnum;
-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.jdk.core.type.OseeCoreException;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface TempCachingService {
-
- BranchCache getBranchCache();
-
- TransactionCache getTransactionCache();
-
- Collection<?> getCaches();
-
- IOseeCache<?, ?> getCache(OseeCacheEnum cacheId) throws OseeCoreException;
-
- void reloadAll() throws OseeCoreException;
-
- void clearAll();
-}
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 6ed0fc1260..a591baef8d 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
@@ -3,7 +3,6 @@
<implementation class="org.eclipse.osee.framework.skynet.core.internal.ClientCachingServiceProxy"/>
<service>
<provide interface="org.eclipse.osee.framework.core.services.IOseeCachingService"/>
- <provide interface="org.eclipse.osee.framework.core.services.TempCachingService"/>
</service>
<reference bind="setModelFactory" cardinality="1..1" interface="org.eclipse.osee.framework.core.services.IOseeModelFactoryService" name="IOseeModelFactoryService" policy="static"/>
<reference bind="setDatabaseService" cardinality="1..1" interface="org.eclipse.osee.framework.database.IOseeDatabaseService" name="IOseeDatabaseService" policy="static"/>
diff --git a/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsIntegrationRule.java b/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsIntegrationRule.java
index faba050ead..707c2ad00e 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsIntegrationRule.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsIntegrationRule.java
@@ -13,7 +13,6 @@ package org.eclipse.osee.orcs.account.admin.integration;
import org.eclipse.osee.account.admin.AccountAdmin;
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.database.IOseeDatabaseService;
import org.eclipse.osee.logger.Log;
import org.eclipse.osee.orcs.OrcsApi;
@@ -44,7 +43,6 @@ public final class OrcsIntegrationRule extends OsgiRule {
@OsgiService public EventService eventService;
@OsgiService public ExecutorAdmin executorAdmin;
@OsgiService public IOseeDatabaseService dbService;
- @OsgiService public IOseeModelFactoryService modelFactory;
@OsgiService public OrcsApi orcsApi;
@OsgiService public AccountAdmin accountAdmin;
// @formatter:on
diff --git a/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF
index 574b6e4051..1b1049a3f4 100644
--- a/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF
@@ -24,7 +24,6 @@ Import-Package: com.google.common.base;version="[11.0.0,15.0.0)",
org.eclipse.osee.framework.core.model,
org.eclipse.osee.framework.core.model.cache,
org.eclipse.osee.framework.core.model.change,
- org.eclipse.osee.framework.core.services,
org.eclipse.osee.framework.jdk.core.type,
org.eclipse.osee.framework.jdk.core.util,
org.eclipse.osee.framework.jdk.core.util.io.xml,
diff --git a/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF
index 9e8d7eaf8c..c27042ec72 100644
--- a/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Import-Package: com.google.common.base;version="[11.0.0,15.0.0)",
org.eclipse.core.runtime,
org.eclipse.osee.console.admin,
org.eclipse.osee.database.schema,
- org.eclipse.osee.event,
org.eclipse.osee.executor.admin,
org.eclipse.osee.framework.core.data,
org.eclipse.osee.framework.core.enums,
@@ -21,7 +20,6 @@ Import-Package: com.google.common.base;version="[11.0.0,15.0.0)",
org.eclipse.osee.framework.core.model.cache,
org.eclipse.osee.framework.core.model.change,
org.eclipse.osee.framework.core.operation,
- org.eclipse.osee.framework.core.services,
org.eclipse.osee.framework.database,
org.eclipse.osee.framework.database.core,
org.eclipse.osee.framework.database.operation,
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseBranchAccessor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseBranchAccessor.java
deleted file mode 100644
index 2f89efb95d..0000000000
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseBranchAccessor.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.orcs.db.internal.accessor;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.osee.event.EventService;
-import org.eclipse.osee.executor.admin.ExecutorAdmin;
-import org.eclipse.osee.framework.core.enums.BranchArchivedState;
-import org.eclipse.osee.framework.core.enums.BranchState;
-import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.core.enums.StorageState;
-import org.eclipse.osee.framework.core.exception.BranchDoesNotExist;
-import org.eclipse.osee.framework.core.exception.OseeExceptions;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.core.model.BranchFactory;
-import org.eclipse.osee.framework.core.model.MergeBranch;
-import org.eclipse.osee.framework.core.model.TransactionRecord;
-import org.eclipse.osee.framework.core.model.cache.BranchCache;
-import org.eclipse.osee.framework.core.model.cache.IOseeCache;
-import org.eclipse.osee.framework.core.model.cache.IOseeDataAccessor;
-import org.eclipse.osee.framework.core.model.cache.TransactionCache;
-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.OseeStateException;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
-import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.orcs.OrcsConstants;
-import org.eclipse.osee.orcs.OrcsSession;
-import org.eclipse.osee.orcs.db.internal.callable.StoreBranchDatabaseCallable;
-
-/**
- * @author Roberto E. Escobar
- */
-public class DatabaseBranchAccessor implements IOseeDataAccessor<Long, Branch> {
- private static final int NULL_PARENT_BRANCH_ID = -1;
-
- private static final String SELECT_BRANCHES = "SELECT * FROM osee_branch";
- private static final String SELECT_MERGE_BRANCHES = "SELECT * FROM osee_merge";
-
- private final Log logger;
- private final OrcsSession session;
- private final IOseeDatabaseService dbService;
- private final ExecutorAdmin executorAdmin;
- private final EventService eventService;
-
- private final TransactionCache txCache;
- private final BranchFactory branchFactory;
-
- public DatabaseBranchAccessor(Log logger, OrcsSession session, ExecutorAdmin executorAdmin, EventService eventService, IOseeDatabaseService dbService, TransactionCache txCache, BranchFactory branchFactory) {
- this.logger = logger;
- this.session = session;
- this.executorAdmin = executorAdmin;
- this.eventService = eventService;
- this.dbService = dbService;
- this.txCache = txCache;
- this.branchFactory = branchFactory;
- }
-
- public Log getLogger() {
- return logger;
- }
-
- private IOseeDatabaseService getDatabaseService() {
- return dbService;
- }
-
- private ExecutorAdmin getExecutorAdmin() {
- return executorAdmin;
- }
-
- private EventService getEventService() {
- return eventService;
- }
-
- @Override
- public void load(IOseeCache<Long, Branch> cache) throws OseeCoreException {
- long startTime = System.currentTimeMillis();
- Map<Branch, Long> childToParent = new HashMap<Branch, Long>();
- Map<Branch, Integer> branchToBaseTx = new HashMap<Branch, Integer>();
- Map<Branch, Integer> branchToSourceTx = new HashMap<Branch, Integer>();
- Map<Branch, Integer> associatedArtifact = new HashMap<Branch, Integer>();
-
- BranchCache brCache = (BranchCache) cache;
- loadBranches(brCache, childToParent, branchToBaseTx, branchToSourceTx, associatedArtifact);
- loadBranchHierarchy(brCache, childToParent);
- loadMergeBranches(brCache);
- loadAssociatedArtifacts(brCache, associatedArtifact);
- loadBranchRelatedTransactions(brCache, branchToBaseTx, branchToSourceTx);
-
- for (Branch branch : cache.getAll()) {
- branch.clearDirty();
- }
- getLogger().info("Branch Cache loaded [%s]", Lib.getElapseString(startTime));
- }
-
- private void loadBranches(BranchCache cache, Map<Branch, Long> childToParent, Map<Branch, Integer> branchToBaseTx, Map<Branch, Integer> branchToSourceTx, Map<Branch, Integer> associatedArtifact) throws OseeCoreException {
- IOseeStatement chStmt = getDatabaseService().getStatement();
- try {
- chStmt.runPreparedQuery(2000, SELECT_BRANCHES);
- while (chStmt.next()) {
- try {
- String branchName = chStmt.getString("branch_name");
- BranchState branchState = BranchState.getBranchState(chStmt.getInt("branch_state"));
- BranchType branchType = BranchType.valueOf(chStmt.getInt("branch_type"));
- boolean isArchived = BranchArchivedState.valueOf(chStmt.getInt("archived")).isArchived();
- long branchUuid = chStmt.getLong("branch_id");
- int inheritAccessControl = chStmt.getInt("inherit_access_control");
- Branch branch =
- branchFactory.createOrUpdate(cache, branchUuid, branchName, branchType, branchState, isArchived,
- StorageState.LOADED, inheritAccessControl == 1);
-
- Long parentBranchId = chStmt.getLong("parent_branch_id");
- if (parentBranchId != NULL_PARENT_BRANCH_ID) {
- childToParent.put(branch, parentBranchId);
- }
- branchToSourceTx.put(branch, chStmt.getInt("parent_transaction_id"));
- branchToBaseTx.put(branch, chStmt.getInt("baseline_transaction_id"));
- associatedArtifact.put(branch, chStmt.getInt("associated_art_id"));
- } catch (OseeCoreException ex) {
- getLogger().error(ex, "Error loading branches");
- }
- }
- } finally {
- chStmt.close();
- }
- }
-
- private void loadAssociatedArtifacts(BranchCache cache, Map<Branch, Integer> associatedArtifact) throws OseeCoreException {
- for (Entry<Branch, Integer> entry : associatedArtifact.entrySet()) {
- Branch branch = entry.getKey();
- branch.setAssociatedArtifactId(entry.getValue());
- }
- }
-
- private void loadBranchRelatedTransactions(BranchCache cache, Map<Branch, Integer> branchToBaseTx, Map<Branch, Integer> branchToSourceTx) throws OseeCoreException {
- Set<Integer> transactionIds = new HashSet<Integer>();
- transactionIds.addAll(branchToSourceTx.values());
- transactionIds.addAll(branchToBaseTx.values());
- txCache.loadTransactions(transactionIds);
-
- for (Entry<Branch, Integer> entry : branchToBaseTx.entrySet()) {
- Branch branch = entry.getKey();
- if (branch.getBaseTransaction() == null) {
- TransactionRecord baseTx = txCache.getById(entry.getValue());
- branch.setBaseTransaction(baseTx);
- }
- }
-
- for (Entry<Branch, Integer> entry : branchToSourceTx.entrySet()) {
- Branch branch = entry.getKey();
- if (branch.getSourceTransaction() == null) {
- TransactionRecord srcTx = txCache.getById(entry.getValue());
- branch.setSourceTransaction(srcTx);
- }
- }
- }
-
- private void loadBranchHierarchy(BranchCache branchCache, Map<Branch, Long> childToParent) throws OseeCoreException {
- for (Entry<Branch, Long> entry : childToParent.entrySet()) {
- Branch childBranch = entry.getKey();
- Branch parentBranch = branchCache.getByUuid(entry.getValue());
- if (parentBranch == null) {
- throw new BranchDoesNotExist("Parent Branch uuid:[%s] does not exist for child branch [%s]",
- entry.getValue(), entry.getKey());
- }
- childBranch.setParentBranch(parentBranch);
- }
- }
-
- private void loadMergeBranches(BranchCache branchCache) throws OseeCoreException {
- IOseeStatement chStmt = getDatabaseService().getStatement();
- try {
- chStmt.runPreparedQuery(1000, SELECT_MERGE_BRANCHES);
- while (chStmt.next()) {
- Branch sourceBranch = branchCache.getByUuid(chStmt.getLong("source_branch_id"));
- Branch destBranch = branchCache.getByUuid(chStmt.getLong("dest_branch_id"));
-
- MergeBranch mergeBranch = (MergeBranch) branchCache.getByUuid(chStmt.getLong("merge_branch_id"));
- mergeBranch.setSourceBranch(sourceBranch);
- mergeBranch.setDestinationBranch(destBranch);
- }
- } finally {
- chStmt.close();
- }
-
- }
-
- @Override
- public void store(Collection<Branch> branches) throws OseeCoreException {
- Callable<IStatus> task =
- new StoreBranchDatabaseCallable(getLogger(), session, getDatabaseService(), getExecutorAdmin(),
- getEventService(), branches);
- try {
- IStatus status = task.call();
- if (status.isOK()) {
- for (Branch branch : branches) {
- branch.clearDirty();
- }
- Map<String, Object> eventData = new HashMap<String, Object>();
- eventData.put(OrcsConstants.ORCS_BRANCH_EVENT_DATA, Collections.unmodifiableCollection(branches));
-
- getEventService().sendEvent(OrcsConstants.ORCS_BRANCH_MODIFIED_EVENT, eventData);
- } else {
- throw new OseeStateException("Error storing branches");
- }
- } catch (Exception ex) {
- OseeExceptions.wrapAndThrow(ex);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseTransactionRecordAccessor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseTransactionRecordAccessor.java
deleted file mode 100644
index 96c8f45d65..0000000000
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseTransactionRecordAccessor.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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.accessor;
-
-import java.util.Collection;
-import java.util.Date;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
-import org.eclipse.osee.framework.core.enums.TransactionVersion;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.core.model.TransactionRecord;
-import org.eclipse.osee.framework.core.model.TransactionRecordFactory;
-import org.eclipse.osee.framework.core.model.cache.BranchCache;
-import org.eclipse.osee.framework.core.model.cache.ITransactionDataAccessor;
-import org.eclipse.osee.framework.core.model.cache.TransactionCache;
-import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.database.core.IOseeStatement;
-import org.eclipse.osee.framework.database.core.IdJoinQuery;
-import org.eclipse.osee.framework.database.core.JoinUtility;
-import org.eclipse.osee.framework.jdk.core.type.MutableInteger;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
-import org.eclipse.osee.orcs.db.internal.sql.OseeSql;
-
-/**
- * @author Roberto E. Escobar
- */
-public class DatabaseTransactionRecordAccessor implements ITransactionDataAccessor {
-
- private static final String SELECT_BASE_TRANSACTION =
- "select * from osee_tx_details where branch_id = ? and tx_type = ?";
-
- private static final String SELECT_BY_TRANSACTION = "select * from osee_tx_details WHERE transaction_id = ?";
-
- private static final String SELECT_HEAD_TRANSACTION =
- "select * from osee_tx_details where transaction_id = (select max(transaction_id) from osee_tx_details where branch_id = ?) and branch_id = ?";
-
- private static final String SELECT_TRANSACTIONS_BY_QUERY_ID =
- "select * from osee_join_id oji, osee_tx_details txd where oji.query_id = ? and txd.transaction_id = oji.id";
-
- private static final String SELECT_NON_EXISTING_TRANSACTIONS_BY_QUERY_ID =
- "select oji.id from osee_join_id oji where oji.query_id = ? and not exists (select 1 from osee_tx_details txd where txd.transaction_id = oji.id)";
-
- private static final String GET_PRIOR_TRANSACTION =
- "select max(transaction_id) FROM osee_tx_details where branch_id = ? and transaction_id < ?";
-
- private final IOseeDatabaseService oseeDatabaseService;
- private final BranchCache branchCache;
- private final TransactionRecordFactory factory;
-
- public DatabaseTransactionRecordAccessor(IOseeDatabaseService oseeDatabaseService, BranchCache branchCache, TransactionRecordFactory factory) {
- this.oseeDatabaseService = oseeDatabaseService;
- this.branchCache = branchCache;
- this.factory = factory;
- }
-
- private synchronized void ensureDependantCachePopulated() throws OseeCoreException {
- branchCache.ensurePopulated();
- }
-
- @Override
- public void loadTransactionRecord(TransactionCache cache, Collection<Integer> transactionIds) throws OseeCoreException {
- if (transactionIds.isEmpty()) {
- return;
- }
- ensureDependantCachePopulated();
- if (transactionIds.size() > 1) {
- IdJoinQuery joinQuery = JoinUtility.createIdJoinQuery();
- try {
- for (Integer txNumber : transactionIds) {
- joinQuery.add(txNumber);
- }
- joinQuery.store();
-
- loadTransactions(cache, transactionIds.size(), SELECT_TRANSACTIONS_BY_QUERY_ID, joinQuery.getQueryId());
-
- } finally {
- joinQuery.delete();
- }
- } else {
- loadTransaction(cache, SELECT_BY_TRANSACTION, transactionIds.iterator().next());
- }
- }
-
- @Override
- public TransactionRecord loadTransactionRecord(TransactionCache cache, IOseeBranch branch, TransactionVersion transactionType) throws OseeCoreException {
- ensureDependantCachePopulated();
- TransactionRecord toReturn = null;
- switch (transactionType) {
- case BASE:
- toReturn =
- loadTransaction(cache, SELECT_BASE_TRANSACTION, branch.getUuid(), TransactionDetailsType.Baselined);
- break;
- case HEAD:
- toReturn = loadTransaction(cache, SELECT_HEAD_TRANSACTION, branch.getUuid(), branch.getUuid());
- break;
- default:
- throw new OseeStateException("Transaction Type [%s] is not supported", transactionType);
- }
- return toReturn;
- }
-
- private void loadTransactions(TransactionCache cache, int expectedCount, String query, int queryId) throws OseeCoreException {
- MutableInteger numberLoaded = new MutableInteger(-1);
- loadFromTransaction(cache, expectedCount, numberLoaded, query, queryId);
-
- if (numberLoaded.getValue() != expectedCount) {
- IOseeStatement chStmt = oseeDatabaseService.getStatement();
- try {
- chStmt.runPreparedQuery(expectedCount, SELECT_NON_EXISTING_TRANSACTIONS_BY_QUERY_ID, queryId);
- while (chStmt.next()) {
- int transactionNumber = chStmt.getInt("id");
- factory.getOrCreate(cache, transactionNumber, null);
- }
- } finally {
- chStmt.close();
- }
- }
- }
-
- private TransactionRecord loadTransaction(TransactionCache cache, String query, Object... parameters) throws OseeCoreException {
- return loadFromTransaction(cache, 1, new MutableInteger(0), query, parameters);
- }
-
- private TransactionRecord loadFromTransaction(TransactionCache cache, int expectedCount, MutableInteger numberLoaded, String query, Object... parameters) throws OseeCoreException {
- IOseeStatement chStmt = oseeDatabaseService.getStatement();
- TransactionRecord record = null;
- int count = 0;
- try {
- chStmt.runPreparedQuery(expectedCount, query, parameters);
- while (chStmt.next()) {
- count++;
- long branchUuid = chStmt.getLong("branch_id");
- int transactionNumber = chStmt.getInt("transaction_id");
- String comment = chStmt.getString("osee_comment");
- Date timestamp = chStmt.getTimestamp("time");
- int authorArtId = chStmt.getInt("author");
- int commitArtId = chStmt.getInt("commit_art_id");
- TransactionDetailsType txType = TransactionDetailsType.toEnum(chStmt.getInt("tx_type"));
-
- record =
- prepareTransactionRecord(cache, transactionNumber, branchUuid, comment, timestamp, authorArtId,
- commitArtId, txType);
- }
- numberLoaded.setValue(count);
- } finally {
- chStmt.close();
- }
- return record;
- }
-
- private TransactionRecord prepareTransactionRecord(TransactionCache cache, int transactionNumber, long branchUuid, String comment, Date timestamp, int authorArtId, int commitArtId, TransactionDetailsType txType) throws OseeCoreException {
- TransactionRecord record =
- factory.createOrUpdate(cache, transactionNumber, branchUuid, comment, timestamp, authorArtId, commitArtId,
- txType, null);
- record.clearDirty();
- return record;
- }
-
- @Override
- public void load(TransactionCache transactionCache) throws OseeCoreException {
- // Not implemented
- }
-
- @Override
- public TransactionRecord getOrLoadPriorTransaction(TransactionCache cache, int transactionNumber, long branchUuid) throws OseeCoreException {
- int priorTransactionId =
- oseeDatabaseService.runPreparedQueryFetchObject(-1, GET_PRIOR_TRANSACTION, branchUuid, transactionNumber);
- return cache.getOrLoad(priorTransactionId);
- }
-
- @Override
- public TransactionRecord getHeadTransaction(TransactionCache cache, Branch branch) throws OseeCoreException {
- return cache.getOrLoad(oseeDatabaseService.runPreparedQueryFetchObject(-1,
- OseeSql.TX_GET_MAX_AS_LARGEST_TX.getSql(), branch.getUuid()));
- }
-}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/MoveBranchDatabaseCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/MoveBranchDatabaseCallable.java
deleted file mode 100644
index 55f44f1cf1..0000000000
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/MoveBranchDatabaseCallable.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.orcs.db.internal.callable;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osee.event.EventService;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.database.core.OseeConnection;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.orcs.OrcsConstants;
-import org.eclipse.osee.orcs.OrcsSession;
-
-/**
- * @author Ryan D. Brooks
- */
-public class MoveBranchDatabaseCallable extends AbstractDatastoreTxCallable<IStatus> {
-
- private static final String INSERT_ADDRESSING =
- "insert into %s (transaction_id, gamma_id, tx_current, mod_type, branch_id) select transaction_id, gamma_id, tx_current, mod_type, branch_id from %s where branch_id = ?";
-
- public static final String DELETE_ADDRESSING = "delete from %s where branch_id = ?";
- private final boolean archive;
- private final Branch branch;
-
- private final EventService eventService;
-
- public MoveBranchDatabaseCallable(Log logger, OrcsSession session, IOseeDatabaseService databaseService, EventService eventService, boolean archive, Branch branch) {
- super(logger, session, databaseService, "Branch Move");
- this.eventService = eventService;
- this.archive = archive;
- this.branch = branch;
- }
-
- private EventService getEventService() {
- return eventService;
- }
-
- @Override
- protected IStatus handleTxWork(OseeConnection connection) throws OseeCoreException {
- String sourceTableName = archive ? "osee_txs" : "osee_txs_archived";
- String destinationTableName = archive ? "osee_txs_archived" : "osee_txs";
- checkForCancelled();
-
- String sql = String.format(INSERT_ADDRESSING, destinationTableName, sourceTableName);
- getDatabaseService().runPreparedUpdate(connection, sql, branch.getUuid());
- checkForCancelled();
-
- sql = String.format(DELETE_ADDRESSING, sourceTableName);
- getDatabaseService().runPreparedUpdate(connection, sql, branch.getUuid());
- checkForCancelled();
-
- Map<String, Object> eventData = new HashMap<String, Object>();
- eventData.put(OrcsConstants.ORCS_BRANCH_EVENT_DATA, Collections.singleton(branch));
- getEventService().postEvent(OrcsConstants.ORCS_BRANCH_MOVE_EVENT, eventData);
- return Status.OK_STATUS;
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/StoreBranchDatabaseCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/StoreBranchDatabaseCallable.java
deleted file mode 100644
index 0cbc019e96..0000000000
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/StoreBranchDatabaseCallable.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.orcs.db.internal.callable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.Callable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osee.event.EventService;
-import org.eclipse.osee.executor.admin.ExecutorAdmin;
-import org.eclipse.osee.framework.core.exception.OseeExceptions;
-import org.eclipse.osee.framework.core.model.AbstractOseeType;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.core.model.BranchField;
-import org.eclipse.osee.framework.core.model.TransactionRecord;
-import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.database.core.OseeConnection;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.orcs.OrcsSession;
-
-/**
- * @author Ryan D. Brooks
- */
-public class StoreBranchDatabaseCallable extends AbstractDatastoreTxCallable<IStatus> {
- protected static final int NULL_PARENT_BRANCH_ID = -1;
-
- private static final String INSERT_BRANCH_WITH_GUID =
- "INSERT INTO osee_branch (branch_id, branch_guid, branch_name, parent_branch_id, parent_transaction_id, archived, associated_art_id, branch_type, branch_state, baseline_transaction_id, inherit_access_control) VALUES (?,?,?,?,?,?,?,?,?,?,?)";
-
- private static final String INSERT_BRANCH =
- "INSERT INTO osee_branch (branch_id, branch_name, parent_branch_id, parent_transaction_id, archived, associated_art_id, branch_type, branch_state, baseline_transaction_id, inherit_access_control) VALUES (?,?,?,?,?,?,?,?,?,?)";
-
- private static final String UPDATE_BRANCH =
- "UPDATE osee_branch SET branch_name = ?, parent_branch_id = ?, parent_transaction_id = ?, archived = ?, associated_art_id = ?, branch_type = ?, branch_state = ?, baseline_transaction_id = ?, inherit_access_control = ? WHERE branch_id = ?";
-
- private static final String DELETE_BRANCH = "DELETE FROM osee_branch WHERE branch_id = ?";
-
- private final Collection<Branch> branches;
- private final ExecutorAdmin executorAdmin;
- private final EventService eventService;
-
- public StoreBranchDatabaseCallable(Log logger, OrcsSession session, IOseeDatabaseService dbService, ExecutorAdmin executorAdmin, EventService eventService, Collection<Branch> branches) {
- super(logger, session, dbService, "Branch Archive Operation");
- this.executorAdmin = executorAdmin;
- this.eventService = eventService;
- this.branches = branches;
- }
-
- private EventService getEventService() {
- return eventService;
- }
-
- private ExecutorAdmin getExecutorAdmin() {
- return executorAdmin;
- }
-
- @Override
- public IStatus handleTxWork(OseeConnection connection) throws OseeCoreException {
- List<Object[]> insertData = new ArrayList<Object[]>();
- List<Object[]> updateData = new ArrayList<Object[]>();
- List<Object[]> deleteData = new ArrayList<Object[]>();
-
- boolean insertBranchGuid = false;
-
- for (Branch branch : branches) {
- if (isDataDirty(branch)) {
- switch (branch.getStorageState()) {
- case CREATED:
- insertBranchGuid = isBranchGuidNeeded(connection);
- insertData.add(toInsertValues(branch, insertBranchGuid));
- break;
- case MODIFIED:
- updateData.add(toUpdateValues(branch));
- break;
- case PURGED:
- deleteData.add(toDeleteValues(branch));
- break;
- default:
- break;
- }
- }
- if (branch.isFieldDirty(BranchField.BRANCH_ARCHIVED_STATE_FIELD_KEY)) {
- Callable<?> task =
- new MoveBranchDatabaseCallable(getLogger(), getSession(), getDatabaseService(), getEventService(),
- branch.getArchiveState().isArchived(), branch);
- try {
- getExecutorAdmin().schedule(task);
- } catch (Exception ex) {
- OseeExceptions.wrapAndThrow(ex);
- }
- }
- }
- String insertBranch = insertBranchGuid ? INSERT_BRANCH_WITH_GUID : INSERT_BRANCH;
- getDatabaseService().runBatchUpdate(connection, insertBranch, insertData);
- getDatabaseService().runBatchUpdate(connection, UPDATE_BRANCH, updateData);
- getDatabaseService().runBatchUpdate(connection, DELETE_BRANCH, deleteData);
-
- return Status.OK_STATUS;
- }
-
- private boolean isBranchGuidNeeded(OseeConnection connection) {
- return getDatabaseService().runPreparedQueryFetchObject(connection, false,
- "select osee_value from osee_info where osee_key = ?", "osee.insert.branch.guid.on.create");
- }
-
- private Object[] toInsertValues(Branch branch, boolean insertBranchGuid) throws OseeCoreException {
- Branch parentBranch = branch.getParentBranch();
- TransactionRecord baseTxRecord = branch.getBaseTransaction();
- long parentBranchId = parentBranch != null ? parentBranch.getUuid() : NULL_PARENT_BRANCH_ID;
- int baselineTransaction = baseTxRecord != null ? baseTxRecord.getId() : NULL_PARENT_BRANCH_ID;
- int inheritAccessControl = branch.isInheritAccessControl() ? 1 : 0;
-
- if (insertBranchGuid) {
- return new Object[] {
- branch.getUuid(),
- GUID.create(),
- branch.getName(),
- parentBranchId,
- branch.getSourceTransaction().getId(),
- branch.getArchiveState().getValue(),
- branch.getAssociatedArtifactId(),
- branch.getBranchType().getValue(),
- branch.getBranchState().getValue(),
- baselineTransaction,
- inheritAccessControl};
- } else {
- return new Object[] {
- branch.getUuid(),
- branch.getName(),
- parentBranchId,
- branch.getSourceTransaction().getId(),
- branch.getArchiveState().getValue(),
- branch.getAssociatedArtifactId(),
- branch.getBranchType().getValue(),
- branch.getBranchState().getValue(),
- baselineTransaction,
- inheritAccessControl};
- }
- }
-
- private Object[] toUpdateValues(Branch branch) throws OseeCoreException {
- Branch parentBranch = branch.getParentBranch();
- TransactionRecord baseTxRecord = branch.getBaseTransaction();
- long parentBranchId = parentBranch != null ? parentBranch.getUuid() : NULL_PARENT_BRANCH_ID;
- int baselineTransaction = baseTxRecord != null ? baseTxRecord.getId() : NULL_PARENT_BRANCH_ID;
- int inheritAccessControl = branch.isInheritAccessControl() ? 1 : 0;
-
- getLogger().debug(
- "Branch Name: [%s], Parent Branch Uuid: [%s], src trans: [%s], arch state: [%s], assoc art: [%s], branch type: [%s], branch state: [%s], baseline trans: [%s], branch uuid: [%s]",
- branch.getName(), parentBranchId, branch.getSourceTransaction().getId(), branch.getArchiveState().getValue(),
- branch.getAssociatedArtifactId(), branch.getBranchType().getValue(), branch.getBranchState().getValue(),
- baselineTransaction, branch.getUuid());
-
- return new Object[] {
- branch.getName(),
- parentBranchId,
- branch.getSourceTransaction().getId(),
- branch.getArchiveState().getValue(),
- branch.getAssociatedArtifactId(),
- branch.getBranchType().getValue(),
- branch.getBranchState().getValue(),
- baselineTransaction,
- inheritAccessControl,
- branch.getUuid()};
- }
-
- private Object[] toDeleteValues(Branch branch) {
- return new Object[] {branch.getUuid()};
- }
-
- private boolean isDataDirty(Branch type) throws OseeCoreException {
- return type.areFieldsDirty(//
- AbstractOseeType.NAME_FIELD_KEY, //
- AbstractOseeType.UNIQUE_ID_FIELD_KEY, //
- BranchField.BRANCH_ARCHIVED_STATE_FIELD_KEY, //
- BranchField.BRANCH_STATE_FIELD_KEY, //
- BranchField.BRANCH_TYPE_FIELD_KEY, //
- BranchField.BRANCH_ASSOCIATED_ARTIFACT_ID_FIELD_KEY, //
- BranchField.BRANCH_BASE_TRANSACTION, //
- BranchField.BRANCH_INHERIT_ACCESS_CONTROL);
- }
-
-}
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 1673adb83c..1130a91914 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
@@ -12,7 +12,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.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 EventService eventService;
@OsgiService public ExecutorAdmin executorAdmin;
@OsgiService public IOseeDatabaseService dbService;
- @OsgiService public IOseeModelFactoryService modelFactory;
// @formatter:on
}

Back to the top