This is an automated email from the ASF dual-hosted git repository. robertlazarski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
The following commit(s) were added to refs/heads/master by this push: new 6c9c8c2a45 AXIS2-6051, cleanup some imports and unused vars 6c9c8c2a45 is described below commit 6c9c8c2a4525e1ee7f4469aa75b391301339a6fd Author: Robert Lazarski <rlazar...@alphatheory.com> AuthorDate: Wed May 29 09:24:03 2024 -1000 AXIS2-6051, cleanup some imports and unused vars --- .../http/src/org/apache/axis2/transport/http/HTTPSender.java | 1 - .../apache/axis2/transport/http/server/AxisHttpConnectionImpl.java | 2 +- .../org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java | 5 ----- .../src/org/apache/axis2/transport/http/server/AxisHttpService.java | 5 ----- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java index a60e18a2cf..7fdef01d5f 100644 --- a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java +++ b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java @@ -42,7 +42,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.hc.core5.http.HttpStatus; import org.apache.hc.core5.http.HttpHeaders; -import org.apache.hc.core5.util.Timeout; import java.io.IOException; import java.io.InputStream; diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpConnectionImpl.java b/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpConnectionImpl.java index 231f569e7f..a1bc7c22cc 100644 --- a/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpConnectionImpl.java +++ b/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpConnectionImpl.java @@ -252,7 +252,7 @@ public class AxisHttpConnectionImpl implements AxisHttpConnection { } ProtocolVersion transportVersion = request.getVersion(); if (transportVersion != null && transportVersion.greaterEquals(HttpVersion.HTTP_2)) { - HEADERLOG.warn("receiveRequestHeader() received http2 version: " + transportVersion + " , however axis2 is configured for HTTP/1.1 and the connection will be downgraded to HTTP/1.1"); + HEADERLOG.warn("receiveRequest() received http2 version: " + transportVersion + " , however axis2 is configured for HTTP/1.1 and the connection will be downgraded to HTTP/1.1"); // Downgrade protocol version if greater than HTTP/1.1 transportVersion = HttpVersion.HTTP_1_1; } diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java b/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java index 74c4d4645a..11824c32c6 100644 --- a/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java +++ b/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java @@ -19,18 +19,14 @@ package org.apache.axis2.transport.http.server; -import org.apache.hc.client5.http.entity.EntityBuilder; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.Header; -import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.ProtocolVersion; import org.apache.hc.core5.http.ProtocolException; -import org.apache.hc.core5.http.config.Http1Config; import org.apache.hc.core5.http.io.entity.BasicHttpEntity; import org.apache.hc.core5.http.io.entity.EmptyInputStream; -import org.apache.hc.core5.http.message.BasicHeaderIterator; import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.http.protocol.HttpCoreContext; import org.apache.hc.core5.http.protocol.HttpProcessor; @@ -39,7 +35,6 @@ import org.apache.axis2.kernel.OutTransportInfo; import java.io.IOException; import java.io.OutputStream; -import java.time.LocalDateTime; import java.util.Iterator; public class AxisHttpResponseImpl implements AxisHttpResponse, OutTransportInfo { diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpService.java b/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpService.java index 6f10cdebbc..a3264acfcd 100644 --- a/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpService.java +++ b/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpService.java @@ -52,14 +52,12 @@ import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy; import org.apache.hc.core5.http.impl.Http1StreamListener; import org.apache.hc.core5.http.impl.ServerSupport; import org.apache.hc.core5.http.impl.io.DefaultClassicHttpResponseFactory; -import org.apache.hc.core5.http.io.SocketConfig; import org.apache.hc.core5.http.io.entity.StringEntity; import org.apache.hc.core5.http.message.BasicClassicHttpResponse; import org.apache.hc.core5.http.message.RequestLine; import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.http.protocol.HttpCoreContext; import org.apache.hc.core5.http.protocol.HttpProcessor; -import org.apache.hc.core5.net.InetAddressUtils; import jakarta.servlet.http.HttpServletResponse; import javax.xml.namespace.QName; @@ -67,7 +65,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.InetSocketAddress; -import java.net.SocketAddress; import java.net.SocketException; import java.util.HashMap; import java.util.Iterator; @@ -93,8 +90,6 @@ public class AxisHttpService { private final Http1StreamListener streamListener; private final Worker worker; - private SocketConfig socketConfig; - public AxisHttpService( final HttpProcessor httpProcessor, final Http1Config http1Config,