From 5baa9ec576379ba2ff91921582401e552ec67183 Mon Sep 17 00:00:00 2001 From: John Tims Date: Mon, 28 Dec 2015 07:51:35 -0700 Subject: [PATCH] Remove duplicate lucene logic --- .../querydsl/lucene3/LuceneSerializerTest.java | 14 ++++++-------- .../querydsl/lucene4/LuceneSerializerTest.java | 14 ++++++-------- .../querydsl/lucene5/LuceneSerializerTest.java | 15 ++++++--------- 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/querydsl-lucene3/src/test/java/com/querydsl/lucene3/LuceneSerializerTest.java b/querydsl-lucene3/src/test/java/com/querydsl/lucene3/LuceneSerializerTest.java index 7910139e5..0b937f41d 100644 --- a/querydsl-lucene3/src/test/java/com/querydsl/lucene3/LuceneSerializerTest.java +++ b/querydsl-lucene3/src/test/java/com/querydsl/lucene3/LuceneSerializerTest.java @@ -18,6 +18,7 @@ import static org.junit.Assert.fail; import java.io.StringReader; import java.util.Arrays; +import java.util.Set; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.Document; @@ -39,6 +40,7 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import com.google.common.collect.Sets; import com.querydsl.core.*; import com.querydsl.core.types.*; import com.querydsl.core.types.dsl.*; @@ -78,6 +80,9 @@ public class LuceneSerializerTest { private IndexWriter writer; private IndexSearcher searcher; + private static final Set UNSUPPORTED_OPERATORS = Sets.immutableEnumSet(Ops.STARTS_WITH_IC, + Ops.EQ_IGNORE_CASE, Ops.ENDS_WITH_IC, Ops.STRING_CONTAINS_IC); + private final QueryMetadata metadata = new DefaultQueryMetadata(); private Document createDocument() { @@ -635,14 +640,7 @@ public class LuceneSerializerTest { } private boolean unsupportedOperation(Predicate filter) { - if (filter instanceof Operation) { - Operator op = ((Operation) filter).getOperator(); - if (op == Ops.STARTS_WITH_IC || op == Ops.EQ_IGNORE_CASE || op == Ops.STARTS_WITH_IC - || op == Ops.ENDS_WITH_IC || op == Ops.STRING_CONTAINS_IC) { - return true; - } - } - return false; + return UNSUPPORTED_OPERATORS.contains(((Operation) filter).getOperator()); } @Test diff --git a/querydsl-lucene4/src/test/java/com/querydsl/lucene4/LuceneSerializerTest.java b/querydsl-lucene4/src/test/java/com/querydsl/lucene4/LuceneSerializerTest.java index 6daa6fa0a..fd8d67868 100644 --- a/querydsl-lucene4/src/test/java/com/querydsl/lucene4/LuceneSerializerTest.java +++ b/querydsl-lucene4/src/test/java/com/querydsl/lucene4/LuceneSerializerTest.java @@ -18,6 +18,7 @@ import static org.junit.Assert.fail; import java.io.StringReader; import java.util.Arrays; +import java.util.Set; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.*; @@ -36,6 +37,7 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import com.google.common.collect.Sets; import com.querydsl.core.*; import com.querydsl.core.types.*; import com.querydsl.core.types.dsl.*; @@ -75,6 +77,9 @@ public class LuceneSerializerTest { private IndexWriter writer; private IndexSearcher searcher; + private static final Set UNSUPPORTED_OPERATORS = Sets.immutableEnumSet(Ops.STARTS_WITH_IC, + Ops.EQ_IGNORE_CASE, Ops.ENDS_WITH_IC, Ops.STRING_CONTAINS_IC); + private final QueryMetadata metadata = new DefaultQueryMetadata(); private Document createDocument() { @@ -637,14 +642,7 @@ public class LuceneSerializerTest { } private boolean unsupportedOperation(Predicate filter) { - if (filter instanceof Operation) { - Operator op = ((Operation) filter).getOperator(); - if (op == Ops.STARTS_WITH_IC || op == Ops.EQ_IGNORE_CASE || op == Ops.STARTS_WITH_IC - || op == Ops.ENDS_WITH_IC || op == Ops.STRING_CONTAINS_IC) { - return true; - } - } - return false; + return UNSUPPORTED_OPERATORS.contains(((Operation) filter).getOperator()); } @Test diff --git a/querydsl-lucene5/src/test/java/com/querydsl/lucene5/LuceneSerializerTest.java b/querydsl-lucene5/src/test/java/com/querydsl/lucene5/LuceneSerializerTest.java index c00c40abe..b78ce641a 100644 --- a/querydsl-lucene5/src/test/java/com/querydsl/lucene5/LuceneSerializerTest.java +++ b/querydsl-lucene5/src/test/java/com/querydsl/lucene5/LuceneSerializerTest.java @@ -18,6 +18,7 @@ import static org.junit.Assert.fail; import java.io.StringReader; import java.util.Arrays; +import java.util.Set; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.Document; @@ -41,6 +42,7 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import com.google.common.collect.Sets; import com.querydsl.core.BooleanBuilder; import com.querydsl.core.DefaultQueryMetadata; import com.querydsl.core.MatchingFiltersFactory; @@ -95,6 +97,9 @@ public class LuceneSerializerTest { private IndexWriter writer; private IndexSearcher searcher; + private static final Set UNSUPPORTED_OPERATORS = Sets.immutableEnumSet(Ops.STARTS_WITH_IC, + Ops.EQ_IGNORE_CASE, Ops.ENDS_WITH_IC, Ops.STRING_CONTAINS_IC); + private final QueryMetadata metadata = new DefaultQueryMetadata(); private Document createDocument() { @@ -712,15 +717,7 @@ public class LuceneSerializerTest { } private boolean unsupportedOperation(Predicate filter) { - if (filter instanceof Operation) { - Operator op = ((Operation) filter).getOperator(); - if (op == Ops.STARTS_WITH_IC || op == Ops.EQ_IGNORE_CASE - || op == Ops.STARTS_WITH_IC || op == Ops.ENDS_WITH_IC - || op == Ops.STRING_CONTAINS_IC) { - return true; - } - } - return false; + return UNSUPPORTED_OPERATORS.contains(((Operation) filter).getOperator()); } @Test