Skip to content

Commit cde775c

Browse files
injectivesinjectives
authored
Update to using the local variable type inference (#1447)
1 parent 9bad973 commit cde775c

File tree

146 files changed

+722
-785
lines changed

Some content is hidden

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

146 files changed

+722
-785
lines changed

‎driver/src/main/java/org/neo4j/driver/Config.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ public ConfigBuilder withMaxConnectionPoolSize(int value) {
492492
* @see #withMaxConnectionPoolSize(int)
493493
*/
494494
public ConfigBuilder withConnectionAcquisitionTimeout(long value, TimeUnit unit) {
495-
long valueInMillis = unit.toMillis(value);
495+
var valueInMillis = unit.toMillis(value);
496496
if (value >= 0) {
497497
this.connectionAcquisitionTimeoutMillis = valueInMillis;
498498
} else {
@@ -557,7 +557,7 @@ public ConfigBuilder withTrustStrategy(TrustStrategy trustStrategy) {
557557
* @return this builder
558558
*/
559559
public ConfigBuilder withRoutingTablePurgeDelay(long delay, TimeUnit unit) {
560-
long routingTablePurgeDelayMillis = unit.toMillis(delay);
560+
var routingTablePurgeDelayMillis = unit.toMillis(delay);
561561
if (routingTablePurgeDelayMillis < 0) {
562562
throw new IllegalArgumentException(String.format(
563563
"The routing table purge delay may not be smaller than 0, but was %d %s.", delay, unit));
@@ -605,12 +605,12 @@ public ConfigBuilder withFetchSize(long size) {
605605
* converted to milliseconds.
606606
*/
607607
public ConfigBuilder withConnectionTimeout(long value, TimeUnit unit) {
608-
long connectionTimeoutMillis = unit.toMillis(value);
608+
var connectionTimeoutMillis = unit.toMillis(value);
609609
if (connectionTimeoutMillis < 0) {
610610
throw new IllegalArgumentException(
611611
String.format("The connection timeout may not be smaller than 0, but was %d %s.", value, unit));
612612
}
613-
int connectionTimeoutMillisInt = (int) connectionTimeoutMillis;
613+
var connectionTimeoutMillisInt = (int) connectionTimeoutMillis;
614614
if (connectionTimeoutMillisInt != connectionTimeoutMillis) {
615615
throw new IllegalArgumentException(String.format(
616616
"The connection timeout must represent int value when converted to milliseconds %d.",
@@ -633,7 +633,7 @@ public ConfigBuilder withConnectionTimeout(long value, TimeUnit unit) {
633633
* @throws IllegalArgumentException when given value is negative
634634
*/
635635
public ConfigBuilder withMaxTransactionRetryTime(long value, TimeUnit unit) {
636-
long maxRetryTimeMs = unit.toMillis(value);
636+
var maxRetryTimeMs = unit.toMillis(value);
637637
if (maxRetryTimeMs < 0) {
638638
throw new IllegalArgumentException(
639639
String.format("The max retry time may not be smaller than 0, but was %d %s.", value, unit));

‎driver/src/main/java/org/neo4j/driver/Logging.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public interface Logging {
9292
* @return {@link Logger} instance
9393
*/
9494
default Logger getLog(Class<?> clazz) {
95-
String canonicalName = clazz.getCanonicalName();
95+
var canonicalName = clazz.getCanonicalName();
9696
return getLog(canonicalName != null ? canonicalName : clazz.getName());
9797
}
9898

@@ -111,7 +111,7 @@ default Logger getLog(Class<?> clazz) {
111111
* @throws IllegalStateException if SLF4J is not available.
112112
*/
113113
static Logging slf4j() {
114-
RuntimeException unavailabilityError = Slf4jLogging.checkAvailability();
114+
var unavailabilityError = Slf4jLogging.checkAvailability();
115115
if (unavailabilityError != null) {
116116
throw unavailabilityError;
117117
}

‎driver/src/main/java/org/neo4j/driver/Query.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ public Query withUpdatedParameters(Value updates) {
134134
} else {
135135
Map<String, Value> newParameters = newHashMapWithSize(Math.max(parameters.size(), updates.size()));
136136
newParameters.putAll(parameters.asMap(ofValue()));
137-
for (Map.Entry<String, Value> entry : updates.asMap(ofValue()).entrySet()) {
138-
Value value = entry.getValue();
137+
for (var entry : updates.asMap(ofValue()).entrySet()) {
138+
var value = entry.getValue();
139139
if (value.isNull()) {
140140
newParameters.remove(entry.getKey());
141141
} else {
@@ -155,13 +155,13 @@ public boolean equals(Object o) {
155155
return false;
156156
}
157157

158-
Query query = (Query) o;
158+
var query = (Query) o;
159159
return text.equals(query.text) && parameters.equals(query.parameters);
160160
}
161161

162162
@Override
163163
public int hashCode() {
164-
int result = text.hashCode();
164+
var result = text.hashCode();
165165
result = 31 * result + parameters.hashCode();
166166
return result;
167167
}

‎driver/src/main/java/org/neo4j/driver/QueryConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public Optional<BookmarkManager> bookmarkManager(BookmarkManager defaultBookmark
125125
public boolean equals(Object o) {
126126
if (this == o) return true;
127127
if (o == null || getClass() != o.getClass()) return false;
128-
QueryConfig that = (QueryConfig) o;
128+
var that = (QueryConfig) o;
129129
return useDefaultBookmarkManager == that.useDefaultBookmarkManager
130130
&& routing == that.routing
131131
&& Objects.equals(database, that.database)

‎driver/src/main/java/org/neo4j/driver/SessionConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public boolean equals(Object o) {
182182
if (o == null || getClass() != o.getClass()) {
183183
return false;
184184
}
185-
SessionConfig that = (SessionConfig) o;
185+
var that = (SessionConfig) o;
186186
return Objects.equals(bookmarks, that.bookmarks)
187187
&& defaultAccessMode == that.defaultAccessMode
188188
&& Objects.equals(database, that.database)

‎driver/src/main/java/org/neo4j/driver/TransactionConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public Duration timeout() {
119119
* @return metadata or empty map when it is not configured.
120120
*/
121121
public Map<String, Value> metadata() {
122-
Map<String, Value> result = this.convertedMetadata;
122+
var result = this.convertedMetadata;
123123
if (result == null) {
124124
synchronized (this) {
125125
result = this.convertedMetadata;
@@ -149,7 +149,7 @@ public boolean equals(Object o) {
149149
if (o == null || getClass() != o.getClass()) {
150150
return false;
151151
}
152-
TransactionConfig that = (TransactionConfig) o;
152+
var that = (TransactionConfig) o;
153153
return Objects.equals(timeout, that.timeout) && Objects.equals(metadata, that.metadata);
154154
}
155155

‎driver/src/main/java/org/neo4j/driver/Values.java

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ public static Value value(Object value) {
223223
* @return the array of values
224224
*/
225225
public static Value[] values(final Object... input) {
226-
Value[] values = new Value[input.length];
227-
for (int i = 0; i < input.length; i++) {
226+
var values = new Value[input.length];
227+
for (var i = 0; i < input.length; i++) {
228228
values[i] = value(input[i]);
229229
}
230230
return values;
@@ -236,8 +236,8 @@ public static Value[] values(final Object... input) {
236236
* @return the value
237237
*/
238238
public static Value value(Value... input) {
239-
int size = input.length;
240-
Value[] values = new Value[size];
239+
var size = input.length;
240+
var values = new Value[size];
241241
System.arraycopy(input, 0, values, 0, size);
242242
return new ListValue(values);
243243
}
@@ -257,8 +257,8 @@ public static Value value(byte... input) {
257257
* @return the value
258258
*/
259259
public static Value value(String... input) {
260-
StringValue[] values = new StringValue[input.length];
261-
for (int i = 0; i < input.length; i++) {
260+
var values = new StringValue[input.length];
261+
for (var i = 0; i < input.length; i++) {
262262
values[i] = new StringValue(input[i]);
263263
}
264264
return new ListValue(values);
@@ -270,8 +270,8 @@ public static Value value(String... input) {
270270
* @return the value
271271
*/
272272
public static Value value(boolean... input) {
273-
Value[] values = new Value[input.length];
274-
for (int i = 0; i < input.length; i++) {
273+
var values = new Value[input.length];
274+
for (var i = 0; i < input.length; i++) {
275275
values[i] = value(input[i]);
276276
}
277277
return new ListValue(values);
@@ -283,8 +283,8 @@ public static Value value(boolean... input) {
283283
* @return the value
284284
*/
285285
public static Value value(char... input) {
286-
Value[] values = new Value[input.length];
287-
for (int i = 0; i < input.length; i++) {
286+
var values = new Value[input.length];
287+
for (var i = 0; i < input.length; i++) {
288288
values[i] = value(input[i]);
289289
}
290290
return new ListValue(values);
@@ -296,8 +296,8 @@ public static Value value(char... input) {
296296
* @return the value
297297
*/
298298
public static Value value(long... input) {
299-
Value[] values = new Value[input.length];
300-
for (int i = 0; i < input.length; i++) {
299+
var values = new Value[input.length];
300+
for (var i = 0; i < input.length; i++) {
301301
values[i] = value(input[i]);
302302
}
303303
return new ListValue(values);
@@ -309,8 +309,8 @@ public static Value value(long... input) {
309309
* @return the value
310310
*/
311311
public static Value value(short... input) {
312-
Value[] values = new Value[input.length];
313-
for (int i = 0; i < input.length; i++) {
312+
var values = new Value[input.length];
313+
for (var i = 0; i < input.length; i++) {
314314
values[i] = value(input[i]);
315315
}
316316
return new ListValue(values);
@@ -321,8 +321,8 @@ public static Value value(short... input) {
321321
* @return the value
322322
*/
323323
public static Value value(int... input) {
324-
Value[] values = new Value[input.length];
325-
for (int i = 0; i < input.length; i++) {
324+
var values = new Value[input.length];
325+
for (var i = 0; i < input.length; i++) {
326326
values[i] = value(input[i]);
327327
}
328328
return new ListValue(values);
@@ -333,8 +333,8 @@ public static Value value(int... input) {
333333
* @return the value
334334
*/
335335
public static Value value(double... input) {
336-
Value[] values = new Value[input.length];
337-
for (int i = 0; i < input.length; i++) {
336+
var values = new Value[input.length];
337+
for (var i = 0; i < input.length; i++) {
338338
values[i] = value(input[i]);
339339
}
340340
return new ListValue(values);
@@ -346,8 +346,8 @@ public static Value value(double... input) {
346346
* @return the value
347347
*/
348348
public static Value value(float... input) {
349-
Value[] values = new Value[input.length];
350-
for (int i = 0; i < input.length; i++) {
349+
var values = new Value[input.length];
350+
for (var i = 0; i < input.length; i++) {
351351
values[i] = value(input[i]);
352352
}
353353
return new ListValue(values);
@@ -359,9 +359,9 @@ public static Value value(float... input) {
359359
* @return the value
360360
*/
361361
public static Value value(List<Object> vals) {
362-
Value[] values = new Value[vals.size()];
363-
int i = 0;
364-
for (Object val : vals) {
362+
var values = new Value[vals.size()];
363+
var i = 0;
364+
for (var val : vals) {
365365
values[i++] = value(val);
366366
}
367367
return new ListValue(values);
@@ -395,7 +395,7 @@ public static Value value(Iterator<Object> val) {
395395
* @return the value
396396
*/
397397
public static Value value(Stream<Object> stream) {
398-
Value[] values = stream.map(Values::value).toArray(Value[]::new);
398+
var values = stream.map(Values::value).toArray(Value[]::new);
399399
return new ListValue(values);
400400
}
401401

@@ -460,7 +460,7 @@ public static Value value(final boolean val) {
460460
*/
461461
public static Value value(final Map<String, Object> val) {
462462
Map<String, Value> asValues = newHashMapWithSize(val.size());
463-
for (Map.Entry<String, Object> entry : val.entrySet()) {
463+
for (var entry : val.entrySet()) {
464464
asValues.put(entry.getKey(), value(entry.getValue()));
465465
}
466466
return new MapValue(asValues);
@@ -619,8 +619,8 @@ public static Value parameters(Object... keysAndValues) {
619619
+ ".");
620620
}
621621
HashMap<String, Value> map = newHashMapWithSize(keysAndValues.length / 2);
622-
for (int i = 0; i < keysAndValues.length; i += 2) {
623-
Object value = keysAndValues[i + 1];
622+
for (var i = 0; i < keysAndValues.length; i += 2) {
623+
var value = keysAndValues[i + 1];
624624
assertParameter(value);
625625
map.put(keysAndValues[i].toString(), value(value));
626626
}

‎driver/src/main/java/org/neo4j/driver/internal/BoltServerAddress.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public boolean equals(Object o) {
7474
if (o == null || getClass() != o.getClass()) {
7575
return false;
7676
}
77-
BoltServerAddress address = (BoltServerAddress) o;
77+
var address = (BoltServerAddress) o;
7878
return port == address.port && host.equals(address.host) && connectionHost.equals(address.connectionHost);
7979
}
8080

@@ -114,23 +114,23 @@ public Stream<BoltServerAddress> unicastStream() {
114114
}
115115

116116
private static String hostFrom(URI uri) {
117-
String host = uri.getHost();
117+
var host = uri.getHost();
118118
if (host == null) {
119119
throw invalidAddressFormat(uri);
120120
}
121121
return host;
122122
}
123123

124124
private static int portFrom(URI uri) {
125-
int port = uri.getPort();
125+
var port = uri.getPort();
126126
return port == -1 ? DEFAULT_PORT : port;
127127
}
128128

129129
private static URI uriFrom(String address) {
130130
String scheme;
131131
String hostPort;
132132

133-
String[] schemeSplit = address.split("://");
133+
var schemeSplit = address.split("://");
134134
if (schemeSplit.length == 1) {
135135
// URI can't parse addresses without scheme, prepend fake "bolt://" to reuse the parsing facility
136136
scheme = "bolt://";
@@ -151,7 +151,7 @@ private static String hostPortFrom(String address) {
151151
return address;
152152
}
153153

154-
boolean containsSingleColon = address.indexOf(":") == address.lastIndexOf(":");
154+
var containsSingleColon = address.indexOf(":") == address.lastIndexOf(":");
155155
if (containsSingleColon) {
156156
// expected to be an IPv4 address with or without port like 127.0.0.1 or 127.0.0.1:7687
157157
return address;

‎driver/src/main/java/org/neo4j/driver/internal/DirectConnectionProvider.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import static org.neo4j.driver.internal.async.ConnectionContext.PENDING_DATABASE_NAME_EXCEPTION_SUPPLIER;
2222

23-
import java.util.concurrent.CompletableFuture;
2423
import java.util.concurrent.CompletionStage;
2524
import java.util.function.Function;
2625
import org.neo4j.driver.AuthToken;
@@ -47,7 +46,7 @@ public class DirectConnectionProvider implements ConnectionProvider {
4746

4847
@Override
4948
public CompletionStage<Connection> acquireConnection(ConnectionContext context) {
50-
CompletableFuture<DatabaseName> databaseNameFuture = context.databaseNameFuture();
49+
var databaseNameFuture = context.databaseNameFuture();
5150
databaseNameFuture.complete(DatabaseNameUtil.defaultDatabase());
5251
return acquirePooledConnection(context.overrideAuthToken())
5352
.thenApply(connection -> new DirectConnection(

0 commit comments

Comments
 (0)