Skip to content

Commit 92433b7

Browse files
mp911demp911de
committed
DATAES-579 - Reformat test sources.
Original pull request: spring-projects#283.
1 parent 198ad0e commit 92433b7

22 files changed

+94
-91
lines changed

‎src/test/java/org/elasticsearch/plugins/ExtendedPluginsClassLoader.java

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,36 @@
2525
import java.util.List;
2626

2727
/**
28-
* A classloader that is a union over the parent core classloader and classloaders of extended plugins.
29-
* Cloned from ES repository
30-
* - that file is only available in ES server libs
31-
* - and we need it o create a node client for unittests
28+
* A classloader that is a union over the parent core classloader and classloaders of extended plugins. Cloned from ES
29+
* repository - that file is only available in ES server libs - and we need it o create a node client for unittests
3230
*/
3331
public class ExtendedPluginsClassLoader extends ClassLoader {
3432

35-
/** Loaders of plugins extended by a plugin. */
36-
private final List<ClassLoader> extendedLoaders;
33+
/** Loaders of plugins extended by a plugin. */
34+
private final List<ClassLoader> extendedLoaders;
3735

38-
private ExtendedPluginsClassLoader(ClassLoader parent, List<ClassLoader> extendedLoaders) {
39-
super(parent);
40-
this.extendedLoaders = Collections.unmodifiableList(extendedLoaders);
41-
}
36+
private ExtendedPluginsClassLoader(ClassLoader parent, List<ClassLoader> extendedLoaders) {
37+
super(parent);
38+
this.extendedLoaders = Collections.unmodifiableList(extendedLoaders);
39+
}
4240

43-
@Override
44-
protected Class<?> findClass(String name) throws ClassNotFoundException {
45-
for (ClassLoader loader : extendedLoaders) {
46-
try {
47-
return loader.loadClass(name);
48-
} catch (ClassNotFoundException e) {
49-
// continue
50-
}
51-
}
52-
throw new ClassNotFoundException(name);
53-
}
41+
@Override
42+
protected Class<?> findClass(String name) throws ClassNotFoundException {
43+
for (ClassLoader loader : extendedLoaders) {
44+
try {
45+
return loader.loadClass(name);
46+
} catch (ClassNotFoundException e) {
47+
// continue
48+
}
49+
}
50+
throw new ClassNotFoundException(name);
51+
}
5452

55-
/**
56-
* Return a new classloader across the parent and extended loaders.
57-
*/
58-
public static ExtendedPluginsClassLoader create(ClassLoader parent, List<ClassLoader> extendedLoaders) {
59-
return AccessController.doPrivileged((PrivilegedAction<ExtendedPluginsClassLoader>)
60-
() -> new ExtendedPluginsClassLoader(parent, extendedLoaders));
61-
}
62-
}
53+
/**
54+
* Return a new classloader across the parent and extended loaders.
55+
*/
56+
public static ExtendedPluginsClassLoader create(ClassLoader parent, List<ClassLoader> extendedLoaders) {
57+
return AccessController.doPrivileged(
58+
(PrivilegedAction<ExtendedPluginsClassLoader>) () -> new ExtendedPluginsClassLoader(parent, extendedLoaders));
59+
}
60+
}

‎src/test/java/org/springframework/data/elasticsearch/Utils.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,16 @@
1515
*/
1616
package org.springframework.data.elasticsearch;
1717

18+
import static java.util.Arrays.*;
19+
1820
import java.util.UUID;
21+
1922
import org.elasticsearch.client.Client;
2023
import org.elasticsearch.common.settings.Settings;
2124
import org.elasticsearch.node.NodeValidationException;
2225
import org.elasticsearch.transport.Netty4Plugin;
26+
2327
import org.springframework.data.elasticsearch.client.NodeClientFactoryBean;
24-
import static java.util.Arrays.*;
2528

