From 76a64f2171e27ce33b38d693934ad95374194517 Mon Sep 17 00:00:00 2001 From: "andre.schmid" Date: Mon, 24 Feb 2020 11:35:00 +0000 Subject: Allow other entries for SOL004 Tosca.meta Besides the mandatory entries, any other entry will be accepted in the TOSCA.meta file, as far as it has a valid format : . Change-Id: I941a62dbb43167e7e0424deae11a2664e61c8a6c Issue-ID: SDC-2781 Signed-off-by: andre.schmid --- .../openecomp/sdc/tosca/csar/ToscaMetaEntry.java | 20 ++++++-------- .../sdc/tosca/csar/ToscaMetadataFileInfo.java | 31 ++++++++++++++++++++++ 2 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/ToscaMetadataFileInfo.java (limited to 'openecomp-be/lib/openecomp-tosca-lib/src') diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/ToscaMetaEntry.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/ToscaMetaEntry.java index 56dabc5dc2..c6ae0d1843 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/ToscaMetaEntry.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/ToscaMetaEntry.java @@ -21,31 +21,27 @@ package org.openecomp.sdc.tosca.csar; import java.util.Arrays; import java.util.Optional; +import lombok.AllArgsConstructor; +import lombok.Getter; +/** + * Represents entry keys in a TOSCA.meta file. + */ +@AllArgsConstructor +@Getter public enum ToscaMetaEntry { - TOSCA_META_PATH_FILE_NAME("TOSCA-Metadata/TOSCA.meta"), TOSCA_META_FILE_VERSION_ENTRY("TOSCA-Meta-File-Version"), CSAR_VERSION_ENTRY("CSAR-Version"), CREATED_BY_ENTRY("Created-By"), ENTRY_DEFINITIONS("Entry-Definitions"), - ENTRY_EVENTS("Entry-Events"), ETSI_ENTRY_MANIFEST("ETSI-Entry-Manifest"), ETSI_ENTRY_CHANGE_LOG("ETSI-Entry-Change-Log"), ETSI_ENTRY_TESTS("ETSI-Entry-Tests"), ETSI_ENTRY_LICENSES("ETSI-Entry-Licenses"), - ETSI_ENTRY_CERTIFICATE("ETSI-Entry-Certificate"), - TOSCA_META_FILE_VERSION("1.0"); + ETSI_ENTRY_CERTIFICATE("ETSI-Entry-Certificate"); private final String name; - ToscaMetaEntry(final String name) { - this.name = name; - } - - public String getName() { - return name; - } - public static Optional parse(final String name) { return Arrays.stream(values()).filter(toscaMetaEntry -> toscaMetaEntry.getName().equals(name)).findFirst(); } diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/ToscaMetadataFileInfo.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/ToscaMetadataFileInfo.java new file mode 100644 index 0000000000..9d2a95f992 --- /dev/null +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/ToscaMetadataFileInfo.java @@ -0,0 +1,31 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2020 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.tosca.csar; + +public class ToscaMetadataFileInfo { + + public static final String TOSCA_META_PATH_FILE_NAME = "TOSCA-Metadata/TOSCA.meta"; + public static final String TOSCA_META_FILE_VERSION_1_0 = "1.0"; + + private ToscaMetadataFileInfo() { + + } + +} -- cgit 1.2.3-korg