From fd0f1d5068ee326e3200622f6a740df409622a7d Mon Sep 17 00:00:00 2001 From: "miriam.baglioni" Date: Thu, 18 Nov 2021 11:01:44 +0100 Subject: [PATCH] [Schema-Dump] changed the model to allow to change the description annotation w.r.t. the specific semantics of the field - refactoring --- .../java/eu/dnetlib/dhp/schema/dump/oaf/Author.java | 4 ++-- .../eu/dnetlib/dhp/schema/dump/oaf/AuthorPid.java | 6 ++---- .../dnetlib/dhp/schema/dump/oaf/BestAccessRight.java | 5 ++--- .../eu/dnetlib/dhp/schema/dump/oaf/Container.java | 4 ++-- .../dnetlib/dhp/schema/dump/oaf/ControlledField.java | 4 ++-- .../java/eu/dnetlib/dhp/schema/dump/oaf/Country.java | 4 ++-- .../java/eu/dnetlib/dhp/schema/dump/oaf/Funder.java | 4 ++-- .../java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java | 11 +++++------ .../java/eu/dnetlib/dhp/schema/dump/oaf/Language.java | 5 ++--- .../java/eu/dnetlib/dhp/schema/dump/oaf/Project.java | 6 ++---- .../eu/dnetlib/dhp/schema/dump/oaf/Provenance.java | 4 ++-- .../eu/dnetlib/dhp/schema/dump/oaf/Qualifier.java | 4 ++-- .../java/eu/dnetlib/dhp/schema/dump/oaf/Result.java | 4 ++-- .../eu/dnetlib/dhp/schema/dump/oaf/ResultCountry.java | 1 - .../eu/dnetlib/dhp/schema/dump/oaf/ResultPid.java | 5 ++--- .../java/eu/dnetlib/dhp/schema/dump/oaf/Subject.java | 5 ++--- .../schema/dump/oaf/community/CommunityResult.java | 3 +-- .../dnetlib/dhp/schema/dump/oaf/graph/Datasource.java | 1 + .../dnetlib/dhp/schema/dump/oaf/graph/Fundings.java | 5 ++--- .../eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java | 5 ++--- .../dhp/schema/dump/oaf/graph/GraphResult.java | 1 + .../eu/dnetlib/dhp/schema/dump/oaf/graph/Node.java | 4 ++-- .../dnetlib/dhp/schema/dump/oaf/graph/Programme.java | 4 ++-- .../eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java | 6 ++---- .../eu/dnetlib/dhp/schema/dump/oaf/graph/RelType.java | 5 ++--- .../dnetlib/dhp/schema/dump/oaf/graph/Relation.java | 1 + .../dhp/schema/dump/oaf/graph/ResearchCommunity.java | 4 ++-- .../dhp/schema/dump/oaf/graph/ResearchInitiative.java | 5 ++--- .../dhp/schema/oaf/dump/GenerateJsonSchema.java | 3 +-- 29 files changed, 54 insertions(+), 69 deletions(-) diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java index 4a4eebe..3c7710b 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java @@ -1,10 +1,10 @@ package eu.dnetlib.dhp.schema.dump.oaf; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * Used to represent the generic author of the result. It has six parameters: - name of type String to store the given * name of the author. The value for this parameter corresponds to eu.dnetlib.dhp.schema.oaf.Author name - surname of diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/AuthorPid.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/AuthorPid.java index 0fb42db..2ad55c0 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/AuthorPid.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/AuthorPid.java @@ -1,10 +1,10 @@ package eu.dnetlib.dhp.schema.dump.oaf; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * To represent the generic persistent identifier. It has two parameters: * - id of type @@ -85,5 +85,3 @@ class AuthorPidSchemeValue implements Serializable{ return cf; } } - - diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/BestAccessRight.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/BestAccessRight.java index 7d73e72..06ec001 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/BestAccessRight.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/BestAccessRight.java @@ -1,9 +1,9 @@ package eu.dnetlib.dhp.schema.dump.oaf; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * BestAccessRight. Used to represent the result best access rights. Values for this element are found against the * COAR access right scheme. The classid of the element accessright in eu.dnetlib.dhp.schema.oaf.Result is used to get @@ -56,4 +56,3 @@ public class BestAccessRight implements Serializable { return ar; } } - diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Container.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Container.java index 177f077..bef5f74 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Container.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Container.java @@ -1,10 +1,10 @@ package eu.dnetlib.dhp.schema.dump.oaf; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * To store information about the conference or journal where the result has been presented or published. It contains * eleven parameters: - name of type String to store the name of the journal or conference. It corresponds to the diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ControlledField.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ControlledField.java index feb1610..978171a 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ControlledField.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ControlledField.java @@ -1,10 +1,10 @@ package eu.dnetlib.dhp.schema.dump.oaf; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * To represent the information described by a scheme and a value in that scheme (i.e. doi). It has two parameters: - * scheme of type String to store the scheme - value of type String to store the value in that scheme diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Country.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Country.java index 4378389..0cf58b3 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Country.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Country.java @@ -1,10 +1,10 @@ package eu.dnetlib.dhp.schema.dump.oaf; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * Represents the country associated to the generic entity. It extends eu.dnetlib.dhp.schema.dump.oaf.Qualifier with a * provenance parameter of type eu.dnetlib.dhp.schema.dumo.oaf.Provenance. The country in not mapped if its value in the diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Funder.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Funder.java index 112b8a6..06af521 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Funder.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Funder.java @@ -1,10 +1,10 @@ package eu.dnetlib.dhp.schema.dump.oaf; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + public class Funder implements Serializable { @JsonSchema(description = "The short name of the funder (EC)") diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java index 4820456..0e634e0 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java @@ -1,13 +1,14 @@ package eu.dnetlib.dhp.schema.dump.oaf; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; -import org.apache.commons.lang3.StringUtils; - import java.io.Serializable; import java.util.List; +import org.apache.commons.lang3.StringUtils; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * Represents the manifestations (i.e. different versions) of the result. For example: the pre-print and the published * versions are two manifestations of the same research result. It has the following parameters: - license of type @@ -210,5 +211,3 @@ class AlternateIdentifier implements Serializable{ return cf; } } - - diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Language.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Language.java index 8e147e2..6d4de35 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Language.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Language.java @@ -1,9 +1,9 @@ package eu.dnetlib.dhp.schema.dump.oaf; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + public class Language implements Serializable { @JsonSchema(description="alpha-3/ISO 639-2 code of the language") @@ -35,4 +35,3 @@ public class Language implements Serializable { return qualifier; } } - diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Project.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Project.java index 96ad5e9..fc7472b 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Project.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Project.java @@ -1,10 +1,10 @@ package eu.dnetlib.dhp.schema.dump.oaf; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * This class to store the common information about the project that will be dumped for community and for the whole * graph - private String id to store the id of the project (OpenAIRE id) - private String code to store the grant @@ -55,5 +55,3 @@ public class Project implements Serializable { this.title = title; } } - - diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Provenance.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Provenance.java index 8217cd5..884d02d 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Provenance.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Provenance.java @@ -1,10 +1,10 @@ package eu.dnetlib.dhp.schema.dump.oaf; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * Indicates the process that produced (or provided) the information, and the trust associated to the information. It * has two parameters: - provenance of type String to store the provenance of the information, - trust of type String to diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Qualifier.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Qualifier.java index 67ccf61..e977ee2 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Qualifier.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Qualifier.java @@ -1,10 +1,10 @@ package eu.dnetlib.dhp.schema.dump.oaf; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * To represent the information described by a code and a value It has two parameters: - code to store the code * (generally the classid of the eu.dnetlib.dhp.schema.oaf.Qualifier element) - label to store the label (generally the diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java index bffa647..560f74b 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java @@ -1,11 +1,11 @@ package eu.dnetlib.dhp.schema.dump.oaf; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; import java.util.List; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * To represent the dumped result. It will be extended in the dump for Research Communities - Research * Initiative/Infrastructures. It has the following parameters: diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ResultCountry.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ResultCountry.java index 5401a36..df2650b 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ResultCountry.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ResultCountry.java @@ -1,6 +1,5 @@ package eu.dnetlib.dhp.schema.dump.oaf; - import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; /** diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ResultPid.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ResultPid.java index e0a29ee..f95d06e 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ResultPid.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ResultPid.java @@ -1,9 +1,9 @@ package eu.dnetlib.dhp.schema.dump.oaf; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + public class ResultPid implements Serializable { @JsonSchema(description="The scheme of the persistent identifier for the result (i.e. doi). " + "If the pid is here it means the information for the pid has been collected from an authority for " + @@ -39,4 +39,3 @@ public class ResultPid implements Serializable { return cf; } } - diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Subject.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Subject.java index f91cb50..67a21fc 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Subject.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Subject.java @@ -1,10 +1,10 @@ package eu.dnetlib.dhp.schema.dump.oaf; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * To represent keywords associated to the result. It has two parameters: * - subject of type eu.dnetlib.dhp.schema.dump.oaf.SubjectSchemeValue to describe the subject. It mapped as: @@ -72,4 +72,3 @@ class SubjectSchemeValue implements Serializable{ } } - diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityResult.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityResult.java index 9084fb9..d32247f 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityResult.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityResult.java @@ -4,6 +4,7 @@ package eu.dnetlib.dhp.schema.dump.oaf.community; import java.util.List; import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + import eu.dnetlib.dhp.schema.dump.oaf.KeyValue; import eu.dnetlib.dhp.schema.dump.oaf.Result; @@ -63,5 +64,3 @@ public class CommunityResult extends Result { } } - - diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Datasource.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Datasource.java index dace8d7..5ec2598 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Datasource.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Datasource.java @@ -5,6 +5,7 @@ import java.io.Serializable; import java.util.List; import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + import eu.dnetlib.dhp.schema.dump.oaf.Container; import eu.dnetlib.dhp.schema.dump.oaf.ControlledField; diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Fundings.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Fundings.java index 0b695c4..56dacda 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Fundings.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Fundings.java @@ -1,10 +1,10 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * To store inforamtion about the funding stream. It has two parameters: - private String id to store the id of the * fundings stream. The id is created by appending the shortname of the funder to the name of each level in the xml @@ -36,4 +36,3 @@ public class Fundings implements Serializable { this.description = description; } } - diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java index 22d48a2..a4d3fa2 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java @@ -1,10 +1,10 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * To describe the funded amount. It has the following parameters: - private String currency to store the currency of * the fund - private float totalcost to store the total cost of the project - private float fundedamount to store the @@ -59,4 +59,3 @@ public class Granted implements Serializable { return granted; } } - diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/GraphResult.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/GraphResult.java index b60140a..654b75e 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/GraphResult.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/GraphResult.java @@ -4,6 +4,7 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph; import java.util.List; import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + import eu.dnetlib.dhp.schema.dump.oaf.Instance; import eu.dnetlib.dhp.schema.dump.oaf.Result; diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Node.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Node.java index 11aecc6..4146c01 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Node.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Node.java @@ -1,10 +1,10 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * To represent the generic node in a relation. It has the following parameters: - private String id the openaire id of * the entity in the relation - private String type the type of the entity in the relation. Consider the generic diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Programme.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Programme.java index 9b9113d..6ffaaac 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Programme.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Programme.java @@ -1,10 +1,10 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * To store information about the ec programme for the project. It has the following parameters: - private String code * to store the code of the programme - private String description to store the description of the programme diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java index d1fa714..63862a4 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java @@ -1,11 +1,11 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; import java.util.List; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * This is the class representing the Project in the model used for the dumps of the whole graph. At the moment the dump * of the Projects differs from the other dumps because we do not create relations between Funders (Organization) and @@ -162,5 +162,3 @@ public class Project extends eu.dnetlib.dhp.schema.dump.oaf.Project { this.h2020programme = h2020programme; } } - - diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/RelType.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/RelType.java index 618fff1..9773930 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/RelType.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/RelType.java @@ -1,10 +1,10 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * To represent the semantics of the generic relation between two entities. It has the following parameters: - private * String name to store the semantics of the relation (i.e. isAuthorInstitutionOf). It corresponds to the relclass @@ -42,4 +42,3 @@ public class RelType implements Serializable { return rel; } } - diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Relation.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Relation.java index fe42211..07bc3c4 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Relation.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Relation.java @@ -5,6 +5,7 @@ import java.io.Serializable; import java.util.Objects; import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + import eu.dnetlib.dhp.schema.dump.oaf.Provenance; /** diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchCommunity.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchCommunity.java index 3d4e631..95fe861 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchCommunity.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchCommunity.java @@ -1,10 +1,10 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.util.List; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * To represent RC entities. It extends eu.dnetlib.dhp.dump.oaf.grap.ResearchInitiative by adding the parameter subject * to store the list of subjects related to the community diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchInitiative.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchInitiative.java index da458ed..4ea9730 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchInitiative.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchInitiative.java @@ -1,10 +1,10 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph; -import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; - import java.io.Serializable; +import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema; + /** * To represent entity of type RC/RI. It has the following parameters, which are mostly derived by the profile * - private @@ -86,4 +86,3 @@ public class ResearchInitiative implements Serializable { this.description = description; } } - diff --git a/src/test/java/eu/dnetlib/dhp/schema/oaf/dump/GenerateJsonSchema.java b/src/test/java/eu/dnetlib/dhp/schema/oaf/dump/GenerateJsonSchema.java index 0bc2a46..a12f281 100644 --- a/src/test/java/eu/dnetlib/dhp/schema/oaf/dump/GenerateJsonSchema.java +++ b/src/test/java/eu/dnetlib/dhp/schema/oaf/dump/GenerateJsonSchema.java @@ -4,10 +4,9 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.databind.JsonNode; -import com.github.victools.jsonschema.generator.*; import com.fasterxml.jackson.databind.ObjectMapper; - import com.github.imifou.jsonschema.module.addon.AddonModule; +import com.github.victools.jsonschema.generator.*; import eu.dnetlib.dhp.schema.dump.oaf.graph.*;