From 7f7e3f0e7af341f6002f26f3488199eb3833f59d Mon Sep 17 00:00:00 2001 From: dan-s1 Date: Tue, 17 Oct 2023 00:49:35 +0000 Subject: [PATCH] NIFI-12165 Changed the properties "Custom Transformation Class Name" and "Custom Module Directory" to depend on the "Jolt Transformation DSL" property when its value is "Custom" This closes #7890 Signed-off-by: Chris Sampson --- .../nifi/processors/jolt/record/JoltTransformRecord.java | 4 ++-- .../apache/nifi/processors/standard/JoltTransformJSON.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/main/java/org/apache/nifi/processors/jolt/record/JoltTransformRecord.java b/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/main/java/org/apache/nifi/processors/jolt/record/JoltTransformRecord.java index dc2e216f10..4f76041e34 100644 --- a/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/main/java/org/apache/nifi/processors/jolt/record/JoltTransformRecord.java +++ b/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/main/java/org/apache/nifi/processors/jolt/record/JoltTransformRecord.java @@ -161,7 +161,7 @@ public class JoltTransformRecord extends AbstractProcessor { .required(false) .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES) .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) - .dependsOn(JOLT_SPEC, CUSTOMR) + .dependsOn(JOLT_TRANSFORM, CUSTOMR) .build(); static final PropertyDescriptor MODULES = new PropertyDescriptor.Builder() @@ -172,7 +172,7 @@ public class JoltTransformRecord extends AbstractProcessor { .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE, ResourceType.DIRECTORY) .dynamicallyModifiesClasspath(true) - .dependsOn(JOLT_SPEC, CUSTOMR) + .dependsOn(JOLT_TRANSFORM, CUSTOMR) .build(); static final PropertyDescriptor TRANSFORM_CACHE_SIZE = new PropertyDescriptor.Builder() diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JoltTransformJSON.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JoltTransformJSON.java index 7bffe1a077..49b780f471 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JoltTransformJSON.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JoltTransformJSON.java @@ -122,7 +122,7 @@ public class JoltTransformJSON extends AbstractProcessor { .required(false) .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES) .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) - .dependsOn(JOLT_SPEC, CUSTOMR) + .dependsOn(JOLT_TRANSFORM, CUSTOMR) .build(); public static final PropertyDescriptor MODULES = new PropertyDescriptor.Builder() @@ -133,7 +133,7 @@ public class JoltTransformJSON extends AbstractProcessor { .identifiesExternalResource(ResourceCardinality.MULTIPLE, ResourceType.FILE, ResourceType.DIRECTORY) .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) .dynamicallyModifiesClasspath(true) - .dependsOn(JOLT_SPEC, CUSTOMR) + .dependsOn(JOLT_TRANSFORM, CUSTOMR) .build(); static final PropertyDescriptor TRANSFORM_CACHE_SIZE = new PropertyDescriptor.Builder()