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 3fb0b88 KNOX-1702 - Use Boolean.parseBoolean instead of true.equals
3fb0b88 is described below
commit 3fb0b88e6232e423d746befde3407ba13db4e400
Author: Kevin Risden <[email protected]>
AuthorDate: Thu Dec 20 11:14:09 2018 -0500
KNOX-1702 - Use Boolean.parseBoolean instead of true.equals
Signed-off-by: Kevin Risden <[email protected]>
---
.../IdentityAsserterHttpServletRequestWrapper.java | 2 +-
.../webappsec/deploy/WebAppSecContributor.java | 12 ++++-----
.../gateway/config/impl/GatewayConfigImpl.java | 31 +++++++---------------
.../java/org/apache/knox/gateway/util/KnoxCLI.java | 2 +-
.../gateway/service/knoxtoken/TokenResource.java | 2 +-
.../knox/gateway/dispatch/DefaultDispatch.java | 2 +-
.../gateway/dispatch/DefaultHttpClientFactory.java | 2 +-
7 files changed, 21 insertions(+), 32 deletions(-)
diff --git
a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/IdentityAsserterHttpServletRequestWrapper.java
b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/IdentityAsserterHttpServletRequestWrapper.java
index 280dfc7..de844ca 100644
---
a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/IdentityAsserterHttpServletRequestWrapper.java
+++
b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/IdentityAsserterHttpServletRequestWrapper.java
@@ -163,7 +163,7 @@ private static SpiGatewayMessages log =
MessagesFactory.get( SpiGatewayMessages.
List<String> principalParamNames = getImpersonationParamNames();
params = scrubOfExistingPrincipalParams(params, principalParamNames);
- if
("true".equals(System.getProperty(GatewayConfig.HADOOP_KERBEROS_SECURED))) {
+ if
(Boolean.parseBoolean(System.getProperty(GatewayConfig.HADOOP_KERBEROS_SECURED)))
{
params.put(DOAS_PRINCIPAL_PARAM, al);
} else {
params.put(PRINCIPAL_PARAM, al);
diff --git
a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/deploy/WebAppSecContributor.java
b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/deploy/WebAppSecContributor.java
index f01688e..8633c15 100644
---
a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/deploy/WebAppSecContributor.java
+++
b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/deploy/WebAppSecContributor.java
@@ -85,7 +85,7 @@ public class WebAppSecContributor extends
ProviderDeploymentContributorBase {
Map<String, String> providerParams = provider.getParams();
// CORS support
String corsEnabled = map.get(CORS_ENABLED);
- if (corsEnabled != null && "true".equals(corsEnabled)) {
+ if (Boolean.parseBoolean(corsEnabled)) {
provisionConfig(resource, providerParams, params, "cors.");
resource.addFilter().name(getName() + CORS_SUFFIX)
.role(getRole())
@@ -96,7 +96,7 @@ public class WebAppSecContributor extends
ProviderDeploymentContributorBase {
// CRSF
params = new ArrayList<>();
String csrfEnabled = map.get(CSRF_ENABLED);
- if (csrfEnabled != null && "true".equals(csrfEnabled)) {
+ if (Boolean.parseBoolean(csrfEnabled)) {
provisionConfig(resource, providerParams, params, "csrf.");
resource.addFilter().name(getName() + CSRF_SUFFIX)
.role(getRole())
@@ -107,7 +107,7 @@ public class WebAppSecContributor extends
ProviderDeploymentContributorBase {
// X-Frame-Options - clickjacking protection
params = new ArrayList<>();
String xframeOptionsEnabled = map.get(XFRAME_OPTIONS_ENABLED);
- if (xframeOptionsEnabled != null && "true".equals(xframeOptionsEnabled))
{
+ if (Boolean.parseBoolean(xframeOptionsEnabled)) {
provisionConfig(resource, providerParams, params, "xframe.");
resource.addFilter().name(getName() + XFRAME_OPTIONS_SUFFIX)
.role(getRole())
@@ -118,7 +118,7 @@ public class WebAppSecContributor extends
ProviderDeploymentContributorBase {
// X-Content-Type-Options - MIME type sniffing protection
params = new ArrayList<>();
String xContentTypeOptionsEnabled =
map.get(XCONTENT_TYPE_OPTIONS_ENABLED);
- if (xContentTypeOptionsEnabled != null &&
"true".equals(xContentTypeOptionsEnabled)) {
+ if (Boolean.parseBoolean(xContentTypeOptionsEnabled)) {
provisionConfig(resource, providerParams, params, "xcontent-type.");
resource.addFilter().name(getName() + XCONTENT_TYPE_OPTIONS_SUFFIX)
.role(getRole())
@@ -129,7 +129,7 @@ public class WebAppSecContributor extends
ProviderDeploymentContributorBase {
// X-XSS-Protection - browser xss protection
params = new ArrayList<>();
String xssProtectionEnabled = map.get(XSS_PROTECTION_ENABLED);
- if (xssProtectionEnabled != null && "true".equals(xssProtectionEnabled))
{
+ if (Boolean.parseBoolean(xssProtectionEnabled)) {
provisionConfig(resource, providerParams, params, "xss.");
resource.addFilter().name(getName() + XSS_PROTECTION_SUFFIX)
.role(getRole())
@@ -140,7 +140,7 @@ public class WebAppSecContributor extends
ProviderDeploymentContributorBase {
// HTTP Strict-Transport-Security
params = new ArrayList<>();
String strictTranportEnabled = map.get(STRICT_TRANSPORT_ENABLED);
- if (strictTranportEnabled != null &&
"true".equals(strictTranportEnabled)) {
+ if (Boolean.parseBoolean(strictTranportEnabled)) {
provisionConfig(resource, providerParams, params, "strict.");
resource.addFilter().name(getName() + STRICT_TRANSPORT_SUFFIX)
.role(getRole())
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
b/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
index 6273015..35f872a 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
@@ -442,15 +442,12 @@ public class GatewayConfigImpl extends Configuration
implements GatewayConfig {
@Override
public boolean isSSLEnabled() {
- String enabled = get( SSL_ENABLED, "true" );
-
- return "true".equals(enabled);
+ return Boolean.parseBoolean(get( SSL_ENABLED, "true" ));
}
@Override
public boolean isHadoopKerberosSecured() {
- String hadoopKerberosSecured = get( HADOOP_KERBEROS_SECURED, "false" );
- return "true".equals(hadoopKerberosSecured);
+ return Boolean.parseBoolean(get( HADOOP_KERBEROS_SECURED, "false" ));
}
@Override
@@ -460,8 +457,7 @@ public class GatewayConfigImpl extends Configuration
implements GatewayConfig {
@Override
public boolean isKerberosDebugEnabled() {
- String kerberosDebugEnabled = get( KRB5_DEBUG, "false" );
- return "true".equals(kerberosDebugEnabled);
+ return Boolean.parseBoolean(get( KRB5_DEBUG, "false" ));
}
@Override
@@ -522,14 +518,12 @@ public class GatewayConfigImpl extends Configuration
implements GatewayConfig {
@Override
public boolean isClientAuthNeeded() {
- String clientAuthNeeded = get( CLIENT_AUTH_NEEDED, "false" );
- return "true".equals(clientAuthNeeded);
+ return Boolean.parseBoolean(get( CLIENT_AUTH_NEEDED, "false" ));
}
@Override
public boolean isClientAuthWanted() {
- String clientAuthWanted = get( CLIENT_AUTH_WANTED, "false" );
- return "true".equals(clientAuthWanted);
+ return Boolean.parseBoolean(get( CLIENT_AUTH_WANTED, "false" ));
}
@Override
@@ -539,8 +533,7 @@ public class GatewayConfigImpl extends Configuration
implements GatewayConfig {
@Override
public boolean getTrustAllCerts() {
- String trustAllCerts = get( TRUST_ALL_CERTS, "false" );
- return "true".equals(trustAllCerts);
+ return Boolean.parseBoolean(get( TRUST_ALL_CERTS, "false" ));
}
@Override
@@ -555,8 +548,7 @@ public class GatewayConfigImpl extends Configuration
implements GatewayConfig {
@Override
public boolean isXForwardedEnabled() {
- String xForwardedEnabled = get( XFORWARDED_ENABLED, "true" );
- return "true".equals(xForwardedEnabled);
+ return Boolean.parseBoolean(get( XFORWARDED_ENABLED, "true" ));
}
@Override
@@ -679,20 +671,17 @@ public class GatewayConfigImpl extends Configuration
implements GatewayConfig {
@Override
public boolean isMetricsEnabled() {
- String metricsEnabled = get( METRICS_ENABLED, "false" );
- return "true".equals(metricsEnabled);
+ return Boolean.parseBoolean(get( METRICS_ENABLED, "false" ));
}
@Override
public boolean isJmxMetricsReportingEnabled() {
- String enabled = get( JMX_METRICS_REPORTING_ENABLED, "false" );
- return "true".equals(enabled);
+ return Boolean.parseBoolean(get( JMX_METRICS_REPORTING_ENABLED, "false" ));
}
@Override
public boolean isGraphiteMetricsReportingEnabled() {
- String enabled = get( GRAPHITE_METRICS_REPORTING_ENABLED, "false" );
- return "true".equals(enabled);
+ return Boolean.parseBoolean(get( GRAPHITE_METRICS_REPORTING_ENABLED,
"false" ));
}
@Override
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java
b/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java
index 8987db9..309f0ed 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java
@@ -721,7 +721,7 @@ public class KnoxCLI extends Configured implements Tool {
out.println(name + " has been successfully created.");
}
else {
- if ("true".equals(generate)) {
+ if (Boolean.parseBoolean(generate)) {
as.generateAliasForCluster(cluster, name);
out.println(name + " has been successfully generated.");
}
diff --git
a/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java
b/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java
index 307b739..526f7d9 100644
---
a/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java
+++
b/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java
@@ -86,7 +86,7 @@ public class TokenResource {
}
String clientCert = context.getInitParameter(TOKEN_CLIENT_CERT_REQUIRED);
- clientCertRequired = "true".equals(clientCert);
+ clientCertRequired = Boolean.parseBoolean(clientCert);
String principals = context.getInitParameter(TOKEN_ALLOWED_PRINCIPALS);
if (principals != null) {
diff --git
a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/DefaultDispatch.java
b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/DefaultDispatch.java
index 6eaccc8..8b899b9 100644
---
a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/DefaultDispatch.java
+++
b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/DefaultDispatch.java
@@ -121,7 +121,7 @@ public class DefaultDispatch extends
AbstractGatewayDispatch {
try {
auditor.audit( Action.DISPATCH, outboundRequest.getURI().toString(),
ResourceType.URI, ActionOutcome.UNAVAILABLE, RES.requestMethod(
outboundRequest.getMethod() ) );
- if( !"true".equals( System.getProperty(
GatewayConfig.HADOOP_KERBEROS_SECURED ) ) ) {
+ if(
!Boolean.parseBoolean(System.getProperty(GatewayConfig.HADOOP_KERBEROS_SECURED)))
{
// Hadoop cluster not Kerberos enabled
addCredentialsToRequest( outboundRequest );
}
diff --git
a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/DefaultHttpClientFactory.java
b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/DefaultHttpClientFactory.java
index a50bd49..2b38171 100644
---
a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/DefaultHttpClientFactory.java
+++
b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/DefaultHttpClientFactory.java
@@ -105,7 +105,7 @@ public class DefaultHttpClientFactory implements
HttpClientFactory {
}
builder.setSSLSocketFactory(new SSLConnectionSocketFactory(sslcontext));
}
- if (
"true".equals(System.getProperty(GatewayConfig.HADOOP_KERBEROS_SECURED)) ) {
+ if
(Boolean.parseBoolean(System.getProperty(GatewayConfig.HADOOP_KERBEROS_SECURED)))
{
CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
credentialsProvider.setCredentials(AuthScope.ANY, new
UseJaasCredentials());
