From 428f1022fdd9c105ce361fab6051e25dcfb4a3db Mon Sep 17 00:00:00 2001 From: "miriam.baglioni" Date: Mon, 24 Aug 2020 17:05:50 +0200 Subject: [PATCH] refactoring due to compilation --- .../dump/oaf/community/CommunityInstance.java | 51 +++++++++---------- .../dump/oaf/community/CommunityResult.java | 9 ++-- .../schema/dump/oaf/community/Project.java | 12 ++--- 3 files changed, 31 insertions(+), 41 deletions(-) diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityInstance.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityInstance.java index f520ef04f..6a605d742 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityInstance.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityInstance.java @@ -1,41 +1,36 @@ + package eu.dnetlib.dhp.schema.dump.oaf.community; import eu.dnetlib.dhp.schema.dump.oaf.Instance; import eu.dnetlib.dhp.schema.dump.oaf.KeyValue; /** - * It extends eu.dnetlib.dhp.dump.oaf.Instance with values related to the community dump. In the Result dump this information - * is not present because it is dumped as a set of relations between the result and the datasource. - * - hostedby of type eu.dnetlib.dhp.schema.dump.oaf.KeyValue to store the information about the source from which the instance can be - * viewed or downloaded. It is mapped against the hostedby parameter of the instance to be dumped and - * - key corresponds to hostedby.key - * - value corresponds to hostedby.value - * - collectedfrom of type eu.dnetlib.dhp.schema.dump.oaf.KeyValue to store the information about the source from which the instance has been - * collected. It is mapped against the collectedfrom parameter of the instance to be dumped and - * - key corresponds to collectedfrom.key - * - value corresponds to collectedfrom.value + * It extends eu.dnetlib.dhp.dump.oaf.Instance with values related to the community dump. In the Result dump this + * information is not present because it is dumped as a set of relations between the result and the datasource. - + * hostedby of type eu.dnetlib.dhp.schema.dump.oaf.KeyValue to store the information about the source from which the + * instance can be viewed or downloaded. It is mapped against the hostedby parameter of the instance to be dumped and - + * key corresponds to hostedby.key - value corresponds to hostedby.value - collectedfrom of type + * eu.dnetlib.dhp.schema.dump.oaf.KeyValue to store the information about the source from which the instance has been + * collected. It is mapped against the collectedfrom parameter of the instance to be dumped and - key corresponds to + * collectedfrom.key - value corresponds to collectedfrom.value */ public class CommunityInstance extends Instance { - private KeyValue hostedby; - private KeyValue collectedfrom; + private KeyValue hostedby; + private KeyValue collectedfrom; + public KeyValue getHostedby() { + return hostedby; + } - public KeyValue getHostedby() { - return hostedby; - } + public void setHostedby(KeyValue hostedby) { + this.hostedby = hostedby; + } + public KeyValue getCollectedfrom() { + return collectedfrom; + } - public void setHostedby(KeyValue hostedby) { - this.hostedby = hostedby; - } - - - public KeyValue getCollectedfrom() { - return collectedfrom; - } - - - public void setCollectedfrom(KeyValue collectedfrom) { - this.collectedfrom = collectedfrom; - } + public void setCollectedfrom(KeyValue collectedfrom) { + this.collectedfrom = collectedfrom; + } } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityResult.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityResult.java index a4e9d77c7..690a53706 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityResult.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityResult.java @@ -14,9 +14,9 @@ import eu.dnetlib.dhp.schema.dump.oaf.Result; * For each context in the result represented in the internal model one context in the external model is produced - * collectedfrom of type List to store information about the sources from which * the record has been collected. For each collectedfrom in the result represented in the internal model one - * collectedfrom in the external model is produced - * - instance of type List to store all the instances associated - * to the result. It corresponds to the same parameter in the result represented in the internal model + * collectedfrom in the external model is produced - instance of type + * List to store all the instances associated to the result. + * It corresponds to the same parameter in the result represented in the internal model */ public class CommunityResult extends Result { @@ -26,7 +26,7 @@ public class CommunityResult extends Result { protected List collectedfrom; - private List instance ; + private List instance; public List getInstance() { return instance; @@ -36,7 +36,6 @@ public class CommunityResult extends Result { this.instance = instance; } - public List getCollectedfrom() { return collectedfrom; } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java index 0530bbb3b..030b565be 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java @@ -8,12 +8,10 @@ import eu.dnetlib.dhp.schema.dump.oaf.Provenance; /** * To store information about the project related to the result. This information is not directly mapped from the result * represented in the internal model because it is not there. The mapped result will be enriched with project - * information derived by relation between results and projects. - * Project extends eu.dnetlib.dhp.schema.dump.oaf.Project with the following parameters: - * - funder of - * type eu.dnetlib.dhp.schema.dump.oaf.community.Funder to store information about the funder funding the project - - * provenance of type eu.dnetlib.dhp.schema.dump.oaf.Provenance to store information about the. provenance of the - * association between the result and the project + * information derived by relation between results and projects. Project extends eu.dnetlib.dhp.schema.dump.oaf.Project + * with the following parameters: - funder of type eu.dnetlib.dhp.schema.dump.oaf.community.Funder to store information + * about the funder funding the project - provenance of type eu.dnetlib.dhp.schema.dump.oaf.Provenance to store + * information about the. provenance of the association between the result and the project */ public class Project extends eu.dnetlib.dhp.schema.dump.oaf.Project { @@ -29,8 +27,6 @@ public class Project extends eu.dnetlib.dhp.schema.dump.oaf.Project { this.provenance = provenance; } - - public Funder getFunder() { return funder; }