NIFI-271
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/6a706458 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/6a706458 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/6a706458 Branch: refs/heads/NIFI-292 Commit: 6a706458d093af061e6b957d99de3ca1bc1f4c30 Parents: 666de3d Author: joewitt <[email protected]> Authored: Mon Apr 27 13:25:44 2015 -0400 Committer: joewitt <[email protected]> Committed: Mon Apr 27 13:25:44 2015 -0400 ---------------------------------------------------------------------- nifi-parent/pom.xml | 6 +- .../nifi/processors/standard/BinFiles.java | 15 +- .../processors/standard/CompressContent.java | 9 +- .../nifi/processors/standard/ControlRate.java | 11 +- .../standard/ConvertCharacterSet.java | 22 ++- .../processors/standard/DistributeLoad.java | 17 +- .../processors/standard/EvaluateJsonPath.java | 36 ++-- .../nifi/processors/standard/EvaluateXPath.java | 9 +- .../processors/standard/EvaluateXQuery.java | 6 +- .../processors/standard/ExecuteProcess.java | 9 +- .../standard/ExecuteStreamCommand.java | 21 +-- .../nifi/processors/standard/ExtractText.java | 3 +- .../processors/standard/GenerateFlowFile.java | 3 +- .../nifi/processors/standard/GetFile.java | 6 +- .../nifi/processors/standard/GetJMSTopic.java | 3 +- .../processors/standard/HandleHttpRequest.java | 17 +- .../processors/standard/HandleHttpResponse.java | 3 +- .../nifi/processors/standard/HashAttribute.java | 10 +- .../nifi/processors/standard/InvokeHTTP.java | 24 ++- .../nifi/processors/standard/JmsConsumer.java | 6 +- .../nifi/processors/standard/ListenUDP.java | 178 +++++++++---------- .../nifi/processors/standard/MergeContent.java | 6 +- .../nifi/processors/standard/PostHTTP.java | 47 +++-- .../nifi/processors/standard/PutEmail.java | 6 +- .../apache/nifi/processors/standard/PutFTP.java | 9 +- .../processors/standard/PutFileTransfer.java | 11 +- .../apache/nifi/processors/standard/PutJMS.java | 3 +- .../nifi/processors/standard/PutSFTP.java | 6 +- .../nifi/processors/standard/ReplaceText.java | 28 ++- .../standard/ReplaceTextWithMapping.java | 13 +- .../processors/standard/RouteOnAttribute.java | 6 +- .../nifi/processors/standard/ScanAttribute.java | 5 +- .../nifi/processors/standard/SplitContent.java | 9 +- .../nifi/processors/standard/SplitText.java | 18 +- .../nifi/processors/standard/SplitXml.java | 3 +- .../nifi/processors/standard/TransformXml.java | 52 +++--- .../nifi/processors/standard/UnpackContent.java | 39 ++-- .../nifi/processors/standard/ValidateXml.java | 51 +++--- .../servlets/ContentAcknowledgmentServlet.java | 5 - .../standard/servlets/ListenHTTPServlet.java | 5 - .../nifi/processors/standard/util/Bin.java | 22 +-- .../processors/standard/util/BinManager.java | 2 +- .../standard/util/DocumentReaderCallback.java | 10 +- .../processors/standard/util/FTPTransfer.java | 3 +- .../nifi/processors/standard/util/FTPUtils.java | 2 +- .../processors/standard/util/FileTransfer.java | 29 ++- .../processors/standard/util/SFTPTransfer.java | 9 +- .../standard/util/XmlSplitterSaxParser.java | 11 +- .../processors/standard/TestDistributeLoad.java | 3 +- .../standard/TestHandleHttpRequest.java | 4 +- 50 files changed, 374 insertions(+), 457 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi-parent/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-parent/pom.xml b/nifi-parent/pom.xml index 2e888c5..bdb94c8 100644 --- a/nifi-parent/pom.xml +++ b/nifi-parent/pom.xml @@ -253,7 +253,7 @@ <module name="Checker"> <property name="charset" value="UTF-8" /> <property name="severity" value="warning" /> - <!-- Checks for whitespace --> + <!-- Checks for whitespace --> <!-- See http://checkstyle.sf.net/config_whitespace.html --> <module name="FileTabCharacter"> <property name="eachLine" value="true" /> @@ -267,10 +267,6 @@ <property name="format" value="[@]see\s+[{][@]link" /> <property name="message" value="Javadoc @see does not need @link: pick one or the other." /> </module> - <module name="RegexpSinglelineJava"> - <property name="format" value="jline[.]internal[.]Preconditions" /> - <property name="message" value="Please use Guava Preconditions not JLine" /> - </module> <module name="OuterTypeFilename" /> <module name="LineLength"> <!-- needs extra, because Eclipse formatter ignores the ending left brace --> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/BinFiles.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/BinFiles.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/BinFiles.java index 6452c23..399a12b 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/BinFiles.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/BinFiles.java @@ -225,8 +225,7 @@ public abstract class BinFiles extends AbstractSessionFactoryProcessor { try { binAlreadyCommitted = this.processBin(bin, binCopy, context, session); } catch (final ProcessException e) { - logger. - error("Failed to process bundle of {} files due to {}", new Object[]{binCopy.size(), e}); + logger.error("Failed to process bundle of {} files due to {}", new Object[]{binCopy.size(), e}); for (final FlowFileSessionWrapper wrapper : binCopy) { wrapper.getSession().transfer(wrapper.getFlowFile(), REL_FAILURE); @@ -294,8 +293,7 @@ public abstract class BinFiles extends AbstractSessionFactoryProcessor { } if (context.getProperty(MAX_SIZE).isSet()) { - binManager.setMaximumSize(context.getProperty(MAX_SIZE). - asDataSize(DataUnit.B).longValue()); + binManager.setMaximumSize(context.getProperty(MAX_SIZE).asDataSize(DataUnit.B).longValue()); } else { binManager.setMaximumSize(Long.MAX_VALUE); } @@ -313,8 +311,7 @@ public abstract class BinFiles extends AbstractSessionFactoryProcessor { @Override protected final Collection<ValidationResult> customValidate(final ValidationContext context) { - final List<ValidationResult> problems = new ArrayList<>(super. - customValidate(context)); + final List<ValidationResult> problems = new ArrayList<>(super.customValidate(context)); final long minBytes = context.getProperty(MIN_SIZE).asDataSize(DataUnit.B).longValue(); final Double maxBytes = context.getProperty(MAX_SIZE).asDataSize(DataUnit.B); @@ -330,10 +327,8 @@ public abstract class BinFiles extends AbstractSessionFactoryProcessor { ); } - final Long min = context.getProperty(MIN_ENTRIES). - asLong(); - final Long max = context.getProperty(MAX_ENTRIES). - asLong(); + final Long min = context.getProperty(MIN_ENTRIES).asLong(); + final Long max = context.getProperty(MAX_ENTRIES).asLong(); if (min != null && max != null) { if (min > max) { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java index d9946da..585902b 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java @@ -146,8 +146,7 @@ public class CompressContent extends AbstractProcessor { mimeTypeMap.put("application/gzip", COMPRESSION_FORMAT_GZIP); mimeTypeMap.put("application/bzip2", COMPRESSION_FORMAT_BZIP2); mimeTypeMap.put("application/x-lzma", COMPRESSION_FORMAT_LZMA); - this.compressionFormatMimeTypeMap = Collections. - unmodifiableMap(mimeTypeMap); + this.compressionFormatMimeTypeMap = Collections.unmodifiableMap(mimeTypeMap); } @Override @@ -286,8 +285,7 @@ public class CompressContent extends AbstractProcessor { final long sizeAfterCompression = flowFile.getSize(); if (MODE_DECOMPRESS.equalsIgnoreCase(compressionMode)) { - flowFile = session. - removeAttribute(flowFile, CoreAttributes.MIME_TYPE.key()); + flowFile = session.removeAttribute(flowFile, CoreAttributes.MIME_TYPE.key()); if (context.getProperty(UPDATE_FILENAME).asBoolean()) { final String filename = flowFile.getAttribute(CoreAttributes.FILENAME.key()); @@ -296,8 +294,7 @@ public class CompressContent extends AbstractProcessor { } } } else { - flowFile = session. - putAttribute(flowFile, CoreAttributes.MIME_TYPE.key(), mimeTypeRef.get()); + flowFile = session.putAttribute(flowFile, CoreAttributes.MIME_TYPE.key(), mimeTypeRef.get()); if (context.getProperty(UPDATE_FILENAME).asBoolean()) { final String filename = flowFile.getAttribute(CoreAttributes.FILENAME.key()); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java index 10cd45d..47c3cb4 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java @@ -156,10 +156,10 @@ public class ControlRate extends AbstractProcessor { rateValidator = StandardValidators.POSITIVE_LONG_VALIDATOR; final String rateAttr = context.getProperty(RATE_CONTROL_ATTRIBUTE_NAME).getValue(); if (rateAttr == null) { - validationResults.add(new ValidationResult.Builder(). - subject(RATE_CONTROL_ATTRIBUTE_NAME.getName()). - explanation("<Rate Controlled Attribute> property must be set if using <Rate Control Criteria> of 'attribute value'"). - build()); + validationResults.add(new ValidationResult.Builder() + .subject(RATE_CONTROL_ATTRIBUTE_NAME.getName()) + .explanation("<Rate Controlled Attribute> property must be set if using <Rate Control Criteria> of 'attribute value'") + .build()); } break; case FLOWFILE_RATE: @@ -281,8 +281,7 @@ public class ControlRate extends AbstractProcessor { throttle.lock(); try { if (throttle.tryAdd(rateValue)) { - logger. - info("transferring {} to 'success'", new Object[]{flowFile}); + logger.info("transferring {} to 'success'", new Object[]{flowFile}); session.transfer(flowFile, REL_SUCCESS); } else { flowFile = session.penalize(flowFile); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java index ec61370..a0a1364 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java @@ -16,6 +16,13 @@ */ package org.apache.nifi.processors.standard; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.OutputStreamWriter; import org.apache.nifi.processor.ProcessContext; import org.apache.nifi.processor.AbstractProcessor; import org.apache.nifi.processor.ProcessorInitializationContext; @@ -34,13 +41,16 @@ import org.apache.nifi.processor.io.StreamCallback; import org.apache.nifi.processor.util.StandardValidators; import org.apache.nifi.util.StopWatch; -import java.io.*; import java.nio.CharBuffer; import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; import java.nio.charset.CodingErrorAction; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import java.util.concurrent.TimeUnit; /** @@ -117,12 +127,8 @@ public class ConvertCharacterSet extends AbstractProcessor { public void onTrigger(final ProcessContext context, final ProcessSession session) { final ProcessorLog logger = getLogger(); - final Charset inputCharset = Charset.forName(context. - getProperty(INPUT_CHARSET). - getValue()); - final Charset outputCharset = Charset.forName(context. - getProperty(OUTPUT_CHARSET). - getValue()); + final Charset inputCharset = Charset.forName(context.getProperty(INPUT_CHARSET).getValue()); + final Charset outputCharset = Charset.forName(context.getProperty(OUTPUT_CHARSET).getValue()); final CharBuffer charBuffer = CharBuffer.allocate(MAX_BUFFER_SIZE); final CharsetDecoder decoder = inputCharset.newDecoder(); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DistributeLoad.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DistributeLoad.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DistributeLoad.java index 585ba1d..afff3c4 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DistributeLoad.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DistributeLoad.java @@ -117,11 +117,11 @@ public class DistributeLoad extends AbstractProcessor { } }).build(); public static final PropertyDescriptor LOAD_DISTRIBUTION_SERVICE_TEMPLATE = new PropertyDescriptor.Builder() - .name("Load Distribution Service ID"). - description("The identifier of the Load Distribution Service"). - required(true). - identifiesControllerService(LoadDistributionService.class). - build(); + .name("Load Distribution Service ID") + .description("The identifier of the Load Distribution Service") + .required(true) + .identifiesControllerService(LoadDistributionService.class) + .build(); private List<PropertyDescriptor> properties; private final AtomicReference<Set<Relationship>> relationshipsRef = new AtomicReference<>(); @@ -327,8 +327,7 @@ public class DistributeLoad extends AbstractProcessor { final List<Relationship> relationshipList = new ArrayList<>(); for (final Map.Entry<Integer, Integer> entry : weightings.entrySet()) { final String relationshipName = String.valueOf(entry.getKey()); - final Relationship relationship = new Relationship.Builder(). - name(relationshipName).build(); + final Relationship relationship = new Relationship.Builder().name(relationshipName).build(); for (int i = 0; i < entry.getValue(); i++) { relationshipList.add(relationship); } @@ -386,8 +385,8 @@ public class DistributeLoad extends AbstractProcessor { private static interface DistributionStrategy { /** - * @param session session - * @param flowFiles flowFile + * @param context context + * @param flowFile flowFile * @return a mapping of FlowFile to Relationship or <code>null</code> if the needed relationships are not available to accept files */ Relationship mapToRelationship(ProcessContext context, FlowFile flowFile); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java index 042e4a6..b4ddc16 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java @@ -151,8 +151,7 @@ public class EvaluateJsonPath extends AbstractJsonPathProcessor { @Override protected Collection<ValidationResult> customValidate(final ValidationContext context) { - final List<ValidationResult> results = new ArrayList<>(super. - customValidate(context)); + final List<ValidationResult> results = new ArrayList<>(super.customValidate(context)); final String destination = context.getProperty(DESTINATION).getValue(); if (DESTINATION_CONTENT.equals(destination)) { @@ -165,8 +164,8 @@ public class EvaluateJsonPath extends AbstractJsonPathProcessor { } if (jsonPathCount != 1) { - results.add(new ValidationResult.Builder().subject("JsonPaths").valid(false). - explanation("Exactly one JsonPath must be set if using destination of " + DESTINATION_CONTENT).build()); + results.add(new ValidationResult.Builder().subject("JsonPaths").valid(false) + .explanation("Exactly one JsonPath must be set if using destination of " + DESTINATION_CONTENT).build()); } } @@ -185,18 +184,17 @@ public class EvaluateJsonPath extends AbstractJsonPathProcessor { @Override protected PropertyDescriptor getSupportedDynamicPropertyDescriptor(final String propertyDescriptorName) { - return new PropertyDescriptor.Builder().name(propertyDescriptorName).expressionLanguageSupported(false). - addValidator(new JsonPathValidator() { - @Override - public void cacheComputedValue(String subject, String input, JsonPath computedJsonPath) { - cachedJsonPathMap.put(input, computedJsonPath); - } - - @Override - public boolean isStale(String subject, String input) { - return cachedJsonPathMap.get(input) == null; - } - }).required(false).dynamic(true).build(); + return new PropertyDescriptor.Builder().name(propertyDescriptorName).expressionLanguageSupported(false).addValidator(new JsonPathValidator() { + @Override + public void cacheComputedValue(String subject, String input, JsonPath computedJsonPath) { + cachedJsonPathMap.put(input, computedJsonPath); + } + + @Override + public boolean isStale(String subject, String input) { + return cachedJsonPathMap.get(input) == null; + } + }).required(false).dynamic(true).build(); } @Override @@ -235,8 +233,7 @@ public class EvaluateJsonPath extends AbstractJsonPathProcessor { final ProcessorLog logger = getLogger(); - String representationOption = processContext. - getProperty(NULL_VALUE_DEFAULT_REPRESENTATION).getValue(); + String representationOption = processContext.getProperty(NULL_VALUE_DEFAULT_REPRESENTATION).getValue(); final String nullDefaultValue = NULL_REPRESENTATION_MAP.get(representationOption); /* Build the JsonPath expressions from attributes */ @@ -309,8 +306,7 @@ public class EvaluateJsonPath extends AbstractJsonPathProcessor { @Override public void process(final OutputStream out) throws IOException { try (OutputStream outputStream = new BufferedOutputStream(out)) { - outputStream.write(resultRepresentation. - getBytes(StandardCharsets.UTF_8)); + outputStream.write(resultRepresentation.getBytes(StandardCharsets.UTF_8)); } } }); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java index 1ea0748..a24f4d0 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java @@ -165,11 +165,9 @@ public class EvaluateXPath extends AbstractProcessor { @Override protected Collection<ValidationResult> customValidate(final ValidationContext context) { - final List<ValidationResult> results = new ArrayList<>(super. - customValidate(context)); + final List<ValidationResult> results = new ArrayList<>(super.customValidate(context)); - final String destination = context.getProperty(DESTINATION). - getValue(); + final String destination = context.getProperty(DESTINATION).getValue(); if (DESTINATION_CONTENT.equals(destination)) { int xpathCount = 0; @@ -356,8 +354,7 @@ public class EvaluateXPath extends AbstractProcessor { @Override public void process(final OutputStream rawOut) throws IOException { try (final OutputStream out = new BufferedOutputStream(rawOut)) { - out.write(resultString. - getBytes("UTF-8")); + out.write(resultString.getBytes("UTF-8")); } } }); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java index c6321ad..5e8f0ba 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java @@ -184,8 +184,7 @@ public class EvaluateXQuery extends AbstractProcessor { @Override protected Collection<ValidationResult> customValidate(final ValidationContext context) { - final List<ValidationResult> results = new ArrayList<>(super. - customValidate(context)); + final List<ValidationResult> results = new ArrayList<>(super.customValidate(context)); final String destination = context.getProperty(DESTINATION).getValue(); if (DESTINATION_CONTENT.equals(destination)) { @@ -311,8 +310,7 @@ public class EvaluateXQuery extends AbstractProcessor { } } else { // if (DESTINATION_CONTENT.equals(destination)){ if (result.size() == 0) { - logger. - info("Routing {} to 'unmatched'", new Object[]{flowFile}); + logger.info("Routing {} to 'unmatched'", new Object[]{flowFile}); session.transfer(flowFile, REL_NO_MATCH); continue flowFileLoop; } else if (result.size() == 1) { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java index 7950c9c..424094c 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java @@ -163,8 +163,7 @@ public class ExecuteProcess extends AbstractProcessor { if (inQuotes) { sb.append(c); } else { - final String arg = sb.toString(). - trim(); + final String arg = sb.toString().trim(); if (!arg.isEmpty()) { args.add(arg); } @@ -377,13 +376,11 @@ public class ExecuteProcess extends AbstractProcessor { } final int exitCode; - final long millis = TimeUnit.NANOSECONDS. - toMillis(System.nanoTime() - startNanos); + final long millis = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos); try { exitCode = process.waitFor(); } catch (final InterruptedException ie) { - getLogger(). - warn("Process was interrupted before finishing"); + getLogger().warn("Process was interrupted before finishing"); return; } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java index ddeb51a..63fd55b 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java @@ -121,10 +121,10 @@ import org.apache.nifi.stream.io.StreamUtils; @WritesAttribute(attribute = "execution.error", description = "Any error messages returned from executing the command")}) public class ExecuteStreamCommand extends AbstractProcessor { - public static final Relationship ORIGINAL_RELATIONSHIP = new Relationship.Builder(). - name("original"). - description("FlowFiles that were successfully processed"). - build(); + public static final Relationship ORIGINAL_RELATIONSHIP = new Relationship.Builder() + .name("original") + .description("FlowFiles that were successfully processed") + .build(); public static final Relationship OUTPUT_STREAM_RELATIONSHIP = new Relationship.Builder() .name("output stream") .description("The destination path for the flow file created from the command's output") @@ -139,8 +139,8 @@ public class ExecuteStreamCommand extends AbstractProcessor { } private static final Validator ATTRIBUTE_EXPRESSION_LANGUAGE_VALIDATOR = StandardValidators.createAttributeExpressionLanguageValidator(ResultType.STRING, true); - static final PropertyDescriptor EXECUTION_COMMAND = new PropertyDescriptor.Builder(). - name("Command Path") + static final PropertyDescriptor EXECUTION_COMMAND = new PropertyDescriptor.Builder() + .name("Command Path") .description("Specifies the command to be executed; if just the name of an executable is provided, it must be in the user's environment PATH.") .expressionLanguageSupported(true) .addValidator(ATTRIBUTE_EXPRESSION_LANGUAGE_VALIDATOR) @@ -158,8 +158,7 @@ public class ExecuteStreamCommand extends AbstractProcessor { .subject(subject).valid(true).input(input).build(); String[] args = input.split(";"); for (String arg : args) { - ValidationResult valResult = ATTRIBUTE_EXPRESSION_LANGUAGE_VALIDATOR. - validate(subject, arg, context); + ValidationResult valResult = ATTRIBUTE_EXPRESSION_LANGUAGE_VALIDATOR.validate(subject, arg, context); if (!valResult.isValid()) { result = valResult; break; @@ -255,8 +254,7 @@ public class ExecuteStreamCommand extends AbstractProcessor { session.read(flowFile, callback); outputStreamFlowFile = callback.outputStreamFlowFile; exitCode = callback.exitCode; - logger. - debug("Execution complete for command: {}. Exited with code: {}", new Object[]{executeCommand, exitCode}); + logger.debug("Execution complete for command: {}. Exited with code: {}", new Object[]{executeCommand, exitCode}); Map<String, String> attributes = new HashMap<>(); @@ -328,8 +326,7 @@ public class ExecuteStreamCommand extends AbstractProcessor { try { StreamUtils.copy(incomingFlowFileIS, stdInWritable); } catch (IOException e) { - logger. - error("Failed to write flow file to stdIn due to {}", new Object[]{e}, e); + logger.error("Failed to write flow file to stdIn due to {}", new Object[]{e}, e); } // MUST close the output stream to the stdIn so that whatever is reading knows // there is no more data http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java index d413b1a..1bcd3bf 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java @@ -272,8 +272,7 @@ public class ExtractText extends AbstractProcessor { final Map<String, Pattern> patternMap = compiledPattersMapRef.get(); for (final Map.Entry<String, Pattern> entry : patternMap.entrySet()) { - final Matcher matcher = entry.getValue(). - matcher(contentString); + final Matcher matcher = entry.getValue().matcher(contentString); if (matcher.find()) { final String baseKey = entry.getKey(); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateFlowFile.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateFlowFile.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateFlowFile.java index ebcca86..aa1206a 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateFlowFile.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateFlowFile.java @@ -149,8 +149,7 @@ public class GenerateFlowFile extends AbstractProcessor { data = this.data.get(); } - for (int i = 0; i < context.getProperty(BATCH_SIZE). - asInteger(); i++) { + for (int i = 0; i < context.getProperty(BATCH_SIZE).asInteger(); i++) { FlowFile flowFile = session.create(); if (data.length > 0) { flowFile = session.write(flowFile, new OutputStreamCallback() { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFile.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFile.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFile.java index bc2fac2..0fa9178 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFile.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFile.java @@ -344,8 +344,7 @@ public class GetFile extends AbstractProcessor { if (store.supportsFileAttributeView("posix")) { try { PosixFileAttributeView view = Files.getFileAttributeView(file, PosixFileAttributeView.class); - attributes. - put(FILE_PERMISSIONS_ATTRIBUTE, PosixFilePermissions.toString(view.readAttributes().permissions())); + attributes.put(FILE_PERMISSIONS_ATTRIBUTE, PosixFilePermissions.toString(view.readAttributes().permissions())); attributes.put(FILE_GROUP_ATTRIBUTE, view.readAttributes().group().getName()); } catch (Exception ignore) { } // allow other attributes if these fail @@ -425,8 +424,7 @@ public class GetFile extends AbstractProcessor { flowFile = session.create(); final long importStart = System.nanoTime(); - flowFile = session. - importFrom(filePath, keepingSourceFile, flowFile); + flowFile = session.importFrom(filePath, keepingSourceFile, flowFile); final long importNanos = System.nanoTime() - importStart; final long importMillis = TimeUnit.MILLISECONDS.convert(importNanos, TimeUnit.NANOSECONDS); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetJMSTopic.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetJMSTopic.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetJMSTopic.java index 94b49fe..e7209cc 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetJMSTopic.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetJMSTopic.java @@ -268,8 +268,7 @@ public class GetJMSTopic extends JmsConsumer { final String serverUrl = props.getProperty(URL.getName()); final String username = props.getProperty(USERNAME.getName()); final String encryptedPassword = props.getProperty(PASSWORD.getName()); - final String subscriptionName = props. - getProperty(SUBSCRIPTION_NAME_PROPERTY); + final String subscriptionName = props.getProperty(SUBSCRIPTION_NAME_PROPERTY); final String jmsProvider = props.getProperty(JMS_PROVIDER.getName()); final String password = encryptedPassword == null ? null : context.decrypt(encryptedPassword); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java index e7f28be..2583e88 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java @@ -104,8 +104,7 @@ import com.sun.jersey.api.client.ClientResponse.Status; public class HandleHttpRequest extends AbstractProcessor { public static final String HTTP_CONTEXT_ID = "http.context.identifier"; - private static final Pattern URL_QUERY_PARAM_DELIMITER = Pattern. - compile("&"); + private static final Pattern URL_QUERY_PARAM_DELIMITER = Pattern.compile("&"); // Allowable values for client auth public static final AllowableValue CLIENT_NONE = new AllowableValue("No Authentication", "No Authentication", @@ -174,13 +173,13 @@ public class HandleHttpRequest extends AbstractProcessor { .allowableValues("true", "false") .defaultValue("true") .build(); - public static final PropertyDescriptor ALLOW_PUT = new PropertyDescriptor.Builder(). - name("Allow PUT"). - description("Allow HTTP PUT Method"). - required(true). - allowableValues("true", "false"). - defaultValue("true"). - build(); + public static final PropertyDescriptor ALLOW_PUT = new PropertyDescriptor.Builder() + .name("Allow PUT") + .description("Allow HTTP PUT Method") + .required(true) + .allowableValues("true", "false") + .defaultValue("true") + .build(); public static final PropertyDescriptor ALLOW_DELETE = new PropertyDescriptor.Builder() .name("Allow DELETE") .description("Allow HTTP DELETE Method") http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java index 0201730..6de3fe6 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java @@ -154,8 +154,7 @@ public class HandleHttpResponse extends AbstractProcessor { response.flushBuffer(); } catch (final IOException ioe) { session.transfer(flowFile, REL_FAILURE); - getLogger(). - error("Failed to respond to HTTP request for {} due to {}", new Object[]{flowFile, ioe}); + getLogger().error("Failed to respond to HTTP request for {} due to {}", new Object[]{flowFile, ioe}); return; } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java index 314f1c7..b3dbf83 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java @@ -129,8 +129,7 @@ public class HashAttribute extends AbstractProcessor { private Set<Relationship> relationships; private List<PropertyDescriptor> properties; - private final AtomicReference<Map<String, Pattern>> regexMapRef = new AtomicReference<>(Collections. - <String, Pattern>emptyMap()); + private final AtomicReference<Map<String, Pattern>> regexMapRef = new AtomicReference<>(Collections.<String, Pattern>emptyMap()); @Override protected void init(final ProcessorInitializationContext context) { @@ -157,12 +156,7 @@ public class HashAttribute extends AbstractProcessor { @Override protected PropertyDescriptor getSupportedDynamicPropertyDescriptor(final String propertyDescriptorName) { return new PropertyDescriptor.Builder() - .name(propertyDescriptorName). - addValidator(StandardValidators. - createRegexValidator(0, 1, false)). - required(false). - dynamic(true). - build(); + .name(propertyDescriptorName).addValidator(StandardValidators.createRegexValidator(0, 1, false)).required(false).dynamic(true).build(); } @Override http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java index 8f4286b..e9eae83 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java @@ -244,17 +244,16 @@ public final class InvokeHTTP extends AbstractProcessor { .identifiesControllerService(SSLContextService.class) .build(); - public static final List<PropertyDescriptor> PROPERTIES = Collections. - unmodifiableList(Arrays.asList( - PROP_METHOD, - PROP_URL, - PROP_SSL_CONTEXT_SERVICE, - PROP_CONNECT_TIMEOUT, - PROP_READ_TIMEOUT, - PROP_DATE_HEADER, - PROP_FOLLOW_REDIRECTS, - PROP_ATTRIBUTES_TO_SEND - )); + public static final List<PropertyDescriptor> PROPERTIES = Collections.unmodifiableList(Arrays.asList( + PROP_METHOD, + PROP_URL, + PROP_SSL_CONTEXT_SERVICE, + PROP_CONNECT_TIMEOUT, + PROP_READ_TIMEOUT, + PROP_DATE_HEADER, + PROP_FOLLOW_REDIRECTS, + PROP_ATTRIBUTES_TO_SEND + )); // property to allow the hostname verifier to be overridden // this is a "hidden" property - it's configured using a dynamic user property @@ -559,8 +558,7 @@ public final class InvokeHTTP extends AbstractProcessor { private Map<String, String> convertAttributesFromHeaders() throws IOException { // create a new hashmap to store the values from the connection Map<String, String> map = new HashMap<>(); - for (Map.Entry<String, List<String>> entry : conn.getHeaderFields(). - entrySet()) { + for (Map.Entry<String, List<String>> entry : conn.getHeaderFields().entrySet()) { String key = entry.getKey(); if (key == null) { continue; http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JmsConsumer.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JmsConsumer.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JmsConsumer.java index 6b3283c..b53d62f 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JmsConsumer.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JmsConsumer.java @@ -175,7 +175,8 @@ public abstract class JmsConsumer extends AbstractProcessor { } } - public static JmsProcessingSummary map2FlowFile(final ProcessContext context, final ProcessSession session, final Message message, final boolean addAttributes, ProcessorLog logger) throws Exception { + public static JmsProcessingSummary map2FlowFile(final ProcessContext context, final ProcessSession session, final Message message, final boolean addAttributes, ProcessorLog logger) + throws Exception { // Currently not very useful, because always one Message == one FlowFile final IntegerHolder msgsThisFlowFile = new IntegerHolder(1); @@ -186,8 +187,7 @@ public abstract class JmsConsumer extends AbstractProcessor { if (message instanceof MapMessage) { MapMessage mapMessage = (MapMessage) message; flowFile = session.putAllAttributes(flowFile, createMapMessageValues(mapMessage)); - } // all other message types, write Message body to FlowFile content - else { + } else { // all other message types, write Message body to FlowFile content flowFile = session.write(flowFile, new OutputStreamCallback() { @Override public void process(final OutputStream rawOut) throws IOException { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenUDP.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenUDP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenUDP.java index fa17df1..fa60d6b 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenUDP.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenUDP.java @@ -226,11 +226,11 @@ public class ListenUDP extends AbstractSessionFactoryProcessor { } catch (SocketException e) { } } - public static final PropertyDescriptor NETWORK_INTF_NAME = new PropertyDescriptor.Builder(). - name("Local Network Interface"). - description("The name of a local network interface to be used to restrict listening for UDP Datagrams to a specific LAN." - + "May be a system property or an environment variable."). - addValidator(new Validator() { + public static final PropertyDescriptor NETWORK_INTF_NAME = new PropertyDescriptor.Builder() + .name("Local Network Interface") + .description("The name of a local network interface to be used to restrict listening for UDP Datagrams to a specific LAN." + + "May be a system property or an environment variable.") + .addValidator(new Validator() { @Override public ValidationResult validate(String subject, String input, ValidationContext context) { ValidationResult result = new ValidationResult.Builder() @@ -257,7 +257,8 @@ public class ListenUDP extends AbstractSessionFactoryProcessor { return result; } - }).expressionLanguageSupported(true).build(); + }) + .expressionLanguageSupported(true).build(); static { List<PropertyDescriptor> props = new ArrayList<>(); @@ -303,102 +304,100 @@ public class ListenUDP extends AbstractSessionFactoryProcessor { /** * Create the ChannelListener and a thread that causes the Consumer to create flow files. * - * @param context - * @throws IOException + * @param context context + * @throws IOException ex */ @OnScheduled public void initializeChannelListenerAndConsumerProcessing(final ProcessContext context) throws IOException { getChannelListener(context); stopping.set(false); - Future<Tuple<ProcessSession, List<FlowFile>>> consumerFuture = consumerExecutorService. - submit(new Callable<Tuple<ProcessSession, List<FlowFile>>>() { - - @Override - public Tuple<ProcessSession, List<FlowFile>> call() { - final int maxFlowFilesPerSession = context.getProperty(FLOW_FILES_PER_SESSION).asInteger(); - final long channelReaderIntervalMSecs = context.getProperty(CHANNEL_READER_PERIOD).asTimePeriod(TimeUnit.MILLISECONDS); - // number of waits in 5 secs, or 1 - final int maxWaits = (int) (channelReaderIntervalMSecs <= 1000 ? 5000 / channelReaderIntervalMSecs : 1); - final ProcessorLog logger = getLogger(); - int flowFileCount = maxFlowFilesPerSession; - ProcessSession session = null; - int numWaits = 0; - while (!stopping.get()) { - UDPStreamConsumer consumer = consumerRef.get(); - if (consumer == null || sessionFactoryRef.get() == null) { - try { - Thread.sleep(100L); - } catch (InterruptedException swallow) { - } - } else { - try { + Future<Tuple<ProcessSession, List<FlowFile>>> consumerFuture = consumerExecutorService.submit(new Callable<Tuple<ProcessSession, List<FlowFile>>>() { + + @Override + public Tuple<ProcessSession, List<FlowFile>> call() { + final int maxFlowFilesPerSession = context.getProperty(FLOW_FILES_PER_SESSION).asInteger(); + final long channelReaderIntervalMSecs = context.getProperty(CHANNEL_READER_PERIOD).asTimePeriod(TimeUnit.MILLISECONDS); + // number of waits in 5 secs, or 1 + final int maxWaits = (int) (channelReaderIntervalMSecs <= 1000 ? 5000 / channelReaderIntervalMSecs : 1); + final ProcessorLog logger = getLogger(); + int flowFileCount = maxFlowFilesPerSession; + ProcessSession session = null; + int numWaits = 0; + while (!stopping.get()) { + UDPStreamConsumer consumer = consumerRef.get(); + if (consumer == null || sessionFactoryRef.get() == null) { + try { + Thread.sleep(100L); + } catch (InterruptedException swallow) { + } + } else { + try { // first time through, flowFileCount is maxFlowFilesPerSession so that a session - // is created and the consumer is updated with it. - if (flowFileCount == maxFlowFilesPerSession || numWaits == maxWaits) { - logger.debug("Have waited {} times", new Object[]{numWaits}); - numWaits = 0; - if (session != null) { - Tuple<ProcessSession, List<FlowFile>> flowFilesPerSession = new Tuple<ProcessSession, List<FlowFile>>(session, new ArrayList<>(newFlowFiles)); - newFlowFiles.clear(); - flowFilesPerSessionQueue. - add(flowFilesPerSession); - } - session = sessionFactoryRef.get().createSession(); - consumer.setSession(session); - flowFileCount = 0; - } + // is created and the consumer is updated with it. + if (flowFileCount == maxFlowFilesPerSession || numWaits == maxWaits) { + logger.debug("Have waited {} times", new Object[]{numWaits}); + numWaits = 0; + if (session != null) { + Tuple<ProcessSession, List<FlowFile>> flowFilesPerSession = new Tuple<ProcessSession, List<FlowFile>>(session, new ArrayList<>(newFlowFiles)); + newFlowFiles.clear(); + flowFilesPerSessionQueue.add(flowFilesPerSession); + } + session = sessionFactoryRef.get().createSession(); + consumer.setSession(session); + flowFileCount = 0; + } // this will throttle the processing of the received datagrams. If there are no more - // buffers to read into because none have been returned to the pool via consumer.process(), - // then the desired back pressure on the channel is created. - if (context.getAvailableRelationships().size() > 0) { - consumer.process(); - if (flowFileCount == newFlowFiles.size()) { + // buffers to read into because none have been returned to the pool via consumer.process(), + // then the desired back pressure on the channel is created. + if (context.getAvailableRelationships().size() > 0) { + consumer.process(); + if (flowFileCount == newFlowFiles.size()) { // no new datagrams received, need to throttle this thread back so it does - // not consume all cpu...but don't want to cause back pressure on the channel - // so the sleep time is same as the reader interval - // If have done this for approx. 5 secs, assume datagram sender is down. So, push - // out the remaining flow files (see numWaits == maxWaits above) - Thread.sleep(channelReaderIntervalMSecs); - if (flowFileCount > 0) { - numWaits++; - } - } else { - flowFileCount = newFlowFiles.size(); - } - } else { - logger.debug("Creating back pressure...no available destinations"); - Thread.sleep(1000L); - } - } catch (final IOException ioe) { - logger.error("Unable to fully process consumer {}", new Object[]{consumer}, ioe); - } catch (InterruptedException e) { - // don't care - } finally { - if (consumer.isConsumerFinished()) { - logger.info("Consumer {} was closed and is finished", new Object[]{consumer}); - consumerRef.set(null); - disconnect(); - if (!stopping.get()) { - resetChannelListener.set(true); - } + // not consume all cpu...but don't want to cause back pressure on the channel + // so the sleep time is same as the reader interval + // If have done this for approx. 5 secs, assume datagram sender is down. So, push + // out the remaining flow files (see numWaits == maxWaits above) + Thread.sleep(channelReaderIntervalMSecs); + if (flowFileCount > 0) { + numWaits++; } + } else { + flowFileCount = newFlowFiles.size(); } + } else { + logger.debug("Creating back pressure...no available destinations"); + Thread.sleep(1000L); } - } - // when shutting down, need consumer to drain rest of cached buffers and clean up. - // prior to getting here, the channelListener was shutdown - UDPStreamConsumer consumer; - while ((consumer = consumerRef.get()) != null && !consumer.isConsumerFinished()) { - try { - consumer.process(); - } catch (IOException swallow) { - // if this is blown...consumer.isConsumerFinished will be true + } catch (final IOException ioe) { + logger.error("Unable to fully process consumer {}", new Object[]{consumer}, ioe); + } catch (InterruptedException e) { + // don't care + } finally { + if (consumer.isConsumerFinished()) { + logger.info("Consumer {} was closed and is finished", new Object[]{consumer}); + consumerRef.set(null); + disconnect(); + if (!stopping.get()) { + resetChannelListener.set(true); + } } } - Tuple<ProcessSession, List<FlowFile>> flowFilesPerSession = new Tuple<ProcessSession, List<FlowFile>>(session, new ArrayList<>(newFlowFiles)); - return flowFilesPerSession; } - }); + } + // when shutting down, need consumer to drain rest of cached buffers and clean up. + // prior to getting here, the channelListener was shutdown + UDPStreamConsumer consumer; + while ((consumer = consumerRef.get()) != null && !consumer.isConsumerFinished()) { + try { + consumer.process(); + } catch (IOException swallow) { + // if this is blown...consumer.isConsumerFinished will be true + } + } + Tuple<ProcessSession, List<FlowFile>> flowFilesPerSession = new Tuple<ProcessSession, List<FlowFile>>(session, new ArrayList<>(newFlowFiles)); + return flowFilesPerSession; + } + }); consumerFutureRef.set(consumerFuture); } @@ -434,8 +433,7 @@ public class ListenUDP extends AbstractSessionFactoryProcessor { @Override public StreamConsumer newInstance(final String streamId) { - final UDPStreamConsumer consumer = new UDPStreamConsumer(streamId, newFlowFiles, flowFileSizeTrigger. - intValue(), getLogger()); + final UDPStreamConsumer consumer = new UDPStreamConsumer(streamId, newFlowFiles, flowFileSizeTrigger.intValue(), getLogger()); consumerRef.set(consumer); return consumer; } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java index bd639dd..b11dee3 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java @@ -327,8 +327,7 @@ public class MergeContent extends BinFiles { protected boolean processBin(final Bin unmodifiableBin, final List<FlowFileSessionWrapper> binCopy, final ProcessContext context, final ProcessSession session) throws ProcessException { - final String mergeFormat = context.getProperty(MERGE_FORMAT). - getValue(); + final String mergeFormat = context.getProperty(MERGE_FORMAT).getValue(); MergeBin merger; switch (mergeFormat) { case MERGE_FORMAT_TAR_VALUE: @@ -458,8 +457,7 @@ public class MergeContent extends BinFiles { return false; } - return NUMBER_PATTERN.matcher(value). - matches(); + return NUMBER_PATTERN.matcher(value).matches(); } private class BinaryConcatenationMerge implements MergeBin { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java index 6b906c2..9509790 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java @@ -418,9 +418,8 @@ public class PostHTTP extends AbstractProcessor { try { new java.net.URL(url); } catch (final MalformedURLException e) { - logger. - error("After substituting attribute values for {}, URL is {}; this is not a valid URL, so routing to failure", - new Object[]{flowFile, url}); + logger.error("After substituting attribute values for {}, URL is {}; this is not a valid URL, so routing to failure", + new Object[]{flowFile, url}); flowFile = session.penalize(flowFile); session.transfer(flowFile, REL_FAILURE); continue; @@ -442,29 +441,28 @@ public class PostHTTP extends AbstractProcessor { final HttpClientBuilder clientBuilder = HttpClientBuilder.create(); clientBuilder.setConnectionManager(conMan); clientBuilder.setUserAgent(userAgent); - clientBuilder. - addInterceptorFirst(new HttpResponseInterceptor() { - @Override - public void process(final HttpResponse response, final HttpContext httpContext) throws HttpException, IOException { - HttpCoreContext coreContext = HttpCoreContext.adapt(httpContext); - ManagedHttpClientConnection conn = coreContext.getConnection(ManagedHttpClientConnection.class); - if (!conn.isOpen()) { - return; - } - - SSLSession sslSession = conn.getSSLSession(); + clientBuilder.addInterceptorFirst(new HttpResponseInterceptor() { + @Override + public void process(final HttpResponse response, final HttpContext httpContext) throws HttpException, IOException { + HttpCoreContext coreContext = HttpCoreContext.adapt(httpContext); + ManagedHttpClientConnection conn = coreContext.getConnection(ManagedHttpClientConnection.class); + if (!conn.isOpen()) { + return; + } - if (sslSession != null) { - final X509Certificate[] certChain = sslSession.getPeerCertificateChain(); - if (certChain == null || certChain.length == 0) { - throw new SSLPeerUnverifiedException("No certificates found"); - } + SSLSession sslSession = conn.getSSLSession(); - final X509Certificate cert = certChain[0]; - dnHolder.set(cert.getSubjectDN().getName().trim()); - } + if (sslSession != null) { + final X509Certificate[] certChain = sslSession.getPeerCertificateChain(); + if (certChain == null || certChain.length == 0) { + throw new SSLPeerUnverifiedException("No certificates found"); } - }); + + final X509Certificate cert = certChain[0]; + dnHolder.set(cert.getSubjectDN().getName().trim()); + } + } + }); clientBuilder.disableAutomaticRetries(); clientBuilder.disableContentCompression(); @@ -783,8 +781,7 @@ public class PostHTTP extends AbstractProcessor { if (!isScheduled()) { context.yield(); - logger. - warn("Failed to delete Hold that destination placed on {}; Processor has been stopped so routing FlowFile(s) to failure", new Object[]{flowFileDescription}); + logger.warn("Failed to delete Hold that destination placed on {}; Processor has been stopped so routing FlowFile(s) to failure", new Object[]{flowFileDescription}); for (FlowFile flowFile : toSend) { flowFile = session.penalize(flowFile); session.transfer(flowFile, REL_FAILURE); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java index 8efc563..7e2dd31 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java @@ -274,8 +274,7 @@ public class PutEmail extends AbstractProcessor { final String bcc = context.getProperty(BCC).getValue(); if (to == null && cc == null && bcc == null) { - errors.add(new ValidationResult.Builder().subject("To, CC, BCC"). - valid(false).explanation("Must specify at least one To/CC/BCC address").build()); + errors.add(new ValidationResult.Builder().subject("To, CC, BCC").valid(false).explanation("Must specify at least one To/CC/BCC address").build()); } return errors; @@ -390,8 +389,7 @@ public class PutEmail extends AbstractProcessor { final ProcessorLog logger = this.getLogger(); - for (Entry<String, PropertyDescriptor> entry : propertyToContext. - entrySet()) { + for (Entry<String, PropertyDescriptor> entry : propertyToContext.entrySet()) { // Evaluate the property descriptor against the flow file String flowFileValue = context.getProperty(entry.getValue()).evaluateAttributeExpressions(flowFile).getValue(); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java index 051cb07..b959efa 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java @@ -57,10 +57,8 @@ import org.apache.nifi.processors.standard.util.FTPTransfer; + " you leave off the .")}) public class PutFTP extends PutFileTransfer<FTPTransfer> { - private static final Pattern PRE_SEND_CMD_PATTERN = Pattern. - compile("^pre\\.cmd\\.(\\d+)$"); - private static final Pattern POST_SEND_CMD_PATTERN = Pattern. - compile("^post\\.cmd\\.(\\d+)$"); + private static final Pattern PRE_SEND_CMD_PATTERN = Pattern.compile("^pre\\.cmd\\.(\\d+)$"); + private static final Pattern POST_SEND_CMD_PATTERN = Pattern.compile("^post\\.cmd\\.(\\d+)$"); private final AtomicReference<List<PropertyDescriptor>> preSendDescriptorRef = new AtomicReference<>(); private final AtomicReference<List<PropertyDescriptor>> postSendDescriptorRef = new AtomicReference<>(); @@ -109,8 +107,7 @@ public class PutFTP extends PutFileTransfer<FTPTransfer> { @Override protected void afterPut(final FlowFile flowFile, final ProcessContext context, final FTPTransfer transfer) throws IOException { - transfer. - sendCommands(getCommands(postSendDescriptorRef.get(), context, flowFile), flowFile); + transfer.sendCommands(getCommands(postSendDescriptorRef.get(), context, flowFile), flowFile); } @Override http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java index b60d07f..c03f755 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java @@ -44,7 +44,7 @@ import java.util.concurrent.TimeUnit; /** * Base class for PutFTP & PutSFTP * - * @param <T> + * @param <T> type of transfer */ public abstract class PutFileTransfer<T extends FileTransfer> extends AbstractProcessor { @@ -181,7 +181,14 @@ public abstract class PutFileTransfer<T extends FileTransfer> extends AbstractPr } //Attempts to identify naming or content issues with files before they are transferred. - private ConflictResult identifyAndResolveConflictFile(final String conflictResolutionType, final T transfer, final String path, final FlowFile flowFile, final boolean rejectZeroByteFiles, final ProcessorLog logger) throws IOException { + private ConflictResult identifyAndResolveConflictFile( + final String conflictResolutionType, + final T transfer, + final String path, + final FlowFile flowFile, + final boolean rejectZeroByteFiles, + final ProcessorLog logger) + throws IOException { Relationship destinationRelationship = REL_SUCCESS; String fileName = flowFile.getAttribute(CoreAttributes.FILENAME.key()); boolean transferFile = true; http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutJMS.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutJMS.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutJMS.java index 65bbb36..034a3fc 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutJMS.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutJMS.java @@ -336,8 +336,7 @@ public class PutJMS extends AbstractProcessor { final String key = entry.getKey(); final String value = entry.getValue(); - if (key.toLowerCase(). - startsWith(ATTRIBUTE_PREFIX.toLowerCase()) && !key.toLowerCase().endsWith(ATTRIBUTE_TYPE_SUFFIX.toLowerCase())) { + if (key.toLowerCase().startsWith(ATTRIBUTE_PREFIX.toLowerCase()) && !key.toLowerCase().endsWith(ATTRIBUTE_TYPE_SUFFIX.toLowerCase())) { final String jmsPropName = key.substring(ATTRIBUTE_PREFIX.length()); final String type = attributes.get(key + ATTRIBUTE_TYPE_SUFFIX); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSFTP.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSFTP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSFTP.java index 395ddee..97fe7e5 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSFTP.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSFTP.java @@ -76,12 +76,10 @@ public class PutSFTP extends PutFileTransfer<SFTPTransfer> { @Override protected PropertyDescriptor getSupportedDynamicPropertyDescriptor(String propertyDescriptorName) { - if (SFTPTransfer.DISABLE_DIRECTORY_LISTING.getName(). - equalsIgnoreCase(propertyDescriptorName)) { + if (SFTPTransfer.DISABLE_DIRECTORY_LISTING.getName().equalsIgnoreCase(propertyDescriptorName)) { return SFTPTransfer.DISABLE_DIRECTORY_LISTING; } - return super. - getSupportedDynamicPropertyDescriptor(propertyDescriptorName); + return super.getSupportedDynamicPropertyDescriptor(propertyDescriptorName); } @Override
