ignored jenv prop

.gitignore

@@ -10,7 +10,7 @@ buildNumber.properties
 .mvn/timing.properties
 # https://github.com/takari/maven-wrapper#usage-without-binary-jar
 .mvn/wrapper/maven-wrapper.jar
-
+.java-version
 # ---> Java
 # Compiled class file
 *.class

src/main/java/eu/dnetlib/dhp/schema/sx/api/model/v2/ScholixItemType.java

@@ -158,7 +158,7 @@ public class ScholixItemType {
         if (input == null)
             return null;
         final ScholixItemType instance = new ScholixItemType();
-        instance.setType("publication".equalsIgnoreCase(input.getObjectType())?"literature": "dataset");
+        instance.setType("publication".equalsIgnoreCase(input.getObjectType())?"literature": input.getObjectType());
         instance.setTitle(input.getTitle());
 
         if (input.getIdentifier()!= null)

src/main/java/eu/dnetlib/dhp/schema/sx/scholix/ScholixFlat.java

@@ -0,0 +1,158 @@
+package eu.dnetlib.dhp.schema.sx.scholix;
+
+import java.util.List;
+
+public class ScholixFlat {
+    private String identifier;
+    private String relationType;
+    private String sourceId;
+    private String sourceType;
+    private String sourceSubType;
+    private List<String> sourcePid;
+    private List<String> sourcePidType;
+    private List<String> sourcePublisher;
+    private String targetId;
+    private String targetType;
+    private String targetSubType;
+    private List<String> targetPid;
+    private List<String> targetPidType;
+    private List<String> targetPublisher;
+    private List<String> linkProviders;
+    private String publicationDate;
+    private String blob;
+
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
+
+    public String getRelationType() {
+        return relationType;
+    }
+
+    public void setRelationType(String relationType) {
+        this.relationType = relationType;
+    }
+    public String getSourceId() {
+        return sourceId;
+    }
+
+    public void setSourceId(String sourceId) {
+        this.sourceId = sourceId;
+    }
+
+    public String getSourceType() {
+        return sourceType;
+    }
+
+    public void setSourceType(String sourceType) {
+        this.sourceType = sourceType;
+    }
+
+    public String getSourceSubType() {
+        return sourceSubType;
+    }
+
+    public void setSourceSubType(String sourceSubType) {
+        this.sourceSubType = sourceSubType;
+    }
+
+    public List<String> getSourcePid() {
+        return sourcePid;
+    }
+
+    public void setSourcePid(List<String> sourcePid) {
+        this.sourcePid = sourcePid;
+    }
+
+    public List<String> getSourcePidType() {
+        return sourcePidType;
+    }
+
+    public void setSourcePidType(List<String> sourcePidType) {
+        this.sourcePidType = sourcePidType;
+    }
+
+    public List<String> getSourcePublisher() {
+        return sourcePublisher;
+    }
+
+    public void setSourcePublisher(List<String> sourcePublisher) {
+        this.sourcePublisher = sourcePublisher;
+    }
+
+    public String getTargetId() {
+        return targetId;
+    }
+
+    public void setTargetId(String targetId) {
+        this.targetId = targetId;
+    }
+
+    public String getTargetType() {
+        return targetType;
+    }
+
+    public void setTargetType(String targetType) {
+        this.targetType = targetType;
+    }
+
+    public String getTargetSubType() {
+        return targetSubType;
+    }
+
+    public void setTargetSubType(String targetSubType) {
+        this.targetSubType = targetSubType;
+    }
+
+    public List<String> getTargetPid() {
+        return targetPid;
+    }
+
+    public void setTargetPid(List<String> targetPid) {
+        this.targetPid = targetPid;
+    }
+
+    public List<String> getTargetPidType() {
+        return targetPidType;
+    }
+
+    public void setTargetPidType(List<String> targetPidType) {
+        this.targetPidType = targetPidType;
+    }
+
+    public List<String> getTargetPublisher() {
+        return targetPublisher;
+    }
+
+    public void setTargetPublisher(List<String> targetPublisher) {
+        this.targetPublisher = targetPublisher;
+    }
+
+    public List<String> getLinkProviders() {
+        return linkProviders;
+    }
+
+    public void setLinkProviders(List<String> linkProviders) {
+        this.linkProviders = linkProviders;
+    }
+
+    public String getPublicationDate() {
+        return publicationDate;
+    }
+
+    public void setPublicationDate(String publicationDate) {
+        this.publicationDate = publicationDate;
+    }
+
+    public String getBlob() {
+        return blob;
+    }
+
+    public void setBlob(String blob) {
+        this.blob = blob;
+    }
+}

src/main/java/eu/dnetlib/dhp/schema/sx/summary/AuthorPid.java

@@ -0,0 +1,30 @@
+package eu.dnetlib.dhp.schema.sx.summary;
+
+public class AuthorPid {
+    private String fullname;
+    private String ORCID;
+
+    public AuthorPid() {
+    }
+
+    public AuthorPid(String fullname, String ORCID) {
+        this.fullname = fullname;
+        this.ORCID = ORCID;
+    }
+
+    public String getFullname() {
+        return fullname;
+    }
+
+    public void setFullname(String fullname) {
+        this.fullname = fullname;
+    }
+
+    public String getORCID() {
+        return ORCID;
+    }
+
+    public void setORCID(String ORCID) {
+        this.ORCID = ORCID;
+    }
+}

src/main/java/eu/dnetlib/dhp/schema/sx/summary/ScholixSummary.java

@@ -14,7 +14,7 @@ public class ScholixSummary implements Serializable {
 	private Typology typology;
 	private String subType;
 	private List<String> title;
-	private List<String> author;
+	private List<AuthorPid> author;
 	private List<String> date;
 	private String description;
 	private List<SchemeValue> subject;
@@ -56,11 +56,11 @@ public class ScholixSummary implements Serializable {
 		this.title = title;
 	}
 
-	public List<String> getAuthor() {
+	public List<AuthorPid> getAuthor() {
 		return author;
 	}
 
-	public void setAuthor(List<String> author) {
+	public void setAuthor(List<AuthorPid> author) {
 		this.author = author;
 	}
 

src/main/java/eu/dnetlib/dhp/schema/sx/summary/Typology.java

@@ -4,5 +4,5 @@ package eu.dnetlib.dhp.schema.sx.summary;
 import java.io.Serializable;
 
 public enum Typology implements Serializable {
-	dataset, publication, unknown
+	dataset, publication, software, otherresearchproduct
 }