#1329 change type of plan to PreparePlan

Author: lling

marklogic-client-api/src/main/java/com/marklogic/client/impl/RowManagerImpl.java

@@ -256,7 +256,7 @@ public <T> T explainAs(Plan plan, Class<T> as) {
   }
 
   @Override
-  public <T extends XMLReadHandle> T generateView(Plan plan, String schema, String view, T resultsHandle) {
+  public <T extends XMLReadHandle> T generateView(PlanBuilder.PreparePlan plan, String schema, String view, T resultsHandle) {
     if (resultsHandle == null) {
       throw new IllegalArgumentException("Must specify a handle to generate a view for the plan");
     } else if (schema == null || schema.length() == 0) {
@@ -276,7 +276,7 @@ public <T extends XMLReadHandle> T generateView(Plan plan, String schema, String
     return services.postResource(requestLogger, "rows", null, params, astHandle, resultsHandle);
   }
   @Override
-  public <T> T generateViewAs(Plan plan, String schema, String view, Class<T> as) {
+  public <T> T generateViewAs(PlanBuilder.PreparePlan plan, String schema, String view, Class<T> as) {
     ContentHandle<T> handle = handleFor(as);
     if (generateView(plan, schema, view, (XMLReadHandle) handle) == null) {
       return null;
@@ -286,7 +286,7 @@ public <T> T generateViewAs(Plan plan, String schema, String view, Class<T> as)
   }
 
   @Override
-  public <T extends JSONReadHandle> T columnInfo(Plan plan, T resultsHandle) {
+  public <T extends JSONReadHandle> T columnInfo(PlanBuilder.PreparePlan plan, T resultsHandle) {
     if (resultsHandle == null) {
       throw new IllegalArgumentException("Must specify a handle to generate a view for the plan");
     }
@@ -300,7 +300,7 @@ public <T extends JSONReadHandle> T columnInfo(Plan plan, T resultsHandle) {
     return services.postResource(requestLogger, "rows", null, params, astHandle, resultsHandle);
   }
   @Override
-  public <T> T columnInfoAs(Plan plan, Class<T> as) {
+  public <T> T columnInfoAs(PlanBuilder.PreparePlan plan, Class<T> as) {
     ContentHandle<T> handle = handleFor(as);
     if (!(handle instanceof JSONReadHandle))
       throw new IllegalArgumentException("The handle is not an instance of JSONReadHandle.");

marklogic-client-api/src/main/java/com/marklogic/client/row/RowManager.java

@@ -273,7 +273,7 @@ public enum RowStructure{ARRAY, OBJECT}
      * @param <T> the type of the handle for the generated view
      * @return	the handle with the content of the generated view for the plan
      */
-    <T extends XMLReadHandle> T generateView(Plan plan, String schema, String view, T handle);
+    <T extends XMLReadHandle> T generateView(PlanBuilder.PreparePlan plan, String schema, String view, T handle);
     /**
      * Generates generates a view that encapsulates a plan.
      *
@@ -294,7 +294,7 @@ public enum RowStructure{ARRAY, OBJECT}
      * @param <T> the type of the IO object for reading the generated view
      * @return	an object of the IO class with the content of the generated view for the plan
      */
-    <T> T generateViewAs(Plan plan, String schema, String view, Class<T> as);
+    <T> T generateViewAs(PlanBuilder.PreparePlan plan, String schema, String view, Class<T> as);
 
     /**
      * This function can be used to inspect the state of a plan before execution. It returns the information about each
@@ -306,7 +306,7 @@ public enum RowStructure{ARRAY, OBJECT}
      * @param <T> the type of the handle for the column information
      * @return	the handle with the content of the column information for the plan
      */
-    <T extends JSONReadHandle> T columnInfo(Plan plan, T handle);
+    <T extends JSONReadHandle> T columnInfo(PlanBuilder.PreparePlan plan, T handle);
     /**This function can be used to inspect the state of a plan before execution. It returns the information about each
      * column in the plan, including schema name, view name, column name, data type and nullability. It also returns the
      * information about system columns.Generates generates a view that encapsulates a plan.
@@ -322,5 +322,5 @@ public enum RowStructure{ARRAY, OBJECT}
      * @param <T> the type of the IO object for reading the column information
      * @return	an object of the IO class with the content of the column information for the plan
      */
-    <T> T columnInfoAs(Plan plan, Class<T> as);
+    <T> T columnInfoAs(PlanBuilder.PreparePlan plan, Class<T> as);
 }

marklogic-client-api/src/test/java/com/marklogic/client/test/RowManagerTest.java

@@ -1218,7 +1218,7 @@ public void testColumnInfo() throws IOException {
 
     PlanBuilder p = rowMgr.newPlanBuilder();
 
-    PlanBuilder.ExportablePlan builtPlan =
+    PlanBuilder.PreparePlan builtPlan =
             p.fromView("opticUnitTest", "musician")
                     .where(
                             p.cts.andQuery(
@@ -1241,7 +1241,7 @@ public void testGenerateView() throws IOException {
 
     PlanBuilder p = rowMgr.newPlanBuilder();
 
-    PlanBuilder.ExportablePlan builtPlan =
+    PlanBuilder.PreparePlan builtPlan =
           p.fromView("opticUnitTest", "musician")
            .where(
               p.cts.andQuery(