knox git commit: KNOX-1098 - Livy proxyUser should be added when not present
Repository: knox Updated Branches: refs/heads/master 1c887df8e -> b34c0eb81 KNOX-1098 - Livy proxyUser should be added when not present Signed-off-by: Kevin Risden Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/b34c0eb8 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/b34c0eb8 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/b34c0eb8 Branch: refs/heads/master Commit: b34c0eb811ef7cbad565fecc644049d1cf42e898 Parents: 1c887df Author: Kevin Risden Authored: Wed Nov 14 14:40:52 2018 -0500 Committer: Kevin Risden Committed: Thu Nov 15 08:50:00 2018 -0500 -- gateway-release/pom.xml | 4 + .../resources/services/livy/0.4.0/rewrite.xml | 8 -- .../resources/services/livy/0.4.0/service.xml | 5 +- gateway-service-livy/pom.xml| 67 + .../apache/knox/gateway/livy/LivyDispatch.java | 100 +++ pom.xml | 6 ++ 6 files changed, 178 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/knox/blob/b34c0eb8/gateway-release/pom.xml -- diff --git a/gateway-release/pom.xml b/gateway-release/pom.xml index ebbfcd4..659a8ed 100644 --- a/gateway-release/pom.xml +++ b/gateway-release/pom.xml @@ -186,6 +186,10 @@ org.apache.knox +gateway-service-livy + + +org.apache.knox gateway-service-tgs http://git-wip-us.apache.org/repos/asf/knox/blob/b34c0eb8/gateway-service-definitions/src/main/resources/services/livy/0.4.0/rewrite.xml -- diff --git a/gateway-service-definitions/src/main/resources/services/livy/0.4.0/rewrite.xml b/gateway-service-definitions/src/main/resources/services/livy/0.4.0/rewrite.xml index 013fa99..befa1e4 100644 --- a/gateway-service-definitions/src/main/resources/services/livy/0.4.0/rewrite.xml +++ b/gateway-service-definitions/src/main/resources/services/livy/0.4.0/rewrite.xml @@ -16,18 +16,10 @@ limitations under the License. --> - - - - - - - - http://git-wip-us.apache.org/repos/asf/knox/blob/b34c0eb8/gateway-service-definitions/src/main/resources/services/livy/0.4.0/service.xml -- diff --git a/gateway-service-definitions/src/main/resources/services/livy/0.4.0/service.xml b/gateway-service-definitions/src/main/resources/services/livy/0.4.0/service.xml index ef71d1e..642ec2e 100644 --- a/gateway-service-definitions/src/main/resources/services/livy/0.4.0/service.xml +++ b/gateway-service-definitions/src/main/resources/services/livy/0.4.0/service.xml @@ -15,14 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - + http://git-wip-us.apache.org/repos/asf/knox/blob/b34c0eb8/gateway-service-livy/pom.xml -- diff --git a/gateway-service-livy/pom.xml b/gateway-service-livy/pom.xml new file mode 100644 index 000..d1a5041 --- /dev/null +++ b/gateway-service-livy/pom.xml @@ -0,0 +1,67 @@ + + +http://maven.apache.org/POM/4.0.0; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +4.0.0 + +org.apache.knox +gateway +1.3.0-SNAPSHOT + + +gateway-service-livy +gateway-service-livy +The extension to the gateway for supporting Livy. + + + +org.apache.knox +gateway-spi + + +org.apache.knox +gateway-provider-rewrite + + + +javax.servlet +javax.servlet-api + + + +com.fasterxml.jackson.core +jackson-core + + +com.fasterxml.jackson.core +jackson-databind + + + +org.apache.knox +gateway-test-utils +test + + +junit +junit +test + + + http://git-wip-us.apache.org/repos/asf/knox/blob/b34c0eb8/gateway-service-livy/src/main/java/org/apache/knox/gateway/livy/LivyDispatch.java -- 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 new
knox git commit: KNOX-1098 - Livy proxyUser should be added when not present
Repository: knox Updated Branches: refs/heads/v1.2.0 634783426 -> c7984052e KNOX-1098 - Livy proxyUser should be added when not present Signed-off-by: Kevin Risden Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/c7984052 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/c7984052 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/c7984052 Branch: refs/heads/v1.2.0 Commit: c7984052e1a831f799f292a747409fa46d5d3f12 Parents: 6347834 Author: Kevin Risden Authored: Wed Nov 14 14:40:52 2018 -0500 Committer: Kevin Risden Committed: Thu Nov 15 08:50:42 2018 -0500 -- gateway-release/pom.xml | 4 + .../resources/services/livy/0.4.0/rewrite.xml | 8 -- .../resources/services/livy/0.4.0/service.xml | 5 +- gateway-service-livy/pom.xml| 67 + .../apache/knox/gateway/livy/LivyDispatch.java | 100 +++ pom.xml | 6 ++ 6 files changed, 178 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/knox/blob/c7984052/gateway-release/pom.xml -- diff --git a/gateway-release/pom.xml b/gateway-release/pom.xml index 73a3169..8a72b96 100644 --- a/gateway-release/pom.xml +++ b/gateway-release/pom.xml @@ -186,6 +186,10 @@ org.apache.knox +gateway-service-livy + + +org.apache.knox gateway-service-tgs http://git-wip-us.apache.org/repos/asf/knox/blob/c7984052/gateway-service-definitions/src/main/resources/services/livy/0.4.0/rewrite.xml -- diff --git a/gateway-service-definitions/src/main/resources/services/livy/0.4.0/rewrite.xml b/gateway-service-definitions/src/main/resources/services/livy/0.4.0/rewrite.xml index 013fa99..befa1e4 100644 --- a/gateway-service-definitions/src/main/resources/services/livy/0.4.0/rewrite.xml +++ b/gateway-service-definitions/src/main/resources/services/livy/0.4.0/rewrite.xml @@ -16,18 +16,10 @@ limitations under the License. --> - - - - - - - - http://git-wip-us.apache.org/repos/asf/knox/blob/c7984052/gateway-service-definitions/src/main/resources/services/livy/0.4.0/service.xml -- diff --git a/gateway-service-definitions/src/main/resources/services/livy/0.4.0/service.xml b/gateway-service-definitions/src/main/resources/services/livy/0.4.0/service.xml index ef71d1e..642ec2e 100644 --- a/gateway-service-definitions/src/main/resources/services/livy/0.4.0/service.xml +++ b/gateway-service-definitions/src/main/resources/services/livy/0.4.0/service.xml @@ -15,14 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - + http://git-wip-us.apache.org/repos/asf/knox/blob/c7984052/gateway-service-livy/pom.xml -- diff --git a/gateway-service-livy/pom.xml b/gateway-service-livy/pom.xml new file mode 100644 index 000..d1a5041 --- /dev/null +++ b/gateway-service-livy/pom.xml @@ -0,0 +1,67 @@ + + +http://maven.apache.org/POM/4.0.0; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +4.0.0 + +org.apache.knox +gateway +1.3.0-SNAPSHOT + + +gateway-service-livy +gateway-service-livy +The extension to the gateway for supporting Livy. + + + +org.apache.knox +gateway-spi + + +org.apache.knox +gateway-provider-rewrite + + + +javax.servlet +javax.servlet-api + + + +com.fasterxml.jackson.core +jackson-core + + +com.fasterxml.jackson.core +jackson-databind + + + +org.apache.knox +gateway-test-utils +test + + +junit +junit +test + + + http://git-wip-us.apache.org/repos/asf/knox/blob/c7984052/gateway-service-livy/src/main/java/org/apache/knox/gateway/livy/LivyDispatch.java -- 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 new
knox git commit: Fix gateway-service-livy pom
Repository: knox Updated Branches: refs/heads/v1.2.0 c7984052e -> c291b4cb3 Fix gateway-service-livy pom Signed-off-by: Kevin Risden Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/c291b4cb Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/c291b4cb Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/c291b4cb Branch: refs/heads/v1.2.0 Commit: c291b4cb3daf4c60d73e5c3a9f0b4ecbdf5c8f25 Parents: c798405 Author: Kevin Risden Authored: Thu Nov 15 08:53:41 2018 -0500 Committer: Kevin Risden Committed: Thu Nov 15 08:53:45 2018 -0500 -- gateway-service-livy/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/knox/blob/c291b4cb/gateway-service-livy/pom.xml -- diff --git a/gateway-service-livy/pom.xml b/gateway-service-livy/pom.xml index d1a5041..7aa9fa3 100644 --- a/gateway-service-livy/pom.xml +++ b/gateway-service-livy/pom.xml @@ -22,7 +22,7 @@ org.apache.knox gateway -1.3.0-SNAPSHOT +1.2.0-SNAPSHOT gateway-service-livy
knox git commit: Fix gateway-service-livy pom
Repository: knox Updated Branches: refs/heads/v1.2.0 c291b4cb3 -> 5b7b64731 Fix gateway-service-livy pom Signed-off-by: Kevin Risden Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/5b7b6473 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/5b7b6473 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/5b7b6473 Branch: refs/heads/v1.2.0 Commit: 5b7b6473182d6607a0c72d2ddce5ebf138e36b60 Parents: c291b4c Author: Kevin Risden Authored: Thu Nov 15 08:55:39 2018 -0500 Committer: Kevin Risden Committed: Thu Nov 15 08:55:44 2018 -0500 -- gateway-service-livy/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/knox/blob/5b7b6473/gateway-service-livy/pom.xml -- diff --git a/gateway-service-livy/pom.xml b/gateway-service-livy/pom.xml index 7aa9fa3..d57a763 100644 --- a/gateway-service-livy/pom.xml +++ b/gateway-service-livy/pom.xml @@ -22,7 +22,7 @@ org.apache.knox gateway -1.2.0-SNAPSHOT +1.2.0 gateway-service-livy
knox git commit: KNOX-1602 - JsonFilterReader should handle strings, numbers, booleans, and null at root
Repository: knox
Updated Branches:
refs/heads/master 986172bb5 -> 1c887df8e
KNOX-1602 - JsonFilterReader should handle strings, numbers, booleans, and null
at root
Signed-off-by: Kevin Risden
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/1c887df8
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/1c887df8
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/1c887df8
Branch: refs/heads/master
Commit: 1c887df8e303b9267a879e58b86c4908a0b26225
Parents: 986172b
Author: Kevin Risden
Authored: Wed Nov 14 17:26:32 2018 -0500
Committer: Kevin Risden
Committed: Wed Nov 14 17:26:36 2018 -0500
--
.../rewrite/impl/json/JsonFilterReader.java | 16
.../rewrite/impl/json/JsonFilterReaderTest.java | 42
2 files changed, 58 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/knox/blob/1c887df8/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
--
diff --git
a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
index 2e47a58..ecc7925 100644
---
a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
+++
b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
@@ -305,6 +305,10 @@ class JsonFilterReader extends Reader {
Level child;
Level parent;
String value = null;
+if(stack.isEmpty()) {
+ generator.writeString( parser.getText() );
+ return;
+}
parent = stack.peek();
if( parent.isArray() ) {
ArrayNode array = (ArrayNode)parent.node;
@@ -337,6 +341,10 @@ class JsonFilterReader extends Reader {
private void processValueNumber() throws IOException {
Level child;
Level parent;
+if(stack.isEmpty()) {
+ processedUnbufferedValueNumber();
+ return;
+}
parent = stack.peek();
if( parent.isArray() ) {
if( bufferingLevel != null ) {
@@ -430,6 +438,10 @@ class JsonFilterReader extends Reader {
private void processValueBoolean() throws IOException {
Level child;
Level parent;
+if(stack.isEmpty()) {
+ generator.writeBoolean(parser.getBooleanValue());
+ return;
+}
parent = stack.peek();
if( parent.isArray() ) {
((ArrayNode)parent.node ).add( parser.getBooleanValue() );
@@ -453,6 +465,10 @@ class JsonFilterReader extends Reader {
private void processValueNull() throws IOException {
Level child;
+if(stack.isEmpty()) {
+ generator.writeNull();
+ return;
+}
Level parent = stack.peek();
if( parent.isArray() ) {
((ArrayNode)parent.node ).addNull();
http://git-wip-us.apache.org/repos/asf/knox/blob/1c887df8/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java
--
diff --git
a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java
b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java
index b92363a..25488a0 100644
---
a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java
+++
b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java
@@ -33,6 +33,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -56,6 +59,45 @@ public class JsonFilterReaderTest {
assertThat( output, containsString( "\"startedTime\":1399975176760}" ) );
}
+ @Test
+ public void testString() throws IOException {
+String inputJson = "\"abc\"";
+StringReader inputReader = new StringReader( inputJson );
+JsonFilterReader filterReader = new TestJsonFilterReader( inputReader,
null );
+String outputJson = new String( IOUtils.toCharArray( filterReader ) );
+JsonAssert.with( outputJson ).assertThat( "$", is( "abc" ) );
+ }
+
+ @Test
+ public void testNumber() throws IOException {
+int num = new Random().nextInt();
+String inputJson = String.valueOf(num);
+StringReader inputReader = new StringReader( inputJson );
+JsonFilterReader filterReader = new
knox git commit: KNOX-1602 - JsonFilterReader should handle strings, numbers, booleans, and null at root
Repository: knox
Updated Branches:
refs/heads/v1.2.0 5be3f1a64 -> 634783426
KNOX-1602 - JsonFilterReader should handle strings, numbers, booleans, and null
at root
Signed-off-by: Kevin Risden
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/63478342
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/63478342
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/63478342
Branch: refs/heads/v1.2.0
Commit: 634783426356ee2d2629466d614bb4db996101f4
Parents: 5be3f1a
Author: Kevin Risden
Authored: Wed Nov 14 17:26:32 2018 -0500
Committer: Kevin Risden
Committed: Thu Nov 15 08:48:58 2018 -0500
--
.../rewrite/impl/json/JsonFilterReader.java | 16
.../rewrite/impl/json/JsonFilterReaderTest.java | 42
2 files changed, 58 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/knox/blob/63478342/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
--
diff --git
a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
index 2e47a58..ecc7925 100644
---
a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
+++
b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
@@ -305,6 +305,10 @@ class JsonFilterReader extends Reader {
Level child;
Level parent;
String value = null;
+if(stack.isEmpty()) {
+ generator.writeString( parser.getText() );
+ return;
+}
parent = stack.peek();
if( parent.isArray() ) {
ArrayNode array = (ArrayNode)parent.node;
@@ -337,6 +341,10 @@ class JsonFilterReader extends Reader {
private void processValueNumber() throws IOException {
Level child;
Level parent;
+if(stack.isEmpty()) {
+ processedUnbufferedValueNumber();
+ return;
+}
parent = stack.peek();
if( parent.isArray() ) {
if( bufferingLevel != null ) {
@@ -430,6 +438,10 @@ class JsonFilterReader extends Reader {
private void processValueBoolean() throws IOException {
Level child;
Level parent;
+if(stack.isEmpty()) {
+ generator.writeBoolean(parser.getBooleanValue());
+ return;
+}
parent = stack.peek();
if( parent.isArray() ) {
((ArrayNode)parent.node ).add( parser.getBooleanValue() );
@@ -453,6 +465,10 @@ class JsonFilterReader extends Reader {
private void processValueNull() throws IOException {
Level child;
+if(stack.isEmpty()) {
+ generator.writeNull();
+ return;
+}
Level parent = stack.peek();
if( parent.isArray() ) {
((ArrayNode)parent.node ).addNull();
http://git-wip-us.apache.org/repos/asf/knox/blob/63478342/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java
--
diff --git
a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java
b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java
index b92363a..25488a0 100644
---
a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java
+++
b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java
@@ -33,6 +33,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -56,6 +59,45 @@ public class JsonFilterReaderTest {
assertThat( output, containsString( "\"startedTime\":1399975176760}" ) );
}
+ @Test
+ public void testString() throws IOException {
+String inputJson = "\"abc\"";
+StringReader inputReader = new StringReader( inputJson );
+JsonFilterReader filterReader = new TestJsonFilterReader( inputReader,
null );
+String outputJson = new String( IOUtils.toCharArray( filterReader ) );
+JsonAssert.with( outputJson ).assertThat( "$", is( "abc" ) );
+ }
+
+ @Test
+ public void testNumber() throws IOException {
+int num = new Random().nextInt();
+String inputJson = String.valueOf(num);
+StringReader inputReader = new StringReader( inputJson );
+JsonFilterReader filterReader = new
knox git commit: KNOX-1604 - Enable jacoco for test coverage
Repository: knox
Updated Branches:
refs/heads/master 7c22f02ad -> 0f89a951e
KNOX-1604 - Enable jacoco for test coverage
Signed-off-by: Kevin Risden
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/0f89a951
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/0f89a951
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/0f89a951
Branch: refs/heads/master
Commit: 0f89a951ef924e4d19d6b77cd5cada7adabd71eb
Parents: 7c22f02
Author: Kevin Risden
Authored: Sat Nov 10 11:34:14 2018 -0500
Committer: Kevin Risden
Committed: Thu Nov 15 14:34:01 2018 -0500
--
pom.xml | 64
1 file changed, 64 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/knox/blob/0f89a951/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 342d834..3881ac2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,6 +170,7 @@
4.5.6
4.4.10
2.9.7
+0.8.2
1.17.1
1.2
1.1.3
@@ -561,6 +562,57 @@
+
+org.jacoco
+jacoco-maven-plugin
+${jacoco-maven-plugin.version}
+
+
+default-prepare-agent
+
+prepare-agent
+
+
+
+default-prepare-agent-integration
+
+prepare-agent-integration
+
+
+
+default-report
+
+report
+
+
+
+default-report-integration
+
+report-integration
+
+
+
+default-check
+
+check
+
+
+
+
+BUNDLE
+
+
+COMPLEXITY
+COVEREDRATIO
+0.00
+
+
+
+
+
+
+
+
@@ -592,6 +644,18 @@
+
+org.jacoco
+jacoco-maven-plugin
+
+
+
+
+report
+
+
+
+
[1/2] knox git commit: KNOX-1605 - Ensure overridden methods have @Override annotation
Repository: knox
Updated Branches:
refs/heads/master 0f89a951e -> c4b35aaff
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/topology/discovery/DefaultServiceDiscoveryConfig.java
--
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/topology/discovery/DefaultServiceDiscoveryConfig.java
b/gateway-server/src/main/java/org/apache/knox/gateway/topology/discovery/DefaultServiceDiscoveryConfig.java
index fde01b0..04e0e8c 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/topology/discovery/DefaultServiceDiscoveryConfig.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/topology/discovery/DefaultServiceDiscoveryConfig.java
@@ -33,14 +33,17 @@ public class DefaultServiceDiscoveryConfig implements
ServiceDiscoveryConfig {
this.pwdAlias = alias;
}
+@Override
public String getAddress() {
return address;
}
+@Override
public String getUser() {
return user;
}
+@Override
public String getPasswordAlias() {
return pwdAlias;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/DefaultRemoteConfigurationMonitor.java
--
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/DefaultRemoteConfigurationMonitor.java
b/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/DefaultRemoteConfigurationMonitor.java
index d94eb73..87d9373 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/DefaultRemoteConfigurationMonitor.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/DefaultRemoteConfigurationMonitor.java
@@ -46,22 +46,27 @@ class DefaultRemoteConfigurationMonitor implements
RemoteConfigurationMonitor {
private static final RemoteConfigurationRegistryClient.EntryACL
AUTHENTICATED_USERS_ALL;
static {
AUTHENTICATED_USERS_ALL = new
RemoteConfigurationRegistryClient.EntryACL() {
+@Override
public String getId() {
return "";
}
+@Override
public String getType() {
return "auth";
}
+@Override
public Object getPermissions() {
return ZooDefs.Perms.ALL;
}
+@Override
public boolean canRead() {
return true;
}
+@Override
public boolean canWrite() {
return true;
}
@@ -71,22 +76,27 @@ class DefaultRemoteConfigurationMonitor implements
RemoteConfigurationMonitor {
private static final RemoteConfigurationRegistryClient.EntryACL
WORLD_ANYONE_READ;
static {
WORLD_ANYONE_READ = new RemoteConfigurationRegistryClient.EntryACL() {
+@Override
public String getId() {
return "anyone";
}
+@Override
public String getType() {
return "world";
}
+@Override
public Object getPermissions() {
return ZooDefs.Perms.READ;
}
+@Override
public boolean canRead() {
return true;
}
+@Override
public boolean canWrite() {
return false;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/c4b35aaf/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java
--
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java
b/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java
index 090bffc..1a7359b 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java
@@ -62,14 +62,17 @@ public class TopologyValidator {
Validator validator = s.newValidator();
final List exceptions = new LinkedList<>();
validator.setErrorHandler(new ErrorHandler() {
+@Override
public void warning(SAXParseException exception) throws SAXException {
exceptions.add(exception);
}
+@Override
public void fatalError(SAXParseException exception) throws
SAXException {
exceptions.add(exception);
}
+@Override
public void error(SAXParseException exception) throws SAXException {
exceptions.add(exception);
}
knox git commit: KNOX-1603 - Ensure resources are properly closed
Repository: knox
Updated Branches:
refs/heads/master b34c0eb81 -> 7c22f02ad
KNOX-1603 - Ensure resources are properly closed
Signed-off-by: Kevin Risden
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/7c22f02a
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/7c22f02a
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/7c22f02a
Branch: refs/heads/master
Commit: 7c22f02ad8fe1df99b184d906077e6028b7f65a1
Parents: b34c0eb
Author: Kevin Risden
Authored: Thu Nov 15 09:15:37 2018 -0500
Committer: Kevin Risden
Committed: Thu Nov 15 12:30:03 2018 -0500
--
.../org/apache/knox/gateway/GatewayServer.java | 6 +-
.../gateway/util/ServiceDefinitionsLoader.java | 12 +--
.../service/test/ServiceTestResource.java | 106 ++-
.../services/hostmap/FileBasedHostMapper.java | 35 +++---
.../java/org/apache/knox/test/TestUtils.java| 4 +-
5 files changed, 80 insertions(+), 83 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/knox/blob/7c22f02a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java
--
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java
b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java
index 9f9bc1e..385f9cb 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java
@@ -960,9 +960,9 @@ public class GatewayServer {
}
private static void checkAddressAvailability( InetSocketAddress address )
throws IOException {
-ServerSocket socket = new ServerSocket();
-socket.bind( address );
-socket.close();
+try( ServerSocket socket = new ServerSocket() ) {
+ socket.bind(address);
+}
}
private static class RegexFilenameFilter implements FilenameFilter {
http://git-wip-us.apache.org/repos/asf/knox/blob/7c22f02a/gateway-server/src/main/java/org/apache/knox/gateway/util/ServiceDefinitionsLoader.java
--
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/util/ServiceDefinitionsLoader.java
b/gateway-server/src/main/java/org/apache/knox/gateway/util/ServiceDefinitionsLoader.java
index cd6b7d2..d2687ec 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/util/ServiceDefinitionsLoader.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/util/ServiceDefinitionsLoader.java
@@ -118,15 +118,9 @@ public class ServiceDefinitionsLoader {
public static UrlRewriteRulesDescriptor loadRewriteRules(File servicesDir) {
File rewriteFile = new File(servicesDir, REWRITE_FILE);
if ( rewriteFile.exists() ) {
- InputStream stream;
- try {
-stream = new FileInputStream(rewriteFile);
-Reader reader = new InputStreamReader(stream, StandardCharsets.UTF_8);
-UrlRewriteRulesDescriptor rules =
UrlRewriteRulesDescriptorFactory.load(
-"xml", reader);
-reader.close();
-stream.close();
-return rules;
+ try (InputStream stream = new FileInputStream(rewriteFile);
+ Reader reader = new InputStreamReader(stream,
StandardCharsets.UTF_8)) {
+return UrlRewriteRulesDescriptorFactory.load("xml", reader);
} catch ( FileNotFoundException e ) {
log.failedToFindRewriteFile(rewriteFile.getAbsolutePath(), e);
} catch ( IOException e ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/7c22f02a/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/ServiceTestResource.java
--
diff --git
a/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/ServiceTestResource.java
b/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/ServiceTestResource.java
index 2ab6a14..9e8554e 100644
---
a/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/ServiceTestResource.java
+++
b/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/ServiceTestResource.java
@@ -70,7 +70,7 @@ public class ServiceTestResource {
String authString;
GatewayConfig config = (GatewayConfig)
request.getServletContext().getAttribute(GatewayConfig.GATEWAY_CONFIG_ATTRIBUTE);
SSLContext ctx = null;
-CloseableHttpClient client;
+CloseableHttpClient client = null;
String id = getTopologyName();
Topology topology = getTopology(id);
@@ -92,63 +92,67 @@ public class ServiceTestResource {
}
//Initialize the HTTP client
-if(ctx == null) {
- client = HttpClients.createDefault();
-} else {
- client =
knox git commit: KNOX-1539 - Add checkstyle enforcement for array style
Repository: knox Updated Branches: refs/heads/master c4b35aaff -> 8a173d139 KNOX-1539 - Add checkstyle enforcement for array style Signed-off-by: Kevin Risden Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/8a173d13 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/8a173d13 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/8a173d13 Branch: refs/heads/master Commit: 8a173d139c19ab155022c175e24bd00d26cdbe2d Parents: c4b35aa Author: Kevin Risden Authored: Thu Nov 15 15:33:44 2018 -0500 Committer: Kevin Risden Committed: Thu Nov 15 16:05:14 2018 -0500 -- build-tools/src/main/resources/build-tools/checkstyle/checker.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/knox/blob/8a173d13/build-tools/src/main/resources/build-tools/checkstyle/checker.xml -- diff --git a/build-tools/src/main/resources/build-tools/checkstyle/checker.xml b/build-tools/src/main/resources/build-tools/checkstyle/checker.xml index 50af2f6..d3d4b5f 100644 --- a/build-tools/src/main/resources/build-tools/checkstyle/checker.xml +++ b/build-tools/src/main/resources/build-tools/checkstyle/checker.xml @@ -64,6 +64,8 @@ limitations under the License. + +
