Moved common fields back to the individual entitites

oparl-server/src/main/java/de/twomartens/oparlservice/entity/Paper.java

@@ -1,21 +1,52 @@
 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 lombok.*;
-import lombok.experimental.SuperBuilder;
 
 import java.time.LocalDate;
+import java.time.ZonedDateTime;
 import java.util.List;
 
-@SuperBuilder
+@Builder
 @Getter
 @ToString
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
-@Schema(allOf = CommonFields.class)
-public class Paper extends CommonFields {
+@JsonInclude(JsonInclude.Include.NON_NULL)
+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)
     private final String body;