generated from 2martens/template-service
Moved common fields back to the individual entitites
This commit is contained in:
parent
37ee7bff7a
commit
d14361b8fd
|
@ -1,22 +1,52 @@
|
||||||
package de.twomartens.oparlservice.entity;
|
package de.twomartens.oparlservice.entity;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import lombok.experimental.SuperBuilder;
|
|
||||||
|
|
||||||
import java.time.ZonedDateTime;
|
import java.time.ZonedDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@SuperBuilder
|
@Builder
|
||||||
@Getter
|
@Getter
|
||||||
@ToString
|
@ToString
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
||||||
@Schema(allOf = CommonFields.class)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
public class AgendaItem extends CommonFields {
|
public class AgendaItem {
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "The unique identifier of the object")
|
||||||
|
private final String id;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "Namespace URL to the object type schema")
|
||||||
|
private final String type;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the creation of the object")
|
||||||
|
private final ZonedDateTime created;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the last update of the object")
|
||||||
|
private final ZonedDateTime modified;
|
||||||
|
|
||||||
|
@Schema(description = "URL to the license", nullable = true)
|
||||||
|
private String license;
|
||||||
|
|
||||||
|
@Schema(description = "Categorization of the object", nullable = true)
|
||||||
|
private String keyword;
|
||||||
|
|
||||||
|
@Schema(description = "URL of a website that presents the object in the browser", nullable = true)
|
||||||
|
private String web;
|
||||||
|
|
||||||
|
@Schema(description = "True, if the object was deleted")
|
||||||
|
private final boolean deleted;
|
||||||
|
|
||||||
@Schema(description = "URL to the meeting this agenda item is part of", nullable = true)
|
@Schema(description = "URL to the meeting this agenda item is part of", nullable = true)
|
||||||
private final String meeting;
|
private final String meeting;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package de.twomartens.oparlservice.entity;
|
package de.twomartens.oparlservice.entity;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import lombok.experimental.SuperBuilder;
|
import lombok.experimental.SuperBuilder;
|
||||||
|
@ -8,13 +9,43 @@ import lombok.experimental.SuperBuilder;
|
||||||
import java.time.ZonedDateTime;
|
import java.time.ZonedDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@SuperBuilder
|
@Builder
|
||||||
@Getter
|
@Getter
|
||||||
@ToString
|
@ToString
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
||||||
public class Body extends CommonFields {
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
|
public class Body {
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "The unique identifier of the object")
|
||||||
|
private final String id;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "Namespace URL to the object type schema")
|
||||||
|
private final String type;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the creation of the object")
|
||||||
|
private final ZonedDateTime created;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the last update of the object")
|
||||||
|
private final ZonedDateTime modified;
|
||||||
|
|
||||||
|
@Schema(description = "URL to the license", nullable = true)
|
||||||
|
private String license;
|
||||||
|
|
||||||
|
@Schema(description = "Categorization of the object", nullable = true)
|
||||||
|
private String keyword;
|
||||||
|
|
||||||
|
@Schema(description = "URL of a website that presents the object in the browser", nullable = true)
|
||||||
|
private String web;
|
||||||
|
|
||||||
|
@Schema(description = "True, if the object was deleted")
|
||||||
|
private final boolean deleted;
|
||||||
|
|
||||||
@Schema(description = "URL to the system this body belongs to", nullable = true)
|
@Schema(description = "URL to the system this body belongs to", nullable = true)
|
||||||
private final String system;
|
private final String system;
|
||||||
|
|
|
@ -1,43 +0,0 @@
|
||||||
package de.twomartens.oparlservice.entity;
|
|
||||||
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
|
||||||
import lombok.*;
|
|
||||||
import lombok.experimental.SuperBuilder;
|
|
||||||
|
|
||||||
import java.time.ZonedDateTime;
|
|
||||||
|
|
||||||
@SuperBuilder
|
|
||||||
@Getter
|
|
||||||
@ToString
|
|
||||||
@EqualsAndHashCode
|
|
||||||
@AllArgsConstructor(access = AccessLevel.PROTECTED)
|
|
||||||
@NoArgsConstructor(force = true, access = AccessLevel.PROTECTED)
|
|
||||||
public class CommonFields {
|
|
||||||
@NonNull
|
|
||||||
@Schema(required = true, description = "The unique identifier of the object")
|
|
||||||
private final String id;
|
|
||||||
|
|
||||||
@NonNull
|
|
||||||
@Schema(required = true, description = "Namespace URL to the object type schema")
|
|
||||||
private final String type;
|
|
||||||
|
|
||||||
@NonNull
|
|
||||||
@Schema(required = true, description = "Date and time of the creation of the object")
|
|
||||||
private final ZonedDateTime created;
|
|
||||||
|
|
||||||
@NonNull
|
|
||||||
@Schema(required = true, description = "Date and time of the last update of the object")
|
|
||||||
private final ZonedDateTime modified;
|
|
||||||
|
|
||||||
@Schema(description = "URL to the license", nullable = true)
|
|
||||||
private String license;
|
|
||||||
|
|
||||||
@Schema(description = "Categorization of the object", nullable = true)
|
|
||||||
private String keyword;
|
|
||||||
|
|
||||||
@Schema(description = "URL of a website that presents the object in the browser", nullable = true)
|
|
||||||
private String web;
|
|
||||||
|
|
||||||
@Schema(description = "True, if the object was deleted")
|
|
||||||
private final boolean deleted;
|
|
||||||
}
|
|
|
@ -1,19 +1,51 @@
|
||||||
package de.twomartens.oparlservice.entity;
|
package de.twomartens.oparlservice.entity;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import lombok.experimental.SuperBuilder;
|
|
||||||
|
|
||||||
|
import java.time.ZonedDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@SuperBuilder
|
@Builder
|
||||||
@Getter
|
@Getter
|
||||||
@ToString
|
@ToString
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
||||||
@Schema(allOf = CommonFields.class)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
public class Consultation extends CommonFields {
|
public class Consultation {
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "The unique identifier of the object")
|
||||||
|
private final String id;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "Namespace URL to the object type schema")
|
||||||
|
private final String type;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the creation of the object")
|
||||||
|
private final ZonedDateTime created;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the last update of the object")
|
||||||
|
private final ZonedDateTime modified;
|
||||||
|
|
||||||
|
@Schema(description = "URL to the license", nullable = true)
|
||||||
|
private String license;
|
||||||
|
|
||||||
|
@Schema(description = "Categorization of the object", nullable = true)
|
||||||
|
private String keyword;
|
||||||
|
|
||||||
|
@Schema(description = "URL of a website that presents the object in the browser", nullable = true)
|
||||||
|
private String web;
|
||||||
|
|
||||||
|
@Schema(description = "True, if the object was deleted")
|
||||||
|
private final boolean deleted;
|
||||||
|
|
||||||
@Schema(description = "URL to the paper related to this consultation", nullable = true)
|
@Schema(description = "URL to the paper related to this consultation", nullable = true)
|
||||||
private final String paper;
|
private final String paper;
|
||||||
|
|
||||||
|
|
|
@ -1,21 +1,52 @@
|
||||||
package de.twomartens.oparlservice.entity;
|
package de.twomartens.oparlservice.entity;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import lombok.experimental.SuperBuilder;
|
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
import java.time.ZonedDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@SuperBuilder
|
@Builder
|
||||||
@Getter
|
@Getter
|
||||||
@ToString
|
@ToString
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
||||||
@Schema(allOf = CommonFields.class)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
public class File extends CommonFields {
|
public class File {
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "The unique identifier of the object")
|
||||||
|
private final String id;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "Namespace URL to the object type schema")
|
||||||
|
private final String type;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the creation of the object")
|
||||||
|
private final ZonedDateTime created;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the last update of the object")
|
||||||
|
private final ZonedDateTime modified;
|
||||||
|
|
||||||
|
@Schema(description = "URL to the license", nullable = true)
|
||||||
|
private String license;
|
||||||
|
|
||||||
|
@Schema(description = "Categorization of the object", nullable = true)
|
||||||
|
private String keyword;
|
||||||
|
|
||||||
|
@Schema(description = "URL of a website that presents the object in the browser", nullable = true)
|
||||||
|
private String web;
|
||||||
|
|
||||||
|
@Schema(description = "True, if the object was deleted")
|
||||||
|
private final boolean deleted;
|
||||||
|
|
||||||
@Schema(description = "name of the file without file ending", nullable = true)
|
@Schema(description = "name of the file without file ending", nullable = true)
|
||||||
private final String name;
|
private final String name;
|
||||||
|
|
||||||
|
|
|
@ -1,21 +1,50 @@
|
||||||
package de.twomartens.oparlservice.entity;
|
package de.twomartens.oparlservice.entity;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import lombok.experimental.SuperBuilder;
|
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.ZonedDateTime;
|
import java.time.ZonedDateTime;
|
||||||
|
|
||||||
@SuperBuilder
|
@Builder
|
||||||
@Getter
|
@Getter
|
||||||
@ToString
|
@ToString
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
||||||
@Schema(allOf = CommonFields.class)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
public class LegislativeTerm extends CommonFields {
|
public class LegislativeTerm {
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "The unique identifier of the object")
|
||||||
|
private final String id;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "Namespace URL to the object type schema")
|
||||||
|
private final String type;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the creation of the object")
|
||||||
|
private final ZonedDateTime created;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the last update of the object")
|
||||||
|
private final ZonedDateTime modified;
|
||||||
|
|
||||||
|
@Schema(description = "URL to the license", nullable = true)
|
||||||
|
private String license;
|
||||||
|
|
||||||
|
@Schema(description = "Categorization of the object", nullable = true)
|
||||||
|
private String keyword;
|
||||||
|
|
||||||
|
@Schema(description = "URL of a website that presents the object in the browser", nullable = true)
|
||||||
|
private String web;
|
||||||
|
|
||||||
|
@Schema(description = "True, if the object was deleted")
|
||||||
|
private final boolean deleted;
|
||||||
|
|
||||||
@Schema(description = "URL to body this legislative term belongs to", nullable = true)
|
@Schema(description = "URL to body this legislative term belongs to", nullable = true)
|
||||||
private final String body;
|
private final String body;
|
||||||
|
|
|
@ -1,19 +1,50 @@
|
||||||
package de.twomartens.oparlservice.entity;
|
package de.twomartens.oparlservice.entity;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import lombok.experimental.SuperBuilder;
|
|
||||||
|
|
||||||
|
import java.time.ZonedDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@SuperBuilder
|
@Builder
|
||||||
@Getter
|
@Getter
|
||||||
@ToString
|
@ToString
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
||||||
@Schema(allOf = CommonFields.class)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
public class Location extends CommonFields {
|
public class Location {
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "The unique identifier of the object")
|
||||||
|
private final String id;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "Namespace URL to the object type schema")
|
||||||
|
private final String type;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the creation of the object")
|
||||||
|
private final ZonedDateTime created;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the last update of the object")
|
||||||
|
private final ZonedDateTime modified;
|
||||||
|
|
||||||
|
@Schema(description = "URL to the license", nullable = true)
|
||||||
|
private String license;
|
||||||
|
|
||||||
|
@Schema(description = "Categorization of the object", nullable = true)
|
||||||
|
private String keyword;
|
||||||
|
|
||||||
|
@Schema(description = "URL of a website that presents the object in the browser", nullable = true)
|
||||||
|
private String web;
|
||||||
|
|
||||||
|
@Schema(description = "True, if the object was deleted")
|
||||||
|
private final boolean deleted;
|
||||||
|
|
||||||
@Schema(description = "description of the location", nullable = true)
|
@Schema(description = "description of the location", nullable = true)
|
||||||
private final String description;
|
private final String description;
|
||||||
|
|
|
@ -1,21 +1,51 @@
|
||||||
package de.twomartens.oparlservice.entity;
|
package de.twomartens.oparlservice.entity;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import lombok.experimental.SuperBuilder;
|
|
||||||
|
|
||||||
import java.time.ZonedDateTime;
|
import java.time.ZonedDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@SuperBuilder
|
@Builder
|
||||||
@Getter
|
@Getter
|
||||||
@ToString
|
@ToString
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
||||||
@Schema(allOf = CommonFields.class)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
public class Meeting extends CommonFields {
|
public class Meeting {
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "The unique identifier of the object")
|
||||||
|
private final String id;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "Namespace URL to the object type schema")
|
||||||
|
private final String type;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the creation of the object")
|
||||||
|
private final ZonedDateTime created;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the last update of the object")
|
||||||
|
private final ZonedDateTime modified;
|
||||||
|
|
||||||
|
@Schema(description = "URL to the license", nullable = true)
|
||||||
|
private String license;
|
||||||
|
|
||||||
|
@Schema(description = "Categorization of the object", nullable = true)
|
||||||
|
private String keyword;
|
||||||
|
|
||||||
|
@Schema(description = "URL of a website that presents the object in the browser", nullable = true)
|
||||||
|
private String web;
|
||||||
|
|
||||||
|
@Schema(description = "True, if the object was deleted")
|
||||||
|
private final boolean deleted;
|
||||||
|
|
||||||
@Schema(description = "name of the meeting")
|
@Schema(description = "name of the meeting")
|
||||||
private final String name;
|
private final String name;
|
||||||
|
|
||||||
|
|
|
@ -1,20 +1,51 @@
|
||||||
package de.twomartens.oparlservice.entity;
|
package de.twomartens.oparlservice.entity;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import lombok.experimental.SuperBuilder;
|
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
import java.time.ZonedDateTime;
|
||||||
|
|
||||||
@SuperBuilder
|
@Builder
|
||||||
@Getter
|
@Getter
|
||||||
@ToString
|
@ToString
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
||||||
@Schema(allOf = CommonFields.class)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
public class Membership extends CommonFields {
|
public class Membership {
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "The unique identifier of the object")
|
||||||
|
private final String id;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "Namespace URL to the object type schema")
|
||||||
|
private final String type;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the creation of the object")
|
||||||
|
private final ZonedDateTime created;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the last update of the object")
|
||||||
|
private final ZonedDateTime modified;
|
||||||
|
|
||||||
|
@Schema(description = "URL to the license", nullable = true)
|
||||||
|
private String license;
|
||||||
|
|
||||||
|
@Schema(description = "Categorization of the object", nullable = true)
|
||||||
|
private String keyword;
|
||||||
|
|
||||||
|
@Schema(description = "URL of a website that presents the object in the browser", nullable = true)
|
||||||
|
private String web;
|
||||||
|
|
||||||
|
@Schema(description = "True, if the object was deleted")
|
||||||
|
private final boolean deleted;
|
||||||
|
|
||||||
@Schema(description = "URL to the person related to this membership", nullable = true)
|
@Schema(description = "URL to the person related to this membership", nullable = true)
|
||||||
private final String person;
|
private final String person;
|
||||||
|
|
||||||
|
|
|
@ -1,21 +1,51 @@
|
||||||
package de.twomartens.oparlservice.entity;
|
package de.twomartens.oparlservice.entity;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import lombok.experimental.SuperBuilder;
|
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
import java.time.ZonedDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@SuperBuilder
|
@Builder
|
||||||
@Getter
|
@Getter
|
||||||
@ToString
|
@ToString
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
||||||
@Schema(allOf = CommonFields.class)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
public class Organization extends CommonFields {
|
public class Organization {
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "The unique identifier of the object")
|
||||||
|
private final String id;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "Namespace URL to the object type schema")
|
||||||
|
private final String type;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the creation of the object")
|
||||||
|
private final ZonedDateTime created;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the last update of the object")
|
||||||
|
private final ZonedDateTime modified;
|
||||||
|
|
||||||
|
@Schema(description = "URL to the license", nullable = true)
|
||||||
|
private String license;
|
||||||
|
|
||||||
|
@Schema(description = "Categorization of the object", nullable = true)
|
||||||
|
private String keyword;
|
||||||
|
|
||||||
|
@Schema(description = "URL of a website that presents the object in the browser", nullable = true)
|
||||||
|
private String web;
|
||||||
|
|
||||||
|
@Schema(description = "True, if the object was deleted")
|
||||||
|
private final boolean deleted;
|
||||||
|
|
||||||
@Schema(description = "URL to body this legislative term belongs to", nullable = true)
|
@Schema(description = "URL to body this legislative term belongs to", nullable = true)
|
||||||
private final String body;
|
private final String body;
|
||||||
|
|
|
@ -1,21 +1,52 @@
|
||||||
package de.twomartens.oparlservice.entity;
|
package de.twomartens.oparlservice.entity;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import lombok.experimental.SuperBuilder;
|
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
import java.time.ZonedDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@SuperBuilder
|
@Builder
|
||||||
@Getter
|
@Getter
|
||||||
@ToString
|
@ToString
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
||||||
@Schema(allOf = CommonFields.class)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
public class Paper extends CommonFields {
|
public class Paper {
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "The unique identifier of the object")
|
||||||
|
private final String id;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "Namespace URL to the object type schema")
|
||||||
|
private final String type;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the creation of the object")
|
||||||
|
private final ZonedDateTime created;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the last update of the object")
|
||||||
|
private final ZonedDateTime modified;
|
||||||
|
|
||||||
|
@Schema(description = "URL to the license", nullable = true)
|
||||||
|
private String license;
|
||||||
|
|
||||||
|
@Schema(description = "Categorization of the object", nullable = true)
|
||||||
|
private String keyword;
|
||||||
|
|
||||||
|
@Schema(description = "URL of a website that presents the object in the browser", nullable = true)
|
||||||
|
private String web;
|
||||||
|
|
||||||
|
@Schema(description = "True, if the object was deleted")
|
||||||
|
private final boolean deleted;
|
||||||
|
|
||||||
@Schema(description = "URL to the body this paper belongs to", nullable = true)
|
@Schema(description = "URL to the body this paper belongs to", nullable = true)
|
||||||
private final String body;
|
private final String body;
|
||||||
|
|
||||||
|
|
|
@ -1,19 +1,51 @@
|
||||||
package de.twomartens.oparlservice.entity;
|
package de.twomartens.oparlservice.entity;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import lombok.experimental.SuperBuilder;
|
|
||||||
|
|
||||||
|
import java.time.ZonedDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@SuperBuilder
|
@Builder
|
||||||
@Getter
|
@Getter
|
||||||
@ToString
|
@ToString
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
||||||
@Schema(allOf = CommonFields.class)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
public class Person extends CommonFields {
|
public class Person {
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "The unique identifier of the object")
|
||||||
|
private final String id;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "Namespace URL to the object type schema")
|
||||||
|
private final String type;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the creation of the object")
|
||||||
|
private final ZonedDateTime created;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the last update of the object")
|
||||||
|
private final ZonedDateTime modified;
|
||||||
|
|
||||||
|
@Schema(description = "URL to the license", nullable = true)
|
||||||
|
private String license;
|
||||||
|
|
||||||
|
@Schema(description = "Categorization of the object", nullable = true)
|
||||||
|
private String keyword;
|
||||||
|
|
||||||
|
@Schema(description = "URL of a website that presents the object in the browser", nullable = true)
|
||||||
|
private String web;
|
||||||
|
|
||||||
|
@Schema(description = "True, if the object was deleted")
|
||||||
|
private final boolean deleted;
|
||||||
|
|
||||||
@Schema(description = "URL to the body this person belongs so", nullable = true)
|
@Schema(description = "URL to the body this person belongs so", nullable = true)
|
||||||
private final String body;
|
private final String body;
|
||||||
|
|
||||||
|
|
|
@ -1,19 +1,50 @@
|
||||||
package de.twomartens.oparlservice.entity;
|
package de.twomartens.oparlservice.entity;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import lombok.experimental.SuperBuilder;
|
|
||||||
|
|
||||||
|
import java.time.ZonedDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@SuperBuilder
|
@Builder
|
||||||
@Getter
|
@Getter
|
||||||
@ToString
|
@ToString
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
|
||||||
@Schema(allOf = CommonFields.class)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
public class System extends CommonFields {
|
public class System {
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "The unique identifier of the object")
|
||||||
|
private final String id;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Schema(required = true, description = "Namespace URL to the object type schema")
|
||||||
|
private final String type;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the creation of the object")
|
||||||
|
private final ZonedDateTime created;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
@Schema(required = true, description = "Date and time of the last update of the object")
|
||||||
|
private final ZonedDateTime modified;
|
||||||
|
|
||||||
|
@Schema(description = "URL to the license", nullable = true)
|
||||||
|
private String license;
|
||||||
|
|
||||||
|
@Schema(description = "Categorization of the object", nullable = true)
|
||||||
|
private String keyword;
|
||||||
|
|
||||||
|
@Schema(description = "URL of a website that presents the object in the browser", nullable = true)
|
||||||
|
private String web;
|
||||||
|
|
||||||
|
@Schema(description = "True, if the object was deleted")
|
||||||
|
private final boolean deleted;
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
@Schema(required = true, description = "URL to the OParl specification supported by this service")
|
@Schema(required = true, description = "URL to the OParl specification supported by this service")
|
||||||
|
|
Loading…
Reference in New Issue