From 8b96df258de56ca272fdfce84c073be8426b9dde Mon Sep 17 00:00:00 2001 From: kyle-sammons Date: Mon, 30 Sep 2024 17:05:43 -0700 Subject: [PATCH] Initialize more things all at once --- .../slack/astra/logstore/search/SearchResultUtils.java | 9 +++------ 1 file changed, 3 insertions(+), 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 index 70cbd038b0..80de17647b 100644 --- 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,