This is an automated email from the ASF dual-hosted git repository.
krisden 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 c1b2cbd KNOX-1836 - Migrate from commons-lang to commons-lang3
c1b2cbd is described below
commit c1b2cbd2a0c24e2a01a27285f30e9ee6d463de66
Author: Kevin Risden <[email protected]>
AuthorDate: Fri Mar 29 14:22:40 2019 -0400
KNOX-1836 - Migrate from commons-lang to commons-lang3
Close apache/knox#80
Signed-off-by: Kevin Risden <[email protected]>
---
gateway-provider-identity-assertion-common/pom.xml | 4 ++--
.../common/filter/CommonIdentityAssertionFilter.java | 2 +-
gateway-provider-security-jwt/pom.xml | 4 ----
.../gateway/provider/federation/jwt/filter/AbstractJWTFilter.java | 5 ++---
gateway-provider-security-pac4j/pom.xml | 4 ++--
.../org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java | 2 +-
gateway-server/pom.xml | 4 ----
.../org/apache/knox/gateway/filter/PortMappingHelperHandler.java | 2 +-
.../knox/gateway/services/security/impl/DefaultKeystoreService.java | 3 +--
.../java/org/apache/knox/gateway/websockets/MessageFailureTest.java | 2 +-
gateway-service-nifi/pom.xml | 4 ++--
.../main/java/org/apache/knox/gateway/dispatch/NiFiRequestUtil.java | 2 +-
.../java/org/apache/knox/gateway/dispatch/NiFiResponseUtil.java | 2 +-
gateway-test-release-utils/pom.xml | 6 ------
.../src/main/java/org/apache/knox/gateway/GatewayTestConfig.java | 2 +-
pom.xml | 6 ------
16 files changed, 16 insertions(+), 38 deletions(-)
diff --git a/gateway-provider-identity-assertion-common/pom.xml
b/gateway-provider-identity-assertion-common/pom.xml
index f22c76f..38a900a 100644
--- a/gateway-provider-identity-assertion-common/pom.xml
+++ b/gateway-provider-identity-assertion-common/pom.xml
@@ -59,8 +59,8 @@
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
diff --git
a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java
b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java
index 9e9987b..20680c9 100644
---
a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java
+++
b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java
@@ -26,7 +26,7 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.knox.gateway.IdentityAsserterMessages;
import org.apache.knox.gateway.i18n.messages.MessagesFactory;
import org.apache.knox.gateway.security.principal.PrincipalMappingException;
diff --git a/gateway-provider-security-jwt/pom.xml
b/gateway-provider-security-jwt/pom.xml
index 828edf6..36c9ee1 100644
--- a/gateway-provider-security-jwt/pom.xml
+++ b/gateway-provider-security-jwt/pom.xml
@@ -50,10 +50,6 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git
a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java
b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java
index 1a1ea64..7b990e6 100644
---
a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java
+++
b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java
@@ -55,7 +55,6 @@ import org.apache.knox.gateway.security.PrimaryPrincipal;
import org.apache.knox.gateway.services.GatewayServices;
import org.apache.knox.gateway.services.security.token.JWTokenAuthority;
import org.apache.knox.gateway.services.security.token.TokenServiceException;
-import org.apache.commons.lang.StringUtils;
import org.apache.knox.gateway.services.security.token.impl.JWT;
import com.nimbusds.jose.JWSHeader;
@@ -124,7 +123,7 @@ public abstract class AbstractJWTFilter implements Filter {
protected List<String> parseExpectedAudiences(String expectedAudiences) {
List<String> audList = null;
// setup the list of valid audiences for token validation
- if (!StringUtils.isEmpty(expectedAudiences)) {
+ if (expectedAudiences != null && !expectedAudiences.isEmpty()) {
// parse into the list
String[] audArray = expectedAudiences.split(",");
audList = new ArrayList<>();
@@ -305,4 +304,4 @@ public abstract class AbstractJWTFilter implements Filter {
protected abstract void handleValidationError(HttpServletRequest request,
HttpServletResponse response, int status,
String error) throws
IOException;
-}
\ No newline at end of file
+}
diff --git a/gateway-provider-security-pac4j/pom.xml
b/gateway-provider-security-pac4j/pom.xml
index 5af432a..1a8de32 100644
--- a/gateway-provider-security-pac4j/pom.xml
+++ b/gateway-provider-security-pac4j/pom.xml
@@ -55,8 +55,8 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
diff --git
a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java
b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java
index a78e38b..39bd323 100644
---
a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java
+++
b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java
@@ -17,7 +17,7 @@
*/
package org.apache.knox.gateway.pac4j.filter;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.knox.gateway.i18n.messages.MessagesFactory;
import org.apache.knox.gateway.pac4j.Pac4jMessages;
import org.apache.knox.gateway.pac4j.session.KnoxSessionStore;
diff --git a/gateway-server/pom.xml b/gateway-server/pom.xml
index b451d69..28d07b8 100644
--- a/gateway-server/pom.xml
+++ b/gateway-server/pom.xml
@@ -180,10 +180,6 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/filter/PortMappingHelperHandler.java
b/gateway-server/src/main/java/org/apache/knox/gateway/filter/PortMappingHelperHandler.java
index effcd64..e776596 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/filter/PortMappingHelperHandler.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/filter/PortMappingHelperHandler.java
@@ -16,7 +16,7 @@
*/
package org.apache.knox.gateway.filter;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.knox.gateway.GatewayMessages;
import org.apache.knox.gateway.config.GatewayConfig;
import org.apache.knox.gateway.i18n.messages.MessagesFactory;
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultKeystoreService.java
b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultKeystoreService.java
index 9a0b95a..76ed008 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultKeystoreService.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultKeystoreService.java
@@ -19,7 +19,6 @@ package org.apache.knox.gateway.services.security.impl;
import static
org.apache.knox.gateway.services.security.AliasService.NO_CLUSTER_NAME;
-import org.apache.commons.lang.StringUtils;
import org.apache.knox.gateway.GatewayMessages;
import org.apache.knox.gateway.GatewayResources;
import org.apache.knox.gateway.config.GatewayConfig;
@@ -579,7 +578,7 @@ public class DefaultKeystoreService implements
KeystoreService, Service {
private char[] getKeyStorePassword(String alias) throws
KeystoreServiceException {
char[] password = null;
- if (StringUtils.isNotEmpty(alias)) {
+ if (alias != null && !alias.isEmpty()) {
password = getCredentialForCluster(NO_CLUSTER_NAME, alias);
}
return (password == null) ? masterService.getMasterSecret() : password;
diff --git
a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/MessageFailureTest.java
b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/MessageFailureTest.java
index fe4359f..64b7f9a 100644
---
a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/MessageFailureTest.java
+++
b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/MessageFailureTest.java
@@ -17,7 +17,7 @@
*/
package org.apache.knox.gateway.websockets;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.ContextHandler;
diff --git a/gateway-service-nifi/pom.xml b/gateway-service-nifi/pom.xml
index ddd3f35..2dfa22e 100644
--- a/gateway-service-nifi/pom.xml
+++ b/gateway-service-nifi/pom.xml
@@ -44,8 +44,8 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
diff --git
a/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiRequestUtil.java
b/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiRequestUtil.java
index 7286920..b028695 100644
---
a/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiRequestUtil.java
+++
b/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiRequestUtil.java
@@ -17,7 +17,7 @@
*/
package org.apache.knox.gateway.dispatch;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.http.Header;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.client.methods.RequestBuilder;
diff --git
a/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiResponseUtil.java
b/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiResponseUtil.java
index 93441af..29c3ec1 100644
---
a/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiResponseUtil.java
+++
b/gateway-service-nifi/src/main/java/org/apache/knox/gateway/dispatch/NiFiResponseUtil.java
@@ -25,7 +25,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.http.Header;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
diff --git a/gateway-test-release-utils/pom.xml
b/gateway-test-release-utils/pom.xml
index 24a6276..3886dd2 100644
--- a/gateway-test-release-utils/pom.xml
+++ b/gateway-test-release-utils/pom.xml
@@ -97,12 +97,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git
a/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java
b/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java
index e5647b6..4572047 100644
---
a/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java
+++
b/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java
@@ -17,7 +17,7 @@
*/
package org.apache.knox.gateway;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.knox.gateway.config.GatewayConfig;
import org.apache.knox.gateway.config.impl.GatewayConfigImpl;
diff --git a/pom.xml b/pom.xml
index 6952341..6fa7e19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,6 @@
<commons-configuration.version>1.10</commons-configuration.version>
<commons-digester3.version>3.2</commons-digester3.version>
<commons-io.version>2.6</commons-io.version>
- <commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.8.1</commons-lang3.version>
<commons-net.version>3.6</commons-net.version>
<commons-text.version>1.6</commons-text.version>
@@ -1517,11 +1516,6 @@
<version>${commons-io.version}</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
