Merge branch 'master' of https://code-repo.d4science.org/D-Net/dhp-schemas
This commit is contained in:
commit
5f0b0d3a87
|
|
@ -0,0 +1,16 @@
|
||||||
|
|
||||||
|
|
||||||
|
## Changelog
|
||||||
|
|
||||||
|
| **Version** | **Changes** | **Readiness** |
|
||||||
|
|---|---|---|
|
||||||
|
| 2.7.14 | [Graph model]<br>Relation types are now inspired by the Datacite definitions https://schema.datacite.org/meta/kernel-4.4/doc/DataCite-MetadataKernel_v4.4.pdf <br>The changes involve the values stored in `relation.subRelType` and `relation.relClass`:<br>Updated the casing of the following terms (`relation.relClass`):<br>1. `isSupplementTo -> IsSupplementTo` / `isSupplementedBy -> IsSupplementedBy`<br>2. `isPartOf -> IsPartOf` / `hasPart -> HasPart`<br>3. `cites -> Cites` / `isCitedBy -> IsCitedBy`<br>4. `reviews -> Reviews` / `isReviewedBy -> IsReviewedBy`<br>Added the following terms [`subRelType: relClass / relClass (inverse)`]:<br>1. `relationship: References / IsReferencedBy`<br>2. `relationship: IsIdenticalTo`<br>3. `relationship: IsContinuedBy / Continues`<br>4. `relationship: IsDocumentedBy / Documents`<br>5. `relationship: Documents / IsDocumentedBy`<br>6. `relationship: IsCompiledBy / Compiles`<br>7. `version: IsPreviousVersionOf / IsNewVersionOf`<br>8. `version: IsSourceOf / IsDerivedFrom`<br>9. `version: IsVariantFormOf / IsOriginalFormOf`<br>10. `version: IsObsoletedBy / Obsoletes`<br>11. `version: IsVersionOf / HasVersion` | beta |
|
||||||
|
| 2.6.14 | [Scholexplorer]<br>1. Added model classes for Scholexplorer, package `eu.dnetlib.dhp.schema.sx` | production |
|
||||||
|
| 2.6.13 | 1. `Result.mergeFrom` handles field `dateOfAcceptance` | production |
|
||||||
|
| 2.5.12 | 1. delegating the date parsing to https://github.com/sisyphsu/dateparser | production |
|
||||||
|
| 2.5.[11-9] | 1. support for more date formats<br>2. enable the possibility to extend the date formats used to parse `Relation.validationDate` | production |
|
||||||
|
| 2.4.8 | 1. added constant for ORCID datasource name | production |
|
||||||
|
| 2.4.7 | refactoring | production |
|
||||||
|
| 2.3.6 | [Aggregation]<br>1. introduced MetadataStoreManager (MdSM) model classes| production |
|
||||||
|
| 2.2.5 | [Graph model]<br>1. introduced fields `Instance.pid` and `Instance.alternateIdentifier`<br>2. `LicenseComparator` renamed as `AccessRightComparator`<br>3. introduced `AccessRight` model class defining the `OpenAccessRoute` field to keep track of the OpenAccess color at the `Instance` level<br>4. `ExternalReference` cleanup (removed description, added alternateLabel(s))<br>5. added several ModelConstants<br>[Aggregation]<br>7. introduced MDStore record model classes<br>8. Introduced ORCID specific model classes | production |
|
||||||
|
| 2.2.4 | 1. ORCID specific model classes backported in the version used in PROD<br>2. added constant for dnet:externalReference_typologies<br>3. added constant for ORCID datasource name<br>4. `Result.mergeFrom` handles field `dateOfAcceptance` | production |
|
||||||
11
README.md
11
README.md
|
|
@ -2,10 +2,11 @@ Description of the project
|
||||||
--------------------------
|
--------------------------
|
||||||
This project defines **object schemas** of the OpenAIRE main entities and the relationships that intercur among them.
|
This project defines **object schemas** of the OpenAIRE main entities and the relationships that intercur among them.
|
||||||
Namely it defines the model for
|
Namely it defines the model for
|
||||||
|
|
||||||
- **research product (result)** which subclasses in publication, dataset, other research product, software
|
- the graph internal representation, defined under the package `eu.dnetlib.dhp.schema.oaf`
|
||||||
- **data source** object describing the data provider (institutional repository, aggregators, cris systems)
|
- the public graph dump representations, defined under the package `eu.dnetlib.dhp.schema.dump.oaf`
|
||||||
- **organization** research bodies managing a data source or participating to a research project
|
- the scholexplorer content representation, defined under the package `eu.dnetlib.dhp.schema.sx`
|
||||||
- **project** research project
|
- the contents acquired from the netadata aggregation subsystem, defined under the package `eu.dnetlib.dhp.schema.mdstore`
|
||||||
|
- the ORCID common schemas, defined under the package `eu.dnetlib.dhp.schema.orcid`
|
||||||
|
|
||||||
Te serialization of such objects (data store files) are used to pass data between workflow nodes in the processing pipeline.
|
Te serialization of such objects (data store files) are used to pass data between workflow nodes in the processing pipeline.
|
||||||
|
|
|
||||||
2
pom.xml
2
pom.xml
|
|
@ -5,7 +5,7 @@
|
||||||
<groupId>eu.dnetlib.dhp</groupId>
|
<groupId>eu.dnetlib.dhp</groupId>
|
||||||
<artifactId>dhp-schemas</artifactId>
|
<artifactId>dhp-schemas</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<version>2.6.14-SNAPSHOT</version>
|
<version>2.7.15-SNAPSHOT</version>
|
||||||
|
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
|
|
|
||||||
|
|
@ -55,54 +55,82 @@ public class ModelConstants {
|
||||||
public static final String SOFTWARE_RESULTTYPE_CLASSID = "software";
|
public static final String SOFTWARE_RESULTTYPE_CLASSID = "software";
|
||||||
public static final String ORP_RESULTTYPE_CLASSID = "other";
|
public static final String ORP_RESULTTYPE_CLASSID = "other";
|
||||||
|
|
||||||
public static final String RESULT_RESULT = "resultResult";
|
public static final String RESULT_RESULT = "resultResult"; // relType
|
||||||
/**
|
/**
|
||||||
* @deprecated Use {@link ModelConstants#RELATIONSHIP} instead.
|
* @deprecated Use {@link ModelConstants#RELATIONSHIP} instead.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public static final String PUBLICATION_DATASET = "publicationDataset";
|
public static final String PUBLICATION_DATASET = "publicationDataset"; // subreltype
|
||||||
public static final String IS_RELATED_TO = "isRelatedTo";
|
|
||||||
public static final String SUPPLEMENT = "supplement";
|
|
||||||
public static final String IS_SUPPLEMENT_TO = "isSupplementTo";
|
|
||||||
public static final String IS_SUPPLEMENTED_BY = "isSupplementedBy";
|
|
||||||
public static final String PART = "part";
|
|
||||||
public static final String IS_PART_OF = "isPartOf";
|
|
||||||
public static final String HAS_PART = "hasPart";
|
|
||||||
public static final String RELATIONSHIP = "relationship";
|
|
||||||
public static final String CITATION = "citation";
|
|
||||||
public static final String CITES = "cites";
|
|
||||||
public static final String IS_CITED_BY = "isCitedBy";
|
|
||||||
public static final String REVIEW = "review"; // subreltype
|
|
||||||
public static final String REVIEWS = "reviews";
|
|
||||||
public static final String IS_REVIEWED_BY = "isReviewedBy";
|
|
||||||
|
|
||||||
public static final String RESULT_PROJECT = "resultProject";
|
public static final String SUPPLEMENT = "supplement"; // subreltype
|
||||||
public static final String OUTCOME = "outcome";
|
public static final String IS_SUPPLEMENT_TO = "IsSupplementTo";
|
||||||
|
public static final String IS_SUPPLEMENTED_BY = "IsSupplementedBy";
|
||||||
|
|
||||||
|
public static final String PART = "part"; // subreltype
|
||||||
|
public static final String IS_PART_OF = "IsPartOf";
|
||||||
|
public static final String HAS_PART = "HasPart";
|
||||||
|
|
||||||
|
public static final String RELATIONSHIP = "relationship"; // subreltype
|
||||||
|
|
||||||
|
public static final String IS_RELATED_TO = "isRelatedTo";
|
||||||
|
public static final String IS_IDENTICAL_TO = "IsIdenticalTo";
|
||||||
|
|
||||||
|
public static final String REFERENCES = "References";
|
||||||
|
public static final String IS_REFERENCED_BY = "IsReferencedBy";
|
||||||
|
public static final String CONTINUES = "Continues";
|
||||||
|
public static final String IS_CONTINUED_BY = "IsContinuedBy";
|
||||||
|
public static final String DOCUMENTS = "Documents";
|
||||||
|
public static final String IS_DOCUMENTED_BY = "IsDocumentedBy";
|
||||||
|
public static final String IS_SOURCE_OF = "IsSourceOf";
|
||||||
|
public static final String IS_DERIVED_FROM = "IsDerivedFrom";
|
||||||
|
public static final String COMPILES = "Compiles";
|
||||||
|
public static final String IS_COMPILED_BY = "IsCompiledBy";
|
||||||
|
|
||||||
|
public static final String CITATION = "citation"; // subreltype
|
||||||
|
public static final String CITES = "Cites";
|
||||||
|
public static final String IS_CITED_BY = "IsCitedBy";
|
||||||
|
|
||||||
|
public static final String REVIEW = "review"; // subreltype
|
||||||
|
public static final String REVIEWS = "Reviews";
|
||||||
|
public static final String IS_REVIEWED_BY = "IsReviewedBy";
|
||||||
|
|
||||||
|
public static final String VERSION = "version"; // subreltype
|
||||||
|
public static final String IS_VERSION_OF = "IsVersionOf";
|
||||||
|
public static final String HAS_VERSION = "HasVersion";
|
||||||
|
public static final String IS_PREVIOUS_VERSION_OF = "IsPreviousVersionOf";
|
||||||
|
public static final String IS_NEW_VERSION_OF = "IsNewVersionOf";
|
||||||
|
public static final String IS_VARIANT_FORM_OF = "IsVariantFormOf";
|
||||||
|
public static final String IS_ORIGINAL_FORM_OF = "IsOriginalFormOf";
|
||||||
|
public static final String IS_OBSOLETED_BY = "IsObsoletedBy";
|
||||||
|
public static final String OBSOLETES = "Obsoletes";
|
||||||
|
|
||||||
|
public static final String RESULT_PROJECT = "resultProject"; // relType
|
||||||
|
public static final String OUTCOME = "outcome"; // subreltype
|
||||||
public static final String IS_PRODUCED_BY = "isProducedBy";
|
public static final String IS_PRODUCED_BY = "isProducedBy";
|
||||||
public static final String PRODUCES = "produces";
|
public static final String PRODUCES = "produces";
|
||||||
|
|
||||||
public static final String DATASOURCE_ORGANIZATION = "datasourceOrganization";
|
public static final String DATASOURCE_ORGANIZATION = "datasourceOrganization"; // relType
|
||||||
public static final String PROVISION = "provision";
|
public static final String PROVISION = "provision"; // subreltype
|
||||||
public static final String IS_PROVIDED_BY = "isProvidedBy";
|
public static final String IS_PROVIDED_BY = "isProvidedBy";
|
||||||
public static final String PROVIDES = "provides";
|
public static final String PROVIDES = "provides";
|
||||||
|
|
||||||
public static final String PROJECT_ORGANIZATION = "projectOrganization";
|
public static final String PROJECT_ORGANIZATION = "projectOrganization"; // relType
|
||||||
public static final String PARTICIPATION = "participation";
|
public static final String PARTICIPATION = "participation"; // subreltype
|
||||||
public static final String HAS_PARTICIPANT = "hasParticipant";
|
public static final String HAS_PARTICIPANT = "hasParticipant";
|
||||||
public static final String IS_PARTICIPANT = "isParticipant";
|
public static final String IS_PARTICIPANT = "isParticipant";
|
||||||
|
|
||||||
public static final String RESULT_ORGANIZATION = "resultOrganization";
|
public static final String RESULT_ORGANIZATION = "resultOrganization"; // relType
|
||||||
public static final String AFFILIATION = "affiliation";
|
public static final String AFFILIATION = "affiliation"; // subreltype
|
||||||
public static final String IS_AUTHOR_INSTITUTION_OF = "isAuthorInstitutionOf";
|
public static final String IS_AUTHOR_INSTITUTION_OF = "isAuthorInstitutionOf";
|
||||||
public static final String HAS_AUTHOR_INSTITUTION = "hasAuthorInstitution";
|
public static final String HAS_AUTHOR_INSTITUTION = "hasAuthorInstitution";
|
||||||
|
|
||||||
public static final String ORG_ORG_RELTYPE = "organizationOrganization";
|
public static final String ORG_ORG_RELTYPE = "organizationOrganization"; // relType
|
||||||
|
|
||||||
public static final String DEDUP = "dedup";
|
public static final String DEDUP = "dedup"; // subreltype
|
||||||
public static final String MERGES = "merges";
|
public static final String MERGES = "merges";
|
||||||
public static final String IS_MERGED_IN = "isMergedIn";
|
public static final String IS_MERGED_IN = "isMergedIn";
|
||||||
|
|
||||||
public static final String SIMILARITY = "similarity";
|
public static final String SIMILARITY = "similarity"; // subreltype
|
||||||
public static final String IS_SIMILAR_TO = "isSimilarTo";
|
public static final String IS_SIMILAR_TO = "isSimilarTo";
|
||||||
|
|
||||||
public static final String IS_DIFFERENT_FROM = "isDifferentFrom";
|
public static final String IS_DIFFERENT_FROM = "isDifferentFrom";
|
||||||
|
|
|
||||||
|
|
@ -46,18 +46,27 @@ public class CleaningFunctions {
|
||||||
* @return the PID containing the normalised value.
|
* @return the PID containing the normalised value.
|
||||||
*/
|
*/
|
||||||
public static StructuredProperty normalizePidValue(StructuredProperty pid) {
|
public static StructuredProperty normalizePidValue(StructuredProperty pid) {
|
||||||
String value = Optional
|
pid.setValue(
|
||||||
.ofNullable(pid.getValue())
|
normalizePidValue(
|
||||||
.map(String::trim)
|
pid.getQualifier().getClassid(),
|
||||||
.orElseThrow(() -> new IllegalArgumentException("PID value cannot be empty"));
|
pid.getValue()));
|
||||||
switch (pid.getQualifier().getClassid()) {
|
|
||||||
|
|
||||||
// TODO add cleaning for more PID types as needed
|
|
||||||
case "doi":
|
|
||||||
pid.setValue(value.toLowerCase().replaceFirst(DOI_PREFIX_REGEX, DOI_PREFIX));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return pid;
|
return pid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static String normalizePidValue(String pidType, String pidValue) {
|
||||||
|
String value = Optional
|
||||||
|
.ofNullable(pidValue)
|
||||||
|
.map(String::trim)
|
||||||
|
.orElseThrow(() -> new IllegalArgumentException("PID value cannot be empty"));
|
||||||
|
|
||||||
|
switch (pidType) {
|
||||||
|
|
||||||
|
// TODO add cleaning for more PID types as needed
|
||||||
|
case "doi":
|
||||||
|
return value.toLowerCase().replaceFirst(DOI_PREFIX_REGEX, DOI_PREFIX);
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -164,9 +164,7 @@ public class IdentifierFactory implements Serializable {
|
||||||
.stream()
|
.stream()
|
||||||
// filter away PIDs provided by a DS that is not considered an authority for the
|
// filter away PIDs provided by a DS that is not considered an authority for the
|
||||||
// given PID Type
|
// given PID Type
|
||||||
.filter(p -> {
|
.filter(p -> shouldFilterPid(collectedFrom, p, mapHandles))
|
||||||
return shouldFilterPid(collectedFrom, p, mapHandles);
|
|
||||||
})
|
|
||||||
.map(CleaningFunctions::normalizePidValue)
|
.map(CleaningFunctions::normalizePidValue)
|
||||||
.filter(CleaningFunctions::pidFilter))
|
.filter(CleaningFunctions::pidFilter))
|
||||||
.orElse(Stream.empty());
|
.orElse(Stream.empty());
|
||||||
|
|
@ -193,13 +191,17 @@ public class IdentifierFactory implements Serializable {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static <T extends OafEntity> String idFromPid(T entity, StructuredProperty s, boolean md5) {
|
private static <T extends OafEntity> String idFromPid(T entity, StructuredProperty s, boolean md5) {
|
||||||
|
return idFromPid(ModelSupport.getIdPrefix(entity.getClass()), s.getQualifier().getClassid(), s.getValue(), md5);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String idFromPid(String numericPrefix, String pidType, String pidValue, boolean md5) {
|
||||||
return new StringBuilder()
|
return new StringBuilder()
|
||||||
.append(ModelSupport.getIdPrefix(entity.getClass()))
|
.append(numericPrefix)
|
||||||
.append(ID_PREFIX_SEPARATOR)
|
.append(ID_PREFIX_SEPARATOR)
|
||||||
.append(createPrefix(s.getQualifier().getClassid()))
|
.append(createPrefix(pidType))
|
||||||
.append(ID_SEPARATOR)
|
.append(ID_SEPARATOR)
|
||||||
.append(md5 ? md5(s.getValue()) : s.getValue())
|
.append(md5 ? md5(pidValue) : pidValue)
|
||||||
.toString();
|
.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
// create the prefix (length = 12)
|
// create the prefix (length = 12)
|
||||||
|
|
|
||||||
|
|
@ -1,89 +0,0 @@
|
||||||
|
|
||||||
package eu.dnetlib.dhp.schema.scholexplorer;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
|
||||||
|
|
||||||
import eu.dnetlib.dhp.schema.oaf.Dataset;
|
|
||||||
import eu.dnetlib.dhp.schema.oaf.OafEntity;
|
|
||||||
|
|
||||||
public class DLIDataset extends Dataset {
|
|
||||||
|
|
||||||
private String originalObjIdentifier;
|
|
||||||
|
|
||||||
private List<ProvenaceInfo> dlicollectedfrom;
|
|
||||||
|
|
||||||
private String completionStatus;
|
|
||||||
|
|
||||||
public String getCompletionStatus() {
|
|
||||||
return completionStatus;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setCompletionStatus(String completionStatus) {
|
|
||||||
this.completionStatus = completionStatus;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<ProvenaceInfo> getDlicollectedfrom() {
|
|
||||||
return dlicollectedfrom;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDlicollectedfrom(List<ProvenaceInfo> dlicollectedfrom) {
|
|
||||||
this.dlicollectedfrom = dlicollectedfrom;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getOriginalObjIdentifier() {
|
|
||||||
return originalObjIdentifier;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setOriginalObjIdentifier(String originalObjIdentifier) {
|
|
||||||
this.originalObjIdentifier = originalObjIdentifier;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mergeFrom(OafEntity e) {
|
|
||||||
super.mergeFrom(e);
|
|
||||||
DLIDataset p = (DLIDataset) e;
|
|
||||||
if (StringUtils.isBlank(completionStatus) && StringUtils.isNotBlank(p.completionStatus))
|
|
||||||
completionStatus = p.completionStatus;
|
|
||||||
if ("complete".equalsIgnoreCase(p.completionStatus))
|
|
||||||
completionStatus = "complete";
|
|
||||||
dlicollectedfrom = mergeProvenance(dlicollectedfrom, p.getDlicollectedfrom());
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<ProvenaceInfo> mergeProvenance(
|
|
||||||
final List<ProvenaceInfo> a, final List<ProvenaceInfo> b) {
|
|
||||||
Map<String, ProvenaceInfo> result = new HashMap<>();
|
|
||||||
if (a != null)
|
|
||||||
a
|
|
||||||
.forEach(
|
|
||||||
p -> {
|
|
||||||
if (p != null && StringUtils.isNotBlank(p.getId()) && result.containsKey(p.getId())) {
|
|
||||||
if ("incomplete".equalsIgnoreCase(result.get(p.getId()).getCompletionStatus())
|
|
||||||
&& StringUtils.isNotBlank(p.getCompletionStatus())) {
|
|
||||||
result.put(p.getId(), p);
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (p != null && p.getId() != null && !result.containsKey(p.getId()))
|
|
||||||
result.put(p.getId(), p);
|
|
||||||
});
|
|
||||||
if (b != null)
|
|
||||||
b
|
|
||||||
.forEach(
|
|
||||||
p -> {
|
|
||||||
if (p != null && StringUtils.isNotBlank(p.getId()) && result.containsKey(p.getId())) {
|
|
||||||
if ("incomplete".equalsIgnoreCase(result.get(p.getId()).getCompletionStatus())
|
|
||||||
&& StringUtils.isNotBlank(p.getCompletionStatus())) {
|
|
||||||
result.put(p.getId(), p);
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (p != null && p.getId() != null && !result.containsKey(p.getId()))
|
|
||||||
result.put(p.getId(), p);
|
|
||||||
});
|
|
||||||
|
|
||||||
return new ArrayList<>(result.values());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,87 +0,0 @@
|
||||||
|
|
||||||
package eu.dnetlib.dhp.schema.scholexplorer;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
|
||||||
|
|
||||||
import eu.dnetlib.dhp.schema.oaf.OafEntity;
|
|
||||||
import eu.dnetlib.dhp.schema.oaf.Publication;
|
|
||||||
|
|
||||||
public class DLIPublication extends Publication implements Serializable {
|
|
||||||
|
|
||||||
private String originalObjIdentifier;
|
|
||||||
|
|
||||||
private List<ProvenaceInfo> dlicollectedfrom;
|
|
||||||
|
|
||||||
private String completionStatus;
|
|
||||||
|
|
||||||
public String getCompletionStatus() {
|
|
||||||
return completionStatus;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setCompletionStatus(String completionStatus) {
|
|
||||||
this.completionStatus = completionStatus;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<ProvenaceInfo> getDlicollectedfrom() {
|
|
||||||
return dlicollectedfrom;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDlicollectedfrom(List<ProvenaceInfo> dlicollectedfrom) {
|
|
||||||
this.dlicollectedfrom = dlicollectedfrom;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getOriginalObjIdentifier() {
|
|
||||||
return originalObjIdentifier;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setOriginalObjIdentifier(String originalObjIdentifier) {
|
|
||||||
this.originalObjIdentifier = originalObjIdentifier;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mergeFrom(OafEntity e) {
|
|
||||||
super.mergeFrom(e);
|
|
||||||
DLIPublication p = (DLIPublication) e;
|
|
||||||
if (StringUtils.isBlank(completionStatus) && StringUtils.isNotBlank(p.completionStatus))
|
|
||||||
completionStatus = p.completionStatus;
|
|
||||||
if ("complete".equalsIgnoreCase(p.completionStatus))
|
|
||||||
completionStatus = "complete";
|
|
||||||
dlicollectedfrom = mergeProvenance(dlicollectedfrom, p.getDlicollectedfrom());
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<ProvenaceInfo> mergeProvenance(
|
|
||||||
final List<ProvenaceInfo> a, final List<ProvenaceInfo> b) {
|
|
||||||
Map<String, ProvenaceInfo> result = new HashMap<>();
|
|
||||||
if (a != null)
|
|
||||||
a
|
|
||||||
.forEach(
|
|
||||||
p -> {
|
|
||||||
if (p != null && StringUtils.isNotBlank(p.getId()) && result.containsKey(p.getId())) {
|
|
||||||
if ("incomplete".equalsIgnoreCase(result.get(p.getId()).getCompletionStatus())
|
|
||||||
&& StringUtils.isNotBlank(p.getCompletionStatus())) {
|
|
||||||
result.put(p.getId(), p);
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (p != null && p.getId() != null && !result.containsKey(p.getId()))
|
|
||||||
result.put(p.getId(), p);
|
|
||||||
});
|
|
||||||
if (b != null)
|
|
||||||
b
|
|
||||||
.forEach(
|
|
||||||
p -> {
|
|
||||||
if (p != null && StringUtils.isNotBlank(p.getId()) && result.containsKey(p.getId())) {
|
|
||||||
if ("incomplete".equalsIgnoreCase(result.get(p.getId()).getCompletionStatus())
|
|
||||||
&& StringUtils.isNotBlank(p.getCompletionStatus())) {
|
|
||||||
result.put(p.getId(), p);
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (p != null && p.getId() != null && !result.containsKey(p.getId()))
|
|
||||||
result.put(p.getId(), p);
|
|
||||||
});
|
|
||||||
|
|
||||||
return new ArrayList<>(result.values());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,132 +0,0 @@
|
||||||
|
|
||||||
package eu.dnetlib.dhp.schema.scholexplorer;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.util.*;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
|
||||||
|
|
||||||
import eu.dnetlib.dhp.schema.oaf.Oaf;
|
|
||||||
import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
|
|
||||||
|
|
||||||
public class DLIUnknown extends Oaf implements Serializable {
|
|
||||||
|
|
||||||
private String id;
|
|
||||||
|
|
||||||
private List<StructuredProperty> pid;
|
|
||||||
|
|
||||||
private String dateofcollection;
|
|
||||||
|
|
||||||
private String dateoftransformation;
|
|
||||||
|
|
||||||
private List<ProvenaceInfo> dlicollectedfrom;
|
|
||||||
|
|
||||||
private String completionStatus = "incomplete";
|
|
||||||
|
|
||||||
public String getCompletionStatus() {
|
|
||||||
return completionStatus;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setCompletionStatus(String completionStatus) {
|
|
||||||
this.completionStatus = completionStatus;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<ProvenaceInfo> getDlicollectedfrom() {
|
|
||||||
return dlicollectedfrom;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDlicollectedfrom(List<ProvenaceInfo> dlicollectedfrom) {
|
|
||||||
this.dlicollectedfrom = dlicollectedfrom;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setId(String id) {
|
|
||||||
this.id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<StructuredProperty> getPid() {
|
|
||||||
return pid;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPid(List<StructuredProperty> pid) {
|
|
||||||
this.pid = pid;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getDateofcollection() {
|
|
||||||
return dateofcollection;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDateofcollection(String dateofcollection) {
|
|
||||||
this.dateofcollection = dateofcollection;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getDateoftransformation() {
|
|
||||||
return dateoftransformation;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDateoftransformation(String dateoftransformation) {
|
|
||||||
this.dateoftransformation = dateoftransformation;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void mergeFrom(DLIUnknown p) {
|
|
||||||
if ("complete".equalsIgnoreCase(p.completionStatus))
|
|
||||||
completionStatus = "complete";
|
|
||||||
dlicollectedfrom = mergeProvenance(dlicollectedfrom, p.getDlicollectedfrom());
|
|
||||||
if (StringUtils.isEmpty(id) && StringUtils.isNoneEmpty(p.getId()))
|
|
||||||
id = p.getId();
|
|
||||||
if (StringUtils.isEmpty(dateofcollection) && StringUtils.isNoneEmpty(p.getDateofcollection()))
|
|
||||||
dateofcollection = p.getDateofcollection();
|
|
||||||
|
|
||||||
if (StringUtils.isEmpty(dateoftransformation) && StringUtils.isNoneEmpty(p.getDateoftransformation()))
|
|
||||||
dateofcollection = p.getDateoftransformation();
|
|
||||||
pid = mergeLists(pid, p.getPid());
|
|
||||||
}
|
|
||||||
|
|
||||||
protected <T> List<T> mergeLists(final List<T>... lists) {
|
|
||||||
|
|
||||||
return Arrays
|
|
||||||
.stream(lists)
|
|
||||||
.filter(Objects::nonNull)
|
|
||||||
.flatMap(List::stream)
|
|
||||||
.filter(Objects::nonNull)
|
|
||||||
.distinct()
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<ProvenaceInfo> mergeProvenance(
|
|
||||||
final List<ProvenaceInfo> a, final List<ProvenaceInfo> b) {
|
|
||||||
Map<String, ProvenaceInfo> result = new HashMap<>();
|
|
||||||
if (a != null)
|
|
||||||
a
|
|
||||||
.forEach(
|
|
||||||
p -> {
|
|
||||||
if (p != null && StringUtils.isNotBlank(p.getId()) && result.containsKey(p.getId())) {
|
|
||||||
if ("incomplete".equalsIgnoreCase(result.get(p.getId()).getCompletionStatus())
|
|
||||||
&& StringUtils.isNotBlank(p.getCompletionStatus())) {
|
|
||||||
result.put(p.getId(), p);
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (p != null && p.getId() != null && !result.containsKey(p.getId()))
|
|
||||||
result.put(p.getId(), p);
|
|
||||||
});
|
|
||||||
if (b != null)
|
|
||||||
b
|
|
||||||
.forEach(
|
|
||||||
p -> {
|
|
||||||
if (p != null && StringUtils.isNotBlank(p.getId()) && result.containsKey(p.getId())) {
|
|
||||||
if ("incomplete".equalsIgnoreCase(result.get(p.getId()).getCompletionStatus())
|
|
||||||
&& StringUtils.isNotBlank(p.getCompletionStatus())) {
|
|
||||||
result.put(p.getId(), p);
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (p != null && p.getId() != null && !result.containsKey(p.getId()))
|
|
||||||
result.put(p.getId(), p);
|
|
||||||
});
|
|
||||||
|
|
||||||
return new ArrayList<>(result.values());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,47 +0,0 @@
|
||||||
|
|
||||||
package eu.dnetlib.dhp.schema.scholexplorer;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
|
|
||||||
public class ProvenaceInfo implements Serializable {
|
|
||||||
|
|
||||||
private String id;
|
|
||||||
|
|
||||||
private String name;
|
|
||||||
|
|
||||||
private String completionStatus;
|
|
||||||
|
|
||||||
private String collectionMode = "collected";
|
|
||||||
|
|
||||||
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 String getCompletionStatus() {
|
|
||||||
return completionStatus;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setCompletionStatus(String completionStatus) {
|
|
||||||
this.completionStatus = completionStatus;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getCollectionMode() {
|
|
||||||
return collectionMode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setCollectionMode(String collectionMode) {
|
|
||||||
this.collectionMode = collectionMode;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package eu.dnetlib.dhp.schema.scholexplorer
|
package eu.dnetlib.dhp.schema.sx
|
||||||
|
|
||||||
import eu.dnetlib.dhp.schema.common.ModelConstants
|
import eu.dnetlib.dhp.schema.common.ModelConstants
|
||||||
import eu.dnetlib.dhp.schema.oaf.{AccessRight, DataInfo, Field, KeyValue, Qualifier, StructuredProperty}
|
import eu.dnetlib.dhp.schema.oaf.{AccessRight, DataInfo, Field, KeyValue, Qualifier, StructuredProperty}
|
||||||
|
|
@ -0,0 +1,77 @@
|
||||||
|
|
||||||
|
package eu.dnetlib.dhp.schema.sx.scholix;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class Scholix implements Serializable {
|
||||||
|
private String publicationDate;
|
||||||
|
|
||||||
|
private List<ScholixEntityId> publisher;
|
||||||
|
|
||||||
|
private List<ScholixEntityId> linkprovider;
|
||||||
|
|
||||||
|
private ScholixRelationship relationship;
|
||||||
|
|
||||||
|
private ScholixResource source;
|
||||||
|
|
||||||
|
private ScholixResource target;
|
||||||
|
|
||||||
|
private String identifier;
|
||||||
|
|
||||||
|
public String getPublicationDate() {
|
||||||
|
return publicationDate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPublicationDate(String publicationDate) {
|
||||||
|
this.publicationDate = publicationDate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<ScholixEntityId> getPublisher() {
|
||||||
|
return publisher;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPublisher(List<ScholixEntityId> publisher) {
|
||||||
|
this.publisher = publisher;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<ScholixEntityId> getLinkprovider() {
|
||||||
|
return linkprovider;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLinkprovider(List<ScholixEntityId> linkprovider) {
|
||||||
|
this.linkprovider = linkprovider;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScholixRelationship getRelationship() {
|
||||||
|
return relationship;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRelationship(ScholixRelationship relationship) {
|
||||||
|
this.relationship = relationship;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScholixResource getSource() {
|
||||||
|
return source;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSource(ScholixResource source) {
|
||||||
|
this.source = source;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScholixResource getTarget() {
|
||||||
|
return target;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTarget(ScholixResource target) {
|
||||||
|
this.target = target;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getIdentifier() {
|
||||||
|
return identifier;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setIdentifier(String identifier) {
|
||||||
|
this.identifier = identifier;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
|
||||||
|
package eu.dnetlib.dhp.schema.sx.scholix;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
public class ScholixCollectedFrom implements Serializable {
|
||||||
|
|
||||||
|
private ScholixEntityId provider;
|
||||||
|
private String provisionMode;
|
||||||
|
private String completionStatus;
|
||||||
|
|
||||||
|
public ScholixCollectedFrom() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScholixCollectedFrom(
|
||||||
|
ScholixEntityId provider, String provisionMode, String completionStatus) {
|
||||||
|
this.provider = provider;
|
||||||
|
this.provisionMode = provisionMode;
|
||||||
|
this.completionStatus = completionStatus;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScholixEntityId getProvider() {
|
||||||
|
return provider;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setProvider(ScholixEntityId provider) {
|
||||||
|
this.provider = provider;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getProvisionMode() {
|
||||||
|
return provisionMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setProvisionMode(String provisionMode) {
|
||||||
|
this.provisionMode = provisionMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCompletionStatus() {
|
||||||
|
return completionStatus;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCompletionStatus(String completionStatus) {
|
||||||
|
this.completionStatus = completionStatus;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,34 @@
|
||||||
|
|
||||||
|
package eu.dnetlib.dhp.schema.sx.scholix;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class ScholixEntityId implements Serializable {
|
||||||
|
private String name;
|
||||||
|
private List<ScholixIdentifier> identifiers;
|
||||||
|
|
||||||
|
public ScholixEntityId() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScholixEntityId(String name, List<ScholixIdentifier> identifiers) {
|
||||||
|
this.name = name;
|
||||||
|
this.identifiers = identifiers;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<ScholixIdentifier> getIdentifiers() {
|
||||||
|
return identifiers;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setIdentifiers(List<ScholixIdentifier> identifiers) {
|
||||||
|
this.identifiers = identifiers;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,59 @@
|
||||||
|
|
||||||
|
package eu.dnetlib.dhp.schema.sx.scholix;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
public class ScholixIdentifier implements Serializable {
|
||||||
|
private String identifier;
|
||||||
|
private String schema;
|
||||||
|
private String url;
|
||||||
|
|
||||||
|
public ScholixIdentifier() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScholixIdentifier(String identifier, String schema, String url) {
|
||||||
|
this.identifier = identifier;
|
||||||
|
this.schema = schema;
|
||||||
|
this.url = url;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public String getUrl() {
|
||||||
|
return url;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUrl(String url) {
|
||||||
|
this.url = url;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (this == o) return true;
|
||||||
|
if (o == null || getClass() != o.getClass()) return false;
|
||||||
|
ScholixIdentifier that = (ScholixIdentifier) o;
|
||||||
|
return identifier.equals(that.identifier) && schema.equals(that.schema);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(identifier, schema);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getIdentifier() {
|
||||||
|
return identifier;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setIdentifier(String identifier) {
|
||||||
|
this.identifier = identifier;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getSchema() {
|
||||||
|
return schema;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSchema(String schema) {
|
||||||
|
this.schema = schema;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,43 @@
|
||||||
|
|
||||||
|
package eu.dnetlib.dhp.schema.sx.scholix;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
public class ScholixRelationship implements Serializable {
|
||||||
|
private String name;
|
||||||
|
private String schema;
|
||||||
|
private String inverse;
|
||||||
|
|
||||||
|
public ScholixRelationship() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScholixRelationship(String name, String schema, String inverse) {
|
||||||
|
this.name = name;
|
||||||
|
this.schema = schema;
|
||||||
|
this.inverse = inverse;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getSchema() {
|
||||||
|
return schema;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSchema(String schema) {
|
||||||
|
this.schema = schema;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getInverse() {
|
||||||
|
return inverse;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setInverse(String inverse) {
|
||||||
|
this.inverse = inverse;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,90 @@
|
||||||
|
|
||||||
|
package eu.dnetlib.dhp.schema.sx.scholix;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class ScholixResource implements Serializable {
|
||||||
|
|
||||||
|
private List<ScholixIdentifier> identifier;
|
||||||
|
private String dnetIdentifier;
|
||||||
|
private String objectType;
|
||||||
|
private String objectSubType;
|
||||||
|
private String title;
|
||||||
|
private List<ScholixEntityId> creator;
|
||||||
|
private String publicationDate;
|
||||||
|
private List<ScholixEntityId> publisher;
|
||||||
|
private List<ScholixCollectedFrom> collectedFrom;
|
||||||
|
|
||||||
|
public List<ScholixIdentifier> getIdentifier() {
|
||||||
|
return identifier;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setIdentifier(List<ScholixIdentifier> identifier) {
|
||||||
|
this.identifier = identifier;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDnetIdentifier() {
|
||||||
|
return dnetIdentifier;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDnetIdentifier(String dnetIdentifier) {
|
||||||
|
this.dnetIdentifier = dnetIdentifier;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getObjectType() {
|
||||||
|
return objectType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setObjectType(String objectType) {
|
||||||
|
this.objectType = objectType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getObjectSubType() {
|
||||||
|
return objectSubType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setObjectSubType(String objectSubType) {
|
||||||
|
this.objectSubType = objectSubType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getTitle() {
|
||||||
|
return title;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTitle(String title) {
|
||||||
|
this.title = title;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<ScholixEntityId> getCreator() {
|
||||||
|
return creator;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCreator(List<ScholixEntityId> creator) {
|
||||||
|
this.creator = creator;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPublicationDate() {
|
||||||
|
return publicationDate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPublicationDate(String publicationDate) {
|
||||||
|
this.publicationDate = publicationDate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<ScholixEntityId> getPublisher() {
|
||||||
|
return publisher;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPublisher(List<ScholixEntityId> publisher) {
|
||||||
|
this.publisher = publisher;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<ScholixCollectedFrom> getCollectedFrom() {
|
||||||
|
return collectedFrom;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCollectedFrom(List<ScholixCollectedFrom> collectedFrom) {
|
||||||
|
this.collectedFrom = collectedFrom;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,58 @@
|
||||||
|
|
||||||
|
package eu.dnetlib.dhp.schema.sx.summary;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
public class CollectedFromType implements Serializable {
|
||||||
|
|
||||||
|
private String datasourceName;
|
||||||
|
private String datasourceId;
|
||||||
|
private String completionStatus;
|
||||||
|
|
||||||
|
public CollectedFromType() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public CollectedFromType(String datasourceName, String datasourceId, String completionStatus) {
|
||||||
|
this.datasourceName = datasourceName;
|
||||||
|
this.datasourceId = datasourceId;
|
||||||
|
this.completionStatus = completionStatus;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (this == o) return true;
|
||||||
|
if (o == null || getClass() != o.getClass()) return false;
|
||||||
|
CollectedFromType that = (CollectedFromType) o;
|
||||||
|
return Objects.equals(datasourceName, that.datasourceName) && Objects.equals(datasourceId, that.datasourceId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(datasourceName, datasourceId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDatasourceName() {
|
||||||
|
return datasourceName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDatasourceName(String datasourceName) {
|
||||||
|
this.datasourceName = datasourceName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDatasourceId() {
|
||||||
|
return datasourceId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDatasourceId(String datasourceId) {
|
||||||
|
this.datasourceId = datasourceId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCompletionStatus() {
|
||||||
|
return completionStatus;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCompletionStatus(String completionStatus) {
|
||||||
|
this.completionStatus = completionStatus;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,33 @@
|
||||||
|
|
||||||
|
package eu.dnetlib.dhp.schema.sx.summary;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
public class SchemeValue implements Serializable {
|
||||||
|
private String scheme;
|
||||||
|
private String value;
|
||||||
|
|
||||||
|
public SchemeValue() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public SchemeValue(String scheme, String value) {
|
||||||
|
this.scheme = scheme;
|
||||||
|
this.value = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getScheme() {
|
||||||
|
return scheme;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setScheme(String scheme) {
|
||||||
|
this.scheme = scheme;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getValue() {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setValue(String value) {
|
||||||
|
this.value = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,140 @@
|
||||||
|
|
||||||
|
package eu.dnetlib.dhp.schema.sx.summary;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import eu.dnetlib.dhp.schema.sx.scholix.ScholixIdentifier;
|
||||||
|
|
||||||
|
public class ScholixSummary implements Serializable {
|
||||||
|
private String id;
|
||||||
|
private List<ScholixIdentifier> localIdentifier;
|
||||||
|
private Typology typology;
|
||||||
|
private String subType;
|
||||||
|
private List<String> title;
|
||||||
|
private List<String> author;
|
||||||
|
private List<String> date;
|
||||||
|
private String description;
|
||||||
|
private List<SchemeValue> subject;
|
||||||
|
private List<String> publisher;
|
||||||
|
private long relatedPublications;
|
||||||
|
private long relatedDatasets;
|
||||||
|
private long relatedUnknown;
|
||||||
|
private List<CollectedFromType> datasources;
|
||||||
|
|
||||||
|
public String getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setId(String id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<ScholixIdentifier> getLocalIdentifier() {
|
||||||
|
return localIdentifier;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLocalIdentifier(List<ScholixIdentifier> localIdentifier) {
|
||||||
|
this.localIdentifier = localIdentifier;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Typology getTypology() {
|
||||||
|
return typology;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTypology(Typology typology) {
|
||||||
|
this.typology = typology;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<String> getTitle() {
|
||||||
|
return title;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTitle(List<String> title) {
|
||||||
|
this.title = title;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<String> getAuthor() {
|
||||||
|
return author;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAuthor(List<String> author) {
|
||||||
|
this.author = author;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<String> getDate() {
|
||||||
|
return date;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDate(List<String> date) {
|
||||||
|
this.date = date;
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonProperty("abstract")
|
||||||
|
public String getDescription() {
|
||||||
|
return description;
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonProperty("abstract")
|
||||||
|
public void setDescription(String description) {
|
||||||
|
this.description = description;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<SchemeValue> getSubject() {
|
||||||
|
return subject;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSubject(List<SchemeValue> subject) {
|
||||||
|
this.subject = subject;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<String> getPublisher() {
|
||||||
|
return publisher;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPublisher(List<String> publisher) {
|
||||||
|
this.publisher = publisher;
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getRelatedPublications() {
|
||||||
|
return relatedPublications;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRelatedPublications(long relatedPublications) {
|
||||||
|
this.relatedPublications = relatedPublications;
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getRelatedDatasets() {
|
||||||
|
return relatedDatasets;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRelatedDatasets(long relatedDatasets) {
|
||||||
|
this.relatedDatasets = relatedDatasets;
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getRelatedUnknown() {
|
||||||
|
return relatedUnknown;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRelatedUnknown(long relatedUnknown) {
|
||||||
|
this.relatedUnknown = relatedUnknown;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<CollectedFromType> getDatasources() {
|
||||||
|
return datasources;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDatasources(List<CollectedFromType> datasources) {
|
||||||
|
this.datasources = datasources;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getSubType() {
|
||||||
|
return subType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSubType(String subType) {
|
||||||
|
this.subType = subType;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
|
||||||
|
package eu.dnetlib.dhp.schema.sx.summary;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
public enum Typology implements Serializable {
|
||||||
|
dataset, publication, unknown
|
||||||
|
}
|
||||||
|
|
@ -1,84 +0,0 @@
|
||||||
|
|
||||||
package eu.dnetlib.dhp.schema.scholexplorer;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collections;
|
|
||||||
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import com.fasterxml.jackson.databind.DeserializationFeature;
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
||||||
import com.fasterxml.jackson.databind.SerializationFeature;
|
|
||||||
|
|
||||||
import eu.dnetlib.dhp.schema.common.ModelConstants;
|
|
||||||
import eu.dnetlib.dhp.schema.oaf.Qualifier;
|
|
||||||
import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
|
|
||||||
|
|
||||||
public class DLItest {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testMergePublication() throws JsonProcessingException {
|
|
||||||
DLIPublication a1 = new DLIPublication();
|
|
||||||
a1.setPid(Arrays.asList(createSP("123456", "pdb", ModelConstants.DNET_PID_TYPES)));
|
|
||||||
a1.setTitle(Collections.singletonList(createSP("Un Titolo", "title", "dnetTitle")));
|
|
||||||
a1.setDlicollectedfrom(Arrays.asList(createCollectedFrom("znd", "Zenodo", "complete")));
|
|
||||||
a1.setCompletionStatus("complete");
|
|
||||||
|
|
||||||
DLIPublication a = new DLIPublication();
|
|
||||||
a
|
|
||||||
.setPid(
|
|
||||||
Arrays
|
|
||||||
.asList(
|
|
||||||
createSP("10.11", "doi", ModelConstants.DNET_PID_TYPES),
|
|
||||||
createSP("123456", "pdb", ModelConstants.DNET_PID_TYPES)));
|
|
||||||
a.setTitle(Collections.singletonList(createSP("A Title", "title", "dnetTitle")));
|
|
||||||
a
|
|
||||||
.setDlicollectedfrom(
|
|
||||||
Arrays
|
|
||||||
.asList(
|
|
||||||
createCollectedFrom("dct", "datacite", "complete"),
|
|
||||||
createCollectedFrom("dct", "datacite", "incomplete")));
|
|
||||||
a.setCompletionStatus("incomplete");
|
|
||||||
|
|
||||||
a.mergeFrom(a1);
|
|
||||||
|
|
||||||
ObjectMapper mapper = new ObjectMapper();
|
|
||||||
System.out.println(mapper.writeValueAsString(a));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testDeserialization() throws IOException {
|
|
||||||
|
|
||||||
final String json = "{\"dataInfo\":{\"invisible\":false,\"inferred\":null,\"deletedbyinference\":false,\"trust\":\"0.9\",\"inferenceprovenance\":null,\"provenanceaction\":null},\"lastupdatetimestamp\":null,\"id\":\"60|bd9352547098929a394655ad1a44a479\",\"originalId\":[\"bd9352547098929a394655ad1a44a479\"],\"collectedfrom\":[{\"key\":\"dli_________::datacite\",\"value\":\"Datasets in Datacite\",\"dataInfo\":null,\"blank\":false}],\"pid\":[{\"value\":\"10.7925/DRS1.DUCHAS_5078760\",\"qualifier\":{\"classid\":\"doi\",\"classname\":\"doi\",\"schemeid\":\"dnet:pid_types\",\"schemename\":\"dnet:pid_types\",\"blank\":false},\"dataInfo\":null}],\"dateofcollection\":\"2020-01-09T08:29:31.885Z\",\"dateoftransformation\":null,\"extraInfo\":null,\"oaiprovenance\":null,\"author\":[{\"fullname\":\"Cathail, S. Ó\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null},{\"fullname\":\"Donnell, Breda Mc\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null},{\"fullname\":\"Ireland. Department of Arts, Culture, and the Gaeltacht\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null},{\"fullname\":\"University College Dublin\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null},{\"fullname\":\"National Folklore Foundation\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null},{\"fullname\":\"Cathail, S. Ó\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null},{\"fullname\":\"Donnell, Breda Mc\",\"name\":null,\"surname\":null,\"rank\":null,\"pid\":null,\"affiliation\":null}],\"resulttype\":null,\"language\":null,\"country\":null,\"subject\":[{\"value\":\"Recreation\",\"qualifier\":{\"classid\":\"dnet:subject\",\"classname\":\"dnet:subject\",\"schemeid\":\"unknown\",\"schemename\":\"unknown\",\"blank\":false},\"dataInfo\":null},{\"value\":\"Entertainments and recreational activities\",\"qualifier\":{\"classid\":\"dnet:subject\",\"classname\":\"dnet:subject\",\"schemeid\":\"unknown\",\"schemename\":\"unknown\",\"blank\":false},\"dataInfo\":null},{\"value\":\"Siamsaíocht agus caitheamh aimsire\",\"qualifier\":{\"classid\":\"dnet:subject\",\"classname\":\"dnet:subject\",\"schemeid\":\"unknown\",\"schemename\":\"unknown\",\"blank\":false},\"dataInfo\":null}],\"title\":[{\"value\":\"Games We Play\",\"qualifier\":null,\"dataInfo\":null}],\"relevantdate\":[{\"value\":\"1938-09-28\",\"qualifier\":{\"classid\":\"date\",\"classname\":\"date\",\"schemeid\":\"dnet::date\",\"schemename\":\"dnet::date\",\"blank\":false},\"dataInfo\":null}],\"description\":[{\"value\":\"Story collected by Breda Mc Donnell, a student at Tenure school (Tinure, Co. Louth) (no informant identified).\",\"dataInfo\":null}],\"dateofacceptance\":null,\"publisher\":{\"value\":\"University College Dublin\",\"dataInfo\":null},\"embargoenddate\":null,\"source\":null,\"fulltext\":null,\"format\":null,\"contributor\":null,\"resourcetype\":null,\"coverage\":null,\"refereed\":null,\"context\":null,\"processingchargeamount\":null,\"processingchargecurrency\":null,\"externalReference\":null,\"instance\":[],\"storagedate\":null,\"device\":null,\"size\":null,\"version\":null,\"lastmetadataupdate\":null,\"metadataversionnumber\":null,\"geolocation\":null,\"dlicollectedfrom\":[{\"id\":\"dli_________::datacite\",\"name\":\"Datasets in Datacite\",\"completionStatus\":\"complete\",\"collectionMode\":\"resolved\"}],\"completionStatus\":\"complete\"}";
|
|
||||||
|
|
||||||
ObjectMapper mapper = new ObjectMapper();
|
|
||||||
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
|
||||||
DLIDataset dliDataset = mapper.readValue(json, DLIDataset.class);
|
|
||||||
mapper.enable(SerializationFeature.INDENT_OUTPUT);
|
|
||||||
System.out.println(mapper.writeValueAsString(dliDataset));
|
|
||||||
}
|
|
||||||
|
|
||||||
private ProvenaceInfo createCollectedFrom(
|
|
||||||
final String id, final String name, final String completionStatus) {
|
|
||||||
ProvenaceInfo p = new ProvenaceInfo();
|
|
||||||
p.setId(id);
|
|
||||||
p.setName(name);
|
|
||||||
p.setCompletionStatus(completionStatus);
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
|
|
||||||
private StructuredProperty createSP(
|
|
||||||
final String value, final String className, final String schemeName) {
|
|
||||||
StructuredProperty p = new StructuredProperty();
|
|
||||||
p.setValue(value);
|
|
||||||
Qualifier schema = new Qualifier();
|
|
||||||
schema.setClassname(className);
|
|
||||||
schema.setClassid(className);
|
|
||||||
schema.setSchemename(schemeName);
|
|
||||||
schema.setSchemeid(schemeName);
|
|
||||||
p.setQualifier(schema);
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue