Merge pull request 'release_1.1.5' (#9) from release_1.1.5 into master

Reviewed-on: https://gitea.intranda.com/intranda/goobi-vocabulary-server/pulls/9
intranda · Oct 24, 2024 · 494e9d9 · 494e9d9
2 parents 992ad5d + d21701e
commit 494e9d9
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 37 deletions.
diff --git a/migration/lib/data/field_definition.py b/migration/lib/data/field_definition.py
@@ -69,8 +69,6 @@ def post_process(self, fallback_language):
                     logging.warning(f'Fallback language {fallback_language} is not defined for field definition:\n{self.__str__()}')
                 fallback_translations[0]['fallback'] = True
                 fallback_translations[0]['required'] = True
-        if self['titleField']:
-            self['required'] = True
         if self['mainEntry']:
             self['required'] = True
 

diff --git a/module-core/pom.xml b/module-core/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>io.goobi.vocabulary</groupId>
     <artifactId>vocabulary-server-core</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <name>Vocabulary-Server-Core</name>
     <description>Spring Boot based RESTful web service for vocabulary management</description>
     <packaging>jar</packaging>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>io.goobi.vocabulary</groupId>
             <artifactId>vocabulary-server-exchange</artifactId>
-            <version>1.1.4</version>
+            <version>1.1.5</version>
             <scope>compile</scope>
         </dependency>
 

diff --git a/module-core/src/main/java/io/goobi/vocabulary/validation/SchemaValidatorImpl.java b/module-core/src/main/java/io/goobi/vocabulary/validation/SchemaValidatorImpl.java
@@ -28,7 +28,6 @@ public SchemaValidatorImpl(Validator<FieldDefinitionEntity> fieldDefinitionValid
                 this::checkFieldDefinitionExistence,
                 this::checkSingleMainFieldDefinition,
                 this::checkMainFieldIsRequired,
-                this::checkTitleFieldsAreRequired,
                 this::perFieldDefinitionChecks
         ));
     }
@@ -70,20 +69,6 @@ private void checkMainFieldIsRequired(VocabularySchemaEntity schema) throws Voca
         }
     }
 
-    private void checkTitleFieldsAreRequired(VocabularySchemaEntity schema) throws VocabularyException {
-        List<String> titleFieldsThatAreNotRequired = schema.getDefinitions().stream()
-                .filter(d -> Boolean.TRUE.equals(d.isTitleField()))
-                .filter(d -> Boolean.FALSE.equals(d.isRequired()))
-                .map(FieldDefinitionEntity::getName)
-                .collect(Collectors.toList());
-        if (!titleFieldsThatAreNotRequired.isEmpty()) {
-            throw new VocabularyException(SchemaValidationTitleFieldsAreNotRequired, null, Map.of(
-                    "titleFieldNames", String.join(",", titleFieldsThatAreNotRequired)
-            ),
-                    params -> "Title fields need to be required: " + params.get("titleFieldNames"));
-        }
-    }
-
     private void perFieldDefinitionChecks(VocabularySchemaEntity schema) throws VocabularyException {
         List<VocabularyException> errors = new LinkedList<>();
         for (FieldDefinitionEntity d : schema.getDefinitions()) {

diff --git a/module-core/src/test/java/io/goobi/vocabulary/validation/SchemaValidationTests.java b/module-core/src/test/java/io/goobi/vocabulary/validation/SchemaValidationTests.java
@@ -92,22 +92,6 @@ void exactlyOneMainFieldDefinitionThatIsNotRequired_fails() {
         assertThrows(VocabularyException.class, () -> validator.validate(schema));
     }
 
-    @Test
-    void titleFieldsThatIsNotRequired_fails() {
-        VocabularySchemaEntity schema = new VocabularySchemaEntity();
-
-        FieldDefinitionEntity mainEntryField = validMainField(schema, "Main");
-        FieldDefinitionEntity titleField = new FieldDefinitionEntity();
-        titleField.setSchema(schema);
-        titleField.setName("Title");
-        titleField.setTitleField(true);
-        titleField.setRequired(false);
-
-        schema.setDefinitions(List.of(mainEntryField, titleField));
-
-        assertThrows(VocabularyException.class, () -> validator.validate(schema));
-    }
-
     @Test
     void titleFieldsThatIsRequired_success() throws VocabularyException {
         VocabularySchemaEntity schema = new VocabularySchemaEntity();

diff --git a/module-exchange/pom.xml b/module-exchange/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.goobi.vocabulary</groupId>
     <artifactId>vocabulary-server-exchange</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <name>Vocabulary Exchange</name>
     <description>Vocabulary data exchange classes</description>
     <packaging>jar</packaging>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.goobi.vocabulary</groupId>
     <artifactId>vocabulary-server</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <name>Vocabulary-Server</name>
     <packaging>pom</packaging>
     <description>RESTful webservice for vocabulary management</description>