refinement: Inject DbService in osee.ats.impl

Change-Id: I3e5d470d65d0c5f03bc6cb82ac7af85974555c44

4 files changed, 18 insertions, 37 deletions

diff --git a/plugins/org.eclipse.osee.ats.impl/OSGI-INF/ats.server.service.xml b/plugins/org.eclipse.osee.ats.impl/OSGI-INF/ats.server.service.xml
index 36fccf5365e..e7dd742c3b3 100644
--- a/plugins/org.eclipse.osee.ats.impl/OSGI-INF/ats.server.service.xml
+++ b/plugins/org.eclipse.osee.ats.impl/OSGI-INF/ats.server.service.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" name="org.eclipse.osee.ats.impl.internal.AtsServerImpl">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start">
    <implementation class="org.eclipse.osee.ats.impl.internal.AtsServerImpl"/>
    <reference bind="setOrcsApi" cardinality="1..1" interface="org.eclipse.osee.orcs.OrcsApi" name="OrcsApi" policy="static"/>
    <reference bind="setWorkDefService" cardinality="1..1" interface="org.eclipse.osee.ats.api.workdef.IAtsWorkDefinitionService" name="IAtsWorkDefinitionService" policy="static"/>
@@ -12,4 +12,5 @@
       <provide interface="org.eclipse.osee.ats.core.config.IAtsConfigProvider"/>
       <provide interface="org.eclipse.osee.ats.impl.IAtsServer"/>
    </service>
+   <reference bind="setDatabaseService" cardinality="1..1" interface="org.eclipse.osee.framework.database.IOseeDatabaseService" name="IOseeDatabaseService" policy="static"/>
 </scr:component>
diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/AtsServerImpl.java b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/AtsServerImpl.java
index 6202aa9ac1b..c4cdd4d78be 100644
--- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/AtsServerImpl.java
+++ b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/AtsServerImpl.java
@@ -51,6 +51,7 @@ import org.eclipse.osee.ats.impl.internal.workitem.AtsWorkItemServiceImpl;
 import org.eclipse.osee.ats.impl.internal.workitem.ConfigItemFactory;
 import org.eclipse.osee.ats.impl.internal.workitem.WorkItemFactory;
 import org.eclipse.osee.ats.impl.internal.workitem.WorkItemPage;
+import org.eclipse.osee.framework.database.IOseeDatabaseService;
 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.Conditions;
@@ -91,6 +92,7 @@ public class AtsServerImpl implements IAtsServer {
    private IAtsActionFactory actionFactory;
    private ActionableItemManager actionableItemManager;
    private ActionUtility actionUtil;
+   private IOseeDatabaseService dbService;
 
    public static AtsServerImpl get() {
       checkStarted();
@@ -106,6 +108,10 @@ public class AtsServerImpl implements IAtsServer {
       return configItemFactory;
    }
 
+   public void setDatabaseService(IOseeDatabaseService dbService) {
+      this.dbService = dbService;
+   }
+
    public void setOrcsApi(OrcsApi orcsApi) {
       AtsServerImpl.orcsApi = orcsApi;
    }
@@ -144,7 +150,7 @@ public class AtsServerImpl implements IAtsServer {
       atsStoreFactory = new AtsStoreFactoryImpl(this);
 
       utilService = AtsCoreFactory.getUtilService(attributeResolverService);
-      sequenceProvider = new AtsSequenceProvider(OseeDatabaseService.getDbService());
+      sequenceProvider = new AtsSequenceProvider(dbService);
       config = new AtsArtifactConfigCache(this, orcsApi);
       actionableItemManager = new ActionableItemManager(config);
       actionUtil = new ActionUtility(orcsApi);
@@ -264,7 +270,11 @@ public class AtsServerImpl implements IAtsServer {
 
    @Override
    public List<IAtsDatabaseConversion> getDatabaseConversions() {
-      return AtsDatabaseConversions.getConversions(getOrcsApi());
+      return AtsDatabaseConversions.getConversions(getOrcsApi(), getDatabaseService());
+   }
+
+   private IOseeDatabaseService getDatabaseService() {
+      return dbService;
    }
 
    @Override
diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/OseeDatabaseService.java b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/OseeDatabaseService.java
deleted file mode 100644
index 7ca802ac5ce..00000000000
--- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/OseeDatabaseService.java
+++ /dev/null
@@ -1,30 +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.ats.impl.internal;
-
-import org.eclipse.osee.framework.database.IOseeDatabaseService;
-
-/**
- * @author Donald G. Dunne
- */
-public class OseeDatabaseService {
-
-   private static IOseeDatabaseService dbService;
-
-   public static IOseeDatabaseService getDbService() {
-      return dbService;
-   }
-
-   public void setDatabaseService(IOseeDatabaseService dbService) {
-      OseeDatabaseService.dbService = dbService;
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/AtsDatabaseConversions.java b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/AtsDatabaseConversions.java
index db1f6362a38..9c3bb63222c 100644
--- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/AtsDatabaseConversions.java
+++ b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/AtsDatabaseConversions.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.ats.impl.internal.convert;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.osee.ats.api.util.IAtsDatabaseConversion;
-import org.eclipse.osee.ats.impl.internal.OseeDatabaseService;
+import org.eclipse.osee.framework.database.IOseeDatabaseService;
 import org.eclipse.osee.orcs.OrcsApi;
 
 /**
@@ -25,10 +25,10 @@ public class AtsDatabaseConversions {
 
    private static List<IAtsDatabaseConversion> externalConversions = new ArrayList<IAtsDatabaseConversion>();
 
-   public static List<IAtsDatabaseConversion> getConversions(OrcsApi orcsApi) {
+   public static List<IAtsDatabaseConversion> getConversions(OrcsApi orcsApi, IOseeDatabaseService dbService) {
       List<IAtsDatabaseConversion> conversions = new ArrayList<IAtsDatabaseConversion>();
-      conversions.add(new ConvertBaselineGuidToBaselineUuid(OseeDatabaseService.getDbService(), orcsApi));
-      conversions.add(new ConvertFavoriteBranchGuidToUuid(OseeDatabaseService.getDbService(), orcsApi));
+      conversions.add(new ConvertBaselineGuidToBaselineUuid(dbService, orcsApi));
+      conversions.add(new ConvertFavoriteBranchGuidToUuid(dbService, orcsApi));
       conversions.addAll(externalConversions);
       return conversions;
    }