From 4e4ec8e9c21acf7f9210aaebf8f13a60542737fc Mon Sep 17 00:00:00 2001 From: franciscovila Date: Thu, 30 Jun 2022 16:06:54 +0100 Subject: Allow set values in properties of type timestamp Issue-ID: SDC-4080 Signed-off-by: franciscovila Change-Id: I4c03e660e64118a388beb1d0db3527f9a1427c3f --- .../openecomp/sdc/be/model/tosca/ToscaType.java | 8 +-- .../model/tosca/validators/TimestampValidator.java | 77 ++++++++++++++++++++++ .../sdc/be/model/tosca/ToscaTypeTest.java | 4 +- .../tosca/validators/TimestampValidatorTest.java | 52 +++++++++++++++ 4 files changed, 132 insertions(+), 9 deletions(-) create mode 100644 catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/validators/TimestampValidator.java create mode 100644 catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/validators/TimestampValidatorTest.java (limited to 'catalog-model') diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/ToscaType.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/ToscaType.java index 98ca5d02ab..85758707b8 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/ToscaType.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/ToscaType.java @@ -31,6 +31,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import org.openecomp.sdc.be.model.tosca.constraints.ConstraintUtil; import org.openecomp.sdc.be.model.tosca.constraints.exception.ConstraintValueDoNotMatchPropertyTypeException; +import org.openecomp.sdc.be.model.tosca.validators.TimestampValidator; /** * The primitive type that TOSCA YAML supports. @@ -107,12 +108,7 @@ public enum ToscaType { case SCALAR_UNIT_FREQUENCY: return true; case TIMESTAMP: - try { - new SimpleDateFormat("MMM dd, yyyy hh:mm:ss a", Locale.US).parse(value); - return true; - } catch (ParseException e) { - return false; - } + return TimestampValidator.getInstance().isValid(value, null); case VERSION: return VersionUtil.isValid(value); case LIST: diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/validators/TimestampValidator.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/validators/TimestampValidator.java new file mode 100644 index 0000000000..f7b368d8cb --- /dev/null +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/validators/TimestampValidator.java @@ -0,0 +1,77 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2022 Nordix Foundation + * ================================================================================ + * Licensed 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + * + * + */ +package org.openecomp.sdc.be.model.tosca.validators; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.openecomp.sdc.be.model.DataTypeDefinition; +import org.openecomp.sdc.common.log.wrappers.Logger; + +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; +import java.time.format.DateTimeParseException; +import java.util.Map; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class TimestampValidator implements PropertyTypeValidator { + + private static final Logger log = Logger.getLogger(TimestampValidator.class.getName()); + + private static TimestampValidator timestampValidator = new TimestampValidator(); + + public static TimestampValidator getInstance() { + return timestampValidator; + } + + @Override + public boolean isValid(String value, String innerType, Map allDataTypes) { + if (value == null || value.isEmpty()) { + return true; + } + boolean isValid = true; + DateTimeFormatter dateFormatter = new DateTimeFormatterBuilder() + .appendOptional(DateTimeFormatter.ISO_DATE_TIME) + .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd H:mm:ss.SS")) + .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + .optionalStart() + .appendOffset("+HH", "0000") + .optionalEnd() + .optionalStart() + .appendLiteral(" ") + .appendOffset("+H", "0000") + .optionalEnd() + .toFormatter(); + try { + dateFormatter.parse(value); + } catch (DateTimeParseException e) { + isValid = false; + } + if (!isValid && log.isDebugEnabled()) { + log.debug("parameter Timestamp value {} is not valid.", value); + } + return isValid; + } + + @Override + public boolean isValid(String value, String innerType) { + return isValid(value, innerType, null); + } +} diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/ToscaTypeTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/ToscaTypeTest.java index 233c44c569..d2bfc375a2 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/ToscaTypeTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/ToscaTypeTest.java @@ -24,10 +24,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertNull; -import java.text.DateFormat; import java.util.Date; import java.util.List; -import java.util.Locale; import java.util.Map; import org.junit.jupiter.api.Test; import org.openecomp.sdc.be.model.tosca.version.Version; @@ -68,7 +66,7 @@ public class ToscaTypeTest { ToscaType toscaType = ToscaType.TIMESTAMP;; assertTrue(!toscaType.isValidValue("timestamp")); - assertTrue(toscaType.isValidValue("Jun 30, 2009 7:03:47 AM")); + assertTrue(toscaType.isValidValue("2001-12-14t21:59:43.10-05:00")); assertTrue(!toscaType.isValidValue("30 juin 2009 07:03:47")); } diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/validators/TimestampValidatorTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/validators/TimestampValidatorTest.java new file mode 100644 index 0000000000..33fc276f69 --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/validators/TimestampValidatorTest.java @@ -0,0 +1,52 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2022 Nordix Foundation + * ================================================================================ + * Licensed 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + * + * + */ + +package org.openecomp.sdc.be.model.tosca.validators; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class TimestampValidatorTest { + + private static final TimestampValidator validator = TimestampValidator.getInstance(); + + @Test + void testTimestampValidator_Success() { + assertTrue(validator.isValid(null, null)); + assertTrue(validator.isValid("", null)); + assertTrue(validator.isValid("2001-12-15T02:59:43.1Z", null)); + assertTrue(validator.isValid("2001-12-14t21:59:43.10-05:00", null)); + assertTrue(validator.isValid("2001-12-15 2:59:43.10", null)); + assertTrue(validator.isValid("2001-12-15 02:59:43.10", null)); + assertTrue(validator.isValid("2002-12-14", null)); + assertTrue(validator.isValid("2001-12-14 21:59:43.10+00", null)); + assertTrue(validator.isValid("2001-12-14 21:59:43.10 -5", null)); + } + + @Test + void testTimestampValidator_UnSuccess() { + assertFalse(validator.isValid("2022-22-22,", null)); + assertFalse(validator.isValid("2022-01-01 25:61:61,", null)); + + } +} \ No newline at end of file -- cgit 1.2.3-korg