D-Net
/
dnet-hadoop
13
4
Fork 10
Code Issues 14 Pull Requests 9 Projects 2 Releases 1 Wiki Activity

refactoring due to compilation

This commit is contained in:
Miriam Baglioni 2020-08-24 17:05:50 +02:00
parent c90a0d39dd
commit 428f1022fd
3 changed files with 31 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityInstance.java
View File

@ -1,41 +1,36 @@
package eu.dnetlib.dhp.schema.dump.oaf.community; package eu.dnetlib.dhp.schema.dump.oaf.community;
import eu.dnetlib.dhp.schema.dump.oaf.Instance; import eu.dnetlib.dhp.schema.dump.oaf.Instance;
import eu.dnetlib.dhp.schema.dump.oaf.KeyValue; 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 * It extends eu.dnetlib.dhp.dump.oaf.Instance with values related to the community dump. In the Result dump this
* is not present because it is dumped as a set of relations between the result and the datasource. * 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 * hostedby of type eu.dnetlib.dhp.schema.dump.oaf.KeyValue to store the information about the source from which the
* viewed or downloaded. It is mapped against the hostedby parameter of the instance to be dumped and * 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 * key corresponds to hostedby.key - value corresponds to hostedby.value - collectedfrom of type
* - value corresponds to hostedby.value * eu.dnetlib.dhp.schema.dump.oaf.KeyValue to store the information about the source from which the instance has been
* - 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
* collected. It is mapped against the collectedfrom parameter of the instance to be dumped and * collectedfrom.key - value corresponds to collectedfrom.value
* - key corresponds to collectedfrom.key
* - value corresponds to collectedfrom.value
*/ */
public class CommunityInstance extends Instance { public class CommunityInstance extends Instance {
private KeyValue hostedby; private KeyValue hostedby;
private KeyValue collectedfrom; private KeyValue collectedfrom;
public KeyValue getHostedby() {
return hostedby;
}
public KeyValue getHostedby() { public void setHostedby(KeyValue hostedby) {
return hostedby; this.hostedby = hostedby;
} }
public KeyValue getCollectedfrom() {
return collectedfrom;
}
public void setHostedby(KeyValue hostedby) { public void setCollectedfrom(KeyValue collectedfrom) {
this.hostedby = hostedby; this.collectedfrom = collectedfrom;
} }
public KeyValue getCollectedfrom() {
return collectedfrom;
}
public void setCollectedfrom(KeyValue collectedfrom) {
this.collectedfrom = collectedfrom;
}
} }

9
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityResult.java
View File

@ -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 - * For each context in the result represented in the internal model one context in the external model is produced -
* collectedfrom of type List<eu.dnetliv.dhp.schema.dump.oaf.KeyValue> to store information about the sources from which * collectedfrom of type List<eu.dnetliv.dhp.schema.dump.oaf.KeyValue> 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 * the record has been collected. For each collectedfrom in the result represented in the internal model one
* collectedfrom in the external model is produced * collectedfrom in the external model is produced - instance of type
* - instance of type List<eu.dnetlib.dhp.schema.dump.oaf.community.CommunityInstance> to store all the instances associated * List<eu.dnetlib.dhp.schema.dump.oaf.community.CommunityInstance> to store all the instances associated to the result.
* to the result. It corresponds to the same parameter in the result represented in the internal model * It corresponds to the same parameter in the result represented in the internal model
*/ */
public class CommunityResult extends Result { public class CommunityResult extends Result {
@ -26,7 +26,7 @@ public class CommunityResult extends Result {
protected List<KeyValue> collectedfrom; protected List<KeyValue> collectedfrom;
private List<CommunityInstance> instance ; private List<CommunityInstance> instance;
public List<CommunityInstance> getInstance() { public List<CommunityInstance> getInstance() {
return instance; return instance;
@ -36,7 +36,6 @@ public class CommunityResult extends Result {
this.instance = instance; this.instance = instance;
} }
public List<KeyValue> getCollectedfrom() { public List<KeyValue> getCollectedfrom() {
return collectedfrom; return collectedfrom;
} }

12
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java
View File

@ -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 * 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 * 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. * information derived by relation between results and projects. Project extends eu.dnetlib.dhp.schema.dump.oaf.Project
* Project extends eu.dnetlib.dhp.schema.dump.oaf.Project with the following parameters: * with the following parameters: - funder of type eu.dnetlib.dhp.schema.dump.oaf.community.Funder to store information
* - funder of * about the funder funding the project - provenance of type eu.dnetlib.dhp.schema.dump.oaf.Provenance to store
* type eu.dnetlib.dhp.schema.dump.oaf.community.Funder to store information about the funder funding the project - * information about the. provenance of the association between the result and 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 { 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; this.provenance = provenance;
} }
public Funder getFunder() { public Funder getFunder() {
return funder; return funder;
} }