Skip to content

Commit d3295a6

Browse files
committed
DATAES-659 - Move MappingElasticsearchConverter to correct package.
Original PR: #328
1 parent 1b12d81 commit d3295a6

10 files changed

+12
-11
lines changed

src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
102102
import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
103103
import org.springframework.data.elasticsearch.core.facet.FacetRequest;
104-
import org.springframework.data.elasticsearch.core.indexmapping.MappingBuilder;
104+
import org.springframework.data.elasticsearch.core.index.MappingBuilder;
105105
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
106106
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
107107
import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;

src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
8989
import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
9090
import org.springframework.data.elasticsearch.core.facet.FacetRequest;
91-
import org.springframework.data.elasticsearch.core.indexmapping.MappingBuilder;
91+
import org.springframework.data.elasticsearch.core.index.MappingBuilder;
9292
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
9393
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
9494
import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;

src/main/java/org/springframework/data/elasticsearch/core/indexmapping/MappingBuilder.java renamed to src/main/java/org/springframework/data/elasticsearch/core/index/MappingBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.core.indexmapping;
16+
package org.springframework.data.elasticsearch.core.index;
1717

1818
import static org.elasticsearch.common.xcontent.XContentFactory.*;
19-
import static org.springframework.data.elasticsearch.core.indexmapping.MappingParameters.*;
19+
import static org.springframework.data.elasticsearch.core.index.MappingParameters.*;
2020
import static org.springframework.util.StringUtils.*;
2121

2222
import java.io.ByteArrayInputStream;
+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
15-
*/package org.springframework.data.elasticsearch.core.indexmapping;
15+
*/
16+
package org.springframework.data.elasticsearch.core.index;
1617

1718
import java.io.IOException;
1819
import java.lang.annotation.Annotation;

src/main/java/org/springframework/data/elasticsearch/core/indexmapping/package-info.java renamed to src/main/java/org/springframework/data/elasticsearch/core/index/package-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
* infrastructure to define the Elasticsearch mapping for an index.
33
*/
44
@org.springframework.lang.NonNullApi
5-
package org.springframework.data.elasticsearch.core.indexmapping;
5+
package org.springframework.data.elasticsearch.core.index;
+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.data.elasticsearch.core.indexmapping;
17+
package org.springframework.data.elasticsearch.core.index;
1818

1919
import static org.assertj.core.api.Assertions.*;
2020
import static org.elasticsearch.index.query.QueryBuilders.*;
+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* limitations under the License.
1414
*/
1515

16-
package org.springframework.data.elasticsearch.core.indexmapping;
16+
package org.springframework.data.elasticsearch.core.index;
1717

1818
import org.springframework.data.elasticsearch.config.ElasticsearchConfigurationSupport;
1919
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.springframework.data.elasticsearch.core.indexmapping;
1+
package org.springframework.data.elasticsearch.core.index;
22

33
import static org.assertj.core.api.Assertions.*;
44

Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.core.indexmapping;
16+
package org.springframework.data.elasticsearch.core.index;
1717

1818
import static org.assertj.core.api.Assertions.*;
1919

Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.core.indexmapping;
16+
package org.springframework.data.elasticsearch.core.index;
1717

1818
import static org.assertj.core.api.Assertions.*;
1919
import static org.springframework.data.elasticsearch.annotations.FieldType.*;

0 commit comments

Comments
 (0)