diff options
2 files changed, 74 insertions, 44 deletions
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/PropertyTypeExt.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/PropertyTypeExt.java index 8d1b5525de..60f26501e0 100644 --- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/PropertyTypeExt.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/PropertyTypeExt.java @@ -7,9 +7,9 @@ * 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. @@ -29,54 +29,40 @@ import java.util.Map; */ public enum PropertyTypeExt { - /** - * Json property type ext. - */ - JSON("json"); + /** + * Json property type ext. + */ + JSON("json"); - private static final Map<String, PropertyTypeExt> M_MAP = - Collections.unmodifiableMap(initializeMapping()); - private String displayName; + private static final Map<String, PropertyTypeExt> M_MAP = + Collections.unmodifiableMap(initializeMapping()); + private String displayName; - PropertyTypeExt(String displayName) { - - this.displayName = displayName; - } - - /** - * Initialize mapping map. - * - * @return the map - */ - public static Map<String, PropertyTypeExt> initializeMapping() { - Map<String, PropertyTypeExt> typeMap = new HashMap<String, PropertyTypeExt>(); - for (PropertyTypeExt v : PropertyTypeExt.values()) { - typeMap.put(v.displayName, v); + PropertyTypeExt(String displayName) { + this.displayName = displayName; } - return typeMap; - } - /** - * Gets property type by display name. - * - * @param displayName the display name - * @return the property type by display name - */ - public static PropertyTypeExt getPropertyTypeByDisplayName(String displayName) { - if (M_MAP.containsKey(displayName)) { - return M_MAP.get(displayName); + /** + * Initialize mapping map. + * + * @return the map + */ + public static Map<String, PropertyTypeExt> initializeMapping() { + Map<String, PropertyTypeExt> typeMap = new HashMap<>(); + for (PropertyTypeExt v : PropertyTypeExt.values()) { + typeMap.put(v.displayName, v); + } + return typeMap; } - return null; - } - /** - * Gets display name. - * - * @return the display name - */ - public String getDisplayName() { - return displayName; - } + /** + * Gets display name. + * + * @return the display name + */ + public String getDisplayName() { + return displayName; + } } diff --git a/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/heatextend/PropertyTypeExtTest.java b/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/heatextend/PropertyTypeExtTest.java new file mode 100644 index 0000000000..0e6c1ff999 --- /dev/null +++ b/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/heatextend/PropertyTypeExtTest.java @@ -0,0 +1,44 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2020 AT&T. All rights reserved. + * ================================================================================ + * 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.tosca.datatypes.model.heatextend; + +import org.junit.jupiter.api.Test; + +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.*; + +public class PropertyTypeExtTest { + + @Test + public void initializeProperMapping() { + Map<String, PropertyTypeExt> map = PropertyTypeExt.initializeMapping(); + assertNotNull(map); + assertEquals(1, map.size()); + assertEquals(PropertyTypeExt.JSON, map.get("json")); + } + + @Test + public void getDisplayName() { + assertEquals("json", PropertyTypeExt.JSON.getDisplayName()); + } + +} |