diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/gcat/CatalogueEntry.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/gcat/CatalogueEntry.java index 3de3a0628..8cd4f6bdd 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/gcat/CatalogueEntry.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/gcat/CatalogueEntry.java @@ -14,8 +14,26 @@ public class CatalogueEntry implements Serializable { private String notes; // description.value (the first description private String url; // the url of the resource in the openaire dashboard private String version; // valid for datasets + private List tags; // subject and keywords + private List groups; // access and publishers private List extras; + public List getGroups() { + return groups; + } + + public void setGroups(List groups) { + this.groups = groups; + } + + public List getTags() { + return tags; + } + + public void setTags(List tags) { + this.tags = tags; + } + public String getVersion() { return version; } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/gcat/Group.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/gcat/Group.java index 39cba69ae..9373ecd2c 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/gcat/Group.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/gcat/Group.java @@ -1,4 +1,37 @@ + package eu.dnetlib.dhp.schema.dump.gcat; -public class Group { +import java.io.Serializable; + +public class Group implements Serializable { + private String id; + private String name; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public static Group newInstance(String id, String name) { + Group g = new Group(); + if (id != null) { + g.id = id; + } + if (name != null) { + g.name = name; + } + + return g; + } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/gcat/Tag.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/gcat/Tag.java index 9f9830f32..6babd91bd 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/gcat/Tag.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/gcat/Tag.java @@ -1,4 +1,24 @@ + package eu.dnetlib.dhp.schema.dump.gcat; -public class Tag { +import java.io.Serializable; + +import com.fasterxml.jackson.core.SerializableString; + +public class Tag implements Serializable { + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public static Tag newInstance(String n) { + Tag t = new Tag(); + t.name = n; + return t; + } }