Repository: nifi Updated Branches: refs/heads/master ec8afd18d -> 08c54bc48
Revert "NIFI-4558 - Set JKS as the default keystore type and truststore type." This reverts commit 2b9fdf8415eb2b033bfc63a6c5254bba3e69ecdd. This closes #3097. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/08c54bc4 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/08c54bc4 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/08c54bc4 Branch: refs/heads/master Commit: 08c54bc48d14d559ce38970ecde0b9583ecc96a5 Parents: ec8afd1 Author: thenatog <[email protected]> Authored: Fri Oct 19 15:46:12 2018 -0400 Committer: Jeff Storck <[email protected]> Committed: Sat Oct 20 17:50:24 2018 -0400 ---------------------------------------------------------------------- .../nifi/ssl/StandardSSLContextService.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/08c54bc4/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java index e413769..6b267ac 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java +++ b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java @@ -16,6 +16,14 @@ */ package org.apache.nifi.ssl; +import java.io.File; +import java.net.MalformedURLException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import javax.net.ssl.SSLContext; import org.apache.nifi.annotation.documentation.CapabilityDescription; import org.apache.nifi.annotation.documentation.Tags; import org.apache.nifi.annotation.lifecycle.OnEnabled; @@ -33,15 +41,6 @@ import org.apache.nifi.security.util.CertificateUtils; import org.apache.nifi.security.util.KeystoreType; import org.apache.nifi.security.util.SslContextFactory; -import javax.net.ssl.SSLContext; -import java.io.File; -import java.net.MalformedURLException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; - @Tags({"ssl", "secure", "certificate", "keystore", "truststore", "jks", "p12", "pkcs12", "pkcs", "tls"}) @CapabilityDescription("Standard implementation of the SSLContextService. Provides the ability to configure " + "keystore and/or truststore properties once and reuse that configuration throughout the application. " @@ -66,7 +65,6 @@ public class StandardSSLContextService extends AbstractControllerService impleme .allowableValues(STORE_TYPE_JKS, STORE_TYPE_PKCS12) .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .sensitive(false) - .defaultValue(STORE_TYPE_JKS) .build(); public static final PropertyDescriptor TRUSTSTORE_PASSWORD = new PropertyDescriptor.Builder() .name("Truststore Password") @@ -88,7 +86,6 @@ public class StandardSSLContextService extends AbstractControllerService impleme .allowableValues(STORE_TYPE_JKS, STORE_TYPE_PKCS12) .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .sensitive(false) - .defaultValue(STORE_TYPE_JKS) .build(); public static final PropertyDescriptor KEYSTORE_PASSWORD = new PropertyDescriptor.Builder() .name("Keystore Password")
