Skip to content

Commit 097c5f6

Browse files
committed
DATAES-46 - Apply code formatting
1 parent a66dc08 commit 097c5f6

File tree

12 files changed

+1795
-395
lines changed

12 files changed

+1795
-395
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ public ElasticsearchTemplate(Client client, ElasticsearchConverter elasticsearch
123123

124124
public ElasticsearchTemplate(Client client, ElasticsearchConverter elasticsearchConverter, ResultsMapper resultsMapper) {
125125
this.client = client;
126-
this.elasticsearchConverter = (elasticsearchConverter == null) ? new MappingElasticsearchConverter(
127-
new SimpleElasticsearchMappingContext()) : elasticsearchConverter;
126+
this.elasticsearchConverter = (elasticsearchConverter == null) ? new MappingElasticsearchConverter(
127+
new SimpleElasticsearchMappingContext()) : elasticsearchConverter;
128128
this.resultsMapper = (resultsMapper == null) ? new DefaultResultMapper(this.elasticsearchConverter.getMappingContext()) : resultsMapper;
129129
}
130130

@@ -879,14 +879,14 @@ private List<String> extractIds(SearchResponse response) {
879879
return ids;
880880
}
881881

882-
@Override
883-
public void setApplicationContext(ApplicationContext context) throws BeansException {
884-
if(elasticsearchConverter instanceof ApplicationContextAware){
885-
((ApplicationContextAware)elasticsearchConverter).setApplicationContext(context);
886-
}
887-
}
882+
@Override
883+
public void setApplicationContext(ApplicationContext context) throws BeansException {
884+
if (elasticsearchConverter instanceof ApplicationContextAware) {
885+
((ApplicationContextAware) elasticsearchConverter).setApplicationContext(context);
886+
}
887+
}
888888

889-
private static String[] toArray(List<String> values) {
889+
private static String[] toArray(List<String> values) {
890890
String[] valuesAsArray = new String[values.size()];
891891
return values.toArray(valuesAsArray);
892892
}

src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ public ConversionService getConversionService() {
6161
@Override
6262
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
6363
this.applicationContext = applicationContext;
64-
if(mappingContext instanceof ApplicationContextAware){
65-
((ApplicationContextAware)mappingContext).setApplicationContext(applicationContext);
66-
}
64+
if (mappingContext instanceof ApplicationContextAware) {
65+
((ApplicationContextAware) mappingContext).setApplicationContext(applicationContext);
66+
}
6767
}
6868
}

src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchMappingContext.java

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,18 @@
3333
*/
3434

3535
public class SimpleElasticsearchMappingContext extends
36-
AbstractMappingContext<SimpleElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> implements ApplicationContextAware{
36+
AbstractMappingContext<SimpleElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> implements ApplicationContextAware {
3737

38-
private ApplicationContext context;
38+
private ApplicationContext context;
3939

40-
@Override
40+
@Override
4141
protected <T> SimpleElasticsearchPersistentEntity<?> createPersistentEntity(TypeInformation<T> typeInformation) {
42-
final SimpleElasticsearchPersistentEntity<T> persistentEntity =
43-
new SimpleElasticsearchPersistentEntity<T>(typeInformation);
44-
if(context != null)
45-
{
46-
persistentEntity.setApplicationContext(context);
47-
}
48-
return persistentEntity;
42+
final SimpleElasticsearchPersistentEntity<T> persistentEntity =
43+
new SimpleElasticsearchPersistentEntity<T>(typeInformation);
44+
if (context != null) {
45+
persistentEntity.setApplicationContext(context);
46+
}
47+
return persistentEntity;
4948
}
5049

5150
@Override
@@ -54,8 +53,8 @@ protected ElasticsearchPersistentProperty createPersistentProperty(Field field,
5453
return new SimpleElasticsearchPersistentProperty(field, descriptor, owner, simpleTypeHolder);
5554
}
5655

57-
@Override
58-
public void setApplicationContext(ApplicationContext context) throws BeansException {
59-
this.context = context;
60-
}
56+
@Override
57+
public void setApplicationContext(ApplicationContext context) throws BeansException {
58+
this.context = context;
59+
}
6160
}

src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit
6161
public SimpleElasticsearchPersistentEntity(TypeInformation<T> typeInformation) {
6262
super(typeInformation);
6363
this.context = new StandardEvaluationContext();
64-
this.parser = new SpelExpressionParser();
64+
this.parser = new SpelExpressionParser();
6565

6666
Class<T> clazz = typeInformation.getType();
6767
if (clazz.isAnnotationPresent(Document.class)) {

src/main/java/org/springframework/data/elasticsearch/core/query/UpdateQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public UpdateRequest getUpdateRequest() {
4646
public void setUpdateRequest(UpdateRequest updateRequest) {
4747
this.updateRequest = updateRequest;
4848
}
49-
49+
5050
public String getIndexName() {
5151
return indexName;
5252
}

src/main/java/org/springframework/data/elasticsearch/core/query/UpdateQueryBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public UpdateQueryBuilder withUpdateRequest(UpdateRequest updateRequest) {
4141
this.updateRequest = updateRequest;
4242
return this;
4343
}
44-
44+
4545
public UpdateQueryBuilder withIndexRequest(IndexRequest indexRequest) {
4646
this.indexRequest = indexRequest;
4747
return this;
@@ -76,7 +76,7 @@ public UpdateQuery build() {
7676
if (this.indexRequest != null) {
7777
if (this.updateRequest == null) {
7878
updateRequest = new UpdateRequest();
79-
}
79+
}
8080
updateRequest.doc(indexRequest);
8181
}
8282
updateQuery.setUpdateRequest(updateRequest);

src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class ElasticsearchRepositoryBean<T> extends CdiRepositoryBean<T> {
4545
* @param repositoryType must not be {@literal null}.
4646
* @param beanManager must not be {@literal null}.
4747
* @param customImplementationBean the bean for the custom implementation of the
48-
* {@link org.springframework.data.repository.Repository}, can be {@literal null}.
48+
* {@link org.springframework.data.repository.Repository}, can be {@literal null}.
4949
*/
5050
public ElasticsearchRepositoryBean(Bean<ElasticsearchOperations> operations, Set<Annotation> qualifiers,
5151
Class<T> repositoryType, BeanManager beanManager, Bean<?> customImplementationBean) {

0 commit comments

Comments
 (0)