Repository: knox Updated Branches: refs/heads/master 9846cd05f -> e2d179d72
KNOX-1528 - Remove hadoop-common dependency from gateway-spi module Signed-off-by: Kevin Risden <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/e2d179d7 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/e2d179d7 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/e2d179d7 Branch: refs/heads/master Commit: e2d179d726a36bed69ac2f24929664d746ce380c Parents: 9846cd0 Author: Kevin Risden <[email protected]> Authored: Wed Oct 17 10:25:03 2018 -0400 Committer: Kevin Risden <[email protected]> Committed: Wed Oct 17 15:42:52 2018 -0400 ---------------------------------------------------------------------- gateway-spi/pom.xml | 4 ---- .../apache/knox/gateway/dispatch/AbstractGatewayDispatch.java | 7 +++---- .../apache/knox/gateway/filter/GatewayResponseWrapper.java | 5 ++--- 3 files changed, 5 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/e2d179d7/gateway-spi/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-spi/pom.xml b/gateway-spi/pom.xml index d8a9324..5a6b4de 100644 --- a/gateway-spi/pom.xml +++ b/gateway-spi/pom.xml @@ -48,10 +48,6 @@ </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/knox/blob/e2d179d7/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/AbstractGatewayDispatch.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/AbstractGatewayDispatch.java b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/AbstractGatewayDispatch.java index c6df0c2..476e8f4 100644 --- a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/AbstractGatewayDispatch.java +++ b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/AbstractGatewayDispatch.java @@ -17,8 +17,8 @@ */ package org.apache.knox.gateway.dispatch; +import org.apache.commons.io.IOUtils; import org.apache.knox.gateway.filter.GatewayResponse; -import org.apache.hadoop.io.IOUtils; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpUriRequest; @@ -35,9 +35,8 @@ import java.util.Set; public abstract class AbstractGatewayDispatch implements Dispatch { - private static final int STREAM_COPY_BUFFER_SIZE = 4096; private static final Set<String> REQUEST_EXCLUDE_HEADERS = new HashSet<>(); - + static { REQUEST_EXCLUDE_HEADERS.add("Host"); REQUEST_EXCLUDE_HEADERS.add("Authorization"); @@ -62,7 +61,7 @@ public abstract class AbstractGatewayDispatch implements Dispatch { ((GatewayResponse)response).streamResponse( stream ); } else { OutputStream output = response.getOutputStream(); - IOUtils.copyBytes( stream, output, STREAM_COPY_BUFFER_SIZE ); + IOUtils.copy(stream, output); //KNOX-685: output.flush(); output.close(); } http://git-wip-us.apache.org/repos/asf/knox/blob/e2d179d7/gateway-spi/src/main/java/org/apache/knox/gateway/filter/GatewayResponseWrapper.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/filter/GatewayResponseWrapper.java b/gateway-spi/src/main/java/org/apache/knox/gateway/filter/GatewayResponseWrapper.java index 50a305d..0364bb0 100644 --- a/gateway-spi/src/main/java/org/apache/knox/gateway/filter/GatewayResponseWrapper.java +++ b/gateway-spi/src/main/java/org/apache/knox/gateway/filter/GatewayResponseWrapper.java @@ -17,8 +17,8 @@ */ package org.apache.knox.gateway.filter; +import org.apache.commons.io.IOUtils; import org.apache.knox.gateway.util.MimeTypes; -import org.apache.hadoop.io.IOUtils; import javax.activation.MimeType; import javax.servlet.http.HttpServletResponse; @@ -30,7 +30,6 @@ import java.io.OutputStream; public abstract class GatewayResponseWrapper extends HttpServletResponseWrapper implements GatewayResponse { private static final String DEFAULT_MIME_TYPE = "*/*"; - private static final int STREAM_COPY_BUFFER_SIZE = 4096; /** * Constructs a response adaptor wrapping the given response. @@ -60,7 +59,7 @@ public abstract class GatewayResponseWrapper extends HttpServletResponseWrapper @Override public void streamResponse( InputStream input, OutputStream output ) throws IOException { - IOUtils.copyBytes( input, output, STREAM_COPY_BUFFER_SIZE ); + IOUtils.copy(input, output); //KNOX-685: output.flush(); output.close(); }
