From ddc4e28967c55ebe3522c16dc1e0bd642936e534 Mon Sep 17 00:00:00 2001 From: thenatog Date: Fri, 19 Oct 2018 15:46:12 -0400 Subject: [PATCH] Revert "NIFI-4558 - Set JKS as the default keystore type and truststore type." This reverts commit 2b9fdf8415eb2b033bfc63a6c5254bba3e69ecdd. --- .../nifi/ssl/StandardSSLContextService.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) 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 e413769bea0e..6b267ac91580 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.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")