refactor: Remove superfluous usage of branch.getUuid

Change-Id: I7e48c154c7549a4a51e78ed72eadc20a621c7847

8 files changed, 15 insertions, 16 deletions

diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseConflictAccessor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseConflictAccessor.java
index 0db4c40fae5..370d772d082 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseConflictAccessor.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/DatabaseConflictAccessor.java
@@ -61,7 +61,7 @@ public class DatabaseConflictAccessor {
          conflicts.add(
             new Conflict(StorageState.LOADED, uniqueId, conflictType, mergeBranch, status, sourceGammaId, destGammaId));
       };
-      getJdbcClient().runQuery(consumer, SELECT_CONFLICTS, mergeBranch.getUuid());
+      getJdbcClient().runQuery(consumer, SELECT_CONFLICTS, mergeBranch);
    }
 
    public void store(Collection<Conflict> conflicts) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ArchiveUnarchiveBranchCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ArchiveUnarchiveBranchCallable.java
index 20fa0686ede..5248c7fc1c8 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ArchiveUnarchiveBranchCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ArchiveUnarchiveBranchCallable.java
@@ -46,13 +46,13 @@ public class ArchiveUnarchiveBranchCallable extends AbstractDatastoreTxCallable<
       String destinationTableName = archive ? "osee_txs_archived" : "osee_txs";
 
       String sql = String.format(INSERT_ADDRESSING, destinationTableName, sourceTableName);
-      jdbcClient.runPreparedUpdate(connection, sql, branch.getUuid());
+      jdbcClient.runPreparedUpdate(connection, sql, branch);
 
       sql = String.format(DELETE_ADDRESSING, sourceTableName);
-      jdbcClient.runPreparedUpdate(connection, sql, branch.getUuid());
+      jdbcClient.runPreparedUpdate(connection, sql, branch);
 
       BranchArchivedState newState = archive ? BranchArchivedState.ARCHIVED : BranchArchivedState.UNARCHIVED;
-      Object[] params = new Object[] {newState.getValue(), branch.getUuid()};
+      Object[] params = new Object[] {newState.getValue(), branch};
       jdbcClient.runPreparedUpdate(connection, UPDATE_BRANCH, params);
       return null;
    }
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ChangeBranchFieldCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ChangeBranchFieldCallable.java
index 1eee3ab9267..a61c5b4a78f 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ChangeBranchFieldCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/ChangeBranchFieldCallable.java
@@ -44,7 +44,7 @@ public class ChangeBranchFieldCallable extends AbstractDatastoreTxCallable<Void>
    protected Void handleTxWork(JdbcConnection connection) throws OseeCoreException {
       Conditions.checkNotNull(branch, "branch");
       Conditions.checkNotNullOrEmpty(field, "column");
-      Object[] params = new Object[] {value, branch.getUuid()};
+      Object[] params = new Object[] {value, branch};
       String query = String.format(UPDATE_BRANCH_FIELD, field);
       getJdbcClient().runPreparedUpdate(connection, query, params);
       return null;
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CommitBranchDatabaseTxCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CommitBranchDatabaseTxCallable.java
index c57d291cf90..4a439d5fffa 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CommitBranchDatabaseTxCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/CommitBranchDatabaseTxCallable.java
@@ -92,8 +92,7 @@ public class CommitBranchDatabaseTxCallable extends AbstractDatastoreTxCallable<
          updatePreviousCurrentsOnDestinationBranch(connection);
          insertCommitAddressing(newTx, connection);
 
-         getJdbcClient().runPreparedUpdate(connection, UPDATE_MERGE_COMMIT_TX, newTx, sourceBranch.getUuid(),
-            destinationBranch.getUuid());
+         getJdbcClient().runPreparedUpdate(connection, UPDATE_MERGE_COMMIT_TX, newTx, sourceBranch, destinationBranch);
 
          manageBranchStates();
          if (mergeBranch.isValid()) {
@@ -154,8 +153,8 @@ public class CommitBranchDatabaseTxCallable extends AbstractDatastoreTxCallable<
       String comment = COMMIT_COMMENT + sourceBranch.getName();
 
       getJdbcClient().runPreparedUpdate(connection, INSERT_COMMIT_TRANSACTION,
-         TransactionDetailsType.NonBaselined.getId(), destinationBranch.getUuid(), newTransactionNumber, comment,
-         timestamp, committer, sourceBranch.getAssociatedArtifact());
+         TransactionDetailsType.NonBaselined.getId(), destinationBranch, newTransactionNumber, comment, timestamp,
+         committer, sourceBranch.getAssociatedArtifact());
       return newTransactionNumber;
    }
 
