You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by bb...@apache.org on 2019/10/10 19:09:58 UTC
[nifi] 02/02: NIFI-5753 Make use of keyPassword optional and only
used when keystore is used, bump registry client version
This is an automated email from the ASF dual-hosted git repository.
bbende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit af81afce408a4d4e731d2431fb1b9b2b26def1fe
Author: Bryan Bende <bb...@apache.org>
AuthorDate: Thu Oct 10 15:07:12 2019 -0400
NIFI-5753 Make use of keyPassword optional and only used when keystore is used, bump registry client version
This closes #3126.
---
.../nifi-hwx-schema-registry-service/pom.xml | 2 +-
.../nifi/schemaregistry/hortonworks/HortonworksSchemaRegistry.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml
index c0d2fdb..fe4c35e 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml
@@ -28,7 +28,7 @@ limitations under the License.
<artifactId>nifi-hwx-schema-registry-service</artifactId>
<packaging>jar</packaging>
<properties>
- <hwx.registry.version>0.5.3</hwx.registry.version>
+ <hwx.registry.version>0.8.0</hwx.registry.version>
</properties>
<dependencies>
<dependency>
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/src/main/java/org/apache/nifi/schemaregistry/hortonworks/HortonworksSchemaRegistry.java b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/src/main/java/org/apache/nifi/schemaregistry/hortonworks/HortonworksSchemaRegistry.java
index cb97fce..eb5817e 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/src/main/java/org/apache/nifi/schemaregistry/hortonworks/HortonworksSchemaRegistry.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/src/main/java/org/apache/nifi/schemaregistry/hortonworks/HortonworksSchemaRegistry.java
@@ -142,11 +142,13 @@ public class HortonworksSchemaRegistry extends AbstractControllerService impleme
ImmutableMap.Builder<String, String> propertiesBuilder = ImmutableMap.builder();
if (sslContextService != null) {
propertiesBuilder.put("protocol", sslContextService.getSslAlgorithm());
- propertiesBuilder.put("keyPassword", sslContextService.getKeyPassword());
if (sslContextService.isKeyStoreConfigured()) {
propertiesBuilder.put("keyStorePath", sslContextService.getKeyStoreFile());
propertiesBuilder.put("keyStorePassword", sslContextService.getKeyStorePassword());
propertiesBuilder.put("keyStoreType", sslContextService.getKeyStoreType());
+ if (sslContextService.getKeyPassword() != null) {
+ propertiesBuilder.put("keyPassword", sslContextService.getKeyPassword());
+ }
}
if (sslContextService.isTrustStoreConfigured()) {
propertiesBuilder.put("trustStorePath", sslContextService.getTrustStoreFile());