Merge remote-tracking branch 'origin/develop' into feature_cmspage_ar…

…chive
intranda · Jan 24, 2025 · 8fa89d1 · 8fa89d1
2 parents 4ba2168 + 0e7204b
commit 8fa89d1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/goobi-viewer-core/pom.xml b/goobi-viewer-core/pom.xml
@@ -118,7 +118,7 @@
 		<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
 		<jakarta.websocket.version>2.2.0</jakarta.websocket.version>
 		<jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
-		<java-jwt.version>3.19.1</java-jwt.version>
+		<java-jwt.version>4.4.0</java-jwt.version>
 		<jwks-rsa.version>0.22.1</jwks-rsa.version>
 		<jaxen.version>2.0.0</jaxen.version>
 		<jaxb-api.version>4.0.2</jaxb-api.version>

diff --git a/...iewer-core/src/main/java/io/goobi/viewer/api/rest/model/IndexerDataRequestParameters.java b/...iewer-core/src/main/java/io/goobi/viewer/api/rest/model/IndexerDataRequestParameters.java
@@ -23,11 +23,13 @@
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * POST request parameters for IndexingResource (indexer ersion).
+ * POST request parameters for IndexingResource (indexer version).
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class IndexerDataRequestParameters {
 
     private String application;

diff --git a/goobi-viewer-core/src/main/java/io/goobi/viewer/model/search/SearchFacets.java b/goobi-viewer-core/src/main/java/io/goobi/viewer/model/search/SearchFacets.java
@@ -268,7 +268,12 @@ public List<IFacetItem> getActiveFacetsForField(String field) {
      * @return true if given link is part of the active facet string; false otherwise
      */
     public boolean isFacetStringCurrentlyUsed(String link) {
-        return isFacetCurrentlyUsed(new FacetItem(link, false));
+        try {
+            return isFacetCurrentlyUsed(new FacetItem(link, false));
+        } catch (IllegalArgumentException e) {
+            logger.warn(e.getMessage());
+            return false;
+        }
     }
 
     /**