NIFI-4149: Minor tweaks to verbiage This closes #2205.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/644133dc Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/644133dc Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/644133dc Branch: refs/heads/master Commit: 644133dc353e8ca3b66658e768b1199c4820da06 Parents: 4c78779 Author: Mark Payne <marka...@hotmail.com> Authored: Fri Apr 6 12:39:34 2018 -0400 Committer: Mark Payne <marka...@hotmail.com> Committed: Fri Apr 6 12:42:38 2018 -0400 ---------------------------------------------------------------------- .../apache/nifi/web/api/dto/PropertyDescriptorDTO.java | 12 ++++++------ .../documentation/html/HtmlDocumentationWriter.java | 8 ++++---- .../html/ProcessorDocumentationWriterTest.java | 2 +- .../java/org/apache/nifi/controller/TemplateUtils.java | 2 +- .../java/org/apache/nifi/web/api/dto/DtoFactory.java | 2 +- .../nifi-web-ui/src/main/webapp/js/nf/nf-common.js | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/644133dc/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java index e14b1bf..5834f15 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java @@ -37,7 +37,7 @@ public class PropertyDescriptorDTO { private Boolean sensitive; private Boolean dynamic; private Boolean supportsEl; - private String scopeEl; + private String expressionLanguageScope; private String identifiesControllerService; private BundleDTO identifiesControllerServiceBundle; @@ -171,14 +171,14 @@ public class PropertyDescriptorDTO { * @return specifies the scope of expression language evaluation */ @ApiModelProperty( - value = "Scope of the EL evaluation for the property." + value = "Scope of the Expression Language evaluation for the property." ) - public String getScopeEl() { - return scopeEl; + public String getExpressionLanguageScope() { + return expressionLanguageScope; } - public void setScopeEl(String scopeEl) { - this.scopeEl = scopeEl; + public void setExpressionLanguageScope(String scope) { + this.expressionLanguageScope = scope; } /** http://git-wip-us.apache.org/repos/asf/nifi/blob/644133dc/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java index 48fa109..fb2c5a0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java @@ -525,8 +525,8 @@ public class HtmlDocumentationWriter implements DocumentationWriter { if (property.isExpressionLanguageSupported()) { xmlStreamWriter.writeEmptyElement("br"); String text = "Supports Expression Language: true"; - final String perFF = " (will be evaluated using flow file attributes and registry)"; - final String registry = " (will be evaluated using registry only)"; + final String perFF = " (will be evaluated using flow file attributes and variable registry)"; + final String registry = " (will be evaluated using variable registry only)"; final InputRequirement inputRequirement = configurableComponent.getClass().getAnnotation(InputRequirement.class); switch(property.getExpressionLanguageScope()) { @@ -627,10 +627,10 @@ public class HtmlDocumentationWriter implements DocumentationWriter { } else { switch(dynamicProperty.expressionLanguageScope()) { case FLOWFILE_ATTRIBUTES: - text = "Supports Expression Language: true (will be evaluated using flow file attributes and registry)"; + text = "Supports Expression Language: true (will be evaluated using flow file attributes and variable registry)"; break; case VARIABLE_REGISTRY: - text = "Supports Expression Language: true (will be evaluated using registry only)"; + text = "Supports Expression Language: true (will be evaluated using variable registry only)"; break; case NONE: default: http://git-wip-us.apache.org/repos/asf/nifi/blob/644133dc/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/html/ProcessorDocumentationWriterTest.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/html/ProcessorDocumentationWriterTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/html/ProcessorDocumentationWriterTest.java index a047fd5..4e45b7b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/html/ProcessorDocumentationWriterTest.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/html/ProcessorDocumentationWriterTest.java @@ -87,7 +87,7 @@ public class ProcessorDocumentationWriterTest { assertNotContains(results, "Additional Details..."); // check expression language scope - assertContains(results, "Supports Expression Language: true (will be evaluated using registry only)"); + assertContains(results, "Supports Expression Language: true (will be evaluated using variable registry only)"); assertContains(results, "Supports Expression Language: true (undefined scope)"); // verify dynamic properties http://git-wip-us.apache.org/repos/asf/nifi/blob/644133dc/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/TemplateUtils.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/TemplateUtils.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/TemplateUtils.java index 5b40f72..57ea19f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/TemplateUtils.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/TemplateUtils.java @@ -209,7 +209,7 @@ public class TemplateUtils { descriptor.setRequired(null); descriptor.setSensitive(null); descriptor.setSupportsEl(null); - descriptor.setScopeEl(null); + descriptor.setExpressionLanguageScope(null); descriptor.setIdentifiesControllerServiceBundle(null); } http://git-wip-us.apache.org/repos/asf/nifi/blob/644133dc/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java index d0bd539..3aac227 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java @@ -3605,7 +3605,7 @@ public final class DtoFactory { String description = propertyDescriptor.isExpressionLanguageSupported() && propertyDescriptor.getExpressionLanguageScope().equals(ExpressionLanguageScope.NONE) ? "true (undefined scope)" : propertyDescriptor.getExpressionLanguageScope().getDescription(); - dto.setScopeEl(description); + dto.setExpressionLanguageScope(description); // set the identifies controller service is applicable if (propertyDescriptor.getControllerServiceDefinition() != null) { http://git-wip-us.apache.org/repos/asf/nifi/blob/644133dc/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js index 238c8be..99b2d35 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js @@ -900,7 +900,7 @@ tipContent.push('<b>Default value:</b> ' + nfCommon.escapeHtml(propertyDescriptor.defaultValue)); } if (!nfCommon.isBlank(propertyDescriptor.supportsEl)) { - tipContent.push('<b>Expression language scope:</b> ' + nfCommon.escapeHtml(propertyDescriptor.scopeEl)); + tipContent.push('<b>Expression language scope:</b> ' + nfCommon.escapeHtml(propertyDescriptor.expressionLanguageScope)); } if (!nfCommon.isBlank(propertyDescriptor.identifiesControllerService)) { var formattedType = nfCommon.formatType({
