Skip to content

Commit 7804bdc

Browse files
michael-simonsmichael-simons
authored
DATAGRAPH-1354 - Use same check style import conventions as Spring Boot.
This avoids mostly star and static imports. It allows the CypherDSL elements to be imported statically.
1 parent 3af7555 commit 7804bdc

File tree

113 files changed

+710
-493
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+710
-493
lines changed

‎.mvn/wrapper/MavenWrapperDownloader.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ Licensed to the Apache Software Foundation (ASF) under one
1717
under the License.
1818
*/
1919

20-
import java.net.*;
21-
import java.io.*;
22-
import java.nio.channels.*;
2320
import java.util.Properties;
2421

2522
public class MavenWrapperDownloader {

‎etc/checkstyle/config.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@
5656
<module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck" />
5757

5858
<!-- Imports -->
59+
<module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck" />
60+
<module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStaticImportCheck">
61+
<property name="excludes"
62+
value="org.neo4j.cypherdsl.core.Cypher.*, org.neo4j.cypherdsl.core.Functions.*, org.neo4j.cypherdsl.core.Conditions.*, org.neo4j.cypherdsl.core.Predicates.*, org.apiguardian.api.API.Status.*, org.assertj.core.api.Assertions.*, org.assertj.core.api.Assumptions.*, org.hamcrest.CoreMatchers.*, org.hamcrest.Matchers.*, org.mockito.Mockito.*, org.mockito.ArgumentMatchers.*" />
63+
</module>
5964
<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
6065
<property name="regexp" value="true" />
6166
<property name="illegalPkgs"

‎src/main/java/org/springframework/data/neo4j/core/DefaultNeo4jClient.java‎

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

18-
import static java.util.stream.Collectors.*;
19-
import static org.springframework.data.neo4j.core.Neo4jClient.*;
20-
2118
import java.lang.invoke.MethodHandle;
2219
import java.lang.invoke.MethodHandles;
2320
import java.lang.reflect.InvocationHandler;
@@ -30,6 +27,7 @@
3027
import java.util.function.BiFunction;
3128
import java.util.function.Function;
3229
import java.util.function.Supplier;
30+
import java.util.stream.Collectors;
3331

3432
import org.neo4j.driver.Driver;
3533
import org.neo4j.driver.QueryRunner;
@@ -203,7 +201,7 @@ class DefaultRunnableSpec implements RunnableSpec {
203201
@Override
204202
public RunnableSpecTightToDatabase in(@SuppressWarnings("HiddenField") String targetDatabase) {
205203

206-
this.targetDatabase = verifyDatabaseName(targetDatabase);
204+
this.targetDatabase = Neo4jClient.verifyDatabaseName(targetDatabase);
207205
return this;
208206
}
209207

@@ -317,7 +315,7 @@ public Collection<T> all() {
317315

318316
try (AutoCloseableQueryRunner statementRunner = getQueryRunner(this.targetDatabase)) {
319317
Result result = runnableStatement.runWith(statementRunner);
320-
return result.stream().map(partialMappingFunction(typeSystem)).collect(toList());
318+
return result.stream().map(partialMappingFunction(typeSystem)).collect(Collectors.toList());
321319
} catch (RuntimeException e) {
322320
throw potentiallyConvertRuntimeException(e, persistenceExceptionTranslator);
323321
}
@@ -350,7 +348,7 @@ class DefaultRunnableDelegation<T> implements RunnableDelegation<T>, OngoingDele
350348
@Override
351349
public RunnableDelegation in(@Nullable @SuppressWarnings("HiddenField") String targetDatabase) {
352350

353-
this.targetDatabase = verifyDatabaseName(targetDatabase);
351+
this.targetDatabase = Neo4jClient.verifyDatabaseName(targetDatabase);
354352
return this;
355353
}
356354

‎src/main/java/org/springframework/data/neo4j/core/NamedParameters.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
*/
1616
package org.springframework.data.neo4j.core;
1717

18-
import static java.util.stream.Collectors.*;
19-
2018
import java.util.Collection;
2119
import java.util.Collections;
2220
import java.util.HashMap;
2321
import java.util.Map;
22+
import java.util.stream.Collectors;
2423

2524
import org.apiguardian.api.API;
2625
import org.neo4j.cypherdsl.core.Cypher;
@@ -78,7 +77,7 @@ public boolean isEmpty() {
7877
@Override
7978
public String toString() {
8079
return parameters.entrySet().stream().map(e -> String.format("%s: %s", e.getKey(), formatValue(e.getValue())))
81-
.collect(joining(", ", ":params {", "}"));
80+
.collect(Collectors.joining(", ", ":params {", "}"));
8281
}
8382

8483
private static Object formatValue(Object value) {
@@ -88,9 +87,11 @@ private static Object formatValue(Object value) {
8887
return Cypher.quote((String) value);
8988
} else if (value instanceof Map) {
9089
return ((Map<?, ?>) value).entrySet().stream()
91-
.map(e -> String.format("%s: %s", e.getKey(), formatValue(e.getValue()))).collect(joining(", ", "{", "}"));
90+
.map(e -> String.format("%s: %s", e.getKey(), formatValue(e.getValue()))).collect(
91+
Collectors.joining(", ", "{", "}"));
9292
} else if (value instanceof Collection) {
93-
return ((Collection) value).stream().map(NamedParameters::formatValue).collect(joining(", ", "[", "]"));
93+
return ((Collection) value).stream().map(NamedParameters::formatValue).collect(
94+
Collectors.joining(", ", "[", "]"));
9495
}
9596

9697
return value.toString();

‎src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java‎

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

18-
import static java.util.Collections.*;
19-
import static java.util.stream.Collectors.*;
20-
import static org.neo4j.cypherdsl.core.Cypher.*;
18+
import static org.neo4j.cypherdsl.core.Cypher.asterisk;
19+
import static org.neo4j.cypherdsl.core.Cypher.parameter;
2120

2221
import java.util.ArrayList;
2322
import java.util.Collection;
@@ -26,6 +25,7 @@
2625
import java.util.Map;
2726
import java.util.Optional;
2827
import java.util.function.Function;
28+
import java.util.stream.Collectors;
2929

3030
import org.apache.commons.logging.LogFactory;
3131
import org.apiguardian.api.API;
@@ -116,7 +116,7 @@ public long count(Class<?> domainType) {
116116

117117
@Override
118118
public long count(Statement statement) {
119-
return count(statement, emptyMap());
119+
return count(statement, Collections.emptyMap());
120120
}
121121

122122
@Override
@@ -126,7 +126,7 @@ public long count(Statement statement, Map<String, Object> parameters) {
126126

127127
@Override
128128
public long count(String cypherQuery) {
129-
return count(cypherQuery, emptyMap());
129+
return count(cypherQuery, Collections.emptyMap());
130130
}
131131

132132
@Override
@@ -182,7 +182,8 @@ public <T> Optional<T> findById(Object id, Class<T> domainType) {
182182
Statement statement = cypherGenerator
183183
.prepareMatchOf(entityMetaData, entityMetaData.getIdExpression().isEqualTo(parameter(Constants.NAME_OF_ID)))
184184
.returning(cypherGenerator.createReturnStatementForMatch(entityMetaData)).build();
185-
return createExecutableQuery(domainType, statement, singletonMap(Constants.NAME_OF_ID, convertIdValues(id)))
185+
return createExecutableQuery(domainType, statement, Collections
186+
.singletonMap(Constants.NAME_OF_ID, convertIdValues(id)))
186187
.getSingleResult();
187188
}
188189

@@ -193,7 +194,8 @@ public <T> List<T> findAllById(Iterable<?> ids, Class<T> domainType) {
193194
.prepareMatchOf(entityMetaData, entityMetaData.getIdExpression().in((parameter(Constants.NAME_OF_IDS))))
194195
.returning(cypherGenerator.createReturnStatementForMatch(entityMetaData)).build();
195196

196-
return createExecutableQuery(domainType, statement, singletonMap(Constants.NAME_OF_IDS, convertIdValues(ids)))
197+
return createExecutableQuery(domainType, statement, Collections
198+
.singletonMap(Constants.NAME_OF_IDS, convertIdValues(ids)))
197199
.getResults();
198200
}
199201

@@ -282,14 +284,14 @@ public <T> List<T> saveAll(Iterable<T> instances) {
282284
if (entityMetaData.isUsingInternalIds() || entityMetaData.hasVersionProperty()) {
283285
log.debug("Saving entities using single statements.");
284286

285-
return entities.stream().map(e -> saveImpl(e, databaseName)).collect(toList());
287+
return entities.stream().map(e -> saveImpl(e, databaseName)).collect(Collectors.toList());
286288
}
287289

288-
List<T> entitiesToBeSaved = entities.stream().map(eventSupport::maybeCallBeforeBind).collect(toList());
290+
List<T> entitiesToBeSaved = entities.stream().map(eventSupport::maybeCallBeforeBind).collect(Collectors.toList());
289291

290292
// Save roots
291293
Function<T, Map<String, Object>> binderFunction = neo4jMappingContext.getRequiredBinderFunctionFor(domainClass);
292-
List<Map<String, Object>> entityList = entitiesToBeSaved.stream().map(binderFunction).collect(toList());
294+
List<Map<String, Object>> entityList = entitiesToBeSaved.stream().map(binderFunction).collect(Collectors.toList());
293295
ResultSummary resultSummary = neo4jClient
294296
.query(() -> renderer.render(cypherGenerator.prepareSaveOfMultipleInstancesOf(entityMetaData))).in(databaseName)
295297
.bind(entityList).to(Constants.NAME_OF_ENTITY_LIST_PARAM).run();
@@ -509,7 +511,7 @@ final class DefaultExecutableQuery<T> implements ExecutableQuery<T> {
509511
}
510512

511513
public List<T> getResults() {
512-
return fetchSpec.all().stream().collect(toList());
514+
return fetchSpec.all().stream().collect(Collectors.toList());
513515
}
514516

515517
public Optional<T> getSingleResult() {

‎src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java‎

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

18-
import static java.util.Collections.*;
19-
import static java.util.stream.Collectors.*;
20-
import static org.neo4j.cypherdsl.core.Cypher.*;
18+
import static org.neo4j.cypherdsl.core.Cypher.asterisk;
19+
import static org.neo4j.cypherdsl.core.Cypher.parameter;
2120

2221
import reactor.core.publisher.Flux;
2322
import reactor.core.publisher.Mono;
@@ -30,6 +29,7 @@
3029
import java.util.List;
3130
import java.util.Map;
3231
import java.util.function.Function;
32+
import java.util.stream.Collectors;
3333

3434
import org.apache.commons.logging.LogFactory;
3535
import org.apiguardian.api.API;
@@ -114,7 +114,7 @@ public Mono<Long> count(Class<?> domainType) {
114114

115115
@Override
116116
public Mono<Long> count(Statement statement) {
117-
return count(statement, emptyMap());
117+
return count(statement, Collections.emptyMap());
118118
}
119119

120120
@Override
@@ -124,7 +124,7 @@ public Mono<Long> count(Statement statement, Map<String, Object> parameters) {
124124

125125
@Override
126126
public Mono<Long> count(String cypherQuery) {
127-
return count(cypherQuery, emptyMap());
127+
return count(cypherQuery, Collections.emptyMap());
128128
}
129129

130130
@Override
@@ -184,7 +184,8 @@ public <T> Mono<T> findById(Object id, Class<T> domainType) {
184184
.prepareMatchOf(entityMetaData, entityMetaData.getIdExpression().isEqualTo(parameter(Constants.NAME_OF_ID)))
185185
.returning(cypherGenerator.createReturnStatementForMatch(entityMetaData)).build();
186186

187-
return createExecutableQuery(domainType, statement, singletonMap(Constants.NAME_OF_ID, convertIdValues(id)))
187+
return createExecutableQuery(domainType, statement, Collections
188+
.singletonMap(Constants.NAME_OF_ID, convertIdValues(id)))
188189
.flatMap(ExecutableQuery::getSingleResult);
189190
}
190191

@@ -196,7 +197,8 @@ public <T> Flux<T> findAllById(Iterable<?> ids, Class<T> domainType) {
196197
.prepareMatchOf(entityMetaData, entityMetaData.getIdExpression().in((parameter(Constants.NAME_OF_IDS))))
197198
.returning(cypherGenerator.createReturnStatementForMatch(entityMetaData)).build();
198199

199-
return createExecutableQuery(domainType, statement, singletonMap(Constants.NAME_OF_IDS, convertIdValues(ids)))
200+
return createExecutableQuery(domainType, statement, Collections
201+
.singletonMap(Constants.NAME_OF_IDS, convertIdValues(ids)))
200202
.flatMapMany(ExecutableQuery::getResults);
201203
}
202204

@@ -306,7 +308,7 @@ public <T> Flux<T> saveAll(Iterable<T> instances) {
306308
// flux
307309
// completes
308310
List<Map<String, Object>> boundedEntityList = entitiesToBeSaved.stream().map(binderFunction)
309-
.collect(toList());
311+
.collect(Collectors.toList());
310312

311313
return neo4jClient
312314
.query(() -> renderer.render(cypherGenerator.prepareSaveOfMultipleInstancesOf(entityMetaData)))

‎src/main/java/org/springframework/data/neo4j/core/convert/AdditionalTypes.java‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package org.springframework.data.neo4j.core.convert;
1717

18-
import static org.springframework.data.convert.ConverterBuilder.*;
19-
2018
import java.lang.reflect.Array;
2119
import java.math.BigDecimal;
2220
import java.math.BigInteger;
@@ -41,6 +39,7 @@
4139
import org.springframework.core.convert.converter.ConditionalConverter;
4240
import org.springframework.core.convert.converter.ConverterRegistry;
4341
import org.springframework.core.convert.converter.GenericConverter;
42+
import org.springframework.data.convert.ConverterBuilder;
4443
import org.springframework.data.convert.ReadingConverter;
4544
import org.springframework.data.convert.WritingConverter;
4645
import org.springframework.util.Assert;
@@ -61,33 +60,33 @@ final class AdditionalTypes {
6160
static {
6261

6362
List<Object> hlp = new ArrayList<>();
64-
hlp.add(reading(Value.class, boolean[].class, AdditionalTypes::asBooleanArray).andWriting(Values::value));
65-
hlp.add(reading(Value.class, Byte.class, AdditionalTypes::asByte).andWriting(AdditionalTypes::value));
66-
hlp.add(reading(Value.class, byte.class, AdditionalTypes::asByte).andWriting(AdditionalTypes::value));
67-
hlp.add(reading(Value.class, Character.class, AdditionalTypes::asCharacter).andWriting(Values::value));
68-
hlp.add(reading(Value.class, char.class, AdditionalTypes::asCharacter).andWriting(Values::value));
69-
hlp.add(reading(Value.class, char[].class, AdditionalTypes::asCharArray).andWriting(Values::value));
70-
hlp.add(reading(Value.class, Date.class, AdditionalTypes::asDate).andWriting(AdditionalTypes::value));
71-
hlp.add(reading(Value.class, double[].class, AdditionalTypes::asDoubleArray).andWriting(Values::value));
63+
hlp.add(ConverterBuilder.reading(Value.class, boolean[].class, AdditionalTypes::asBooleanArray).andWriting(Values::value));
64+
hlp.add(ConverterBuilder.reading(Value.class, Byte.class, AdditionalTypes::asByte).andWriting(AdditionalTypes::value));
65+
hlp.add(ConverterBuilder.reading(Value.class, byte.class, AdditionalTypes::asByte).andWriting(AdditionalTypes::value));
66+
hlp.add(ConverterBuilder.reading(Value.class, Character.class, AdditionalTypes::asCharacter).andWriting(Values::value));
67+
hlp.add(ConverterBuilder.reading(Value.class, char.class, AdditionalTypes::asCharacter).andWriting(Values::value));
68+
hlp.add(ConverterBuilder.reading(Value.class, char[].class, AdditionalTypes::asCharArray).andWriting(Values::value));
69+
hlp.add(ConverterBuilder.reading(Value.class, Date.class, AdditionalTypes::asDate).andWriting(AdditionalTypes::value));
70+
hlp.add(ConverterBuilder.reading(Value.class, double[].class, AdditionalTypes::asDoubleArray).andWriting(Values::value));
7271
hlp.add(new EnumConverter());
73-
hlp.add(reading(Value.class, Float.class, AdditionalTypes::asFloat).andWriting(AdditionalTypes::value));
74-
hlp.add(reading(Value.class, float.class, AdditionalTypes::asFloat).andWriting(AdditionalTypes::value));
75-
hlp.add(reading(Value.class, float[].class, AdditionalTypes::asFloatArray).andWriting(AdditionalTypes::value));
76-
hlp.add(reading(Value.class, Integer.class, Value::asInt).andWriting(Values::value));
77-
hlp.add(reading(Value.class, int.class, Value::asInt).andWriting(Values::value));
78-
hlp.add(reading(Value.class, int[].class, AdditionalTypes::asIntArray).andWriting(Values::value));
79-
hlp.add(reading(Value.class, Locale.class, AdditionalTypes::asLocale).andWriting(AdditionalTypes::value));
80-
hlp.add(reading(Value.class, long[].class, AdditionalTypes::asLongArray).andWriting(Values::value));
81-
hlp.add(reading(Value.class, Short.class, AdditionalTypes::asShort).andWriting(AdditionalTypes::value));
82-
hlp.add(reading(Value.class, short.class, AdditionalTypes::asShort).andWriting(AdditionalTypes::value));
83-
hlp.add(reading(Value.class, short[].class, AdditionalTypes::asShortArray).andWriting(AdditionalTypes::value));
84-
hlp.add(reading(Value.class, String[].class, AdditionalTypes::asStringArray).andWriting(Values::value));
85-
hlp.add(reading(Value.class, BigDecimal.class, AdditionalTypes::asBigDecimal).andWriting(AdditionalTypes::value));
86-
hlp.add(reading(Value.class, BigInteger.class, AdditionalTypes::asBigInteger).andWriting(AdditionalTypes::value));
87-
hlp.add(reading(Value.class, TemporalAmount.class, AdditionalTypes::asTemporalAmount)
72+
hlp.add(ConverterBuilder.reading(Value.class, Float.class, AdditionalTypes::asFloat).andWriting(AdditionalTypes::value));
73+
hlp.add(ConverterBuilder.reading(Value.class, float.class, AdditionalTypes::asFloat).andWriting(AdditionalTypes::value));
74+
hlp.add(ConverterBuilder.reading(Value.class, float[].class, AdditionalTypes::asFloatArray).andWriting(AdditionalTypes::value));
75+
hlp.add(ConverterBuilder.reading(Value.class, Integer.class, Value::asInt).andWriting(Values::value));
76+
hlp.add(ConverterBuilder.reading(Value.class, int.class, Value::asInt).andWriting(Values::value));
77+
hlp.add(ConverterBuilder.reading(Value.class, int[].class, AdditionalTypes::asIntArray).andWriting(Values::value));
78+
hlp.add(ConverterBuilder.reading(Value.class, Locale.class, AdditionalTypes::asLocale).andWriting(AdditionalTypes::value));
79+
hlp.add(ConverterBuilder.reading(Value.class, long[].class, AdditionalTypes::asLongArray).andWriting(Values::value));
80+
hlp.add(ConverterBuilder.reading(Value.class, Short.class, AdditionalTypes::asShort).andWriting(AdditionalTypes::value));
81+
hlp.add(ConverterBuilder.reading(Value.class, short.class, AdditionalTypes::asShort).andWriting(AdditionalTypes::value));
82+
hlp.add(ConverterBuilder.reading(Value.class, short[].class, AdditionalTypes::asShortArray).andWriting(AdditionalTypes::value));
83+
hlp.add(ConverterBuilder.reading(Value.class, String[].class, AdditionalTypes::asStringArray).andWriting(Values::value));
84+
hlp.add(ConverterBuilder.reading(Value.class, BigDecimal.class, AdditionalTypes::asBigDecimal).andWriting(AdditionalTypes::value));
85+
hlp.add(ConverterBuilder.reading(Value.class, BigInteger.class, AdditionalTypes::asBigInteger).andWriting(AdditionalTypes::value));
86+
hlp.add(ConverterBuilder.reading(Value.class, TemporalAmount.class, AdditionalTypes::asTemporalAmount)
8887
.andWriting(AdditionalTypes::value));
89-
hlp.add(reading(Value.class, Instant.class, AdditionalTypes::asInstant).andWriting(AdditionalTypes::value));
90-
hlp.add(reading(Value.class, UUID.class, AdditionalTypes::asUUID).andWriting(AdditionalTypes::value));
88+
hlp.add(ConverterBuilder.reading(Value.class, Instant.class, AdditionalTypes::asInstant).andWriting(AdditionalTypes::value));
89+
hlp.add(ConverterBuilder.reading(Value.class, UUID.class, AdditionalTypes::asUUID).andWriting(AdditionalTypes::value));
9190

9291
CONVERTERS = Collections.unmodifiableList(hlp);
9392
}

0 commit comments

Comments
 (0)