diff options
8 files changed, 151 insertions, 15 deletions
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<String, DataTypeDefinition> 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 diff --git a/catalog-ui/src/app/models/properties-inputs/property-fe-model.ts b/catalog-ui/src/app/models/properties-inputs/property-fe-model.ts index d4b45408ca..f231ec8aa8 100644 --- a/catalog-ui/src/app/models/properties-inputs/property-fe-model.ts +++ b/catalog-ui/src/app/models/properties-inputs/property-fe-model.ts @@ -284,6 +284,7 @@ export class PropertyFEModel extends PropertyBEModel { valueObj = value || defaultValue || null; // use null for empty value object if (valueObj && propertyType !== PROPERTY_TYPES.STRING && + propertyType !== PROPERTY_TYPES.TIMESTAMP && propertyType !== PROPERTY_TYPES.JSON && PROPERTY_DATA.SCALAR_TYPES.indexOf(<string>propertyType) == -1) { valueObj = JSON.parse(value); // the value object contains the real value ans not the value as string diff --git a/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.ts b/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.ts index 865aea6598..6107e8ad50 100644 --- a/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.ts +++ b/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.ts @@ -81,7 +81,7 @@ export class DynamicPropertyComponent { } initConsraintsValues(){ - let primitiveProperties = ['string', 'integer', 'float', 'boolean']; + let primitiveProperties = ['string', 'integer', 'float', 'boolean', PROPERTY_TYPES.TIMESTAMP]; //Property has constraints if(this.property.constraints && this.property.constraints[0]){ diff --git a/catalog-ui/src/app/ng2/components/ui/dynamic-element/dynamic-element.component.ts b/catalog-ui/src/app/ng2/components/ui/dynamic-element/dynamic-element.component.ts index 5e3214d888..50c77d3f53 100644 --- a/catalog-ui/src/app/ng2/components/ui/dynamic-element/dynamic-element.component.ts +++ b/catalog-ui/src/app/ng2/components/ui/dynamic-element/dynamic-element.component.ts @@ -28,7 +28,7 @@ import {UiElementInputComponent} from "../form-components/input/ui-element-input import {UiElementPopoverInputComponent} from "../form-components/popover-input/ui-element-popover-input.component"; import {UiElementIntegerInputComponent} from "../form-components/integer-input/ui-element-integer-input.component"; import {UiElementDropDownComponent, DropdownValue} from "../form-components/dropdown/ui-element-dropdown.component"; -import {PROPERTY_DATA} from "../../../../utils/constants"; +import {PROPERTY_DATA, PROPERTY_TYPES} from "../../../../utils/constants"; enum DynamicElementComponentCreatorIdentifier { STRING, @@ -38,7 +38,8 @@ enum DynamicElementComponentCreatorIdentifier { SUBNETPOOLID, ENUM, LIST, - DEFAULT + DEFAULT, + TIMESTAMP } @Component({ @@ -107,6 +108,9 @@ export class DynamicElementComponent { case this.type === 'string': this.elementCreatorIdentifier = DynamicElementComponentCreatorIdentifier.STRING; break; + case this.type === PROPERTY_TYPES.TIMESTAMP: + this.elementCreatorIdentifier = DynamicElementComponentCreatorIdentifier.TIMESTAMP; + break; case this.type === 'boolean': this.elementCreatorIdentifier = DynamicElementComponentCreatorIdentifier.BOOLEAN; break; @@ -146,6 +150,9 @@ export class DynamicElementComponent { case 'string': this.elementCreatorIdentifier = DynamicElementComponentCreatorIdentifier.STRING; break; + case PROPERTY_TYPES.TIMESTAMP: + this.elementCreatorIdentifier = DynamicElementComponentCreatorIdentifier.TIMESTAMP; + break; case 'boolean': this.elementCreatorIdentifier = DynamicElementComponentCreatorIdentifier.BOOLEAN; break; @@ -190,6 +197,10 @@ export class DynamicElementComponent { this.createComponent(UiElementInputComponent); break; + case DynamicElementComponentCreatorIdentifier.TIMESTAMP: + this.createComponent(UiElementInputComponent); + break; + case DynamicElementComponentCreatorIdentifier.BOOLEAN: this.createComponent(UiElementDropDownComponent); @@ -210,7 +221,7 @@ export class DynamicElementComponent { case DynamicElementComponentCreatorIdentifier.DEFAULT: default: this.createComponent(UiElementInputComponent); - console.log("ERROR: No ui-models component to handle type: " + this.type); + console.error("ERROR: No ui-models component to handle type: " + this.type); } // } // //There are consraints diff --git a/catalog-ui/src/app/utils/constants.ts b/catalog-ui/src/app/utils/constants.ts index af5c23c764..4e268f7087 100644 --- a/catalog-ui/src/app/utils/constants.ts +++ b/catalog-ui/src/app/utils/constants.ts @@ -133,6 +133,7 @@ export class SEVERITY { export class PROPERTY_TYPES { public static STRING = 'string'; public static INTEGER = 'integer'; + public static TIMESTAMP = 'timestamp'; public static FLOAT = 'float'; public static BOOLEAN = 'boolean'; public static JSON = 'json'; @@ -151,8 +152,8 @@ export class SOURCES { } export class PROPERTY_DATA { - public static TYPES = [PROPERTY_TYPES.STRING, PROPERTY_TYPES.INTEGER, PROPERTY_TYPES.FLOAT, PROPERTY_TYPES.BOOLEAN, PROPERTY_TYPES.JSON, PROPERTY_TYPES.SCALAR, PROPERTY_TYPES.SCALAR_FREQUENCY, PROPERTY_TYPES.SCALAR_SIZE, PROPERTY_TYPES.SCALAR_TIME, PROPERTY_TYPES.LIST, PROPERTY_TYPES.MAP]; - public static SIMPLE_TYPES = [PROPERTY_TYPES.STRING, PROPERTY_TYPES.INTEGER, PROPERTY_TYPES.FLOAT, PROPERTY_TYPES.BOOLEAN, PROPERTY_TYPES.JSON, PROPERTY_TYPES.SCALAR, PROPERTY_TYPES.SCALAR_FREQUENCY, PROPERTY_TYPES.SCALAR_SIZE, PROPERTY_TYPES.SCALAR_TIME]; + public static TYPES = [PROPERTY_TYPES.STRING, PROPERTY_TYPES.INTEGER, PROPERTY_TYPES.TIMESTAMP, PROPERTY_TYPES.FLOAT, PROPERTY_TYPES.BOOLEAN, PROPERTY_TYPES.JSON, PROPERTY_TYPES.SCALAR, PROPERTY_TYPES.SCALAR_FREQUENCY, PROPERTY_TYPES.SCALAR_SIZE, PROPERTY_TYPES.SCALAR_TIME, PROPERTY_TYPES.LIST, PROPERTY_TYPES.MAP]; + public static SIMPLE_TYPES = [PROPERTY_TYPES.STRING, PROPERTY_TYPES.INTEGER, PROPERTY_TYPES.TIMESTAMP, PROPERTY_TYPES.FLOAT, PROPERTY_TYPES.BOOLEAN, PROPERTY_TYPES.JSON, PROPERTY_TYPES.SCALAR, PROPERTY_TYPES.SCALAR_FREQUENCY, PROPERTY_TYPES.SCALAR_SIZE, PROPERTY_TYPES.SCALAR_TIME]; public static SIMPLE_TYPES_COMPARABLE = [PROPERTY_TYPES.STRING, PROPERTY_TYPES.INTEGER, PROPERTY_TYPES.FLOAT]; public static SCALAR_TYPES = [PROPERTY_TYPES.SCALAR, PROPERTY_TYPES.SCALAR_FREQUENCY, PROPERTY_TYPES.SCALAR_SIZE, PROPERTY_TYPES.SCALAR_TIME]; public static ROOT_DATA_TYPE = "tosca.datatypes.Root"; |