[NIFI-5584] Reorder if statement in DataTypeUtils.toTimestamp so that Timestamp comes before Date

• Type: Improvement
• Status: Resolved
• Priority: Trivial
• Resolution: Fixed
• Affects Version/s: 1.7.1
• Fix Version/s: 1.10.0
• Component/s: Core Framework
• Environment: RHEL, JDK 8
• Assignee: Margot Tien
• Reporter: Gideon Korir
• Created: 10/Sep/18 13:51
• Updated: 29/Oct/19 21:42
• Resolved: 29/Oct/19 21:42

Description

The method DataTypeUtils.toTimestamp in package nifi-record has the if statement structured as follows:

public static Timestamp toTimestamp(final Object value, final Supplier<DateFormat> format, final String fieldName) {
if (value == null) {
return null;
}

if (value instanceof java.util.Date) {
return new Timestamp(((java.util.Date)value).getTime());
}

if (value instanceof Timestamp) {
return (Timestamp) value;
}

Since Timestamp extends java.util.Date a value of type timestamp always matches the 1st if statement and allocates a new timestamp object. The 1st if statement should check for timestamp followed by java.util.Date check.
 

Issue Links

• is related to: NIFI-6442 ExecuteSQL/ExecuteSQLRecord convert to Avro date type incorrectly when set 'Use Avro Logical Types' to true