diff --git a/querydsl-lucene/pom.xml b/querydsl-lucene/pom.xml index 9c5731cbf..ef6c36022 100644 --- a/querydsl-lucene/pom.xml +++ b/querydsl-lucene/pom.xml @@ -18,7 +18,8 @@ org.apache.lucene lucene-core - 3.0.0 + 3.0.0 + provided @@ -26,13 +27,6 @@ querydsl-core ${project.parent.version} - - com.mysema.querydsl - querydsl-core - ${project.parent.version} - test - test-jar - diff --git a/querydsl-lucene/readme.txt b/querydsl-lucene/readme.txt deleted file mode 100644 index 10d9359a6..000000000 --- a/querydsl-lucene/readme.txt +++ /dev/null @@ -1,11 +0,0 @@ -# LuceneSerializer : - * serialize Querydsl expressions (Path & Operation) into Lucene queries - * overview of operations : com.mysema.query.types.operation.Ops - * only supported path type : property - * see EBoolean, ENumber, EComparable and Expr for operation usage - -# LuceneQuery : - * ?!? - -# HibernateSearchQuery : - * !?! \ No newline at end of file diff --git a/querydsl-lucene/src/main/java/com/mysema/query/search/LuceneQuery.java b/querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneQuery.java similarity index 96% rename from querydsl-lucene/src/main/java/com/mysema/query/search/LuceneQuery.java rename to querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneQuery.java index 652c7159e..dcab53093 100644 --- a/querydsl-lucene/src/main/java/com/mysema/query/search/LuceneQuery.java +++ b/querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneQuery.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.search; +package com.mysema.query.lucene; import java.io.IOException; import java.util.ArrayList; diff --git a/querydsl-lucene/src/main/java/com/mysema/query/search/LuceneSerializer.java b/querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneSerializer.java similarity index 96% rename from querydsl-lucene/src/main/java/com/mysema/query/search/LuceneSerializer.java rename to querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneSerializer.java index 22d2396ff..a2e090c5e 100644 --- a/querydsl-lucene/src/main/java/com/mysema/query/search/LuceneSerializer.java +++ b/querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneSerializer.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.search; +package com.mysema.query.lucene; import java.util.List; import java.util.Locale; diff --git a/querydsl-lucene/src/test/java/com/mysema/query/search/LuceneQueryTest.java b/querydsl-lucene/src/test/java/com/mysema/query/lucene/LuceneQueryTest.java similarity index 92% rename from querydsl-lucene/src/test/java/com/mysema/query/search/LuceneQueryTest.java rename to querydsl-lucene/src/test/java/com/mysema/query/lucene/LuceneQueryTest.java index 5fe8f9856..a162a24ac 100644 --- a/querydsl-lucene/src/test/java/com/mysema/query/search/LuceneQueryTest.java +++ b/querydsl-lucene/src/test/java/com/mysema/query/lucene/LuceneQueryTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.search; +package com.mysema.query.lucene; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -28,8 +28,11 @@ import org.junit.Test; import com.mysema.query.QueryException; import com.mysema.query.QueryModifiers; import com.mysema.query.SearchResults; +import com.mysema.query.lucene.LuceneQuery; +import com.mysema.query.lucene.LuceneSerializer; +import com.mysema.query.types.path.PEntity; import com.mysema.query.types.path.PString; -import com.mysema.query.types.path.PathBuilder; +import com.mysema.query.types.path.PathMetadataFactory; /** * Tests for LuceneQuery @@ -38,8 +41,23 @@ import com.mysema.query.types.path.PathBuilder; * */ public class LuceneQueryTest { + + public class QDocument extends PEntity{ + + private static final long serialVersionUID = -4872833626508344081L; + + public QDocument(String var) { + super(Document.class, PathMetadataFactory.forVariable(var)); + } + + public final PString year = createString("year"); + + public final PString title = createString("title"); + + } + private LuceneQuery query; - private PathBuilder entityPath; +// private PathBuilder entityPath; private PString title; private PString year; @@ -60,9 +78,13 @@ public class LuceneQueryTest { @Before public void setUp() throws Exception { - entityPath = new PathBuilder(Object.class, "obj"); - title = entityPath.getString("title"); - year = entityPath.getString("year"); +// entityPath = new PathBuilder(Object.class, "obj"); +// title = entityPath.getString("title"); +// year = entityPath.getString("year"); + + QDocument entityPath = new QDocument("doc"); + title = entityPath.title; + year = entityPath.year; idx = new RAMDirectory(); writer = new IndexWriter(idx, new StandardAnalyzer(Version.LUCENE_CURRENT), true, MaxFieldLength.UNLIMITED); diff --git a/querydsl-lucene/src/test/java/com/mysema/query/search/LuceneSerializerTest.java b/querydsl-lucene/src/test/java/com/mysema/query/lucene/LuceneSerializerTest.java similarity index 96% rename from querydsl-lucene/src/test/java/com/mysema/query/search/LuceneSerializerTest.java rename to querydsl-lucene/src/test/java/com/mysema/query/lucene/LuceneSerializerTest.java index 4e44a8716..8e34a73c6 100644 --- a/querydsl-lucene/src/test/java/com/mysema/query/search/LuceneSerializerTest.java +++ b/querydsl-lucene/src/test/java/com/mysema/query/lucene/LuceneSerializerTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.search; +package com.mysema.query.lucene; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -26,6 +26,7 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import com.mysema.query.lucene.LuceneSerializer; import com.mysema.query.types.Expr; import com.mysema.query.types.path.PString; import com.mysema.query.types.path.PathBuilder;