Skip to content

Update to using the local variable type inference #1447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 7, 2023
Merged

Update to using the local variable type inference #1447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions driver/src/main/java/org/neo4j/driver/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ public ConfigBuilder withMaxConnectionPoolSize(int value) {
* @see #withMaxConnectionPoolSize(int)
*/
public ConfigBuilder withConnectionAcquisitionTimeout(long value, TimeUnit unit) {
long valueInMillis = unit.toMillis(value);
var valueInMillis = unit.toMillis(value);
if (value >= 0) {
this.connectionAcquisitionTimeoutMillis = valueInMillis;
} else {
Expand Down Expand Up @@ -557,7 +557,7 @@ public ConfigBuilder withTrustStrategy(TrustStrategy trustStrategy) {
* @return this builder
*/
public ConfigBuilder withRoutingTablePurgeDelay(long delay, TimeUnit unit) {
long routingTablePurgeDelayMillis = unit.toMillis(delay);
var routingTablePurgeDelayMillis = unit.toMillis(delay);
if (routingTablePurgeDelayMillis < 0) {
throw new IllegalArgumentException(String.format(
"The routing table purge delay may not be smaller than 0, but was %d %s.", delay, unit));
Expand Down Expand Up @@ -605,12 +605,12 @@ public ConfigBuilder withFetchSize(long size) {
* converted to milliseconds.
*/
public ConfigBuilder withConnectionTimeout(long value, TimeUnit unit) {
long connectionTimeoutMillis = unit.toMillis(value);
var connectionTimeoutMillis = unit.toMillis(value);
if (connectionTimeoutMillis < 0) {
throw new IllegalArgumentException(
String.format("The connection timeout may not be smaller than 0, but was %d %s.", value, unit));
}
int connectionTimeoutMillisInt = (int) connectionTimeoutMillis;
var connectionTimeoutMillisInt = (int) connectionTimeoutMillis;
if (connectionTimeoutMillisInt != connectionTimeoutMillis) {
throw new IllegalArgumentException(String.format(
"The connection timeout must represent int value when converted to milliseconds %d.",
Expand All @@ -633,7 +633,7 @@ public ConfigBuilder withConnectionTimeout(long value, TimeUnit unit) {
* @throws IllegalArgumentException when given value is negative
*/
public ConfigBuilder withMaxTransactionRetryTime(long value, TimeUnit unit) {
long maxRetryTimeMs = unit.toMillis(value);
var maxRetryTimeMs = unit.toMillis(value);
if (maxRetryTimeMs < 0) {
throw new IllegalArgumentException(
String.format("The max retry time may not be smaller than 0, but was %d %s.", value, unit));
Expand Down
4 changes: 2 additions & 2 deletions driver/src/main/java/org/neo4j/driver/Logging.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public interface Logging {
* @return {@link Logger} instance
*/
default Logger getLog(Class<?> clazz) {
String canonicalName = clazz.getCanonicalName();
var canonicalName = clazz.getCanonicalName();
return getLog(canonicalName != null ? canonicalName : clazz.getName());
}

Expand All @@ -111,7 +111,7 @@ default Logger getLog(Class<?> clazz) {
* @throws IllegalStateException if SLF4J is not available.
*/
static Logging slf4j() {
RuntimeException unavailabilityError = Slf4jLogging.checkAvailability();
var unavailabilityError = Slf4jLogging.checkAvailability();
if (unavailabilityError != null) {
throw unavailabilityError;
}
Expand Down
8 changes: 4 additions & 4 deletions driver/src/main/java/org/neo4j/driver/Query.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ public Query withUpdatedParameters(Value updates) {
} else {
Map<String, Value> newParameters = newHashMapWithSize(Math.max(parameters.size(), updates.size()));
newParameters.putAll(parameters.asMap(ofValue()));
for (Map.Entry<String, Value> entry : updates.asMap(ofValue()).entrySet()) {
Value value = entry.getValue();
for (var entry : updates.asMap(ofValue()).entrySet()) {
var value = entry.getValue();
if (value.isNull()) {
newParameters.remove(entry.getKey());
} else {
Expand All @@ -155,13 +155,13 @@ public boolean equals(Object o) {
return false;
}

Query query = (Query) o;
var query = (Query) o;
return text.equals(query.text) && parameters.equals(query.parameters);
}

@Override
public int hashCode() {
int result = text.hashCode();
var result = text.hashCode();
result = 31 * result + parameters.hashCode();
return result;
}
Expand Down
2 changes: 1 addition & 1 deletion driver/src/main/java/org/neo4j/driver/QueryConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public Optional<BookmarkManager> bookmarkManager(BookmarkManager defaultBookmark
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
QueryConfig that = (QueryConfig) o;
var that = (QueryConfig) o;
return useDefaultBookmarkManager == that.useDefaultBookmarkManager
&& routing == that.routing
&& Objects.equals(database, that.database)
Expand Down
2 changes: 1 addition & 1 deletion driver/src/main/java/org/neo4j/driver/SessionConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public boolean equals(Object o) {
if (o == null || getClass() != o.getClass()) {
return false;
}
SessionConfig that = (SessionConfig) o;
var that = (SessionConfig) o;
return Objects.equals(bookmarks, that.bookmarks)
&& defaultAccessMode == that.defaultAccessMode
&& Objects.equals(database, that.database)
Expand Down
4 changes: 2 additions & 2 deletions driver/src/main/java/org/neo4j/driver/TransactionConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public Duration timeout() {
* @return metadata or empty map when it is not configured.
*/
public Map<String, Value> metadata() {
Map<String, Value> result = this.convertedMetadata;
var result = this.convertedMetadata;
if (result == null) {
synchronized (this) {
result = this.convertedMetadata;
Expand Down Expand Up @@ -149,7 +149,7 @@ public boolean equals(Object o) {
if (o == null || getClass() != o.getClass()) {
return false;
}
TransactionConfig that = (TransactionConfig) o;
var that = (TransactionConfig) o;
return Objects.equals(timeout, that.timeout) && Objects.equals(metadata, that.metadata);
}

Expand Down
54 changes: 27 additions & 27 deletions driver/src/main/java/org/neo4j/driver/Values.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ public static Value value(Object value) {
* @return the array of values
*/
public static Value[] values(final Object... input) {
Value[] values = new Value[input.length];
for (int i = 0; i < input.length; i++) {
var values = new Value[input.length];
for (var i = 0; i < input.length; i++) {
values[i] = value(input[i]);
}
return values;
Expand All @@ -236,8 +236,8 @@ public static Value[] values(final Object... input) {
* @return the value
*/
public static Value value(Value... input) {
int size = input.length;
Value[] values = new Value[size];
var size = input.length;
var values = new Value[size];
System.arraycopy(input, 0, values, 0, size);
return new ListValue(values);
}
Expand All @@ -257,8 +257,8 @@ public static Value value(byte... input) {
* @return the value
*/
public static Value value(String... input) {
StringValue[] values = new StringValue[input.length];
for (int i = 0; i < input.length; i++) {
var values = new StringValue[input.length];
for (var i = 0; i < input.length; i++) {
values[i] = new StringValue(input[i]);
}
return new ListValue(values);
Expand All @@ -270,8 +270,8 @@ public static Value value(String... input) {
* @return the value
*/
public static Value value(boolean... input) {
Value[] values = new Value[input.length];
for (int i = 0; i < input.length; i++) {
var values = new Value[input.length];
for (var i = 0; i < input.length; i++) {
values[i] = value(input[i]);
}
return new ListValue(values);
Expand All @@ -283,8 +283,8 @@ public static Value value(boolean... input) {
* @return the value
*/
public static Value value(char... input) {
Value[] values = new Value[input.length];
for (int i = 0; i < input.length; i++) {
var values = new Value[input.length];
for (var i = 0; i < input.length; i++) {
values[i] = value(input[i]);
}
return new ListValue(values);
Expand All @@ -296,8 +296,8 @@ public static Value value(char... input) {
* @return the value
*/
public static Value value(long... input) {
Value[] values = new Value[input.length];
for (int i = 0; i < input.length; i++) {
var values = new Value[input.length];
for (var i = 0; i < input.length; i++) {
values[i] = value(input[i]);
}
return new ListValue(values);
Expand All @@ -309,8 +309,8 @@ public static Value value(long... input) {
* @return the value
*/
public static Value value(short... input) {
Value[] values = new Value[input.length];
for (int i = 0; i < input.length; i++) {
var values = new Value[input.length];
for (var i = 0; i < input.length; i++) {
values[i] = value(input[i]);
}
return new ListValue(values);
Expand All @@ -321,8 +321,8 @@ public static Value value(short... input) {
* @return the value
*/
public static Value value(int... input) {
Value[] values = new Value[input.length];
for (int i = 0; i < input.length; i++) {
var values = new Value[input.length];
for (var i = 0; i < input.length; i++) {
values[i] = value(input[i]);
}
return new ListValue(values);
Expand All @@ -333,8 +333,8 @@ public static Value value(int... input) {
* @return the value
*/
public static Value value(double... input) {
Value[] values = new Value[input.length];
for (int i = 0; i < input.length; i++) {
var values = new Value[input.length];
for (var i = 0; i < input.length; i++) {
values[i] = value(input[i]);
}
return new ListValue(values);
Expand All @@ -346,8 +346,8 @@ public static Value value(double... input) {
* @return the value
*/
public static Value value(float... input) {
Value[] values = new Value[input.length];
for (int i = 0; i < input.length; i++) {
var values = new Value[input.length];
for (var i = 0; i < input.length; i++) {
values[i] = value(input[i]);
}
return new ListValue(values);
Expand All @@ -359,9 +359,9 @@ public static Value value(float... input) {
* @return the value
*/
public static Value value(List<Object> vals) {
Value[] values = new Value[vals.size()];
int i = 0;
for (Object val : vals) {
var values = new Value[vals.size()];
var i = 0;
for (var val : vals) {
values[i++] = value(val);
}
return new ListValue(values);
Expand Down Expand Up @@ -395,7 +395,7 @@ public static Value value(Iterator<Object> val) {
* @return the value
*/
public static Value value(Stream<Object> stream) {
Value[] values = stream.map(Values::value).toArray(Value[]::new);
var values = stream.map(Values::value).toArray(Value[]::new);
return new ListValue(values);
}

Expand Down Expand Up @@ -460,7 +460,7 @@ public static Value value(final boolean val) {
*/
public static Value value(final Map<String, Object> val) {
Map<String, Value> asValues = newHashMapWithSize(val.size());
for (Map.Entry<String, Object> entry : val.entrySet()) {
for (var entry : val.entrySet()) {
asValues.put(entry.getKey(), value(entry.getValue()));
}
return new MapValue(asValues);
Expand Down Expand Up @@ -619,8 +619,8 @@ public static Value parameters(Object... keysAndValues) {
+ ".");
}
HashMap<String, Value> map = newHashMapWithSize(keysAndValues.length / 2);
for (int i = 0; i < keysAndValues.length; i += 2) {
Object value = keysAndValues[i + 1];
for (var i = 0; i < keysAndValues.length; i += 2) {
var value = keysAndValues[i + 1];
assertParameter(value);
map.put(keysAndValues[i].toString(), value(value));
}
Expand Down
10 changes: 5 additions & 5 deletions driver/src/main/java/org/neo4j/driver/internal/BoltServerAddress.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public boolean equals(Object o) {
if (o == null || getClass() != o.getClass()) {
return false;
}
BoltServerAddress address = (BoltServerAddress) o;
var address = (BoltServerAddress) o;
return port == address.port && host.equals(address.host) && connectionHost.equals(address.connectionHost);
}

Expand Down Expand Up @@ -114,23 +114,23 @@ public Stream<BoltServerAddress> unicastStream() {
}

private static String hostFrom(URI uri) {
String host = uri.getHost();
var host = uri.getHost();
if (host == null) {
throw invalidAddressFormat(uri);
}
return host;
}

private static int portFrom(URI uri) {
int port = uri.getPort();
var port = uri.getPort();
return port == -1 ? DEFAULT_PORT : port;
}

private static URI uriFrom(String address) {
String scheme;
String hostPort;

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

boolean containsSingleColon = address.indexOf(":") == address.lastIndexOf(":");
var containsSingleColon = address.indexOf(":") == address.lastIndexOf(":");
if (containsSingleColon) {
// expected to be an IPv4 address with or without port like 127.0.0.1 or 127.0.0.1:7687
return address;
Expand Down
3 changes: 1 addition & 2 deletions driver/src/main/java/org/neo4j/driver/internal/DirectConnectionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

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

import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.function.Function;
import org.neo4j.driver.AuthToken;
Expand All @@ -47,7 +46,7 @@ public class DirectConnectionProvider implements ConnectionProvider {

@Override
public CompletionStage<Connection> acquireConnection(ConnectionContext context) {
CompletableFuture<DatabaseName> databaseNameFuture = context.databaseNameFuture();
var databaseNameFuture = context.databaseNameFuture();
databaseNameFuture.complete(DatabaseNameUtil.defaultDatabase());
return acquirePooledConnection(context.overrideAuthToken())
.thenApply(connection -> new DirectConnection(
Expand Down
Loading