From c5c9956bc04a85185bb7d589c72109249e03579f Mon Sep 17 00:00:00 2001 From: Mohsin Husen Date: Wed, 24 Feb 2016 12:44:00 +0000 Subject: [PATCH] DATAES-211 - clean up remove waitForOperation from refresh() enhance GeoPoint and Point feature code clean up --- .../core/CriteriaFilterProcessor.java | 1 - .../core/ElasticsearchOperations.java | 8 +- .../core/ElasticsearchTemplate.java | 49 +++---- .../data/elasticsearch/core/geo/GeoPoint.java | 5 +- .../elasticsearch/core/query/DeleteQuery.java | 20 ++- .../repository/ElasticsearchRepository.java | 4 +- .../AbstractElasticsearchRepository.java | 19 ++- .../data/elasticsearch/InnerObjectTests.java | 4 +- .../data/elasticsearch/NestedObjectTests.java | 18 +-- .../data/elasticsearch/core/AliasTests.java | 8 +- .../core/DefaultEntityMapperTests.java | 2 +- ...ElasticsearchTemplateParentChildTests.java | 6 +- .../core/ElasticsearchTemplateTests.java | 133 +++++++++--------- .../elasticsearch/core/LogEntityTests.java | 4 +- .../core/MappingBuilderTests.java | 4 +- ... SimpleElasticsearchDateMappingTests.java} | 5 +- ...ElasticsearchTemplateAggregationTests.java | 6 +- .../ElasticsearchTemplateCompletionTests.java | 18 +-- .../geo/ElasticsearchTemplateGeoTests.java | 12 +- .../core/query/CriteriaQueryTests.java | 42 +++--- .../CustomMethodRepositoryTests.java | 16 +-- ...a => CreateIndexFalseRepositoryTests.java} | 2 +- ...java => SpringDataGeoRepositoryTests.java} | 25 +++- ...ettingAndMappingEntityRepositoryTests.java | 8 +- ...ldDynamicMappingEntityRepositoryTests.java | 4 +- .../synonym/SynonymRepositoryTests.java | 4 +- ...stomMethodRepositoryManualWiringTests.java | 4 +- .../ComplexCustomMethodRepositoryTests.java | 4 +- .../support/DoubleIDRepositoryTests.java | 4 +- ...rchEntityInformationCreatorImplTests.java} | 2 +- .../support/IntegerIDRepositoryTests.java | 4 +- ...wordsTest.java => QueryKeywordsTests.java} | 21 ++- .../SimpleElasticsearchRepositoryTests.java | 10 +- 33 files changed, 262 insertions(+), 214 deletions(-) rename src/test/java/org/springframework/data/elasticsearch/core/{SimpleElasticsearchDateMappingTest.java => SimpleElasticsearchDateMappingTests.java} (85%) rename src/test/java/org/springframework/data/elasticsearch/repositories/existing/index/{CreateIndexFalseRepositoryTest.java => CreateIndexFalseRepositoryTests.java} (94%) rename src/test/java/org/springframework/data/elasticsearch/repositories/geo/{SpringDataGeoRepositoryTest.java => SpringDataGeoRepositoryTests.java} (64%) rename src/test/java/org/springframework/data/elasticsearch/repository/support/{ElasticsearchEntityInformationCreatorImplTest.java => ElasticsearchEntityInformationCreatorImplTests.java} (97%) rename src/test/java/org/springframework/data/elasticsearch/repository/support/{QueryKeywordsTest.java => QueryKeywordsTests.java} (81%) diff --git a/src/main/java/org/springframework/data/elasticsearch/core/CriteriaFilterProcessor.java b/src/main/java/org/springframework/data/elasticsearch/core/CriteriaFilterProcessor.java index c654e9659..271747f28 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/CriteriaFilterProcessor.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/CriteriaFilterProcessor.java @@ -108,7 +108,6 @@ class CriteriaFilterProcessor { } QueryBuilder filter = null; - //todo : expose more option for GeoPoint i.e GeoDistance.PLANE or GeoDistance.ARC switch (key) { case WITHIN: { GeoDistanceQueryBuilder geoDistanceQueryBuilder = QueryBuilders.geoDistanceQuery(fieldName); diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchOperations.java index a37ab2d1e..f367e6205 100755 --- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchOperations.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchOperations.java @@ -461,17 +461,17 @@ public interface ElasticsearchOperations { * refresh the index * * @param indexName - * @param waitForOperation + * */ - void refresh(String indexName, boolean waitForOperation); + void refresh(String indexName); /** * refresh the index * * @param clazz - * @param waitForOperation + * */ - void refresh(Class clazz, boolean waitForOperation); + void refresh(Class clazz); /** * Returns scroll id for criteria query diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java index 74229576a..1720cdf96 100755 --- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java @@ -639,31 +639,24 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati @Override public void delete(DeleteQuery deleteQuery, Class clazz) { - //TODO : clean up expose parameter for scan and scroll - String iName = deleteQuery.getIndex(); - String tName = deleteQuery.getType(); - if(clazz!=null){ - ElasticsearchPersistentEntity persistentEntity = getPersistentEntityFor(clazz); - iName = persistentEntity.getIndexName(); - tName =persistentEntity.getIndexType(); - } + String indexName = isNotBlank(deleteQuery.getIndex()) ? deleteQuery.getIndex() : getPersistentEntityFor(clazz).getIndexName(); + String typeName = isNotBlank(deleteQuery.getType()) ? deleteQuery.getType() : getPersistentEntityFor(clazz).getIndexType(); + Integer pageSize = deleteQuery.getPageSize() != null ? deleteQuery.getPageSize() : 1000; + Long scrollTimeInMillis = deleteQuery.getScrollTimeInMillis() != null ? deleteQuery.getScrollTimeInMillis() : 10000l; - final String indexName = iName; - final String typeName = tName; - - SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(deleteQuery.getQuery()) + SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(deleteQuery.getQuery()) .withIndices(indexName) .withTypes(typeName) - .withPageable(new PageRequest(0, 1000)) + .withPageable(new PageRequest(0, pageSize)) .build(); - final String scrollId = scan(searchQuery, 10000, true); + String scrollId = scan(searchQuery, scrollTimeInMillis, true); - final BulkRequestBuilder bulkRequestBuilder = client.prepareBulk(); + BulkRequestBuilder bulkRequestBuilder = client.prepareBulk(); List ids = new ArrayList(); boolean hasRecords = true; while (hasRecords) { - Page page = scroll(scrollId, 5000, new SearchResultMapper() { + Page page = scroll(scrollId, scrollTimeInMillis, new SearchResultMapper() { @Override public Page mapResults(SearchResponse response, Class clazz, Pageable pageable) { List result = new ArrayList(); @@ -671,7 +664,6 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati String id = searchHit.getId(); result.add(id); } - if (result.size() > 0) { return new PageImpl((List) result); } @@ -693,7 +685,6 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati bulkRequestBuilder.execute().actionGet(); } - refresh(indexName, false); } @Override @@ -802,7 +793,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati @Override public Page moreLikeThis(MoreLikeThisQuery query, Class clazz) { - //todo : clean up + ElasticsearchPersistentEntity persistentEntity = getPersistentEntityFor(clazz); String indexName = isNotBlank(query.getIndexName()) ? query.getIndexName() : persistentEntity.getIndexName(); String type = isNotBlank(query.getType()) ? query.getType() : persistentEntity.getIndexType(); @@ -811,8 +802,8 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati Assert.notNull(type, "No 'type' defined for MoreLikeThisQuery"); Assert.notNull(query.getId(), "No document id defined for MoreLikeThisQuery"); - final MoreLikeThisQueryBuilder.Item item = new MoreLikeThisQueryBuilder.Item(indexName, type, query.getId()); - MoreLikeThisQueryBuilder moreLikeThisQueryBuilder = moreLikeThisQuery().addLikeItem(item); + MoreLikeThisQueryBuilder moreLikeThisQueryBuilder = moreLikeThisQuery() + .addLikeItem(new MoreLikeThisQueryBuilder.Item(indexName, type, query.getId())); if (query.getMinTermFreq() != null) { moreLikeThisQueryBuilder.minTermFreq(query.getMinTermFreq()); @@ -839,8 +830,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati moreLikeThisQueryBuilder.boostTerms(query.getBoostTerms()); } - final NativeSearchQuery build = new NativeSearchQueryBuilder().withQuery(moreLikeThisQueryBuilder).build(); - return queryForPage(build,clazz); + return queryForPage(new NativeSearchQueryBuilder().withQuery(moreLikeThisQueryBuilder).build(), clazz); } private SearchResponse doSearch(SearchRequestBuilder searchRequest, SearchQuery searchQuery) { @@ -866,7 +856,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati searchRequest.addHighlightedField(highlightField); } } - + if (CollectionUtils.isNotEmpty(searchQuery.getIndicesBoost())) { for (IndexBoost indexBoost : searchQuery.getIndicesBoost()) { searchRequest.addIndexBoost(indexBoost.getIndexName(), indexBoost.getBoost()); @@ -1022,18 +1012,15 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati } } - //TODO : remove or waitForOperation @Override - public void refresh(String indexName, boolean waitForOperation) { + public void refresh(String indexName) { + Assert.notNull(indexName, "No index defined for refresh()"); client.admin().indices().refresh(refreshRequest(indexName)).actionGet(); } - //TODO : remove or waitForOperation @Override - public void refresh(Class clazz, boolean waitForOperation) { - ElasticsearchPersistentEntity persistentEntity = getPersistentEntityFor(clazz); - client.admin().indices() - .refresh(refreshRequest(persistentEntity.getIndexName())).actionGet(); + public void refresh(Class clazz) { + refresh(getPersistentEntityFor(clazz).getIndexName()); } @Override diff --git a/src/main/java/org/springframework/data/elasticsearch/core/geo/GeoPoint.java b/src/main/java/org/springframework/data/elasticsearch/core/geo/GeoPoint.java index 057813f63..bbc862a9a 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/geo/GeoPoint.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/geo/GeoPoint.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ import org.springframework.data.geo.Point; * geo-location used for #{@link org.springframework.data.elasticsearch.core.query.Criteria}. * * @author Franck Marchand + * @author Mohsin Husen */ public class GeoPoint { @@ -51,7 +52,7 @@ public class GeoPoint { * @return a {@link org.springframework.data.elasticsearch.core.geo.GeoPoint} */ public static GeoPoint fromPoint(Point point) { - return new GeoPoint(point.getY(), point.getX()); + return new GeoPoint(point.getX(), point.getY()); } public static Point toPoint(GeoPoint point) { diff --git a/src/main/java/org/springframework/data/elasticsearch/core/query/DeleteQuery.java b/src/main/java/org/springframework/data/elasticsearch/core/query/DeleteQuery.java index 812cec05d..d36a8bdae 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/query/DeleteQuery.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/query/DeleteQuery.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,6 +28,8 @@ public class DeleteQuery { private QueryBuilder query; private String index; private String type; + private Integer pageSize; + private Long scrollTimeInMillis; public QueryBuilder getQuery() { return query; @@ -52,4 +54,20 @@ public class DeleteQuery { public void setType(String type) { this.type = type; } + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + + public Long getScrollTimeInMillis() { + return scrollTimeInMillis; + } + + public void setScrollTimeInMillis(Long scrollTimeInMillis) { + this.scrollTimeInMillis = scrollTimeInMillis; + } } diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/ElasticsearchRepository.java b/src/main/java/org/springframework/data/elasticsearch/repository/ElasticsearchRepository.java index e2f5982d6..ffcc814a4 100644 --- a/src/main/java/org/springframework/data/elasticsearch/repository/ElasticsearchRepository.java +++ b/src/main/java/org/springframework/data/elasticsearch/repository/ElasticsearchRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,4 +41,6 @@ public interface ElasticsearchRepository extends Ela Page search(SearchQuery searchQuery); Page searchSimilar(T entity, String[] fields, Pageable pageable); + + void refresh(); } diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/support/AbstractElasticsearchRepository.java b/src/main/java/org/springframework/data/elasticsearch/repository/support/AbstractElasticsearchRepository.java index e63697c18..d6bede718 100644 --- a/src/main/java/org/springframework/data/elasticsearch/repository/support/AbstractElasticsearchRepository.java +++ b/src/main/java/org/springframework/data/elasticsearch/repository/support/AbstractElasticsearchRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2014 the original author or authors. + * Copyright 2013-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -140,7 +140,7 @@ public abstract class AbstractElasticsearchRepository S save(S entity) { Assert.notNull(entity, "Cannot save 'null' entity."); elasticsearchOperations.index(createIndexQuery(entity)); - elasticsearchOperations.refresh(entityInformation.getIndexName(), true); + elasticsearchOperations.refresh(entityInformation.getIndexName()); return entity; } @@ -152,7 +152,7 @@ public abstract class AbstractElasticsearchRepository sampleEntities = elasticsearchTemplate.queryForPage(searchQuery, SampleEntity.class); @@ -268,7 +268,7 @@ public class ElasticsearchTemplateTests { IndexQuery indexQuery = getIndexQuery(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); IndexRequest indexRequest = new IndexRequest(); indexRequest.source("message", messageAfterUpdate); @@ -299,7 +299,7 @@ public class ElasticsearchTemplateTests { elasticsearchTemplate.index(indexQuery); // when elasticsearchTemplate.delete(INDEX_NAME, TYPE_NAME, documentId); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // then SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(termQuery("id", documentId)).build(); Page sampleEntities = elasticsearchTemplate.queryForPage(searchQuery, SampleEntity.class); @@ -318,7 +318,7 @@ public class ElasticsearchTemplateTests { elasticsearchTemplate.index(indexQuery); // when elasticsearchTemplate.delete(SampleEntity.class, documentId); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // then SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(termQuery("id", documentId)).build(); Page sampleEntities = elasticsearchTemplate.queryForPage(searchQuery, SampleEntity.class); @@ -335,12 +335,13 @@ public class ElasticsearchTemplateTests { IndexQuery indexQuery = getIndexQuery(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // when DeleteQuery deleteQuery = new DeleteQuery(); deleteQuery.setQuery(termQuery("id", documentId)); elasticsearchTemplate.delete(deleteQuery, SampleEntity.class); + elasticsearchTemplate.refresh(SampleEntity.class); // then SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(termQuery("id", documentId)).build(); Page sampleEntities = elasticsearchTemplate.queryForPage(searchQuery, SampleEntity.class); @@ -356,7 +357,7 @@ public class ElasticsearchTemplateTests { IndexQuery indexQuery = getIndexQuery(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()) .withFilter(boolQuery().filter(termQuery("id", documentId))).build(); @@ -394,7 +395,7 @@ public class ElasticsearchTemplateTests { indexQueries = getIndexQueries(Arrays.asList(sampleEntity1, sampleEntity2, sampleEntity3)); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()) .withSort(new FieldSortBuilder("rate").ignoreUnmapped(true).order(SortOrder.ASC)).build(); @@ -433,7 +434,7 @@ public class ElasticsearchTemplateTests { indexQueries = getIndexQueries(Arrays.asList(sampleEntity1, sampleEntity2, sampleEntity3)); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()) .withSort(new FieldSortBuilder("rate").ignoreUnmapped(true).order(SortOrder.ASC)) @@ -456,7 +457,7 @@ public class ElasticsearchTemplateTests { IndexQuery indexQuery = getIndexQuery(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); StringQuery stringQuery = new StringQuery(matchAllQuery().toString()); // when @@ -480,7 +481,7 @@ public class ElasticsearchTemplateTests { indexQuery.setObject(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); Map params = new HashMap(); params.put("factor", 2); @@ -506,7 +507,7 @@ public class ElasticsearchTemplateTests { IndexQuery indexQuery = getIndexQuery(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); StringQuery stringQuery = new StringQuery(matchAllQuery().toString(), new PageRequest(0, 10)); // when @@ -531,7 +532,7 @@ public class ElasticsearchTemplateTests { indexQuery.setObject(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); StringQuery stringQuery = new StringQuery(matchAllQuery().toString(), new PageRequest(0, 10), new Sort( new Sort.Order(Sort.Direction.ASC, "messsage"))); @@ -551,7 +552,7 @@ public class ElasticsearchTemplateTests { IndexQuery indexQuery = getIndexQuery(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); StringQuery stringQuery = new StringQuery(termQuery("id", documentId).toString()); // when @@ -582,7 +583,7 @@ public class ElasticsearchTemplateTests { IndexQuery indexQuery = getIndexQuery(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").contains("test")); // when @@ -601,11 +602,12 @@ public class ElasticsearchTemplateTests { IndexQuery indexQuery = getIndexQuery(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").contains("test")); // when elasticsearchTemplate.delete(criteriaQuery, SampleEntity.class); + elasticsearchTemplate.refresh(SampleEntity.class); // then StringQuery stringQuery = new StringQuery(matchAllQuery().toString()); List sampleEntities = elasticsearchTemplate.queryForList(stringQuery, SampleEntity.class); @@ -624,7 +626,7 @@ public class ElasticsearchTemplateTests { IndexQuery indexQuery = getIndexQuery(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).withIndices(INDEX_NAME) .withTypes(TYPE_NAME).withFields("message").build(); // when @@ -665,7 +667,7 @@ public class ElasticsearchTemplateTests { elasticsearchTemplate.index(getIndexQuery(SampleEntity.builder().id(documentId2).message(sampleMessage) .version(System.currentTimeMillis()).build())); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); MoreLikeThisQuery moreLikeThisQuery = new MoreLikeThisQuery(); moreLikeThisQuery.setId(documentId2); @@ -688,7 +690,7 @@ public class ElasticsearchTemplateTests { List entities = createSampleEntitiesWithMessage("Test message", 30); // when elasticsearchTemplate.bulkIndex(entities); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // then CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria()); @@ -716,7 +718,7 @@ public class ElasticsearchTemplateTests { List entities = createSampleEntitiesWithMessage("Test message", 30); // when elasticsearchTemplate.bulkIndex(entities); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // then SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).withIndices(INDEX_NAME) @@ -745,7 +747,7 @@ public class ElasticsearchTemplateTests { List entities = createSampleEntitiesWithMessage("Test message", 30); // when elasticsearchTemplate.bulkIndex(entities); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // then CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria()); @@ -794,7 +796,7 @@ public class ElasticsearchTemplateTests { List entities = createSampleEntitiesWithMessage("Test message", 30); // when elasticsearchTemplate.bulkIndex(entities); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // then SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()) @@ -845,7 +847,7 @@ public class ElasticsearchTemplateTests { List entities = createSampleEntitiesWithMessage("Test message", 30); // when elasticsearchTemplate.bulkIndex(entities); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // then CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria()); @@ -891,7 +893,7 @@ public class ElasticsearchTemplateTests { List entities = createSampleEntitiesWithMessage("Test message", 30); // when elasticsearchTemplate.bulkIndex(entities); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // then SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).withIndices(INDEX_NAME) @@ -938,7 +940,7 @@ public class ElasticsearchTemplateTests { List entities = createSampleEntitiesWithMessage("Test message", 30); // when elasticsearchTemplate.bulkIndex(entities); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // then CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria()); @@ -967,7 +969,7 @@ public class ElasticsearchTemplateTests { List entities = createSampleEntitiesWithMessage("Test message", 30); // when elasticsearchTemplate.bulkIndex(entities); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // then SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()) @@ -996,7 +998,7 @@ public class ElasticsearchTemplateTests { List entities = createSampleEntitiesWithMessage("Test message", 30); // when elasticsearchTemplate.bulkIndex(entities); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // then CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria()); @@ -1057,7 +1059,7 @@ public class ElasticsearchTemplateTests { // when elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // when CriteriaQuery singleCriteriaQuery = new CriteriaQuery(new Criteria("message").contains("test")); CriteriaQuery multipleCriteriaQuery = new CriteriaQuery(new Criteria("message").contains("some").and("message") @@ -1098,7 +1100,7 @@ public class ElasticsearchTemplateTests { // when elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // when StringQuery stringQuery = new StringQuery(matchAllQuery().toString()); List sampleEntities = elasticsearchTemplate.queryForList(stringQuery, SampleEntity.class); @@ -1139,7 +1141,7 @@ public class ElasticsearchTemplateTests { IndexQuery indexQuery = getIndexQuery(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); IndexRequest indexRequest = new IndexRequest(); indexRequest.source("message", messageAfterUpdate); @@ -1197,7 +1199,7 @@ public class ElasticsearchTemplateTests { IndexQuery indexQuery = getIndexQuery(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); SearchQuery searchQuery = new NativeSearchQueryBuilder() .withQuery(termQuery("message", "test")) @@ -1239,13 +1241,14 @@ public class ElasticsearchTemplateTests { IndexQuery indexQuery = getIndexQuery(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // when DeleteQuery deleteQuery = new DeleteQuery(); deleteQuery.setQuery(termQuery("id", documentId)); deleteQuery.setIndex(INDEX_NAME); deleteQuery.setType(TYPE_NAME); elasticsearchTemplate.delete(deleteQuery); + elasticsearchTemplate.refresh(INDEX_NAME); // then SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(termQuery("id", documentId)).build(); Page sampleEntities = elasticsearchTemplate.queryForPage(searchQuery, SampleEntity.class); @@ -1264,7 +1267,7 @@ public class ElasticsearchTemplateTests { indexQuery.setType(TYPE_NAME); // when elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(termQuery("id", indexQuery.getId())) .withIndices(INDEX_NAME) .withTypes(TYPE_NAME) @@ -1306,7 +1309,7 @@ public class ElasticsearchTemplateTests { List entities = createSampleEntitiesWithMessage("Test message", 30); // when elasticsearchTemplate.bulkIndex(entities); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); SearchQuery searchQuery = new NativeSearchQueryBuilder() .withQuery(termQuery("message", "message")) .withIndices(INDEX_NAME) @@ -1329,7 +1332,7 @@ public class ElasticsearchTemplateTests { indexQueries.add(buildIndex(SampleEntity.builder().id("3").message("ac").build())); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // when SearchQuery searchQuery = new NativeSearchQueryBuilder() @@ -1390,7 +1393,7 @@ public class ElasticsearchTemplateTests { indexQueries.add(indexQuery2); // when elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // then SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).build(); Page sampleEntities = elasticsearchTemplate.queryForPage(searchQuery, SampleEntity.class); @@ -1435,7 +1438,7 @@ public class ElasticsearchTemplateTests { //when elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(INDEX_NAME, true); + elasticsearchTemplate.refresh(INDEX_NAME); // then SearchQuery searchQuery = new NativeSearchQueryBuilder().withIndices(INDEX_NAME) @@ -1480,7 +1483,7 @@ public class ElasticsearchTemplateTests { .withObject(sampleEntity).build(); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(INDEX_NAME, true); + elasticsearchTemplate.refresh(INDEX_NAME); SearchQuery searchQuery = new NativeSearchQueryBuilder().withIndices(INDEX_NAME) .withTypes(TYPE_NAME).withQuery(matchAllQuery()).build(); @@ -1503,7 +1506,7 @@ public class ElasticsearchTemplateTests { IndexQuery indexQuery = getIndexQuery(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria()); criteriaQuery.addIndices("test-index"); // when @@ -1524,7 +1527,7 @@ public class ElasticsearchTemplateTests { IndexQuery indexQuery = getIndexQuery(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); SearchQuery searchQuery = new NativeSearchQueryBuilder() .withQuery(matchAllQuery()) .withIndices("test-index") @@ -1547,7 +1550,7 @@ public class ElasticsearchTemplateTests { IndexQuery indexQuery = getIndexQuery(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria()); criteriaQuery.addIndices("test-index"); criteriaQuery.addTypes("test-type"); @@ -1569,7 +1572,7 @@ public class ElasticsearchTemplateTests { IndexQuery indexQuery = getIndexQuery(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); SearchQuery searchQuery = new NativeSearchQueryBuilder() .withQuery(matchAllQuery()) .withIndices("test-index") @@ -1607,8 +1610,8 @@ public class ElasticsearchTemplateTests { .build(); elasticsearchTemplate.bulkIndex(Arrays.asList(indexQuery1, indexQuery2)); - elasticsearchTemplate.refresh("test-index-1", true); - elasticsearchTemplate.refresh("test-index-2", true); + elasticsearchTemplate.refresh("test-index-1"); + elasticsearchTemplate.refresh("test-index-2"); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria()); criteriaQuery.addIndices("test-index-1", "test-index-2"); @@ -1644,8 +1647,8 @@ public class ElasticsearchTemplateTests { .build(); elasticsearchTemplate.bulkIndex(Arrays.asList(indexQuery1, indexQuery2)); - elasticsearchTemplate.refresh("test-index-1", true); - elasticsearchTemplate.refresh("test-index-2", true); + elasticsearchTemplate.refresh("test-index-1"); + elasticsearchTemplate.refresh("test-index-2"); SearchQuery searchQuery = new NativeSearchQueryBuilder() .withQuery(matchAllQuery()) @@ -1662,8 +1665,8 @@ public class ElasticsearchTemplateTests { elasticsearchTemplate.deleteIndex("test-index-2"); elasticsearchTemplate.createIndex("test-index-1"); elasticsearchTemplate.createIndex("test-index-2"); - elasticsearchTemplate.refresh("test-index-1", true); - elasticsearchTemplate.refresh("test-index-2", true); + elasticsearchTemplate.refresh("test-index-1"); + elasticsearchTemplate.refresh("test-index-2"); } /* @@ -1686,7 +1689,7 @@ public class ElasticsearchTemplateTests { public void shouldDeleteIndexForSpecifiedIndexName() { // given elasticsearchTemplate.createIndex(SampleEntity.class); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // when elasticsearchTemplate.deleteIndex("test-index"); @@ -1720,8 +1723,8 @@ public class ElasticsearchTemplateTests { .build(); elasticsearchTemplate.bulkIndex(Arrays.asList(indexQuery1, indexQuery2)); - elasticsearchTemplate.refresh("test-index-1", true); - elasticsearchTemplate.refresh("test-index-2", true); + elasticsearchTemplate.refresh("test-index-1"); + elasticsearchTemplate.refresh("test-index-2"); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria()); criteriaQuery.addIndices("test-index-1"); @@ -1757,8 +1760,8 @@ public class ElasticsearchTemplateTests { .build(); elasticsearchTemplate.bulkIndex(Arrays.asList(indexQuery1, indexQuery2)); - elasticsearchTemplate.refresh("test-index-1", true); - elasticsearchTemplate.refresh("test-index-2", true); + elasticsearchTemplate.refresh("test-index-1"); + elasticsearchTemplate.refresh("test-index-2"); SearchQuery searchQuery = new NativeSearchQueryBuilder() .withQuery(matchAllQuery()) @@ -1779,7 +1782,7 @@ public class ElasticsearchTemplateTests { IndexQuery indexQuery = getIndexQuery(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria()); // when long count = elasticsearchTemplate.count(criteriaQuery); @@ -1799,7 +1802,7 @@ public class ElasticsearchTemplateTests { IndexQuery indexQuery = getIndexQuery(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); SearchQuery searchQuery = new NativeSearchQueryBuilder() .withQuery(matchAllQuery()) .build(); @@ -1886,7 +1889,7 @@ public class ElasticsearchTemplateTests { elasticsearchTemplate.deleteIndex(SampleEntity.class); elasticsearchTemplate.createIndex(SampleEntity.class, settings); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // then Map map = elasticsearchTemplate.getSetting(SampleEntity.class); @@ -1919,8 +1922,8 @@ public class ElasticsearchTemplateTests { .build(); elasticsearchTemplate.bulkIndex(Arrays.asList(indexQuery1, indexQuery2)); - elasticsearchTemplate.refresh("test-index-1", true); - elasticsearchTemplate.refresh("test-index-2", true); + elasticsearchTemplate.refresh("test-index-1"); + elasticsearchTemplate.refresh("test-index-2"); SearchQuery searchQuery = new NativeSearchQueryBuilder() .withQuery(matchAllQuery()) @@ -1948,8 +1951,8 @@ public class ElasticsearchTemplateTests { IndexQuery idxQuery2 = new IndexQueryBuilder().withIndexName(INDEX_2_NAME).withId(entity2.getId()).withObject(entity2).build(); elasticsearchTemplate.bulkIndex(Arrays.asList(idxQuery1, idxQuery2)); - elasticsearchTemplate.refresh(INDEX_1_NAME, true); - elasticsearchTemplate.refresh(INDEX_2_NAME, true); + elasticsearchTemplate.refresh(INDEX_1_NAME); + elasticsearchTemplate.refresh(INDEX_2_NAME); // When diff --git a/src/test/java/org/springframework/data/elasticsearch/core/LogEntityTests.java b/src/test/java/org/springframework/data/elasticsearch/core/LogEntityTests.java index 97698499d..ae110ad38 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/LogEntityTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/LogEntityTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 the original author or authors. + * Copyright 2014-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -71,7 +71,7 @@ public class LogEntityTests { .ip("10.10.10.4").buildIndex(); template.bulkIndex(Arrays.asList(indexQuery1, indexQuery2, indexQuery3, indexQuery4)); - template.refresh(LogEntity.class, true); + template.refresh(LogEntity.class); } /* diff --git a/src/test/java/org/springframework/data/elasticsearch/core/MappingBuilderTests.java b/src/test/java/org/springframework/data/elasticsearch/core/MappingBuilderTests.java index 84a0b62f5..f7f7a7495 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/MappingBuilderTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/MappingBuilderTests.java @@ -91,7 +91,7 @@ public class MappingBuilderTests { double price = 2.34; String id = "abc"; elasticsearchTemplate.index(buildIndex(StockPrice.builder().id(id).symbol(symbol).price(new BigDecimal(price)).build())); - elasticsearchTemplate.refresh(StockPrice.class, true); + elasticsearchTemplate.refresh(StockPrice.class); SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).build(); List result = elasticsearchTemplate.queryForList(searchQuery, StockPrice.class); @@ -138,7 +138,7 @@ public class MappingBuilderTests { String message = "msg"; String id = "abc"; elasticsearchTemplate.index(new SampleInheritedEntityBuilder(id).createdDate(createdDate).message(message).buildIndex()); - elasticsearchTemplate.refresh(SampleInheritedEntity.class, true); + elasticsearchTemplate.refresh(SampleInheritedEntity.class); SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).build(); List result = elasticsearchTemplate.queryForList(searchQuery, SampleInheritedEntity.class); diff --git a/src/test/java/org/springframework/data/elasticsearch/core/SimpleElasticsearchDateMappingTest.java b/src/test/java/org/springframework/data/elasticsearch/core/SimpleElasticsearchDateMappingTests.java similarity index 85% rename from src/test/java/org/springframework/data/elasticsearch/core/SimpleElasticsearchDateMappingTest.java rename to src/test/java/org/springframework/data/elasticsearch/core/SimpleElasticsearchDateMappingTests.java index eeeb16a4c..18e36f3ff 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/SimpleElasticsearchDateMappingTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/SimpleElasticsearchDateMappingTests.java @@ -27,11 +27,10 @@ import org.springframework.data.elasticsearch.entities.SampleDateMappingEntity; * @author Jakub Vavrik * @author Mohsin Husen */ -public class SimpleElasticsearchDateMappingTest { +public class SimpleElasticsearchDateMappingTests { private static final String EXPECTED_MAPPING = "{\"mapping\":{\"properties\":{\"message\":{\"store\":true," + - "\"type\":\"string\",\"index\":\"not_analyzed\",\"search_analyzer\":\"standard\",\"index_analyzer\"" + - ":\"standard\"},\"customFormatDate\":{\"store\":false,\"type\":\"date\",\"format\":\"dd.MM.yyyy hh:mm\"}," + + "\"type\":\"string\",\"index\":\"not_analyzed\",\"analyzer\":\"standard\"},\"customFormatDate\":{\"store\":false,\"type\":\"date\",\"format\":\"dd.MM.yyyy hh:mm\"}," + "\"defaultFormatDate\":{\"store\":false,\"type\":\"date\"},\"basicFormatDate\":{\"store\":false,\"" + "type\":\"date\",\"format\":\"basic_date\"}}}}"; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/aggregation/ElasticsearchTemplateAggregationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/aggregation/ElasticsearchTemplateAggregationTests.java index 761f8aebb..0f2da2cb0 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/aggregation/ElasticsearchTemplateAggregationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/aggregation/ElasticsearchTemplateAggregationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -62,7 +62,7 @@ public class ElasticsearchTemplateAggregationTests { elasticsearchTemplate.deleteIndex(ArticleEntity.class); elasticsearchTemplate.createIndex(ArticleEntity.class); elasticsearchTemplate.putMapping(ArticleEntity.class); - elasticsearchTemplate.refresh(ArticleEntity.class, true); + elasticsearchTemplate.refresh(ArticleEntity.class); IndexQuery article1 = new ArticleEntityBuilder("1").title("article four").subject("computing").addAuthor(RIZWAN_IDREES).addAuthor(ARTUR_KONCZAK).addAuthor(MOHSIN_HUSEN).addAuthor(JONATHAN_YAN).score(10).buildIndex(); IndexQuery article2 = new ArticleEntityBuilder("2").title("article three").subject("computing").addAuthor(RIZWAN_IDREES).addAuthor(ARTUR_KONCZAK).addAuthor(MOHSIN_HUSEN).addPublishedYear(YEAR_2000).score(20).buildIndex(); @@ -73,7 +73,7 @@ public class ElasticsearchTemplateAggregationTests { elasticsearchTemplate.index(article2); elasticsearchTemplate.index(article3); elasticsearchTemplate.index(article4); - elasticsearchTemplate.refresh(ArticleEntity.class, true); + elasticsearchTemplate.refresh(ArticleEntity.class); } @Test diff --git a/src/test/java/org/springframework/data/elasticsearch/core/completion/ElasticsearchTemplateCompletionTests.java b/src/test/java/org/springframework/data/elasticsearch/core/completion/ElasticsearchTemplateCompletionTests.java index a17c6ebd0..92c3c5e31 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/completion/ElasticsearchTemplateCompletionTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/completion/ElasticsearchTemplateCompletionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,7 +58,7 @@ public class ElasticsearchTemplateCompletionTests { private void loadCompletionObjectEntities() { elasticsearchTemplate.deleteIndex(CompletionEntity.class); elasticsearchTemplate.createIndex(CompletionEntity.class); - elasticsearchTemplate.refresh(CompletionEntity.class, true); + elasticsearchTemplate.refresh(CompletionEntity.class); elasticsearchTemplate.putMapping(CompletionEntity.class); List indexQueries = new ArrayList(); @@ -68,13 +68,13 @@ public class ElasticsearchTemplateCompletionTests { indexQueries.add(new CompletionEntityBuilder("4").name("Artur Konczak").suggest(new String[]{"Artur", "Konczak"}, "Artur Konczak").buildIndex()); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(CompletionEntity.class, true); + elasticsearchTemplate.refresh(CompletionEntity.class); } private void loadAnnotatedCompletionObjectEntities() { elasticsearchTemplate.deleteIndex(AnnotatedCompletionEntity.class); elasticsearchTemplate.createIndex(AnnotatedCompletionEntity.class); - elasticsearchTemplate.refresh(AnnotatedCompletionEntity.class, true); + elasticsearchTemplate.refresh(AnnotatedCompletionEntity.class); elasticsearchTemplate.putMapping(AnnotatedCompletionEntity.class); NonDocumentEntity nonDocumentEntity = new NonDocumentEntity(); @@ -88,13 +88,13 @@ public class ElasticsearchTemplateCompletionTests { indexQueries.add(new AnnotatedCompletionEntityBuilder("4").name("Artur Konczak").suggest(new String[]{"Artur", "Konczak"}, "Artur Konczak").buildIndex()); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(AnnotatedCompletionEntity.class, true); + elasticsearchTemplate.refresh(AnnotatedCompletionEntity.class); } private void loadAnnotatedCompletionObjectEntitiesWithPayloads() { elasticsearchTemplate.deleteIndex(AnnotatedCompletionEntity.class); elasticsearchTemplate.createIndex(AnnotatedCompletionEntity.class); - elasticsearchTemplate.refresh(AnnotatedCompletionEntity.class, true); + elasticsearchTemplate.refresh(AnnotatedCompletionEntity.class); elasticsearchTemplate.putMapping(AnnotatedCompletionEntity.class); NonDocumentEntity nonDocumentEntity = new NonDocumentEntity(); @@ -108,13 +108,13 @@ public class ElasticsearchTemplateCompletionTests { indexQueries.add(new AnnotatedCompletionEntityBuilder("4").name("Mewes Kochheim4").suggest(new String[]{"Mewes Kochheim4"}, null, nonDocumentEntity).buildIndex()); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(AnnotatedCompletionEntity.class, true); + elasticsearchTemplate.refresh(AnnotatedCompletionEntity.class); } private void loadAnnotatedCompletionObjectEntitiesWithWeights() { elasticsearchTemplate.deleteIndex(AnnotatedCompletionEntity.class); elasticsearchTemplate.createIndex(AnnotatedCompletionEntity.class); - elasticsearchTemplate.refresh(AnnotatedCompletionEntity.class, true); + elasticsearchTemplate.refresh(AnnotatedCompletionEntity.class); elasticsearchTemplate.putMapping(AnnotatedCompletionEntity.class); List indexQueries = new ArrayList(); @@ -124,7 +124,7 @@ public class ElasticsearchTemplateCompletionTests { indexQueries.add(new AnnotatedCompletionEntityBuilder("4").name("Mewes Kochheim4").suggest(new String[]{"Mewes Kochheim4"}, null, null, Integer.MAX_VALUE).buildIndex()); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(AnnotatedCompletionEntity.class, true); + elasticsearchTemplate.refresh(AnnotatedCompletionEntity.class); } @Test diff --git a/src/test/java/org/springframework/data/elasticsearch/core/geo/ElasticsearchTemplateGeoTests.java b/src/test/java/org/springframework/data/elasticsearch/core/geo/ElasticsearchTemplateGeoTests.java index 4ce6860d8..0ff09d9d8 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/geo/ElasticsearchTemplateGeoTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/geo/ElasticsearchTemplateGeoTests.java @@ -52,7 +52,7 @@ public class ElasticsearchTemplateGeoTests { private void loadClassBaseEntities() { elasticsearchTemplate.deleteIndex(AuthorMarkerEntity.class); elasticsearchTemplate.createIndex(AuthorMarkerEntity.class); - elasticsearchTemplate.refresh(AuthorMarkerEntity.class, true); + elasticsearchTemplate.refresh(AuthorMarkerEntity.class); elasticsearchTemplate.putMapping(AuthorMarkerEntity.class); List indexQueries = new ArrayList(); @@ -60,13 +60,13 @@ public class ElasticsearchTemplateGeoTests { indexQueries.add(new AuthorMarkerEntityBuilder("2").name("Mohsin Husen").location(51.5171d, 0.1062d).buildIndex()); indexQueries.add(new AuthorMarkerEntityBuilder("3").name("Rizwan Idrees").location(51.5171d, 0.1062d).buildIndex()); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(AuthorMarkerEntity.class, true); + elasticsearchTemplate.refresh(AuthorMarkerEntity.class); } private void loadAnnotationBaseEntities() { elasticsearchTemplate.deleteIndex(LocationMarkerEntity.class); elasticsearchTemplate.createIndex(LocationMarkerEntity.class); - elasticsearchTemplate.refresh(LocationMarkerEntity.class, true); + elasticsearchTemplate.refresh(LocationMarkerEntity.class); elasticsearchTemplate.putMapping(LocationMarkerEntity.class); List indexQueries = new ArrayList(); @@ -96,7 +96,7 @@ public class ElasticsearchTemplateGeoTests { indexQueries.add(buildIndex(location3)); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(AuthorMarkerEntity.class, true); + elasticsearchTemplate.refresh(AuthorMarkerEntity.class); } @Test @@ -254,8 +254,8 @@ public class ElasticsearchTemplateGeoTests { loadClassBaseEntities(); CriteriaQuery geoLocationCriteriaQuery3 = new CriteriaQuery( new Criteria("location").boundedBy( - new Point(0, 53.5171d), - new Point(0.2062d, 49.5171d)) + new Point(53.5171d, 0), + new Point(49.5171d, 0.2062d )) ); //when List geoAuthorsForGeoCriteria3 = elasticsearchTemplate.queryForList(geoLocationCriteriaQuery3, AuthorMarkerEntity.class); diff --git a/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTests.java b/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTests.java index 0c4e9d786..358cdedde 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2014 the original author or authors. + * Copyright 2013-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ public class CriteriaQueryTests { public void before() { elasticsearchTemplate.deleteIndex(SampleEntity.class); elasticsearchTemplate.createIndex(SampleEntity.class); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); } @Test @@ -65,7 +65,7 @@ public class CriteriaQueryTests { indexQuery.setId(documentId); indexQuery.setObject(sampleEntity); elasticsearchTemplate.index(indexQuery); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").contains("test").and("message") .contains("some")); // when @@ -104,7 +104,7 @@ public class CriteriaQueryTests { indexQueries.add(indexQuery2); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").contains("some").or("message") .contains("test")); // when @@ -131,7 +131,7 @@ public class CriteriaQueryTests { indexQueries.add(indexQuery); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria().and(new Criteria("message").contains("some"))); // when Page page = elasticsearchTemplate.queryForPage(criteriaQuery, SampleEntity.class); @@ -158,7 +158,7 @@ public class CriteriaQueryTests { indexQueries.add(indexQuery); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria().or(new Criteria("message").contains("some"))); // when Page page = elasticsearchTemplate.queryForPage(criteriaQuery, SampleEntity.class); @@ -184,7 +184,7 @@ public class CriteriaQueryTests { indexQueries.add(indexQuery); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").is("some message")); // when Page page = elasticsearchTemplate.queryForPage(criteriaQuery, SampleEntity.class); @@ -222,7 +222,7 @@ public class CriteriaQueryTests { indexQueries.add(indexQuery2); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").is("some message")); // when Page page = elasticsearchTemplate.queryForPage(criteriaQuery, SampleEntity.class); @@ -260,7 +260,7 @@ public class CriteriaQueryTests { indexQueries.add(indexQuery2); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); Criteria criteria = new Criteria("message").endsWith("end"); CriteriaQuery criteriaQuery = new CriteriaQuery(criteria); // when @@ -299,7 +299,7 @@ public class CriteriaQueryTests { indexQueries.add(indexQuery2); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); Criteria criteria = new Criteria("message").startsWith("start"); CriteriaQuery criteriaQuery = new CriteriaQuery(criteria); // when @@ -338,7 +338,7 @@ public class CriteriaQueryTests { indexQueries.add(indexQuery2); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").contains("contains")); // when SampleEntity sampleEntity = elasticsearchTemplate.queryForObject(criteriaQuery, SampleEntity.class); @@ -376,7 +376,7 @@ public class CriteriaQueryTests { indexQueries.add(indexQuery2); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").expression("+elasticsearch || test")); // when SampleEntity sampleEntity = elasticsearchTemplate.queryForObject(criteriaQuery, SampleEntity.class); @@ -414,7 +414,7 @@ public class CriteriaQueryTests { indexQueries.add(indexQuery2); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").startsWith("some").endsWith("search") .contains("message").is("some message search")); // when @@ -453,7 +453,7 @@ public class CriteriaQueryTests { indexQueries.add(indexQuery2); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").is("foo").not()); // when Page page = elasticsearchTemplate.queryForPage(criteriaQuery, SampleEntity.class); @@ -494,7 +494,7 @@ public class CriteriaQueryTests { indexQueries.add(indexQuery2); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("rate").between(100, 150)); // when SampleEntity sampleEntity = elasticsearchTemplate.queryForObject(criteriaQuery, SampleEntity.class); @@ -533,7 +533,7 @@ public class CriteriaQueryTests { indexQueries.add(indexQuery2); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("rate").between(350, null)); // when Page page = elasticsearchTemplate.queryForPage(criteriaQuery, SampleEntity.class); @@ -573,7 +573,7 @@ public class CriteriaQueryTests { indexQueries.add(indexQuery2); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("rate").between(null, 550)); // when Page page = elasticsearchTemplate.queryForPage(criteriaQuery, SampleEntity.class); @@ -613,7 +613,7 @@ public class CriteriaQueryTests { indexQueries.add(indexQuery2); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("rate").lessThanEqual(750)); // when Page page = elasticsearchTemplate.queryForPage(criteriaQuery, SampleEntity.class); @@ -653,7 +653,7 @@ public class CriteriaQueryTests { indexQueries.add(indexQuery2); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("rate").greaterThanEqual(950)); // when Page page = elasticsearchTemplate.queryForPage(criteriaQuery, SampleEntity.class); @@ -693,7 +693,7 @@ public class CriteriaQueryTests { indexQueries.add(indexQuery2); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").contains("foo").boost(1)); // when Page page = elasticsearchTemplate.queryForPage(criteriaQuery, SampleEntity.class); @@ -711,7 +711,7 @@ public class CriteriaQueryTests { indexQueries.add(buildIndex(SampleEntity.builder().id("3").message("ac").build())); elasticsearchTemplate.bulkIndex(indexQueries); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); // when CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").contains("a").or(new Criteria("message").contains("b"))); diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java index 9137268a2..8206a97cd 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,7 +63,7 @@ public class CustomMethodRepositoryTests { elasticsearchTemplate.deleteIndex(SampleEntity.class); elasticsearchTemplate.createIndex(SampleEntity.class); elasticsearchTemplate.putMapping(SampleEntity.class); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); } @Test @@ -581,7 +581,7 @@ public class CustomMethodRepositoryTests { repository.save(sampleEntity); // when - Page page = repository.findByLocationWithin(new Point(3.0875d, 45.7806d), new Distance(2, Metrics.KILOMETERS), new PageRequest(0, 10)); + Page page = repository.findByLocationWithin(new Point(45.7806d, 3.0875d), new Distance(2, Metrics.KILOMETERS), new PageRequest(0, 10)); // then assertThat(page, is(notNullValue())); assertThat(page.getTotalElements(), is(equalTo(1L))); @@ -617,7 +617,7 @@ public class CustomMethodRepositoryTests { assertThat(pageAll.getTotalElements(), is(equalTo(2L))); // when - Page page = repository.findByLocationNear(new Box(new Point(3d, 46d), new Point(4d, 45d)), new PageRequest(0, 10)); + Page page = repository.findByLocationNear(new Box(new Point(46d, 3d), new Point(45d, 4d)), new PageRequest(0, 10)); // then assertThat(page, is(notNullValue())); assertThat(page.getTotalElements(), is(equalTo(1L))); @@ -637,7 +637,7 @@ public class CustomMethodRepositoryTests { repository.save(sampleEntity); // when - Page page = repository.findByLocationNear(new Point(3.0875d, 45.7806d), new Distance(2, Metrics.KILOMETERS), new PageRequest(0, 10)); + Page page = repository.findByLocationNear(new Point(45.7806d, 3.0875d), new Distance(2, Metrics.KILOMETERS), new PageRequest(0, 10)); // then assertThat(page, is(notNullValue())); assertThat(page.getTotalElements(), is(equalTo(1L))); @@ -1124,7 +1124,7 @@ public class CustomMethodRepositoryTests { repository.save(sampleEntity2); // when - long count = repository.countByLocationWithin(new Point(3.0875d, 45.7806d), new Distance(2, Metrics.KILOMETERS)); + long count = repository.countByLocationWithin(new Point(45.7806d, 3.0875d), new Distance(2, Metrics.KILOMETERS)); // then assertThat(count, is(equalTo(1L))); } @@ -1156,7 +1156,7 @@ public class CustomMethodRepositoryTests { repository.save(sampleEntity2); // when - long count = repository.countByLocationNear(new Box(new Point(3d, 46d), new Point(4d, 45d))); + long count = repository.countByLocationNear(new Box(new Point(46d, 3d), new Point(45d, 4d))); // then assertThat(count, is(equalTo(1L))); } @@ -1188,7 +1188,7 @@ public class CustomMethodRepositoryTests { repository.save(sampleEntity2); // when - long count = repository.countByLocationNear(new Point(3.0875d, 45.7806d), new Distance(2, Metrics.KILOMETERS)); + long count = repository.countByLocationNear(new Point(45.7806d, 3.0875d), new Distance(2, Metrics.KILOMETERS)); // then assertThat(count, is(equalTo(1L))); } diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/existing/index/CreateIndexFalseRepositoryTest.java b/src/test/java/org/springframework/data/elasticsearch/repositories/existing/index/CreateIndexFalseRepositoryTests.java similarity index 94% rename from src/test/java/org/springframework/data/elasticsearch/repositories/existing/index/CreateIndexFalseRepositoryTest.java rename to src/test/java/org/springframework/data/elasticsearch/repositories/existing/index/CreateIndexFalseRepositoryTests.java index 5f4cc670d..c5bcb7e67 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/existing/index/CreateIndexFalseRepositoryTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/existing/index/CreateIndexFalseRepositoryTests.java @@ -11,7 +11,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:/existing-index-repository-test.xml") -public class CreateIndexFalseRepositoryTest { +public class CreateIndexFalseRepositoryTests { @Autowired private CreateIndexFalseRepository repository; diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/geo/SpringDataGeoRepositoryTest.java b/src/test/java/org/springframework/data/elasticsearch/repositories/geo/SpringDataGeoRepositoryTests.java similarity index 64% rename from src/test/java/org/springframework/data/elasticsearch/repositories/geo/SpringDataGeoRepositoryTest.java rename to src/test/java/org/springframework/data/elasticsearch/repositories/geo/SpringDataGeoRepositoryTests.java index 11b275278..1332a93b3 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/geo/SpringDataGeoRepositoryTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/geo/SpringDataGeoRepositoryTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.data.elasticsearch.repositories.geo; import static org.hamcrest.Matchers.*; @@ -17,7 +32,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:/repository-spring-data-geo-support.xml") -public class SpringDataGeoRepositoryTest { +public class SpringDataGeoRepositoryTests { @Autowired private ElasticsearchTemplate template; @@ -30,7 +45,7 @@ public class SpringDataGeoRepositoryTest { template.deleteIndex(GeoEntity.class); template.createIndex(GeoEntity.class); template.putMapping(GeoEntity.class); - template.refresh(GeoEntity.class, true); + template.refresh(GeoEntity.class); } @Test @@ -48,8 +63,10 @@ public class SpringDataGeoRepositoryTest { GeoEntity result = repository.findOne(entity.getId()); //then - assertThat(entity.getPointA(), is(result.getPointA())); - assertThat(entity.getPointB(), is(result.getPointB())); + assertThat(entity.getPointA().getX(), is(result.getPointA().getX())); + assertThat(entity.getPointA().getY(), is(result.getPointA().getY())); + assertThat(entity.getPointB().getLat(), is(result.getPointB().getLat())); + assertThat(entity.getPointB().getLon(), is(result.getPointB().getLon())); assertThat(entity.getPointC(), is(result.getPointC())); assertThat(entity.getPointD(), is(result.getPointD())); } diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/setting/DynamicSettingAndMappingEntityRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repositories/setting/DynamicSettingAndMappingEntityRepositoryTests.java index 62e2d8e8f..2b7a85bbe 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/setting/DynamicSettingAndMappingEntityRepositoryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/setting/DynamicSettingAndMappingEntityRepositoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 the original author or authors. + * Copyright 2014-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,7 +54,7 @@ public class DynamicSettingAndMappingEntityRepositoryTests { elasticsearchTemplate.deleteIndex(DynamicSettingAndMappingEntity.class); elasticsearchTemplate.createIndex(DynamicSettingAndMappingEntity.class); elasticsearchTemplate.putMapping(DynamicSettingAndMappingEntity.class); - elasticsearchTemplate.refresh(DynamicSettingAndMappingEntity.class, true); + elasticsearchTemplate.refresh(DynamicSettingAndMappingEntity.class); } /* @@ -129,7 +129,7 @@ public class DynamicSettingAndMappingEntityRepositoryTests { //given elasticsearchTemplate.deleteIndex(DynamicSettingAndMappingEntity.class); elasticsearchTemplate.createIndex(DynamicSettingAndMappingEntity.class); - elasticsearchTemplate.refresh(DynamicSettingAndMappingEntity.class, true); + elasticsearchTemplate.refresh(DynamicSettingAndMappingEntity.class); //when String mappings = "{\n" + " \"test-setting-type\" : {\n" + @@ -139,7 +139,7 @@ public class DynamicSettingAndMappingEntityRepositoryTests { " }\n" + "}"; elasticsearchTemplate.putMapping(DynamicSettingAndMappingEntity.class, mappings); - elasticsearchTemplate.refresh(DynamicSettingAndMappingEntity.class, true); + elasticsearchTemplate.refresh(DynamicSettingAndMappingEntity.class); //then Map mapping = elasticsearchTemplate.getMapping(DynamicSettingAndMappingEntity.class); Map properties = (Map) mapping.get("properties"); diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/setting/FieldDynamicMappingEntityRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repositories/setting/FieldDynamicMappingEntityRepositoryTests.java index 7d17aa1fd..6c820d278 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/setting/FieldDynamicMappingEntityRepositoryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/setting/FieldDynamicMappingEntityRepositoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 the original author or authors. + * Copyright 2014-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ public class FieldDynamicMappingEntityRepositoryTests { elasticsearchTemplate.deleteIndex(FieldDynamicMappingEntity.class); elasticsearchTemplate.createIndex(FieldDynamicMappingEntity.class); elasticsearchTemplate.putMapping(FieldDynamicMappingEntity.class); - elasticsearchTemplate.refresh(FieldDynamicMappingEntity.class, true); + elasticsearchTemplate.refresh(FieldDynamicMappingEntity.class); } /* diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/synonym/SynonymRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repositories/synonym/SynonymRepositoryTests.java index fb6790ff8..9ff9b72c2 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/synonym/SynonymRepositoryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/synonym/SynonymRepositoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 the original author or authors. + * Copyright 2014-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ public class SynonymRepositoryTests { elasticsearchTemplate.deleteIndex(SynonymEntity.class); elasticsearchTemplate.createIndex(SynonymEntity.class); elasticsearchTemplate.putMapping(SynonymEntity.class); - elasticsearchTemplate.refresh(SynonymEntity.class, true); + elasticsearchTemplate.refresh(SynonymEntity.class); } diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexCustomMethodRepositoryManualWiringTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexCustomMethodRepositoryManualWiringTests.java index 49f61d819..433446bed 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexCustomMethodRepositoryManualWiringTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexCustomMethodRepositoryManualWiringTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ public class ComplexCustomMethodRepositoryManualWiringTests { public void before() { elasticsearchTemplate.deleteIndex(SampleEntity.class); elasticsearchTemplate.createIndex(SampleEntity.class); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); } @Test diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexCustomMethodRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexCustomMethodRepositoryTests.java index bf192a078..d1abb74d3 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexCustomMethodRepositoryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexCustomMethodRepositoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,7 +45,7 @@ public class ComplexCustomMethodRepositoryTests { public void before() { elasticsearchTemplate.deleteIndex(SampleEntity.class); elasticsearchTemplate.createIndex(SampleEntity.class); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); } @Test diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTests.java index 1dc8fb720..94826bb83 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ public class DoubleIDRepositoryTests { public void before() { elasticsearchTemplate.deleteIndex(DoubleIDEntity.class); elasticsearchTemplate.createIndex(DoubleIDEntity.class); - elasticsearchTemplate.refresh(DoubleIDEntity.class, true); + elasticsearchTemplate.refresh(DoubleIDEntity.class); } @Test diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchEntityInformationCreatorImplTest.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchEntityInformationCreatorImplTests.java similarity index 97% rename from src/test/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchEntityInformationCreatorImplTest.java rename to src/test/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchEntityInformationCreatorImplTests.java index 6b3d782dc..d4d69ef1b 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchEntityInformationCreatorImplTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchEntityInformationCreatorImplTests.java @@ -30,7 +30,7 @@ import static org.mockito.Mockito.doReturn; * @author Florian Hopf */ @RunWith(MockitoJUnitRunner.class) -public class ElasticsearchEntityInformationCreatorImplTest { +public class ElasticsearchEntityInformationCreatorImplTests { @Mock private MappingContext, ElasticsearchPersistentProperty> mappingContext; diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTests.java index f639d5bde..5c8cb26a1 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ public class IntegerIDRepositoryTests { public void before() { elasticsearchTemplate.deleteIndex(IntegerIDEntity.class); elasticsearchTemplate.createIndex(IntegerIDEntity.class); - elasticsearchTemplate.refresh(IntegerIDEntity.class, true); + elasticsearchTemplate.refresh(IntegerIDEntity.class); } @Test diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/QueryKeywordsTest.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/QueryKeywordsTests.java similarity index 81% rename from src/test/java/org/springframework/data/elasticsearch/repository/support/QueryKeywordsTest.java rename to src/test/java/org/springframework/data/elasticsearch/repository/support/QueryKeywordsTests.java index cefeb3c99..4fbe48d2f 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repository/support/QueryKeywordsTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/QueryKeywordsTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.data.elasticsearch.repository.support; import static org.hamcrest.core.Is.*; @@ -20,7 +35,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:/repository-query-support.xml") -public class QueryKeywordsTest { +public class QueryKeywordsTests { @Autowired private ProductRepository repository; @@ -33,7 +48,7 @@ public class QueryKeywordsTest { elasticsearchTemplate.deleteIndex(Product.class); elasticsearchTemplate.createIndex(Product.class); elasticsearchTemplate.putMapping(Product.class); - elasticsearchTemplate.refresh(Product.class, true); + elasticsearchTemplate.refresh(Product.class); repository.save(Arrays.asList( Product.builder().id("1").name("Sugar").text("Cane sugar").price(1.0f).available(false).build() @@ -42,7 +57,7 @@ public class QueryKeywordsTest { , Product.builder().id("4").name("Salt").text("Rock salt").price(1.9f).available(true).build() , Product.builder().id("5").name("Salt").text("Sea salt").price(2.1f).available(false).build())); - elasticsearchTemplate.refresh(Product.class, true); + elasticsearchTemplate.refresh(Product.class); } @Test diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java index 50ddc85ad..608d59d78 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java @@ -60,7 +60,7 @@ public class SimpleElasticsearchRepositoryTests { public void before() { elasticsearchTemplate.deleteIndex(SampleEntity.class); elasticsearchTemplate.createIndex(SampleEntity.class); - elasticsearchTemplate.refresh(SampleEntity.class, true); + elasticsearchTemplate.refresh(SampleEntity.class); } @Test @@ -310,6 +310,8 @@ public class SimpleElasticsearchRepositoryTests { repository.save(sampleEntity); // when long result = repository.deleteById(documentId); + repository.refresh(); + // then SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(termQuery("id", documentId)).build(); Page sampleEntities = repository.search(searchQuery); @@ -343,6 +345,7 @@ public class SimpleElasticsearchRepositoryTests { repository.save(Arrays.asList(sampleEntity1, sampleEntity2, sampleEntity3)); // when List result = repository.deleteByAvailable(true); + repository.refresh(); // then assertThat(result.size(), equalTo(2)); SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).build(); @@ -373,6 +376,7 @@ public class SimpleElasticsearchRepositoryTests { repository.save(Arrays.asList(sampleEntity1, sampleEntity2, sampleEntity3)); // when List result = repository.deleteByMessage("hello world 3"); + repository.refresh(); // then assertThat(result.size(), equalTo(1)); SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).build(); @@ -403,14 +407,13 @@ public class SimpleElasticsearchRepositoryTests { repository.save(Arrays.asList(sampleEntity1, sampleEntity2, sampleEntity3)); // when repository.deleteByType("article"); + repository.refresh(); // then SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).build(); Page sampleEntities = repository.search(searchQuery); assertThat(sampleEntities.getTotalElements(), equalTo(2L)); } - - @Test public void shouldDeleteEntity() { // given @@ -492,7 +495,6 @@ public class SimpleElasticsearchRepositoryTests { @Test public void shouldSortByGivenField() { - // todo // given String documentId = randomNumeric(5); SampleEntity sampleEntity = new SampleEntity();