diff --git a/libs/dnet-openaire-broker-common/src/main/java/eu/dnetlib/broker/objects/OaBrokerMainEntity.java b/libs/dnet-openaire-broker-common/src/main/java/eu/dnetlib/broker/objects/OaBrokerMainEntity.java index 01f3f88b..a625db94 100644 --- a/libs/dnet-openaire-broker-common/src/main/java/eu/dnetlib/broker/objects/OaBrokerMainEntity.java +++ b/libs/dnet-openaire-broker-common/src/main/java/eu/dnetlib/broker/objects/OaBrokerMainEntity.java @@ -40,12 +40,6 @@ public class OaBrokerMainEntity implements Serializable { private OaBrokerJournal journal; - private String collectedFromId; - - private String collectedFromName; - - private String collectedFromType; - private List pids = new ArrayList<>(); private List instances = new ArrayList<>(); @@ -60,6 +54,8 @@ public class OaBrokerMainEntity implements Serializable { private List softwares = new ArrayList<>(); + private List datasources = new ArrayList<>(); + public String getOpenaireId() { return openaireId; } @@ -164,30 +160,6 @@ public class OaBrokerMainEntity implements Serializable { this.journal = journal; } - public String getCollectedFromId() { - return collectedFromId; - } - - public void setCollectedFromId(final String collectedFromId) { - this.collectedFromId = collectedFromId; - } - - public String getCollectedFromName() { - return collectedFromName; - } - - public void setCollectedFromName(final String collectedFromName) { - this.collectedFromName = collectedFromName; - } - - public String getCollectedFromType() { - return collectedFromType; - } - - public void setCollectedFromType(final String collectedFromType) { - this.collectedFromType = collectedFromType; - } - public List getPids() { return pids; } @@ -244,4 +216,12 @@ public class OaBrokerMainEntity implements Serializable { this.softwares = softwares; } + public List getDatasources() { + return datasources; + } + + public void setDatasources(final List datasources) { + this.datasources = datasources; + } + } diff --git a/libs/dnet-openaire-broker-common/src/main/java/eu/dnetlib/broker/objects/OaBrokerRelatedDatasource.java b/libs/dnet-openaire-broker-common/src/main/java/eu/dnetlib/broker/objects/OaBrokerRelatedDatasource.java new file mode 100644 index 00000000..30289b28 --- /dev/null +++ b/libs/dnet-openaire-broker-common/src/main/java/eu/dnetlib/broker/objects/OaBrokerRelatedDatasource.java @@ -0,0 +1,49 @@ +package eu.dnetlib.broker.objects; + +import java.io.Serializable; + +public class OaBrokerRelatedDatasource implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 5528390911729639973L; + + private String openaireId; + private String name; + private String type; + private String relType; + + public String getOpenaireId() { + return openaireId; + } + + public void setOpenaireId(final String openaireId) { + this.openaireId = openaireId; + } + + public String getName() { + return name; + } + + public void setName(final String name) { + this.name = name; + } + + public String getType() { + return type; + } + + public void setType(final String type) { + this.type = type; + } + + public String getRelType() { + return relType; + } + + public void setRelType(final String relType) { + this.relType = relType; + } + +}