From d92137247f04c9575e9ea1e1953deed25b31e6d0 Mon Sep 17 00:00:00 2001 From: Mohsin Husen Date: Fri, 30 Jan 2015 17:19:06 +0000 Subject: [PATCH] DATAES-46 - Apply code formatting --- pom.xml | 3 +- .../annotations/CompletionField.java | 12 +-- .../data/elasticsearch/annotations/Field.java | 1 - .../core/CriteriaQueryProcessor.java | 4 +- .../elasticsearch/core/MappingBuilder.java | 6 +- .../elasticsearch/core/ResultsExtractor.java | 1 + .../core/completion/Completion.java | 68 +++++++-------- .../elasticsearch/core/query/Criteria.java | 2 +- .../cdi/ElasticsearchRepositoryBean.java | 4 +- .../cdi/ElasticsearchRepositoryExtension.java | 2 +- .../parser/ElasticsearchQueryCreator.java | 30 +++---- .../data/elasticsearch/NestedObjectTests.java | 16 ++-- .../ElasticsearchTemplateCompletionTests.java | 24 ++---- .../entities/AbstractInheritedEntity.java | 1 - .../data/elasticsearch/entities/Person.java | 2 +- .../entities/PersonMultipleLevelNested.java | 3 +- .../entities/SampleInheritedEntity.java | 2 - .../CustomMethodRepositoryTests.java | 86 +++++++++---------- .../custom/SampleCustomMethodRepository.java | 3 +- 19 files changed, 130 insertions(+), 140 deletions(-) diff --git a/pom.xml b/pom.xml index 13f68f187..e734b740c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.springframework.data diff --git a/src/main/java/org/springframework/data/elasticsearch/annotations/CompletionField.java b/src/main/java/org/springframework/data/elasticsearch/annotations/CompletionField.java index f3df6794d..559ce5508 100644 --- a/src/main/java/org/springframework/data/elasticsearch/annotations/CompletionField.java +++ b/src/main/java/org/springframework/data/elasticsearch/annotations/CompletionField.java @@ -28,15 +28,15 @@ import java.lang.annotation.*; @Inherited public @interface CompletionField { - String searchAnalyzer() default "simple"; + String searchAnalyzer() default "simple"; - String indexAnalyzer() default "simple"; + String indexAnalyzer() default "simple"; - boolean payloads() default false; + boolean payloads() default false; - boolean preserveSeparators() default true; + boolean preserveSeparators() default true; - boolean preservePositionIncrements() default true; + boolean preservePositionIncrements() default true; - int maxInputLength() default 50; + int maxInputLength() default 50; } diff --git a/src/main/java/org/springframework/data/elasticsearch/annotations/Field.java b/src/main/java/org/springframework/data/elasticsearch/annotations/Field.java index bf5c941dc..f4cec2b38 100644 --- a/src/main/java/org/springframework/data/elasticsearch/annotations/Field.java +++ b/src/main/java/org/springframework/data/elasticsearch/annotations/Field.java @@ -53,5 +53,4 @@ public @interface Field { String[] ignoreFields() default {}; boolean includeInParent() default false; - } diff --git a/src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java b/src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java index dfc0eb9a2..ece8d59ff 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java @@ -118,9 +118,9 @@ class CriteriaQueryProcessor { } QueryBuilder query = null; - String searchText = StringUtils.toString(value); + String searchText = StringUtils.toString(value); - switch (key) { + switch (key) { case EQUALS: query = queryString(searchText).field(fieldName); break; diff --git a/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java b/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java index 9eb8b5212..91c8dfb49 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java @@ -79,7 +79,7 @@ class MappingBuilder { // Properties XContentBuilder xContentBuilder = mapping.startObject(FIELD_PROPERTIES); - mapEntity(xContentBuilder, clazz, true, idFieldName, EMPTY, false, FieldType.Auto,null); + mapEntity(xContentBuilder, clazz, true, idFieldName, EMPTY, false, FieldType.Auto, null); return xContentBuilder.endObject().endObject().endObject(); } @@ -95,7 +95,7 @@ class MappingBuilder { type = fieldType.toString().toLowerCase(); } XContentBuilder t = xContentBuilder.startObject(nestedObjectFieldName).field(FIELD_TYPE, type); - + if (nestedOrObjectField && FieldType.Nested == fieldType && fieldAnnotation.includeInParent()) { t.field("include_in_parent", fieldAnnotation.includeInParent()); } @@ -117,7 +117,7 @@ class MappingBuilder { continue; } boolean nestedOrObject = isNestedOrObjectField(field); - mapEntity(xContentBuilder, getFieldType(field), false, EMPTY, field.getName(), nestedOrObject, singleField.type(),field.getAnnotation(Field.class)); + mapEntity(xContentBuilder, getFieldType(field), false, EMPTY, field.getName(), nestedOrObject, singleField.type(), field.getAnnotation(Field.class)); if (nestedOrObject) { continue; } 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 60ce31d23..e1f816da7 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/ResultsExtractor.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ResultsExtractor.java @@ -19,5 +19,6 @@ package org.springframework.data.elasticsearch.core; import org.elasticsearch.action.search.SearchResponse; public interface ResultsExtractor { + T extract(SearchResponse response); } diff --git a/src/main/java/org/springframework/data/elasticsearch/core/completion/Completion.java b/src/main/java/org/springframework/data/elasticsearch/core/completion/Completion.java index a1d86d17c..0b8d08024 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/completion/Completion.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/completion/Completion.java @@ -10,48 +10,48 @@ import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(value = JsonInclude.Include.NON_NULL) public class Completion { - private String[] input; - private String output; - private Integer weight; - private Object payload; + private String[] input; + private String output; + private Integer weight; + private Object payload; - private Completion() { - //required by mapper to instantiate object - } + private Completion() { + //required by mapper to instantiate object + } - public Completion(String[] input) { - this.input = input; - } + public Completion(String[] input) { + this.input = input; + } - public String[] getInput() { - return input; - } + public String[] getInput() { + return input; + } - public void setInput(String[] input) { - this.input = input; - } + public void setInput(String[] input) { + this.input = input; + } - public String getOutput() { - return output; - } + public String getOutput() { + return output; + } - public void setOutput(String output) { - this.output = output; - } + public void setOutput(String output) { + this.output = output; + } - public Object getPayload() { - return payload; - } + public Object getPayload() { + return payload; + } - public void setPayload(Object payload) { - this.payload = payload; - } + public void setPayload(Object payload) { + this.payload = payload; + } - public Integer getWeight() { - return weight; - } + public Integer getWeight() { + return weight; + } - public void setWeight(Integer weight) { - this.weight = weight; - } + public void setWeight(Integer weight) { + this.weight = weight; + } } 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 8f0b51597..0ee92f413 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 @@ -193,7 +193,7 @@ public class Criteria { * @return */ public Criteria is(Object o) { - queryCriteria.add(new CriteriaEntry(OperationKey.EQUALS, o)); + queryCriteria.add(new CriteriaEntry(OperationKey.EQUALS, o)); return this; } diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryBean.java b/src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryBean.java index 1c983e69c..88daf135d 100644 --- a/src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryBean.java +++ b/src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryBean.java @@ -46,10 +46,10 @@ public class ElasticsearchRepositoryBean extends CdiRepositoryBean { * @param repositoryType must not be {@literal null}. * @param beanManager must not be {@literal null}. * @param detector detector for the custom {@link org.springframework.data.repository.Repository} implementations - * {@link CustomRepositoryImplementationDetector}, can be {@literal null}. + * {@link CustomRepositoryImplementationDetector}, can be {@literal null}. */ public ElasticsearchRepositoryBean(Bean operations, Set qualifiers, - Class repositoryType, BeanManager beanManager, CustomRepositoryImplementationDetector detector) { + Class repositoryType, BeanManager beanManager, CustomRepositoryImplementationDetector detector) { super(qualifiers, repositoryType, beanManager, detector); Assert.notNull(operations, "Cannot create repository with 'null' for ElasticsearchOperations."); diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryExtension.java b/src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryExtension.java index 679569637..f1df39fe2 100644 --- a/src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryExtension.java +++ b/src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryExtension.java @@ -67,7 +67,7 @@ public class ElasticsearchRepositoryExtension extends CdiRepositoryExtensionSupp } private CdiRepositoryBean createRepositoryBean(Class repositoryType, Set qualifiers, - BeanManager beanManager) { + BeanManager beanManager) { Bean elasticsearchOperationsBean = this.elasticsearchOperationsMap.get(qualifiers .toString()); 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 353e78e23..8417147d2 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 @@ -90,7 +90,7 @@ public class ElasticsearchQueryCreator extends AbstractQueryCreator parameters) { - Part.Type type = part.getType(); + Part.Type type = part.getType(); Criteria criteria = instance; if (criteria == null) { @@ -126,24 +126,24 @@ public class ElasticsearchQueryCreator extends AbstractQueryCreator personIndexed = elasticsearchTemplate.queryForPage(searchQuery, PersonMultipleLevelNested.class); assertThat(personIndexed, is(notNullValue())); @@ -375,8 +375,8 @@ public class NestedObjectTests { elasticsearchTemplate.refresh(Book.class, true); //then final SearchQuery searchQuery = new NativeSearchQueryBuilder() - .withQuery(nestedQuery("buckets", termQuery("buckets.1", "test3"))) - .build(); + .withQuery(nestedQuery("buckets", termQuery("buckets.1", "test3"))) + .build(); final Page books = elasticsearchTemplate.queryForPage(searchQuery, Book.class); assertThat(books.getContent().size(), is(1)); 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 2ae73e723..a17c6ebd0 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 @@ -154,7 +154,7 @@ public class ElasticsearchTemplateCompletionTests { assertThat(options.size(), is(2)); assertThat(options.get(0).getText().string(), isOneOf("Marchand", "Mohsin Husen")); assertThat(options.get(1).getText().string(), isOneOf("Marchand", "Mohsin Husen")); - } + } @Test public void shouldFindSuggestionsForGivenCriteriaQueryUsingAnnotatedCompletionEntity() { @@ -171,8 +171,8 @@ public class ElasticsearchTemplateCompletionTests { //then assertThat(options.size(), is(2)); - assertThat(options.get(0).getText().string(), isOneOf("Marchand","Mohsin Husen")); - assertThat(options.get(1).getText().string(), isOneOf("Marchand","Mohsin Husen")); + assertThat(options.get(0).getText().string(), isOneOf("Marchand", "Mohsin Husen")); + assertThat(options.get(1).getText().string(), isOneOf("Marchand", "Mohsin Husen")); } @Test @@ -193,14 +193,11 @@ public class ElasticsearchTemplateCompletionTests { for (CompletionSuggestion.Entry.Option option : options) { if (option.getText().string().equals("Mewes Kochheim1")) { assertEquals(Double.MAX_VALUE, option.getPayloadAsDouble(), 0); - } - else if (option.getText().string().equals("Mewes Kochheim2")) { + } else if (option.getText().string().equals("Mewes Kochheim2")) { assertEquals(Long.MAX_VALUE, option.getPayloadAsLong()); - } - else if (option.getText().string().equals("Mewes Kochheim3")) { + } else if (option.getText().string().equals("Mewes Kochheim3")) { assertEquals("Payload test", option.getPayloadAsString()); - } - else if (option.getText().string().equals("Mewes Kochheim4")) { + } else if (option.getText().string().equals("Mewes Kochheim4")) { assertEquals("Payload", option.getPayloadAsMap().get("someField1")); assertEquals("test", option.getPayloadAsMap().get("someField2")); } else { @@ -227,14 +224,11 @@ public class ElasticsearchTemplateCompletionTests { for (CompletionSuggestion.Entry.Option option : options) { if (option.getText().string().equals("Mewes Kochheim1")) { assertEquals(4, option.getScore(), 0); - } - else if (option.getText().string().equals("Mewes Kochheim2")) { + } else if (option.getText().string().equals("Mewes Kochheim2")) { assertEquals(0, option.getScore(), 0); - } - else if (option.getText().string().equals("Mewes Kochheim3")) { + } else if (option.getText().string().equals("Mewes Kochheim3")) { assertEquals(1, option.getScore(), 0); - } - else if (option.getText().string().equals("Mewes Kochheim4")) { + } else if (option.getText().string().equals("Mewes Kochheim4")) { assertEquals(Integer.MAX_VALUE, option.getScore(), 0); } else { fail("Unexpected option"); diff --git a/src/test/java/org/springframework/data/elasticsearch/entities/AbstractInheritedEntity.java b/src/test/java/org/springframework/data/elasticsearch/entities/AbstractInheritedEntity.java index c5ee1b5f0..630c2d700 100644 --- a/src/test/java/org/springframework/data/elasticsearch/entities/AbstractInheritedEntity.java +++ b/src/test/java/org/springframework/data/elasticsearch/entities/AbstractInheritedEntity.java @@ -48,5 +48,4 @@ public class AbstractInheritedEntity { public void setCreatedDate(Date createdDate) { this.createdDate = createdDate; } - } diff --git a/src/test/java/org/springframework/data/elasticsearch/entities/Person.java b/src/test/java/org/springframework/data/elasticsearch/entities/Person.java index 14cc0dc2b..5dd6858ac 100644 --- a/src/test/java/org/springframework/data/elasticsearch/entities/Person.java +++ b/src/test/java/org/springframework/data/elasticsearch/entities/Person.java @@ -40,7 +40,7 @@ public class Person { @Field(type = FieldType.Nested) private List car; - @Field(type = FieldType.Nested, includeInParent=true) + @Field(type = FieldType.Nested, includeInParent = true) private List books; public String getId() { diff --git a/src/test/java/org/springframework/data/elasticsearch/entities/PersonMultipleLevelNested.java b/src/test/java/org/springframework/data/elasticsearch/entities/PersonMultipleLevelNested.java index 076d074aa..bd745b244 100644 --- a/src/test/java/org/springframework/data/elasticsearch/entities/PersonMultipleLevelNested.java +++ b/src/test/java/org/springframework/data/elasticsearch/entities/PersonMultipleLevelNested.java @@ -43,7 +43,7 @@ public class PersonMultipleLevelNested { @Field(type = FieldType.Nested) private List cars; - @Field(type = FieldType.Nested, includeInParent=true) + @Field(type = FieldType.Nested, includeInParent = true) private List bestCars; public String getId() { @@ -85,5 +85,4 @@ public class PersonMultipleLevelNested { public void setBestCars(List bestCars) { this.bestCars = bestCars; } - } diff --git a/src/test/java/org/springframework/data/elasticsearch/entities/SampleInheritedEntity.java b/src/test/java/org/springframework/data/elasticsearch/entities/SampleInheritedEntity.java index 16685a6f3..6f4a9e778 100644 --- a/src/test/java/org/springframework/data/elasticsearch/entities/SampleInheritedEntity.java +++ b/src/test/java/org/springframework/data/elasticsearch/entities/SampleInheritedEntity.java @@ -37,6 +37,4 @@ public class SampleInheritedEntity extends AbstractInheritedEntity { public void setMessage(String message) { this.message = message; } - - } 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 17e9ff257..432dc176a 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java @@ -495,54 +495,55 @@ public class CustomMethodRepositoryTests { assertThat(sampleEntities.size(), is(1)); } - @Test - public void shouldExecuteCustomMethodWithGeoPoint() { - // 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 shouldExecuteCustomMethodWithGeoPoint() { + // 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.findByLocation(new GeoPoint(45.7806d, 3.0875d), new PageRequest(0, 10)); - // then - assertThat(page, is(notNullValue())); - assertThat(page.getTotalElements(), is(equalTo(1L))); - } - @Test - public void shouldExecuteCustomMethodWithGeoPointAndString() { - // 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)); + // when + Page page = repository.findByLocation(new GeoPoint(45.7806d, 3.0875d), new PageRequest(0, 10)); + // then + assertThat(page, is(notNullValue())); + assertThat(page.getTotalElements(), is(equalTo(1L))); + } - repository.save(sampleEntity); + @Test + public void shouldExecuteCustomMethodWithGeoPointAndString() { + // 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)); - documentId = randomNumeric(5); - sampleEntity = new SampleEntity(); - sampleEntity.setId(documentId); - sampleEntity.setType("test"); - sampleEntity.setRate(10); - sampleEntity.setMessage("foo"); - sampleEntity.setLocation(new GeoPoint(48.7806d, 3.0875d)); + repository.save(sampleEntity); - repository.save(sampleEntity); + documentId = randomNumeric(5); + sampleEntity = new SampleEntity(); + sampleEntity.setId(documentId); + sampleEntity.setType("test"); + sampleEntity.setRate(10); + sampleEntity.setMessage("foo"); + sampleEntity.setLocation(new GeoPoint(48.7806d, 3.0875d)); - // when - Page page = repository.findByLocationAndMessage(new GeoPoint(45.7806d, 3.0875d), "foo", new PageRequest(0, 10)); - // then - assertThat(page, is(notNullValue())); - assertThat(page.getTotalElements(), is(equalTo(1L))); - } + repository.save(sampleEntity); + + // when + Page page = repository.findByLocationAndMessage(new GeoPoint(45.7806d, 3.0875d), "foo", new PageRequest(0, 10)); + // then + assertThat(page, is(notNullValue())); + assertThat(page.getTotalElements(), is(equalTo(1L))); + } @Test public void shouldExecuteCustomMethodWithWithinGeoPoint() { @@ -1173,6 +1174,5 @@ public class CustomMethodRepositoryTests { // then assertThat(count, 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 ea5283408..2b2a0e8d4 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 @@ -75,7 +75,7 @@ public interface SampleCustomMethodRepository extends ElasticsearchRepository findByLocationAndMessage(GeoPoint point, String msg, 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); @@ -126,5 +126,4 @@ public interface SampleCustomMethodRepository extends ElasticsearchRepository