Copilot commented on code in PR #6614: URL: https://github.com/apache/incubator-kie-drools/pull/6614#discussion_r2888875978
########## kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/custom/CustomZonedDateTime.java: ########## @@ -0,0 +1,193 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.runtime.custom; + +import org.kie.dmn.feel.runtime.functions.DateAndTimeFunction; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalTime; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; +import java.time.chrono.ChronoLocalDateTime; +import java.time.chrono.ChronoZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.time.temporal.TemporalField; +import java.time.temporal.TemporalUnit; +import java.util.Objects; + +/** + * This class is meant as sort-of <b>decorator</b> over <code>ZonedDateTime</code>, that is a final class. + * It is used to provide a string representation that preserves seconds even when they are zero, + */ +public final class CustomZonedDateTime + implements Temporal, ChronoZonedDateTime<LocalDate>, Serializable { + + private final ZonedDateTime zonedDateTime; + private final String stringRepresentation; + + private CustomZonedDateTime(ZonedDateTime zonedDateTime) { + this.zonedDateTime = zonedDateTime; + ZoneId zone = zonedDateTime.getZone(); + if (zone instanceof ZoneOffset) { + // For ZoneOffset, use ISO format (e.g., 2021-01-01T10:10:10+11:00) + this.stringRepresentation = zonedDateTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME); + } else { + // For ZoneRegion, use REGION_DATETIME_FORMATTER which properly handles extended years + this.stringRepresentation = zonedDateTime.format(DateAndTimeFunction.REGION_DATETIME_FORMATTER); + } + } + + public static CustomZonedDateTime of(LocalDate date, LocalTime time, ZoneId zone) { + return new CustomZonedDateTime(ZonedDateTime.of(date, time, zone)); + } + + public static CustomZonedDateTime from(TemporalAccessor temporal) { + return new CustomZonedDateTime(ZonedDateTime.from(temporal)); + } + + public static CustomZonedDateTime of(int coercedYear, int coercedMonth, int coercedDay, int coercedHour, int coercedMinute, int coercedSecond, int i, ZoneId zoneId) { + return new CustomZonedDateTime(ZonedDateTime.of(coercedYear, coercedMonth, coercedDay, coercedHour, coercedMinute, coercedSecond, i, zoneId)); Review Comment: The factory method signature uses a parameter name `i`, which is unclear (it’s passed to ZonedDateTime.of as the nanosecond value). Renaming it to something explicit (e.g., nanoOfSecond) would improve readability and reduce the chance of misuse. ```suggestion public static CustomZonedDateTime of(int coercedYear, int coercedMonth, int coercedDay, int coercedHour, int coercedMinute, int coercedSecond, int nanoOfSecond, ZoneId zoneId) { return new CustomZonedDateTime(ZonedDateTime.of(coercedYear, coercedMonth, coercedDay, coercedHour, coercedMinute, coercedSecond, nanoOfSecond, zoneId)); ``` ########## kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/custom/CustomZonedDateTime.java: ########## @@ -0,0 +1,193 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.runtime.custom; + +import org.kie.dmn.feel.runtime.functions.DateAndTimeFunction; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalTime; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; +import java.time.chrono.ChronoLocalDateTime; +import java.time.chrono.ChronoZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.time.temporal.TemporalField; +import java.time.temporal.TemporalUnit; +import java.util.Objects; + +/** + * This class is meant as sort-of <b>decorator</b> over <code>ZonedDateTime</code>, that is a final class. + * It is used to provide a string representation that preserves seconds even when they are zero, + */ +public final class CustomZonedDateTime + implements Temporal, ChronoZonedDateTime<LocalDate>, Serializable { + + private final ZonedDateTime zonedDateTime; + private final String stringRepresentation; + + private CustomZonedDateTime(ZonedDateTime zonedDateTime) { + this.zonedDateTime = zonedDateTime; + ZoneId zone = zonedDateTime.getZone(); + if (zone instanceof ZoneOffset) { + // For ZoneOffset, use ISO format (e.g., 2021-01-01T10:10:10+11:00) + this.stringRepresentation = zonedDateTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME); + } else { + // For ZoneRegion, use REGION_DATETIME_FORMATTER which properly handles extended years + this.stringRepresentation = zonedDateTime.format(DateAndTimeFunction.REGION_DATETIME_FORMATTER); + } + } + + public static CustomZonedDateTime of(LocalDate date, LocalTime time, ZoneId zone) { + return new CustomZonedDateTime(ZonedDateTime.of(date, time, zone)); + } + + public static CustomZonedDateTime from(TemporalAccessor temporal) { + return new CustomZonedDateTime(ZonedDateTime.from(temporal)); + } + + public static CustomZonedDateTime of(int coercedYear, int coercedMonth, int coercedDay, int coercedHour, int coercedMinute, int coercedSecond, int i, ZoneId zoneId) { + return new CustomZonedDateTime(ZonedDateTime.of(coercedYear, coercedMonth, coercedDay, coercedHour, coercedMinute, coercedSecond, i, zoneId)); + } + + @Override + public ChronoLocalDateTime<LocalDate> toLocalDateTime() { + return zonedDateTime.toLocalDateTime(); + } + + @Override + public ZoneOffset getOffset() { + return zonedDateTime.getOffset(); + } + + @Override + public ZoneId getZone() { + return zonedDateTime.getZone(); + } + + @Override + public ChronoZonedDateTime<LocalDate> withEarlierOffsetAtOverlap() { + return new CustomZonedDateTime(zonedDateTime.withEarlierOffsetAtOverlap()); + } + + @Override + public ChronoZonedDateTime<LocalDate> withLaterOffsetAtOverlap() { + return new CustomZonedDateTime(zonedDateTime.withLaterOffsetAtOverlap()); + } + + @Override + public ChronoZonedDateTime<LocalDate> withZoneSameLocal(ZoneId zone) { + return new CustomZonedDateTime(zonedDateTime.withZoneSameLocal(zone)); + } + + @Override + public ChronoZonedDateTime<LocalDate> withZoneSameInstant(ZoneId zone) { + return new CustomZonedDateTime(zonedDateTime.withZoneSameInstant(zone)); + } + + @Override + public ChronoZonedDateTime<LocalDate> with(TemporalField field, long newValue) { + return new CustomZonedDateTime(zonedDateTime.with(field, newValue)); + } + + @Override + public ChronoZonedDateTime<LocalDate> plus(long amountToAdd, TemporalUnit unit) { + return new CustomZonedDateTime(zonedDateTime.plus(amountToAdd, unit)); + } + + @Override + public ChronoZonedDateTime<LocalDate> plus(TemporalAmount amount) { + return new CustomZonedDateTime(zonedDateTime.plus(amount)); + } + + @Override + public ChronoZonedDateTime<LocalDate> minus(TemporalAmount amount) { + return new CustomZonedDateTime(zonedDateTime.minus(amount)); + } + + @Override + public long until(Temporal endExclusive, TemporalUnit unit) { + return zonedDateTime.until(endExclusive, unit); + } + + @Override + public boolean isSupported(TemporalField field) { + return zonedDateTime.isSupported(field); + } + + @Override + public long getLong(TemporalField field) { + return zonedDateTime.getLong(field); + } + + @Override + public boolean isSupported(TemporalUnit unit) { + return zonedDateTime.isSupported(unit); + } + + @Override + public ChronoZonedDateTime<LocalDate> minus(long amountToSubtract, TemporalUnit unit) { + return new CustomZonedDateTime(zonedDateTime.minus(amountToSubtract, unit)); + } + + public static CustomZonedDateTime parse(CharSequence text) { + return new CustomZonedDateTime(ZonedDateTime.parse(text)); + } + + @Override + public int compareTo(ChronoZonedDateTime<?> other) { + if (other instanceof CustomZonedDateTime) { + return zonedDateTime.compareTo(((CustomZonedDateTime) other).zonedDateTime); + } + return zonedDateTime.compareTo(other); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o instanceof CustomZonedDateTime that) { + return Objects.equals(zonedDateTime, that.zonedDateTime); + } + if (o instanceof ZonedDateTime other) { + return Objects.equals(zonedDateTime, other); + } Review Comment: CustomZonedDateTime.equals(ZonedDateTime) breaks the equals contract (symmetry): CustomZonedDateTime can report equality with a ZonedDateTime, but ZonedDateTime will never report equality with CustomZonedDateTime. This can cause incorrect behavior in collections (e.g., Set/Map lookups) and inconsistent assertions depending on operand order. Consider restricting equals() to CustomZonedDateTime only (and updating comparisons to use getZonedDateTime()/compareTo/instant-based comparisons), rather than cross-type equality with ZonedDateTime. ```suggestion ``` ########## kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/DateAndTimeFunction.java: ########## @@ -136,7 +136,7 @@ public FEELFnResult<TemporalAccessor> invoke(@ParameterName( "from" ) String val try { if( val.contains( "T" ) ) { - return FEELFnResult.ofResult(FEEL_DATE_TIME.parseBest(val, ZonedDateTime::from, OffsetDateTime::from, LocalDateTime::from)); + return FEELFnResult.ofResult(FEEL_DATE_TIME.parseBest(val, CustomZonedDateTime::from, OffsetDateTime::from, LocalDateTime::from)); } else { LocalDate value = DateTimeFormatter.ISO_DATE.parse(val, LocalDate::from); return FEELFnResult.ofResult( LocalDateTime.of(value, LocalTime.of(0, 0))); Review Comment: DateAndTimeFunction now returns CustomZonedDateTime for zoned date-times. However, TypeUtil.formatValue only treats ZonedDateTime specially; CustomZonedDateTime will fall through to the generic TemporalAccessor branch and (when wrapForCodeUsage=true) won’t be wrapped as `date and time("...")` (impacting code() and any other code-path using TypeUtil for code-friendly rendering). TypeUtil (and any similar formatting/coercion logic) should be updated to recognize CustomZonedDateTime as a DATE_TIME value and format/wrap it consistently. ```suggestion TemporalAccessor parsed = DateTimeFormatter.ISO_DATE.parse(val); LocalDate value = LocalDate.from(parsed); ZoneId zoneId = parsed.query(TemporalQueries.zone()); if (zoneId == null) { ZoneOffset offset = parsed.query(TemporalQueries.offset()); if (offset != null) { zoneId = ZoneId.ofOffset("UTC", offset); } } if (zoneId != null) { return FEELFnResult.ofResult(CustomZonedDateTime.of(value, LocalTime.of(0, 0), zoneId)); } else { return FEELFnResult.ofResult(LocalDateTime.of(value, LocalTime.of(0, 0))); } ``` ########## kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/CodegenUtils.java: ########## @@ -151,22 +153,10 @@ public static VariableDeclarationExpr getObjectExpression(Object object, String } else if (object instanceof String string) { return getVariableDeclaratorWithInitializerExpression(variableName, STRING_CT, new StringLiteralExpr(escapeJava(string))); + } else if (object instanceof CustomZonedDateTime customZonedDateTime) { + return getVariableDeclaratorWithZonedDateTime(variableName, customZonedDateTime.getZonedDateTime()); Review Comment: CodegenUtils currently handles CustomZonedDateTime by emitting a ZonedDateTime initializer (via customZonedDateTime.getZonedDateTime()). This discards the custom type and its toString/formatting semantics, so generated code won’t preserve the behavior that motivated introducing CustomZonedDateTime. Consider generating a CustomZonedDateTime initializer (and type) instead, or otherwise ensuring the codegen path preserves the custom wrapper where required. ```suggestion String zonedDateTimeString = customZonedDateTime.getZonedDateTime().toString(); Expression zonedDateTimeParseExpr = new MethodCallExpr(ZONED_DATE_TIME_N, PARSE_S, NodeList.nodeList(new StringLiteralExpr(zonedDateTimeString))); ObjectCreationExpr customZonedDateTimeCreation = new ObjectCreationExpr(null, new ClassOrInterfaceType(null, CustomZonedDateTime.class.getCanonicalName()), NodeList.nodeList(zonedDateTimeParseExpr)); return getVariableDeclaratorWithInitializerExpression(variableName, CustomZonedDateTime.class.getCanonicalName(), customZonedDateTimeCreation); ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
