Repository: oodt Updated Branches: refs/heads/master 8c054377a -> dd7577b50
OODT-902 tidy up fix enums Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/73d960ed Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/73d960ed Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/73d960ed Branch: refs/heads/master Commit: 73d960ed0d31cc1745cdf5b5bde6bfeec984c90a Parents: 8c05437 Author: Tom Barber <[email protected]> Authored: Sun Oct 25 15:31:48 2015 +0000 Committer: Tom Barber <[email protected]> Committed: Sun Oct 25 15:31:48 2015 +0000 ---------------------------------------------------------------------- .../query/ComparisonQueryExpression.java | 2 +- .../org/apache/oodt/commons/date/DateUtils.java | 4 +-- .../cas/crawl/action/CrawlerActionPhases.java | 2 +- .../oodt/cas/filemgr/tools/QueryTool.java | 38 ++++++++++---------- .../cas/filemgr/catalog/TestLuceneCatalog.java | 2 ++ 5 files changed, 25 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/73d960ed/catalog/src/main/java/org/apache/oodt/cas/catalog/query/ComparisonQueryExpression.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/ComparisonQueryExpression.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/ComparisonQueryExpression.java index fc04920..f294e01 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/ComparisonQueryExpression.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/ComparisonQueryExpression.java @@ -26,7 +26,7 @@ package org.apache.oodt.cas.catalog.query; */ public class ComparisonQueryExpression extends TermQueryExpression { - public static enum Operator { EQUAL_TO("=="), LESS_THAN_EQUAL_TO("<="), GREATER_THAN_EQUAL_TO(">="), LESS_THAN("<"), GREATER_THAN(">"), LIKE("LIKE"); + public enum Operator { EQUAL_TO("=="), LESS_THAN_EQUAL_TO("<="), GREATER_THAN_EQUAL_TO(">="), LESS_THAN("<"), GREATER_THAN(">"), LIKE("LIKE"); private String value; http://git-wip-us.apache.org/repos/asf/oodt/blob/73d960ed/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java b/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java index 188a5eb..83b823d 100644 --- a/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java +++ b/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java @@ -35,7 +35,7 @@ import java.util.TimeZone; */ public class DateUtils { - public static enum FormatType { UTC_FORMAT, LOCAL_FORMAT, TAI_FORMAT }; + public enum FormatType { UTC_FORMAT, LOCAL_FORMAT, TAI_FORMAT }; public static Calendar tai93epoch = new GregorianCalendar(1993, GregorianCalendar.JANUARY, 1); @@ -53,7 +53,7 @@ public class DateUtils { taiFormat.setTimeZone(TimeZone.getTimeZone("UTC")); } - static enum IndexType { + enum IndexType { DATE(0), LEAP_SECS(1); http://git-wip-us.apache.org/repos/asf/oodt/blob/73d960ed/crawler/src/main/java/org/apache/oodt/cas/crawl/action/CrawlerActionPhases.java ---------------------------------------------------------------------- diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/CrawlerActionPhases.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/CrawlerActionPhases.java index 00cc7f6..c0522e7 100644 --- a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/CrawlerActionPhases.java +++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/CrawlerActionPhases.java @@ -29,7 +29,7 @@ public enum CrawlerActionPhases { private String name; - private CrawlerActionPhases(String name) { + CrawlerActionPhases(String name) { this.name = name; } http://git-wip-us.apache.org/repos/asf/oodt/blob/73d960ed/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java index 871c850..ba77bb8 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java @@ -18,15 +18,15 @@ package org.apache.oodt.cas.filemgr.tools; //JDK imports -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Iterator; -import java.util.List; -import java.util.Vector; -import java.util.logging.Level; -import java.util.logging.Logger; - -//OODT imports +import org.apache.lucene.index.Term; +import org.apache.lucene.queryParser.ParseException; +import org.apache.lucene.queryParser.QueryParser; +import org.apache.lucene.search.BooleanClause; +import org.apache.lucene.search.BooleanQuery; +import org.apache.lucene.search.PhraseQuery; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.RangeQuery; +import org.apache.lucene.search.TermQuery; import org.apache.oodt.cas.filemgr.structs.Product; import org.apache.oodt.cas.filemgr.structs.ProductType; import org.apache.oodt.cas.filemgr.structs.RangeQueryCriteria; @@ -40,16 +40,16 @@ import org.apache.oodt.cas.filemgr.structs.query.QueryResult; import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; import org.apache.oodt.cas.filemgr.util.SqlParser; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Iterator; +import java.util.List; +import java.util.Vector; +import java.util.logging.Level; +import java.util.logging.Logger; + +//OODT imports //APACHE imports -import org.apache.lucene.index.Term; -import org.apache.lucene.queryParser.ParseException; -import org.apache.lucene.queryParser.QueryParser; -import org.apache.lucene.search.BooleanClause; -import org.apache.lucene.search.BooleanQuery; -import org.apache.lucene.search.PhraseQuery; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.RangeQuery; -import org.apache.lucene.search.TermQuery; /** * @author mattmann @@ -67,7 +67,7 @@ public final class QueryTool { private XmlRpcFileManagerClient client = null; - private static enum QueryType { LUCENE, SQL }; + private enum QueryType { LUCENE, SQL }; /* our log stream */ private static final Logger LOG = Logger.getLogger(QueryTool.class.getName()); http://git-wip-us.apache.org/repos/asf/oodt/blob/73d960ed/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java index 3115d10..4e30b40 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java @@ -983,6 +983,8 @@ public class TestLuceneCatalog extends TestCase { public void testNullIndexPath(){ System.clearProperty("org.apache.oodt.cas.filemgr.catalog.lucene.idxPath"); + Properties sysProps = System.getProperties(); + try{ LuceneCatalogFactory fact = new LuceneCatalogFactory(); fail( "Missing exception" );
