From 95592369f22a874007b5293e636b382ddcccd678 Mon Sep 17 00:00:00 2001 From: "miriam.baglioni" Date: Wed, 17 Nov 2021 09:28:54 +0100 Subject: [PATCH 1/3] [Graph Dump] changed the type for policies from Object to String --- .../eu/dnetlib/dhp/schema/dump/oaf/graph/Datasource.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 62a32a0..de845b3 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 @@ -93,7 +93,7 @@ public class Datasource implements Serializable { private String certificates; // string - private List policies; // + private List policies; // private Container journal; // issn etc del Journal @@ -297,11 +297,11 @@ public class Datasource implements Serializable { this.certificates = certificates; } - public List getPolicies() { + public List getPolicies() { return policies; } - public void setPolicies(List policiesr3) { + public void setPolicies(List policiesr3) { this.policies = policiesr3; } From d01dce4337944f8507a93aae83bef8585747f918 Mon Sep 17 00:00:00 2001 From: "miriam.baglioni" Date: Wed, 17 Nov 2021 09:35:14 +0100 Subject: [PATCH 2/3] {Graph Dump] added dependency to pom to move the class for the generation of the schema --- pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d1e829d..12743ec 100644 --- a/pom.xml +++ b/pom.xml @@ -360,7 +360,12 @@ javax.persistence javax.persistence-api - + + com.github.victools + jsonschema-generator + ${jsonschemagenerator.version} + test + @@ -377,6 +382,7 @@ 2.11.12 5.6.1 3.3.3 + 4.13.0 From fb0139c09a8b165f3767be85a8d600b2eb9b60f7 Mon Sep 17 00:00:00 2001 From: "miriam.baglioni" Date: Wed, 17 Nov 2021 10:24:04 +0100 Subject: [PATCH 3/3] [Graph Dump] added test class to generate the json schema of the dump --- .../schema/oaf/dump/GenerateJsonSchema.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/test/java/eu/dnetlib/dhp/schema/oaf/dump/GenerateJsonSchema.java 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 new file mode 100644 index 0000000..de1e77f --- /dev/null +++ b/src/test/java/eu/dnetlib/dhp/schema/oaf/dump/GenerateJsonSchema.java @@ -0,0 +1,27 @@ +package eu.dnetlib.dhp.schema.oaf.dump; + +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 eu.dnetlib.dhp.schema.dump.oaf.graph.*; + +@Disabled +class GenerateJsonSchema { + + @Test + void generateSchema() { + SchemaGeneratorConfigBuilder configBuilder = new SchemaGeneratorConfigBuilder(SchemaVersion.DRAFT_7, + OptionPreset.PLAIN_JSON) + .with(Option.SCHEMA_VERSION_INDICATOR) + .without(Option.NONPUBLIC_NONSTATIC_FIELDS_WITHOUT_GETTERS); + configBuilder.forFields().withDescriptionResolver(field -> "Description of " + field.getDeclaredName()); + SchemaGeneratorConfig config = configBuilder.build(); + SchemaGenerator generator = new SchemaGenerator(config); + JsonNode jsonSchema = generator.generateSchema(GraphResult.class); + + System.out.println(jsonSchema.toString()); + } +}