From d926f61683b4d6b582d7b506651d587434620141 Mon Sep 17 00:00:00 2001
From: Martin Monperrus <martin.monperrus@gnieh.org>
Date: Tue, 30 Apr 2024 22:12:21 +0200
Subject: [PATCH 1/4] up

---
 .../java/gumtree/spoon/AstComparator.java     |   19 +-
 .../java/gumtree/spoon/AstComparatorTest.java |   15 +
 src/test/resources/issue264/Util_after.java   | 1048 +++++++++++++++++
 src/test/resources/issue264/Util_before.java  | 1048 +++++++++++++++++
 4 files changed, 2128 insertions(+), 2 deletions(-)
 create mode 100644 src/test/resources/issue264/Util_after.java
 create mode 100644 src/test/resources/issue264/Util_before.java

diff --git a/src/main/java/gumtree/spoon/AstComparator.java b/src/main/java/gumtree/spoon/AstComparator.java
index bb726e1b..88742c0b 100644
--- a/src/main/java/gumtree/spoon/AstComparator.java
+++ b/src/main/java/gumtree/spoon/AstComparator.java
@@ -10,6 +10,7 @@
 import spoon.compiler.SpoonResource;
 import spoon.compiler.SpoonResourceHelper;
 import spoon.reflect.declaration.CtElement;
+import spoon.reflect.declaration.CtPackage;
 import spoon.reflect.declaration.CtType;
 import spoon.reflect.factory.Factory;
 import spoon.reflect.factory.FactoryImpl;
