From 7a285680a04b96114a5ce9b4911612ce5491822e Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Thu, 25 May 2023 16:28:13 +0200 Subject: [PATCH 1/6] added fulltext field on the instance level --- .../java/eu/dnetlib/dhp/schema/oaf/Instance.java | 13 +++++++++++++ src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java index 6bb2908..42b8931 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java @@ -39,6 +39,11 @@ public class Instance implements Serializable { private List measures; + /** + * Direct fulltext URL. + */ + private String fulltext; + public Field getLicense() { return license; } @@ -151,6 +156,14 @@ public class Instance implements Serializable { this.measures = measures; } + public String getFulltext() { + return fulltext; + } + + public void setFulltext(String fulltext) { + this.fulltext = fulltext; + } + public String toComparableString() { return String .format( diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java index 0027fc4..9ea7801 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java @@ -95,9 +95,9 @@ public class Result extends OafEntity implements Serializable { private List> source; /** - * The Fulltext. + * The list of direct fulltext URLs. */ - private List> fulltext; // remove candidate + private List> fulltext; /** * The Format. From 66ffad1ca032ad8ffc5b17e6a0a97e81e87ff153 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Fri, 26 May 2023 15:09:20 +0200 Subject: [PATCH 2/6] bumped version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4e353cb..5261849 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib.dhp dhp-schemas jar - 3.16.1-SNAPSHOT + 3.17.1-SNAPSHOT From 28b81c55bb7935a16180ab79086a6f071c4af5f3 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Jun 2023 13:39:00 +0200 Subject: [PATCH 3/6] added extra organization specific PID types --- src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidType.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidType.java index 392bc02..6f3cfe3 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidType.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidType.java @@ -59,7 +59,7 @@ public enum PidType { pmc, handle, arXiv, nct, pdb, w3id, // Organization - openorgs, corda, corda_h2020, GRID, mag_id, urn, + openorgs, ROR, GRID, PIC, ISNI, Wikidata, FundRef, corda, corda_h2020, mag_id, urn, // Used by dedup undefined, original; From f57efd75b54abe3578aadb583028aaa447145948 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Jun 2023 13:41:24 +0200 Subject: [PATCH 4/6] udpated changelog --- CHANGES.md | 73 +++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index c5da8cb..7cfb486 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,40 +2,41 @@ ## Changelog -| **Version** | **Changes** | **Readiness** | -|-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------| -| 3.16.0 | [Graph model]
  • added entity level measures.
      • | beta | -| 3.15.0 | [Graph model]
      • added w3id as PID type, with ROHub as authority.
          • | beta | -| 3.14.0 | [Graph model]
          • introduced specific type for result.subject
              • | beta | -| 2.13.0 | [Scholexplorer]
              • update swagger annotation jar version to be compatible with new implementation of openAPI ui
                  • | beta | -| 2.12.1 | [Graph model]
                  • added field oafEntity.eoscifguidelines
                      • | production | -| 2.12.0 | [Graph model]
                      • Introducing EOSC Services as datasources
                          • | production | -| 2.11.33 | [Scholexplorer]
                          • Moved Scholix API Data model into dhp-schemas
                          • implementation of the compareTo method on Scholix objects and all model properties
                          • Unit Test to verify that compareTo works on different case
                              • | production | -| 2.10.31 | [Minor]
                              NPE checks | production | -| 2.10.30 | [Minor]
                              added comparator for refereed field instances | production | -| 2.10.29 | [Merge Result]
                              merge logics changed to consider invisble in dataInfo | production | -| 2.10.28 | [Graph Model]
                              Added APC information at the level of the result | production | -| 2.10.27 | [Graph Model]
                              change name and id of OpenAPC datasource | production | -| 2.10.26 | [Graph Model]
                              OpenAIRE ids of the delegated authorities and enrichment providers in the identifier creation strategy | production | -| 2.10.25 | [Graph model]
                              implemented enrichment on Result specializing in the method mergefrom. | production | -| 2.10.24 | [Graph model]
                              added utility method and constants for checking weather is an OafEntity represents an enrichment. | production | -| 2.9.24 | [Dump model]
                              change the names of the classes to be able to automatically create the json schema with specific descriptions | production | -| 2.9.23 | [Graph model]
                              Added Instance.measures field, allowing to maintain the association between them and the individual result instance
                              [Dump model]
                              added json schemas | production | -| 2.8.22 | [Graph model]
                              minor: added serializable to the Measures model class
                              [Dump model]
                              added dedicated BestAccessRight class, used at the result level instead of AccessRight | production | -| 2.8.21 | [Graph model]
                              added the following relation terms Describes/IsDescribedBy, IsMetadataFor/IsMetadataOf, HasAssociationWith/HasAssociationWith, IsRequiredBy/Requires. All these are used in combination with the relation subRelType "relationship" | production | -| 2.8.20 | [Graph model]
                              added constants declaring the values used for hierarchical relationships among the organizations IsParentOf / IsChildOf | production | -| 2.7.18-19 | [Dump model]
                              include validation info in relations
                              [Graph model]
                              added constants declaring vocabulary names for relation fields | production | -| 2.7.17 | [Dump model]
                              aligned the graph dump schema to mirror the changes in the model
                              1. Added openaccessroute at the level of the instance inside the AccessRight element;
                              2. Added pid and the alternate identifiers at the level of the instance;
                              3. Added the bipFinder measures | production | -| 2.7.16 | [Graph model]
                              Updated the casing of the following terms (`relation.relClass`):
                              1. `isRelatedTo -> IsRelatedTo`
                              Added the following `relClass` terms:
                              1. `IsAmongTopNSimilarDocuments`
                              2. `HasAmongTopNSimilarDocuments` | production | -| 2.7.15 | 1. added support for delegated authorities
                              2. fixed regex for DOI cleaning | production | -| 2.7.14 | [Graph model]
                              Relation types are now inspired by the Datacite definitions https://schema.datacite.org/meta/kernel-4.4/doc/DataCite-MetadataKernel_v4.4.pdf
                              The changes involve the values stored in `relation.subRelType` and `relation.relClass`:
                              Updated the casing of the following terms (`relation.relClass`):
                              1. `isSupplementTo -> IsSupplementTo` / `isSupplementedBy -> IsSupplementedBy`
                              2. `isPartOf -> IsPartOf` / `hasPart -> HasPart`
                              3. `cites -> Cites` / `isCitedBy -> IsCitedBy`
                              4. `reviews -> Reviews` / `isReviewedBy -> IsReviewedBy`
                              Added the following terms [`subRelType: relClass / relClass (inverse)`]:
                              1. `relationship: References / IsReferencedBy`
                              2. `relationship: IsIdenticalTo`
                              3. `relationship: IsContinuedBy / Continues`
                              4. `relationship: IsDocumentedBy / Documents`
                              5. `relationship: Documents / IsDocumentedBy`
                              6. `relationship: IsCompiledBy / Compiles`
                              7. `version: IsPreviousVersionOf / IsNewVersionOf`
                              8. `version: IsSourceOf / IsDerivedFrom`
                              9. `version: IsVariantFormOf / IsOriginalFormOf`
                              10. `version: IsObsoletedBy / Obsoletes`
                              11. `version: IsVersionOf / HasVersion` | production | -| 2.6.14 | [Scholexplorer]
                              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
                              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]
                              1. introduced MetadataStoreManager (MdSM) model classes | production | -| 2.2.5 | [Graph model]
                              1. introduced fields `Instance.pid` and `Instance.alternateIdentifier`
                              2. `LicenseComparator` renamed as `AccessRightComparator`
                              3. introduced `AccessRight` model class defining the `OpenAccessRoute` field to keep track of the OpenAccess color at the `Instance` level
                              4. `ExternalReference` cleanup (removed description, added alternateLabel(s))
                              5. added several ModelConstants
                              [Aggregation]
                              7. introduced MDStore record model classes
                              8. Introduced ORCID specific model classes | production | -| 2.2.4 | 1. ORCID specific model classes backported in the version used in PROD
                              2. added constant for dnet:externalReference_typologies
                              3. added constant for ORCID datasource name
                              4. `Result.mergeFrom` handles field `dateOfAcceptance` | production | +| **Version** | **Changes** | **Readiness** | +|-------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------| +| 3.17.1 | [Graph model]
                              • added fulltext field on the instance level.
                              • added extra organization specific PID types
                                  • | beta | +| 3.16.0 | [Graph model]
                                  • added entity level measures.
                                      • | beta | +| 3.15.0 | [Graph model]
                                      • added w3id as PID type, with ROHub as authority.
                                          • | beta | +| 3.14.0 | [Graph model]
                                          • introduced specific type for result.subject
                                              • | beta | +| 2.13.0 | [Scholexplorer]
                                              • update swagger annotation jar version to be compatible with new implementation of openAPI ui
                                                  • | beta | +| 2.12.1 | [Graph model]
                                                  • added field oafEntity.eoscifguidelines
                                                      • | production | +| 2.12.0 | [Graph model]
                                                      • Introducing EOSC Services as datasources
                                                          • | production | +| 2.11.33 | [Scholexplorer]
                                                          • Moved Scholix API Data model into dhp-schemas
                                                          • implementation of the compareTo method on Scholix objects and all model properties
                                                          • Unit Test to verify that compareTo works on different case
                                                              • | production | +| 2.10.31 | [Minor]
                                                              NPE checks | production | +| 2.10.30 | [Minor]
                                                              added comparator for refereed field instances | production | +| 2.10.29 | [Merge Result]
                                                              merge logics changed to consider invisble in dataInfo | production | +| 2.10.28 | [Graph Model]
                                                              Added APC information at the level of the result | production | +| 2.10.27 | [Graph Model]
                                                              change name and id of OpenAPC datasource | production | +| 2.10.26 | [Graph Model]
                                                              OpenAIRE ids of the delegated authorities and enrichment providers in the identifier creation strategy | production | +| 2.10.25 | [Graph model]
                                                              implemented enrichment on Result specializing in the method mergefrom. | production | +| 2.10.24 | [Graph model]
                                                              added utility method and constants for checking weather is an OafEntity represents an enrichment. | production | +| 2.9.24 | [Dump model]
                                                              change the names of the classes to be able to automatically create the json schema with specific descriptions | production | +| 2.9.23 | [Graph model]
                                                              Added Instance.measures field, allowing to maintain the association between them and the individual result instance
                                                              [Dump model]
                                                              added json schemas | production | +| 2.8.22 | [Graph model]
                                                              minor: added serializable to the Measures model class
                                                              [Dump model]
                                                              added dedicated BestAccessRight class, used at the result level instead of AccessRight | production | +| 2.8.21 | [Graph model]
                                                              added the following relation terms Describes/IsDescribedBy, IsMetadataFor/IsMetadataOf, HasAssociationWith/HasAssociationWith, IsRequiredBy/Requires. All these are used in combination with the relation subRelType "relationship" | production | +| 2.8.20 | [Graph model]
                                                              added constants declaring the values used for hierarchical relationships among the organizations IsParentOf / IsChildOf | production | +| 2.7.18-19 | [Dump model]
                                                              include validation info in relations
                                                              [Graph model]
                                                              added constants declaring vocabulary names for relation fields | production | +| 2.7.17 | [Dump model]
                                                              aligned the graph dump schema to mirror the changes in the model
                                                              1. Added openaccessroute at the level of the instance inside the AccessRight element;
                                                              2. Added pid and the alternate identifiers at the level of the instance;
                                                              3. Added the bipFinder measures | production | +| 2.7.16 | [Graph model]
                                                              Updated the casing of the following terms (`relation.relClass`):
                                                              1. `isRelatedTo -> IsRelatedTo`
                                                              Added the following `relClass` terms:
                                                              1. `IsAmongTopNSimilarDocuments`
                                                              2. `HasAmongTopNSimilarDocuments` | production | +| 2.7.15 | 1. added support for delegated authorities
                                                              2. fixed regex for DOI cleaning | production | +| 2.7.14 | [Graph model]
                                                              Relation types are now inspired by the Datacite definitions https://schema.datacite.org/meta/kernel-4.4/doc/DataCite-MetadataKernel_v4.4.pdf
                                                              The changes involve the values stored in `relation.subRelType` and `relation.relClass`:
                                                              Updated the casing of the following terms (`relation.relClass`):
                                                              1. `isSupplementTo -> IsSupplementTo` / `isSupplementedBy -> IsSupplementedBy`
                                                              2. `isPartOf -> IsPartOf` / `hasPart -> HasPart`
                                                              3. `cites -> Cites` / `isCitedBy -> IsCitedBy`
                                                              4. `reviews -> Reviews` / `isReviewedBy -> IsReviewedBy`
                                                              Added the following terms [`subRelType: relClass / relClass (inverse)`]:
                                                              1. `relationship: References / IsReferencedBy`
                                                              2. `relationship: IsIdenticalTo`
                                                              3. `relationship: IsContinuedBy / Continues`
                                                              4. `relationship: IsDocumentedBy / Documents`
                                                              5. `relationship: Documents / IsDocumentedBy`
                                                              6. `relationship: IsCompiledBy / Compiles`
                                                              7. `version: IsPreviousVersionOf / IsNewVersionOf`
                                                              8. `version: IsSourceOf / IsDerivedFrom`
                                                              9. `version: IsVariantFormOf / IsOriginalFormOf`
                                                              10. `version: IsObsoletedBy / Obsoletes`
                                                              11. `version: IsVersionOf / HasVersion` | production | +| 2.6.14 | [Scholexplorer]
                                                              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
                                                              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]
                                                              1. introduced MetadataStoreManager (MdSM) model classes | production | +| 2.2.5 | [Graph model]
                                                              1. introduced fields `Instance.pid` and `Instance.alternateIdentifier`
                                                              2. `LicenseComparator` renamed as `AccessRightComparator`
                                                              3. introduced `AccessRight` model class defining the `OpenAccessRoute` field to keep track of the OpenAccess color at the `Instance` level
                                                              4. `ExternalReference` cleanup (removed description, added alternateLabel(s))
                                                              5. added several ModelConstants
                                                              [Aggregation]
                                                              7. introduced MDStore record model classes
                                                              8. Introduced ORCID specific model classes | production | +| 2.2.4 | 1. ORCID specific model classes backported in the version used in PROD
                                                              2. added constant for dnet:externalReference_typologies
                                                              3. added constant for ORCID datasource name
                                                              4. `Result.mergeFrom` handles field `dateOfAcceptance` | production | From c341fe012b028b7e6b03f6ec5a83c754a5b337fe Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Jun 2023 13:42:13 +0200 Subject: [PATCH 5/6] [maven-release-plugin] prepare release dhp-schemas-3.17.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5261849..0d715a3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib.dhp dhp-schemas jar - 3.17.1-SNAPSHOT + 3.17.1 @@ -32,7 +32,7 @@ scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git https://code-repo.d4science.org/D-Net/dhp-schemas/ - dhp-schemas-2.10.30 + dhp-schemas-3.17.1 This module contains common schema classes meant to be used across the dnet-hadoop submodules From 6ce896ca0a1d949faea27394dfe6bab64faea1d6 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Jun 2023 13:42:17 +0200 Subject: [PATCH 6/6] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0d715a3..c70a6f3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib.dhp dhp-schemas jar - 3.17.1 + 3.17.2-SNAPSHOT @@ -32,7 +32,7 @@ scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git https://code-repo.d4science.org/D-Net/dhp-schemas/ - dhp-schemas-3.17.1 + dhp-schemas-2.10.30 This module contains common schema classes meant to be used across the dnet-hadoop submodules