This is an automated email from the ASF dual-hosted git repository.
smolnar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new b8a0185d8 KNOX-2751 - Custom service dispatches are now configurable
(#645)
b8a0185d8 is described below
commit b8a0185d886f87dd5d5f7305c8b9fdff66c50f52
Author: Sandor Molnar <[email protected]>
AuthorDate: Tue Oct 4 10:39:48 2022 +0200
KNOX-2751 - Custom service dispatches are now configurable (#645)
---
.../src/main/java/org/apache/knox/gateway/hbase/HBaseDispatch.java | 4 ++--
.../src/main/java/org/apache/knox/gateway/hbase/HBaseUIDispatch.java | 4 ++--
.../src/main/java/org/apache/knox/gateway/hive/HiveDispatch.java | 4 ++--
.../src/main/java/org/apache/knox/gateway/impala/ImpalaDispatch.java | 4 ++--
.../src/main/java/org/apache/knox/gateway/jkg/JkgDispatch.java | 5 +++--
.../src/main/java/org/apache/knox/gateway/livy/LivyDispatch.java | 5 +++--
.../src/main/java/org/apache/knox/gateway/dispatch/NiFiDispatch.java | 2 +-
.../java/org/apache/knox/gateway/rm/dispatch/RMHaBaseDispatcher.java | 4 ++--
.../src/main/java/org/apache/knox/gateway/storm/StormDispatch.java | 4 ++--
.../apache/knox/gateway/hdfs/dispatch/HdfsHttpClientDispatch.java | 4 ++--
.../java/org/apache/knox/gateway/dispatch/URLDecodingDispatch.java | 2 +-
11 files changed, 22 insertions(+), 20 deletions(-)
diff --git
a/gateway-service-hbase/src/main/java/org/apache/knox/gateway/hbase/HBaseDispatch.java
b/gateway-service-hbase/src/main/java/org/apache/knox/gateway/hbase/HBaseDispatch.java
index cc474146f..49876707d 100644
---
a/gateway-service-hbase/src/main/java/org/apache/knox/gateway/hbase/HBaseDispatch.java
+++
b/gateway-service-hbase/src/main/java/org/apache/knox/gateway/hbase/HBaseDispatch.java
@@ -20,7 +20,7 @@ package org.apache.knox.gateway.hbase;
import java.net.URI;
import javax.servlet.http.HttpServletRequest;
-import org.apache.knox.gateway.dispatch.DefaultDispatch;
+import org.apache.knox.gateway.dispatch.ConfigurableDispatch;
/**
* This used to be a specialized dispatch providing HBase specific features to
the
@@ -28,7 +28,7 @@ import org.apache.knox.gateway.dispatch.DefaultDispatch;
* @deprecated Use {@link org.apache.knox.gateway.dispatch.DefaultDispatch}
*/
@Deprecated
-public class HBaseDispatch extends DefaultDispatch {
+public class HBaseDispatch extends ConfigurableDispatch {
// KNOX-709: HBase can't handle URL encoded paths.
@Override
public URI getDispatchUrl(HttpServletRequest request) {
diff --git
a/gateway-service-hbase/src/main/java/org/apache/knox/gateway/hbase/HBaseUIDispatch.java
b/gateway-service-hbase/src/main/java/org/apache/knox/gateway/hbase/HBaseUIDispatch.java
index 25acebea2..b453864f1 100644
---
a/gateway-service-hbase/src/main/java/org/apache/knox/gateway/hbase/HBaseUIDispatch.java
+++
b/gateway-service-hbase/src/main/java/org/apache/knox/gateway/hbase/HBaseUIDispatch.java
@@ -18,13 +18,13 @@
package org.apache.knox.gateway.hbase;
import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.knox.gateway.dispatch.DefaultDispatch;
+import org.apache.knox.gateway.dispatch.ConfigurableDispatch;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-public class HBaseUIDispatch extends DefaultDispatch {
+public class HBaseUIDispatch extends ConfigurableDispatch {
@Override
protected void executeRequest(HttpUriRequest outboundRequest,
HttpServletRequest inboundRequest,
HttpServletResponse outboundResponse) throws IOException {
diff --git
a/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveDispatch.java
b/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveDispatch.java
index 97dc8c137..e577a6635 100644
---
a/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveDispatch.java
+++
b/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveDispatch.java
@@ -19,14 +19,14 @@ package org.apache.knox.gateway.hive;
import org.apache.knox.gateway.config.Configure;
import org.apache.knox.gateway.config.Default;
-import org.apache.knox.gateway.dispatch.DefaultDispatch;
+import org.apache.knox.gateway.dispatch.ConfigurableDispatch;
import org.apache.http.client.methods.HttpUriRequest;
/**
* This specialized dispatch provides Hive specific features to the
* default HttpClientDispatch.
*/
-public class HiveDispatch extends DefaultDispatch {
+public class HiveDispatch extends ConfigurableDispatch {
private boolean basicAuthPreemptive;
@Override
diff --git
a/gateway-service-impala/src/main/java/org/apache/knox/gateway/impala/ImpalaDispatch.java
b/gateway-service-impala/src/main/java/org/apache/knox/gateway/impala/ImpalaDispatch.java
index 7604a6498..4796fed44 100644
---
a/gateway-service-impala/src/main/java/org/apache/knox/gateway/impala/ImpalaDispatch.java
+++
b/gateway-service-impala/src/main/java/org/apache/knox/gateway/impala/ImpalaDispatch.java
@@ -19,14 +19,14 @@ package org.apache.knox.gateway.impala;
import org.apache.knox.gateway.config.Configure;
import org.apache.knox.gateway.config.Default;
-import org.apache.knox.gateway.dispatch.DefaultDispatch;
+import org.apache.knox.gateway.dispatch.ConfigurableDispatch;
import org.apache.http.client.methods.HttpUriRequest;
/**
* This specialized dispatch provides Impala specific features to the
* default HttpClientDispatch.
*/
-public class ImpalaDispatch extends DefaultDispatch {
+public class ImpalaDispatch extends ConfigurableDispatch {
private boolean basicAuthPreemptive;
@Override
diff --git
a/gateway-service-jkg/src/main/java/org/apache/knox/gateway/jkg/JkgDispatch.java
b/gateway-service-jkg/src/main/java/org/apache/knox/gateway/jkg/JkgDispatch.java
index 6b6839f09..adefb4e74 100644
---
a/gateway-service-jkg/src/main/java/org/apache/knox/gateway/jkg/JkgDispatch.java
+++
b/gateway-service-jkg/src/main/java/org/apache/knox/gateway/jkg/JkgDispatch.java
@@ -19,7 +19,8 @@ package org.apache.knox.gateway.jkg;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.knox.gateway.dispatch.DefaultDispatch;
+
+import org.apache.knox.gateway.dispatch.ConfigurableDispatch;
import org.apache.knox.gateway.filter.rewrite.impl.UrlRewriteRequestStream;
import org.apache.knox.gateway.security.SubjectUtils;
@@ -44,7 +45,7 @@ import java.util.Map;
* This specialized dispatch provides Jupyter Kernel Gateway specific features
to the
* default dispatch.
*/
-public class JkgDispatch extends DefaultDispatch {
+public class JkgDispatch extends ConfigurableDispatch {
@Override
public void doPost(URI url, HttpServletRequest request, HttpServletResponse
response)
diff --git
a/gateway-service-livy/src/main/java/org/apache/knox/gateway/livy/LivyDispatch.java
b/gateway-service-livy/src/main/java/org/apache/knox/gateway/livy/LivyDispatch.java
index a46af29d5..7387564fa 100644
---
a/gateway-service-livy/src/main/java/org/apache/knox/gateway/livy/LivyDispatch.java
+++
b/gateway-service-livy/src/main/java/org/apache/knox/gateway/livy/LivyDispatch.java
@@ -19,7 +19,8 @@ package org.apache.knox.gateway.livy;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.knox.gateway.dispatch.DefaultDispatch;
+
+import org.apache.knox.gateway.dispatch.ConfigurableDispatch;
import org.apache.knox.gateway.filter.rewrite.impl.UrlRewriteRequestStream;
import org.apache.knox.gateway.security.SubjectUtils;
@@ -42,7 +43,7 @@ import java.util.Map;
* This specialized dispatch provides Livy specific features to the
* default dispatch.
*/
-public class LivyDispatch extends DefaultDispatch {
+public class LivyDispatch extends ConfigurableDispatch {
@Override
public void doPost(URI url, HttpServletRequest request, HttpServletResponse
response)
diff --git
a/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiDispatch.java
b/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiDispatch.java
index adc6321a7..57ea9e78f 100644
---
a/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiDispatch.java
+++
b/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiDispatch.java
@@ -29,7 +29,7 @@ import java.io.InputStream;
import java.util.Locale;
import java.util.Set;
-public class NiFiDispatch extends DefaultDispatch {
+public class NiFiDispatch extends ConfigurableDispatch {
@Override
protected void executeRequest(HttpUriRequest outboundRequest,
HttpServletRequest inboundRequest, HttpServletResponse outboundResponse) throws
IOException {
diff --git
a/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaBaseDispatcher.java
b/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaBaseDispatcher.java
index b9438aaf1..7f3bf712f 100644
---
a/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaBaseDispatcher.java
+++
b/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaBaseDispatcher.java
@@ -20,7 +20,7 @@ import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.entity.BufferedHttpEntity;
-import org.apache.knox.gateway.dispatch.DefaultDispatch;
+import org.apache.knox.gateway.dispatch.ConfigurableDispatch;
import org.apache.knox.gateway.filter.AbstractGatewayFilter;
import org.apache.knox.gateway.ha.provider.HaProvider;
import org.apache.knox.gateway.ha.provider.impl.HaServiceConfigConstants;
@@ -35,7 +35,7 @@ import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.atomic.AtomicInteger;
-class RMHaBaseDispatcher extends DefaultDispatch {
+class RMHaBaseDispatcher extends ConfigurableDispatch {
private static final String FAILOVER_COUNTER_ATTRIBUTE =
"dispatch.ha.failover.counter";
private static final String LOCATION = "Location";
private static final RMMessages LOG =
MessagesFactory.get(RMMessages.class);
diff --git
a/gateway-service-storm/src/main/java/org/apache/knox/gateway/storm/StormDispatch.java
b/gateway-service-storm/src/main/java/org/apache/knox/gateway/storm/StormDispatch.java
index 1eb2fbbbb..fe6a912e1 100644
---
a/gateway-service-storm/src/main/java/org/apache/knox/gateway/storm/StormDispatch.java
+++
b/gateway-service-storm/src/main/java/org/apache/knox/gateway/storm/StormDispatch.java
@@ -17,7 +17,7 @@
*/
package org.apache.knox.gateway.storm;
-import org.apache.knox.gateway.dispatch.DefaultDispatch;
+import org.apache.knox.gateway.dispatch.ConfigurableDispatch;
import java.util.Collections;
import java.util.Set;
@@ -26,7 +26,7 @@ import java.util.Set;
* This specialized dispatch provides Storm specific features to the
* default dispatch.
*/
-public class StormDispatch extends DefaultDispatch {
+public class StormDispatch extends ConfigurableDispatch {
@Override
public Set<String> getOutboundResponseExcludeHeaders() {
diff --git
a/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/HdfsHttpClientDispatch.java
b/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/HdfsHttpClientDispatch.java
index 471cf6a77..9958d4796 100644
---
a/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/HdfsHttpClientDispatch.java
+++
b/gateway-service-webhdfs/src/main/java/org/apache/knox/gateway/hdfs/dispatch/HdfsHttpClientDispatch.java
@@ -17,14 +17,14 @@
*/
package org.apache.knox.gateway.hdfs.dispatch;
-import org.apache.knox.gateway.dispatch.DefaultDispatch;
+import org.apache.knox.gateway.dispatch.ConfigurableDispatch;
import org.apache.http.HttpEntity;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
-public class HdfsHttpClientDispatch extends DefaultDispatch {
+public class HdfsHttpClientDispatch extends ConfigurableDispatch {
public HdfsHttpClientDispatch() throws ServletException {
super();
diff --git
a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/URLDecodingDispatch.java
b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/URLDecodingDispatch.java
index 7e7177676..5edebb3ca 100644
---
a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/URLDecodingDispatch.java
+++
b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/URLDecodingDispatch.java
@@ -29,7 +29,7 @@ import java.nio.charset.StandardCharsets;
*
* @since 1.1.0
*/
-public class URLDecodingDispatch extends DefaultDispatch {
+public class URLDecodingDispatch extends ConfigurableDispatch {
public URLDecodingDispatch() {
super();
