Skip to content

Commit 75c0cd0

Browse files
authored
Move range field mapper back to core
This commit moves the range field mapper back to core so that we can remove the compile-time dependency of percolator on mapper-extras which compilcates dependency management for the percolator client JAR, and modules should not be intertwined like this anyway. Relates #27854
1 parent fade828 commit 75c0cd0

19 files changed

+13
-28
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
1920
package org.apache.lucene.queries;
2021

2122
import org.apache.lucene.index.BinaryDocValues;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
1920
package org.elasticsearch.index.mapper;
2021

21-
import org.apache.lucene.document.HalfFloatPoint;
2222
import org.apache.lucene.store.ByteArrayDataOutput;
2323
import org.apache.lucene.util.BytesRef;
2424
import org.apache.lucene.util.NumericUtils;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
1920
package org.elasticsearch.index.mapper;
2021

2122
import org.apache.lucene.document.DoubleRange;

core/src/main/java/org/elasticsearch/indices/IndicesModule.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import org.elasticsearch.index.mapper.NumberFieldMapper;
4444
import org.elasticsearch.index.mapper.ObjectMapper;
4545
import org.elasticsearch.index.mapper.ParentFieldMapper;
46+
import org.elasticsearch.index.mapper.RangeFieldMapper;
4647
import org.elasticsearch.index.mapper.RoutingFieldMapper;
4748
import org.elasticsearch.index.mapper.SeqNoFieldMapper;
4849
import org.elasticsearch.index.mapper.SourceFieldMapper;
@@ -98,6 +99,9 @@ private Map<String, Mapper.TypeParser> getMappers(List<MapperPlugin> mapperPlugi
9899
for (NumberFieldMapper.NumberType type : NumberFieldMapper.NumberType.values()) {
99100
mappers.put(type.typeName(), new NumberFieldMapper.TypeParser(type));
100101
}
102+
for (RangeFieldMapper.RangeType type : RangeFieldMapper.RangeType.values()) {
103+
mappers.put(type.typeName(), new RangeFieldMapper.TypeParser(type));
104+
}
101105
mappers.put(BooleanFieldMapper.CONTENT_TYPE, new BooleanFieldMapper.TypeParser());
102106
mappers.put(BinaryFieldMapper.CONTENT_TYPE, new BinaryFieldMapper.TypeParser());
103107
mappers.put(DateFieldMapper.CONTENT_TYPE, new DateFieldMapper.TypeParser());

0 commit comments

Comments
 (0)