refactor ip field mapper into its own package

Author: kimchy

modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ObjectMapper.java

@@ -28,6 +28,7 @@
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.mapper.*;
+import org.elasticsearch.index.mapper.xcontent.ip.IpFieldMapper;
 
 import java.io.IOException;
 import java.util.HashMap;

modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDocumentMapperParser.java

@@ -37,6 +37,7 @@
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldMapper;
+import org.elasticsearch.index.mapper.xcontent.ip.IpFieldMapper;
 import org.elasticsearch.index.settings.IndexSettings;
 
 import javax.annotation.Nullable;

modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentMapperBuilders.java

@@ -19,6 +19,8 @@
 
 package org.elasticsearch.index.mapper.xcontent;
 
+import org.elasticsearch.index.mapper.xcontent.ip.IpFieldMapper;
+
 /**
  * @author kimchy (shay.banon)
  */

modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/IpFieldMapper.java renamed to modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ip/IpFieldMapper.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper.xcontent;
+package org.elasticsearch.index.mapper.xcontent.ip;
 
 import org.apache.lucene.analysis.NumericTokenStream;
 import org.apache.lucene.document.Field;
@@ -38,6 +38,10 @@
 import org.elasticsearch.index.field.data.FieldDataType;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
+import org.elasticsearch.index.mapper.xcontent.MergeContext;
+import org.elasticsearch.index.mapper.xcontent.NumberFieldMapper;
+import org.elasticsearch.index.mapper.xcontent.ParseContext;
+import org.elasticsearch.index.mapper.xcontent.XContentMapper;
 
 import java.io.IOException;
 import java.io.Reader;