Accept YML #9
Accept YML #9
Conversation
Signed-off-by: Ehtesham <ehteshamkhan3014@gmail.com>
| * @author Gary O'Neall | ||
| * | ||
| */ | ||
| public class SpdxToolsHelper { | ||
|
|
||
| public enum SerFileType { | ||
| JSON, RDFXML, XML, XLS, XLSX, YAML, TAG | ||
| JSON, RDFXML, XML, XLS, XLSX, YAML, TAG, YML |
There was a problem hiding this comment.
Rather than add an additional file type, we should just map the .yml file extension to the existing YAML file type. The SerFileType should represent type type of file (e.g. the format of the content), not the extension used. This would the change more straight forward.
There was a problem hiding this comment.
I have done the requested changes but here I have a doubt that if I don't add the YML file type then I will get this error
an enum switch case label must be the unqualified name of an enumeration constant
| @@ -64,6 +64,7 @@ | |||
| temp.put("yaml", SerFileType.YAML); | |||
| temp.put("tag", SerFileType.TAG); | |||
| temp.put("spdx", SerFileType.TAG); | |||
| temp.put("yml", SerFileType.YML); | |||
There was a problem hiding this comment.
This could just be mapped to SerFileType.YAML
Signed-off-by: Ehtesham <ehteshamkhan3014@gmail.com>
|
I think I should revert back to the initial commit @goneall |
| @@ -81,7 +82,8 @@ public static ISerializableModelStore fileTypeToStore(SerFileType fileType) thro | |||
| case XLSX: return new SpreadsheetStore(new InMemSpdxStore(), SpreadsheetFormatType.XLSX); | |||
| case XML: return new MultiFormatStore(new InMemSpdxStore(), Format.XML, Verbose.COMPACT); | |||
| case YAML: return new MultiFormatStore(new InMemSpdxStore(), Format.YAML, Verbose.COMPACT); | |||
| default: throw new InvalidSPDXAnalysisException("Unsupporte file type: "+fileType+". Check back later."); | |||
| case YML: return new MultiFormatStore(new InMemSpdxStore(), Format.YAML, Verbose.COMPACT); | |||
There was a problem hiding this comment.
You no longer need this case statement. The additional file type will get taken care of by the line SerFileType retval = EXT_TO_FILETYPE.get(ext); below..
Signed-off-by: Ehtesham <ehteshamkhan3014@gmail.com>
|
Thanks @ek08 |
Signed-off-by: Ehtesham ehteshamkhan3014@gmail.com
Verify should support file extension "yml" #8