Compare commits

...

15 Commits

Author SHA1 Message Date
Claudio Atzori b03a9f497d cleanup 2024-06-12 16:38:13 +02:00
Claudio Atzori 642f535498 Merge branch 'org_type' 2024-06-12 15:06:53 +02:00
Claudio Atzori eb7dcf6f11 OrganizationType must be public 2024-06-12 15:06:30 +02:00
Giambattista Bloisi 2dc10b8afe Change visibility of Organization.OrganizationType from package level to public to allow users call getOrganizationType and setOrganizationType 2024-06-11 18:11:12 +02:00
Claudio Atzori 9eaad49a2e Merge pull request 'Organizations types' (#32) from org_type into master
Reviewed-on: #32
2024-05-22 11:44:44 +02:00
Claudio Atzori 055afdc5fc Merge branch 'master' into org_type 2024-05-22 11:33:07 +02:00
Claudio Atzori cf3135ac5a [maven-release-plugin] prepare for next development iteration 2024-05-14 12:32:12 +02:00
Claudio Atzori 2502d512d1 [maven-release-plugin] prepare release dhp-schemas-6.1.2 2024-05-14 12:32:05 +02:00
Claudio Atzori 3531ac7f66 Merge pull request 'project.oamandatepublications' (#33) from solr_json_model into master
Reviewed-on: #33
2024-05-14 12:27:21 +02:00
Claudio Atzori f422a58b95 added field to the JSON solr records project.oamandatepublications 2024-05-14 12:17:12 +02:00
Claudio Atzori 97df2e3c48 adding typology to organizations 2024-05-09 12:16:29 +02:00
Claudio Atzori 4a7e960409 [maven-release-plugin] prepare for next development iteration 2024-04-19 17:26:56 +02:00
Claudio Atzori a835c8db1e [maven-release-plugin] prepare release dhp-schemas-6.1.1 2024-04-19 17:26:52 +02:00
Claudio Atzori 2a4b84af79 updated changelog 2024-04-19 17:26:05 +02:00
Claudio Atzori 2324536a61 Merge pull request 'doidoost_dismiss' (#31) from doidoost_dismiss into master
Reviewed-on: #31
2024-04-19 17:24:42 +02:00
25 changed files with 26 additions and 61 deletions

View File

@ -4,6 +4,7 @@
| **Version** | **Changes** | **Readiness** | | **Version** | **Changes** | **Readiness** |
|-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------| |-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
| 6.1.1 | [Graph model] </br> <ul><li>Introduced constants used in the DOIBoost dismission.</li></ul> | beta |
| 6.1.0 | [Graph model] </br> <ul><li>Introduced model classes to provide a JSON representation of records embedding information from the related entities.</li></ul> | beta | | 6.1.0 | [Graph model] </br> <ul><li>Introduced model classes to provide a JSON representation of records embedding information from the related entities.</li></ul> | beta |
| 5.17.3 | [Graph model] </br> <ul><li>added result level textual field to store the transformative agreement information.</li></ul> | beta | | 5.17.3 | [Graph model] </br> <ul><li>added result level textual field to store the transformative agreement information.</li></ul> | beta |
| 4.17.3 | [Graph model] </br> <ul><li>moved context at the level of the entity. </li></ul> | beta | | 4.17.3 | [Graph model] </br> <ul><li>moved context at the level of the entity. </li></ul> | beta |

View File

@ -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>6.1.1-SNAPSHOT</version> <version>6.1.3-SNAPSHOT</version>
<licenses> <licenses>
<license> <license>

View File

@ -1,15 +1,13 @@
package eu.dnetlib.dhp.schema.oaf; package eu.dnetlib.dhp.schema.oaf;
import java.util.Objects;
import java.util.Optional;
/** /**
* This class models the access rights of research products. * This class models the access rights of research products.
*/ */
public class AccessRight extends Qualifier { public class AccessRight extends Qualifier {
private static final long serialVersionUID = -8945177777173510134L; private static final long serialVersionUID = -8945177777173510134L;
private OpenAccessRoute openAccessRoute; private OpenAccessRoute openAccessRoute;
public OpenAccessRoute getOpenAccessRoute() { public OpenAccessRoute getOpenAccessRoute() {

View File

@ -3,7 +3,6 @@ package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import java.util.Objects;
public class Context implements Serializable { public class Context implements Serializable {

View File

@ -2,7 +2,6 @@
package eu.dnetlib.dhp.schema.oaf; package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects;
public class DataInfo implements Serializable { public class DataInfo implements Serializable {

View File

@ -1,12 +1,6 @@
package eu.dnetlib.dhp.schema.oaf; package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.lang3.StringUtils;
/** /**
* Describes a reference to the EOSC Interoperability Framework (IF) Guidelines * Describes a reference to the EOSC Interoperability Framework (IF) Guidelines

View File

@ -3,7 +3,6 @@ package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import java.util.Objects;
public class ExternalReference implements Serializable { public class ExternalReference implements Serializable {

View File

@ -2,7 +2,6 @@
package eu.dnetlib.dhp.schema.oaf; package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects;
public class ExtraInfo implements Serializable { public class ExtraInfo implements Serializable {

View File

@ -2,11 +2,6 @@
package eu.dnetlib.dhp.schema.oaf; package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects;
import org.apache.commons.lang3.StringUtils;
import com.fasterxml.jackson.annotation.JsonIgnore;
public class GeoLocation implements Serializable { public class GeoLocation implements Serializable {

View File

@ -2,7 +2,6 @@
package eu.dnetlib.dhp.schema.oaf; package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects;
/** /**
* To store information about the classification for the project. The classification depends on the programme. For example * To store information about the classification for the project. The classification depends on the programme. For example

View File

@ -2,7 +2,6 @@
package eu.dnetlib.dhp.schema.oaf; package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects;
/** /**
* To store information about the ec programme for the project. It has the following parameters: * To store information about the ec programme for the project. It has the following parameters:

View File

@ -3,9 +3,6 @@ package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import java.util.Optional;
import com.google.common.base.Joiner;
public class Instance implements Serializable { public class Instance implements Serializable {

View File

@ -2,7 +2,6 @@
package eu.dnetlib.dhp.schema.oaf; package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects;
public class Journal implements Serializable { public class Journal implements Serializable {

View File

@ -2,13 +2,6 @@
package eu.dnetlib.dhp.schema.oaf; package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects;
import java.util.Optional;
import org.apache.commons.lang3.StringUtils;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.common.base.Joiner;
public class KeyValue implements Serializable { public class KeyValue implements Serializable {

View File

@ -4,8 +4,6 @@ package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import com.google.common.base.Objects;
/** /**
* Represent a measure, must be further described by a system available resource providing name and descriptions. * Represent a measure, must be further described by a system available resource providing name and descriptions.
*/ */

View File

@ -2,7 +2,6 @@
package eu.dnetlib.dhp.schema.oaf; package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects;
public class OAIProvenance implements Serializable { public class OAIProvenance implements Serializable {

View File

@ -2,12 +2,7 @@
package eu.dnetlib.dhp.schema.oaf; package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
public abstract class Oaf implements Serializable { public abstract class Oaf implements Serializable {

View File

@ -3,7 +3,6 @@ package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
public abstract class OafEntity extends Oaf implements Serializable { public abstract class OafEntity extends Oaf implements Serializable {

View File

@ -6,6 +6,10 @@ import java.util.List;
public class Organization extends OafEntity implements Serializable { public class Organization extends OafEntity implements Serializable {
public enum OrganizationType {
Archive, Company, Education, Facility, Government, Healthcare, Nonprofit, Other, Unknown
}
private static final long serialVersionUID = -9048723860770504113L; private static final long serialVersionUID = -9048723860770504113L;
private Field<String> legalshortname; private Field<String> legalshortname;
@ -40,6 +44,8 @@ public class Organization extends OafEntity implements Serializable {
private Qualifier country; private Qualifier country;
private OrganizationType organizationType;
public Field<String> getLegalshortname() { public Field<String> getLegalshortname() {
return legalshortname; return legalshortname;
} }
@ -169,4 +175,11 @@ public class Organization extends OafEntity implements Serializable {
this.country = country; this.country = country;
} }
public OrganizationType getOrganizationType() {
return organizationType;
}
public void setOrganizationType(OrganizationType organizationType) {
this.organizationType = organizationType;
}
} }

View File

@ -2,7 +2,6 @@
package eu.dnetlib.dhp.schema.oaf; package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects;
public class OriginDescription implements Serializable { public class OriginDescription implements Serializable {

View File

@ -4,8 +4,6 @@ package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import org.apache.commons.lang3.StringUtils;
public class Project extends OafEntity implements Serializable { public class Project extends OafEntity implements Serializable {
private static final long serialVersionUID = 5783959097903529424L; private static final long serialVersionUID = 5783959097903529424L;

View File

@ -2,12 +2,6 @@
package eu.dnetlib.dhp.schema.oaf; package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects;
import java.util.Optional;
import org.apache.commons.lang3.builder.EqualsBuilder;
import com.google.common.base.Joiner;
public class Qualifier implements Serializable { public class Qualifier implements Serializable {
private static final long serialVersionUID = 6632548656644563076L; private static final long serialVersionUID = 6632548656644563076L;

View File

@ -1,15 +1,10 @@
package eu.dnetlib.dhp.schema.oaf; package eu.dnetlib.dhp.schema.oaf;
import static com.google.common.base.Preconditions.checkArgument;
import java.text.ParseException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import eu.dnetlib.dhp.schema.common.ModelSupport;
/** /**
* Relation models any edge between two nodes in the OpenAIRE graph. It has a source id and a target id pointing to * Relation models any edge between two nodes in the OpenAIRE graph. It has a source id and a target id pointing to
* graph node identifiers and it is further characterised by the semantic of the link through the fields relType, * graph node identifiers and it is further characterised by the semantic of the link through the fields relType,

View File

@ -2,12 +2,6 @@
package eu.dnetlib.dhp.schema.oaf; package eu.dnetlib.dhp.schema.oaf;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.lang3.StringUtils;
public class StructuredProperty implements Serializable { public class StructuredProperty implements Serializable {

View File

@ -18,6 +18,8 @@ public class Project implements Serializable {
private String keywords; private String keywords;
private String duration; private String duration;
private String oamandatepublications;
private String ecarticle29_3; private String ecarticle29_3;
private List<Subject> subjects; private List<Subject> subjects;
@ -107,6 +109,14 @@ public class Project implements Serializable {
this.duration = duration; this.duration = duration;
} }
public String getOamandatepublications() {
return oamandatepublications;
}
public void setOamandatepublications(String oamandatepublications) {
this.oamandatepublications = oamandatepublications;
}
public String getEcarticle29_3() { public String getEcarticle29_3() {
return ecarticle29_3; return ecarticle29_3;
} }