From 2919db8728ed183cdd2a39aae35b736a7e1e2276 Mon Sep 17 00:00:00 2001 From: David Wayne Smiley Date: Fri, 13 Feb 2015 17:19:33 +0000 Subject: [PATCH] LUCENE-6215: Move NumberRangePrefixTreeStrategy into correct package git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1659615 13f79535-47bb-0310-9956-ffa450edef68 --- .../spatial/{ => prefix}/NumberRangePrefixTreeStrategy.java | 4 +--- .../lucene/spatial/prefix/tree/NumberRangePrefixTree.java | 2 +- .../org/apache/lucene/spatial/prefix/DateNRStrategyTest.java | 1 - .../apache/lucene/spatial/prefix/NumberRangeFacetsTest.java | 3 +-- solr/core/src/java/org/apache/solr/schema/DateRangeField.java | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) rename lucene/spatial/src/java/org/apache/lucene/spatial/{ => prefix}/NumberRangePrefixTreeStrategy.java (98%) diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/NumberRangePrefixTreeStrategy.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/NumberRangePrefixTreeStrategy.java similarity index 98% rename from lucene/spatial/src/java/org/apache/lucene/spatial/NumberRangePrefixTreeStrategy.java rename to lucene/spatial/src/java/org/apache/lucene/spatial/prefix/NumberRangePrefixTreeStrategy.java index 8d3ed927211..d7baf5839ca 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/NumberRangePrefixTreeStrategy.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/NumberRangePrefixTreeStrategy.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial; +package org.apache.lucene.spatial.prefix; /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -30,8 +30,6 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReaderContext; import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.search.Filter; -import org.apache.lucene.spatial.prefix.PrefixTreeFacetCounter; -import org.apache.lucene.spatial.prefix.RecursivePrefixTreeStrategy; import org.apache.lucene.spatial.prefix.tree.Cell; import org.apache.lucene.spatial.prefix.tree.NumberRangePrefixTree; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/NumberRangePrefixTree.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/NumberRangePrefixTree.java index 0e9fd8383cb..f308e8c7a4f 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/NumberRangePrefixTree.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/NumberRangePrefixTree.java @@ -50,7 +50,7 @@ import org.apache.lucene.util.StringHelper; * Unlike "normal" spatial components in this module, this special-purpose one only works with {@link Shape}s * created by the methods on this class, not from any {@link com.spatial4j.core.context.SpatialContext}. * - * @see org.apache.lucene.spatial.NumberRangePrefixTreeStrategy + * @see org.apache.lucene.spatial.prefix.NumberRangePrefixTreeStrategy * @see LUCENE-5648 * @lucene.experimental */ diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/DateNRStrategyTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/DateNRStrategyTest.java index fc628c05db5..c5092bf58cf 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/DateNRStrategyTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/DateNRStrategyTest.java @@ -22,7 +22,6 @@ import java.util.Calendar; import com.carrotsearch.randomizedtesting.annotations.Repeat; import com.spatial4j.core.shape.Shape; -import org.apache.lucene.spatial.NumberRangePrefixTreeStrategy; import org.apache.lucene.spatial.prefix.tree.DateRangePrefixTree; import org.apache.lucene.spatial.prefix.tree.NumberRangePrefixTree.UnitNRShape; import org.apache.lucene.spatial.query.SpatialOperation; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/NumberRangeFacetsTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/NumberRangeFacetsTest.java index f190bf0dcbd..83e05287a32 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/NumberRangeFacetsTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/NumberRangeFacetsTest.java @@ -28,9 +28,8 @@ import com.spatial4j.core.shape.Shape; import org.apache.lucene.index.Term; import org.apache.lucene.queries.TermsFilter; import org.apache.lucene.search.Filter; -import org.apache.lucene.spatial.NumberRangePrefixTreeStrategy; -import org.apache.lucene.spatial.NumberRangePrefixTreeStrategy.Facets; import org.apache.lucene.spatial.StrategyTestCase; +import org.apache.lucene.spatial.prefix.NumberRangePrefixTreeStrategy.Facets; import org.apache.lucene.spatial.prefix.tree.Cell; import org.apache.lucene.spatial.prefix.tree.CellIterator; import org.apache.lucene.spatial.prefix.tree.DateRangePrefixTree; diff --git a/solr/core/src/java/org/apache/solr/schema/DateRangeField.java b/solr/core/src/java/org/apache/solr/schema/DateRangeField.java index d6f46273599..6590476b331 100644 --- a/solr/core/src/java/org/apache/solr/schema/DateRangeField.java +++ b/solr/core/src/java/org/apache/solr/schema/DateRangeField.java @@ -26,7 +26,7 @@ import java.util.Map; import com.spatial4j.core.shape.Shape; import org.apache.lucene.index.StorableField; import org.apache.lucene.search.Query; -import org.apache.lucene.spatial.NumberRangePrefixTreeStrategy; +import org.apache.lucene.spatial.prefix.NumberRangePrefixTreeStrategy; import org.apache.lucene.spatial.prefix.tree.DateRangePrefixTree; import org.apache.lucene.spatial.prefix.tree.NumberRangePrefixTree.NRShape; import org.apache.lucene.spatial.prefix.tree.NumberRangePrefixTree.UnitNRShape;