[Schema-Dump] changed the model to allow to change the description annotation w.r.t. the specific semantics of the field - part 4

src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Datasource.java

@@ -337,71 +337,4 @@ public class Datasource implements Serializable {
 	}
 }
 
-//TODO change the DatasourceSchemaValue to DatasourceKeyValue. The scheme is always the dnet one. What we show here is the entry in the scheme (the key) and its understandable value
-class DatasourceSchemeValue implements Serializable{
-	@JsonSchema(description="The scheme used to express the value (i.e. pubsrepository::journal)")
-	private String scheme;
 
-	@JsonSchema(description="The value expressed in the scheme (Journal)")
-	private String 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;
-	}
-
-	public static DatasourceSchemeValue newInstance(String scheme, String value) {
-		DatasourceSchemeValue cf = new DatasourceSchemeValue();
-
-		cf.setScheme(scheme);
-		cf.setValue(value);
-
-		return cf;
-	}
-}
-
-class DatasourcePid implements Serializable{
-
-	@JsonSchema(description="The scheme used to express the value ")
-	private String scheme;
-
-	@JsonSchema(description="The value expressed in the scheme ")
-	private String 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;
-	}
-
-	public static DatasourcePid newInstance(String scheme, String value) {
-		DatasourcePid cf = new DatasourcePid();
-
-		cf.setScheme(scheme);
-		cf.setValue(value);
-
-		return cf;
-	}
-
-}

src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/DatasourcePid.java

@@ -0,0 +1,40 @@
+package eu.dnetlib.dhp.schema.dump.oaf.graph;
+
+import java.io.Serializable;
+
+import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema;
+
+public class DatasourcePid implements Serializable {
+
+    @JsonSchema(description="The scheme used to express the value ")
+    private String scheme;
+
+    @JsonSchema(description="The value expressed in the scheme ")
+    private String 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;
+    }
+
+    public static DatasourcePid newInstance(String scheme, String value) {
+        DatasourcePid cf = new DatasourcePid();
+
+        cf.setScheme(scheme);
+        cf.setValue(value);
+
+        return cf;
+    }
+
+}

src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/DatasourceSchemeValue.java

@@ -0,0 +1,39 @@
+package eu.dnetlib.dhp.schema.dump.oaf.graph;
+
+import java.io.Serializable;
+
+import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema;
+
+public //TODO change the DatasourceSchemaValue to DatasourceKeyValue. The scheme is always the dnet one. What we show here is the entry in the scheme (the key) and its understandable value
+class DatasourceSchemeValue implements Serializable {
+    @JsonSchema(description="The scheme used to express the value (i.e. pubsrepository::journal)")
+    private String scheme;
+
+    @JsonSchema(description="The value expressed in the scheme (Journal)")
+    private String 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;
+    }
+
+    public static DatasourceSchemeValue newInstance(String scheme, String value) {
+        DatasourceSchemeValue cf = new DatasourceSchemeValue();
+
+        cf.setScheme(scheme);
+        cf.setValue(value);
+
+        return cf;
+    }
+}

src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java

@@ -94,30 +94,4 @@ public class Organization implements Serializable {
 }
 
 
-class OrganizationPid implements Serializable{
-	@JsonSchema(description="The scheme of the identifier (i.e. isni)")
-	private String scheme;
-
-	@JsonSchema(description="The value in the schema (i.e. 0000000090326370)")
-	private String 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;
-	}
-}
-
-
-
 

src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/OrganizationPid.java

@@ -0,0 +1,31 @@
+package eu.dnetlib.dhp.schema.dump.oaf.graph;
+
+import java.io.Serializable;
+
+import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema;
+
+public
+
+class OrganizationPid implements Serializable {
+    @JsonSchema(description="The scheme of the identifier (i.e. isni)")
+    private String scheme;
+
+    @JsonSchema(description="The value in the schema (i.e. 0000000090326370)")
+    private String 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;
+    }
+}