#642 ignoring underscore in facet names

gbif · Jan 8, 2025 · 7b827db · 7b827db
1 parent 0c2eada
commit 7b827db
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/...rg/gbif/registry/ws/provider/BaseGrSciCollSearchRequestHandlerMethodArgumentResolver.java b/...rg/gbif/registry/ws/provider/BaseGrSciCollSearchRequestHandlerMethodArgumentResolver.java
@@ -287,4 +287,8 @@ protected Map<String, String[]> toCaseInsensitiveParams(NativeWebRequest webRequ
             Collectors.toMap(
                 e -> e.getKey().toLowerCase(), Map.Entry::getValue, ArrayUtils::addAll));
   }
+
+  protected String normalizeFacet(String facet) {
+    return facet.toLowerCase().replace("_", "");
+  }
 }
diff --git a/...registry/ws/provider/CollectionDescriptorsSearchRequestHandlerMethodArgumentResolver.java b/...registry/ws/provider/CollectionDescriptorsSearchRequestHandlerMethodArgumentResolver.java
@@ -88,6 +88,13 @@ public Object resolveArgument(
   }
 
   private Function<String, CollectionFacetParameter> facetParamParser() {
-    return s -> CollectionFacetParameter.valueOf(s.toUpperCase());
+    return s -> {
+      for (CollectionFacetParameter value : CollectionFacetParameter.values()) {
+        if (normalizeFacet(value.name()).equals(normalizeFacet(s))) {
+          return value;
+        }
+      }
+      return null;
+    };
   }
 }
diff --git a/...if/registry/ws/provider/InstitutionFacetedSearchRequestHandlerMethodArgumentResolver.java b/...if/registry/ws/provider/InstitutionFacetedSearchRequestHandlerMethodArgumentResolver.java
@@ -46,6 +46,13 @@ public Object resolveArgument(
   }
 
   private Function<String, InstitutionFacetParameter> facetParamParser() {
-    return s -> InstitutionFacetParameter.valueOf(s.toUpperCase());
+    return s -> {
+      for (InstitutionFacetParameter value : InstitutionFacetParameter.values()) {
+        if (normalizeFacet(value.name()).equals(normalizeFacet(s))) {
+          return value;
+        }
+      }
+      return null;
+    };
   }
 }