From 9890f71491902c83422ab39d8fcec29e47a35144 Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Wed, 31 Aug 2022 14:34:52 +0200 Subject: [PATCH] cleaned empty @Schema --- .../domain/AggregationHistoryResponse.java | 3 -- .../openaire/dsm/domain/ApiDetails.java | 18 ---------- .../dsm/domain/ApiDetailsResponse.java | 3 +- .../openaire/dsm/domain/CollectionInfo.java | 1 - .../openaire/dsm/domain/CollectionMode.java | 3 -- .../dsm/domain/DatasourceDetailResponse.java | 4 --- .../dsm/domain/DatasourceDetails.java | 35 ------------------- .../dsm/domain/DatasourceDetailsUpdate.java | 20 ----------- .../dsm/domain/DatasourceDetailsWithApis.java | 2 -- .../openaire/dsm/domain/DatasourceInfo.java | 9 ----- .../dsm/domain/DatasourceResponse.java | 3 -- .../dsm/domain/DatasourceSearchResponse.java | 4 --- .../dsm/domain/DatasourceSnippet.java | 3 -- .../dsm/domain/DatasourceSnippetExtended.java | 15 -------- .../dsm/domain/DatasourceSnippetResponse.java | 4 --- .../dnetlib/openaire/dsm/domain/Header.java | 9 ----- .../dsm/domain/IdentitiesDetails.java | 3 -- .../dsm/domain/OrganizationDetails.java | 5 --- .../dnetlib/openaire/dsm/domain/Response.java | 1 - .../openaire/dsm/domain/SimpleResponse.java | 4 --- .../dsm/domain/TransformationInfo.java | 2 -- .../openaire/dsm/domain/db/CountryTerm.java | 2 -- 22 files changed, 1 insertion(+), 152 deletions(-) diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationHistoryResponse.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationHistoryResponse.java index 862402b4..e9a92bf0 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationHistoryResponse.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationHistoryResponse.java @@ -5,13 +5,10 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonAutoDetect; import eu.dnetlib.enabling.datasources.common.AggregationInfo; -import io.swagger.v3.oas.annotations.media.Schema; -@Schema @JsonAutoDetect public class AggregationHistoryResponse extends Response { - @Schema private List aggregationInfo; public AggregationHistoryResponse(final List aggregationInfo) { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiDetails.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiDetails.java index b114f316..4768d9a0 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiDetails.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiDetails.java @@ -11,58 +11,40 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(name = "Api model", description = "provides information about the datasource API") public class ApiDetails extends ApiIgnoredProperties { - @Schema private String id = null; - @Schema private String protocol = null; - @Schema private String datasource = null; - @Schema private String contentdescription = null; - @Schema private String eoscDatasourceType = null; - @Schema private String compatibility; - @Schema private String compatibilityOverride; - @Schema private Integer lastCollectionTotal; - @Schema private Date lastCollectionDate; - @Schema private Integer lastAggregationTotal; - @Schema private Date lastAggregationDate; - @Schema private Integer lastDownloadTotal; - @Schema private Date lastDownloadDate; - @Schema private String baseurl; - @Schema protected Boolean removable = false; - @Schema private Set apiParams; - @Schema private String metadataIdentifierPath = ""; - @Schema private String typology = null; public String getId() { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiDetailsResponse.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiDetailsResponse.java index 567b1053..cecb20c1 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiDetailsResponse.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiDetailsResponse.java @@ -6,11 +6,10 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import io.swagger.v3.oas.annotations.media.Schema; -@Schema + @JsonAutoDetect public class ApiDetailsResponse extends Response { - @Schema private List api; public List getApi() { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionInfo.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionInfo.java index ed816d8c..7c21cc3d 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionInfo.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionInfo.java @@ -8,7 +8,6 @@ import io.swagger.v3.oas.annotations.media.Schema; /** * Created by claudio on 29/11/2016. */ -@Schema @JsonAutoDetect public class CollectionInfo extends AggregationInfo { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionMode.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionMode.java index 6ac26ee1..5d8702d7 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionMode.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionMode.java @@ -2,12 +2,9 @@ package eu.dnetlib.openaire.dsm.domain; import com.fasterxml.jackson.annotation.JsonAutoDetect; -import io.swagger.v3.oas.annotations.media.Schema; - /** * Created by claudio on 12/09/16. */ -@Schema @JsonAutoDetect public enum CollectionMode { REFRESH, diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailResponse.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailResponse.java index 49dc55bd..e59cb037 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailResponse.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailResponse.java @@ -4,13 +4,9 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonAutoDetect; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema @JsonAutoDetect public class DatasourceDetailResponse extends Response { - @Schema private List datasourceInfo; public DatasourceDetailResponse(final List datasourceInfo) { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetails.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetails.java index 5dfa2dc9..0d27e3bc 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetails.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetails.java @@ -19,117 +19,82 @@ import io.swagger.v3.oas.annotations.media.Schema; public class DatasourceDetails extends DatasourceIgnoredProperties { @NotBlank - @Schema private String id; @Transient - @Schema private String openaireId; @NotBlank - @Schema private String officialname; @NotBlank - @Schema private String englishname; - @Schema private String websiteurl; - @Schema private String logourl; @Email - @Schema private String contactemail; - @Schema private Double latitude; - @Schema private Double longitude; - @Schema private String timezone; @NotBlank - @Schema private String namespaceprefix; - @Schema private String languages; - @Schema private Date dateofvalidation; @NotBlank - @Schema private String eoscDatasourceType; - @Schema private Date dateofcollection; - @Schema private String platform; - @Schema private String activationId; - @Schema private String description; - @Schema private String issn; - @Schema private String eissn; - @Schema private String lissn; @Email - @Schema private String registeredby; - @Schema private String subjects; - @Schema protected String aggregator = "OPENAIRE"; - @Schema protected String collectedfrom; - @Schema private Boolean managed; - @Schema private Boolean consentTermsOfUse; - @Schema private Boolean fullTextDownload; - @Schema private Date consentTermsOfUseDate; - @Schema private Date lastConsentTermsOfUseDate; - @Schema private Set organizations; - @Schema private Set identities; - @Schema private String status; @Deprecated - @Schema private String typology; - @Schema private Date registrationdate; public String getId() { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsUpdate.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsUpdate.java index ecee9de2..750813bb 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsUpdate.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsUpdate.java @@ -18,69 +18,49 @@ import io.swagger.v3.oas.annotations.media.Schema; public class DatasourceDetailsUpdate { @NotBlank - @Schema private String id; @NotBlank - @Schema private String officialname; @NotBlank - @Schema private String englishname; - @Schema private String websiteurl; - @Schema private String logourl; @Email - @Schema private String contactemail; - @Schema private Double latitude; - @Schema private Double longitude; - @Schema private String timezone; @Deprecated - @Schema private String typology; - @Schema private String eoscDatasourceType; - @Schema private String platform; - @Schema private String description; @Email - @Schema private String registeredby; - @Schema private Boolean managed; - @Schema private Set identities; - @Schema private Boolean consentTermsOfUse; - @Schema private Date consentTermsOfUseDate; - @Schema private Date lastConsentTermsOfUseDate; - @Schema private Boolean fullTextDownload; public String getId() { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsWithApis.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsWithApis.java index 0dbd5b26..8e0c3d09 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsWithApis.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsWithApis.java @@ -14,10 +14,8 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(name = "Datasource model with apis", description = "provides information about the datasource and its apis") public class DatasourceDetailsWithApis { - @Schema private DatasourceDetails datasource; - @Schema private List apis = new ArrayList<>(); public DatasourceDetails getDatasource() { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceInfo.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceInfo.java index f6a55f94..07399122 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceInfo.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceInfo.java @@ -11,31 +11,22 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(name = "Datasource info model", description = "provides information about the datasource and its aggregation status") public class DatasourceInfo { - @Schema private long indexRecords; - @Schema private long fundedContent; - @Schema private long fulltexts; - @Schema private String lastIndexingDate; - @Schema private String firstHarvestDate; - @Schema private DatasourceDetails datasource; - @Schema private AggregationInfo lastCollection; - @Schema private AggregationInfo lastTransformation; - @Schema private List aggregationHistory; public DatasourceInfo() { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceResponse.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceResponse.java index 35a5a3e4..9aba8b8a 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceResponse.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceResponse.java @@ -5,9 +5,6 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.google.common.collect.Lists; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema @JsonAutoDetect public class DatasourceResponse extends Response { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSearchResponse.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSearchResponse.java index 3e00fd03..2be76532 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSearchResponse.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSearchResponse.java @@ -4,13 +4,9 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonAutoDetect; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema @JsonAutoDetect public class DatasourceSearchResponse extends Response { - @Schema private List datasourceInfo; public DatasourceSearchResponse(final List datasourceInfo) { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippet.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippet.java index 0ab9413c..9ce47b8d 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippet.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippet.java @@ -11,15 +11,12 @@ import io.swagger.v3.oas.annotations.media.Schema; public class DatasourceSnippet { @NotBlank - @Schema private String id; @NotBlank - @Schema private String officialname; @NotBlank - @Schema private String englishname; public String getId() { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetExtended.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetExtended.java index 55f2f1d5..819fe307 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetExtended.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetExtended.java @@ -15,53 +15,38 @@ import io.swagger.v3.oas.annotations.media.Schema; public class DatasourceSnippetExtended { @NotBlank - @Schema private String id; @NotBlank - @Schema private String officialname; @NotBlank - @Schema private String englishname; - @Schema private String websiteurl; @Email - @Schema private String registeredby; - @Schema private Date registrationdate; - @Schema private String eoscDatasourceType; - @Schema private String logoUrl; - @Schema private String description; - @Schema private Boolean consentTermsOfUse; - @Schema private Date consentTermsOfUseDate; - @Schema private Date lastConsentTermsOfUseDate; - @Schema private Boolean fullTextDownload; - @Schema private Set organizations; @Deprecated - @Schema private String typology; public String getId() { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetResponse.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetResponse.java index e226176d..522d5653 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetResponse.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetResponse.java @@ -4,13 +4,9 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonAutoDetect; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema @JsonAutoDetect public class DatasourceSnippetResponse extends Response { - @Schema private List datasourceInfo; public DatasourceSnippetResponse(final List datasourceInfo) { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/Header.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/Header.java index 764ab879..4db04905 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/Header.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/Header.java @@ -9,28 +9,19 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.common.collect.Lists; import com.google.gson.GsonBuilder; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema @JsonAutoDetect public class Header { - @Schema private long total; - @Schema private int page; - @Schema private int size; - @Schema private long time; - @Schema private int statusCode; - @Schema private List errors = Lists.newArrayList(); @JsonIgnore diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/IdentitiesDetails.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/IdentitiesDetails.java index 9a55d3a9..48cba1e9 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/IdentitiesDetails.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/IdentitiesDetails.java @@ -2,9 +2,6 @@ package eu.dnetlib.openaire.dsm.domain; import com.fasterxml.jackson.annotation.JsonAutoDetect; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema @JsonAutoDetect public class IdentitiesDetails { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/OrganizationDetails.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/OrganizationDetails.java index 4337caa1..1abc52d4 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/OrganizationDetails.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/OrganizationDetails.java @@ -10,21 +10,16 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(name = "Organization info model", description = "provides information about the organization") public class OrganizationDetails extends OrganizationIgnoredProperties { - @Schema private String legalshortname; @NotBlank - @Schema private String legalname; - @Schema private String websiteurl; - @Schema private String logourl; @NotBlank - @Schema private String country; public String getLegalshortname() { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/Response.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/Response.java index ca256d07..abba2c54 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/Response.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/Response.java @@ -8,7 +8,6 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(name = "Api response model", description = "Api response model, provides a response header") public class Response { - @Schema private Header header; public Response() { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/SimpleResponse.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/SimpleResponse.java index 66730df2..73381faf 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/SimpleResponse.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/SimpleResponse.java @@ -4,13 +4,9 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonAutoDetect; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema @JsonAutoDetect public class SimpleResponse extends Response { - @Schema private List response; public List getResponse() { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/TransformationInfo.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/TransformationInfo.java index 954bd908..ec7cf05f 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/TransformationInfo.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/TransformationInfo.java @@ -3,12 +3,10 @@ package eu.dnetlib.openaire.dsm.domain; import com.fasterxml.jackson.annotation.JsonAutoDetect; import eu.dnetlib.enabling.datasources.common.AggregationInfo; -import io.swagger.v3.oas.annotations.media.Schema; /** * Created by claudio on 29/11/2016. */ -@Schema @JsonAutoDetect public class TransformationInfo extends AggregationInfo { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/db/CountryTerm.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/db/CountryTerm.java index f635b1c0..8fc19f5b 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/db/CountryTerm.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/db/CountryTerm.java @@ -7,14 +7,12 @@ import javax.persistence.Table; import com.fasterxml.jackson.annotation.JsonAutoDetect; import eu.dnetlib.enabling.datasources.common.BrowseTerm; -import io.swagger.v3.oas.annotations.media.Schema; /** * Created by claudio on 20/04/2017. */ @Entity @Table(name = "browse_countries") -@Schema @JsonAutoDetect public class CountryTerm implements Comparable, BrowseTerm {