@@ -57,8 +58,8 @@ protected Factory createFactory() {
 	 * compares two java files
 	 */
 	public Diff compare(File f1, File f2) throws Exception {
-		CtType<?> ctType1 = getCtType(f1);
-		CtType<?> ctType2 = getCtType(f2);
+		CtPackage ctType1 = getCtPackage(f1);
+		CtPackage ctType2 = getCtPackage(f2);
 		if (ctType1 == null || ctType2 == null) {
 			return null;
 		} else {
@@ -122,6 +123,10 @@ public CtType getCtType(File file) throws Exception {
 		SpoonResource resource = SpoonResourceHelper.createResource(file);
 		return getCtType(resource);
 	}
+	public CtPackage getCtPackage(File file) throws Exception {
+		SpoonResource resource = SpoonResourceHelper.createResource(file);
+		return getCtPackage(resource);
+	}
 
 	public CtType getCtType(SpoonResource resource) {
 		Factory factory = createFactory();
@@ -143,6 +148,16 @@ public CtType getCtType(SpoonResource resource) {
 		return factory.Type().get(type.getQualifiedName());
 	}
 
+	public CtPackage getCtPackage(SpoonResource resource) {
+		Factory factory = createFactory();
+		factory.getModel().setBuildModelIsFinished(false);
+		SpoonModelBuilder compiler = new JDTBasedSpoonCompiler(factory);
+		compiler.getFactory().getEnvironment().setLevel("OFF");
+		compiler.addInputSource(resource);
+		compiler.build();
+		return factory.Package().getRootPackage();
+	}
+
 	public CtType<?> getCtType(String content) {
 		return getCtType(content, "/test");
 	}
diff --git a/src/test/java/gumtree/spoon/AstComparatorTest.java b/src/test/java/gumtree/spoon/AstComparatorTest.java
index cdd0c440..6a4bcaf4 100644
--- a/src/test/java/gumtree/spoon/AstComparatorTest.java
+++ b/src/test/java/gumtree/spoon/AstComparatorTest.java
@@ -2101,4 +2101,19 @@ public void thisAndSuperShouldResultInAnASTDiff() {
 		// assert
 		assertTrue(diff.containsOperations(OperationKind.Update, "Invocation", "this", "super"));
 	}
+
+	@Test
+	public void test264() throws Exception {
+		File s = new File("src/test/resources/issue264/Util_before.java");
+		File t = new File("src/test/resources/issue264/Util_after.java");
+		boolean includeComments = true;
+		AstComparator r = new AstComparator(includeComments);
+
+		Diff diffOut = r.compare(s, t);
+		Assert.assertEquals(3, diffOut.getRootOperations().size());
+		Assert.assertEquals("Delete Literal at org.wso2.transport.http.netty.contractimpl.common.Util:147\n" +
+				"\tfalse\n", diffOut.getRootOperations().get(0).toString());
+
+	}
+
 }
diff --git a/src/test/resources/issue264/Util_after.java b/src/test/resources/issue264/Util_after.java
new file mode 100644
index 00000000..176a53b8
--- /dev/null
+++ b/src/test/resources/issue264/Util_after.java
@@ -0,0 +1,1048 @@
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * 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 org.wso2.transport.http.netty.contractimpl.common;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.base64.Base64;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.DefaultHttpRequest;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.handler.codec.http2.Http2Exception;
+import io.netty.handler.codec.http2.Http2Headers;
+import io.netty.handler.codec.http2.HttpConversionUtil;
+import io.netty.handler.ssl.ReferenceCountedOpenSslContext;
+import io.netty.handler.ssl.ReferenceCountedOpenSslEngine;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslContextBuilder;
+import io.netty.handler.ssl.SslHandler;
+import io.netty.handler.ssl.SslProvider;
+import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
+import io.netty.util.AsciiString;
+import io.netty.util.CharsetUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.wso2.transport.http.netty.contract.Constants;
+import org.wso2.transport.http.netty.contract.HttpResponseFuture;
+import org.wso2.transport.http.netty.contract.config.ChunkConfig;
+import org.wso2.transport.http.netty.contract.config.ForwardedExtensionConfig;
+import org.wso2.transport.http.netty.contract.config.KeepAliveConfig;
+import org.wso2.transport.http.netty.contract.config.ProxyServerConfiguration;
+import org.wso2.transport.http.netty.contract.config.SenderConfiguration;
+import org.wso2.transport.http.netty.contract.exceptions.ConfigurationException;
+import org.wso2.transport.http.netty.contractimpl.Http2OutboundRespListener;
+import org.wso2.transport.http.netty.contractimpl.common.ssl.SSLConfig;
+import org.wso2.transport.http.netty.contractimpl.common.ssl.SSLHandlerFactory;
+import org.wso2.transport.http.netty.contractimpl.listener.HttpTraceLoggingHandler;
+import org.wso2.transport.http.netty.contractimpl.listener.SourceHandler;
+import org.wso2.transport.http.netty.contractimpl.listener.http2.Http2SourceHandler;
+import org.wso2.transport.http.netty.contractimpl.sender.CertificateValidationHandler;
+import org.wso2.transport.http.netty.contractimpl.sender.ForwardedHeaderUpdater;
+import org.wso2.transport.http.netty.contractimpl.sender.OCSPStaplingHandler;
+import org.wso2.transport.http.netty.message.DefaultBackPressureListener;
+import org.wso2.transport.http.netty.message.DefaultListener;
+import org.wso2.transport.http.netty.message.Http2InboundContentListener;
+import org.wso2.transport.http.netty.message.Http2PassthroughBackPressureListener;
+import org.wso2.transport.http.netty.message.HttpCarbonMessage;
+import org.wso2.transport.http.netty.message.HttpCarbonRequest;
+import org.wso2.transport.http.netty.message.HttpCarbonResponse;
+import org.wso2.transport.http.netty.message.Listener;
+import org.wso2.transport.http.netty.message.PassthroughBackPressureListener;
+import org.wso2.transport.http.netty.message.PooledDataStreamerFactory;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.nio.channels.ClosedChannelException;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Map;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLParameters;
+
+import static io.netty.handler.codec.http.HttpHeaderNames.TRAILER;
+import static org.wso2.transport.http.netty.contract.Constants.COLON;
+import static org.wso2.transport.http.netty.contract.Constants.HEADER_VAL_100_CONTINUE;
+import static org.wso2.transport.http.netty.contract.Constants.HTTP_HOST;
+import static org.wso2.transport.http.netty.contract.Constants.HTTP_PORT;
+import static org.wso2.transport.http.netty.contract.Constants.HTTP_SCHEME;
+import static org.wso2.transport.http.netty.contract.Constants.IS_PROXY_ENABLED;
+import static org.wso2.transport.http.netty.contract.Constants.MUTUAL_SSL_HANDSHAKE_RESULT;
+import static org.wso2.transport.http.netty.contract.Constants.OK_200;
+import static org.wso2.transport.http.netty.contract.Constants.PROTOCOL;
+import static org.wso2.transport.http.netty.contract.Constants
+        .REMOTE_CLIENT_CLOSED_WHILE_WRITING_OUTBOUND_RESPONSE_HEADERS;
+import static org.wso2.transport.http.netty.contract.Constants.TO;
+import static org.wso2.transport.http.netty.contract.Constants.URL_AUTHORITY;
+import static org.wso2.transport.http.netty.contract.config.KeepAliveConfig.ALWAYS;
+import static org.wso2.transport.http.netty.contract.config.KeepAliveConfig.AUTO;
+
+/**
+ * Includes utility methods for creating http requests and responses and their related properties.
+ */
+public class Util {
+
+    private Util() {
+        //Hides implicit public constructor.
+    }
+
+    private static final Logger LOG = LoggerFactory.getLogger(Util.class);
+
+    private static String getStringValue(HttpCarbonMessage msg, String key, String defaultValue) {
+        String value = (String) msg.getProperty(key);
+        if (value == null) {
+            return defaultValue;
+        }
+
+        return value;
+    }
+
+    private static int getIntValue(HttpCarbonMessage msg) {
+        Integer value = msg.getHttpStatusCode();
+        if (value == null) {
+            return OK_200;
+        }
+        return value;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static HttpResponse createHttpResponse(HttpCarbonMessage outboundResponseMsg, String inboundReqHttpVersion,
+                                                  String serverName, boolean keepAlive) {
+
+        HttpVersion httpVersion = new HttpVersion(Constants.HTTP_VERSION_PREFIX + inboundReqHttpVersion, true);
+        HttpResponseStatus httpResponseStatus = getHttpResponseStatus(outboundResponseMsg);
+        HttpResponse outboundNettyResponse = new DefaultHttpResponse(httpVersion, httpResponseStatus);
+
+        setOutboundRespHeaders(outboundResponseMsg, inboundReqHttpVersion, serverName, keepAlive,
+                outboundNettyResponse);
+
+        return outboundNettyResponse;
+    }
+
+    public static HttpResponse createFullHttpResponse(HttpCarbonMessage outboundResponseMsg,
+            String inboundReqHttpVersion, String serverName, boolean keepAlive, ByteBuf fullContent) {
+
+        HttpVersion httpVersion = new HttpVersion(Constants.HTTP_VERSION_PREFIX + inboundReqHttpVersion, true);
+        HttpResponseStatus httpResponseStatus = getHttpResponseStatus(outboundResponseMsg);
+        HttpResponse outboundNettyResponse =
+                new DefaultFullHttpResponse(httpVersion, httpResponseStatus, fullContent);
+
+        setOutboundRespHeaders(outboundResponseMsg, inboundReqHttpVersion, serverName, keepAlive,
+                outboundNettyResponse);
+
+        return outboundNettyResponse;
+    }
+
+    private static void setOutboundRespHeaders(HttpCarbonMessage outboundResponseMsg, String inboundReqHttpVersion,
+                                               String serverName, boolean keepAlive,
+                                               HttpResponse outboundNettyResponse) {
+        if (!keepAlive && (Float.valueOf(inboundReqHttpVersion) >= Constants.HTTP_1_1)) {
+            outboundResponseMsg.setHeader(HttpHeaderNames.CONNECTION.toString(), Constants.CONNECTION_CLOSE);
+        } else if (keepAlive && (Float.valueOf(inboundReqHttpVersion) < Constants.HTTP_1_1)) {
+            outboundResponseMsg.setHeader(HttpHeaderNames.CONNECTION.toString(), Constants.CONNECTION_KEEP_ALIVE);
+        } else {
+            outboundResponseMsg.removeHeader(HttpHeaderNames.CONNECTION.toString());
+        }
+
+        if (outboundResponseMsg.getHeader(HttpHeaderNames.SERVER.toString()) == null) {
+            outboundResponseMsg.setHeader(HttpHeaderNames.SERVER.toString(), serverName);
+        }
+
+        if (outboundResponseMsg.getHeader(HttpHeaderNames.DATE.toString()) == null) {
+            outboundResponseMsg.setHeader(HttpHeaderNames.DATE.toString(),
+                                          ZonedDateTime.now().format(DateTimeFormatter.RFC_1123_DATE_TIME));
+        }
+
+        outboundNettyResponse.headers().add(outboundResponseMsg.getHeaders());
+    }
+
+    public static HttpResponseStatus getHttpResponseStatus(HttpCarbonMessage msg) {
+        int statusCode = Util.getIntValue(msg);
+        String reasonPhrase = Util.getStringValue(msg, Constants.HTTP_REASON_PHRASE,
+                HttpResponseStatus.valueOf(statusCode).reasonPhrase());
+        return new HttpResponseStatus(statusCode, reasonPhrase);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static HttpRequest createHttpRequest(HttpCarbonMessage outboundRequestMsg) {
+        HttpMethod httpMethod = getHttpMethod(outboundRequestMsg);
+        HttpVersion httpVersion = getHttpVersion(outboundRequestMsg);
+        String requestPath = getRequestPath(outboundRequestMsg);
+        HttpRequest outboundNettyRequest = new DefaultHttpRequest(httpVersion, httpMethod,
+                (String) outboundRequestMsg.getProperty(TO));
+        outboundNettyRequest.setMethod(httpMethod);
+        outboundNettyRequest.setProtocolVersion(httpVersion);
+        outboundNettyRequest.setUri(requestPath);
+        outboundNettyRequest.headers().add(outboundRequestMsg.getHeaders());
+
+        return outboundNettyRequest;
+    }
+
+    private static String getRequestPath(HttpCarbonMessage outboundRequestMsg) {
+        if (outboundRequestMsg.getProperty(TO) == null) {
+            outboundRequestMsg.setProperty(TO, "");
+        }
+        // Return absolute url if proxy is enabled
+        if (outboundRequestMsg.getProperty(IS_PROXY_ENABLED) != null && (boolean) outboundRequestMsg
+                .getProperty(IS_PROXY_ENABLED) && outboundRequestMsg.getProperty(PROTOCOL).equals(HTTP_SCHEME)) {
+            return outboundRequestMsg.getProperty(PROTOCOL) + URL_AUTHORITY
+                    + outboundRequestMsg.getProperty(HTTP_HOST) + COLON
+                    + outboundRequestMsg.getProperty(HTTP_PORT)
+                    + outboundRequestMsg.getProperty(TO);
+        }
+        return (String) outboundRequestMsg.getProperty(TO);
+    }
+
+    private static HttpVersion getHttpVersion(HttpCarbonMessage outboundRequestMsg) {
+        HttpVersion httpVersion;
+        if (null != outboundRequestMsg.getHttpVersion()) {
+            httpVersion = new HttpVersion(Constants.HTTP_VERSION_PREFIX
+                    + outboundRequestMsg.getHttpVersion(), true);
+        } else {
+            httpVersion = new HttpVersion(Constants.DEFAULT_VERSION_HTTP_1_1, true);
+        }
+        return httpVersion;
+    }
+
+    private static HttpMethod getHttpMethod(HttpCarbonMessage outboundRequestMsg) {
+        HttpMethod httpMethod;
+        if (null != outboundRequestMsg.getHttpMethod()) {
+            httpMethod = new HttpMethod(outboundRequestMsg.getHttpMethod());
+        } else {
+            httpMethod = new HttpMethod(Constants.HTTP_POST_METHOD);
+        }
+        return httpMethod;
+    }
+
+    public static void setupChunkedRequest(HttpCarbonMessage httpOutboundRequest) {
+        httpOutboundRequest.removeHeader(HttpHeaderNames.CONTENT_LENGTH.toString());
+        if (httpOutboundRequest.getHeader(HttpHeaderNames.TRANSFER_ENCODING.toString()) == null) {
+            httpOutboundRequest.setHeader(HttpHeaderNames.TRANSFER_ENCODING.toString(), Constants.CHUNKED);
+        }
+    }
+
+    /**
+     * Creates a {@link HttpRequest} using a {@link Http2Headers} received over a particular HTTP/2 stream.
+     *
+     * @param http2Headers the Http2Headers received over a HTTP/2 stream
+     * @param streamId     the stream id
+     * @return the HttpRequest formed using the HttpHeaders
+     * @throws Http2Exception if an error occurs while converting headers from HTTP/2 to HTTP
+     */
+    public static HttpRequest createHttpRequestFromHttp2Headers(Http2Headers http2Headers, int streamId)
+            throws Http2Exception {
+        String method = Constants.HTTP_GET_METHOD;
+        if (http2Headers.method() != null) {
+            method = http2Headers.getAndRemove(Constants.HTTP2_METHOD).toString();
+        }
+        String path = Constants.DEFAULT_BASE_PATH;
+        if (http2Headers.path() != null) {
+            path = http2Headers.getAndRemove(Constants.HTTP2_PATH).toString();
+        }
+        // Remove PseudoHeaderNames from headers
+        http2Headers.getAndRemove(Constants.HTTP2_AUTHORITY);
+        http2Headers.getAndRemove(Constants.HTTP2_SCHEME);
+        HttpVersion version = new HttpVersion(Constants.HTTP_VERSION_2_0, true);
+
+        // Construct new HTTP Carbon Request
+        HttpRequest httpRequest = new DefaultHttpRequest(version, HttpMethod.valueOf(method), path);
+        // Convert Http2Headers to HttpHeaders
+        HttpConversionUtil.addHttp2ToHttpHeaders(
+                streamId, http2Headers, httpRequest.headers(), version, false, true);
+        CharSequence trailerHeaderValue = http2Headers.get(TRAILER.toString());
+        if (trailerHeaderValue != null) {
+            httpRequest.headers().add(TRAILER.toString(), trailerHeaderValue.toString());
+        }
+        return httpRequest;
+    }
+
+    public static void setupContentLengthRequest(HttpCarbonMessage httpOutboundRequest, long contentLength) {
+        removeContentLengthAndTransferEncodingHeaders(httpOutboundRequest);
+        httpOutboundRequest.setHeader(HttpHeaderNames.CONTENT_LENGTH.toString(), String.valueOf(contentLength));
+    }
+
+    public static boolean checkContentLengthAndTransferEncodingHeaderAllowance(HttpCarbonMessage httpOutboundRequest) {
+        HttpMethod method = getHttpMethod(httpOutboundRequest);
+        if (httpOutboundRequest.getProperty(Constants.NO_ENTITY_BODY) == null) {
+            return true;
+        }
+        boolean nonEntityBodyRequest = (boolean) httpOutboundRequest.getProperty(Constants.NO_ENTITY_BODY);
+        if (nonEntityBodyRequest && (HttpMethod.GET.equals(method)
+                || HttpMethod.HEAD.equals(method) || HttpMethod.OPTIONS.equals(method))) {
+            removeContentLengthAndTransferEncodingHeaders(httpOutboundRequest);
+            return false;
+        }
+        return true;
+    }
+
+    private static void removeContentLengthAndTransferEncodingHeaders(HttpCarbonMessage httpOutboundRequest) {
+        httpOutboundRequest.removeHeader(HttpHeaderNames.TRANSFER_ENCODING.toString());
+        httpOutboundRequest.removeHeader(HttpHeaderNames.CONTENT_LENGTH.toString());
+    }
+
+    /**
+     * Returns the status of chunking compatibility with http version.
+     *
+     * @param httpVersion http version string.
+     * @return  boolean value of status.
+     */
+    public static boolean isVersionCompatibleForChunking(String httpVersion) {
+        return Float.valueOf(httpVersion) >= Constants.HTTP_1_1;
+    }
+
+    /**
+     * Returns whether to enforce chunking on HTTP 1.0 requests.
+     *
+     * @param chunkConfig Chunking configuration.
+     * @param httpVersion http version string.
+     * @return true if chunking should be enforced else false.
+     */
+    public static boolean shouldEnforceChunkingforHttpOneZero(ChunkConfig chunkConfig, String httpVersion) {
+        return chunkConfig == ChunkConfig.ALWAYS && Float.valueOf(httpVersion) >= Constants.HTTP_1_0;
+    }
+
+    /**
+     * Configure outbound HTTP pipeline for SSL configuration.
+     *
+     * @param socketChannel Socket channel of outbound connection
+     * @param sslConfig     {@link SSLConfig}
+     * @param host          host of the connection
+     * @param port          port of the connection
+     * @return the {@link SSLEngine} which enables secure communication
+     * @throws SSLException if any error occurs in the SSL connection
+     */
+    public static SSLEngine configureHttpPipelineForSSL(SocketChannel socketChannel, String host, int port,
+                                                        SSLConfig sslConfig) throws SSLException {
+        LOG.debug("adding ssl handler");
+        SSLEngine sslEngine = null;
+        SslHandler sslHandler;
+        ChannelPipeline pipeline = socketChannel.pipeline();
+        SSLHandlerFactory sslHandlerFactory = new SSLHandlerFactory(sslConfig);
+        if (sslConfig.isOcspStaplingEnabled()) {
+            sslHandlerFactory.createSSLContextFromKeystores(false);
+            ReferenceCountedOpenSslContext referenceCountedOpenSslContext = sslHandlerFactory
+                    .buildClientReferenceCountedOpenSslContext();
+
+            if (referenceCountedOpenSslContext != null) {
+                sslHandler = referenceCountedOpenSslContext.newHandler(socketChannel.alloc());
+                sslEngine = sslHandler.engine();
+                setSslHandshakeTimeOut(sslConfig, sslHandler);
+                socketChannel.pipeline().addLast(sslHandler);
+                socketChannel.pipeline().addLast(new OCSPStaplingHandler((ReferenceCountedOpenSslEngine) sslEngine));
+            }
+        } else {
+            if (sslConfig.isDisableSsl()) {
+                sslEngine = createInsecureSslEngine(socketChannel, host, port);
+            } else {
+                if (sslConfig.getTrustStore() != null) {
+                    sslHandlerFactory.createSSLContextFromKeystores(false);
+                    sslEngine = instantiateAndConfigSSL(sslConfig, host, port,
+                            sslConfig.isHostNameVerificationEnabled(), sslHandlerFactory);
+                } else {
+                    sslEngine = getSslEngineForCerts(socketChannel, host, port, sslConfig, sslHandlerFactory);
+                }
+            }
+            sslHandler = new SslHandler(sslEngine);
+            setSslHandshakeTimeOut(sslConfig, sslHandler);
+            pipeline.addLast(Constants.SSL_HANDLER, sslHandler);
+            if (sslConfig.isValidateCertEnabled()) {
+                pipeline.addLast(Constants.HTTP_CERT_VALIDATION_HANDLER, new CertificateValidationHandler(
+                        sslEngine, sslConfig.getCacheValidityPeriod(), sslConfig.getCacheSize()));
+            }
+        }
+        return sslEngine;
+    }
+
+    private static SSLEngine getSslEngineForCerts(SocketChannel socketChannel, String host, int port,
+            SSLConfig sslConfig, SSLHandlerFactory sslHandlerFactory) throws SSLException {
+        SslContext sslContext = sslHandlerFactory.createHttpTLSContextForClient();
+        SslHandler sslHandler = sslContext.newHandler(socketChannel.alloc(), host, port);
+        SSLEngine sslEngine = sslHandler.engine();
+        sslHandlerFactory.addCommonConfigs(sslEngine);
+        sslHandlerFactory.setSNIServerNames(sslEngine, host);
+        if (sslConfig.isHostNameVerificationEnabled()) {
+            setHostNameVerfication(sslEngine);
+        }
+        return sslEngine;
+    }
+
+    private static SSLEngine createInsecureSslEngine(SocketChannel socketChannel, String host, int port)
+            throws SSLException {
+        SslContext sslContext = SslContextBuilder.forClient().sslProvider(SslProvider.JDK)
+                .trustManager(InsecureTrustManagerFactory.INSTANCE).build();
+        SslHandler sslHandler = sslContext.newHandler(socketChannel.alloc(), host, port);
+        return sslHandler.engine();
+    }
+
+    /**
+     * Set configurations to create ssl engine.
+     *
+     * @param sslConfig ssl related configurations
+     * @param host host of the connection
+     * @param port port of the connection
+     * @param hostNameVerificationEnabled true if host name verification is enabled
+     * @param sslHandlerFactory an instance of sslHandlerFactory
+     * @return ssl engine
+     */
+    private static SSLEngine instantiateAndConfigSSL(SSLConfig sslConfig, String host, int port,
+            boolean hostNameVerificationEnabled, SSLHandlerFactory sslHandlerFactory) {
+        // set the pipeline factory, which creates the pipeline for each newly created channels
+        SSLEngine sslEngine = null;
+        if (sslConfig != null) {
+            sslEngine = sslHandlerFactory.buildClientSSLEngine(host, port);
+            sslEngine.setUseClientMode(true);
+            sslHandlerFactory.setSNIServerNames(sslEngine, host);
+            if (hostNameVerificationEnabled) {
+                sslHandlerFactory.setHostNameVerfication(sslEngine);
+            }
+        }
+        return sslEngine;
+    }
+
+    /**
+     * Get integer type property value from a property map.
+     * <p>
+     * If {@code properties} is null or property value is null, default value is returned
+     *
+     * @param properties map of properties
+     * @param key        property name
+     * @param defaultVal default value of the property
+     * @return integer value of the property,
+     */
+    public static int getIntProperty(Map<String, Object> properties, String key, int defaultVal) {
+
+        if (properties == null) {
+            return defaultVal;
+        }
+
+        Object propertyVal = properties.get(key);
+
+        if (propertyVal == null) {
+            return defaultVal;
+        }
+
+        if (!(propertyVal instanceof Integer)) {
+            throw new IllegalArgumentException("Property : " + key + " must be an integer");
+        }
+
+        return (Integer) propertyVal;
+    }
+
+
+    /**
+     * Get string type property value from a property map.
+     * <p>
+     * If {@code properties} is null or property value is null, default value is returned
+     *
+     * @param properties map of properties
+     * @param key        property name
+     * @param defaultVal default value of the property
+     * @return integer value of the property,
+     */
+    public static String getStringProperty(Map<String, Object> properties, String key, String defaultVal) {
+
+        if (properties == null) {
+            return defaultVal;
+        }
+
+        Object propertyVal = properties.get(key);
+
+        if (propertyVal == null) {
+            return defaultVal;
+        }
+
+        if (!(propertyVal instanceof String)) {
+            throw new IllegalArgumentException("Property : " + key + " must be a string");
+        }
+
+        return (String) propertyVal;
+    }
+
+
+    /**
+     * Get boolean type property value from a property map.
+     * <p>
+     * If {@code properties} is null or property value is null, default value is returned
+     *
+     * @param properties map of properties
+     * @param key        property name
+     * @param defaultVal default value of the property
+     * @return integer value of the property,
+     */
+    public static Boolean getBooleanProperty(Map<String, Object> properties, String key, boolean defaultVal) {
+
+        if (properties == null) {
+            return defaultVal;
+        }
+
+        Object propertyVal = properties.get(key);
+
+        if (propertyVal == null) {
+            return defaultVal;
+        }
+
+        if (!(propertyVal instanceof Boolean)) {
+            throw new IllegalArgumentException("Property : " + key + " must be a boolean");
+        }
+
+        return (Boolean) propertyVal;
+    }
+
+    /**
+     * Get long type property value from a property map.
+     * <p>
+     * If {@code properties} is null or property value is null, default value is returned
+     *
+     * @param properties map of properties
+     * @param key        property name
+     * @param defaultVal default value of the property
+     * @return integer value of the property,
+     */
+    public static Long getLongProperty(Map<String, Object> properties, String key, long defaultVal) {
+
+        if (properties == null) {
+            return defaultVal;
+        }
+
+        Object propertyVal = properties.get(key);
+
+        if (propertyVal == null) {
+            return defaultVal;
+        }
+
+        if (!(propertyVal instanceof Long)) {
+            throw new IllegalArgumentException("Property : " + key + " must be a long");
+        }
+
+        return (Long) propertyVal;
+    }
+
+    //TODO Below code segment is directly copied from kernel. Once kernel Utils been moved as a separate dependency
+    //Need to remove below part and use that.
+    private static final Pattern varPattern = Pattern.compile("\\$\\{([^}]*)}");
+
+    /**
+     * Replace system property holders in the property values.
+     * e.g. Replace ${carbon.home} with value of the carbon.home system property.
+     *
+     * @param value string value to substitute
+     * @return String substituted string
+     */
+    public static String substituteVariables(String value) {
+        Matcher matcher = varPattern.matcher(value);
+        boolean found = matcher.find();
+        if (!found) {
+            return value;
+        }
+        StringBuffer sb = new StringBuffer();
+        do {
+            String sysPropKey = matcher.group(1);
+            String sysPropValue = getSystemVariableValue(sysPropKey, null);
+            if (sysPropValue == null || sysPropValue.length() == 0) {
+                throw new RuntimeException("System property " + sysPropKey + " is not specified");
+            }
+            // Due to reported bug under CARBON-14746
+            sysPropValue = sysPropValue.replace("\\", "\\\\");
+            matcher.appendReplacement(sb, sysPropValue);
+        } while (matcher.find());
+        matcher.appendTail(sb);
+        return sb.toString();
+    }
+
+    /**
+     * A utility which allows reading variables from the environment or System properties.
+     * If the variable in available in the environment as well as a System property, the System property takes
+     * precedence.
+     *
+     * @param variableName System/environment variable name
+     * @param defaultValue default value to be returned if the specified system variable is not specified.
+     * @return value of the system/environment variable
+     */
+    private static String getSystemVariableValue(String variableName, String defaultValue) {
+        String value;
+        if (System.getProperty(variableName) != null) {
+            value = System.getProperty(variableName);
+        } else if (System.getenv(variableName) != null) {
+            value = System.getenv(variableName);
+        } else {
+            value = defaultValue;
+        }
+        return value;
+    }
+
+    /**
+     * Create ID for server connector.
+     *
+     * @param host host of the channel.
+     * @param port port of the channel.
+     * @return constructed ID for server connector.
+     */
+    public static String createServerConnectorID(String host, int port) {
+        return host + ":" + port;
+    }
+
+    /**
+     * Reset channel attributes.
+     *
+     * @param ctx Channel handler context
+     */
+    public static void resetChannelAttributes(ChannelHandlerContext ctx) {
+        ctx.channel().attr(Constants.RESPONSE_FUTURE_OF_ORIGINAL_CHANNEL).set(null);
+        ctx.channel().attr(Constants.ORIGINAL_REQUEST).set(null);
+        ctx.channel().attr(Constants.REDIRECT_COUNT).set(null);
+        ctx.channel().attr(Constants.RESOLVED_REQUESTED_URI_ATTR).set(null);
+        ctx.channel().attr(Constants.ORIGINAL_CHANNEL_START_TIME).set(null);
+        ctx.channel().attr(Constants.ORIGINAL_CHANNEL_TIMEOUT).set(null);
+    }
+
+    /**
+     * Check if a given content is last httpContent.
+     *
+     * @param httpContent new content.
+     * @return true or false.
+     */
+    public static boolean isLastHttpContent(HttpContent httpContent) {
+        return httpContent instanceof LastHttpContent;
+    }
+
+    /**
+     * Send back no entity body response and close the connection. This function is mostly used
+     * when we send back error messages.
+     *
+     * @param ctx connection
+     * @param status response status
+     * @param httpVersion of the response
+     * @param serverName server name
+     */
+    public static void sendAndCloseNoEntityBodyResp(ChannelHandlerContext ctx, HttpResponseStatus status,
+            HttpVersion httpVersion, String serverName) {
+        HttpResponse outboundResponse = new DefaultHttpResponse(httpVersion, status);
+        outboundResponse.headers().set(HttpHeaderNames.CONTENT_LENGTH, 0);
+        outboundResponse.headers().set(HttpHeaderNames.CONNECTION.toString(), Constants.CONNECTION_CLOSE);
+        outboundResponse.headers().set(HttpHeaderNames.SERVER.toString(), serverName);
+        ChannelFuture outboundRespFuture = ctx.channel().writeAndFlush(outboundResponse);
+        outboundRespFuture.addListener(
+                (ChannelFutureListener) channelFuture -> LOG.warn("Failed to send {}", status.reasonPhrase()));
+        ctx.channel().close();
+    }
+
+    /**
+     * Checks for status of the response write operation.
+     *
+     * @param inboundRequestMsg        request message received from the client
+     * @param outboundRespStatusFuture the future of outbound response write operation
+     * @param channelFuture            the channel future related to response write operation
+     */
+    public static void checkForResponseWriteStatus(HttpCarbonMessage inboundRequestMsg,
+                                           HttpResponseFuture outboundRespStatusFuture, ChannelFuture channelFuture) {
+        channelFuture.addListener(writeOperationPromise -> {
+            Throwable throwable = writeOperationPromise.cause();
+            if (throwable != null) {
+                if (throwable instanceof ClosedChannelException) {
+                    throwable = new IOException(REMOTE_CLIENT_CLOSED_WHILE_WRITING_OUTBOUND_RESPONSE_HEADERS);
+                }
+                outboundRespStatusFuture.notifyHttpListener(throwable);
+            } else {
+                outboundRespStatusFuture.notifyHttpListener(inboundRequestMsg);
+            }
+        });
+    }
+
+    /**
+     * Adds a listener to notify the outbound response future if an error occurs while writing the response message.
+     *
+     * @param outboundRespStatusFuture  the future of outbound response write operation
+     * @param channelFuture             the channel future related to response write operation
+     * @param http2OutboundRespListener the http/2 outbound response listener
+     */
+    public static void addResponseWriteFailureListener(HttpResponseFuture outboundRespStatusFuture,
+                                                       ChannelFuture channelFuture,
+                                                       Http2OutboundRespListener http2OutboundRespListener) {
+        channelFuture.addListener(writeOperationPromise -> {
+            Throwable throwable = writeOperationPromise.cause();
+            if (throwable != null) {
+                if (throwable instanceof ClosedChannelException) {
+                    throwable = new IOException(REMOTE_CLIENT_CLOSED_WHILE_WRITING_OUTBOUND_RESPONSE_HEADERS);
+                }
+
+                if (http2OutboundRespListener.getOutboundResponseMsg() != null) {
+                    http2OutboundRespListener.getOutboundResponseMsg().setIoException(
+                            new IOException(REMOTE_CLIENT_CLOSED_WHILE_WRITING_OUTBOUND_RESPONSE_HEADERS));
+                }
+
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug("Remove response writer and backpressure listener in case of failure");
+                }
+                http2OutboundRespListener.removeBackPressureListener();
+                http2OutboundRespListener.removeDefaultResponseWriter();
+                outboundRespStatusFuture.notifyHttpListener(throwable);
+            }
+        });
+    }
+
+    /**
+     * Creates HTTP carbon message.
+     *
+     * @param httpMessage HTTP message
+     * @param ctx Channel handler context
+     * @return HttpCarbonMessage
+     */
+    public static HttpCarbonMessage createHTTPCarbonMessage(HttpMessage httpMessage, ChannelHandlerContext ctx) {
+        Listener contentListener = new DefaultListener(ctx);
+        return new HttpCarbonMessage(httpMessage, contentListener);
+    }
+
+    /**
+     * Removes handlers from the pipeline if they are present.
+     *
+     * @param pipeline     the channel pipeline
+     * @param handlerNames names of the handlers to be removed
+     */
+    public static void safelyRemoveHandlers(ChannelPipeline pipeline, String... handlerNames) {
+        for (String name : handlerNames) {
+            if (pipeline.get(name) != null) {
+                pipeline.remove(name);
+            } else {
+                LOG.debug("Trying to remove not engaged {} handler from the pipeline", name);
+            }
+        }
+    }
+
+    /**
+     * Create a HttpCarbonMessage using the netty inbound http request.
+     * @param httpRequestHeaders of inbound request
+     * @param ctx of the inbound request
+     * @param sourceHandler instance which handled the particular request
+     * @return HttpCarbon message
+     */
+    public static HttpCarbonMessage createInboundReqCarbonMsg(HttpRequest httpRequestHeaders,
+            ChannelHandlerContext ctx, SourceHandler sourceHandler) {
+
+        HttpCarbonMessage inboundRequestMsg =
+                new HttpCarbonRequest(httpRequestHeaders, new DefaultListener(ctx));
+        inboundRequestMsg.setProperty(Constants.POOLED_BYTE_BUFFER_FACTORY, new PooledDataStreamerFactory(ctx.alloc()));
+
+        inboundRequestMsg.setProperty(Constants.CHNL_HNDLR_CTX, ctx);
+        inboundRequestMsg.setProperty(Constants.SRC_HANDLER, sourceHandler);
+        HttpVersion protocolVersion = httpRequestHeaders.protocolVersion();
+        inboundRequestMsg.setHttpVersion(protocolVersion.majorVersion() + "." + protocolVersion.minorVersion());
+        inboundRequestMsg.setHttpMethod(httpRequestHeaders.method().name());
+        InetSocketAddress localAddress = null;
+
+        //This check was added because in case of netty embedded channel, this could be of type 'EmbeddedSocketAddress'.
+        if (ctx.channel().localAddress() instanceof InetSocketAddress) {
+            localAddress = (InetSocketAddress) ctx.channel().localAddress();
+        }
+        inboundRequestMsg.setProperty(Constants.LISTENER_PORT, localAddress != null ? localAddress.getPort() : null);
+        inboundRequestMsg.setProperty(Constants.LISTENER_INTERFACE_ID, sourceHandler.getInterfaceId());
+        inboundRequestMsg.setProperty(Constants.PROTOCOL, Constants.HTTP_SCHEME);
+
+        boolean isSecuredConnection = false;
+        if (ctx.channel().pipeline().get(Constants.SSL_HANDLER) != null) {
+            isSecuredConnection = true;
+        }
+        inboundRequestMsg.setProperty(Constants.IS_SECURED_CONNECTION, isSecuredConnection);
+
+        inboundRequestMsg.setProperty(Constants.LOCAL_ADDRESS, ctx.channel().localAddress());
+        inboundRequestMsg.setProperty(Constants.REMOTE_ADDRESS, sourceHandler.getRemoteAddress());
+        inboundRequestMsg.setRequestUrl(httpRequestHeaders.uri());
+        inboundRequestMsg.setProperty(Constants.TO, httpRequestHeaders.uri());
+        inboundRequestMsg.setProperty(MUTUAL_SSL_HANDSHAKE_RESULT,
+                ctx.channel().attr(Constants.MUTUAL_SSL_RESULT_ATTRIBUTE).get());
+
+        return inboundRequestMsg;
+    }
+
+    /**
+     * Create a HttpCarbonMessage using the netty inbound response message.
+     * @param ctx of the inbound response message
+     * @param httpResponseHeaders of the inbound response message
+     * @param outboundRequestMsg is the correlated outbound request message
+     * @return HttpCarbon message
+     */
+    public static HttpCarbonMessage createInboundRespCarbonMsg(ChannelHandlerContext ctx,
+                                                               HttpResponse httpResponseHeaders,
+                                                               HttpCarbonMessage outboundRequestMsg) {
+        HttpCarbonMessage inboundResponseMsg = new HttpCarbonResponse(httpResponseHeaders, new DefaultListener(ctx));
+        inboundResponseMsg.setProperty(Constants.POOLED_BYTE_BUFFER_FACTORY,
+                new PooledDataStreamerFactory(ctx.alloc()));
+
+        inboundResponseMsg.setProperty(Constants.DIRECTION, Constants.DIRECTION_RESPONSE);
+        inboundResponseMsg.setHttpStatusCode(httpResponseHeaders.status().code());
+
+        //copy required properties for service chaining from incoming carbon message to the response carbon message
+        //copy shared worker pool
+        inboundResponseMsg.setProperty(Constants.EXECUTOR_WORKER_POOL, outboundRequestMsg
+                .getProperty(Constants.EXECUTOR_WORKER_POOL));
+
+        return inboundResponseMsg;
+    }
+
+    /**
+     * Check whether a connection should alive or not.
+     * @param keepAliveConfig of the connection
+     * @param outboundRequestMsg of this particular transaction
+     * @return true if the connection should be kept alive
+     * @throws ConfigurationException for invalid configurations
+     */
+    public static boolean isKeepAlive(KeepAliveConfig keepAliveConfig, HttpCarbonMessage outboundRequestMsg)
+            throws ConfigurationException {
+        switch (keepAliveConfig) {
+        case AUTO:
+            return Float.valueOf(outboundRequestMsg.getHttpVersion()) > Constants.HTTP_1_0;
+        case ALWAYS:
+            return true;
+        case NEVER:
+            return false;
+        default:
+            // The execution will never reach here. In case execution reach here means it should be an invalid value
+            // for keep-alive configurations.
+            throw new ConfigurationException("Invalid keep-alive configuration value : "
+                    + keepAliveConfig.toString());
+        }
+    }
+
+    /**
+     * Check whether a particular request is expecting continue.
+     * @param inboundRequestMsg in question
+     * @return true if the request expects 100-continue response
+     */
+    public static boolean is100ContinueRequest(HttpCarbonMessage inboundRequestMsg) {
+        return HEADER_VAL_100_CONTINUE.equalsIgnoreCase(
+                inboundRequestMsg.getHeader(HttpHeaderNames.EXPECT.toString()));
+    }
+
+    /**
+     * Decide whether the connection should be kept open.
+     *
+     * @param keepAliveConfig         Represents keepalive configuration
+     * @param requestConnectionHeader Connection header of the request
+     * @param httpVersion             Represents HTTP version
+     * @return A boolean indicating whether to keep the connection open or not
+     */
+    public static boolean isKeepAliveConnection(KeepAliveConfig keepAliveConfig, String requestConnectionHeader,
+                                                String httpVersion) {
+        if (keepAliveConfig == null || keepAliveConfig == AUTO) {
+            if (Float.valueOf(httpVersion) <= Constants.HTTP_1_0) {
+                return requestConnectionHeader != null && requestConnectionHeader
+                        .equalsIgnoreCase(Constants.CONNECTION_KEEP_ALIVE);
+            } else {
+                return requestConnectionHeader == null || !requestConnectionHeader
+                        .equalsIgnoreCase(Constants.CONNECTION_CLOSE);
+            }
+        } else {
+            return keepAliveConfig == ALWAYS;
+        }
+    }
+
+    /**
+     * Disable host name verification if it is set to false by the user.
+     *
+     * @param sslEngine ssl engine
+     */
+    public static void setHostNameVerfication(SSLEngine sslEngine) {
+        SSLParameters sslParams = sslEngine.getSSLParameters();
+        sslParams.setEndpointIdentificationAlgorithm(Constants.HTTPS_SCHEME);
+        sslEngine.setSSLParameters(sslParams);
+    }
+
+    /**
+     * Use this method to get the {@link BackPressureHandler} in the pipeline. This requires a {@link
+     * ChannelHandlerContext} of a handler in the pipeline.
+     *
+     * @param channelContext the channelContext which will be used to obtain the {@link BackPressureHandler} in the
+     *                       pipeline.
+     * @return The {@link BackPressureHandler} in the pipeline.
+     */
+    public static BackPressureHandler getBackPressureHandler(ChannelHandlerContext channelContext) {
+        return (BackPressureHandler) channelContext.pipeline().get(Constants.BACK_PRESSURE_HANDLER);
+
+    }
+
+    /**
+     * Sets the backPressure listener the to the Observable of the handler.
+     *
+     * @param outboundMessage     represents the outbound request or response
+     * @param backpressureHandler the handler that checks the writability
+     * @param ctx                 represents channel handler context
+     */
+    public static void setBackPressureListener(HttpCarbonMessage outboundMessage,
+                                               BackPressureHandler backpressureHandler, ChannelHandlerContext ctx) {
+        if (backpressureHandler != null) {
+            if (outboundMessage.isPassthrough()) {
+                setPassthroughBackOffListener(outboundMessage, backpressureHandler, ctx);
+            } else {
+                backpressureHandler.getBackPressureObservable().setListener(
+                    new DefaultBackPressureListener());
+            }
+        }
+    }
+
+    /**
+     * Based on the inbound listener type, sets the relevant backpressure listener. Passthrough scenarios
+     * that are applicable here are (request HTTP/1.1-HTTP/1.1), (request HTTP/2-HTTP/1.1), (response HTTP/1.1-HTTP/1.1)
+     * and (response HTTP/2-HTTP/1.1).
+     *
+     * @param outboundMessage     represent the outbound request or response
+     * @param backpressureHandler the handler that checks the writability
+     * @param ctx                 represents channel handler context
+     */
+    private static void setPassthroughBackOffListener(HttpCarbonMessage outboundMessage,
+                                                      BackPressureHandler backpressureHandler,
+                                                      ChannelHandlerContext ctx) {
+        Listener inboundListener = outboundMessage.getListener();
+        if (inboundListener instanceof Http2InboundContentListener) {
+            backpressureHandler.getBackPressureObservable().setListener(
+                new Http2PassthroughBackPressureListener((Http2InboundContentListener) inboundListener));
+        } else if (inboundListener instanceof DefaultListener && ctx != null) {
+            backpressureHandler.getBackPressureObservable().setListener(new PassthroughBackPressureListener(ctx));
+        }
+    }
+
+    /**
+     * Checks if channel is unWritable and notifies BackPressure observable.
+     *
+     * @param context             The context on which to check writablity.
+     * @param backpressureHandler The back pressure handler with the observable.
+     */
+    public static void checkUnWritabilityAndNotify(ChannelHandlerContext context,
+                                                   BackPressureHandler backpressureHandler) {
+        if (backpressureHandler != null) {
+            Channel channel = context.channel();
+            if (!channel.isWritable() && channel.isActive()) {
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug("HTTP/1.1 channel is not writable in thread {} ", Thread.currentThread().getName());
+                }
+                backpressureHandler.getBackPressureObservable().notifyUnWritable();
+            }
+        }
+    }
+
+    public static void setSslHandshakeTimeOut(SSLConfig sslConfig, SslHandler sslHandler) {
+        long handshakeTimeout = sslConfig.getHandshakeTimeOut();
+        if (handshakeTimeout > 0) {
+            sslHandler.setHandshakeTimeout(handshakeTimeout, TimeUnit.SECONDS);
+        }
+    }
+
+    public static long ticksInNanos() {
+        return System.nanoTime();
+    }
+
+    public static ScheduledFuture<?> schedule(ChannelHandlerContext ctx, Runnable task, long delay) {
+        return ctx.executor().schedule(task, delay, TimeUnit.NANOSECONDS);
+    }
+
+    public static void setCorrelationIdForLogging(ChannelPipeline pipeline, ChannelInboundHandlerAdapter srcHandler) {
+        if (srcHandler != null && pipeline.get(Constants.HTTP_TRACE_LOG_HANDLER) != null) {
+            HttpTraceLoggingHandler loggingHandler = (HttpTraceLoggingHandler)
+                    pipeline.get(Constants.HTTP_TRACE_LOG_HANDLER);
+            if (srcHandler instanceof SourceHandler) {
+                SourceHandler h1SourceHandler = (SourceHandler) srcHandler;
+                loggingHandler.setCorrelatedSourceId(
+                        h1SourceHandler.getInboundChannelContext().channel().id().asShortText());
+            } else if (srcHandler instanceof Http2SourceHandler) {
+                Http2SourceHandler h2SourceHandler = (Http2SourceHandler) srcHandler;
+                loggingHandler.setCorrelatedSourceId(
+                        h2SourceHandler.getInboundChannelContext().channel().id().asShortText());
+            }
+        }
+    }
+
+    public static void handleOutboundConnectionHeader(SenderConfiguration senderConfiguration,
+                                                HttpCarbonMessage httpOutboundRequest) {
+        switch (senderConfiguration.getKeepAliveConfig()) {
+            case AUTO:
+                if (Float.valueOf(senderConfiguration.getHttpVersion()) >= Constants.HTTP_1_1) {
+                    httpOutboundRequest
+                            .setHeader(HttpHeaderNames.CONNECTION.toString(), Constants.CONNECTION_KEEP_ALIVE);
+                } else {
+                    httpOutboundRequest.setHeader(HttpHeaderNames.CONNECTION.toString(), Constants.CONNECTION_CLOSE);
+                }
+                break;
+            case ALWAYS:
+                httpOutboundRequest.setHeader(HttpHeaderNames.CONNECTION.toString(), Constants.CONNECTION_KEEP_ALIVE);
+                break;
+            case NEVER:
+                httpOutboundRequest.setHeader(HttpHeaderNames.CONNECTION.toString(), Constants.CONNECTION_CLOSE);
+                break;
+            default:
+                //Do nothing
+                break;
+        }
+        // Add proxy-authorization header if proxy is enabled and scheme is http
+        ProxyServerConfiguration proxyConfig = senderConfiguration.getProxyServerConfiguration();
+        if (senderConfiguration.getScheme().equals(HTTP_SCHEME) &&
+                proxyConfig != null && proxyConfig.getProxyUsername() != null &&
+                proxyConfig.getProxyPassword() != null) {
+            setProxyAuthorizationHeader(proxyConfig, httpOutboundRequest);
+        }
+    }
+
+    private static void setProxyAuthorizationHeader(ProxyServerConfiguration proxyConfig,
+                                                    HttpCarbonMessage httpOutboundRequest) {
+        ByteBuf authz = Unpooled.copiedBuffer(
+                proxyConfig.getProxyUsername() + COLON + proxyConfig.getProxyPassword(), CharsetUtil.UTF_8);
+        ByteBuf authzBase64 = Base64.encode(authz, false);
+        CharSequence authorization = new AsciiString("Basic " + authzBase64.toString(CharsetUtil.US_ASCII));
+        httpOutboundRequest.setHeader(HttpHeaderNames.PROXY_AUTHORIZATION.toString(), authorization);
+        authz.release();
+        authzBase64.release();
+    }
+
+    public static void setForwardedExtension(ForwardedExtensionConfig forwardedConfig,
+                                             String localAddress, HttpCarbonMessage httpOutboundRequest) {
+        if (forwardedConfig == ForwardedExtensionConfig.DISABLE) {
+            return;
+        }
+
+        ForwardedHeaderUpdater headerUpdater = new ForwardedHeaderUpdater(httpOutboundRequest, localAddress);
+        if (headerUpdater.isForwardedHeaderRequired()) {
+            headerUpdater.setForwardedHeader();
+            return;
+        }
+        if (headerUpdater.isXForwardedHeaderRequired()) {
+            if (forwardedConfig == ForwardedExtensionConfig.ENABLE) {
+                headerUpdater.setDefactoForwardedHeaders();
+                return;
+            }
+            headerUpdater.transformAndSetForwardedHeader();
+            return;
+        }
+        LOG.warn("Both Forwarded and X-Forwarded-- headers are present. Hence updating only the forwarded header");
+        headerUpdater.setForwardedHeader();
+    }
+}
diff --git a/src/test/resources/issue264/Util_before.java b/src/test/resources/issue264/Util_before.java
new file mode 100644
index 00000000..d9ac1a4b
--- /dev/null
+++ b/src/test/resources/issue264/Util_before.java
@@ -0,0 +1,1048 @@
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * 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 org.wso2.transport.http.netty.contractimpl.common;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.base64.Base64;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.DefaultHttpRequest;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.handler.codec.http2.Http2Exception;
+import io.netty.handler.codec.http2.Http2Headers;
+import io.netty.handler.codec.http2.HttpConversionUtil;
+import io.netty.handler.ssl.ReferenceCountedOpenSslContext;
+import io.netty.handler.ssl.ReferenceCountedOpenSslEngine;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslContextBuilder;
+import io.netty.handler.ssl.SslHandler;
+import io.netty.handler.ssl.SslProvider;
+import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
+import io.netty.util.AsciiString;
+import io.netty.util.CharsetUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.wso2.transport.http.netty.contract.Constants;
+import org.wso2.transport.http.netty.contract.HttpResponseFuture;
+import org.wso2.transport.http.netty.contract.config.ChunkConfig;
+import org.wso2.transport.http.netty.contract.config.ForwardedExtensionConfig;
+import org.wso2.transport.http.netty.contract.config.KeepAliveConfig;
+import org.wso2.transport.http.netty.contract.config.ProxyServerConfiguration;
+import org.wso2.transport.http.netty.contract.config.SenderConfiguration;
+import org.wso2.transport.http.netty.contract.exceptions.ConfigurationException;
+import org.wso2.transport.http.netty.contractimpl.Http2OutboundRespListener;
+import org.wso2.transport.http.netty.contractimpl.common.ssl.SSLConfig;
+import org.wso2.transport.http.netty.contractimpl.common.ssl.SSLHandlerFactory;
+import org.wso2.transport.http.netty.contractimpl.listener.HttpTraceLoggingHandler;
+import org.wso2.transport.http.netty.contractimpl.listener.SourceHandler;
+import org.wso2.transport.http.netty.contractimpl.listener.http2.Http2SourceHandler;
+import org.wso2.transport.http.netty.contractimpl.sender.CertificateValidationHandler;
+import org.wso2.transport.http.netty.contractimpl.sender.ForwardedHeaderUpdater;
+import org.wso2.transport.http.netty.contractimpl.sender.OCSPStaplingHandler;
+import org.wso2.transport.http.netty.message.DefaultBackPressureListener;
+import org.wso2.transport.http.netty.message.DefaultListener;
+import org.wso2.transport.http.netty.message.Http2InboundContentListener;
+import org.wso2.transport.http.netty.message.Http2PassthroughBackPressureListener;
+import org.wso2.transport.http.netty.message.HttpCarbonMessage;
+import org.wso2.transport.http.netty.message.HttpCarbonRequest;
+import org.wso2.transport.http.netty.message.HttpCarbonResponse;
+import org.wso2.transport.http.netty.message.Listener;
+import org.wso2.transport.http.netty.message.PassthroughBackPressureListener;
+import org.wso2.transport.http.netty.message.PooledDataStreamerFactory;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.nio.channels.ClosedChannelException;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Map;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLParameters;
+
+import static io.netty.handler.codec.http.HttpHeaderNames.TRAILER;
+import static org.wso2.transport.http.netty.contract.Constants.COLON;
+import static org.wso2.transport.http.netty.contract.Constants.HEADER_VAL_100_CONTINUE;
+import static org.wso2.transport.http.netty.contract.Constants.HTTP_HOST;
+import static org.wso2.transport.http.netty.contract.Constants.HTTP_PORT;
+import static org.wso2.transport.http.netty.contract.Constants.HTTP_SCHEME;
+import static org.wso2.transport.http.netty.contract.Constants.IS_PROXY_ENABLED;
+import static org.wso2.transport.http.netty.contract.Constants.MUTUAL_SSL_HANDSHAKE_RESULT;
+import static org.wso2.transport.http.netty.contract.Constants.OK_200;
+import static org.wso2.transport.http.netty.contract.Constants.PROTOCOL;
+import static org.wso2.transport.http.netty.contract.Constants
+        .REMOTE_CLIENT_CLOSED_WHILE_WRITING_OUTBOUND_RESPONSE_HEADERS;
+import static org.wso2.transport.http.netty.contract.Constants.TO;
+import static org.wso2.transport.http.netty.contract.Constants.URL_AUTHORITY;
+import static org.wso2.transport.http.netty.contract.config.KeepAliveConfig.ALWAYS;
+import static org.wso2.transport.http.netty.contract.config.KeepAliveConfig.AUTO;
+
+/**
+ * Includes utility methods for creating http requests and responses and their related properties.
+ */
+public class Util {
+
+    private Util() {
+        //Hides implicit public constructor.
+    }
+
+    private static final Logger LOG = LoggerFactory.getLogger(Util.class);
+
+    private static String getStringValue(HttpCarbonMessage msg, String key, String defaultValue) {
+        String value = (String) msg.getProperty(key);
+        if (value == null) {
+            return defaultValue;
+        }
+
+        return value;
+    }
+
+    private static int getIntValue(HttpCarbonMessage msg) {
+        Integer value = msg.getHttpStatusCode();
+        if (value == null) {
+            return OK_200;
+        }
+        return value;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static HttpResponse createHttpResponse(HttpCarbonMessage outboundResponseMsg, String inboundReqHttpVersion,
+                                                  String serverName, boolean keepAlive) {
+
+        HttpVersion httpVersion = new HttpVersion(Constants.HTTP_VERSION_PREFIX + inboundReqHttpVersion, true);
+        HttpResponseStatus httpResponseStatus = getHttpResponseStatus(outboundResponseMsg);
+        HttpResponse outboundNettyResponse = new DefaultHttpResponse(httpVersion, httpResponseStatus, false);
+
+        setOutboundRespHeaders(outboundResponseMsg, inboundReqHttpVersion, serverName, keepAlive,
+                outboundNettyResponse);
+
+        return outboundNettyResponse;
+    }
+
+    public static HttpResponse createFullHttpResponse(HttpCarbonMessage outboundResponseMsg,
+            String inboundReqHttpVersion, String serverName, boolean keepAlive, ByteBuf fullContent) {
+
+        HttpVersion httpVersion = new HttpVersion(Constants.HTTP_VERSION_PREFIX + inboundReqHttpVersion, true);
+        HttpResponseStatus httpResponseStatus = getHttpResponseStatus(outboundResponseMsg);
+        HttpResponse outboundNettyResponse =
+                new DefaultFullHttpResponse(httpVersion, httpResponseStatus, fullContent, false);
+
+        setOutboundRespHeaders(outboundResponseMsg, inboundReqHttpVersion, serverName, keepAlive,
+                outboundNettyResponse);
+
+        return outboundNettyResponse;
+    }
+
+    private static void setOutboundRespHeaders(HttpCarbonMessage outboundResponseMsg, String inboundReqHttpVersion,
+                                               String serverName, boolean keepAlive,
+                                               HttpResponse outboundNettyResponse) {
+        if (!keepAlive && (Float.valueOf(inboundReqHttpVersion) >= Constants.HTTP_1_1)) {
+            outboundResponseMsg.setHeader(HttpHeaderNames.CONNECTION.toString(), Constants.CONNECTION_CLOSE);
+        } else if (keepAlive && (Float.valueOf(inboundReqHttpVersion) < Constants.HTTP_1_1)) {
+            outboundResponseMsg.setHeader(HttpHeaderNames.CONNECTION.toString(), Constants.CONNECTION_KEEP_ALIVE);
+        } else {
+            outboundResponseMsg.removeHeader(HttpHeaderNames.CONNECTION.toString());
+        }
+
+        if (outboundResponseMsg.getHeader(HttpHeaderNames.SERVER.toString()) == null) {
+            outboundResponseMsg.setHeader(HttpHeaderNames.SERVER.toString(), serverName);
+        }
+
+        if (outboundResponseMsg.getHeader(HttpHeaderNames.DATE.toString()) == null) {
+            outboundResponseMsg.setHeader(HttpHeaderNames.DATE.toString(),
+                                          ZonedDateTime.now().format(DateTimeFormatter.RFC_1123_DATE_TIME));
+        }
+
+        outboundNettyResponse.headers().add(outboundResponseMsg.getHeaders());
+    }
+
+    public static HttpResponseStatus getHttpResponseStatus(HttpCarbonMessage msg) {
+        int statusCode = Util.getIntValue(msg);
+        String reasonPhrase = Util.getStringValue(msg, Constants.HTTP_REASON_PHRASE,
+                HttpResponseStatus.valueOf(statusCode).reasonPhrase());
+        return new HttpResponseStatus(statusCode, reasonPhrase);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static HttpRequest createHttpRequest(HttpCarbonMessage outboundRequestMsg) {
+        HttpMethod httpMethod = getHttpMethod(outboundRequestMsg);
+        HttpVersion httpVersion = getHttpVersion(outboundRequestMsg);
+        String requestPath = getRequestPath(outboundRequestMsg);
+        HttpRequest outboundNettyRequest = new DefaultHttpRequest(httpVersion, httpMethod,
+                (String) outboundRequestMsg.getProperty(TO), false);
+        outboundNettyRequest.setMethod(httpMethod);
+        outboundNettyRequest.setProtocolVersion(httpVersion);
+        outboundNettyRequest.setUri(requestPath);
+        outboundNettyRequest.headers().add(outboundRequestMsg.getHeaders());
+
+        return outboundNettyRequest;
+    }
+
+    private static String getRequestPath(HttpCarbonMessage outboundRequestMsg) {
+        if (outboundRequestMsg.getProperty(TO) == null) {
+            outboundRequestMsg.setProperty(TO, "");
+        }
+        // Return absolute url if proxy is enabled
+        if (outboundRequestMsg.getProperty(IS_PROXY_ENABLED) != null && (boolean) outboundRequestMsg
+                .getProperty(IS_PROXY_ENABLED) && outboundRequestMsg.getProperty(PROTOCOL).equals(HTTP_SCHEME)) {
+            return outboundRequestMsg.getProperty(PROTOCOL) + URL_AUTHORITY
+                    + outboundRequestMsg.getProperty(HTTP_HOST) + COLON
+                    + outboundRequestMsg.getProperty(HTTP_PORT)
+                    + outboundRequestMsg.getProperty(TO);
+        }
+        return (String) outboundRequestMsg.getProperty(TO);
+    }
+
+    private static HttpVersion getHttpVersion(HttpCarbonMessage outboundRequestMsg) {
+        HttpVersion httpVersion;
+        if (null != outboundRequestMsg.getHttpVersion()) {
+            httpVersion = new HttpVersion(Constants.HTTP_VERSION_PREFIX
+                    + outboundRequestMsg.getHttpVersion(), true);
+        } else {
+            httpVersion = new HttpVersion(Constants.DEFAULT_VERSION_HTTP_1_1, true);
+        }
+        return httpVersion;
+    }
+
+    private static HttpMethod getHttpMethod(HttpCarbonMessage outboundRequestMsg) {
+        HttpMethod httpMethod;
+        if (null != outboundRequestMsg.getHttpMethod()) {
+            httpMethod = new HttpMethod(outboundRequestMsg.getHttpMethod());
+        } else {
+            httpMethod = new HttpMethod(Constants.HTTP_POST_METHOD);
+        }
+        return httpMethod;
+    }
+
+    public static void setupChunkedRequest(HttpCarbonMessage httpOutboundRequest) {
+        httpOutboundRequest.removeHeader(HttpHeaderNames.CONTENT_LENGTH.toString());
+        if (httpOutboundRequest.getHeader(HttpHeaderNames.TRANSFER_ENCODING.toString()) == null) {
+            httpOutboundRequest.setHeader(HttpHeaderNames.TRANSFER_ENCODING.toString(), Constants.CHUNKED);
+        }
+    }
+
+    /**
+     * Creates a {@link HttpRequest} using a {@link Http2Headers} received over a particular HTTP/2 stream.
+     *
+     * @param http2Headers the Http2Headers received over a HTTP/2 stream
+     * @param streamId     the stream id
+     * @return the HttpRequest formed using the HttpHeaders
+     * @throws Http2Exception if an error occurs while converting headers from HTTP/2 to HTTP
+     */
+    public static HttpRequest createHttpRequestFromHttp2Headers(Http2Headers http2Headers, int streamId)
+            throws Http2Exception {
+        String method = Constants.HTTP_GET_METHOD;
+        if (http2Headers.method() != null) {
+            method = http2Headers.getAndRemove(Constants.HTTP2_METHOD).toString();
+        }
+        String path = Constants.DEFAULT_BASE_PATH;
+        if (http2Headers.path() != null) {
+            path = http2Headers.getAndRemove(Constants.HTTP2_PATH).toString();
+        }
+        // Remove PseudoHeaderNames from headers
+        http2Headers.getAndRemove(Constants.HTTP2_AUTHORITY);
+        http2Headers.getAndRemove(Constants.HTTP2_SCHEME);
+        HttpVersion version = new HttpVersion(Constants.HTTP_VERSION_2_0, true);
+
+        // Construct new HTTP Carbon Request
+        HttpRequest httpRequest = new DefaultHttpRequest(version, HttpMethod.valueOf(method), path);
+        // Convert Http2Headers to HttpHeaders
+        HttpConversionUtil.addHttp2ToHttpHeaders(
+                streamId, http2Headers, httpRequest.headers(), version, false, true);
+        CharSequence trailerHeaderValue = http2Headers.get(TRAILER.toString());
+        if (trailerHeaderValue != null) {
+            httpRequest.headers().add(TRAILER.toString(), trailerHeaderValue.toString());
+        }
+        return httpRequest;
+    }
+
+    public static void setupContentLengthRequest(HttpCarbonMessage httpOutboundRequest, long contentLength) {
+        removeContentLengthAndTransferEncodingHeaders(httpOutboundRequest);
+        httpOutboundRequest.setHeader(HttpHeaderNames.CONTENT_LENGTH.toString(), String.valueOf(contentLength));
+    }
+
+    public static boolean checkContentLengthAndTransferEncodingHeaderAllowance(HttpCarbonMessage httpOutboundRequest) {
+        HttpMethod method = getHttpMethod(httpOutboundRequest);
+        if (httpOutboundRequest.getProperty(Constants.NO_ENTITY_BODY) == null) {
+            return true;
+        }
+        boolean nonEntityBodyRequest = (boolean) httpOutboundRequest.getProperty(Constants.NO_ENTITY_BODY);
+        if (nonEntityBodyRequest && (HttpMethod.GET.equals(method)
+                || HttpMethod.HEAD.equals(method) || HttpMethod.OPTIONS.equals(method))) {
+            removeContentLengthAndTransferEncodingHeaders(httpOutboundRequest);
+            return false;
+        }
+        return true;
+    }
+
+    private static void removeContentLengthAndTransferEncodingHeaders(HttpCarbonMessage httpOutboundRequest) {
+        httpOutboundRequest.removeHeader(HttpHeaderNames.TRANSFER_ENCODING.toString());
+        httpOutboundRequest.removeHeader(HttpHeaderNames.CONTENT_LENGTH.toString());
+    }
+
+    /**
+     * Returns the status of chunking compatibility with http version.
+     *
+     * @param httpVersion http version string.
+     * @return  boolean value of status.
+     */
+    public static boolean isVersionCompatibleForChunking(String httpVersion) {
+        return Float.valueOf(httpVersion) >= Constants.HTTP_1_1;
+    }
+
+    /**
+     * Returns whether to enforce chunking on HTTP 1.0 requests.
+     *
+     * @param chunkConfig Chunking configuration.
+     * @param httpVersion http version string.
+     * @return true if chunking should be enforced else false.
+     */
+    public static boolean shouldEnforceChunkingforHttpOneZero(ChunkConfig chunkConfig, String httpVersion) {
+        return chunkConfig == ChunkConfig.ALWAYS && Float.valueOf(httpVersion) >= Constants.HTTP_1_0;
+    }
+
+    /**
+     * Configure outbound HTTP pipeline for SSL configuration.
+     *
+     * @param socketChannel Socket channel of outbound connection
+     * @param sslConfig     {@link SSLConfig}
+     * @param host          host of the connection
+     * @param port          port of the connection
+     * @return the {@link SSLEngine} which enables secure communication
+     * @throws SSLException if any error occurs in the SSL connection
+     */
+    public static SSLEngine configureHttpPipelineForSSL(SocketChannel socketChannel, String host, int port,
+                                                        SSLConfig sslConfig) throws SSLException {
+        LOG.debug("adding ssl handler");
+        SSLEngine sslEngine = null;
+        SslHandler sslHandler;
+        ChannelPipeline pipeline = socketChannel.pipeline();
+        SSLHandlerFactory sslHandlerFactory = new SSLHandlerFactory(sslConfig);
+        if (sslConfig.isOcspStaplingEnabled()) {
+            sslHandlerFactory.createSSLContextFromKeystores(false);
+            ReferenceCountedOpenSslContext referenceCountedOpenSslContext = sslHandlerFactory
+                    .buildClientReferenceCountedOpenSslContext();
+
+            if (referenceCountedOpenSslContext != null) {
+                sslHandler = referenceCountedOpenSslContext.newHandler(socketChannel.alloc());
+                sslEngine = sslHandler.engine();
+                setSslHandshakeTimeOut(sslConfig, sslHandler);
+                socketChannel.pipeline().addLast(sslHandler);
+                socketChannel.pipeline().addLast(new OCSPStaplingHandler((ReferenceCountedOpenSslEngine) sslEngine));
+            }
+        } else {
+            if (sslConfig.isDisableSsl()) {
+                sslEngine = createInsecureSslEngine(socketChannel, host, port);
+            } else {
+                if (sslConfig.getTrustStore() != null) {
+                    sslHandlerFactory.createSSLContextFromKeystores(false);
+                    sslEngine = instantiateAndConfigSSL(sslConfig, host, port,
+                            sslConfig.isHostNameVerificationEnabled(), sslHandlerFactory);
+                } else {
+                    sslEngine = getSslEngineForCerts(socketChannel, host, port, sslConfig, sslHandlerFactory);
+                }
+            }
+            sslHandler = new SslHandler(sslEngine);
+            setSslHandshakeTimeOut(sslConfig, sslHandler);
+            pipeline.addLast(Constants.SSL_HANDLER, sslHandler);
+            if (sslConfig.isValidateCertEnabled()) {
+                pipeline.addLast(Constants.HTTP_CERT_VALIDATION_HANDLER, new CertificateValidationHandler(
+                        sslEngine, sslConfig.getCacheValidityPeriod(), sslConfig.getCacheSize()));
+            }
+        }
+        return sslEngine;
+    }
+
+    private static SSLEngine getSslEngineForCerts(SocketChannel socketChannel, String host, int port,
+            SSLConfig sslConfig, SSLHandlerFactory sslHandlerFactory) throws SSLException {
+        SslContext sslContext = sslHandlerFactory.createHttpTLSContextForClient();
+        SslHandler sslHandler = sslContext.newHandler(socketChannel.alloc(), host, port);
+        SSLEngine sslEngine = sslHandler.engine();
+        sslHandlerFactory.addCommonConfigs(sslEngine);
+        sslHandlerFactory.setSNIServerNames(sslEngine, host);
+        if (sslConfig.isHostNameVerificationEnabled()) {
+            setHostNameVerfication(sslEngine);
+        }
+        return sslEngine;
+    }
+
+    private static SSLEngine createInsecureSslEngine(SocketChannel socketChannel, String host, int port)
+            throws SSLException {
+        SslContext sslContext = SslContextBuilder.forClient().sslProvider(SslProvider.JDK)
+                .trustManager(InsecureTrustManagerFactory.INSTANCE).build();
+        SslHandler sslHandler = sslContext.newHandler(socketChannel.alloc(), host, port);
+        return sslHandler.engine();
+    }
+
+    /**
+     * Set configurations to create ssl engine.
+     *
+     * @param sslConfig ssl related configurations
+     * @param host host of the connection
+     * @param port port of the connection
+     * @param hostNameVerificationEnabled true if host name verification is enabled
+     * @param sslHandlerFactory an instance of sslHandlerFactory
+     * @return ssl engine
+     */
+    private static SSLEngine instantiateAndConfigSSL(SSLConfig sslConfig, String host, int port,
+            boolean hostNameVerificationEnabled, SSLHandlerFactory sslHandlerFactory) {
+        // set the pipeline factory, which creates the pipeline for each newly created channels
+        SSLEngine sslEngine = null;
+        if (sslConfig != null) {
+            sslEngine = sslHandlerFactory.buildClientSSLEngine(host, port);
+            sslEngine.setUseClientMode(true);
+            sslHandlerFactory.setSNIServerNames(sslEngine, host);
+            if (hostNameVerificationEnabled) {
+                sslHandlerFactory.setHostNameVerfication(sslEngine);
+            }
+        }
+        return sslEngine;
+    }
+
+    /**
+     * Get integer type property value from a property map.
+     * <p>
+     * If {@code properties} is null or property value is null, default value is returned
+     *
+     * @param properties map of properties
+     * @param key        property name
+     * @param defaultVal default value of the property
+     * @return integer value of the property,
+     */
+    public static int getIntProperty(Map<String, Object> properties, String key, int defaultVal) {
+
+        if (properties == null) {
+            return defaultVal;
+        }
+
+        Object propertyVal = properties.get(key);
+
+        if (propertyVal == null) {
+            return defaultVal;
+        }
+
+        if (!(propertyVal instanceof Integer)) {
+            throw new IllegalArgumentException("Property : " + key + " must be an integer");
+        }
+
+        return (Integer) propertyVal;
+    }
+
+
+    /**
+     * Get string type property value from a property map.
+     * <p>
+     * If {@code properties} is null or property value is null, default value is returned
+     *
+     * @param properties map of properties
+     * @param key        property name
+     * @param defaultVal default value of the property
+     * @return integer value of the property,
+     */
+    public static String getStringProperty(Map<String, Object> properties, String key, String defaultVal) {
+
+        if (properties == null) {
+            return defaultVal;
+        }
+
+        Object propertyVal = properties.get(key);
+
+        if (propertyVal == null) {
+            return defaultVal;
+        }
+
+        if (!(propertyVal instanceof String)) {
+            throw new IllegalArgumentException("Property : " + key + " must be a string");
+        }
+
+        return (String) propertyVal;
+    }
+
+
+    /**
+     * Get boolean type property value from a property map.
+     * <p>
+     * If {@code properties} is null or property value is null, default value is returned
+     *
+     * @param properties map of properties
+     * @param key        property name
+     * @param defaultVal default value of the property
+     * @return integer value of the property,
+     */
+    public static Boolean getBooleanProperty(Map<String, Object> properties, String key, boolean defaultVal) {
+
+        if (properties == null) {
+            return defaultVal;
+        }
+
+        Object propertyVal = properties.get(key);
+
+        if (propertyVal == null) {
+            return defaultVal;
+        }
+
+        if (!(propertyVal instanceof Boolean)) {
+            throw new IllegalArgumentException("Property : " + key + " must be a boolean");
+        }
+
+        return (Boolean) propertyVal;
+    }
+
+    /**
+     * Get long type property value from a property map.
+     * <p>
+     * If {@code properties} is null or property value is null, default value is returned
+     *
+     * @param properties map of properties
+     * @param key        property name
+     * @param defaultVal default value of the property
+     * @return integer value of the property,
+     */
+    public static Long getLongProperty(Map<String, Object> properties, String key, long defaultVal) {
+
+        if (properties == null) {
+            return defaultVal;
+        }
+
+        Object propertyVal = properties.get(key);
+
+        if (propertyVal == null) {
+            return defaultVal;
+        }
+
+        if (!(propertyVal instanceof Long)) {
+            throw new IllegalArgumentException("Property : " + key + " must be a long");
+        }
+
+        return (Long) propertyVal;
+    }
+
+    //TODO Below code segment is directly copied from kernel. Once kernel Utils been moved as a separate dependency
+    //Need to remove below part and use that.
+    private static final Pattern varPattern = Pattern.compile("\\$\\{([^}]*)}");
+
+    /**
+     * Replace system property holders in the property values.
+     * e.g. Replace ${carbon.home} with value of the carbon.home system property.
+     *
+     * @param value string value to substitute
+     * @return String substituted string
+     */
+    public static String substituteVariables(String value) {
+        Matcher matcher = varPattern.matcher(value);
+        boolean found = matcher.find();
+        if (!found) {
+            return value;
+        }
+        StringBuffer sb = new StringBuffer();
+        do {
+            String sysPropKey = matcher.group(1);
+            String sysPropValue = getSystemVariableValue(sysPropKey, null);
+            if (sysPropValue == null || sysPropValue.length() == 0) {
+                throw new RuntimeException("System property " + sysPropKey + " is not specified");
+            }
+            // Due to reported bug under CARBON-14746
+            sysPropValue = sysPropValue.replace("\\", "\\\\");
+            matcher.appendReplacement(sb, sysPropValue);
+        } while (matcher.find());
+        matcher.appendTail(sb);
+        return sb.toString();
+    }
+
+    /**
+     * A utility which allows reading variables from the environment or System properties.
+     * If the variable in available in the environment as well as a System property, the System property takes
+     * precedence.
+     *
+     * @param variableName System/environment variable name
+     * @param defaultValue default value to be returned if the specified system variable is not specified.
+     * @return value of the system/environment variable
+     */
+    private static String getSystemVariableValue(String variableName, String defaultValue) {
+        String value;
+        if (System.getProperty(variableName) != null) {
+            value = System.getProperty(variableName);
+        } else if (System.getenv(variableName) != null) {
+            value = System.getenv(variableName);
+        } else {
+            value = defaultValue;
+        }
+        return value;
+    }
+
+    /**
+     * Create ID for server connector.
+     *
+     * @param host host of the channel.
+     * @param port port of the channel.
+     * @return constructed ID for server connector.
+     */
+    public static String createServerConnectorID(String host, int port) {
+        return host + ":" + port;
+    }
+
+    /**
+     * Reset channel attributes.
+     *
+     * @param ctx Channel handler context
+     */
+    public static void resetChannelAttributes(ChannelHandlerContext ctx) {
+        ctx.channel().attr(Constants.RESPONSE_FUTURE_OF_ORIGINAL_CHANNEL).set(null);
+        ctx.channel().attr(Constants.ORIGINAL_REQUEST).set(null);
+        ctx.channel().attr(Constants.REDIRECT_COUNT).set(null);
+        ctx.channel().attr(Constants.RESOLVED_REQUESTED_URI_ATTR).set(null);
+        ctx.channel().attr(Constants.ORIGINAL_CHANNEL_START_TIME).set(null);
+        ctx.channel().attr(Constants.ORIGINAL_CHANNEL_TIMEOUT).set(null);
+    }
+
+    /**
+     * Check if a given content is last httpContent.
+     *
+     * @param httpContent new content.
+     * @return true or false.
+     */
+    public static boolean isLastHttpContent(HttpContent httpContent) {
+        return httpContent instanceof LastHttpContent;
+    }
+
+    /**
+     * Send back no entity body response and close the connection. This function is mostly used
+     * when we send back error messages.
+     *
+     * @param ctx connection
+     * @param status response status
+     * @param httpVersion of the response
+     * @param serverName server name
+     */
+    public static void sendAndCloseNoEntityBodyResp(ChannelHandlerContext ctx, HttpResponseStatus status,
+            HttpVersion httpVersion, String serverName) {
+        HttpResponse outboundResponse = new DefaultHttpResponse(httpVersion, status);
+        outboundResponse.headers().set(HttpHeaderNames.CONTENT_LENGTH, 0);
+        outboundResponse.headers().set(HttpHeaderNames.CONNECTION.toString(), Constants.CONNECTION_CLOSE);
+        outboundResponse.headers().set(HttpHeaderNames.SERVER.toString(), serverName);
+        ChannelFuture outboundRespFuture = ctx.channel().writeAndFlush(outboundResponse);
+        outboundRespFuture.addListener(
+                (ChannelFutureListener) channelFuture -> LOG.warn("Failed to send {}", status.reasonPhrase()));
+        ctx.channel().close();
+    }
+
+    /**
+     * Checks for status of the response write operation.
+     *
+     * @param inboundRequestMsg        request message received from the client
+     * @param outboundRespStatusFuture the future of outbound response write operation
+     * @param channelFuture            the channel future related to response write operation
+     */
+    public static void checkForResponseWriteStatus(HttpCarbonMessage inboundRequestMsg,
+                                           HttpResponseFuture outboundRespStatusFuture, ChannelFuture channelFuture) {
+        channelFuture.addListener(writeOperationPromise -> {
+            Throwable throwable = writeOperationPromise.cause();
+            if (throwable != null) {
+                if (throwable instanceof ClosedChannelException) {
+                    throwable = new IOException(REMOTE_CLIENT_CLOSED_WHILE_WRITING_OUTBOUND_RESPONSE_HEADERS);
+                }
+                outboundRespStatusFuture.notifyHttpListener(throwable);
+            } else {
+                outboundRespStatusFuture.notifyHttpListener(inboundRequestMsg);
+            }
+        });
+    }
+
+    /**
+     * Adds a listener to notify the outbound response future if an error occurs while writing the response message.
+     *
+     * @param outboundRespStatusFuture  the future of outbound response write operation
+     * @param channelFuture             the channel future related to response write operation
+     * @param http2OutboundRespListener the http/2 outbound response listener
+     */
+    public static void addResponseWriteFailureListener(HttpResponseFuture outboundRespStatusFuture,
+                                                       ChannelFuture channelFuture,
+                                                       Http2OutboundRespListener http2OutboundRespListener) {
+        channelFuture.addListener(writeOperationPromise -> {
+            Throwable throwable = writeOperationPromise.cause();
+            if (throwable != null) {
+                if (throwable instanceof ClosedChannelException) {
+                    throwable = new IOException(REMOTE_CLIENT_CLOSED_WHILE_WRITING_OUTBOUND_RESPONSE_HEADERS);
+                }
+
+                if (http2OutboundRespListener.getOutboundResponseMsg() != null) {
+                    http2OutboundRespListener.getOutboundResponseMsg().setIoException(
+                            new IOException(REMOTE_CLIENT_CLOSED_WHILE_WRITING_OUTBOUND_RESPONSE_HEADERS));
+                }
+
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug("Remove response writer and backpressure listener in case of failure");
+                }
+                http2OutboundRespListener.removeBackPressureListener();
+                http2OutboundRespListener.removeDefaultResponseWriter();
+                outboundRespStatusFuture.notifyHttpListener(throwable);
+            }
+        });
+    }
+
+    /**
+     * Creates HTTP carbon message.
+     *
+     * @param httpMessage HTTP message
+     * @param ctx Channel handler context
+     * @return HttpCarbonMessage
+     */
+    public static HttpCarbonMessage createHTTPCarbonMessage(HttpMessage httpMessage, ChannelHandlerContext ctx) {
+        Listener contentListener = new DefaultListener(ctx);
+        return new HttpCarbonMessage(httpMessage, contentListener);
+    }
+
+    /**
+     * Removes handlers from the pipeline if they are present.
+     *
+     * @param pipeline     the channel pipeline
+     * @param handlerNames names of the handlers to be removed
+     */
+    public static void safelyRemoveHandlers(ChannelPipeline pipeline, String... handlerNames) {
+        for (String name : handlerNames) {
+            if (pipeline.get(name) != null) {
+                pipeline.remove(name);
+            } else {
+                LOG.debug("Trying to remove not engaged {} handler from the pipeline", name);
+            }
+        }
+    }
+
+    /**
+     * Create a HttpCarbonMessage using the netty inbound http request.
+     * @param httpRequestHeaders of inbound request
+     * @param ctx of the inbound request
+     * @param sourceHandler instance which handled the particular request
+     * @return HttpCarbon message
+     */
+    public static HttpCarbonMessage createInboundReqCarbonMsg(HttpRequest httpRequestHeaders,
+            ChannelHandlerContext ctx, SourceHandler sourceHandler) {
+
+        HttpCarbonMessage inboundRequestMsg =
+                new HttpCarbonRequest(httpRequestHeaders, new DefaultListener(ctx));
+        inboundRequestMsg.setProperty(Constants.POOLED_BYTE_BUFFER_FACTORY, new PooledDataStreamerFactory(ctx.alloc()));
+
+        inboundRequestMsg.setProperty(Constants.CHNL_HNDLR_CTX, ctx);
+        inboundRequestMsg.setProperty(Constants.SRC_HANDLER, sourceHandler);
+        HttpVersion protocolVersion = httpRequestHeaders.protocolVersion();
+        inboundRequestMsg.setHttpVersion(protocolVersion.majorVersion() + "." + protocolVersion.minorVersion());
+        inboundRequestMsg.setHttpMethod(httpRequestHeaders.method().name());
+        InetSocketAddress localAddress = null;
+
+        //This check was added because in case of netty embedded channel, this could be of type 'EmbeddedSocketAddress'.
+        if (ctx.channel().localAddress() instanceof InetSocketAddress) {
+            localAddress = (InetSocketAddress) ctx.channel().localAddress();
+        }
+        inboundRequestMsg.setProperty(Constants.LISTENER_PORT, localAddress != null ? localAddress.getPort() : null);
+        inboundRequestMsg.setProperty(Constants.LISTENER_INTERFACE_ID, sourceHandler.getInterfaceId());
+        inboundRequestMsg.setProperty(Constants.PROTOCOL, Constants.HTTP_SCHEME);
+
+        boolean isSecuredConnection = false;
+        if (ctx.channel().pipeline().get(Constants.SSL_HANDLER) != null) {
+            isSecuredConnection = true;
+        }
+        inboundRequestMsg.setProperty(Constants.IS_SECURED_CONNECTION, isSecuredConnection);
+
+        inboundRequestMsg.setProperty(Constants.LOCAL_ADDRESS, ctx.channel().localAddress());
+        inboundRequestMsg.setProperty(Constants.REMOTE_ADDRESS, sourceHandler.getRemoteAddress());
+        inboundRequestMsg.setRequestUrl(httpRequestHeaders.uri());
+        inboundRequestMsg.setProperty(Constants.TO, httpRequestHeaders.uri());
+        inboundRequestMsg.setProperty(MUTUAL_SSL_HANDSHAKE_RESULT,
+                ctx.channel().attr(Constants.MUTUAL_SSL_RESULT_ATTRIBUTE).get());
+
+        return inboundRequestMsg;
+    }
+
+    /**
+     * Create a HttpCarbonMessage using the netty inbound response message.
+     * @param ctx of the inbound response message
+     * @param httpResponseHeaders of the inbound response message
+     * @param outboundRequestMsg is the correlated outbound request message
+     * @return HttpCarbon message
+     */
+    public static HttpCarbonMessage createInboundRespCarbonMsg(ChannelHandlerContext ctx,
+                                                               HttpResponse httpResponseHeaders,
+                                                               HttpCarbonMessage outboundRequestMsg) {
+        HttpCarbonMessage inboundResponseMsg = new HttpCarbonResponse(httpResponseHeaders, new DefaultListener(ctx));
+        inboundResponseMsg.setProperty(Constants.POOLED_BYTE_BUFFER_FACTORY,
+                new PooledDataStreamerFactory(ctx.alloc()));
+
+        inboundResponseMsg.setProperty(Constants.DIRECTION, Constants.DIRECTION_RESPONSE);
+        inboundResponseMsg.setHttpStatusCode(httpResponseHeaders.status().code());
+
+        //copy required properties for service chaining from incoming carbon message to the response carbon message
+        //copy shared worker pool
+        inboundResponseMsg.setProperty(Constants.EXECUTOR_WORKER_POOL, outboundRequestMsg
+                .getProperty(Constants.EXECUTOR_WORKER_POOL));
+
+        return inboundResponseMsg;
+    }
+
+    /**
+     * Check whether a connection should alive or not.
+     * @param keepAliveConfig of the connection
+     * @param outboundRequestMsg of this particular transaction
+     * @return true if the connection should be kept alive
+     * @throws ConfigurationException for invalid configurations
+     */
+    public static boolean isKeepAlive(KeepAliveConfig keepAliveConfig, HttpCarbonMessage outboundRequestMsg)
+            throws ConfigurationException {
+        switch (keepAliveConfig) {
+        case AUTO:
+            return Float.valueOf(outboundRequestMsg.getHttpVersion()) > Constants.HTTP_1_0;
+        case ALWAYS:
+            return true;
+        case NEVER:
+            return false;
+        default:
+            // The execution will never reach here. In case execution reach here means it should be an invalid value
+            // for keep-alive configurations.
+            throw new ConfigurationException("Invalid keep-alive configuration value : "
+                    + keepAliveConfig.toString());
+        }
+    }
+
+    /**
+     * Check whether a particular request is expecting continue.
+     * @param inboundRequestMsg in question
+     * @return true if the request expects 100-continue response
+     */
+    public static boolean is100ContinueRequest(HttpCarbonMessage inboundRequestMsg) {
+        return HEADER_VAL_100_CONTINUE.equalsIgnoreCase(
+                inboundRequestMsg.getHeader(HttpHeaderNames.EXPECT.toString()));
+    }
+
+    /**
+     * Decide whether the connection should be kept open.
+     *
+     * @param keepAliveConfig         Represents keepalive configuration
+     * @param requestConnectionHeader Connection header of the request
+     * @param httpVersion             Represents HTTP version
+     * @return A boolean indicating whether to keep the connection open or not
+     */
+    public static boolean isKeepAliveConnection(KeepAliveConfig keepAliveConfig, String requestConnectionHeader,
+                                                String httpVersion) {
+        if (keepAliveConfig == null || keepAliveConfig == AUTO) {
+            if (Float.valueOf(httpVersion) <= Constants.HTTP_1_0) {
+                return requestConnectionHeader != null && requestConnectionHeader
+                        .equalsIgnoreCase(Constants.CONNECTION_KEEP_ALIVE);
+            } else {
+                return requestConnectionHeader == null || !requestConnectionHeader
+                        .equalsIgnoreCase(Constants.CONNECTION_CLOSE);
+            }
+        } else {
+            return keepAliveConfig == ALWAYS;
+        }
+    }
+
+    /**
+     * Disable host name verification if it is set to false by the user.
+     *
+     * @param sslEngine ssl engine
+     */
+    public static void setHostNameVerfication(SSLEngine sslEngine) {
+        SSLParameters sslParams = sslEngine.getSSLParameters();
+        sslParams.setEndpointIdentificationAlgorithm(Constants.HTTPS_SCHEME);
+        sslEngine.setSSLParameters(sslParams);
+    }
+
+    /**
+     * Use this method to get the {@link BackPressureHandler} in the pipeline. This requires a {@link
+     * ChannelHandlerContext} of a handler in the pipeline.
+     *
+     * @param channelContext the channelContext which will be used to obtain the {@link BackPressureHandler} in the
+     *                       pipeline.
+     * @return The {@link BackPressureHandler} in the pipeline.
+     */
+    public static BackPressureHandler getBackPressureHandler(ChannelHandlerContext channelContext) {
+        return (BackPressureHandler) channelContext.pipeline().get(Constants.BACK_PRESSURE_HANDLER);
+
+    }
+
+    /**
+     * Sets the backPressure listener the to the Observable of the handler.
+     *
+     * @param outboundMessage     represents the outbound request or response
+     * @param backpressureHandler the handler that checks the writability
+     * @param ctx                 represents channel handler context
+     */
+    public static void setBackPressureListener(HttpCarbonMessage outboundMessage,
+                                               BackPressureHandler backpressureHandler, ChannelHandlerContext ctx) {
+        if (backpressureHandler != null) {
+            if (outboundMessage.isPassthrough()) {
+                setPassthroughBackOffListener(outboundMessage, backpressureHandler, ctx);
+            } else {
+                backpressureHandler.getBackPressureObservable().setListener(
+                    new DefaultBackPressureListener());
+            }
+        }
+    }
+
+    /**
+     * Based on the inbound listener type, sets the relevant backpressure listener. Passthrough scenarios
+     * that are applicable here are (request HTTP/1.1-HTTP/1.1), (request HTTP/2-HTTP/1.1), (response HTTP/1.1-HTTP/1.1)
+     * and (response HTTP/2-HTTP/1.1).
+     *
+     * @param outboundMessage     represent the outbound request or response
+     * @param backpressureHandler the handler that checks the writability
+     * @param ctx                 represents channel handler context
+     */
+    private static void setPassthroughBackOffListener(HttpCarbonMessage outboundMessage,
+                                                      BackPressureHandler backpressureHandler,
+                                                      ChannelHandlerContext ctx) {
+        Listener inboundListener = outboundMessage.getListener();
+        if (inboundListener instanceof Http2InboundContentListener) {
+            backpressureHandler.getBackPressureObservable().setListener(
+                new Http2PassthroughBackPressureListener((Http2InboundContentListener) inboundListener));
+        } else if (inboundListener instanceof DefaultListener && ctx != null) {
+            backpressureHandler.getBackPressureObservable().setListener(new PassthroughBackPressureListener(ctx));
+        }
+    }
+
+    /**
+     * Checks if channel is unWritable and notifies BackPressure observable.
+     *
+     * @param context             The context on which to check writablity.
+     * @param backpressureHandler The back pressure handler with the observable.
+     */
+    public static void checkUnWritabilityAndNotify(ChannelHandlerContext context,
+                                                   BackPressureHandler backpressureHandler) {
+        if (backpressureHandler != null) {
+            Channel channel = context.channel();
+            if (!channel.isWritable() && channel.isActive()) {
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug("HTTP/1.1 channel is not writable in thread {} ", Thread.currentThread().getName());
+                }
+                backpressureHandler.getBackPressureObservable().notifyUnWritable();
+            }
+        }
+    }
+
+    public static void setSslHandshakeTimeOut(SSLConfig sslConfig, SslHandler sslHandler) {
+        long handshakeTimeout = sslConfig.getHandshakeTimeOut();
+        if (handshakeTimeout > 0) {
+            sslHandler.setHandshakeTimeout(handshakeTimeout, TimeUnit.SECONDS);
+        }
+    }
+
+    public static long ticksInNanos() {
+        return System.nanoTime();
+    }
+
+    public static ScheduledFuture<?> schedule(ChannelHandlerContext ctx, Runnable task, long delay) {
+        return ctx.executor().schedule(task, delay, TimeUnit.NANOSECONDS);
+    }
+
+    public static void setCorrelationIdForLogging(ChannelPipeline pipeline, ChannelInboundHandlerAdapter srcHandler) {
+        if (srcHandler != null && pipeline.get(Constants.HTTP_TRACE_LOG_HANDLER) != null) {
+            HttpTraceLoggingHandler loggingHandler = (HttpTraceLoggingHandler)
+                    pipeline.get(Constants.HTTP_TRACE_LOG_HANDLER);
+            if (srcHandler instanceof SourceHandler) {
+                SourceHandler h1SourceHandler = (SourceHandler) srcHandler;
+                loggingHandler.setCorrelatedSourceId(
+                        h1SourceHandler.getInboundChannelContext().channel().id().asShortText());
+            } else if (srcHandler instanceof Http2SourceHandler) {
+                Http2SourceHandler h2SourceHandler = (Http2SourceHandler) srcHandler;
+                loggingHandler.setCorrelatedSourceId(
+                        h2SourceHandler.getInboundChannelContext().channel().id().asShortText());
+            }
+        }
+    }
+
+    public static void handleOutboundConnectionHeader(SenderConfiguration senderConfiguration,
+                                                HttpCarbonMessage httpOutboundRequest) {
+        switch (senderConfiguration.getKeepAliveConfig()) {
+            case AUTO:
+                if (Float.valueOf(senderConfiguration.getHttpVersion()) >= Constants.HTTP_1_1) {
+                    httpOutboundRequest
+                            .setHeader(HttpHeaderNames.CONNECTION.toString(), Constants.CONNECTION_KEEP_ALIVE);
+                } else {
+                    httpOutboundRequest.setHeader(HttpHeaderNames.CONNECTION.toString(), Constants.CONNECTION_CLOSE);
+                }
+                break;
+            case ALWAYS:
+                httpOutboundRequest.setHeader(HttpHeaderNames.CONNECTION.toString(), Constants.CONNECTION_KEEP_ALIVE);
+                break;
+            case NEVER:
+                httpOutboundRequest.setHeader(HttpHeaderNames.CONNECTION.toString(), Constants.CONNECTION_CLOSE);
+                break;
+            default:
+                //Do nothing
+                break;
+        }
+        // Add proxy-authorization header if proxy is enabled and scheme is http
+        ProxyServerConfiguration proxyConfig = senderConfiguration.getProxyServerConfiguration();
+        if (senderConfiguration.getScheme().equals(HTTP_SCHEME) &&
+                proxyConfig != null && proxyConfig.getProxyUsername() != null &&
+                proxyConfig.getProxyPassword() != null) {
+            setProxyAuthorizationHeader(proxyConfig, httpOutboundRequest);
+        }
+    }
+
+    private static void setProxyAuthorizationHeader(ProxyServerConfiguration proxyConfig,
+                                                    HttpCarbonMessage httpOutboundRequest) {
+        ByteBuf authz = Unpooled.copiedBuffer(
+                proxyConfig.getProxyUsername() + COLON + proxyConfig.getProxyPassword(), CharsetUtil.UTF_8);
+        ByteBuf authzBase64 = Base64.encode(authz, false);
+        CharSequence authorization = new AsciiString("Basic " + authzBase64.toString(CharsetUtil.US_ASCII));
+        httpOutboundRequest.setHeader(HttpHeaderNames.PROXY_AUTHORIZATION.toString(), authorization);
+        authz.release();
+        authzBase64.release();
+    }
+
+    public static void setForwardedExtension(ForwardedExtensionConfig forwardedConfig,
+                                             String localAddress, HttpCarbonMessage httpOutboundRequest) {
+        if (forwardedConfig == ForwardedExtensionConfig.DISABLE) {
+            return;
+        }
+
+        ForwardedHeaderUpdater headerUpdater = new ForwardedHeaderUpdater(httpOutboundRequest, localAddress);
+        if (headerUpdater.isForwardedHeaderRequired()) {
+            headerUpdater.setForwardedHeader();
+            return;
+        }
+        if (headerUpdater.isXForwardedHeaderRequired()) {
+            if (forwardedConfig == ForwardedExtensionConfig.ENABLE) {
+                headerUpdater.setDefactoForwardedHeaders();
+                return;
+            }
+            headerUpdater.transformAndSetForwardedHeader();
+            return;
+        }
+        LOG.warn("Both Forwarded and X-Forwarded-- headers are present. Hence updating only the forwarded header");
+        headerUpdater.setForwardedHeader();
+    }
+}

From 41ad253088c2c14cc40a0699d4ba001b3f55746b Mon Sep 17 00:00:00 2001
From: Martin Monperrus <martin.monperrus@gnieh.org>
Date: Tue, 30 Apr 2024 22:23:47 +0200
Subject: [PATCH 2/4] up

---
 .../java/gumtree/spoon/AstComparator.java     | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/java/gumtree/spoon/AstComparator.java b/src/main/java/gumtree/spoon/AstComparator.java
index 88742c0b..3ff4032b 100644
--- a/src/main/java/gumtree/spoon/AstComparator.java
+++ b/src/main/java/gumtree/spoon/AstComparator.java
@@ -58,12 +58,12 @@ protected Factory createFactory() {
 	 * compares two java files
 	 */
 	public Diff compare(File f1, File f2) throws Exception {
-		CtPackage ctType1 = getCtPackage(f1);
-		CtPackage ctType2 = getCtPackage(f2);
-		if (ctType1 == null || ctType2 == null) {
+		CtPackage ctPackage1 = getCtPackage(f1);
+		CtPackage ctPackage2 = getCtPackage(f2);
+		if (ctPackage1 == null || ctPackage2 == null) {
 			return null;
 		} else {
-			return compare(ctType1, ctType2);
+			return compare(ctPackage1, ctPackage2);
 		}
 	}
 	
@@ -73,21 +73,28 @@ public Diff compare(File f1, File f2) throws Exception {
 	public Diff compare(File f1, File f2, DiffConfiguration configuration) throws Exception {
 		final SpoonGumTreeBuilder scanner = new SpoonGumTreeBuilder();
 		return new DiffImpl(
-				scanner.getTreeContext(), scanner.getTree(getCtType(f1)), scanner.getTree(getCtType(f2)), configuration);
+				scanner.getTreeContext(), scanner.getTree(getCtPackage(f1)), scanner.getTree(getCtPackage(f2)), configuration);
 	}
 
 	/**
 	 * compares two snippets
 	 */
 	public Diff compare(String left, String right) {
-		return compare(getCtType(left), getCtType(right));
+		return compare(getCtPackage(left, left.hashCode()+".java"), getCtPackage(right, right.hashCode()+".java"));
 	}
 
+
+	public CtPackage getCtPackage(String content, String filename) {
+		VirtualFile resource = new VirtualFile(content, filename);
+		return getCtPackage(resource);
+	}
+
+
 	/**
 	 * compares two snippets
 	 */
 	public Diff compare(String left, String right, DiffConfiguration configuration) {
-		return compare(getCtType(left), getCtType(right),configuration);
+		return compare(getCtPackage(left, left.hashCode()+".java"), getCtPackage(right, right.hashCode()+".java"),configuration);
 	}
 
 	
@@ -96,7 +103,7 @@ public Diff compare(String left, String right, DiffConfiguration configuration)
 	 * compares two snippets that come from the files given as argument
 	 */
 	public Diff compare(String left, String right, String filenameLeft, String filenameRight) {
-		return compare(getCtType(left, filenameLeft), getCtType(right, filenameRight));
+		return compare(getCtPackage(left), getCtPackage(right));
 	}
 
 	/**

From ff9dbdce761d74cb8e9d9a1f0e061fb281f0a8aa Mon Sep 17 00:00:00 2001
From: Martin Monperrus <martin.monperrus@gnieh.org>
Date: Tue, 30 Apr 2024 22:24:59 +0200
Subject: [PATCH 3/4] up

---
 src/main/java/gumtree/spoon/AstComparator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/gumtree/spoon/AstComparator.java b/src/main/java/gumtree/spoon/AstComparator.java
index 3ff4032b..2f45ef0c 100644
--- a/src/main/java/gumtree/spoon/AstComparator.java
+++ b/src/main/java/gumtree/spoon/AstComparator.java
@@ -103,7 +103,7 @@ public Diff compare(String left, String right, DiffConfiguration configuration)
 	 * compares two snippets that come from the files given as argument
 	 */
 	public Diff compare(String left, String right, String filenameLeft, String filenameRight) {
-		return compare(getCtPackage(left), getCtPackage(right));
+		return compare(getCtPackage(left, filenameLeft), getCtPackage(right, filenameRight));
 	}
 
 	/**

From 3dd34c6ee8b0a99e9d9852d9ca90649c2610b7df Mon Sep 17 00:00:00 2001
From: Martin Monperrus <martin.monperrus@gnieh.org>
Date: Tue, 30 Apr 2024 22:29:42 +0200
Subject: [PATCH 4/4] up

---
 src/main/java/gumtree/spoon/AstComparator.java     | 8 ++++++--
 src/test/java/gumtree/spoon/AstComparatorTest.java | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/gumtree/spoon/AstComparator.java b/src/main/java/gumtree/spoon/AstComparator.java
index 2f45ef0c..5194001c 100644
--- a/src/main/java/gumtree/spoon/AstComparator.java
+++ b/src/main/java/gumtree/spoon/AstComparator.java
@@ -80,7 +80,11 @@ public Diff compare(File f1, File f2, DiffConfiguration configuration) throws Ex
 	 * compares two snippets
 	 */
 	public Diff compare(String left, String right) {
-		return compare(getCtPackage(left, left.hashCode()+".java"), getCtPackage(right, right.hashCode()+".java"));
+		return compare(getCtPackage(left, getFilename(left)), getCtPackage(right, getFilename(right)));
+	}
+
+	private static String getFilename(String leftcontent) {
+		return "test"+Math.abs(leftcontent.hashCode()) + ".java";
 	}
 
 
@@ -94,7 +98,7 @@ public CtPackage getCtPackage(String content, String filename) {
 	 * compares two snippets
 	 */
 	public Diff compare(String left, String right, DiffConfiguration configuration) {
-		return compare(getCtPackage(left, left.hashCode()+".java"), getCtPackage(right, right.hashCode()+".java"),configuration);
+		return compare(getCtPackage(left, getFilename(left)), getCtPackage(right, getFilename(right)),configuration);
 	}
 
 	
diff --git a/src/test/java/gumtree/spoon/AstComparatorTest.java b/src/test/java/gumtree/spoon/AstComparatorTest.java
index 6a4bcaf4..d07387c3 100644
--- a/src/test/java/gumtree/spoon/AstComparatorTest.java
+++ b/src/test/java/gumtree/spoon/AstComparatorTest.java
@@ -1714,8 +1714,8 @@ public void testFileName() throws Exception {
 		Diff result = diff.compare(left, right);
 
 		assertEquals(1, result.getRootOperations().size());
-		// by default, name is "test"
-		assertEquals("test", result.getRootOperations().get(0).getSrcNode().getPosition().getFile().getName());
+		// by default, name is prefixed by "test"
+		assertEquals("test2092383990.java", result.getRootOperations().get(0).getSrcNode().getPosition().getFile().getName());
 
 		// let's put other names
 		result = diff.compare(left, right, "mleft.java", "mright.java");