From fa5d1b1e498a163367e5f89e0f3bd54d28c48e28 Mon Sep 17 00:00:00 2001 From: Mohsin Husen Date: Sun, 20 Jul 2014 17:07:57 +0100 Subject: [PATCH] DATAES-46 - Apply code formatting --- pom.xml | 301 +++++++++--------- .../core/CriteriaFilterProcessor.java | 79 +++-- .../core/ElasticsearchOperations.java | 2 +- .../core/ElasticsearchTemplate.java | 31 +- .../elasticsearch/core/ResultsExtractor.java | 4 +- .../data/elasticsearch/core/geo/GeoBox.java | 24 +- .../data/elasticsearch/core/geo/GeoPoint.java | 18 +- .../elasticsearch/core/query/Criteria.java | 29 +- .../core/query/NativeSearchQuery.java | 28 +- .../core/query/NativeSearchQueryBuilder.java | 16 +- .../data/elasticsearch/core/query/Query.java | 1 + .../elasticsearch/core/query/SearchQuery.java | 2 +- .../parser/ElasticsearchQueryCreator.java | 55 ++-- .../data/elasticsearch/core/AliasTests.java | 1 - .../core/ElasticsearchTemplateTests.java | 30 +- ...ElasticsearchTemplateAggregationTests.java | 92 +++--- .../core/facet/ArticleEntity.java | 16 +- .../core/facet/ArticleEntityBuilder.java | 9 +- .../DynamicSettingAndMappingEntity.java | 4 +- .../elasticsearch/entities/SampleEntity.java | 14 +- .../CustomMethodRepositoryTests.java | 162 +++++----- .../custom/SampleCustomMethodRepository.java | 12 +- ...ettingAndMappingEntityRepositoryTests.java | 6 +- .../resources/mappings/test-mappings.json | 9 +- 24 files changed, 474 insertions(+), 471 deletions(-) diff --git a/pom.xml b/pom.xml index dcc1c768..8c5da14b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,178 +1,179 @@ - - 4.0.0 + + 4.0.0 - org.springframework.data - spring-data-elasticsearch - 1.1.0.BUILD-SNAPSHOT + org.springframework.data + spring-data-elasticsearch + 1.1.0.BUILD-SNAPSHOT - - org.springframework.data.build - spring-data-parent - 1.5.0.BUILD-SNAPSHOT - ../spring-data-build/parent/pom.xml - + + org.springframework.data.build + spring-data-parent + 1.5.0.BUILD-SNAPSHOT + ../spring-data-build/parent/pom.xml + - Spring Data Elasticsearch - Spring Data Implementation for Elasticsearch - https://github.com/spring-projects/spring-data-elasticsearch + Spring Data Elasticsearch + Spring Data Implementation for Elasticsearch + https://github.com/spring-projects/spring-data-elasticsearch - + - DATAES + DATAES - 3.2.1 - 2.6 - 1.2.2 - 1.9.0.BUILD-SNAPSHOT + 3.2.1 + 2.6 + 1.2.2 + 1.9.0.BUILD-SNAPSHOT - + - + - - - org.springframework - spring-context - - - commons-logging - commons-logging - - - + + + org.springframework + spring-context + + + commons-logging + commons-logging + + + - - org.springframework - spring-tx - + + org.springframework + spring-tx + - - - org.springframework.data - spring-data-commons - ${springdata.commons} - + + + org.springframework.data + spring-data-commons + ${springdata.commons} + - - - commons-lang - commons-lang - ${commonslang} - - - commons-collections - commons-collections - ${commonscollections} - + + + commons-lang + commons-lang + ${commonslang} + + + commons-collections + commons-collections + ${commonscollections} + - - - joda-time - joda-time - ${jodatime} - + + + joda-time + joda-time + ${jodatime} + - - - org.elasticsearch - elasticsearch - ${elasticsearch} - + + + org.elasticsearch + elasticsearch + ${elasticsearch} + - - - com.fasterxml.jackson.core - jackson-core - ${jackson} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson} - + + + com.fasterxml.jackson.core + jackson-core + ${jackson} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson} + - - - javax.enterprise - cdi-api - ${cdi} - provided - true - + + + javax.enterprise + cdi-api + ${cdi} + provided + true + - - - org.springframework - spring-test - ${spring} - test - - - org.apache.openwebbeans.test - cditest-owb - ${webbeans} - test - - - javax.servlet - servlet-api - 3.0-alpha-1 - test - + + + org.springframework + spring-test + ${spring} + test + + + org.apache.openwebbeans.test + cditest-owb + ${webbeans} + test + + + javax.servlet + servlet-api + 3.0-alpha-1 + test + - + - - - - org.apache.maven.plugins - maven-assembly-plugin - - - org.codehaus.mojo - wagon-maven-plugin - - - + + + + org.apache.maven.plugins + maven-assembly-plugin + + + org.codehaus.mojo + wagon-maven-plugin + + + - - - biomedcentral - BioMed Central Development Team - +0 - - + + + biomedcentral + BioMed Central Development Team + +0 + + - - - spring-libs-snapshot - http://repo.spring.io/libs-snapshot - - + + + spring-libs-snapshot + http://repo.spring.io/libs-snapshot + + - - - spring-plugins-release - http://repo.spring.io/plugins-release - - + + + spring-plugins-release + http://repo.spring.io/plugins-release + + - - https://github.com/spring-projects/spring-data-elasticsearch - scm:git:git://github.com/spring-projects/spring-data-elasticsearch.git - scm:git:ssh://git@github.com/spring-projects/spring-data-elasticsearch.git - - + + https://github.com/spring-projects/spring-data-elasticsearch + scm:git:git://github.com/spring-projects/spring-data-elasticsearch.git + scm:git:ssh://git@github.com/spring-projects/spring-data-elasticsearch.git + + - - Bamboo - http://build.springsource.org/browse/SPRINGDATAES - + + Bamboo + http://build.springsource.org/browse/SPRINGDATAES + - - JIRA - https://jira.springsource.org/browse/DATAES - + + JIRA + https://jira.springsource.org/browse/DATAES + 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 b138ea3c..61db0026 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/CriteriaFilterProcessor.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/CriteriaFilterProcessor.java @@ -113,21 +113,20 @@ class CriteriaFilterProcessor { Assert.isTrue(valArray[0] instanceof GeoPoint || valArray[0] instanceof String || valArray[0] instanceof Point, "First element of a geo distance filter must be a GeoPoint, a Point or a String"); Assert.isTrue(valArray[1] instanceof String || valArray[1] instanceof Distance, "Second element of a geo distance filter must be a String or a Distance"); - StringBuilder dist = new StringBuilder(); - if(valArray[1] instanceof Distance) { - extractDistanceString((Distance)valArray[1], dist); - } else { - dist.append((String) valArray[1]); - } - - if (valArray[0] instanceof GeoPoint) { - GeoPoint loc = (GeoPoint) valArray[0]; - ((GeoDistanceFilterBuilder) filter).lat(loc.getLat()).lon(loc.getLon()).distance(dist.toString()); - } else if (valArray[0] instanceof Point) { - GeoPoint loc = GeoPoint.fromPoint((Point)valArray[0]); - ((GeoDistanceFilterBuilder) filter).lat(loc.getLat()).lon(loc.getLon()).distance(dist.toString()); + if (valArray[1] instanceof Distance) { + extractDistanceString((Distance) valArray[1], dist); + } else { + dist.append((String) valArray[1]); + } + + if (valArray[0] instanceof GeoPoint) { + GeoPoint loc = (GeoPoint) valArray[0]; + ((GeoDistanceFilterBuilder) filter).lat(loc.getLat()).lon(loc.getLon()).distance(dist.toString()); + } else if (valArray[0] instanceof Point) { + GeoPoint loc = GeoPoint.fromPoint((Point) valArray[0]); + ((GeoDistanceFilterBuilder) filter).lat(loc.getLat()).lon(loc.getLon()).distance(dist.toString()); } else { String loc = (String) valArray[0]; if (loc.contains(",")) { @@ -167,40 +166,40 @@ class CriteriaFilterProcessor { } - /** - * extract the distance string from a {@link org.springframework.data.geo.Distance} object. - * - * @param distance distance object to extract string from - * @param sb StringBuilder to build the distance string - */ - private void extractDistanceString(Distance distance, StringBuilder sb) { - // handle Distance object - sb.append((int) distance.getValue()); + /** + * extract the distance string from a {@link org.springframework.data.geo.Distance} object. + * + * @param distance distance object to extract string from + * @param sb StringBuilder to build the distance string + */ + private void extractDistanceString(Distance distance, StringBuilder sb) { + // handle Distance object + sb.append((int) distance.getValue()); - Metrics metric = (Metrics) distance.getMetric(); + Metrics metric = (Metrics) distance.getMetric(); - switch (metric) { - case KILOMETERS : - sb.append("km"); - break; - case MILES: - sb.append("mi"); - break; - } - } + switch (metric) { + case KILOMETERS: + sb.append("km"); + break; + case MILES: + sb.append("mi"); + break; + } + } - private void oneParameterBBox(GeoBoundingBoxFilterBuilder filter, Object value) { + private void oneParameterBBox(GeoBoundingBoxFilterBuilder filter, Object value) { Assert.isTrue(value instanceof GeoBox || value instanceof Box, "single-element of boundedBy filter must be type of GeoBox or Box"); GeoBox geoBBox; - if(value instanceof Box) { - Box sdbox = (Box) value; - geoBBox = GeoBox.fromBox(sdbox); - } else { - geoBBox = (GeoBox) value; - } + if (value instanceof Box) { + Box sdbox = (Box) value; + geoBBox = GeoBox.fromBox(sdbox); + } else { + geoBBox = (GeoBox) value; + } - filter.topLeft(geoBBox.getTopLeft().getLat(), geoBBox.getTopLeft().getLon()); + filter.topLeft(geoBBox.getTopLeft().getLat(), geoBBox.getTopLeft().getLon()); filter.bottomRight(geoBBox.getBottomRight().getLat(), geoBBox.getBottomRight().getLon()); } 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 dc12b21e..a1b6e2fe 100755 --- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchOperations.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchOperations.java @@ -473,5 +473,5 @@ public interface ElasticsearchOperations { Set queryForAlias(String indexName); - T query(SearchQuery query, ResultsExtractor resultsExtractor); + T query(SearchQuery query, ResultsExtractor resultsExtractor); } 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 251bd5cb..365761a6 100755 --- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java @@ -189,7 +189,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations { Assert.notNull(type, "No type defined for putMapping()"); Map mappings = null; try { - mappings = client.admin().indices().getMappings(new GetMappingsRequest().indices(indexName).types(type)) + mappings = client.admin().indices().getMappings(new GetMappingsRequest().indices(indexName).types(type)) .actionGet().getMappings().get(indexName).get(type).getSourceAsMap(); } catch (Exception e) { throw new ElasticsearchException("Error while getting mapping for indexName : " + indexName + " type : " + type + " " + e.getMessage()); @@ -248,13 +248,13 @@ public class ElasticsearchTemplate implements ElasticsearchOperations { return mapper.mapResults(response, clazz, query.getPageable()); } - @Override - public T query(SearchQuery query, ResultsExtractor resultsExtractor) { - SearchResponse response = doSearch(prepareSearch(query), query); - return resultsExtractor.extract(response); - } + @Override + public T query(SearchQuery query, ResultsExtractor resultsExtractor) { + SearchResponse response = doSearch(prepareSearch(query), query); + return resultsExtractor.extract(response); + } - @Override + @Override public List queryForList(CriteriaQuery query, Class clazz) { return queryForPage(query, clazz).getContent(); } @@ -417,7 +417,8 @@ public class ElasticsearchTemplate implements ElasticsearchOperations { } throw new ElasticsearchException( "Bulk indexing has failures. Use ElasticsearchException.getFailedDocuments() for detailed messages [" - + failedDocuments + "]", failedDocuments); + + failedDocuments + "]", failedDocuments + ); } } @@ -501,7 +502,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations { requestBuilder.setPostFilter(searchQuery.getFilter()); } - if(isNotEmpty(searchQuery.getFields())) { + if (isNotEmpty(searchQuery.getFields())) { requestBuilder.addFields(toArray(searchQuery.getFields())); } @@ -615,11 +616,11 @@ public class ElasticsearchTemplate implements ElasticsearchOperations { } } - if(CollectionUtils.isNotEmpty(searchQuery.getAggregations())){ - for(AbstractAggregationBuilder aggregationBuilder : searchQuery.getAggregations()){ - searchRequest.addAggregation(aggregationBuilder); - } - } + if (CollectionUtils.isNotEmpty(searchQuery.getAggregations())) { + for (AbstractAggregationBuilder aggregationBuilder : searchQuery.getAggregations()) { + searchRequest.addAggregation(aggregationBuilder); + } + } return searchRequest.setQuery(searchQuery.getQuery()).execute().actionGet(); } @@ -906,7 +907,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations { if (bufferedReader != null) try { bufferedReader.close(); - } catch (IOException e) { + } catch (IOException e) { logger.debug(String.format("Unable to close buffered reader.. %s", e.getMessage())); } } diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ResultsExtractor.java b/src/main/java/org/springframework/data/elasticsearch/core/ResultsExtractor.java index 90ae17ad..60ce31d2 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/ResultsExtractor.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ResultsExtractor.java @@ -18,6 +18,6 @@ package org.springframework.data.elasticsearch.core; import org.elasticsearch.action.search.SearchResponse; -public interface ResultsExtractor { - T extract(SearchResponse response); +public interface ResultsExtractor { + T extract(SearchResponse response); } diff --git a/src/main/java/org/springframework/data/elasticsearch/core/geo/GeoBox.java b/src/main/java/org/springframework/data/elasticsearch/core/geo/GeoBox.java index bb4e5d52..82ac41ca 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/geo/GeoBox.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/geo/GeoBox.java @@ -40,17 +40,17 @@ public class GeoBox { return bottomRight; } - /** - * return a {@link org.springframework.data.elasticsearch.core.geo.GeoBox} - * from a {@link org.springframework.data.geo.Box}. - * - * @param box {@link org.springframework.data.geo.Box} to use - * @return a {@link org.springframework.data.elasticsearch.core.geo.GeoBox} - */ - public static GeoBox fromBox(Box box) { - GeoPoint topLeft = GeoPoint.fromPoint(box.getFirst()); - GeoPoint bottomRight = GeoPoint.fromPoint(box.getSecond()); + /** + * return a {@link org.springframework.data.elasticsearch.core.geo.GeoBox} + * from a {@link org.springframework.data.geo.Box}. + * + * @param box {@link org.springframework.data.geo.Box} to use + * @return a {@link org.springframework.data.elasticsearch.core.geo.GeoBox} + */ + public static GeoBox fromBox(Box box) { + GeoPoint topLeft = GeoPoint.fromPoint(box.getFirst()); + GeoPoint bottomRight = GeoPoint.fromPoint(box.getSecond()); - return new GeoBox(topLeft, bottomRight); - } + return new GeoBox(topLeft, bottomRight); + } } 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 afdba0cc..e5ff88a5 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 @@ -44,15 +44,15 @@ public class GeoPoint { return lon; } - /** - * build a GeoPoint from a {@link org.springframework.data.geo.Point} - * - * @param point {@link org.springframework.data.geo.Point} - * @return a {@link org.springframework.data.elasticsearch.core.geo.GeoPoint} - */ - public static GeoPoint fromPoint(Point point) { - return new GeoPoint(point.getY(), point.getX()); - } + /** + * build a GeoPoint from a {@link org.springframework.data.geo.Point} + * + * @param point {@link org.springframework.data.geo.Point} + * @return a {@link org.springframework.data.elasticsearch.core.geo.GeoPoint} + */ + public static GeoPoint fromPoint(Point point) { + return new GeoPoint(point.getY(), point.getX()); + } } diff --git a/src/main/java/org/springframework/data/elasticsearch/core/query/Criteria.java b/src/main/java/org/springframework/data/elasticsearch/core/query/Criteria.java index 5980eb6c..0ee92f41 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/query/Criteria.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/query/Criteria.java @@ -362,20 +362,20 @@ public class Criteria { return this; } - /** - * Creates new CriteriaEntry for {@code location WITHIN distance} - * - * @param location {@link org.springframework.data.geo.Point} center coordinates - * @param distance {@link org.springframework.data.geo.Distance} radius - * . - * @return Criteria the chaind criteria with the new 'within' criteria included. - */ - public Criteria within(Point location, Distance distance) { - Assert.notNull(location, "Location value for near criteria must not be null"); - Assert.notNull(location, "Distance value for near criteria must not be null"); - filterCriteria.add(new CriteriaEntry(OperationKey.WITHIN, new Object[]{location, distance})); - return this; - } + /** + * Creates new CriteriaEntry for {@code location WITHIN distance} + * + * @param location {@link org.springframework.data.geo.Point} center coordinates + * @param distance {@link org.springframework.data.geo.Distance} radius + * . + * @return Criteria the chaind criteria with the new 'within' criteria included. + */ + public Criteria within(Point location, Distance distance) { + Assert.notNull(location, "Location value for near criteria must not be null"); + Assert.notNull(location, "Distance value for near criteria must not be null"); + filterCriteria.add(new CriteriaEntry(OperationKey.WITHIN, new Object[]{location, distance})); + return this; + } /** * Creates new CriteriaEntry for {@code geoLocation WITHIN distance} @@ -408,7 +408,6 @@ public class Criteria { } - /** * Creates new CriteriaEntry for bounding box created from points * diff --git a/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQuery.java b/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQuery.java index 64d73739..0477f949 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQuery.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQuery.java @@ -38,7 +38,7 @@ public class NativeSearchQuery extends AbstractQuery implements SearchQuery { private FilterBuilder filter; private List sorts; private List facets; - private List aggregations; + private List aggregations; private HighlightBuilder.Field[] highlightFields; @@ -97,20 +97,20 @@ public class NativeSearchQuery extends AbstractQuery implements SearchQuery { return facets; } - @Override - public List getAggregations() { - return aggregations; - } + @Override + public List getAggregations() { + return aggregations; + } - public void addAggregation(AbstractAggregationBuilder aggregationBuilder) { - if (aggregations == null) { - aggregations = new ArrayList(); - } - aggregations.add(aggregationBuilder); - } + public void addAggregation(AbstractAggregationBuilder aggregationBuilder) { + if (aggregations == null) { + aggregations = new ArrayList(); + } + aggregations.add(aggregationBuilder); + } - public void setAggregations(List aggregations) { - this.aggregations = aggregations; - } + public void setAggregations(List aggregations) { + this.aggregations = aggregations; + } } diff --git a/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java b/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java index 730dcbcd..6a632c9e 100755 --- a/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java @@ -43,7 +43,7 @@ public class NativeSearchQueryBuilder { private FilterBuilder filterBuilder; private List sortBuilders = new ArrayList(); private List facetRequests = new ArrayList(); - private List aggregationBuilders = new ArrayList(); + private List aggregationBuilders = new ArrayList(); private HighlightBuilder.Field[] highlightFields; private Pageable pageable; private String[] indices; @@ -69,10 +69,10 @@ public class NativeSearchQueryBuilder { return this; } - public NativeSearchQueryBuilder addAggregation(AbstractAggregationBuilder aggregationBuilder){ - this.aggregationBuilders.add(aggregationBuilder); - return this; - } + public NativeSearchQueryBuilder addAggregation(AbstractAggregationBuilder aggregationBuilder) { + this.aggregationBuilders.add(aggregationBuilder); + return this; + } public NativeSearchQueryBuilder withFacet(FacetRequest facetRequest) { facetRequests.add(facetRequest); @@ -146,9 +146,9 @@ public class NativeSearchQueryBuilder { nativeSearchQuery.setFacets(facetRequests); } - if (CollectionUtils.isNotEmpty(aggregationBuilders)) { - nativeSearchQuery.setAggregations(aggregationBuilders); - } + if (CollectionUtils.isNotEmpty(aggregationBuilders)) { + nativeSearchQuery.setAggregations(aggregationBuilders); + } if (minScore > 0) { nativeSearchQuery.setMinScore(minScore); diff --git a/src/main/java/org/springframework/data/elasticsearch/core/query/Query.java b/src/main/java/org/springframework/data/elasticsearch/core/query/Query.java index 9e34e240..8ee137be 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/query/Query.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/query/Query.java @@ -135,6 +135,7 @@ public interface Query { /** * Type of search + * * @return */ SearchType getSearchType(); diff --git a/src/main/java/org/springframework/data/elasticsearch/core/query/SearchQuery.java b/src/main/java/org/springframework/data/elasticsearch/core/query/SearchQuery.java index 081ad761..9c21761c 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/query/SearchQuery.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/query/SearchQuery.java @@ -41,7 +41,7 @@ public interface SearchQuery extends Query { List getFacets(); - List getAggregations(); + List getAggregations(); HighlightBuilder.Field[] getHighlightFields(); } diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/query/parser/ElasticsearchQueryCreator.java b/src/main/java/org/springframework/data/elasticsearch/repository/query/parser/ElasticsearchQueryCreator.java index db12425d..676612df 100644 --- a/src/main/java/org/springframework/data/elasticsearch/repository/query/parser/ElasticsearchQueryCreator.java +++ b/src/main/java/org/springframework/data/elasticsearch/repository/query/parser/ElasticsearchQueryCreator.java @@ -126,43 +126,42 @@ public class ElasticsearchQueryCreator extends AbstractQueryCreator FacetedPage mapResults(SearchResponse response, Class clazz, Pageable pageable) { List result = new ArrayList(); - for(SearchHit searchHit : response.getHits()){ + for (SearchHit searchHit : response.getHits()) { String message = searchHit.getFields().get("message").getValue(); SampleEntity sampleEntity = new SampleEntity(); sampleEntity.setId(searchHit.getId()); @@ -629,7 +629,7 @@ public class ElasticsearchTemplateTests { result.add(sampleEntity); } - if(result.size() > 0) { + if (result.size() > 0) { return new FacetedPageImpl((List) result); } return null; @@ -1378,19 +1378,19 @@ public class ElasticsearchTemplateTests { public void shouldCreateIndexWithGivenSettings() { // given String settings = "{\n" + - " \"index\": {\n" + - " \"number_of_shards\": \"1\",\n" + - " \"number_of_replicas\": \"0\",\n" + - " \"analysis\": {\n" + - " \"analyzer\": {\n" + - " \"emailAnalyzer\": {\n" + - " \"type\": \"custom\",\n" + - " \"tokenizer\": \"uax_url_email\"\n" + - " }\n" + - " }\n" + - " }\n" + - " }\n" + - "}"; + " \"index\": {\n" + + " \"number_of_shards\": \"1\",\n" + + " \"number_of_replicas\": \"0\",\n" + + " \"analysis\": {\n" + + " \"analyzer\": {\n" + + " \"emailAnalyzer\": {\n" + + " \"type\": \"custom\",\n" + + " \"tokenizer\": \"uax_url_email\"\n" + + " }\n" + + " }\n" + + " }\n" + + " }\n" + + "}"; elasticsearchTemplate.deleteIndex("test-index"); // when 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 7fec7b9a..761f8aeb 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 @@ -30,7 +30,6 @@ import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilde import org.springframework.data.elasticsearch.core.query.SearchQuery; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - import static org.elasticsearch.action.search.SearchType.COUNT; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.search.aggregations.AggregationBuilders.terms; @@ -48,56 +47,55 @@ import static org.junit.Assert.assertThat; @ContextConfiguration("classpath:elasticsearch-template-test.xml") public class ElasticsearchTemplateAggregationTests { - public static final String RIZWAN_IDREES = "Rizwan Idrees"; - public static final String MOHSIN_HUSEN = "Mohsin Husen"; - public static final String JONATHAN_YAN = "Jonathan Yan"; - public static final String ARTUR_KONCZAK = "Artur Konczak"; - public static final int YEAR_2002 = 2002; - public static final int YEAR_2001 = 2001; - public static final int YEAR_2000 = 2000; - @Autowired - private ElasticsearchTemplate elasticsearchTemplate; + public static final String RIZWAN_IDREES = "Rizwan Idrees"; + public static final String MOHSIN_HUSEN = "Mohsin Husen"; + public static final String JONATHAN_YAN = "Jonathan Yan"; + public static final String ARTUR_KONCZAK = "Artur Konczak"; + public static final int YEAR_2002 = 2002; + public static final int YEAR_2001 = 2001; + public static final int YEAR_2000 = 2000; + @Autowired + private ElasticsearchTemplate elasticsearchTemplate; - @Before - public void before() { - elasticsearchTemplate.deleteIndex(ArticleEntity.class); - elasticsearchTemplate.createIndex(ArticleEntity.class); - elasticsearchTemplate.putMapping(ArticleEntity.class); - elasticsearchTemplate.refresh(ArticleEntity.class, true); + @Before + public void before() { + elasticsearchTemplate.deleteIndex(ArticleEntity.class); + elasticsearchTemplate.createIndex(ArticleEntity.class); + elasticsearchTemplate.putMapping(ArticleEntity.class); + elasticsearchTemplate.refresh(ArticleEntity.class, true); - 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(); - IndexQuery article3 = new ArticleEntityBuilder("3").title("article two").subject("computing").addAuthor(RIZWAN_IDREES).addAuthor(ARTUR_KONCZAK).addPublishedYear(YEAR_2001).addPublishedYear(YEAR_2000).score(30).buildIndex(); - IndexQuery article4 = new ArticleEntityBuilder("4").title("article one").subject("accounting").addAuthor(RIZWAN_IDREES).addPublishedYear(YEAR_2002).addPublishedYear(YEAR_2001).addPublishedYear(YEAR_2000).score(40).buildIndex(); + 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(); + IndexQuery article3 = new ArticleEntityBuilder("3").title("article two").subject("computing").addAuthor(RIZWAN_IDREES).addAuthor(ARTUR_KONCZAK).addPublishedYear(YEAR_2001).addPublishedYear(YEAR_2000).score(30).buildIndex(); + IndexQuery article4 = new ArticleEntityBuilder("4").title("article one").subject("accounting").addAuthor(RIZWAN_IDREES).addPublishedYear(YEAR_2002).addPublishedYear(YEAR_2001).addPublishedYear(YEAR_2000).score(40).buildIndex(); - elasticsearchTemplate.index(article1); - elasticsearchTemplate.index(article2); - elasticsearchTemplate.index(article3); - elasticsearchTemplate.index(article4); - elasticsearchTemplate.refresh(ArticleEntity.class, true); - } - - @Test - public void shouldReturnAggregatedResponseForGivenSearchQuery() { - // given - SearchQuery searchQuery = new NativeSearchQueryBuilder() - .withQuery(matchAllQuery()) - .withSearchType(COUNT) - .withIndices("articles").withTypes("article") - .addAggregation(terms("subjects").field("subject")) - .build(); - // when - Aggregations aggregations = elasticsearchTemplate.query(searchQuery, new ResultsExtractor() { - @Override - public Aggregations extract(SearchResponse response) { - return response.getAggregations(); - } - }); - // then - assertThat(aggregations, is(notNullValue())); - assertThat(aggregations.asMap().get("subjects"), is(notNullValue())); - } + elasticsearchTemplate.index(article1); + elasticsearchTemplate.index(article2); + elasticsearchTemplate.index(article3); + elasticsearchTemplate.index(article4); + elasticsearchTemplate.refresh(ArticleEntity.class, true); + } + @Test + public void shouldReturnAggregatedResponseForGivenSearchQuery() { + // given + SearchQuery searchQuery = new NativeSearchQueryBuilder() + .withQuery(matchAllQuery()) + .withSearchType(COUNT) + .withIndices("articles").withTypes("article") + .addAggregation(terms("subjects").field("subject")) + .build(); + // when + Aggregations aggregations = elasticsearchTemplate.query(searchQuery, new ResultsExtractor() { + @Override + public Aggregations extract(SearchResponse response) { + return response.getAggregations(); + } + }); + // then + assertThat(aggregations, is(notNullValue())); + assertThat(aggregations.asMap().get("subjects"), is(notNullValue())); + } } diff --git a/src/test/java/org/springframework/data/elasticsearch/core/facet/ArticleEntity.java b/src/test/java/org/springframework/data/elasticsearch/core/facet/ArticleEntity.java index 8ed9d5bf..7fda64e1 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/facet/ArticleEntity.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/facet/ArticleEntity.java @@ -40,7 +40,7 @@ public class ArticleEntity { @Id private String id; private String title; - private String subject; + private String subject; @MultiField( mainField = @Field(type = String, index = analyzed), @@ -80,15 +80,15 @@ public class ArticleEntity { this.title = title; } - public String getSubject() { - return subject; - } + public String getSubject() { + return subject; + } - public void setSubject(String subject) { - this.subject = subject; - } + public void setSubject(String subject) { + this.subject = subject; + } - public List getAuthors() { + public List getAuthors() { return authors; } diff --git a/src/test/java/org/springframework/data/elasticsearch/core/facet/ArticleEntityBuilder.java b/src/test/java/org/springframework/data/elasticsearch/core/facet/ArticleEntityBuilder.java index caf49bae..9f0ddbde 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/facet/ArticleEntityBuilder.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/facet/ArticleEntityBuilder.java @@ -35,10 +35,11 @@ public class ArticleEntityBuilder { result.setTitle(title); return this; } - public ArticleEntityBuilder subject(String subject) { - result.setSubject(subject); - return this; - } + + public ArticleEntityBuilder subject(String subject) { + result.setSubject(subject); + return this; + } public ArticleEntityBuilder addAuthor(String author) { result.getAuthors().add(author); diff --git a/src/test/java/org/springframework/data/elasticsearch/entities/DynamicSettingAndMappingEntity.java b/src/test/java/org/springframework/data/elasticsearch/entities/DynamicSettingAndMappingEntity.java index ae053758..ee59e541 100644 --- a/src/test/java/org/springframework/data/elasticsearch/entities/DynamicSettingAndMappingEntity.java +++ b/src/test/java/org/springframework/data/elasticsearch/entities/DynamicSettingAndMappingEntity.java @@ -16,7 +16,9 @@ package org.springframework.data.elasticsearch.entities; import org.springframework.data.annotation.Id; -import org.springframework.data.elasticsearch.annotations.*; +import org.springframework.data.elasticsearch.annotations.Document; +import org.springframework.data.elasticsearch.annotations.Mapping; +import org.springframework.data.elasticsearch.annotations.Setting; /** * Sample DynamicSettingAndMappingEntity for test out dynamic setting using @Setting Annotation diff --git a/src/test/java/org/springframework/data/elasticsearch/entities/SampleEntity.java b/src/test/java/org/springframework/data/elasticsearch/entities/SampleEntity.java index 3c85e6c1..953843cc 100644 --- a/src/test/java/org/springframework/data/elasticsearch/entities/SampleEntity.java +++ b/src/test/java/org/springframework/data/elasticsearch/entities/SampleEntity.java @@ -37,7 +37,7 @@ public class SampleEntity { private boolean available; private String highlightedMessage; - private GeoPoint location; + private GeoPoint location; @Version private Long version; @@ -90,13 +90,13 @@ public class SampleEntity { this.highlightedMessage = highlightedMessage; } - public GeoPoint getLocation() { - return location; - } + public GeoPoint getLocation() { + return location; + } - public void setLocation(GeoPoint location) { - this.location = location; - } + public void setLocation(GeoPoint location) { + this.location = location; + } public Long getVersion() { return version; 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 29f4ccaf..90861b63 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java @@ -494,100 +494,100 @@ public class CustomMethodRepositoryTests { assertThat(sampleEntities.size(), is(1)); } - @Test - public void shouldExecuteCustomMethodWithWithinGeoPoint() { - // given - String documentId = randomNumeric(5); - SampleEntity sampleEntity = new SampleEntity(); - sampleEntity.setId(documentId); - sampleEntity.setType("test"); - sampleEntity.setRate(10); - sampleEntity.setMessage("foo"); - sampleEntity.setLocation(new GeoPoint(45.7806d, 3.0875d)); + @Test + public void shouldExecuteCustomMethodWithWithinGeoPoint() { + // given + String documentId = randomNumeric(5); + SampleEntity sampleEntity = new SampleEntity(); + sampleEntity.setId(documentId); + sampleEntity.setType("test"); + sampleEntity.setRate(10); + sampleEntity.setMessage("foo"); + sampleEntity.setLocation(new GeoPoint(45.7806d, 3.0875d)); - repository.save(sampleEntity); + repository.save(sampleEntity); - // when - Page page = repository.findByLocationWithin(new GeoPoint(45.7806d, 3.0875d), "2km", new PageRequest(0, 10)); - // then - assertThat(page, is(notNullValue())); - assertThat(page.getTotalElements(), is(equalTo(1L))); - } + // when + Page page = repository.findByLocationWithin(new GeoPoint(45.7806d, 3.0875d), "2km", new PageRequest(0, 10)); + // then + assertThat(page, is(notNullValue())); + assertThat(page.getTotalElements(), is(equalTo(1L))); + } - @Test - public void shouldExecuteCustomMethodWithWithinPoint() { - // given - String documentId = randomNumeric(5); - SampleEntity sampleEntity = new SampleEntity(); - sampleEntity.setId(documentId); - sampleEntity.setType("test"); - sampleEntity.setRate(10); - sampleEntity.setMessage("foo"); - sampleEntity.setLocation(new GeoPoint(45.7806d, 3.0875d)); + @Test + public void shouldExecuteCustomMethodWithWithinPoint() { + // given + String documentId = randomNumeric(5); + SampleEntity sampleEntity = new SampleEntity(); + sampleEntity.setId(documentId); + sampleEntity.setType("test"); + sampleEntity.setRate(10); + sampleEntity.setMessage("foo"); + sampleEntity.setLocation(new GeoPoint(45.7806d, 3.0875d)); - repository.save(sampleEntity); + repository.save(sampleEntity); - // when - Page page = repository.findByLocationWithin(new Point(3.0875d, 45.7806d), new Distance(2, Metrics.KILOMETERS), new PageRequest(0, 10)); - // then - assertThat(page, is(notNullValue())); - assertThat(page.getTotalElements(), is(equalTo(1L))); - } + // when + Page page = repository.findByLocationWithin(new Point(3.0875d, 45.7806d), new Distance(2, Metrics.KILOMETERS), new PageRequest(0, 10)); + // then + assertThat(page, is(notNullValue())); + assertThat(page.getTotalElements(), is(equalTo(1L))); + } - @Test - public void shouldExecuteCustomMethodWithNearBox() { - // given - String documentId = randomNumeric(5); - SampleEntity sampleEntity = new SampleEntity(); - sampleEntity.setId(documentId); - sampleEntity.setType("test"); - sampleEntity.setRate(10); - sampleEntity.setMessage("foo"); - sampleEntity.setLocation(new GeoPoint(45.7806d, 3.0875d)); + @Test + public void shouldExecuteCustomMethodWithNearBox() { + // given + String documentId = randomNumeric(5); + SampleEntity sampleEntity = new SampleEntity(); + sampleEntity.setId(documentId); + sampleEntity.setType("test"); + sampleEntity.setRate(10); + sampleEntity.setMessage("foo"); + sampleEntity.setLocation(new GeoPoint(45.7806d, 3.0875d)); - repository.save(sampleEntity); + repository.save(sampleEntity); - documentId = randomNumeric(5); - SampleEntity sampleEntity2 = new SampleEntity(); - sampleEntity2.setId(documentId); - sampleEntity2.setType("test2"); - sampleEntity2.setRate(10); - sampleEntity2.setMessage("foo"); - sampleEntity2.setLocation(new GeoPoint(30.7806d, 0.0875d)); + documentId = randomNumeric(5); + SampleEntity sampleEntity2 = new SampleEntity(); + sampleEntity2.setId(documentId); + sampleEntity2.setType("test2"); + sampleEntity2.setRate(10); + sampleEntity2.setMessage("foo"); + sampleEntity2.setLocation(new GeoPoint(30.7806d, 0.0875d)); - repository.save(sampleEntity2); + repository.save(sampleEntity2); - // when - Page pageAll = repository.findAll(new PageRequest(0, 10)); - // then - assertThat(pageAll, is(notNullValue())); - assertThat(pageAll.getTotalElements(), is(equalTo(2L))); + // when + Page pageAll = repository.findAll(new PageRequest(0, 10)); + // then + assertThat(pageAll, is(notNullValue())); + 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)); - // then - assertThat(page, is(notNullValue())); - assertThat(page.getTotalElements(), is(equalTo(1L))); - } + // when + Page page = repository.findByLocationNear(new Box(new Point(3d, 46d), new Point(4d, 45d)), new PageRequest(0, 10)); + // then + assertThat(page, is(notNullValue())); + assertThat(page.getTotalElements(), is(equalTo(1L))); + } - @Test - public void shouldExecuteCustomMethodWithNearPointAndDistance() { - // given - String documentId = randomNumeric(5); - SampleEntity sampleEntity = new SampleEntity(); - sampleEntity.setId(documentId); - sampleEntity.setType("test"); - sampleEntity.setRate(10); - sampleEntity.setMessage("foo"); - sampleEntity.setLocation(new GeoPoint(45.7806d, 3.0875d)); + @Test + public void shouldExecuteCustomMethodWithNearPointAndDistance() { + // given + String documentId = randomNumeric(5); + SampleEntity sampleEntity = new SampleEntity(); + sampleEntity.setId(documentId); + sampleEntity.setType("test"); + sampleEntity.setRate(10); + sampleEntity.setMessage("foo"); + sampleEntity.setLocation(new GeoPoint(45.7806d, 3.0875d)); - repository.save(sampleEntity); + repository.save(sampleEntity); - // when - Page page = repository.findByLocationNear(new Point(3.0875d, 45.7806d), new Distance(2, Metrics.KILOMETERS), new PageRequest(0, 10)); - // then - assertThat(page, is(notNullValue())); - assertThat(page.getTotalElements(), is(equalTo(1L))); - } + // when + Page page = repository.findByLocationNear(new Point(3.0875d, 45.7806d), new Distance(2, Metrics.KILOMETERS), new PageRequest(0, 10)); + // then + assertThat(page, is(notNullValue())); + assertThat(page.getTotalElements(), is(equalTo(1L))); + } } diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/custom/SampleCustomMethodRepository.java b/src/test/java/org/springframework/data/elasticsearch/repositories/custom/SampleCustomMethodRepository.java index d68f7b8b..7cf997e4 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/custom/SampleCustomMethodRepository.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/custom/SampleCustomMethodRepository.java @@ -70,15 +70,15 @@ public interface SampleCustomMethodRepository extends ElasticsearchRepository findByMessageOrderByTypeAsc(String message, Pageable pageable); - Page findByLocationWithin(GeoPoint point, String distance, Pageable pageable); + Page findByLocationWithin(GeoPoint point, String distance, Pageable pageable); - Page findByLocationWithin(Point point, Distance distance, Pageable pageable); + Page findByLocationWithin(Point point, Distance distance, Pageable pageable); - Page findByLocationNear(GeoBox box, Pageable pageable); + Page findByLocationNear(GeoBox box, Pageable pageable); - Page findByLocationNear(Box box, Pageable pageable); + Page findByLocationNear(Box box, Pageable pageable); - Page findByLocationNear(Point point, Distance distance, Pageable pageable); + Page findByLocationNear(Point point, Distance distance, Pageable pageable); - Page findByLocationNear(GeoPoint point, String distance, Pageable pageable); + Page findByLocationNear(GeoPoint point, String distance, Pageable pageable); } 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 128d64e8..62e2d8e8 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 @@ -121,7 +121,7 @@ public class DynamicSettingAndMappingEntityRepositoryTests { assertThat(mapping, is(notNullValue())); assertThat(properties, is(notNullValue())); assertThat(((String) ((Map) properties.get("email")).get("type")), is("string")); - assertThat((String) ((Map)properties.get("email")).get("analyzer"), is("emailAnalyzer")); + assertThat((String) ((Map) properties.get("email")).get("analyzer"), is("emailAnalyzer")); } @Test @@ -146,7 +146,7 @@ public class DynamicSettingAndMappingEntityRepositoryTests { assertThat(mapping, is(notNullValue())); assertThat(properties, is(notNullValue())); assertThat(((String) ((Map) properties.get("email")).get("type")), is("string")); - assertThat((String) ((Map)properties.get("email")).get("analyzer"), is("emailAnalyzer")); + assertThat((String) ((Map) properties.get("email")).get("analyzer"), is("emailAnalyzer")); } /* @@ -162,6 +162,6 @@ public class DynamicSettingAndMappingEntityRepositoryTests { assertThat(mapping, is(notNullValue())); assertThat(properties, is(notNullValue())); assertThat(((String) ((Map) properties.get("email")).get("type")), is("string")); - assertThat((String) ((Map)properties.get("email")).get("analyzer"), is("emailAnalyzer")); + assertThat((String) ((Map) properties.get("email")).get("analyzer"), is("emailAnalyzer")); } } diff --git a/src/test/resources/mappings/test-mappings.json b/src/test/resources/mappings/test-mappings.json index 07ba4c87..d115109f 100644 --- a/src/test/resources/mappings/test-mappings.json +++ b/src/test/resources/mappings/test-mappings.json @@ -1,7 +1,10 @@ { - "test-setting-type" : { - "properties" : { - "email" : {"type" : "string", "analyzer" : "emailAnalyzer" } + "test-setting-type": { + "properties": { + "email": { + "type": "string", + "analyzer": "emailAnalyzer" } + } } }