From 905d425064bd1a6cb8d762309b217c1e1ab81a0f Mon Sep 17 00:00:00 2001
From: Sandro La Bruzzo <sandro.labruzzo@isti.cnr.it>
Date: Mon, 5 Jul 2021 14:36:45 +0200
Subject: [PATCH] [Scholexplorer]: Updated scholix model: added subtype in
 scholix Summary and URL in Identifier field

---
 .../dhp/schema/sx/scholix/ScholixResource.java       |  6 ++----
 .../dhp/schema/sx/summary/ScholixSummary.java        | 12 +++++++++++-
 .../dhp/schema/sx/summary/TypedIdentifier.java       | 12 +++++++++++-
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/main/java/eu/dnetlib/dhp/schema/sx/scholix/ScholixResource.java b/src/main/java/eu/dnetlib/dhp/schema/sx/scholix/ScholixResource.java
index 8665cb8..e173e2a 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/sx/scholix/ScholixResource.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/sx/scholix/ScholixResource.java
@@ -1,15 +1,13 @@
 
 package eu.dnetlib.dhp.schema.sx.scholix;
 
-
-
-import eu.dnetlib.dhp.schema.sx.summary.ScholixSummary;
-
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import eu.dnetlib.dhp.schema.sx.summary.ScholixSummary;
+
 public class ScholixResource implements Serializable {
 
 	private List<ScholixIdentifier> identifier;
diff --git a/src/main/java/eu/dnetlib/dhp/schema/sx/summary/ScholixSummary.java b/src/main/java/eu/dnetlib/dhp/schema/sx/summary/ScholixSummary.java
index fc146b2..5894c05 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/sx/summary/ScholixSummary.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/sx/summary/ScholixSummary.java
@@ -1,14 +1,16 @@
 
 package eu.dnetlib.dhp.schema.sx.summary;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class ScholixSummary implements Serializable {
 	private String id;
 	private List<TypedIdentifier> localIdentifier;
 	private Typology typology;
+	private String subType;
 	private List<String> title;
 	private List<String> author;
 	private List<String> date;
@@ -125,4 +127,12 @@ public class ScholixSummary implements Serializable {
 	public void setDatasources(List<CollectedFromType> datasources) {
 		this.datasources = datasources;
 	}
+
+	public String getSubType() {
+		return subType;
+	}
+
+	public void setSubType(String subType) {
+		this.subType = subType;
+	}
 }
diff --git a/src/main/java/eu/dnetlib/dhp/schema/sx/summary/TypedIdentifier.java b/src/main/java/eu/dnetlib/dhp/schema/sx/summary/TypedIdentifier.java
index 60465aa..b66cb08 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/sx/summary/TypedIdentifier.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/sx/summary/TypedIdentifier.java
@@ -6,13 +6,23 @@ import java.io.Serializable;
 public class TypedIdentifier implements Serializable {
 	private String id;
 	private String type;
+	private String url;
 
 	public TypedIdentifier() {
 	}
 
-	public TypedIdentifier(String id, String type) {
+	public TypedIdentifier(String id, String type, String url) {
 		this.id = id;
 		this.type = type;
+		this.url = url;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
 	}
 
 	public String getId() {