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

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

@@ -60,24 +60,27 @@ public static void putRequestHeader(final ClientRequest request, final HttpStrin
         request.getRequestHeaders().put(headerName, headerValue);
     }
 
-    public static void putRequestHeader(final ClientRequest request, final HttpString headerName, final String headerValue) {
+    public static void putRequestHeader(final ClientRequest request, final HttpString headerName, final Object headerValue) {
         if (request == null || headerName == null) return;
-        request.getRequestHeaders().put(headerName, headerValue);
+        if (headerValue == null) throw new IllegalArgumentException();
+        request.getRequestHeaders().put(headerName, headerValue.toString());
     }
 
-    public static void addResponseHeader(final HttpServerExchange exchange, final HttpString headerName, final String headerValue) {
+    public static void addResponseHeader(final HttpServerExchange exchange, final HttpString headerName, final Object headerValue) {
         if (exchange == null || headerName == null) return;
-        exchange.getResponseHeaders().add(headerName, headerValue);
+        if (headerValue == null) throw new IllegalArgumentException();
+        exchange.getResponseHeaders().add(headerName, headerValue.toString());
     }
 
     public static String getRequestHeader(final HttpServerExchange exchange, final HttpString headerName) {
         if (exchange == null || headerName == null) return null;
         return exchange.getRequestHeaders().getFirst(headerName);
     }
 
-    public static void putResponseHeader(final HttpServerExchange exchange, final HttpString headerName, final String headerValue) {
+    public static void putResponseHeader(final HttpServerExchange exchange, final HttpString headerName, final Object headerValue) {
         if (exchange == null || headerName == null) return;
-        exchange.getResponseHeaders().put(headerName, headerValue);
+        if (headerValue == null) throw new IllegalArgumentException();
+        exchange.getResponseHeaders().put(headerName, headerValue.toString());
     }
 
 }

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

@@ -194,7 +194,7 @@ private void sendRequestInternal(final HttpConnectionPool.ConnectionHandle conne
                 : authenticationConfiguration;
 
             if (containsRequestHeader(request, CONTENT_TYPE)) {
-                putRequestHeader(request, TRANSFER_ENCODING, CHUNKED.toString());
+                putRequestHeader(request, TRANSFER_ENCODING, CHUNKED);
             }
             final boolean authAdded = retry || connection.getAuthenticationContext().prepareRequest(connection.getUri(), request, authenticationConfiguration);
             connection.sendRequest(request, new ClientCallback<ClientExchange>() {

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

@@ -266,7 +266,7 @@ boolean prepareRequest(URI uri, ClientRequest request, AuthenticationConfigurati
                 sb.append(", response=\"");
                 sb.append(HexConverter.convertToHexString(digest.digest()));
                 sb.append("\"");
-                putRequestHeader(request, AUTHORIZATION, sb.toString());
+                putRequestHeader(request, AUTHORIZATION, sb);
                 return true;
             } catch (NoSuchAlgorithmException e) {
                 throw new RuntimeException(e);

ejb/src/main/java/org/wildfly/httpclient/ejb/RequestBuilder.java

@@ -141,21 +141,21 @@ private void setRequestHeaders(final ClientRequest request) {
         switch (requestType) {
             case INVOKE: {
                 putRequestHeader(request, ACCEPT, INVOCATION_ACCEPT + "," + EJB_EXCEPTION);
-                putRequestHeader(request, CONTENT_TYPE, INVOCATION.toString());
+                putRequestHeader(request, CONTENT_TYPE, INVOCATION);
                 if (invocationId != null) {
                     putRequestHeader(request, INVOCATION_ID, invocationId);
                 }
                 if (compressRequest) {
-                    putRequestHeader(request, CONTENT_ENCODING, GZIP.toString());
+                    putRequestHeader(request, CONTENT_ENCODING, GZIP);
                 }
                 if (compressResponse) {
-                    putRequestHeader(request, ACCEPT_ENCODING, GZIP.toString());
+                    putRequestHeader(request, ACCEPT_ENCODING, GZIP);
                 }
-                putRequestHeader(request, TRANSFER_ENCODING, CHUNKED.toString());
+                putRequestHeader(request, TRANSFER_ENCODING, CHUNKED);
             } break;
             case CREATE_SESSION: {
-                putRequestHeader(request, ACCEPT, EJB_EXCEPTION.toString());
-                putRequestHeader(request, CONTENT_TYPE, SESSION_OPEN.toString());
+                putRequestHeader(request, ACCEPT, EJB_EXCEPTION);
+                putRequestHeader(request, CONTENT_TYPE, SESSION_OPEN);
             } break;
             case DISCOVER: {
                 putRequestHeader(request, ACCEPT, EJB_DISCOVERY_RESPONSE + "," + EJB_EXCEPTION);

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

@@ -418,7 +418,7 @@ public void writeInvocationResult(Object result) {
                     cancellationFlags.remove(identifier);
                 }
                 try {
-                    putResponseHeader(exchange, CONTENT_TYPE, Constants.EJB_RESPONSE.toString());
+                    putResponseHeader(exchange, CONTENT_TYPE, Constants.EJB_RESPONSE);
     //                                    if (output.getSessionAffinity() != null) {
     //                                        exchange.setResponseCookie(new CookieImpl("JSESSIONID", output.getSessionAffinity()).setPath(WILDFLY_SERVICES));
     //                                    }
@@ -673,7 +673,7 @@ public void convertToStateful(@NotNull SessionID sessionId) throws IllegalArgume
                             exchange.setResponseCookie(new CookieImpl(JSESSIONID_COOKIE_NAME, sessionIdGenerator.createSessionId()).setPath(rootPath));
                         }
 
-                        putResponseHeader(exchange, CONTENT_TYPE, EJB_RESPONSE_NEW_SESSION.toString());
+                        putResponseHeader(exchange, CONTENT_TYPE, EJB_RESPONSE_NEW_SESSION);
                         putResponseHeader(exchange, EJB_SESSION_ID, Base64.getUrlEncoder().encodeToString(sessionId.getEncodedForm()));
 
                         exchange.setStatusCode(NO_CONTENT);
@@ -711,7 +711,7 @@ public void moduleUnavailable(List<EJBModuleIdentifier> modules) {
 
         @Override
         protected void handleInternal(HttpServerExchange exchange) throws Exception {
-            putResponseHeader(exchange, CONTENT_TYPE, EJB_DISCOVERY_RESPONSE.toString());
+            putResponseHeader(exchange, CONTENT_TYPE, EJB_DISCOVERY_RESPONSE);
             byte[] data;
             final ByteArrayOutputStream out = new ByteArrayOutputStream();
             Marshaller marshaller = config.getHttpMarshallerFactory(exchange)

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

@@ -108,7 +108,7 @@ private void setRequestPath(final ClientRequest request, final String prefix) {
     private void setRequestHeaders(final ClientRequest request) {
         putRequestHeader(request, ACCEPT, VALUE + "," + EXCEPTION);
         if (object != null) {
-            putRequestHeader(request, CONTENT_TYPE, VALUE.toString());
+            putRequestHeader(request, CONTENT_TYPE, VALUE);
         }
     }
 

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

@@ -136,7 +136,7 @@ public final void handleRequest(HttpServerExchange exchange) throws Exception {
                 } else if (result instanceof Context) {
                     exchange.setStatusCode(NO_CONTENT);
                 } else {
-                    putResponseHeader(exchange, CONTENT_TYPE, VALUE.toString());
+                    putResponseHeader(exchange, CONTENT_TYPE, VALUE);
                     HttpNamingServerObjectResolver resolver = new HttpNamingServerObjectResolver(exchange);
                     Marshaller marshaller = config.getHttpMarshallerFactory(exchange).createMarshaller(resolver);
                     ByteOutput out = byteOutputOf(exchange.getOutputStream());

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

@@ -125,10 +125,10 @@ private void setRequestHeaders(final ClientRequest request) {
         } else if (requestType == XA_RECOVER) {
             putRequestHeader(request, ACCEPT, XID_LIST + "," + NEW_TRANSACTION);
             putRequestHeader(request, RECOVERY_PARENT_NAME, parentName);
-            putRequestHeader(request, RECOVERY_FLAGS, Integer.toString(flags));
+            putRequestHeader(request, RECOVERY_FLAGS, flags);
         } else {
-            putRequestHeader(request, ACCEPT, EXCEPTION.toString());
-            putRequestHeader(request, CONTENT_TYPE, XID.toString());
+            putRequestHeader(request, ACCEPT, EXCEPTION);
+            putRequestHeader(request, CONTENT_TYPE, XID);
         }
     }
 

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

@@ -191,7 +191,7 @@ protected void processRequest(final HttpServerExchange exchange) {
             try {
                 final String timeoutString = getRequestHeader(exchange, TIMEOUT);
                 final Integer timeout = Integer.parseInt(timeoutString);
-                putResponseHeader(exchange, CONTENT_TYPE, NEW_TRANSACTION.toString());
+                putResponseHeader(exchange, CONTENT_TYPE, NEW_TRANSACTION);
                 final LocalTransaction transaction = ctx.beginTransaction(timeout);
                 final Xid xid = xidResolver.apply(transaction);