Commit b0030333 authored by Diogo Santos's avatar Diogo Santos
Browse files

Fixed datetime formatter not using ISO format

parent e4fa7397

src/main/java/org/etsi/osl/tmf/util/ServiceSpecificationValidator.java

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public class ServiceSpecificationValidator implements Validator { 
        final String INTEGER_REGEX = "[-+]?\\d+";

        final String FLOAT_REGEX = "[-+]?\\d*([.,]\\d+)?([eE][-+]?\\d+)?";

        final String BOOLEAN_REGEX = "(?i)true|false";

        final DateTimeFormatter TIMESTAMP_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

        final DateTimeFormatter ISO_DATE_TIME = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ");

        if (serviceSpecCharacteristicValue.getValueType() == null) {

            return true;

        }
@@ -61,7 +61,7 @@ public class ServiceSpecificationValidator implements Validator { 
                case BOOLEAN -> stringValue.matches(BOOLEAN_REGEX) || stringValue.matches(INTEGER_REGEX);

                case TIMESTAMP -> {

                    try {

                        LocalDateTime.parse(stringValue, TIMESTAMP_FORMATTER);

                        LocalDateTime.parse(stringValue, ISO_DATE_TIME);

                        yield true;

                    } catch (DateTimeParseException e) {

                        yield false;