refactor: Consolidate query context creation

Change-Id: I832f12ceb177204974e4a381b1e9e35bd8944dc3

6 files changed, 17 insertions, 43 deletions

diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/QuerySqlContextFactory.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/QuerySqlContextFactory.java
index f27cf326a1d..fb4438ebda8 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/QuerySqlContextFactory.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/QuerySqlContextFactory.java
@@ -13,13 +13,11 @@ package org.eclipse.osee.orcs.db.internal.search;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.orcs.OrcsSession;
 import org.eclipse.osee.orcs.core.ds.QueryData;
+import org.eclipse.osee.orcs.db.internal.sql.QueryType;
 
 /**
  * @author Roberto E. Escobar
  */
 public interface QuerySqlContextFactory {
-
-   QuerySqlContext createCountContext(OrcsSession session, QueryData queryData) throws OseeCoreException;
-
-   QuerySqlContext createQueryContext(OrcsSession session, QueryData queryData) throws OseeCoreException;
-}
+   QuerySqlContext createQueryContext(OrcsSession session, QueryData queryData, QueryType queryType) throws OseeCoreException;
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/AbstractSimpleQueryCallableFactory.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/AbstractSimpleQueryCallableFactory.java
index e41d44d62ec..4a5bb57d4e8 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/AbstractSimpleQueryCallableFactory.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/AbstractSimpleQueryCallableFactory.java
@@ -21,6 +21,7 @@ import org.eclipse.osee.orcs.core.ds.QueryData;
 import org.eclipse.osee.orcs.db.internal.search.QueryCallableFactory;
 import org.eclipse.osee.orcs.db.internal.search.QuerySqlContext;
 import org.eclipse.osee.orcs.db.internal.search.QuerySqlContextFactory;
