Temporal Parse deprecations

Author: JoelBergstrand

core/src/main/java/apoc/date/Date.java

@@ -88,6 +88,31 @@ public double toYears(
     }
 
     @UserFunction("apoc.date.fields")
+    @QueryLanguageScope(scope = QueryLanguage.CYPHER_5)
+    @Description("Splits the given date into fields returning a `MAP` containing the values of each field.")
+    public Map<String, Object> fieldsCypher5(
+            final @Name(value = "date", description = "A string representation of a temporal value.") String date,
+            final @Name(
+                            value = "pattern",
+                            defaultValue = DEFAULT_FORMAT,
+                            description = "The format the given temporal is formatted as.") String pattern) {
+        if (date == null) {
+            return Util.map();
+        }
+        DateTimeFormatter fmt = getSafeDateTimeFormatter(pattern);
+        TemporalAccessor temporal = fmt.parse(date);
+        FieldResult result = new FieldResult();
+
+        for (final TemporalQuery<Consumer<FieldResult>> query : DT_FIELDS_SELECTORS) {
+            query.queryFrom(temporal).accept(result);
+        }
+
+        return result.asMap();
+    }
+
+    @Deprecated
+    @UserFunction(value = "apoc.date.fields", deprecatedBy = "Cypher's temporal pattern constructors.")
+    @QueryLanguageScope(scope = QueryLanguage.CYPHER_25)
     @Description("Splits the given date into fields returning a `MAP` containing the values of each field.")
     public Map<String, Object> fields(
             final @Name(value = "date", description = "A string representation of a temporal value.") String date,
@@ -278,6 +303,22 @@ public Long fromISO8601(final @Name(value = "time", description = "The datetime
     }
 
     @UserFunction("apoc.date.parse")
+    @QueryLanguageScope(scope = QueryLanguage.CYPHER_5)
+    @Description("Parses the given date `STRING` from a specified format into the specified time unit.")
+    public Long parseCypher5(
+            @Name(value = "time", description = "The datetime to convert.") String time,
+            @Name(value = "unit", defaultValue = "ms", description = "The conversion unit.") String unit,
+            @Name(value = "format", defaultValue = DEFAULT_FORMAT, description = "The format the given datetime is in.")
+                    String format,
+            final @Name(value = "timezone", defaultValue = "", description = "The timezone the given datetime is in.")
+                    String timezone) {
+        Long value = StringUtils.isBlank(time) ? null : parseOrThrow(time, getFormat(format, timezone));
+        return value == null ? null : unit(unit).convert(value, TimeUnit.MILLISECONDS);
+    }
+
+    @Deprecated
+    @UserFunction(value = "apoc.date.parse", deprecatedBy = "Cypher's temporal pattern constructors.")
+    @QueryLanguageScope(scope = QueryLanguage.CYPHER_25)
     @Description("Parses the given date `STRING` from a specified format into the specified time unit.")
     public Long parse(
             @Name(value = "time", description = "The datetime to convert.") String time,
@@ -306,6 +347,32 @@ public Long convert(
     }
 
     @UserFunction("apoc.date.convertFormat")
+    @QueryLanguageScope(scope = QueryLanguage.CYPHER_5)
+    @Description("Converts a `STRING` of one type of date format into a `STRING` of another type of date format.")
+    public String convertFormatCypher5(
+            @Name(value = "temporal", description = "A string representation of a temporal value.") String input,
+            @Name(value = "currentFormat", description = "The format the given temporal is formatted as.")
+                    String currentFormat,
+            @Name(
+                            value = "convertTo",
+                            defaultValue = "yyyy-MM-dd",
+                            description = "The format to convert the given temporal value to.")
+                    String convertTo) {
+        if (input == null || input.isEmpty()) {
+            return null;
+        }
+
+        DateTimeFormatter currentFormatter = DateFormatUtil.getOrCreate(currentFormat);
+        DateTimeFormatter convertToFormatter = DateFormatUtil.getOrCreate(convertTo);
+
+        return convertToFormatter.format(currentFormatter.parse(input));
+    }
+
+    @Deprecated
+    @UserFunction(
+            value = "apoc.date.convertFormat",
+            deprecatedBy = "Cypher's temporal pattern constructors and format() function.")
+    @QueryLanguageScope(scope = QueryLanguage.CYPHER_25)
     @Description("Converts a `STRING` of one type of date format into a `STRING` of another type of date format.")
     public String convertFormat(
             @Name(value = "temporal", description = "A string representation of a temporal value.") String input,

core/src/main/java/apoc/temporal/TemporalProcedures.java

@@ -157,6 +157,21 @@ public String formatDuration(
     }
 
     @UserFunction("apoc.temporal.toZonedTemporal")
+    @QueryLanguageScope(scope = QueryLanguage.CYPHER_5)
+    @Description("Parses the given date `STRING` using the specified format into the given time zone.")
+    public ZonedDateTime toZonedTemporalCypher5(
+            @Name(value = "time", description = "The date string to be parsed.") String time,
+            @Name(value = "format", defaultValue = DEFAULT_FORMAT, description = "The format of the given date string.")
+                    String format,
+            final @Name(value = "timezone", defaultValue = "UTC", description = "The timezone the given string is in.")
+                    String timezone) {
+        Long value = parseOrThrow(time, getFormat(format, timezone));
+        return value == null ? null : Instant.ofEpochMilli(value).atZone(ZoneId.of(timezone));
+    }
+
+    @Deprecated
+    @UserFunction(value = "apoc.temporal.toZonedTemporal", deprecatedBy = "Cypher's temporal pattern constructors.")
+    @QueryLanguageScope(scope = QueryLanguage.CYPHER_25)
     @Description("Parses the given date `STRING` using the specified format into the given time zone.")
     public ZonedDateTime toZonedTemporal(
             @Name(value = "time", description = "The date string to be parsed.") String time,