Bring back old param name, to have consistent naming in FE (#18093)

Graylog2 · Jan 30, 2024 · 61ccf0e · 61ccf0e
1 parent 3ad62d2
commit 61ccf0e
Showing 1 changed file with 14 additions and 17 deletions.
diff --git a/...er/src/main/java/org/graylog2/rest/resources/system/indexer/IndexSetsMappingResource.java b/...er/src/main/java/org/graylog2/rest/resources/system/indexer/IndexSetsMappingResource.java
@@ -20,6 +20,18 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import jakarta.inject.Inject;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.graylog.plugins.views.search.permissions.SearchUser;
 import org.graylog.plugins.views.search.rest.PermittedStreams;
@@ -34,21 +46,6 @@
 import org.graylog2.shared.rest.resources.RestResource;
 import org.graylog2.shared.security.RestPermissions;
 
-import jakarta.inject.Inject;
-
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
@@ -80,7 +77,7 @@ public IndexSetsMappingResource(final IndexSetFieldTypeSummaryService indexSetFi
     @NoAuditEvent("No change to the DB")
     @ApiOperation(value = "Gets list of field_name-field_type pairs for given index set, paginated")
     public PageListResponse<IndexSetFieldType> indexSetFieldTypesList(@ApiParam(name = "index_set_id") @PathParam("index_set_id") String indexSetId,
-                                                                      @ApiParam(name = "fieldNameQuery") @QueryParam("fieldNameQuery") @DefaultValue("") String fieldNameQuery,
+                                                                      @ApiParam(name = "query") @QueryParam("query") @DefaultValue("") String query,
                                                                       @ApiParam(name = "filters") @QueryParam("filters") List<String> filters,
                                                                       @ApiParam(name = "page") @QueryParam("page") @DefaultValue("1") int page,
                                                                       @ApiParam(name = "per_page") @QueryParam("per_page") @DefaultValue("50") int perPage,
@@ -94,7 +91,7 @@ public PageListResponse<IndexSetFieldType> indexSetFieldTypesList(@ApiParam(name
                                                                       @Context SearchUser searchUser) {
         checkPermission(RestPermissions.INDEXSETS_READ, indexSetId);
         return indexFieldTypesListService.getIndexSetFieldTypesListPage(indexSetId,
-                fieldNameQuery,
+                query,
                 filters,
                 page,
                 perPage,