2629
/**
2730
* @author Mohsin Husen
@@ -36,14 +39,9 @@ public static Client getNodeClient() throws NodeValidationException {
3639
String pathData = "target/elasticsearchTestData";
3740
String clusterName = UUID.randomUUID().toString();
3841

39-
return new NodeClientFactoryBean.TestNode(
40-
Settings.builder()
41-
.put("transport.type", "netty4")
42-
.put("http.type", "netty4")
43-
.put("path.home", pathHome)
44-
.put("path.data", pathData)
45-
.put("cluster.name", clusterName)
46-
.put("node.max_local_storage_nodes", 100)
47-
.build(), asList(Netty4Plugin.class)).start().client();
42+
return new NodeClientFactoryBean.TestNode(Settings.builder().put("transport.type", "netty4")
43+
.put("http.type", "netty4").put("path.home", pathHome).put("path.data", pathData)
44+
.put("cluster.name", clusterName).put("node.max_local_storage_nodes", 100).build(), asList(Netty4Plugin.class))
45+
.start().client();
4846
}
4947
}

‎src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveMockClientTestsUtils.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717

1818
import static org.mockito.Mockito.*;
1919

20-
import org.mockito.ArgumentCaptor;
21-
import org.springframework.http.HttpMethod;
22-
import org.springframework.web.util.DefaultUriBuilderFactory;
23-
import org.springframework.web.util.UriBuilder;
2420
import reactor.core.publisher.Mono;
2521

2622
import java.io.IOException;
@@ -41,12 +37,15 @@
4137
import java.util.function.Function;
4238
import java.util.function.Supplier;
4339

40+
import org.mockito.ArgumentCaptor;
4441
import org.mockito.Mockito;
42+
4543
import org.springframework.core.io.ClassPathResource;
4644
import org.springframework.core.io.Resource;
4745
import org.springframework.data.elasticsearch.client.ElasticsearchHost;
4846
import org.springframework.data.elasticsearch.client.reactive.ReactiveMockClientTestsUtils.MockWebClientProvider.Send;
4947
import org.springframework.http.HttpHeaders;
48+
import org.springframework.http.HttpMethod;
5049
import org.springframework.http.HttpStatus;
5150
import org.springframework.http.MediaType;
5251
import org.springframework.lang.Nullable;
@@ -56,6 +55,8 @@
5655
import org.springframework.web.reactive.function.client.WebClient;
5756
import org.springframework.web.reactive.function.client.WebClient.RequestBodyUriSpec;
5857
import org.springframework.web.reactive.function.client.WebClient.RequestHeadersUriSpec;
58+
import org.springframework.web.util.DefaultUriBuilderFactory;
59+
import org.springframework.web.util.UriBuilder;
5960

6061
/**
6162
* @author Christoph Strobl

‎src/test/java/org/springframework/data/elasticsearch/config/nested/EnableNestedElasticsearchRepositoriesTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ public void hasNestedRepository() {
7575

7676
@Data
7777
@Builder
78-
@Document(indexName = "test-index-sample-config-nested", type = "test-type", shards = 1, replicas = 0, refreshInterval = "-1")
78+
@Document(indexName = "test-index-sample-config-nested", type = "test-type", shards = 1, replicas = 0,
79+
refreshInterval = "-1")
7980
static class SampleEntity {
8081

8182
@Id private String id;

‎src/test/java/org/springframework/data/elasticsearch/core/CustomEntityMapper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@
2525
public class CustomEntityMapper implements EntityMapper {
2626

2727
public CustomEntityMapper() {
28-
//custom configuration/implementation (e.g. FasterXML/jackson)
28+
// custom configuration/implementation (e.g. FasterXML/jackson)
2929
}
3030

3131
@Override
3232
public String mapToString(Object object) throws IOException {
33-
//mapping Object to text
33+
// mapping Object to text
3434
return null;
3535
}
3636

3737
@Override
3838
public <T> T mapToObject(String source, Class<T> clazz) throws IOException {
39-
//mapping text to Object
39+
// mapping text to Object
4040
return null;
4141
}
4242

‎src/test/java/org/springframework/data/elasticsearch/core/CustomResultMapper.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
*/
3131
public class CustomResultMapper implements ResultsMapper {
3232

33-
3433
private EntityMapper entityMapper;
3534

3635
public CustomResultMapper(EntityMapper entityMapper) {
@@ -44,12 +43,12 @@ public EntityMapper getEntityMapper() {
4443

4544
@Override
4645
public <T> T mapResult(GetResponse response, Class<T> clazz) {
47-
return null; //To change body of implemented methods use File | Settings | File Templates.
46+
return null; // To change body of implemented methods use File | Settings | File Templates.
4847
}
4948

5049
@Override
5150
public <T> AggregatedPage<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
52-
return null; //To change body of implemented methods use File | Settings | File Templates.
51+
return null; // To change body of implemented methods use File | Settings | File Templates.
5352
}
5453

5554
@Override

‎src/test/java/org/springframework/data/elasticsearch/core/MappingBuilderTests.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,8 @@ static class MinimalChildEntity {
499499
@NoArgsConstructor
500500
@AllArgsConstructor
501501
@Builder
502-
@Document(indexName = "test-index-book-mapping-builder", type = "book", shards = 1, replicas = 0, refreshInterval = "-1")
502+
@Document(indexName = "test-index-book-mapping-builder", type = "book", shards = 1, replicas = 0,
503+
refreshInterval = "-1")
503504
static class Book {
504505

505506
@Id private String id;
@@ -515,8 +516,8 @@ static class Book {
515516
* @author Stuart Stevenson
516517
* @author Mohsin Husen
517518
*/
518-
@Document(indexName = "test-index-simple-recursive-mapping-builder", type = "circular-object", shards = 1, replicas = 0,
519-
refreshInterval = "-1")
519+
@Document(indexName = "test-index-simple-recursive-mapping-builder", type = "circular-object", shards = 1,
520+
replicas = 0, refreshInterval = "-1")
520521
static class SimpleRecursiveEntity {
521522

522523
@Id private String id;
@@ -551,7 +552,8 @@ static class CopyToEntity {
551552
@NoArgsConstructor
552553
@AllArgsConstructor
553554
@Builder
554-
@Document(indexName = "test-index-normalizer-mapping-builder", type = "test", shards = 1, replicas = 0, refreshInterval = "-1")
555+
@Document(indexName = "test-index-normalizer-mapping-builder", type = "test", shards = 1, replicas = 0,
556+
refreshInterval = "-1")
555557
@Setting(settingPath = "/settings/test-normalizer.json")
556558
static class NormalizerEntity {
557559

@@ -650,7 +652,8 @@ public IndexQuery buildIndex() {
650652
@NoArgsConstructor
651653
@AllArgsConstructor
652654
@Builder
653-
@Document(indexName = "test-index-stock-mapping-builder", type = "price", shards = 1, replicas = 0, refreshInterval = "-1")
655+
@Document(indexName = "test-index-stock-mapping-builder", type = "price", shards = 1, replicas = 0,
656+
refreshInterval = "-1")
654657
static class StockPrice {
655658

656659
@Id private String id;
@@ -746,7 +749,8 @@ public void setSomething(Boolean something) {
746749
@NoArgsConstructor
747750
@AllArgsConstructor
748751
@Builder
749-
@Document(indexName = "test-index-geo-mapping-builder", type = "geo-test-index", shards = 1, replicas = 0, refreshInterval = "-1")
752+
@Document(indexName = "test-index-geo-mapping-builder", type = "geo-test-index", shards = 1, replicas = 0,
753+
refreshInterval = "-1")
750754
static class GeoEntity {
751755

752756
@Id private String id;

‎src/test/java/org/springframework/data/elasticsearch/core/aggregation/AggregatedPageImplTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@
1515
*/
1616
package org.springframework.data.elasticsearch.core.aggregation;
1717

18-
import static org.junit.Assert.assertEquals;
18+
import static org.junit.Assert.*;
19+
20+
import java.util.Arrays;
1921

2022
import org.junit.Test;
23+
2124
import org.springframework.data.domain.Page;
2225
import org.springframework.data.domain.PageRequest;
2326
import org.springframework.data.elasticsearch.core.aggregation.impl.AggregatedPageImpl;
2427

25-
import java.util.Arrays;
26-
2728
/**
2829
* @author Remco Zigterman
2930
*/

‎src/test/java/org/springframework/data/elasticsearch/core/convert/DateTimeConvertersTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ public void testJodaDateTimeConverterWithNullValue() {
3838
@Test
3939
public void testJodaDateTimeConverter() {
4040
DateTime dateTime = new DateTime(2013, 1, 24, 6, 35, 0, DateTimeZone.UTC);
41-
Assert
42-
.assertEquals("2013-01-24T06:35:00.000Z", DateTimeConverters.JodaDateTimeConverter.INSTANCE.convert(dateTime));
41+
Assert.assertEquals("2013-01-24T06:35:00.000Z",
42+
DateTimeConverters.JodaDateTimeConverter.INSTANCE.convert(dateTime));
4343
}
4444

4545
@Test

‎src/test/java/org/springframework/data/elasticsearch/core/geo/ElasticsearchTemplateGeoTests.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@
5151
* @author Mohsin Husen
5252
* @author Franck Marchand
5353
* @author Artur Konczak
54-
* @author Peter-Josef Meisch
55-
*
56-
* Basic info: latitude - horizontal lines (equator = 0.0, values -90.0 to 90.0) longitude -
54+
* @author Peter-Josef Meisch Basic info: latitude - horizontal lines (equator = 0.0, values -90.0 to 90.0) longitude -
5755
* vertical lines (Greenwich = 0.0, values -180 to 180) London [lat,lon] = [51.50985,-0.118082] - geohash =
5856
* gcpvj3448 Bouding Box for London = (bbox=-0.489,51.28,0.236,51.686) bbox = left,bottom,right,top bbox = min
5957
* Longitude , min Latitude , max Longitude , max Latitude
@@ -93,8 +91,7 @@ private void loadAnnotationBaseEntities() {
9391
.id("1").name("Artur Konczak") //
9492
.locationAsString(latLonString) //
9593
.locationAsArray(lonLatArray) //
96-
.locationAsGeoHash(geohash)
97-
.build();
94+
.locationAsGeoHash(geohash).build();
9895
LocationMarkerEntity location2 = LocationMarkerEntity.builder() //
9996
.id("2").name("Mohsin Husen") //
10097
.locationAsString(geohash.substring(0, 8)) //
@@ -421,8 +418,8 @@ public IndexQuery buildIndex() {
421418
@NoArgsConstructor
422419
@AllArgsConstructor
423420
@Builder
424-
@Document(indexName = "test-index-location-marker-core-geo", type = "geo-annotation-point-type", shards = 1, replicas = 0,
425-
refreshInterval = "-1")
421+
@Document(indexName = "test-index-location-marker-core-geo", type = "geo-annotation-point-type", shards = 1,
422+
replicas = 0, refreshInterval = "-1")
426423
static class LocationMarkerEntity {
427424

428425
@Id private String id;

‎src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntityTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void shouldThrowExceptionGivenMultipleVersionPropertiesArePresent()
6666
// when
6767
entity.addPersistentProperty(persistentProperty2);
6868
}
69-
69+
7070
@Test // DATAES-462
7171
public void rejectsMultipleScoreProperties() {
7272

@@ -123,9 +123,9 @@ public void setVersion2(Long version2) {
123123
}
124124

125125
// DATAES-462
126-
126+
127127
static class TwoScoreProperties {
128-
128+
129129
@Score float first;
130130
@Score float second;
131131
}

‎src/test/java/org/springframework/data/elasticsearch/immutable/ImmutableEntity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
@Getter
3030
public class ImmutableEntity {
3131
private final String id, name;
32-
32+
3333
public ImmutableEntity(String name) {
34-
34+
3535
this.id = null;
3636
this.name = name;
3737
}

‎src/test/java/org/springframework/data/elasticsearch/repositories/cdi/CdiRepositoryClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void setSamplePersonRepository(SamplePersonRepository samplePersonReposit
4949
public QualifiedProductRepository getQualifiedProductRepository() {
5050
return qualifiedProductRepository;
5151
}
52-
52+
5353
@Inject
5454
public void setQualifiedProductRepository(
5555
@PersonDB @OtherQualifier QualifiedProductRepository qualifiedProductRepository) {

‎src/test/java/org/springframework/data/elasticsearch/repositories/cdi/SamplePersonRepository.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* @author Mark Paluch
2222
* @see DATAES-113
2323
*/
24-
public interface SamplePersonRepository extends Repository<CdiRepositoryTests.Person, Long>, SamplePersonRepositoryCustom {
24+
public interface SamplePersonRepository
25+
extends Repository<CdiRepositoryTests.Person, Long>, SamplePersonRepositoryCustom {
2526

2627
}

‎src/test/java/org/springframework/data/elasticsearch/repositories/complex/custommethod/autowiring/ComplexElasticsearchRepository.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
/**
2121
* @author Artur Konczak
2222
*/
23-
public interface ComplexElasticsearchRepository extends ElasticsearchRepository<ComplexCustomMethodRepositoryTests.SampleEntity, String>, ComplexElasticsearchRepositoryCustom {
23+
public interface ComplexElasticsearchRepository
24+
extends ElasticsearchRepository<ComplexCustomMethodRepositoryTests.SampleEntity, String>,
25+
ComplexElasticsearchRepositoryCustom {
2426

2527
}

‎src/test/java/org/springframework/data/elasticsearch/repositories/complex/custommethod/autowiring/ComplexElasticsearchRepositoryImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
*/
99
public class ComplexElasticsearchRepositoryImpl implements ComplexElasticsearchRepositoryCustom {
1010

11-
@Autowired
12-
private ElasticsearchTemplate template;
11+
@Autowired private ElasticsearchTemplate template;
1312

1413
@Override
1514
public String doSomethingSpecial() {

‎src/test/java/org/springframework/data/elasticsearch/repositories/complex/custommethod/manualwiring/ComplexElasticsearchRepositoryManualWiring.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
/**
2222
* @author Artur Konczak
2323
*/
24-
public interface ComplexElasticsearchRepositoryManualWiring extends ElasticsearchRepository<ComplexCustomMethodRepositoryManualWiringTests.SampleEntity, String>, ComplexElasticsearchRepositoryCustom {
24+
public interface ComplexElasticsearchRepositoryManualWiring
25+
extends ElasticsearchRepository<ComplexCustomMethodRepositoryManualWiringTests.SampleEntity, String>,
26+
ComplexElasticsearchRepositoryCustom {
2527

2628
}

‎src/test/java/org/springframework/data/elasticsearch/repositories/geo/SpringDataGeoRepositoryTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ private double[] toGeoArray(Point point) {
103103
@NoArgsConstructor
104104
@AllArgsConstructor
105105
@Builder
106-
@Document(indexName = "test-index-geo-repository", type = "geo-test-index", shards = 1, replicas = 0, refreshInterval = "-1")
106+
@Document(indexName = "test-index-geo-repository", type = "geo-test-index", shards = 1, replicas = 0,
107+
refreshInterval = "-1")
107108
static class GeoEntity {
108109

109110
@Id private String id;

0 commit comments

Comments
 (0)