[WEJBHTTP-139] Final round of cleanup refactorings accross all modules

common/src/main/java/org/wildfly/httpclient/common/ByteOutputs.java

@@ -23,7 +23,11 @@
 import java.io.OutputStream;
 
 /**
- * Helper class. Provides utility method for transforming OutputStreams to ByteOutputs.
+ * Helper class. Provides various utility methods for example:
+ * <ul>
+ *     <li>transforming OutputStreams to ByteOutputs</li>
+ *     <li>introducing special behaviour to existing byte output instances</li>
+ * </ul>
  *
  * @author <a href="mailto:[email protected]">Richard Opalka</a>
  */
@@ -35,7 +39,7 @@ private ByteOutputs() {
 
     public static ByteOutput byteOutputOf(final OutputStream delegate) {
         if (delegate == null) throw new IllegalArgumentException();
-        return new ByteOutputStream(delegate);
+        return new UnflushableByteOutput(new ByteOutputStream(delegate));
     }
 
     private static final class ByteOutputStream implements ByteOutput {
@@ -73,4 +77,38 @@ public void write(final byte[] b, final int off, final int len) throws IOExcepti
 
     }
 
+    private static final class UnflushableByteOutput implements ByteOutput {
+
+        private final ByteOutput delegate;
+
+        public UnflushableByteOutput(final ByteOutput delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public void close() throws IOException {
+            delegate.close();
+        }
+
+        @Override
+        public void flush() throws IOException {
+            //ignore
+        }
+        @Override
+        public void write(final int b) throws IOException {
+            delegate.write(b);
+        }
+
+        @Override
+        public void write(final byte[] b) throws IOException {
+            delegate.write(b);
+        }
+
+        @Override
+        public void write(final byte[] b, int off, int len) throws IOException {
+            delegate.write(b, off, len);
+        }
+
+    }
+
 }

naming/src/main/java/org/wildfly/httpclient/naming/ServerHandlers.java

@@ -40,7 +40,6 @@
 import org.wildfly.httpclient.common.HttpMarshallerFactory;
 import org.wildfly.httpclient.common.HttpServerHelper;
 import org.wildfly.httpclient.common.HttpServiceConfig;
-import org.wildfly.httpclient.common.NoFlushByteOutput;
 
 import javax.naming.Binding;
 import javax.naming.Context;
@@ -134,7 +133,7 @@ public final void handleRequest(HttpServerExchange exchange) throws Exception {
                     exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, VALUE.toString());
                     HttpNamingServerObjectResolver resolver = new HttpNamingServerObjectResolver(exchange);
                     Marshaller marshaller = config.getHttpMarshallerFactory(exchange).createMarshaller(resolver);
-                    ByteOutput out = new NoFlushByteOutput(byteOutputOf(exchange.getOutputStream()));
+                    ByteOutput out = byteOutputOf(exchange.getOutputStream());
                     try (out) {
                         marshaller.start(out);
                         serializeObject(marshaller, result);

transaction/src/main/java/org/wildfly/httpclient/transaction/ClientHandlers.java

@@ -29,7 +29,6 @@
 import org.jboss.marshalling.Marshaller;
 import org.jboss.marshalling.Unmarshaller;
 import org.wildfly.httpclient.common.HttpTargetContext;
-import org.wildfly.httpclient.common.NoFlushByteOutput;
 import org.xnio.IoUtils;
 
 import javax.transaction.xa.Xid;
@@ -77,7 +76,7 @@ private XidHttpMarshaller(final Marshaller marshaller, final Xid xid) {
 
         @Override
         public void marshall(final OutputStream httpBodyRequestStream) throws Exception {
-            try (ByteOutput out = new NoFlushByteOutput(byteOutputOf(httpBodyRequestStream))) {
+            try (ByteOutput out = byteOutputOf(httpBodyRequestStream)) {
                 marshaller.start(out);
                 serializeXid(marshaller, xid);
                 marshaller.finish();

transaction/src/main/java/org/wildfly/httpclient/transaction/ServerHandlers.java

@@ -41,7 +41,6 @@
 import org.wildfly.httpclient.common.ContentType;
 import org.wildfly.httpclient.common.HttpMarshallerFactory;
 import org.wildfly.httpclient.common.HttpServiceConfig;
-import org.wildfly.httpclient.common.NoFlushByteOutput;
 import org.wildfly.transaction.client.ImportResult;
 import org.wildfly.transaction.client.LocalTransaction;
 import org.wildfly.transaction.client.LocalTransactionContext;
@@ -192,7 +191,7 @@ protected void processRequest(final HttpServerExchange exchange) {
                 final Xid xid = xidResolver.apply(transaction);
 
                 final ByteArrayOutputStream out = new ByteArrayOutputStream();
-                final ByteOutput byteOutput = new NoFlushByteOutput(byteOutputOf(out));
+                final ByteOutput byteOutput = byteOutputOf(out);
                 try (byteOutput) {
                     Marshaller marshaller = config.getHttpMarshallerFactory(exchange).createMarshaller();
                     marshaller.start(byteOutput);
@@ -237,7 +236,7 @@ protected void processRequest(HttpServerExchange exchange) {
                 final Xid[] recoveryList = ctx.getRecoveryInterface().recover(flags, parentName);
 
                 final ByteArrayOutputStream out = new ByteArrayOutputStream();
-                final ByteOutput byteOutput = new NoFlushByteOutput(byteOutputOf(out));
+                final ByteOutput byteOutput = byteOutputOf(out);
                 try (byteOutput) {
                     Marshaller marshaller = config.getHttpMarshallerFactory(exchange).createMarshaller();
                     marshaller.start(byteOutput);