Return NO_INTERVALS rather than null from empty TokenStream (#42750)

IntervalBuilder#analyzeText will currently return null if it is passed an
empty TokenStream, which can lead to a confusing NullPointerException
later on during querying. This commit changes the code to return
NO_INTERVALS instead.

Fixes #42587

Author: romseygeek

server/src/main/java/org/elasticsearch/index/query/IntervalBuilder.java

@@ -95,7 +95,7 @@ protected IntervalsSource analyzeText(CachingTokenFilter stream, int maxGaps, bo
         // formulate a single term, boolean, or phrase.
 
         if (numTokens == 0) {
-            return null;
+            return NO_INTERVALS;
         } else if (numTokens == 1) {
             // single term
             return analyzeTerm(stream);
@@ -230,7 +230,7 @@ protected List<IntervalsSource> analyzeGraph(TokenStream source) throws IOExcept
         return clauses;
     }
 
-    private static final IntervalsSource NO_INTERVALS = new IntervalsSource() {
+    static final IntervalsSource NO_INTERVALS = new IntervalsSource() {
 
         @Override
         public IntervalIterator intervals(String field, LeafReaderContext ctx) {

server/src/test/java/org/elasticsearch/index/query/IntervalBuilderTests.java

@@ -110,6 +110,12 @@ public void testPhraseWithStopword() throws IOException {
 
     }
 
+    public void testEmptyTokenStream() throws IOException {
+        CannedTokenStream ts = new CannedTokenStream();
+        IntervalsSource source = BUILDER.analyzeText(new CachingTokenFilter(ts), 0, true);
+        assertSame(IntervalBuilder.NO_INTERVALS, source);
+    }
+
     public void testSimpleSynonyms() throws IOException {
 
         CannedTokenStream ts = new CannedTokenStream(