Commit 8eb0ed80 authored by Diogo Santos's avatar Diogo Santos
Browse files

Fixed datetime formatter not using ISO format

parent c50f0611

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

+3 −4
Original line number Diff line number Diff line
@@ -48,8 +48,7 @@ public class ServiceOrderValidator implements Validator { 
                if (serviceSpecCharacteristic != null) {

                    Set<ServiceSpecCharacteristicValue> serviceSpecCharacteristicValues = serviceSpecCharacteristic.getServiceSpecCharacteristicValue();

                    characteristicParser.updateServiceSpecCharacteristicValues(serviceSpecCharacteristicValues, characteristic);

                    if (serviceSpecCharacteristicValues.stream().anyMatch(

                            value -> {

                    if (serviceSpecCharacteristicValues.stream().anyMatch(value -> {

                            ServiceSpecCharacteristicValueValidator serviceSpecCharacteristicValueValidator = new ServiceSpecCharacteristicValueValidator(value);

                            return !serviceSpecCharacteristicValueValidator.validateType() || !serviceSpecCharacteristicValueValidator.isWithinRangeInterval();

                    })) {

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

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ public class ServiceSpecCharacteristicValueValidator { 
        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;

        }
@@ -40,7 +40,7 @@ public class ServiceSpecCharacteristicValueValidator { 
                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;

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

+2 −2

File changed.

Contains only whitespace changes.