refactor: Utilize utility method OseeExceptions.wrapAndThrow instead of in-place code

4 files changed, 9 insertions, 10 deletions

diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/app/DataStoreBackupApplication.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/app/DataStoreBackupApplication.java
index d1c62bb38cd..ad60a2f6bd2 100644
--- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/app/DataStoreBackupApplication.java
+++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/app/DataStoreBackupApplication.java
@@ -21,7 +21,7 @@ import java.util.logging.Level;
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
 import org.eclipse.osee.framework.branch.management.ExportOptions;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.database.core.ConnectionHandler;
 import org.eclipse.osee.framework.database.core.IOseeStatement;
 import org.eclipse.osee.framework.jdk.core.util.Lib;
@@ -38,7 +38,7 @@ import org.eclipse.osee.framework.server.admin.internal.Activator;
 public class DataStoreBackupApplication implements IApplication {
    private static final String ALL_BRANCHES_QUERY = "select branch_id from osee_branch";
 
-   private List<Integer> getAllBranches() throws OseeDataStoreException {
+   private List<Integer> getAllBranches() throws OseeCoreException {
       List<Integer> toReturn = new ArrayList<Integer>();
       IOseeStatement chStmt = ConnectionHandler.getStatement();
       try {
diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/CompressedContentFix.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/CompressedContentFix.java
index fb52bd263e5..5b8520e62a2 100644
--- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/CompressedContentFix.java
+++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/CompressedContentFix.java
@@ -19,7 +19,6 @@ import java.net.URLEncoder;
 import java.util.Map;
 import java.util.logging.Level;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
 import org.eclipse.osee.framework.core.exception.OseeExceptions;
 import org.eclipse.osee.framework.database.core.ConnectionHandler;
 import org.eclipse.osee.framework.database.core.IOseeStatement;
@@ -95,7 +94,7 @@ public class CompressedContentFix {
          try {
             initializeData();
             doWork(time);
-         } catch (OseeDataStoreException ex) {
+         } catch (OseeCoreException ex) {
             OseeLog.log(Activator.class, Level.SEVERE, ex);
          } finally {
             clear();
@@ -109,7 +108,7 @@ public class CompressedContentFix {
          isRunning = false;
       }
 
-      private void initializeData() throws OseeDataStoreException {
+      private void initializeData() throws OseeCoreException {
          nativeExtension = Util.getArtIdMap("Extension");
          nameMap = Util.getArtIdMap("Name");
       }
diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/Util.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/Util.java
index 3055ea9c02a..e42c3b7f3fc 100644
--- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/Util.java
+++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/Util.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.framework.server.admin.conversion;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.database.core.ConnectionHandler;
 import org.eclipse.osee.framework.database.core.IOseeStatement;
 
@@ -27,7 +27,7 @@ public class Util {
    private static final String sqlExtensionTypes =
       "SELECT attr1.art_id, attr1.value FROM osee_attribute attr1 WHERE attr1.ATTR_TYPE_ID = ?";
 
-   public static Map<Long, String> getArtIdMap(String attrTypeName) throws OseeDataStoreException {
+   public static Map<Long, String> getArtIdMap(String attrTypeName) throws OseeCoreException {
       Map<Long, String> toReturn = new HashMap<Long, String>(250);
 
       IOseeStatement chStmt = ConnectionHandler.getStatement();
diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/search/TaggerAllWorker.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/search/TaggerAllWorker.java
index d16c0bf1947..9e9219e5b69 100644
--- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/search/TaggerAllWorker.java
+++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/search/TaggerAllWorker.java
@@ -15,7 +15,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.database.core.ConnectionHandler;
 import org.eclipse.osee.framework.database.core.IOseeStatement;
 import org.eclipse.osee.framework.database.core.JoinUtility;
@@ -40,7 +40,7 @@ class TaggerAllWorker extends BaseServerCommand {
       this.processor = null;
    }
 
-   private void fetchAndProcessGammas(OseeConnection connection, int branchId, TagProcessListener processor) throws OseeDataStoreException {
+   private void fetchAndProcessGammas(OseeConnection connection, int branchId, TagProcessListener processor) throws OseeCoreException {
       IOseeStatement chStmt = ConnectionHandler.getStatement(connection);
       try {
          chStmt.runPreparedQuery(AttributeDataStore.getAllTaggableGammasByBranchQuery(branchId),
@@ -128,7 +128,7 @@ class TaggerAllWorker extends BaseServerCommand {
          Activator.getInstance().getSearchTagger().stopTaggingByQueueQueryId(toStop);
       }
 
-      public void storeAndAddQueryId(OseeConnection connection, TagQueueJoinQuery joinQuery) throws OseeDataStoreException {
+      public void storeAndAddQueryId(OseeConnection connection, TagQueueJoinQuery joinQuery) throws OseeCoreException {
          if (joinQuery.size() > 0) {
             joinQuery.store(connection);
             this.queryIdMap.put(joinQuery.getQueryId(), joinQuery);