From 69284d73fb7f3f0cbafe6d3fb18e6dbf6372ed36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Tue, 28 Dec 2010 13:48:17 +0000 Subject: [PATCH] made LuceneQuery reusable --- .../com/mysema/query/lucene/LuceneQuery.java | 43 ++++--------------- 1 file changed, 9 insertions(+), 34 deletions(-) diff --git a/querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneQuery.java b/querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneQuery.java index 12814ad22..5d632119b 100644 --- a/querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneQuery.java +++ b/querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneQuery.java @@ -53,10 +53,6 @@ public class LuceneQuery implements SimpleQuery, this(LuceneSerializer.DEFAULT, searcher); } - public void close(){ - // template method - } - private long innerCount(){ try { final int maxDoc = searcher.maxDoc(); @@ -71,22 +67,12 @@ public class LuceneQuery implements SimpleQuery, @Override public long count() { - try{ - return innerCount(); - }finally{ - close(); - } - + return innerCount(); } @Override public long countDistinct() { - try{ - return innerCount(); - }finally{ - close(); - } - + return innerCount(); } private Query createQuery() { @@ -152,11 +138,7 @@ public class LuceneQuery implements SimpleQuery, @Override public List list() { - try{ - return innerList(); - }finally{ - close(); - } + return innerList(); } @Override @@ -171,17 +153,12 @@ public class LuceneQuery implements SimpleQuery, @Override public SearchResults listResults() { - try{ - List documents = innerList(); - /* - * TODO Get rid of count(). It could be implemented by iterating the - * list results in list* from n to m. - */ - return new SearchResults(documents, queryMixin.getMetadata().getModifiers(), innerCount()); - }finally{ - close(); - } - + List documents = innerList(); + /* + * TODO Get rid of count(). It could be implemented by iterating the + * list results in list* from n to m. + */ + return new SearchResults(documents, queryMixin.getMetadata().getModifiers(), innerCount()); } @Override @@ -221,8 +198,6 @@ public class LuceneQuery implements SimpleQuery, } } catch (IOException e) { throw new QueryException(e); - } finally { - close(); } }