gCubeSystem
/
grsf-common-library
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding support for "FAO SDG 14.4.1 Questionnaire" source

This commit is contained in:
Luca Frosini 2022-08-31 11:22:28 +02:00
parent 91c0103dc5
commit 9eb98dea3f
3 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [v1.3.3-SNAPSHOT]
- Adding support for "FAO SDG 14.4.1 Questionnaire" source [#23670]
## [v1.3.2] ## [v1.3.2]
- Updated Labels [#23167] - Updated Labels [#23167]

2
pom.xml
View File

@ -14,7 +14,7 @@
<groupId>org.gcube.data-catalogue</groupId> <groupId>org.gcube.data-catalogue</groupId>
<artifactId>grsf-common-library</artifactId> <artifactId>grsf-common-library</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.3.2</version> <version>1.3.3-SNAPSHOT</version>
<description>Common library for GRSF service and management panel</description> <description>Common library for GRSF service and management panel</description>
<properties> <properties>

52
src/main/java/org/gcube/datacatalogue/common/enums/Sources.java
View File

@ -1,7 +1,6 @@
package org.gcube.datacatalogue.common.enums; package org.gcube.datacatalogue.common.enums;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -13,60 +12,69 @@ import com.fasterxml.jackson.annotation.JsonValue;
*/ */
public enum Sources { public enum Sources {
FIRMS("FIRMS"), FIRMS("FIRMS","firms"),
RAM("RAM"), RAM("RAM","ram"),
FISHSOURCE("FishSource"), FISHSOURCE("FishSource", "fishsource"),
GRSF("GRSF"); GRSF("GRSF", "grsf"),
SDG("FAO SDG 14.4.1 Questionnaire","sdg14.4.1");
private String subGroupNameOrig; private String sourceName;
private String urlPath;
private Sources(String origName) { private Sources(String sourceName, String urlPath) {
this.subGroupNameOrig = origName; this.sourceName = sourceName;
this.urlPath = urlPath;
} }
/** /**
* Return the original name * Return the original name
* @return * @return
*/ */
public String getOrigName(){ public String getSourceName(){
return subGroupNameOrig; return sourceName;
} }
@JsonValue @JsonValue
public String onSerialize(){ public String onSerialize(){
return subGroupNameOrig.toLowerCase(); return urlPath;
} }
@JsonCreator @JsonCreator
public static Sources onDeserialize(String sourceString) { public static Sources onDeserialize(String sourceString) {
if(sourceString != null) { if(sourceString != null) {
for(Sources source : Sources.values()) { for(Sources source : Sources.values()) {
if (source.toString().equalsIgnoreCase(sourceString.trim())) if (source.urlPath.equalsIgnoreCase(sourceString.trim()))
return source; return source;
} }
} }
return null; return null;
} }
public String getURLPath() {
return urlPath;
}
@Override @Override
public String toString() { public String toString() {
return getOrigName(); return urlPath;
} }
public static String getAsList(){ public static String getJsonArrayAsString(){
return "[" + Arrays.asList( return "[" + FIRMS.urlPath + "," +
FIRMS.toString().toLowerCase(), RAM.urlPath + "," +
RAM.toString().toLowerCase(), FISHSOURCE.urlPath + "," +
FISHSOURCE.toString().toLowerCase(), GRSF.urlPath + "," +
GRSF.toString().toLowerCase()) + "]"; SDG.urlPath + "," + "]";
} }
public static List<String> getListNames(){ public static List<String> listNames(){
List<String> valuesString = new ArrayList<String>(Sources.values().length); List<String> valuesString = new ArrayList<String>(Sources.values().length);
for(Sources source : Sources.values()) for(Sources source : Sources.values()) {
valuesString.add(source.getOrigName()); valuesString.add(source.getSourceName());
}
return valuesString; return valuesString;
} }
} }