This is an automated email from the ASF dual-hosted git repository.
mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 6288470504 NIFI-12100_deprecate Annotated the
ConvertExcelToCSVProcessor with the DeprecationNotice annotation and fixed the
Checkstyle violation in SplitJson.
6288470504 is described below
commit 6288470504aa46d9328d4c97e07212f238151503
Author: dan-s1 <[email protected]>
AuthorDate: Fri Sep 29 14:08:19 2023 +0000
NIFI-12100_deprecate Annotated the ConvertExcelToCSVProcessor with the
DeprecationNotice annotation and fixed the Checkstyle violation in SplitJson.
This closes #7814
Signed-off-by: Mike Thomsen <[email protected]>
---
.../org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java | 4 ++++
.../src/main/java/org/apache/nifi/processors/standard/SplitJson.java | 1 -
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java
index bf78d58b67..1ce9cfecd1 100644
---
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java
+++
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java
@@ -27,6 +27,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.annotation.behavior.WritesAttribute;
import org.apache.nifi.annotation.behavior.WritesAttributes;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.csv.CSVUtils;
@@ -73,6 +74,9 @@ import java.util.stream.Collectors;
@WritesAttribute(attribute = "convertexceltocsvprocessor.error",
description = "Error message that was encountered on a per Excel sheet basis.
This attribute is" +
" only populated if an error was occured while processing the
particular sheet. Having the error present at the sheet level will allow for
the end" +
" user to better understand what syntax errors in their excel
doc on a larger scale caused the error.")})
+@DeprecationNotice(reason = "ConvertExcelToCSVProcessor is no longer needed
since there is now the ExcelReader which along with CSVRecordSetWriter" +
+ " can be used in ConvertRecord to achieve the same thing.",
+ classNames = {"org.apache.nifi.excel.ExcelReader",
"org.apache.nifi.csv.CSVRecordSetWriter",
"org.apache.nifi.processors.standard.ConvertRecord"})
public class ConvertExcelToCSVProcessor
extends AbstractProcessor {
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
index e2b1f1b11a..f76ffc2bfd 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
@@ -23,7 +23,6 @@ import com.jayway.jsonpath.JsonPath;
import com.jayway.jsonpath.PathNotFoundException;
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.annotation.behavior.EventDriven;
-import org.apache.nifi.annotation.behavior.SystemResourceConsideration;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
import org.apache.nifi.annotation.behavior.SideEffectFree;