Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-02-13 13:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-11027 Removed direct dependency on Joda Time

Browse Source 
Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #6825.
This commit is contained in:
exceptionfactory 2023-01-04 18:29:52 -06:00 committed by Pierre Villard
parent d9420afb60
commit 53faecdcf6
No known key found for this signature in database
GPG Key ID: F92A93B30C07C6D5
4 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
minifi/pom.xml
View File

@ -744,11 +744,6 @@ limitations under the License.
<artifactId>jzlib</artifactId> <artifactId>jzlib</artifactId>
<version>1.1.3</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.8.2</version>
</dependency>
<dependency> <dependency>
<groupId>com.yammer.metrics</groupId> <groupId>com.yammer.metrics</groupId>
<artifactId>metrics-ganglia</artifactId> <artifactId>metrics-ganglia</artifactId>

5
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
View File

@ -70,11 +70,6 @@
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId> <artifactId>avro</artifactId>
</dependency> </dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>org.xerial.snappy</groupId> <groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId> <artifactId>snappy-java</artifactId>

16
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
View File

@ -27,9 +27,6 @@ import org.apache.avro.io.DatumReader;
import org.apache.nifi.web.ViewableContent.DisplayMode; import org.apache.nifi.web.ViewableContent.DisplayMode;
import org.apache.nifi.xml.processing.ProcessingException; import org.apache.nifi.xml.processing.ProcessingException;
import org.apache.nifi.xml.processing.transform.StandardTransformProvider; import org.apache.nifi.xml.processing.transform.StandardTransformProvider;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.joda.time.LocalTime;
import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.Yaml;
@ -43,7 +40,6 @@ import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import java.util.HashSet; import java.util.HashSet;
import java.util.IdentityHashMap;
import java.util.Set; import java.util.Set;
public class StandardContentViewerController extends HttpServlet { public class StandardContentViewerController extends HttpServlet {
@ -115,17 +111,7 @@ public class StandardContentViewerController extends HttpServlet {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
sb.append("["); sb.append("[");
// Use Avro conversions to display logical type values in human readable way. // Use Avro conversions to display logical type values in human readable way.
final GenericData genericData = new GenericData(){ final GenericData genericData = new GenericData();
@Override
protected void toString(Object datum, StringBuilder buffer, IdentityHashMap<Object, Object> seenObjects) {
// Since these types are not quoted and produce a malformed JSON string, quote it here.
if (datum instanceof LocalDate || datum instanceof LocalTime || datum instanceof DateTime) {
buffer.append("\"").append(datum).append("\"");
return;
}
super.toString(datum, buffer, seenObjects);
}
};
genericData.addLogicalTypeConversion(new Conversions.DecimalConversion()); genericData.addLogicalTypeConversion(new Conversions.DecimalConversion());
genericData.addLogicalTypeConversion(new TimeConversions.DateConversion()); genericData.addLogicalTypeConversion(new TimeConversions.DateConversion());
genericData.addLogicalTypeConversion(new TimeConversions.TimeMicrosConversion()); genericData.addLogicalTypeConversion(new TimeConversions.TimeMicrosConversion());

5
nifi-nar-bundles/nifi-standard-bundle/pom.xml
View File

@ -170,11 +170,6 @@
<artifactId>Saxon-HE</artifactId> <artifactId>Saxon-HE</artifactId>
<version>10.6</version> <version>10.6</version>
</dependency> </dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.8.2</version>
</dependency>
<dependency> <dependency>
<groupId>javax.jms</groupId> <groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId> <artifactId>javax.jms-api</artifactId>