springdoc-openapi-ui #21

Merged
claudio.atzori merged 3 commits from springdoc-openapi-ui into master 2022-09-08 09:19:34 +02:00
2 changed files with 3 additions and 17 deletions

15
pom.xml
View File

@ -5,7 +5,7 @@
<groupId>eu.dnetlib.dhp</groupId> <groupId>eu.dnetlib.dhp</groupId>
<artifactId>dhp-schemas</artifactId> <artifactId>dhp-schemas</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>2.13.2-SNAPSHOT</version> <version>2.14.0-SNAPSHOT</version>
<licenses> <licenses>
<license> <license>
@ -339,11 +339,6 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${dhp.swagger-annotations-version}</version>
</dependency>
<dependency> <dependency>
<groupId>io.swagger.core.v3</groupId> <groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
@ -397,10 +392,6 @@
<groupId>me.xuender</groupId> <groupId>me.xuender</groupId>
<artifactId>unidecode</artifactId> <artifactId>unidecode</artifactId>
</dependency> </dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</dependency>
<dependency> <dependency>
<groupId>io.swagger.core.v3</groupId> <groupId>io.swagger.core.v3</groupId>
@ -474,13 +465,13 @@
<dhp.dateparser.version>1.0.7</dhp.dateparser.version> <dhp.dateparser.version>1.0.7</dhp.dateparser.version>
<dhp.jsonschema.module.addon.version>1.2.1</dhp.jsonschema.module.addon.version> <dhp.jsonschema.module.addon.version>1.2.1</dhp.jsonschema.module.addon.version>
<dhp.validation.api.version>2.0.1.Final</dhp.validation.api.version> <dhp.validation.api.version>2.0.1.Final</dhp.validation.api.version>
<dhp.swagger.annotations.version>2.1.12</dhp.swagger.annotations.version> <dhp.swagger.annotations.version>2.2.2</dhp.swagger.annotations.version>
<dhp.javax.persistence.api.version>2.2</dhp.javax.persistence.api.version> <dhp.javax.persistence.api.version>2.2</dhp.javax.persistence.api.version>
<dhp.commons.codec.version>1.9</dhp.commons.codec.version> <dhp.commons.codec.version>1.9</dhp.commons.codec.version>
<dhp.commons.io.version>2.4</dhp.commons.io.version> <dhp.commons.io.version>2.4</dhp.commons.io.version>
<dhp.slf4j.version>1.7.25</dhp.slf4j.version> <dhp.slf4j.version>1.7.25</dhp.slf4j.version>
<dhp.unidecode.version>0.0.7</dhp.unidecode.version> <dhp.unidecode.version>0.0.7</dhp.unidecode.version>
<dhp.swagger-annotations-version>1.5.20</dhp.swagger-annotations-version> <dhp.swagger-annotations-version>2.1.12</dhp.swagger-annotations-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.plugin.version>3.6.0</maven.compiler.plugin.version> <maven.compiler.plugin.version>3.6.0</maven.compiler.plugin.version>

View File

@ -8,7 +8,6 @@ import javax.validation.constraints.NotBlank;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
/** /**
@ -19,22 +18,18 @@ public class PageResultType implements Serializable {
@NotBlank @NotBlank
@JsonProperty("currentPage") @JsonProperty("currentPage")
@ApiModelProperty(position = 0)
private Integer currentPage = 0; private Integer currentPage = 0;
@NotBlank @NotBlank
@JsonProperty("totalLinks") @JsonProperty("totalLinks")
@ApiModelProperty(position = 1)
private Integer totalLinks= 0; private Integer totalLinks= 0;
@NotBlank @NotBlank
@JsonProperty("totalPages") @JsonProperty("totalPages")
@ApiModelProperty(position = 2)
private Integer totalPages = 0; private Integer totalPages = 0;
@NotBlank @NotBlank
@JsonProperty("result") @JsonProperty("result")
@ApiModelProperty(position = 3)
private List<ScholixType> result = new ArrayList<>(); private List<ScholixType> result = new ArrayList<>();