Removing class that did a simple enum look-up and seemed to be unnecessarily repeated in all 3 storage modules (#24098)

Co-authored-by: Matthias Oesterheld <[email protected]>

Author: luk-kaminski

graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/MoreSearchAdapterES7.java

@@ -85,19 +85,16 @@ public class MoreSearchAdapterES7 implements MoreSearchAdapter {
     private final ES7ResultMessageFactory resultMessageFactory;
     private final ElasticsearchClient client;
     private final Boolean allowLeadingWildcard;
-    private final SortOrderMapper sortOrderMapper;
     private final MultiChunkResultRetriever multiChunkResultRetriever;
 
     @Inject
     public MoreSearchAdapterES7(ES7ResultMessageFactory resultMessageFactory,
                                 ElasticsearchClient client,
                                 @Named("allow_leading_wildcard_searches") Boolean allowLeadingWildcard,
-                                SortOrderMapper sortOrderMapper,
                                 MultiChunkResultRetriever multiChunkResultRetriever) {
         this.resultMessageFactory = resultMessageFactory;
         this.client = client;
         this.allowLeadingWildcard = allowLeadingWildcard;
-        this.sortOrderMapper = sortOrderMapper;
         this.multiChunkResultRetriever = multiChunkResultRetriever;
     }
 
@@ -252,7 +249,7 @@ static QueryBuilder buildExtraFilter(String field, String value) {
     }
 
     private List<FieldSortBuilder> createSorting(Sorting sorting) {
-        final SortOrder order = sortOrderMapper.fromSorting(sorting);
+        final SortOrder order = SortOrder.valueOf(sorting.getUppercasedDirection());
         final List<FieldSortBuilder> sortBuilders;
         if (EventDto.FIELD_TIMERANGE_START.equals(sorting.getField())) {
             sortBuilders = List.of(

graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/SearchRequestFactory.java

@@ -25,6 +25,7 @@
 import org.graylog.shaded.elasticsearch7.org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.graylog.shaded.elasticsearch7.org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
 import org.graylog.shaded.elasticsearch7.org.elasticsearch.search.slice.SliceBuilder;
+import org.graylog.shaded.elasticsearch7.org.elasticsearch.search.sort.SortOrder;
 import org.graylog2.indexer.searches.ChunkCommand;
 import org.graylog2.indexer.searches.SearchesConfig;
 import org.graylog2.indexer.searches.Sorting;
@@ -42,17 +43,14 @@
 
 public class SearchRequestFactory {
     private static final Sorting DEFAULT_SORTING = new Sorting("_doc", Sorting.Direction.ASC);
-    private final SortOrderMapper sortOrderMapper;
     private final boolean allowHighlighting;
     private final boolean allowLeadingWildcardSearches;
     private final UsedSearchFiltersToQueryStringsMapper searchFiltersMapper;
 
     @Inject
-    public SearchRequestFactory(SortOrderMapper sortOrderMapper,
-                                @Named("allow_highlighting") boolean allowHighlighting,
+    public SearchRequestFactory(@Named("allow_highlighting") boolean allowHighlighting,
                                 @Named("allow_leading_wildcard_searches") boolean allowLeadingWildcardSearches,
                                 UsedSearchFiltersToQueryStringsMapper searchFiltersMapper) {
-        this.sortOrderMapper = sortOrderMapper;
         this.allowHighlighting = allowHighlighting;
         this.allowLeadingWildcardSearches = allowLeadingWildcardSearches;
         this.searchFiltersMapper = searchFiltersMapper;
@@ -158,8 +156,8 @@ private BoolQueryBuilder buildStreamIdFilter(Set<String> streams) {
     }
 
     private void applySortingIfPresent(SearchSourceBuilder searchSourceBuilder, SearchCommand command) {
-        final Sorting sort = command.sorting().orElse(DEFAULT_SORTING);
-        searchSourceBuilder.sort(sort.getField(), sortOrderMapper.fromSorting(sort));
+        final Sorting sorting = command.sorting().orElse(DEFAULT_SORTING);
+        searchSourceBuilder.sort(sorting.getField(), SortOrder.valueOf(sorting.getUppercasedDirection()));
     }
 
 

graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/SortOrderMapper.java

@@ -45,7 +45,7 @@ class SearchRequestFactoryTest {
 
     @BeforeEach
     void setUp() {
-        this.searchRequestFactory = new SearchRequestFactory(new SortOrderMapper(), true, true,
+        this.searchRequestFactory = new SearchRequestFactory(true, true,
                 new TestSearchFilterMapper());
     }
 

graylog-storage-elasticsearch7/src/test/java/org/graylog/storage/elasticsearch7/SearchRequestFactoryTest.java

@@ -24,7 +24,6 @@
 import org.graylog.storage.elasticsearch7.MoreSearchAdapterES7;
 import org.graylog.storage.elasticsearch7.PaginationES7;
 import org.graylog.storage.elasticsearch7.SearchRequestFactory;
-import org.graylog.storage.elasticsearch7.SortOrderMapper;
 import org.graylog.storage.elasticsearch7.testing.ElasticsearchInstanceES7;
 import org.graylog.testing.elasticsearch.SearchServerInstance;
 import org.graylog2.indexer.results.ResultMessageFactory;
@@ -45,11 +44,10 @@ protected SearchServerInstance searchServer() {
 
     @Override
     protected MoreSearchAdapter createMoreSearchAdapter() {
-        final SortOrderMapper sortOrderMapper = new SortOrderMapper();
         final ElasticsearchClient client = elasticsearch.elasticsearchClient();
-        return new MoreSearchAdapterES7(new ES7ResultMessageFactory(resultMessageFactory), client, true, sortOrderMapper,
+        return new MoreSearchAdapterES7(new ES7ResultMessageFactory(resultMessageFactory), client, true,
                 new PaginationES7(resultMessageFactory, client,
-                        new SearchRequestFactory(sortOrderMapper, false, true, new IgnoreSearchFilters())
+                        new SearchRequestFactory(false, true, new IgnoreSearchFilters())
                 )
 
         );

graylog-storage-elasticsearch7/src/test/java/org/graylog/storage/elasticsearch7/events/search/MoreSearchAdapterES7UsingPaginationIT.java

@@ -25,7 +25,6 @@
 import org.graylog.storage.elasticsearch7.Scroll;
 import org.graylog.storage.elasticsearch7.ScrollResultES7;
 import org.graylog.storage.elasticsearch7.SearchRequestFactory;
-import org.graylog.storage.elasticsearch7.SortOrderMapper;
 import org.graylog.storage.elasticsearch7.testing.ElasticsearchInstanceES7;
 import org.graylog.testing.elasticsearch.SearchServerInstance;
 import org.graylog2.indexer.results.ResultMessageFactory;
@@ -46,15 +45,14 @@ protected SearchServerInstance searchServer() {
 
     @Override
     protected MoreSearchAdapter createMoreSearchAdapter() {
-        final SortOrderMapper sortOrderMapper = new SortOrderMapper();
         final ElasticsearchClient client = elasticsearch.elasticsearchClient();
         return new MoreSearchAdapterES7(new ES7ResultMessageFactory(resultMessageFactory),
-                client, true, sortOrderMapper,
+                client, true,
                 new Scroll(client,
                         (initialResult, query, scroll, fields, limit) -> new ScrollResultES7(
                                 resultMessageFactory, client, initialResult, query, scroll, fields, limit
                         ),
-                        new SearchRequestFactory(sortOrderMapper, false, true, new IgnoreSearchFilters())
+                        new SearchRequestFactory(false, true, new IgnoreSearchFilters())
                 )
 
         );

graylog-storage-elasticsearch7/src/test/java/org/graylog/storage/elasticsearch7/events/search/MoreSearchAdapterES7UsingScrollIT.java

@@ -33,7 +33,6 @@
 import org.graylog.storage.elasticsearch7.ScrollResultES7;
 import org.graylog.storage.elasticsearch7.SearchRequestFactory;
 import org.graylog.storage.elasticsearch7.SearchesAdapterES7;
-import org.graylog.storage.elasticsearch7.SortOrderMapper;
 import org.graylog.storage.elasticsearch7.cat.CatApi;
 import org.graylog.storage.elasticsearch7.cluster.ClusterStateApi;
 import org.graylog.storage.elasticsearch7.fieldtypes.streams.StreamsForFieldRetrieverES7;
@@ -103,11 +102,10 @@ public SearchesAdapter searchesAdapter() {
         final ScrollResultES7.Factory scrollResultFactory = (initialResult, query, scroll, fields, limit) -> new ScrollResultES7(
                 resultMessageFactory, client, initialResult, query, scroll, fields, limit
         );
-        final SortOrderMapper sortOrderMapper = new SortOrderMapper();
         final boolean allowHighlighting = true;
         final boolean allowLeadingWildcardSearches = true;
 
-        final SearchRequestFactory searchRequestFactory = new SearchRequestFactory(sortOrderMapper, allowHighlighting, allowLeadingWildcardSearches, new IgnoreSearchFilters());
+        final SearchRequestFactory searchRequestFactory = new SearchRequestFactory(allowHighlighting, allowLeadingWildcardSearches, new IgnoreSearchFilters());
         final Scroll scroll = new Scroll(client, scrollResultFactory, searchRequestFactory);
         return new SearchesAdapterES7(resultMessageFactory, client, scroll, searchRequestFactory);
     }

graylog-storage-elasticsearch7/src/test/java/org/graylog/storage/elasticsearch7/testing/AdaptersES7.java

@@ -85,19 +85,16 @@ public class MoreSearchAdapterOS2 implements MoreSearchAdapter {
 
     private final OpenSearchClient client;
     private final Boolean allowLeadingWildcard;
-    private final SortOrderMapper sortOrderMapper;
     private final MultiChunkResultRetriever multiChunkResultRetriever;
     private final OS2ResultMessageFactory resultMessageFactory;
 
     @Inject
     public MoreSearchAdapterOS2(OpenSearchClient client,
                                 @Named("allow_leading_wildcard_searches") Boolean allowLeadingWildcard,
-                                SortOrderMapper sortOrderMapper,
                                 MultiChunkResultRetriever multiChunkResultRetriever,
                                 OS2ResultMessageFactory resultMessageFactory) {
         this.client = client;
         this.allowLeadingWildcard = allowLeadingWildcard;
-        this.sortOrderMapper = sortOrderMapper;
         this.multiChunkResultRetriever = multiChunkResultRetriever;
         this.resultMessageFactory = resultMessageFactory;
     }
@@ -251,7 +248,7 @@ static QueryBuilder buildExtraFilter(String field, String value) {
     }
 
     private List<FieldSortBuilder> createSorting(Sorting sorting) {
-        final SortOrder order = sortOrderMapper.fromSorting(sorting);
+        final SortOrder order = SortOrder.valueOf(sorting.getUppercasedDirection());
         final List<FieldSortBuilder> sortBuilders;
         if (EventDto.FIELD_TIMERANGE_START.equals(sorting.getField())) {
             sortBuilders = List.of(

graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/MoreSearchAdapterOS2.java

@@ -25,6 +25,7 @@
 import org.graylog.shaded.opensearch2.org.opensearch.search.builder.SearchSourceBuilder;
 import org.graylog.shaded.opensearch2.org.opensearch.search.fetch.subphase.highlight.HighlightBuilder;
 import org.graylog.shaded.opensearch2.org.opensearch.search.slice.SliceBuilder;
+import org.graylog.shaded.opensearch2.org.opensearch.search.sort.SortOrder;
 import org.graylog2.indexer.searches.ChunkCommand;
 import org.graylog2.indexer.searches.SearchesConfig;
 import org.graylog2.indexer.searches.Sorting;
@@ -42,17 +43,14 @@
 
 public class SearchRequestFactory {
     private static final Sorting DEFAULT_SORTING = new Sorting("_doc", Sorting.Direction.ASC);
-    private final SortOrderMapper sortOrderMapper;
     private final boolean allowHighlighting;
     private final boolean allowLeadingWildcardSearches;
     private final UsedSearchFiltersToQueryStringsMapper searchFiltersMapper;
 
     @Inject
-    public SearchRequestFactory(SortOrderMapper sortOrderMapper,
-                                @Named("allow_highlighting") boolean allowHighlighting,
+    public SearchRequestFactory(@Named("allow_highlighting") boolean allowHighlighting,
                                 @Named("allow_leading_wildcard_searches") boolean allowLeadingWildcardSearches,
                                 UsedSearchFiltersToQueryStringsMapper searchFiltersMapper) {
-        this.sortOrderMapper = sortOrderMapper;
         this.allowHighlighting = allowHighlighting;
         this.allowLeadingWildcardSearches = allowLeadingWildcardSearches;
         this.searchFiltersMapper = searchFiltersMapper;
@@ -158,8 +156,8 @@ private BoolQueryBuilder buildStreamIdFilter(Set<String> streams) {
     }
 
     private void applySortingIfPresent(SearchSourceBuilder searchSourceBuilder, SearchCommand command) {
-        final Sorting sort = command.sorting().orElse(DEFAULT_SORTING);
-        searchSourceBuilder.sort(sort.getField(), sortOrderMapper.fromSorting(sort));
+        final Sorting sorting = command.sorting().orElse(DEFAULT_SORTING);
+        searchSourceBuilder.sort(sorting.getField(), SortOrder.valueOf(sorting.getUppercasedDirection()));
     }