@@ -166,11 +165,11 @@ public class CommitBranchDatabaseTxCallable extends AbstractDatastoreTxCallable<
          ApplicabilityToken appToken = change.getNetChange().getApplicabilityToken();
          insertData.add(new Object[] {
             newTx,
-            destinationBranch.getUuid(),
+            destinationBranch,
             change.getNetChange().getGammaId(),
             modType.getValue(),
             TxChange.getCurrent(modType).getValue(),
-            appToken.getId()});
+            appToken});
       }
       getJdbcClient().runBatchUpdate(connection, INSERT_COMMIT_ADDRESSING, insertData);
    }
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeBranchDatabaseCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeBranchDatabaseCallable.java
index 899cea16498..ef18411de51 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeBranchDatabaseCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeBranchDatabaseCallable.java
@@ -76,7 +76,7 @@ public class PurgeBranchDatabaseCallable extends AbstractDatastoreTxCallable<Voi
    private List<Pair<Long, Boolean>> findMergeBranches(JdbcConnection connection) {
       List<Pair<Long, Boolean>> toReturn = new LinkedList<>();
       JdbcStatement stmt = getJdbcClient().getStatement(connection);
-      stmt.runPreparedQuery(SELECT_MERGE_BRANCHES, toDelete.getUuid(), toDelete.getUuid());
+      stmt.runPreparedQuery(SELECT_MERGE_BRANCHES, toDelete, toDelete);
       while (stmt.next()) {
          Pair<Long, Boolean> toAdd =
             new Pair<Long, Boolean>(stmt.getLong("merge_branch_id"), stmt.getBoolean("archived"));
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/handler/BranchDataSaxHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/handler/BranchDataSaxHandler.java
index 2b3108f2f22..8de4b05ebeb 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/handler/BranchDataSaxHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/handler/BranchDataSaxHandler.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osee.orcs.db.internal.exchange.handler;
 
-import static org.eclipse.osee.framework.core.enums.CoreBranches.SYSTEM_ROOT_ID;
+import static org.eclipse.osee.framework.core.enums.CoreBranches.SYSTEM_ROOT;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -124,7 +124,7 @@ public class BranchDataSaxHandler extends BaseDbSaxHandler {
       int index = 0;
       for (BranchData branchData : branchesToStore) {
          if (!getOptions().getBoolean(ImportOptions.CLEAN_BEFORE_IMPORT.name()) //
-         && SYSTEM_ROOT_ID.equals(branchData.getId())) {
+            && SYSTEM_ROOT.equals(branchData.getId())) {
             continue;
          }
 
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchAncestorOfSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchAncestorOfSqlHandler.java
index a6b993ee494..790602e6833 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchAncestorOfSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchAncestorOfSqlHandler.java
@@ -47,7 +47,7 @@ public class BranchAncestorOfSqlHandler extends SqlHandler<CriteriaBranchAncesto
       body.append("  SELECT parent_branch_id, branch_level - 1 FROM ").append(withAlias);
       body.append(" recurse, osee_branch br");
       body.append(" WHERE br.branch_id = recurse.parent_id");
-      writer.addParameter(criteria.getChild().getUuid());
+      writer.addParameter(criteria.getChild());
       writer.addWithClause(newRecursiveWithClause(withAlias, "(parent_id, branch_level)", body.toString()));
       writer.addTable(withAlias);
    }
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchChildOfSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchChildOfSqlHandler.java
index 18595d599f1..a4282c9dee2 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchChildOfSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchChildOfSqlHandler.java
@@ -46,7 +46,7 @@ public class BranchChildOfSqlHandler extends SqlHandler<CriteriaBranchChildOf> {
       body.append("\n  UNION ALL \n");
       body.append("  SELECT branch_id, branch_level + 1 FROM ").append(withAlias).append(" recurse, osee_branch br");
       body.append(" WHERE recurse.child_id = br.parent_branch_id");
-      writer.addParameter(criteria.getParent().getUuid());
+      writer.addParameter(criteria.getParent());
       writer.addWithClause(newRecursiveWithClause(withAlias, "(child_id, branch_level)", body.toString()));
       writer.addTable(withAlias);
    }