Merge pull request #124 from kit-data-manager/development

Merge development branch

Author: ThomasJejkal

src/main/java/edu/kit/datamanager/repo/domain/Agent.java

@@ -46,7 +46,6 @@ public class Agent {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @SecureUpdate({"FORBIDDEN"})
     @Searchable
-    @Field(index = false)
     private Long id;
     @Schema(description = "Family name of the user.", example = "Doe", required = false)
     @Field(type = FieldType.Keyword, name = "familyName")
@@ -56,7 +55,7 @@ public class Agent {
     private String givenName;
     @Schema(description = "Affiliation of the user, e.g. home institution.", example = "Karlsruhe Institute of Techology", required = false)
     @ElementCollection
-    @Field(type = FieldType.Nested, includeInParent = true)
+    @Field(type = FieldType.Text)
     private Set<String> affiliations = new HashSet<>();
 
     public static Agent factoryAgent(String givenName, String familyName, String[] affiliations) {

src/main/java/edu/kit/datamanager/repo/domain/Box.java

@@ -40,7 +40,6 @@ public class Box {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @SecureUpdate({"FORBIDDEN"})
     @Searchable
-    @Field(index = false)
     private Long id;
     @Schema(description = "-67.302", example = "-180 <= westLongitude <= 180", required = true)
     @Field(type = FieldType.Float, name = "westLongitude")

src/main/java/edu/kit/datamanager/repo/domain/Contributor.java

@@ -81,7 +81,6 @@ public String getValue() {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @SecureUpdate({"FORBIDDEN"})
     @Searchable
-    @Field(index = false)
     private Long id;
     @Schema(description = "Contributing user.", implementation = edu.kit.datamanager.repo.domain.Agent.class, required = true)
     @OneToOne(cascade = javax.persistence.CascadeType.ALL, orphanRemoval = true)

src/main/java/edu/kit/datamanager/repo/domain/DataResource.java

@@ -93,6 +93,7 @@ public String getValue() {
     //The internal resource identifier assigned once during creation
     @Id
     @org.springframework.data.annotation.Id
+    @Field(type = FieldType.Text)
     @Schema(required = false, accessMode = Schema.AccessMode.READ_ONLY)
     @SecureUpdate({"FORBIDDEN"})
     @Searchable
@@ -184,12 +185,12 @@ public String getValue() {
 
     @Schema(description = "Unstructured size information about the resource or its contents.", example = "15 files, 10 page, 100 bytes", required = false)
     @ElementCollection(fetch = FetchType.EAGER)
-    @Field(type = FieldType.Nested, includeInParent = true)
+    @Field(type = FieldType.Text)
     private Set<String> sizes = new HashSet<>();
 
     @Schema(description = "Format information about the resource or its contents. Preferably, mime types or file extensions are used.", example = "text/plain, xml, application/pdf", required = false)
     @ElementCollection(fetch = FetchType.EAGER)
-    @Field(type = FieldType.Nested, includeInParent = true)
+    @Field(type = FieldType.Text)
     private Set<String> formats = new HashSet<>();
 
     //e.g. major.minor

src/main/java/edu/kit/datamanager/repo/domain/Date.java

@@ -78,7 +78,6 @@ public String getValue() {
     @Schema(required = false, accessMode = Schema.AccessMode.READ_ONLY)
     @SecureUpdate({"FORBIDDEN"})
     @Searchable
-    @Field(index = false)
     private Long id;
     //ISO format
     @Schema(description = "The actual date of the entry.", example = "2017-05-10T10:41:00Z", required = true)

src/main/java/edu/kit/datamanager/repo/domain/Description.java

@@ -65,7 +65,6 @@ public String getValue() {
     @Schema(required = false, accessMode = Schema.AccessMode.READ_ONLY)
     @SecureUpdate({"FORBIDDEN"})
     @Searchable
-    @Field(index = false)
     private Long id;
     @Schema(description = "The actual description as full text.", required = true)
     @Field(type = FieldType.Text, name = "description")

src/main/java/edu/kit/datamanager/repo/domain/FundingReference.java

@@ -44,7 +44,6 @@ public class FundingReference {
     @Schema(required = false, accessMode = Schema.AccessMode.READ_ONLY)
     @SecureUpdate({"FORBIDDEN"})
     @Searchable
-    @Field(index = false)
     private Long id;
     @Schema(required = true)
     @Field(type = FieldType.Text, name = "funderName")

src/main/java/edu/kit/datamanager/repo/domain/GeoLocation.java

@@ -41,7 +41,6 @@ public class GeoLocation {
     @Schema(required = false, accessMode = Schema.AccessMode.READ_ONLY)
     @SecureUpdate({"FORBIDDEN"})
     @Searchable
-    @Field(index = false)
     private Long id;
     @OneToOne(cascade = javax.persistence.CascadeType.ALL, orphanRemoval = true)
     @Field(type = FieldType.Nested, includeInParent = true)

src/main/java/edu/kit/datamanager/repo/domain/Point.java

@@ -41,7 +41,6 @@ public class Point {
     @Schema(required = false, accessMode = Schema.AccessMode.READ_ONLY)
     @SecureUpdate({"FORBIDDEN"})
     @Searchable
-    @Field(index = false)
     private Long id;
     @Schema(example = "-180 <= longitude <= 180", required = true)
     @Field(type = FieldType.Float, name = "longitude")

src/main/java/edu/kit/datamanager/repo/domain/Polygon.java

@@ -45,7 +45,6 @@ public class Polygon {
     @Schema(required = false, accessMode = Schema.AccessMode.READ_ONLY)
     @SecureUpdate({"FORBIDDEN"})
     @Searchable
-    @Field(index = false)
     private Long id;
     @Schema(required = true)
     @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)