From b136fff93985587cf908c628e95550fe30d052e0 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 27 Apr 2020 12:28:29 +0100 Subject: [PATCH] SEARCH-2202 The field analyzeRangeTerms is defined in the supertype. We're already setting the supertype field to true in the only constructor, so it's safe to use that instead. --- .../main/java/org/alfresco/solr/query/Solr4QueryParser.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java index b27ec4299..14587cf1f 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java @@ -5496,8 +5496,6 @@ public class Solr4QueryParser extends QueryParser implements QueryConstants throw new RuntimeException("Error analyzing multiTerm term: " + part, e); } } - - private boolean analyzeRangeTerms = true; protected Query newRangeQuery(String field, String part1, String part2, boolean startInclusive, boolean endInclusive) { final BytesRef start; @@ -5506,13 +5504,13 @@ public class Solr4QueryParser extends QueryParser implements QueryConstants if (part1 == null) { start = null; } else { - start = analyzeRangeTerms ? analyzeMultitermTerm(field, part1) : new BytesRef(part1); + start = getAnalyzeRangeTerms() ? analyzeMultitermTerm(field, part1) : new BytesRef(part1); } if (part2 == null) { end = null; } else { - end = analyzeRangeTerms ? analyzeMultitermTerm(field, part2) : new BytesRef(part2); + end = getAnalyzeRangeTerms() ? analyzeMultitermTerm(field, part2) : new BytesRef(part2); } final TermRangeQuery query = new TermRangeQuery(field, start, end, startInclusive, endInclusive);