more comments, improve HttpSerializers.bytesStreamingSerializer

Author: Scottmitch

servicetalk-http-api/src/main/java/io/servicetalk/http/api/DefaultHttpStreamingSerializer.java

@@ -36,7 +36,12 @@ final class DefaultHttpStreamingSerializer<T> implements HttpStreamingSerializer
     DefaultHttpStreamingSerializer(final Serializer<T> serializer,
                                    final ToIntFunction<T> bytesEstimator,
                                    final Consumer<HttpHeaders> headersSerializeConsumer) {
-        this.serializer = new NonFramedStreamingSerializer<>(serializer, bytesEstimator);
+        this(new NonFramedStreamingSerializer<>(serializer, bytesEstimator), headersSerializeConsumer);
+    }
+
+    DefaultHttpStreamingSerializer(final StreamingSerializer<T> serializer,
+                                   final Consumer<HttpHeaders> headersSerializeConsumer) {
+        this.serializer = requireNonNull(serializer);
         this.headersSerializeConsumer = requireNonNull(headersSerializeConsumer);
     }
 

servicetalk-http-api/src/main/java/io/servicetalk/http/api/HttpSerializers.java

@@ -39,7 +39,6 @@
 import static io.servicetalk.http.api.HttpHeaderValues.TEXT_PLAIN;
 import static io.servicetalk.http.api.HttpHeaderValues.TEXT_PLAIN_US_ASCII;
 import static io.servicetalk.http.api.HttpHeaderValues.TEXT_PLAIN_UTF_8;
-import static io.servicetalk.serializer.utils.ByteArraySerializer.byteArraySerializer;
 import static io.servicetalk.serializer.utils.StringSerializer.stringSerializer;
 import static java.nio.charset.StandardCharsets.US_ASCII;
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -288,15 +287,13 @@ public static HttpStreamingSerializer<String> stringStreamingSerializer(
      * body is provided in {@link String} and the {@link HttpHeaderNames#CONTENT_TYPE} is known a-prior
      * (e.g. streaming raw json data from a stream of {@link String}s). Deserialization should be done using
      * the a-prior knowledge to use a compatible {@link HttpStreamingDeserializer}.
-     * @param forceCopy {@code true} means that data will always be copied from {@link Buffer} memory. {@code false}
-     * means that if {@link Buffer#hasArray()} is {@code true} and the array offsets are aligned the result of
-     * serialization doesn't have to be copied.
      * @param headersSerializeConsumer Sets the headers to indicate the appropriate encoding and content type.
      * @return a {@link HttpStreamingSerializer} that uses a {@link Serializer} for serialization.
      */
     public static HttpStreamingSerializer<byte[]> bytesStreamingSerializer(
-            boolean forceCopy, Consumer<HttpHeaders> headersSerializeConsumer) {
-        return streamingSerializer(byteArraySerializer(forceCopy), bytes -> bytes.length, headersSerializeConsumer);
+            Consumer<HttpHeaders> headersSerializeConsumer) {
+        return new DefaultHttpStreamingSerializer<>(NonFramedBytesStreamingSerializer.INSTANCE,
+                headersSerializeConsumer);
     }
 
     /**

servicetalk-http-api/src/main/java/io/servicetalk/http/api/NonFramedBytesStreamingSerializer.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2021 Apple Inc. and the ServiceTalk project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.servicetalk.http.api;
+
+import io.servicetalk.buffer.api.Buffer;
+import io.servicetalk.buffer.api.BufferAllocator;
+import io.servicetalk.concurrent.api.Publisher;
+import io.servicetalk.serializer.api.StreamingSerializer;
+
+final class NonFramedBytesStreamingSerializer implements StreamingSerializer<byte[]> {
+    static final StreamingSerializer<byte[]> INSTANCE = new NonFramedBytesStreamingSerializer();
+
+    private NonFramedBytesStreamingSerializer() {
+    }
+
+    @Override
+    public Publisher<Buffer> serialize(final Publisher<byte[]> toSerialize, final BufferAllocator allocator) {
+        return toSerialize.map(allocator::wrap);
+    }
+}

servicetalk-http-netty/src/test/java/io/servicetalk/http/netty/HttpRawDataSerializationTest.java

@@ -62,7 +62,7 @@ void bytesSerialization() throws Exception {
             expectedContentLength += s.length;
         }
 
-        runTest(content, contentType, expectedContentLength, bytesStreamingSerializer(false,
+        runTest(content, contentType, expectedContentLength, bytesStreamingSerializer(
                 headers -> headers.set(CONTENT_TYPE, contentType)));
     }
 

servicetalk-serializer-api/src/main/java/io/servicetalk/serializer/api/package-info.java

@@ -13,6 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/**
+ * Serializer and deserializer APIs.
+ */
 @ElementsAreNonnullByDefault
 package io.servicetalk.serializer.api;
 

servicetalk-serializer-utils/src/main/java/io/servicetalk/serializer/utils/package-info.java

@@ -13,6 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/**
+ * Serializer utilities.
+ */
 @ElementsAreNonnullByDefault
 package io.servicetalk.serializer.utils;