refactor: Consolidate AtsVersionService

Change-Id: I34777c5715efcbaea40faebf85990fb2fece9088

2 files changed, 27 insertions, 3 deletions

diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java
index ecbc8f0edeb..8a98ef0e719 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java
@@ -60,6 +60,7 @@ import org.eclipse.osee.ats.api.workflow.state.IAtsWorkStateFactory;
 import org.eclipse.osee.ats.core.config.AtsCache;
 import org.eclipse.osee.ats.core.config.TeamDefinitionService;
 import org.eclipse.osee.ats.core.program.AtsProgramService;
+import org.eclipse.osee.ats.core.version.AtsVersionServiceImpl;
 import org.eclipse.osee.ats.core.workdef.AtsWorkDefinitionAdminImpl;
 import org.eclipse.osee.ats.core.workdef.AtsWorkDefinitionCache;
 import org.eclipse.osee.ats.core.workflow.AtsImplementersService;
@@ -78,6 +79,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.jdbc.JdbcService;
 import org.eclipse.osee.logger.Log;
+import org.osgi.service.event.EventAdmin;
 
 /**
  * @author Donald G. Dunne
@@ -126,6 +128,7 @@ public abstract class AtsCoreServiceImpl implements IAtsServices {
    protected IAtsTeamDefinitionService teamDefinitionService;
    protected IAtsQueryService queryService;
    protected IAtsStoreService storeService;
+   private EventAdmin eventAdmin;
 
    public AtsCoreServiceImpl() {
       searchDataProviders = new ArrayList<>();
@@ -135,6 +138,10 @@ public abstract class AtsCoreServiceImpl implements IAtsServices {
       this.jdbcService = jdbcService;
    }
 
+   public void setEventAdmin(EventAdmin eventAdmin) {
+      this.eventAdmin = eventAdmin;
+   }
+
    public void setAtsWorkDefinitionService(IAtsWorkDefinitionService workDefService) {
       this.workDefService = workDefService;
    }
@@ -172,6 +179,7 @@ public abstract class AtsCoreServiceImpl implements IAtsServices {
       workItemService = new AtsWorkItemServiceImpl(this, teamWorkflowProvidersLazy);
       programService = new AtsProgramService(this);
       teamDefinitionService = new TeamDefinitionService(this);
+      versionService = new AtsVersionServiceImpl(this, eventAdmin);
 
    }
 
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/version/AbstractAtsVersionServiceImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/version/AtsVersionServiceImpl.java
index 8c3c3e75cbc..95681851eea 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/version/AbstractAtsVersionServiceImpl.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/version/AtsVersionServiceImpl.java
@@ -43,12 +43,12 @@ import org.osgi.service.event.EventAdmin;
 /**
  * @author Donald G Dunne
  */
-public abstract class AbstractAtsVersionServiceImpl implements IAtsVersionService {
+public class AtsVersionServiceImpl implements IAtsVersionService {
 
    private final IAtsServices services;
    private final EventAdmin eventAdmin;
 
-   public AbstractAtsVersionServiceImpl(IAtsServices services, EventAdmin eventAdmin) {
+   public AtsVersionServiceImpl(IAtsServices services, EventAdmin eventAdmin) {
       super();
       this.services = services;
       this.eventAdmin = eventAdmin;
@@ -200,7 +200,7 @@ public abstract class AbstractAtsVersionServiceImpl implements IAtsVersionServic
    }
 
    @Override
-   public BranchId getBranchId(IAtsVersion version) {
+   public BranchId getBranch(IAtsVersion version) {
       return services.getAttributeResolver().getSoleAttributeValue(version, AtsAttributeTypes.BaselineBranchUuid,
          BranchId.SENTINEL);
    }
@@ -220,4 +220,20 @@ public abstract class AbstractAtsVersionServiceImpl implements IAtsVersionServic
    public IAtsVersion getVersion(IAtsProgram program, String versionName, IAtsChangeSet changes) {
       return services.getProgramService().getVersion(program, versionName);
    }
+
+   @Override
+   public IAtsVersion createVersion(String title, String guid, long uuid, IAtsChangeSet changes) throws OseeCoreException {
+      return services.getVersionFactory().createVersion(title, guid, uuid, changes, services);
+   }
+
+   @Override
+   public IAtsVersion createVersion(String name, IAtsChangeSet changes) throws OseeCoreException {
+      return services.getVersionFactory().createVersion(name, changes, services);
+   }
+
+   @Override
+   public Collection<IAtsVersion> getVersions(IAtsTeamDefinition teamDef) {
+      return services.getTeamDefinitionService().getVersions(teamDef);
+   }
+
 }