added api data model

pom.xml

@@ -5,7 +5,7 @@
     <groupId>eu.dnetlib.dhp</groupId>
     <artifactId>dhp-schemas</artifactId>
     <packaging>jar</packaging>
-    <version>2.10.30-SNAPSHOT</version>
+    <version>2.10.30-SCHOLEXPLORER-SNAPSHOT</version>
 
 
     <licenses>

src/main/java/eu/dnetlib/dhp/schema/sx/api/model/v1/LinkPublisher.java

@@ -1,11 +1,13 @@
 package eu.dnetlib.dhp.schema.sx.api.model.v1;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
-import io.swagger.v3.oas.annotations.media.Schema;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import java.util.Objects;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import io.swagger.v3.oas.annotations.media.Schema;
 
 public class LinkPublisher {
     @NotBlank

src/main/java/eu/dnetlib/dhp/schema/sx/api/model/v1/ScholixCreator.java

@@ -1,12 +1,13 @@
 package eu.dnetlib.dhp.schema.sx.api.model.v1;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import eu.dnetlib.dhp.schema.sx.scholix.ScholixEntityId;
-import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import eu.dnetlib.dhp.schema.sx.scholix.ScholixEntityId;
+import io.swagger.v3.oas.annotations.media.Schema;
+
 public class ScholixCreator {
 
     @JsonProperty("name")

src/main/java/eu/dnetlib/dhp/schema/sx/api/model/v1/ScholixIdentifier.java

@@ -1,10 +1,11 @@
 package eu.dnetlib.dhp.schema.sx.api.model.v1;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.util.Objects;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
 public class ScholixIdentifier {
 
     @JsonProperty("identifier")

src/main/java/eu/dnetlib/dhp/schema/sx/api/model/v1/ScholixItem.java

@@ -1,14 +1,15 @@
 package eu.dnetlib.dhp.schema.sx.api.model.v1;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import eu.dnetlib.dhp.schema.sx.scholix.ScholixResource;
-import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import eu.dnetlib.dhp.schema.sx.scholix.ScholixResource;
+import io.swagger.v3.oas.annotations.media.Schema;
+
 public class ScholixItem {
 
     @JsonProperty("identifiers")

src/main/java/eu/dnetlib/dhp/schema/sx/api/model/v1/ScholixProvider.java

@@ -1,15 +1,17 @@
 package eu.dnetlib.dhp.schema.sx.api.model.v1;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import eu.dnetlib.dhp.schema.sx.scholix.ScholixEntityId;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import javax.validation.Valid;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import eu.dnetlib.dhp.schema.sx.scholix.ScholixEntityId;
+import io.swagger.v3.oas.annotations.media.Schema;
+
 public class ScholixProvider {
 
     public static ScholixProvider fromScholixEntityId(final ScholixEntityId provider) {

src/main/java/eu/dnetlib/dhp/schema/sx/api/model/v1/ScholixRelationship.java

@@ -1,12 +1,14 @@
 package eu.dnetlib.dhp.schema.sx.api.model.v1;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import static eu.dnetlib.dhp.schema.sx.api.model.v2.RelationshipType.relationMapping;
-import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotBlank;
 import java.util.Objects;
 
-import static eu.dnetlib.dhp.schema.sx.api.model.v2.RelationshipType.relationMapping;
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import io.swagger.v3.oas.annotations.media.Schema;
 
 public class ScholixRelationship {
 

src/main/java/eu/dnetlib/dhp/schema/sx/api/model/v1/ScholixV1.java

@@ -1,16 +1,18 @@
 package eu.dnetlib.dhp.schema.sx.api.model.v1;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import eu.dnetlib.dhp.schema.sx.scholix.Scholix;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import eu.dnetlib.dhp.schema.sx.scholix.Scholix;
+import io.swagger.v3.oas.annotations.media.Schema;
+
 public class ScholixV1 implements Serializable {
 
     @JsonProperty("linkProvider")

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

@@ -1,11 +1,13 @@
 package eu.dnetlib.dhp.schema.sx.api.model.v2;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
-import io.swagger.v3.oas.annotations.media.Schema;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import java.util.Objects;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
  * The type Link provider type.

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

@@ -1,14 +1,16 @@
 package eu.dnetlib.dhp.schema.sx.api.model.v2;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+
 /**
  * The main class that show the page result from the method
  * /l2/links

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

@@ -1,14 +1,16 @@
 package eu.dnetlib.dhp.schema.sx.api.model.v2;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import eu.dnetlib.dhp.schema.sx.scholix.ScholixRelationship;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import javax.validation.constraints.NotNull;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import eu.dnetlib.dhp.schema.sx.scholix.ScholixRelationship;
+import io.swagger.v3.oas.annotations.media.Schema;
+
 /**
  * The type Relationship type.
  */

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

@@ -1,14 +1,16 @@
 package eu.dnetlib.dhp.schema.sx.api.model.v2;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import eu.dnetlib.dhp.schema.sx.scholix.ScholixEntityId;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import javax.validation.constraints.NotBlank;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import eu.dnetlib.dhp.schema.sx.scholix.ScholixEntityId;
+import io.swagger.v3.oas.annotations.media.Schema;
+
 /**
  * The type Scholix creator type.
  */

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

@@ -1,11 +1,12 @@
 package eu.dnetlib.dhp.schema.sx.api.model.v2;
 
+import javax.validation.constraints.NotBlank;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import eu.dnetlib.dhp.schema.sx.scholix.ScholixIdentifier;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * The type Scholix identifier type.
  */

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

@@ -1,12 +1,13 @@
 package eu.dnetlib.dhp.schema.sx.api.model.v2;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import eu.dnetlib.dhp.schema.sx.scholix.ScholixResource;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import eu.dnetlib.dhp.schema.sx.scholix.ScholixResource;
+
 /**
  * The type Scholix item type.
  */

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

@@ -1,14 +1,16 @@
 package eu.dnetlib.dhp.schema.sx.api.model.v2;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import eu.dnetlib.dhp.schema.sx.scholix.ScholixEntityId;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import javax.validation.constraints.NotBlank;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import eu.dnetlib.dhp.schema.sx.scholix.ScholixEntityId;
+import io.swagger.v3.oas.annotations.media.Schema;
+
 /**
  * The type Scholix link provider type.
  */

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

@@ -1,14 +1,16 @@
 package eu.dnetlib.dhp.schema.sx.api.model.v2;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import eu.dnetlib.dhp.schema.sx.scholix.Scholix;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import eu.dnetlib.dhp.schema.sx.scholix.Scholix;
+import io.swagger.v3.oas.annotations.media.Schema;
+
 /**
  * The type Scholix type.
  */

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

@@ -1,15 +1,16 @@
 package eu.dnetlib.dhp.schema.sx.api.model.v3;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import eu.dnetlib.dhp.schema.sx.api.model.v2.ScholixCreatorType;
-import eu.dnetlib.dhp.schema.sx.api.model.v2.ScholixIdentifierType;
-import eu.dnetlib.dhp.schema.sx.api.model.v2.ScholixLinkProviderType;
-import eu.dnetlib.dhp.schema.sx.scholix.ScholixResource;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import eu.dnetlib.dhp.schema.sx.api.model.v2.ScholixCreatorType;
+import eu.dnetlib.dhp.schema.sx.api.model.v2.ScholixIdentifierType;
+import eu.dnetlib.dhp.schema.sx.api.model.v2.ScholixLinkProviderType;
+import eu.dnetlib.dhp.schema.sx.scholix.ScholixResource;
+
 /**
  * The type Scholix item type.
  */
@@ -184,7 +185,9 @@ public class ScholixItemType {
         if (input == null)
             return null;
         final ScholixItemType instance = new ScholixItemType();
-        instance.setType("publication".equalsIgnoreCase(input.getObjectType())?"literature": "dataset");
+        instance.setType(input.getObjectType());
+        instance.setSubType(input.getObjectSubType());
+//        instance.setType("publication".equalsIgnoreCase(input.getObjectType())?"literature": "dataset");
         instance.setTitle(input.getTitle());
 
         if (input.getIdentifier()!= null)

src/main/java/eu/dnetlib/dhp/schema/sx/api/model/v3/ScholixType.java

@@ -1,16 +1,18 @@
 package eu.dnetlib.dhp.schema.sx.api.model.v3;
 
+import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.validation.constraints.NotBlank;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import eu.dnetlib.dhp.schema.sx.api.model.v2.RelationshipType;
 import eu.dnetlib.dhp.schema.sx.api.model.v2.ScholixLinkProviderType;
 import eu.dnetlib.dhp.schema.sx.scholix.Scholix;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * The type Scholix type.
  */

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

@@ -1,14 +1,14 @@
 
 package eu.dnetlib.dhp.schema.sx.scholix;
 
-import org.apache.commons.lang3.StringUtils;
+import static eu.dnetlib.dhp.schema.sx.scholix.ScholixComparator.*;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import static eu.dnetlib.dhp.schema.sx.scholix.ScholixComparator.*;
+import org.apache.commons.lang3.StringUtils;
 
 public class Scholix implements Serializable, Comparable<Scholix> {
 

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

@@ -1,12 +1,12 @@
 
 package eu.dnetlib.dhp.schema.sx.scholix;
 
-import org.apache.commons.lang3.StringUtils;
+import static eu.dnetlib.dhp.schema.sx.scholix.ScholixComparator.*;
 
 import java.io.Serializable;
 import java.util.Objects;
 
-import static eu.dnetlib.dhp.schema.sx.scholix.ScholixComparator.*;
+import org.apache.commons.lang3.StringUtils;
 
 public class ScholixCollectedFrom implements Serializable, Comparable<ScholixCollectedFrom> {
 

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

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.stream.Stream;
 
 import com.google.common.collect.Iterators;
+
 import me.xuender.unidecode.Unidecode;
 
 public class ScholixComparator {

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

@@ -1,8 +1,7 @@
 
 package eu.dnetlib.dhp.schema.sx.scholix;
 
-import com.google.common.collect.Iterators;
+import static eu.dnetlib.dhp.schema.sx.scholix.ScholixComparator.normalizeString;
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 import java.util.List;
@@ -10,7 +9,9 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static eu.dnetlib.dhp.schema.sx.scholix.ScholixComparator.normalizeString;
+import org.apache.commons.lang3.StringUtils;
+
+import com.google.common.collect.Iterators;
 
 public class ScholixEntityId implements Serializable, Comparable<ScholixEntityId> {
 	private String name;

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

@@ -1,11 +1,12 @@
 
 package eu.dnetlib.dhp.schema.sx.scholix;
 
-import org.apache.commons.lang3.StringUtils;
+import static eu.dnetlib.dhp.schema.sx.scholix.ScholixComparator.normalizeIdnetifier;
+
 import java.io.Serializable;
 import java.util.Objects;
 
-import static eu.dnetlib.dhp.schema.sx.scholix.ScholixComparator.normalizeIdnetifier;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * The type Scholix identifier.

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

@@ -1,11 +1,12 @@
 
 package eu.dnetlib.dhp.schema.sx.scholix;
 
-import org.apache.commons.lang3.StringUtils;
+import static eu.dnetlib.dhp.schema.sx.scholix.ScholixComparator.*;
 
 import java.io.Serializable;
 import java.util.Objects;
-import static eu.dnetlib.dhp.schema.sx.scholix.ScholixComparator.*;
+
+import org.apache.commons.lang3.StringUtils;
 
 public class ScholixRelationship implements Serializable, Comparable<ScholixRelationship> {
 	private String name;

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

@@ -1,14 +1,14 @@
 
 package eu.dnetlib.dhp.schema.sx.scholix;
 
-import org.apache.commons.lang3.StringUtils;
+import static eu.dnetlib.dhp.schema.sx.scholix.ScholixComparator.*;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import static eu.dnetlib.dhp.schema.sx.scholix.ScholixComparator.*;
+import org.apache.commons.lang3.StringUtils;
 
 public class ScholixResource implements Serializable, Comparable<ScholixResource> {
 

src/test/java/eu/dnetlib/dhp/schema/sx/scholix/ScholixCompareTest.java

@@ -1,12 +1,14 @@
 package eu.dnetlib.dhp.schema.sx.scholix;
 
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import org.junit.jupiter.api.Test;
 
 public class ScholixCompareTest {