diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCache.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCache.java index 15778c3fd88..bfa06a7a058 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCache.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCache.java @@ -22,8 +22,8 @@ package org.elasticsearch.index.cache; import org.apache.lucene.index.IndexReader; import org.elasticsearch.index.AbstractIndexComponent; import org.elasticsearch.index.Index; -import org.elasticsearch.index.cache.field.FieldDataCache; -import org.elasticsearch.index.cache.field.none.NoneFieldDataCache; +import org.elasticsearch.index.cache.field.data.FieldDataCache; +import org.elasticsearch.index.cache.field.data.none.NoneFieldDataCache; import org.elasticsearch.index.cache.filter.FilterCache; import org.elasticsearch.index.cache.filter.none.NoneFilterCache; import org.elasticsearch.index.settings.IndexSettings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java index 379fca4f618..c90500c386a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.cache; -import org.elasticsearch.index.cache.field.FieldDataCacheModule; +import org.elasticsearch.index.cache.field.data.FieldDataCacheModule; import org.elasticsearch.index.cache.filter.FilterCacheModule; import org.elasticsearch.util.inject.AbstractModule; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/FieldDataCache.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/FieldDataCache.java similarity index 89% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/FieldDataCache.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/FieldDataCache.java index 0be02d6a082..2fac59832a6 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/FieldDataCache.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/FieldDataCache.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.index.cache.field; +package org.elasticsearch.index.cache.field.data; import org.apache.lucene.index.IndexReader; -import org.elasticsearch.index.field.FieldData; -import org.elasticsearch.index.field.FieldDataOptions; +import org.elasticsearch.index.field.data.FieldData; +import org.elasticsearch.index.field.data.FieldDataOptions; import org.elasticsearch.util.component.CloseableComponent; import java.io.IOException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/FieldDataCacheModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/FieldDataCacheModule.java similarity index 92% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/FieldDataCacheModule.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/FieldDataCacheModule.java index f25d3949eb8..ff6a8dda8bb 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/FieldDataCacheModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/FieldDataCacheModule.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.index.cache.field; +package org.elasticsearch.index.cache.field.data; -import org.elasticsearch.index.cache.field.weak.WeakFieldDataCache; +import org.elasticsearch.index.cache.field.data.weak.WeakFieldDataCache; import org.elasticsearch.util.inject.AbstractModule; import org.elasticsearch.util.inject.Scopes; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/none/NoneFieldDataCache.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/none/NoneFieldDataCache.java similarity index 90% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/none/NoneFieldDataCache.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/none/NoneFieldDataCache.java index d0d2c275d84..a98ae1357ed 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/none/NoneFieldDataCache.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/none/NoneFieldDataCache.java @@ -17,15 +17,15 @@ * under the License. */ -package org.elasticsearch.index.cache.field.none; +package org.elasticsearch.index.cache.field.data.none; import org.apache.lucene.index.IndexReader; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.index.AbstractIndexComponent; import org.elasticsearch.index.Index; -import org.elasticsearch.index.cache.field.FieldDataCache; -import org.elasticsearch.index.field.FieldData; -import org.elasticsearch.index.field.FieldDataOptions; +import org.elasticsearch.index.cache.field.data.FieldDataCache; +import org.elasticsearch.index.field.data.FieldData; +import org.elasticsearch.index.field.data.FieldDataOptions; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/soft/SoftFieldDataCache.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/soft/SoftFieldDataCache.java similarity index 88% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/soft/SoftFieldDataCache.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/soft/SoftFieldDataCache.java index 1f2ef65c6f9..3f2730949ac 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/soft/SoftFieldDataCache.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/soft/SoftFieldDataCache.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.index.cache.field.soft; +package org.elasticsearch.index.cache.field.data.soft; import org.elasticsearch.index.Index; -import org.elasticsearch.index.cache.field.support.AbstractConcurrentMapFieldDataCache; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.cache.field.data.support.AbstractConcurrentMapFieldDataCache; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.MapMaker; import org.elasticsearch.util.inject.Inject; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/support/AbstractConcurrentMapFieldDataCache.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/support/AbstractConcurrentMapFieldDataCache.java similarity index 95% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/support/AbstractConcurrentMapFieldDataCache.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/support/AbstractConcurrentMapFieldDataCache.java index 22eebf7852a..df306489643 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/support/AbstractConcurrentMapFieldDataCache.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/support/AbstractConcurrentMapFieldDataCache.java @@ -17,15 +17,15 @@ * under the License. */ -package org.elasticsearch.index.cache.field.support; +package org.elasticsearch.index.cache.field.data.support; import org.apache.lucene.index.IndexReader; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.index.AbstractIndexComponent; import org.elasticsearch.index.Index; -import org.elasticsearch.index.cache.field.FieldDataCache; -import org.elasticsearch.index.field.FieldData; -import org.elasticsearch.index.field.FieldDataOptions; +import org.elasticsearch.index.cache.field.data.FieldDataCache; +import org.elasticsearch.index.field.data.FieldData; +import org.elasticsearch.index.field.data.FieldDataOptions; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.concurrent.ConcurrentCollections; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/weak/WeakFieldDataCache.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/weak/WeakFieldDataCache.java similarity index 88% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/weak/WeakFieldDataCache.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/weak/WeakFieldDataCache.java index 40e7d903505..c9dee54ad66 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/weak/WeakFieldDataCache.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/weak/WeakFieldDataCache.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.index.cache.field.weak; +package org.elasticsearch.index.cache.field.data.weak; import org.elasticsearch.index.Index; -import org.elasticsearch.index.cache.field.support.AbstractConcurrentMapFieldDataCache; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.cache.field.data.support.AbstractConcurrentMapFieldDataCache; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.MapMaker; import org.elasticsearch.util.inject.Inject; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/DocFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/DocFieldData.java similarity index 97% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/DocFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/DocFieldData.java index f3766a026ea..ab537ea4bf0 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/DocFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/DocFieldData.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.field; +package org.elasticsearch.index.field.data; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/FieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/FieldData.java similarity index 91% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/FieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/FieldData.java index eb834a337d2..12e00d8d755 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/FieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/FieldData.java @@ -17,16 +17,16 @@ * under the License. */ -package org.elasticsearch.index.field; +package org.elasticsearch.index.field.data; import org.apache.lucene.index.IndexReader; import org.elasticsearch.ElasticSearchIllegalArgumentException; -import org.elasticsearch.index.field.doubles.DoubleFieldData; -import org.elasticsearch.index.field.floats.FloatFieldData; -import org.elasticsearch.index.field.ints.IntFieldData; -import org.elasticsearch.index.field.longs.LongFieldData; -import org.elasticsearch.index.field.shorts.ShortFieldData; -import org.elasticsearch.index.field.strings.StringFieldData; +import org.elasticsearch.index.field.data.doubles.DoubleFieldData; +import org.elasticsearch.index.field.data.floats.FloatFieldData; +import org.elasticsearch.index.field.data.ints.IntFieldData; +import org.elasticsearch.index.field.data.longs.LongFieldData; +import org.elasticsearch.index.field.data.shorts.ShortFieldData; +import org.elasticsearch.index.field.data.strings.StringFieldData; import org.elasticsearch.util.ThreadLocals; import java.io.IOException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/FieldDataOptions.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/FieldDataOptions.java similarity index 96% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/FieldDataOptions.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/FieldDataOptions.java index 060f26e16ad..cd28b817366 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/FieldDataOptions.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/FieldDataOptions.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.field; +package org.elasticsearch.index.field.data; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/NumericDocFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/NumericDocFieldData.java similarity index 97% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/NumericDocFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/NumericDocFieldData.java index d2b65e9b43f..9b92b35ee96 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/NumericDocFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/NumericDocFieldData.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.field; +package org.elasticsearch.index.field.data; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/NumericFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/NumericFieldData.java similarity index 98% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/NumericFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/NumericFieldData.java index 8918efcc20f..724b2f013ac 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/NumericFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/NumericFieldData.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.field; +package org.elasticsearch.index.field.data; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/doubles/DoubleDocFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleDocFieldData.java similarity index 91% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/doubles/DoubleDocFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleDocFieldData.java index 79ef18e935d..2d6c49d065b 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/doubles/DoubleDocFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleDocFieldData.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.index.field.doubles; +package org.elasticsearch.index.field.data.doubles; -import org.elasticsearch.index.field.NumericDocFieldData; +import org.elasticsearch.index.field.data.NumericDocFieldData; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/doubles/DoubleFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldData.java similarity index 94% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/doubles/DoubleFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldData.java index c933891b2e4..9f787022e6d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/doubles/DoubleFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldData.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.index.field.doubles; +package org.elasticsearch.index.field.data.doubles; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.FieldCache; -import org.elasticsearch.index.field.FieldDataOptions; -import org.elasticsearch.index.field.NumericFieldData; -import org.elasticsearch.index.field.support.FieldDataLoader; +import org.elasticsearch.index.field.data.FieldDataOptions; +import org.elasticsearch.index.field.data.NumericFieldData; +import org.elasticsearch.index.field.data.support.FieldDataLoader; import org.elasticsearch.util.gnu.trove.TDoubleArrayList; import java.io.IOException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/doubles/MultiValueDoubleFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/MultiValueDoubleFieldData.java similarity index 96% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/doubles/MultiValueDoubleFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/MultiValueDoubleFieldData.java index a64670d4be8..809fe305cbb 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/doubles/MultiValueDoubleFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/MultiValueDoubleFieldData.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.index.field.doubles; +package org.elasticsearch.index.field.data.doubles; -import org.elasticsearch.index.field.FieldDataOptions; +import org.elasticsearch.index.field.data.FieldDataOptions; import org.elasticsearch.util.ThreadLocals; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/doubles/SingleValueDoubleFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/SingleValueDoubleFieldData.java similarity index 95% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/doubles/SingleValueDoubleFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/SingleValueDoubleFieldData.java index 322fade03d1..57296544ac8 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/doubles/SingleValueDoubleFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/SingleValueDoubleFieldData.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.index.field.doubles; +package org.elasticsearch.index.field.data.doubles; -import org.elasticsearch.index.field.FieldDataOptions; +import org.elasticsearch.index.field.data.FieldDataOptions; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/floats/FloatDocFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatDocFieldData.java similarity index 91% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/floats/FloatDocFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatDocFieldData.java index c5663a08f3e..193186464cd 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/floats/FloatDocFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatDocFieldData.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.index.field.floats; +package org.elasticsearch.index.field.data.floats; -import org.elasticsearch.index.field.NumericDocFieldData; +import org.elasticsearch.index.field.data.NumericDocFieldData; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/floats/FloatFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldData.java similarity index 94% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/floats/FloatFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldData.java index 49ba88d35f1..da822aa6dd9 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/floats/FloatFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldData.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.index.field.floats; +package org.elasticsearch.index.field.data.floats; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.FieldCache; -import org.elasticsearch.index.field.FieldDataOptions; -import org.elasticsearch.index.field.NumericFieldData; -import org.elasticsearch.index.field.support.FieldDataLoader; +import org.elasticsearch.index.field.data.FieldDataOptions; +import org.elasticsearch.index.field.data.NumericFieldData; +import org.elasticsearch.index.field.data.support.FieldDataLoader; import org.elasticsearch.util.gnu.trove.TFloatArrayList; import java.io.IOException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/floats/MultiValueFloatFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/MultiValueFloatFieldData.java similarity index 96% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/floats/MultiValueFloatFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/MultiValueFloatFieldData.java index 8a36ab875c9..99dc1ae26a7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/floats/MultiValueFloatFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/MultiValueFloatFieldData.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.index.field.floats; +package org.elasticsearch.index.field.data.floats; -import org.elasticsearch.index.field.FieldDataOptions; -import org.elasticsearch.index.field.doubles.DoubleFieldData; +import org.elasticsearch.index.field.data.FieldDataOptions; +import org.elasticsearch.index.field.data.doubles.DoubleFieldData; import org.elasticsearch.util.ThreadLocals; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/floats/SingleValueFloatFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/SingleValueFloatFieldData.java similarity index 94% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/floats/SingleValueFloatFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/SingleValueFloatFieldData.java index 88bef0f72f9..2395e2b12b7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/floats/SingleValueFloatFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/SingleValueFloatFieldData.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.index.field.floats; +package org.elasticsearch.index.field.data.floats; -import org.elasticsearch.index.field.FieldDataOptions; -import org.elasticsearch.index.field.doubles.DoubleFieldData; +import org.elasticsearch.index.field.data.FieldDataOptions; +import org.elasticsearch.index.field.data.doubles.DoubleFieldData; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/ints/IntDocFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntDocFieldData.java similarity index 91% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/ints/IntDocFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntDocFieldData.java index 88c3491d952..c4b5bb4c96a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/ints/IntDocFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntDocFieldData.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.index.field.ints; +package org.elasticsearch.index.field.data.ints; -import org.elasticsearch.index.field.NumericDocFieldData; +import org.elasticsearch.index.field.data.NumericDocFieldData; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/ints/IntFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldData.java similarity index 94% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/ints/IntFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldData.java index 0ae2760875e..3e7f3f9e2ac 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/ints/IntFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldData.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.index.field.ints; +package org.elasticsearch.index.field.data.ints; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.FieldCache; -import org.elasticsearch.index.field.FieldDataOptions; -import org.elasticsearch.index.field.NumericFieldData; -import org.elasticsearch.index.field.support.FieldDataLoader; +import org.elasticsearch.index.field.data.FieldDataOptions; +import org.elasticsearch.index.field.data.NumericFieldData; +import org.elasticsearch.index.field.data.support.FieldDataLoader; import org.elasticsearch.util.gnu.trove.TIntArrayList; import java.io.IOException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/ints/MultiValueIntFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/MultiValueIntFieldData.java similarity index 96% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/ints/MultiValueIntFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/MultiValueIntFieldData.java index a540f4e89ed..2eb00f2f13d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/ints/MultiValueIntFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/MultiValueIntFieldData.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.index.field.ints; +package org.elasticsearch.index.field.data.ints; -import org.elasticsearch.index.field.FieldDataOptions; -import org.elasticsearch.index.field.doubles.DoubleFieldData; +import org.elasticsearch.index.field.data.FieldDataOptions; +import org.elasticsearch.index.field.data.doubles.DoubleFieldData; import org.elasticsearch.util.ThreadLocals; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/ints/SingleValueIntFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/SingleValueIntFieldData.java similarity index 94% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/ints/SingleValueIntFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/SingleValueIntFieldData.java index 6c1cbb2a60d..16383843f8d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/ints/SingleValueIntFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/SingleValueIntFieldData.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.index.field.ints; +package org.elasticsearch.index.field.data.ints; -import org.elasticsearch.index.field.FieldDataOptions; -import org.elasticsearch.index.field.doubles.DoubleFieldData; +import org.elasticsearch.index.field.data.FieldDataOptions; +import org.elasticsearch.index.field.data.doubles.DoubleFieldData; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/longs/LongDocFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongDocFieldData.java similarity index 91% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/longs/LongDocFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongDocFieldData.java index d4e43fbcb58..aaccba3792f 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/longs/LongDocFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongDocFieldData.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.index.field.longs; +package org.elasticsearch.index.field.data.longs; -import org.elasticsearch.index.field.NumericDocFieldData; +import org.elasticsearch.index.field.data.NumericDocFieldData; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/longs/LongFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldData.java similarity index 94% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/longs/LongFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldData.java index f3b0c82cc71..6d4a7772746 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/longs/LongFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldData.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.index.field.longs; +package org.elasticsearch.index.field.data.longs; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.FieldCache; -import org.elasticsearch.index.field.FieldDataOptions; -import org.elasticsearch.index.field.NumericFieldData; -import org.elasticsearch.index.field.support.FieldDataLoader; +import org.elasticsearch.index.field.data.FieldDataOptions; +import org.elasticsearch.index.field.data.NumericFieldData; +import org.elasticsearch.index.field.data.support.FieldDataLoader; import org.elasticsearch.util.gnu.trove.TLongArrayList; import java.io.IOException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/longs/MultiValueLongFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/MultiValueLongFieldData.java similarity index 96% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/longs/MultiValueLongFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/MultiValueLongFieldData.java index 65dcc0e3f8a..1257b5b9480 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/longs/MultiValueLongFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/MultiValueLongFieldData.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.index.field.longs; +package org.elasticsearch.index.field.data.longs; -import org.elasticsearch.index.field.FieldDataOptions; -import org.elasticsearch.index.field.doubles.DoubleFieldData; +import org.elasticsearch.index.field.data.FieldDataOptions; +import org.elasticsearch.index.field.data.doubles.DoubleFieldData; import org.elasticsearch.util.ThreadLocals; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/longs/SingleValueLongFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/SingleValueLongFieldData.java similarity index 94% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/longs/SingleValueLongFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/SingleValueLongFieldData.java index 3f2d3ef1705..7b6fc225381 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/longs/SingleValueLongFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/SingleValueLongFieldData.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.index.field.longs; +package org.elasticsearch.index.field.data.longs; -import org.elasticsearch.index.field.FieldDataOptions; -import org.elasticsearch.index.field.doubles.DoubleFieldData; +import org.elasticsearch.index.field.data.FieldDataOptions; +import org.elasticsearch.index.field.data.doubles.DoubleFieldData; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/shorts/MultiValueShortFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/MultiValueShortFieldData.java similarity index 96% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/shorts/MultiValueShortFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/MultiValueShortFieldData.java index e79ef5250f1..4b6fd6c5f94 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/shorts/MultiValueShortFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/MultiValueShortFieldData.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.index.field.shorts; +package org.elasticsearch.index.field.data.shorts; -import org.elasticsearch.index.field.FieldDataOptions; -import org.elasticsearch.index.field.doubles.DoubleFieldData; +import org.elasticsearch.index.field.data.FieldDataOptions; +import org.elasticsearch.index.field.data.doubles.DoubleFieldData; import org.elasticsearch.util.ThreadLocals; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/shorts/ShortDocFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortDocFieldData.java similarity index 91% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/shorts/ShortDocFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortDocFieldData.java index fd4d67bc445..bcaf0a4323c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/shorts/ShortDocFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortDocFieldData.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.index.field.shorts; +package org.elasticsearch.index.field.data.shorts; -import org.elasticsearch.index.field.NumericDocFieldData; +import org.elasticsearch.index.field.data.NumericDocFieldData; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/shorts/ShortFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldData.java similarity index 94% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/shorts/ShortFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldData.java index f7d4211a753..9364eb12be1 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/shorts/ShortFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldData.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.index.field.shorts; +package org.elasticsearch.index.field.data.shorts; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.FieldCache; -import org.elasticsearch.index.field.FieldDataOptions; -import org.elasticsearch.index.field.NumericFieldData; -import org.elasticsearch.index.field.support.FieldDataLoader; +import org.elasticsearch.index.field.data.FieldDataOptions; +import org.elasticsearch.index.field.data.NumericFieldData; +import org.elasticsearch.index.field.data.support.FieldDataLoader; import org.elasticsearch.util.gnu.trove.TShortArrayList; import java.io.IOException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/shorts/SingleValueShortFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/SingleValueShortFieldData.java similarity index 94% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/shorts/SingleValueShortFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/SingleValueShortFieldData.java index 02659313b99..c5990b35b1a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/shorts/SingleValueShortFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/SingleValueShortFieldData.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.index.field.shorts; +package org.elasticsearch.index.field.data.shorts; -import org.elasticsearch.index.field.FieldDataOptions; -import org.elasticsearch.index.field.doubles.DoubleFieldData; +import org.elasticsearch.index.field.data.FieldDataOptions; +import org.elasticsearch.index.field.data.doubles.DoubleFieldData; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/strings/MultiValueStringFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/MultiValueStringFieldData.java similarity index 96% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/strings/MultiValueStringFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/MultiValueStringFieldData.java index e78c4c9acd0..8f10f58c1f2 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/strings/MultiValueStringFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/MultiValueStringFieldData.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.index.field.strings; +package org.elasticsearch.index.field.data.strings; -import org.elasticsearch.index.field.FieldDataOptions; +import org.elasticsearch.index.field.data.FieldDataOptions; import org.elasticsearch.util.Strings; import org.elasticsearch.util.ThreadLocals; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/strings/SingleValueStringFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/SingleValueStringFieldData.java similarity index 95% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/strings/SingleValueStringFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/SingleValueStringFieldData.java index c404571d5a8..7c7a8c76234 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/strings/SingleValueStringFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/SingleValueStringFieldData.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.index.field.strings; +package org.elasticsearch.index.field.data.strings; -import org.elasticsearch.index.field.FieldDataOptions; +import org.elasticsearch.index.field.data.FieldDataOptions; import org.elasticsearch.util.Strings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/strings/StringDocFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringDocFieldData.java similarity index 91% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/strings/StringDocFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringDocFieldData.java index df3b14a0306..8771b650a20 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/strings/StringDocFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringDocFieldData.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.index.field.strings; +package org.elasticsearch.index.field.data.strings; -import org.elasticsearch.index.field.DocFieldData; +import org.elasticsearch.index.field.data.DocFieldData; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/strings/StringFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldData.java similarity index 93% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/strings/StringFieldData.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldData.java index 12c2cd71601..48da5d1c976 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/strings/StringFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldData.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.index.field.strings; +package org.elasticsearch.index.field.data.strings; import org.apache.lucene.index.IndexReader; -import org.elasticsearch.index.field.FieldData; -import org.elasticsearch.index.field.FieldDataOptions; -import org.elasticsearch.index.field.support.FieldDataLoader; +import org.elasticsearch.index.field.data.FieldData; +import org.elasticsearch.index.field.data.FieldDataOptions; +import org.elasticsearch.index.field.data.support.FieldDataLoader; import java.io.IOException; import java.util.ArrayList; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/support/FieldDataLoader.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/support/FieldDataLoader.java similarity index 96% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/support/FieldDataLoader.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/support/FieldDataLoader.java index dd5cba29f01..e01fb449ae3 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/support/FieldDataLoader.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/support/FieldDataLoader.java @@ -17,15 +17,15 @@ * under the License. */ -package org.elasticsearch.index.field.support; +package org.elasticsearch.index.field.data.support; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermDocs; import org.apache.lucene.index.TermEnum; import org.apache.lucene.util.StringHelper; -import org.elasticsearch.index.field.FieldData; -import org.elasticsearch.index.field.FieldDataOptions; +import org.elasticsearch.index.field.data.FieldData; +import org.elasticsearch.index.field.data.FieldDataOptions; import org.elasticsearch.util.gnu.trove.TIntArrayList; import java.io.IOException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java index dfddb5a4852..a59957d019b 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java @@ -25,7 +25,7 @@ import org.apache.lucene.document.Fieldable; import org.apache.lucene.index.Term; import org.apache.lucene.search.Filter; import org.apache.lucene.search.Query; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.util.concurrent.Immutable; import org.elasticsearch.util.concurrent.ThreadSafe; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentBoostFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentBoostFieldMapper.java index fb758927854..5a8f2d133bb 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentBoostFieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentBoostFieldMapper.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.*; import org.apache.lucene.util.NumericUtils; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.analysis.NumericFloatAnalyzer; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.index.mapper.BoostFieldMapper; import org.elasticsearch.index.mapper.MergeMappingException; import org.elasticsearch.util.Numbers; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDateFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDateFieldMapper.java index 474f366770c..174354ffc94 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDateFieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDateFieldMapper.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.*; import org.apache.lucene.util.NumericUtils; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.analysis.NumericDateAnalyzer; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.util.Numbers; import org.elasticsearch.util.Strings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDoubleFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDoubleFieldMapper.java index 02930e64f05..3f3702ca466 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDoubleFieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDoubleFieldMapper.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.*; import org.apache.lucene.util.NumericUtils; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.analysis.NumericDoubleAnalyzer; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.util.Numbers; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentFieldMapper.java index ce29b3f96a1..88226198cc7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentFieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentFieldMapper.java @@ -25,7 +25,7 @@ import org.apache.lucene.document.Fieldable; import org.apache.lucene.index.Term; import org.apache.lucene.search.*; import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.FieldMapperListener; import org.elasticsearch.index.mapper.MergeMappingException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentFloatFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentFloatFieldMapper.java index 2d5859b7773..59f8523080c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentFloatFieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentFloatFieldMapper.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.*; import org.apache.lucene.util.NumericUtils; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.analysis.NumericFloatAnalyzer; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.util.Numbers; import org.elasticsearch.util.Strings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentIntegerFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentIntegerFieldMapper.java index fb110af1516..13fd2f7e44b 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentIntegerFieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentIntegerFieldMapper.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.*; import org.apache.lucene.util.NumericUtils; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.analysis.NumericIntegerAnalyzer; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.util.Numbers; import org.elasticsearch.util.Strings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentLongFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentLongFieldMapper.java index b7f3846ce78..539738bbb08 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentLongFieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentLongFieldMapper.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.*; import org.apache.lucene.util.NumericUtils; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.analysis.NumericLongAnalyzer; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.util.Numbers; import org.elasticsearch.util.Strings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentNumberFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentNumberFieldMapper.java index de9a3867aa9..944c0102af3 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentNumberFieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentNumberFieldMapper.java @@ -27,7 +27,7 @@ import org.apache.lucene.search.Filter; import org.apache.lucene.search.Query; import org.apache.lucene.util.NumericUtils; import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.util.ThreadLocals; import org.elasticsearch.util.gnu.trove.TIntObjectHashMap; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentShortFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentShortFieldMapper.java index c2d4e9a468d..576c01aaa2e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentShortFieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentShortFieldMapper.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.*; import org.apache.lucene.util.NumericUtils; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.analysis.NumericIntegerAnalyzer; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.util.Numbers; import org.elasticsearch.util.Strings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/histogram/HistogramFacetCollector.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/histogram/HistogramFacetCollector.java index 501ca09ff3a..dbef6818add 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/histogram/HistogramFacetCollector.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/histogram/HistogramFacetCollector.java @@ -20,9 +20,9 @@ package org.elasticsearch.search.facets.histogram; import org.apache.lucene.index.IndexReader; -import org.elasticsearch.index.cache.field.FieldDataCache; -import org.elasticsearch.index.field.FieldData; -import org.elasticsearch.index.field.NumericFieldData; +import org.elasticsearch.index.cache.field.data.FieldDataCache; +import org.elasticsearch.index.field.data.FieldData; +import org.elasticsearch.index.field.data.NumericFieldData; import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.search.facets.Facet; @@ -33,7 +33,7 @@ import org.elasticsearch.util.gnu.trove.TLongLongHashMap; import java.io.IOException; -import static org.elasticsearch.index.field.FieldDataOptions.*; +import static org.elasticsearch.index.field.data.FieldDataOptions.*; /** * A histogram facet collector that uses the same field as the key as well as the diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/histogram/KeyValueHistogramFacetCollector.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/histogram/KeyValueHistogramFacetCollector.java index 161f615be8b..68f6940fb54 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/histogram/KeyValueHistogramFacetCollector.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/histogram/KeyValueHistogramFacetCollector.java @@ -20,9 +20,9 @@ package org.elasticsearch.search.facets.histogram; import org.apache.lucene.index.IndexReader; -import org.elasticsearch.index.cache.field.FieldDataCache; -import org.elasticsearch.index.field.FieldData; -import org.elasticsearch.index.field.NumericFieldData; +import org.elasticsearch.index.cache.field.data.FieldDataCache; +import org.elasticsearch.index.field.data.FieldData; +import org.elasticsearch.index.field.data.NumericFieldData; import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.search.facets.Facet; @@ -33,7 +33,7 @@ import org.elasticsearch.util.gnu.trove.TLongLongHashMap; import java.io.IOException; -import static org.elasticsearch.index.field.FieldDataOptions.*; +import static org.elasticsearch.index.field.data.FieldDataOptions.*; /** * A histogram facet collector that uses different fields for the key and the value. diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/statistical/StatisticalFacetCollector.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/statistical/StatisticalFacetCollector.java index 5799911c022..2352c56df12 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/statistical/StatisticalFacetCollector.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/statistical/StatisticalFacetCollector.java @@ -20,9 +20,9 @@ package org.elasticsearch.search.facets.statistical; import org.apache.lucene.index.IndexReader; -import org.elasticsearch.index.cache.field.FieldDataCache; -import org.elasticsearch.index.field.FieldData; -import org.elasticsearch.index.field.NumericFieldData; +import org.elasticsearch.index.cache.field.data.FieldDataCache; +import org.elasticsearch.index.field.data.FieldData; +import org.elasticsearch.index.field.data.NumericFieldData; import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.search.facets.Facet; @@ -31,7 +31,7 @@ import org.elasticsearch.search.facets.support.AbstractFacetCollector; import java.io.IOException; -import static org.elasticsearch.index.field.FieldDataOptions.*; +import static org.elasticsearch.index.field.data.FieldDataOptions.*; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/terms/TermsFacetCollector.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/terms/TermsFacetCollector.java index b74d99fabd5..a72bdc21ab6 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/terms/TermsFacetCollector.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/terms/TermsFacetCollector.java @@ -20,8 +20,8 @@ package org.elasticsearch.search.facets.terms; import org.apache.lucene.index.IndexReader; -import org.elasticsearch.index.cache.field.FieldDataCache; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.cache.field.data.FieldDataCache; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.search.facets.Facet; @@ -36,7 +36,7 @@ import java.io.IOException; import java.util.ArrayDeque; import java.util.Deque; -import static org.elasticsearch.index.field.FieldDataOptions.*; +import static org.elasticsearch.index.field.data.FieldDataOptions.*; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java index ede24f03444..54324f2d9a7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java @@ -23,7 +23,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.Sort; import org.apache.lucene.store.AlreadyClosedException; import org.elasticsearch.ElasticSearchException; -import org.elasticsearch.index.cache.field.FieldDataCache; +import org.elasticsearch.index.cache.field.data.FieldDataCache; import org.elasticsearch.index.cache.filter.FilterCache; import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.mapper.MapperService; diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/doubles/DoubleFieldDataTests.java b/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataTests.java similarity index 97% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/field/doubles/DoubleFieldDataTests.java rename to modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataTests.java index 7e2ff4a7227..583563ccafd 100644 --- a/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/doubles/DoubleFieldDataTests.java +++ b/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataTests.java @@ -17,21 +17,21 @@ * under the License. */ -package org.elasticsearch.index.field.doubles; +package org.elasticsearch.index.field.data.doubles; import org.apache.lucene.document.NumericField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.util.Tuple; import org.elasticsearch.util.lucene.Lucene; import org.testng.annotations.Test; import java.util.ArrayList; -import static org.elasticsearch.index.field.FieldDataOptions.*; +import static org.elasticsearch.index.field.data.FieldDataOptions.*; import static org.elasticsearch.util.Tuple.*; import static org.elasticsearch.util.lucene.DocumentBuilder.*; import static org.hamcrest.MatcherAssert.*; diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/floats/FloatFieldDataTests.java b/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/floats/FloatFieldDataTests.java similarity index 97% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/field/floats/FloatFieldDataTests.java rename to modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/floats/FloatFieldDataTests.java index d6ff8a8fc3d..58af03beb87 100644 --- a/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/floats/FloatFieldDataTests.java +++ b/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/floats/FloatFieldDataTests.java @@ -17,21 +17,21 @@ * under the License. */ -package org.elasticsearch.index.field.floats; +package org.elasticsearch.index.field.data.floats; import org.apache.lucene.document.NumericField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.util.Tuple; import org.elasticsearch.util.lucene.Lucene; import org.testng.annotations.Test; import java.util.ArrayList; -import static org.elasticsearch.index.field.FieldDataOptions.*; +import static org.elasticsearch.index.field.data.FieldDataOptions.*; import static org.elasticsearch.util.Tuple.*; import static org.elasticsearch.util.lucene.DocumentBuilder.*; import static org.hamcrest.MatcherAssert.*; diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/ints/IntFieldDataTests.java b/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/ints/IntFieldDataTests.java similarity index 97% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/field/ints/IntFieldDataTests.java rename to modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/ints/IntFieldDataTests.java index 071de6b41af..b07d5b1b7c3 100644 --- a/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/ints/IntFieldDataTests.java +++ b/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/ints/IntFieldDataTests.java @@ -17,21 +17,21 @@ * under the License. */ -package org.elasticsearch.index.field.ints; +package org.elasticsearch.index.field.data.ints; import org.apache.lucene.document.NumericField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.util.Tuple; import org.elasticsearch.util.lucene.Lucene; import org.testng.annotations.Test; import java.util.ArrayList; -import static org.elasticsearch.index.field.FieldDataOptions.*; +import static org.elasticsearch.index.field.data.FieldDataOptions.*; import static org.elasticsearch.util.Tuple.*; import static org.elasticsearch.util.lucene.DocumentBuilder.*; import static org.hamcrest.MatcherAssert.*; diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/longs/LongFieldDataTests.java b/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/longs/LongFieldDataTests.java similarity index 97% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/field/longs/LongFieldDataTests.java rename to modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/longs/LongFieldDataTests.java index ea51ba1748b..9631dc8f924 100644 --- a/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/longs/LongFieldDataTests.java +++ b/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/longs/LongFieldDataTests.java @@ -17,21 +17,21 @@ * under the License. */ -package org.elasticsearch.index.field.longs; +package org.elasticsearch.index.field.data.longs; import org.apache.lucene.document.NumericField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.util.Tuple; import org.elasticsearch.util.lucene.Lucene; import org.testng.annotations.Test; import java.util.ArrayList; -import static org.elasticsearch.index.field.FieldDataOptions.*; +import static org.elasticsearch.index.field.data.FieldDataOptions.*; import static org.elasticsearch.util.Tuple.*; import static org.elasticsearch.util.lucene.DocumentBuilder.*; import static org.hamcrest.MatcherAssert.*; diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/shorts/ShortFieldDataTests.java b/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataTests.java similarity index 97% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/field/shorts/ShortFieldDataTests.java rename to modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataTests.java index 4e012f85092..d6038e5ce9d 100644 --- a/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/shorts/ShortFieldDataTests.java +++ b/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataTests.java @@ -17,21 +17,21 @@ * under the License. */ -package org.elasticsearch.index.field.shorts; +package org.elasticsearch.index.field.data.shorts; import org.apache.lucene.document.NumericField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.util.Tuple; import org.elasticsearch.util.lucene.Lucene; import org.testng.annotations.Test; import java.util.ArrayList; -import static org.elasticsearch.index.field.FieldDataOptions.*; +import static org.elasticsearch.index.field.data.FieldDataOptions.*; import static org.elasticsearch.util.Tuple.*; import static org.elasticsearch.util.lucene.DocumentBuilder.*; import static org.hamcrest.MatcherAssert.*; diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/strings/StringFieldDataTests.java b/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/strings/StringFieldDataTests.java similarity index 97% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/field/strings/StringFieldDataTests.java rename to modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/strings/StringFieldDataTests.java index efecc2a5f98..275900132d2 100644 --- a/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/strings/StringFieldDataTests.java +++ b/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/strings/StringFieldDataTests.java @@ -17,20 +17,20 @@ * under the License. */ -package org.elasticsearch.index.field.strings; +package org.elasticsearch.index.field.data.strings; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; -import org.elasticsearch.index.field.FieldData; +import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.util.Tuple; import org.elasticsearch.util.lucene.Lucene; import org.testng.annotations.Test; import java.util.ArrayList; -import static org.elasticsearch.index.field.FieldDataOptions.*; +import static org.elasticsearch.index.field.data.FieldDataOptions.*; import static org.elasticsearch.util.Tuple.*; import static org.elasticsearch.util.lucene.DocumentBuilder.*; import static org.hamcrest.MatcherAssert.*;