#1294 generics for streaming handles

Author: ehennum

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

@@ -6241,8 +6241,8 @@ public <C,R> Stream<C> asStreamOfContent(
       }
     }
     @Override
-    public <C,R> Stream<BufferableContentHandle<C,R>> asStreamOfHandles(
-            BytesHandle endpointStateHandle, BufferableContentHandle<C,R> outputHandle
+    public <T extends BufferableContentHandle<?,?>> Stream<T> asStreamOfHandles(
+            BytesHandle endpointStateHandle, T outputHandle
     ) {
       try {
         if (multipart == null) {
@@ -6251,15 +6251,15 @@ public <C,R> Stream<BufferableContentHandle<C,R>> asStreamOfHandles(
 
         boolean hasEndpointState = (endpointStateHandle != null);
 
-        Stream.Builder<BufferableContentHandle<C,R>> builder = Stream.builder();
+        Stream.Builder<T> builder = Stream.builder();
 
         int partCount = multipart.getCount();
         for (int i=0; i < partCount; i++) {
           BodyPart bodyPart = multipart.getBodyPart(i);
           if (hasEndpointState && i == 0) {
             updateHandle(bodyPart, endpointStateHandle);
           } else {
-            builder.accept(updateHandle(bodyPart, outputHandle.newHandle()));
+            builder.accept(updateHandle(bodyPart, (T) outputHandle.newHandle()));
           }
         }
         return builder.build();

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

@@ -608,15 +608,17 @@ interface SingleCallResponse extends CallResponse {
   interface MultipleCallResponse extends CallResponse {
     Stream<byte[]>            asStreamOfBytes();
     <C,R> Stream<C>           asStreamOfContent(BytesHandle endpointStateHandle, BufferableContentHandle<C,R> outputHandle);
-    <C,R> Stream<BufferableContentHandle<C,R>> asStreamOfHandles(BytesHandle endpointStateHandle, BufferableContentHandle<C,R> outputHandle);
+    <T extends BufferableContentHandle<?,?>> Stream<T>
+        asStreamOfHandles(BytesHandle endpointStateHandle, T outputHandle);
     Stream<InputStream>       asStreamOfInputStream();
     Stream<InputStreamHandle> asStreamOfInputStreamHandle();
     Stream<Reader>            asStreamOfReader();
     Stream<ReaderHandle>      asStreamOfReaderHandle();
     Stream<String>            asStreamOfString();
     byte[][]            asArrayOfBytes();
     <C,R> C[]           asArrayOfContent(BytesHandle endpointStateHandle, BufferableContentHandle<C,R> outputHandle);
-    <C,R> BufferableContentHandle<C,R>[] asArrayOfHandles(BytesHandle endpointStateHandle, BufferableContentHandle<C,R> outputHandle);
+    <C,R> BufferableContentHandle<C,R>[]
+        asArrayOfHandles(BytesHandle endpointStateHandle, BufferableContentHandle<C,R> outputHandle);
     InputStream[]       asArrayOfInputStream();
     InputStreamHandle[] asArrayOfInputStreamHandle();
     Reader[]            asArrayOfReader();

ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/AnyDocumentBundle.java

@@ -65,17 +65,17 @@ public Stream<com.marklogic.client.io.InputStreamHandle> sendReceiveDocs(Stream<
                     );
             }
             private Stream<com.marklogic.client.io.InputStreamHandle> sendReceiveDocs(BaseProxy.DBFunctionRequest request, Stream<String> uris, Stream<com.marklogic.client.io.InputStreamHandle> docs) {
-/* TODO: revise to take sample handle for output and call asStreamOfHandles(endpointStateHandle, outputHandle)
-              return BaseProxy.AnyDocumentType.toInputStreamHandle(
-                request
-                      .withParams(
-                          BaseProxy.atomicParam("uris", true, BaseProxy.StringType.fromString(uris)),
-                          BaseProxy.documentParam("docs", true, docs)
-                          ).responseMultiple(true, Format.UNKNOWN)
-                );
-
+/* TODO:
+    generate code that
+        instead of wrapping with BaseProxy.AnyDocumentType.toInputStreamHandle()
+        calls .asStreamOfHandles()
  */
-                return null;
+                return request
+                        .withParams(
+                                BaseProxy.atomicParam("uris", true, BaseProxy.StringType.fromString(uris)),
+                                BaseProxy.documentParam("docs", true, docs)
+                        ).responseMultiple(true, Format.UNKNOWN)
+                        .asStreamOfHandles(null, new com.marklogic.client.io.InputStreamHandle());
             }
         }