HSEARCH-2811 PhraseQuery is becoming immutable

hibernate · Jul 11, 2017 · 064b71a · 064b71a
1 parent 54b49bc
commit 064b71a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...main/java/org/hibernate/search/query/dsl/impl/ConnectedMultiFieldsPhraseQueryBuilder.java b/...main/java/org/hibernate/search/query/dsl/impl/ConnectedMultiFieldsPhraseQueryBuilder.java
@@ -165,13 +165,13 @@ else if ( size <= 1 ) {
 					perFieldQuery = query;
 				}
 				else {
-					PhraseQuery query = new PhraseQuery();
-					query.setSlop( phraseContext.getSlop() );
+					PhraseQuery.Builder phraseBuilder = new PhraseQuery.Builder();
+					phraseBuilder.setSlop( phraseContext.getSlop() );
 					for ( Map.Entry<Integer, List<Term>> entry : termsPerPosition.entrySet() ) {
 						final List<Term> value = entry.getValue();
-						query.add( value.get( 0 ), entry.getKey() );
+						phraseBuilder.add( value.get( 0 ), entry.getKey() );
 					}
-					perFieldQuery = query;
+					perFieldQuery = phraseBuilder.build();
 				}
 			}
 		}

diff --git a/engine/src/test/java/org/hibernate/search/test/query/engine/FieldNameCollectorTest.java b/engine/src/test/java/org/hibernate/search/test/query/engine/FieldNameCollectorTest.java
@@ -99,8 +99,9 @@ public void testExtractFieldNameFromMultiPhraseQuery() {
 
 	@Test
 	public void testExtractFieldNameFromPhraseQuery() {
-		PhraseQuery phraseQuery = new PhraseQuery();
-		phraseQuery.add( new Term( "stringField", "hello world" ) );
+		PhraseQuery.Builder phraseQBuilder = new PhraseQuery.Builder();
+		phraseQBuilder.add( new Term( "stringField", "hello world" ) );
+		PhraseQuery phraseQuery = phraseQBuilder.build();
 		assertFieldNames( phraseQuery, FieldType.STRING, "stringField" );
 	}