+import org.eclipse.osee.orcs.db.internal.sql.QueryType;
 
 /**
  * @author Roberto E. Escobar
@@ -44,7 +45,8 @@ public abstract class AbstractSimpleQueryCallableFactory implements QueryCallabl
 
          @Override
          protected Integer innerCall() throws Exception {
-            QuerySqlContext queryContext = queryContextFactory.createCountContext(getSession(), getQueryData());
+            QuerySqlContext queryContext =
+               queryContextFactory.createQueryContext(getSession(), getQueryData(), QueryType.COUNT);
             checkForCancelled();
             return objectLoader.getCount(this, queryContext);
          }
@@ -58,7 +60,8 @@ public abstract class AbstractSimpleQueryCallableFactory implements QueryCallabl
 
          @Override
          protected Integer innerCall() throws Exception {
-            QuerySqlContext queryContext = queryContextFactory.createQueryContext(getSession(), getQueryData());
+            QuerySqlContext queryContext =
+               queryContextFactory.createQueryContext(getSession(), getQueryData(), QueryType.SELECT);
             checkForCancelled();
 
             DataLoader loader = objectLoader.newDataLoader(queryContext);
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ArtifactQuerySqlContextFactoryImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ArtifactQuerySqlContextFactoryImpl.java
index 70069732044..d81e092e08a 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ArtifactQuerySqlContextFactoryImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ArtifactQuerySqlContextFactoryImpl.java
@@ -51,16 +51,7 @@ public class ArtifactQuerySqlContextFactoryImpl implements QuerySqlContextFactor
    }
 
    @Override
-   public QuerySqlContext createCountContext(OrcsSession session, QueryData queryData) throws OseeCoreException {
-      return createQueryContext(session, queryData, QueryType.COUNT);
-   }
-
-   @Override
-   public QuerySqlContext createQueryContext(OrcsSession session, QueryData queryData) throws OseeCoreException {
-      return createQueryContext(session, queryData, QueryType.SELECT);
-   }
-
-   private QuerySqlContext createQueryContext(OrcsSession session, QueryData queryData, QueryType queryType) throws OseeCoreException {
+   public QuerySqlContext createQueryContext(OrcsSession session, QueryData queryData, QueryType queryType) {
       QuerySqlContext context = createContext(session, queryData);
 
       AbstractSqlWriter writer = createQueryWriter(context, queryData, queryType);
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ObjectQueryCallableFactory.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ObjectQueryCallableFactory.java
index 45a1dcec2a3..90c01aa453e 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ObjectQueryCallableFactory.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ObjectQueryCallableFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.osee.orcs.db.internal.search.QueryCallableFactory;
 import org.eclipse.osee.orcs.db.internal.search.QueryFilterFactory;
 import org.eclipse.osee.orcs.db.internal.search.QuerySqlContext;
 import org.eclipse.osee.orcs.db.internal.search.QuerySqlContextFactory;
+import org.eclipse.osee.orcs.db.internal.sql.QueryType;
 
 /**
  * @author Roberto E. Escobar
@@ -60,7 +61,8 @@ public class ObjectQueryCallableFactory implements QueryCallableFactory {
          }
 
          protected int getCount() throws OseeCoreException {
-            QuerySqlContext queryContext = queryContextFactory.createCountContext(getSession(), getQueryData());
+            QuerySqlContext queryContext =
+               queryContextFactory.createQueryContext(getSession(), getQueryData(), QueryType.COUNT);
             checkForCancelled();
             return objectLoader.getCount(this, queryContext);
          }
@@ -95,7 +97,8 @@ public class ObjectQueryCallableFactory implements QueryCallableFactory {
       }
 
       protected int loadAndGetCount(LoadDataHandler handler, boolean enableFilter) throws Exception {
-         QuerySqlContext queryContext = queryContextFactory.createQueryContext(getSession(), getQueryData());
+         QuerySqlContext queryContext =
+            queryContextFactory.createQueryContext(getSession(), getQueryData(), QueryType.SELECT);
          checkForCancelled();
 
          DataLoader loader = objectLoader.newDataLoader(queryContext);
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ObjectQuerySqlContextFactoryImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ObjectQuerySqlContextFactoryImpl.java
index 47f0e874e5c..01f52031ff8 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ObjectQuerySqlContextFactoryImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ObjectQuerySqlContextFactoryImpl.java
@@ -11,7 +11,6 @@
 package org.eclipse.osee.orcs.db.internal.search.engines;
 
 import java.util.List;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.jdbc.JdbcClient;
 import org.eclipse.osee.logger.Log;
 import org.eclipse.osee.orcs.OrcsSession;
@@ -44,16 +43,7 @@ public class ObjectQuerySqlContextFactoryImpl implements QuerySqlContextFactory
    }
 
    @Override
-   public QuerySqlContext createCountContext(OrcsSession session, QueryData queryData) throws OseeCoreException {
-      return createQueryContext(session, queryData, QueryType.COUNT);
-   }
-
-   @Override
-   public QuerySqlContext createQueryContext(OrcsSession session, QueryData queryData) throws OseeCoreException {
-      return createQueryContext(session, queryData, QueryType.SELECT);
-   }
-
-   private QuerySqlContext createQueryContext(OrcsSession session, QueryData queryData, QueryType queryType) throws OseeCoreException {
+   public QuerySqlContext createQueryContext(OrcsSession session, QueryData queryData, QueryType queryType) {
       QuerySqlContext context = new QuerySqlContext(session, queryData.getOptions(), ObjectQueryType.DYNAMIC_OBJECT);
       AbstractSqlWriter writer =
          new ObjectQuerySqlWriter(logger, joinFactory, jdbcClient, context, queryType, queryData);
@@ -61,5 +51,4 @@ public class ObjectQuerySqlContextFactoryImpl implements QuerySqlContextFactory
       writer.build(handlers);
       return context;
    }
-
-}
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/QuerySqlContextFactoryImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/QuerySqlContextFactoryImpl.java
index 5f5b7d3bdca..181ff75666b 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/QuerySqlContextFactoryImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/QuerySqlContextFactoryImpl.java
@@ -11,7 +11,6 @@
 package org.eclipse.osee.orcs.db.internal.search.engines;
 
 import java.util.List;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.jdbc.JdbcClient;
 import org.eclipse.osee.logger.Log;
 import org.eclipse.osee.orcs.OrcsSession;
@@ -50,16 +49,7 @@ public class QuerySqlContextFactoryImpl implements QuerySqlContextFactory {
    }
 
    @Override
-   public QuerySqlContext createCountContext(OrcsSession session, QueryData queryData) throws OseeCoreException {
-      return createQueryContext(session, queryData, QueryType.COUNT);
-   }
-
-   @Override
-   public QuerySqlContext createQueryContext(OrcsSession session, QueryData queryData) throws OseeCoreException {
-      return createQueryContext(session, queryData, QueryType.SELECT);
-   }
-
-   private QuerySqlContext createQueryContext(OrcsSession session, QueryData queryData, QueryType queryType) throws OseeCoreException {
+   public QuerySqlContext createQueryContext(OrcsSession session, QueryData queryData, QueryType queryType) {
       QuerySqlContext context = new QuerySqlContext(session, queryData.getOptions(), type);
       AbstractSqlWriter writer =
          new QuerySqlWriter(logger, joinFactory, jdbcClient, context, queryType, table, idColumn);