feature[ats_ATS19845]: Convert IOseeBranch to Identity-Long

Change-Id: I22451bde2e8120ab445bd26ba187fb22b5d54fb1

5 files changed, 56 insertions, 3 deletions

diff --git a/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF
index 6a8e515a7b8..8e4a3714b18 100644
--- a/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF
@@ -43,6 +43,7 @@ Import-Package: com.google.inject,
  org.eclipse.osee.framework.core.model,
  org.eclipse.osee.framework.core.model.cache,
  org.eclipse.osee.framework.core.util,
+ org.eclipse.osee.framework.database,
  org.eclipse.osee.framework.jdk.core.type,
  org.eclipse.osee.framework.jdk.core.util,
  org.eclipse.osee.framework.logging,
diff --git a/plugins/org.eclipse.osee.ats.impl/OSGI-INF/osee.database.service.ref.xml b/plugins/org.eclipse.osee.ats.impl/OSGI-INF/osee.database.service.ref.xml
new file mode 100644
index 00000000000..560deaaa1e7
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.impl/OSGI-INF/osee.database.service.ref.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osee.ats.impl.internal.OseeDatabaseService">
+   <implementation class="org.eclipse.osee.ats.impl.internal.OseeDatabaseService"/>
+   <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/OseeDatabaseService.java b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/OseeDatabaseService.java
new file mode 100644
index 00000000000..7ca802ac5ce
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/OseeDatabaseService.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * 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 3ca56a6a52d..f2bbcd12adb 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,6 +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.orcs.OrcsApi;
 
 /**
@@ -24,7 +25,7 @@ public class AtsDatabaseConversions {
 
    public static List<IAtsDatabaseConversion> getConversions(OrcsApi orcsApi) {
       List<IAtsDatabaseConversion> conversions = new ArrayList<IAtsDatabaseConversion>();
-      conversions.add(new ConvertBaselineGuidToBaselineUuid(orcsApi));
+      conversions.add(new ConvertBaselineGuidToBaselineUuid(OseeDatabaseService.getDbService(), orcsApi));
       return conversions;
    }
 }
diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/ConvertBaselineGuidToBaselineUuid.java b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/ConvertBaselineGuidToBaselineUuid.java
index aa1f4267ab1..30cd749e6c5 100644
--- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/ConvertBaselineGuidToBaselineUuid.java
+++ b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/convert/ConvertBaselineGuidToBaselineUuid.java
@@ -20,6 +20,8 @@ import org.eclipse.osee.framework.core.data.IAttributeType;
 import org.eclipse.osee.framework.core.data.TokenFactory;
 import org.eclipse.osee.framework.core.enums.SystemUser;
 import org.eclipse.osee.framework.core.util.XResultData;
+import org.eclipse.osee.framework.database.IOseeDatabaseService;
+import org.eclipse.osee.framework.jdk.core.util.Conditions;
 import org.eclipse.osee.orcs.OrcsApi;
 import org.eclipse.osee.orcs.data.ArtifactReadable;
 import org.eclipse.osee.orcs.data.BranchReadable;
@@ -37,8 +39,10 @@ public class ConvertBaselineGuidToBaselineUuid implements IAtsDatabaseConversion
    // Leave this attribute definition and conversion for other OSEE sites to convert
    public static final IAttributeType BaselineBranchGuid = TokenFactory.createAttributeType(0x10000000000000A9L,
       "ats.Baseline Branch Guid");
+   private final IOseeDatabaseService dbService;
 
-   public ConvertBaselineGuidToBaselineUuid(OrcsApi orcsApi) {
+   public ConvertBaselineGuidToBaselineUuid(IOseeDatabaseService dbService, OrcsApi orcsApi) {
+      this.dbService = dbService;
       this.orcsApi = orcsApi;
    }
 
@@ -62,7 +66,8 @@ public class ConvertBaselineGuidToBaselineUuid implements IAtsDatabaseConversion
          for (String guid : attributeValues) {
             BranchReadable branch = null;
             try {
-               branch = orcsApi.getQueryFactory(null).branchQuery().andUuids(guid).getResults().getExactlyOne();
+               branch =
+                  orcsApi.getQueryFactory(null).branchQuery().andUuids(getBranchIdLegacy(guid)).getResults().getExactlyOne();
             } catch (Exception ex) {
                // do nothing
             }
@@ -96,6 +101,17 @@ public class ConvertBaselineGuidToBaselineUuid implements IAtsDatabaseConversion
       }
    }
 
+   private final String SELECT_BRANCH_ID_BY_GUID = "select branch_id from osee_branch where branch_guid = ?";
+
+   /**
+    * Temporary method till all code uses branch uuid. Remove after 0.17.0
+    */
+   public long getBranchIdLegacy(String branchGuid) {
+      Long longId = dbService.runPreparedQueryFetchObject(0L, SELECT_BRANCH_ID_BY_GUID, branchGuid);
+      Conditions.checkExpressionFailOnTrue(longId <= 0, "Error getting branch_id for branch: [%s]", branchGuid);
+      return longId;
+   }
+
    @Override
    public String getDescription() {
       StringBuffer data = new StringBuffer();