Initialize more things all at once

slackhq · Oct 1, 2024 · 8b96df2 · 8b96df2
1 parent c29fc18
commit 8b96df2
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/astra/src/main/java/com/slack/astra/logstore/search/SearchResultUtils.java b/astra/src/main/java/com/slack/astra/logstore/search/SearchResultUtils.java
@@ -669,11 +669,11 @@ public static AstraSearch.SearchRequest.SearchAggregation.FiltersAggregation toF
 
   public static SearchQuery fromSearchRequest(AstraSearch.SearchRequest searchRequest) {
     QueryBuilder queryBuilder = null;
+    SearchModule searchModule = new SearchModule(Settings.EMPTY, List.of());
+    NamedXContentRegistry namedXContentRegistry =
+        new NamedXContentRegistry(searchModule.getNamedXContents());
     if (!searchRequest.getQuery().isEmpty()) {
-      SearchModule searchModule = new SearchModule(Settings.EMPTY, List.of());
       try {
-        NamedXContentRegistry namedXContentRegistry =
-            new NamedXContentRegistry(searchModule.getNamedXContents());
         JsonXContentParser jsonXContentParser =
             new JsonXContentParser(
                 namedXContentRegistry,
@@ -687,10 +687,7 @@ public static SearchQuery fromSearchRequest(AstraSearch.SearchRequest searchRequ
 
     AggregatorFactories.Builder aggregatorFactoriesBuilder = null;
     if (!searchRequest.getAggregationJson().isEmpty()) {
-      SearchModule searchModule = new SearchModule(Settings.EMPTY, List.of());
       try {
-        NamedXContentRegistry namedXContentRegistry =
-            new NamedXContentRegistry(searchModule.getNamedXContents());
         JsonXContentParser jsonXContentParser =
             new JsonXContentParser(
                 namedXContentRegistry,