Added back support for 'ldap' query parameter in REST

Allows to use previous sensiNact URLs with a filter
eclipse · Aug 1, 2023 · 003b58e · 003b58e
1 parent dddd626
commit 003b58e
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/northbound/rest/src/main/java/org/eclipse/sensinact/northbound/rest/impl/RestNorthbound.java b/northbound/rest/src/main/java/org/eclipse/sensinact/northbound/rest/impl/RestNorthbound.java
@@ -96,9 +96,14 @@ private AbstractResultDTO handleQuery(final AbstractQueryDTO query) {
     private void injectFilter(final QueryDescribeDTO query) {
         final MultivaluedMap<String, String> queryParameters = uriInfo.getQueryParameters(true);
         query.filter = queryParameters.getFirst("filter");
-        if (queryParameters.containsKey("filterLanguage")) {
-            query.filterLanguage = queryParameters.getFirst("filterLanguage");
-        } else {
+        if (query.filter != null) {
+            if (queryParameters.containsKey("filterLanguage")) {
+                query.filterLanguage = queryParameters.getFirst("filterLanguage");
+            } else {
+                query.filterLanguage = "ldap";
+            }
+        } else if ((query.filter = queryParameters.getFirst("ldap")) != null) {
+            // LDAP-only legacy attribute
             query.filterLanguage = "ldap";
         }
     }