Skip to content

Commit 3a1085e

Browse files
committed
#48 - Polishing.
Formatting.
1 parent 836c5b4 commit 3a1085e

File tree

1 file changed

+23
-26
lines changed

1 file changed

+23
-26
lines changed

src/main/java/org/springframework/data/r2dbc/function/DefaultDatabaseClient.java

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor {
8080
private final DefaultDatabaseClientBuilder builder;
8181

8282
DefaultDatabaseClient(ConnectionFactory connector, R2dbcExceptionTranslator exceptionTranslator,
83-
ReactiveDataAccessStrategy dataAccessStrategy, DefaultDatabaseClientBuilder builder) {
83+
ReactiveDataAccessStrategy dataAccessStrategy, DefaultDatabaseClientBuilder builder) {
8484

8585
this.connector = connector;
8686
this.exceptionTranslator = exceptionTranslator;
@@ -201,15 +201,15 @@ protected ConnectionFactory obtainConnectionFactory() {
201201
*/
202202
protected Connection createConnectionProxy(Connection con) {
203203
return (Connection) Proxy.newProxyInstance(ConnectionProxy.class.getClassLoader(),
204-
new Class<?>[]{ConnectionProxy.class}, new CloseSuppressingInvocationHandler(con));
204+
new Class<?>[] { ConnectionProxy.class }, new CloseSuppressingInvocationHandler(con));
205205
}
206206

207207
/**
208208
* Translate the given {@link R2dbcException} into a generic {@link DataAccessException}.
209209
*
210210
* @param task readable text describing the task being attempted.
211-
* @param sql SQL query or update that caused the problem (may be {@literal null}).
212-
* @param ex the offending {@link R2dbcException}.
211+
* @param sql SQL query or update that caused the problem (may be {@literal null}).
212+
* @param ex the offending {@link R2dbcException}.
213213
* @return a DataAccessException wrapping the {@link R2dbcException} (never {@literal null}).
214214
*/
215215
protected DataAccessException translateException(String task, @Nullable String sql, R2dbcException ex) {
@@ -222,24 +222,24 @@ protected DataAccessException translateException(String task, @Nullable String s
222222
* Customization hook.
223223
*/
224224
protected <T> DefaultTypedExecuteSpec<T> createTypedExecuteSpec(Map<Integer, SettableValue> byIndex,
225-
Map<String, SettableValue> byName, Supplier<String> sqlSupplier, Class<T> typeToRead) {
225+
Map<String, SettableValue> byName, Supplier<String> sqlSupplier, Class<T> typeToRead) {
226226
return new DefaultTypedExecuteSpec<>(byIndex, byName, sqlSupplier, typeToRead);
227227
}
228228

229229
/**
230230
* Customization hook.
231231
*/
232232
protected <T> DefaultTypedExecuteSpec<T> createTypedExecuteSpec(Map<Integer, SettableValue> byIndex,
233-
Map<String, SettableValue> byName, Supplier<String> sqlSupplier,
234-
BiFunction<Row, RowMetadata, T> mappingFunction) {
233+
Map<String, SettableValue> byName, Supplier<String> sqlSupplier,
234+
BiFunction<Row, RowMetadata, T> mappingFunction) {
235235
return new DefaultTypedExecuteSpec<>(byIndex, byName, sqlSupplier, mappingFunction);
236236
}
237237

238238
/**
239239
* Customization hook.
240240
*/
241241
protected ExecuteSpecSupport createGenericExecuteSpec(Map<Integer, SettableValue> byIndex,
242-
Map<String, SettableValue> byName, Supplier<String> sqlSupplier) {
242+
Map<String, SettableValue> byName, Supplier<String> sqlSupplier) {
243243
return new DefaultGenericExecuteSpec(byIndex, byName, sqlSupplier);
244244
}
245245

@@ -251,7 +251,7 @@ protected DefaultGenericExecuteSpec createGenericExecuteSpec(Supplier<String> sq
251251
}
252252

253253
private static void doBind(Statement<?> statement, Map<String, SettableValue> byName,
254-
Map<Integer, SettableValue> byIndex) {
254+
Map<Integer, SettableValue> byIndex) {
255255

256256
byIndex.forEach((i, o) -> {
257257

@@ -377,7 +377,7 @@ public ExecuteSpecSupport bindNull(String name, Class<?> type) {
377377
}
378378

379379
protected ExecuteSpecSupport createInstance(Map<Integer, SettableValue> byIndex, Map<String, SettableValue> byName,
380-
Supplier<String> sqlSupplier) {
380+
Supplier<String> sqlSupplier) {
381381
return new ExecuteSpecSupport(byIndex, byName, sqlSupplier);
382382
}
383383

@@ -395,7 +395,7 @@ public ExecuteSpecSupport bind(Object bean) {
395395
protected class DefaultGenericExecuteSpec extends ExecuteSpecSupport implements GenericExecuteSpec {
396396

397397
DefaultGenericExecuteSpec(Map<Integer, SettableValue> byIndex, Map<String, SettableValue> byName,
398-
Supplier<String> sqlSupplier) {
398+
Supplier<String> sqlSupplier) {
399399
super(byIndex, byName, sqlSupplier);
400400
}
401401

@@ -456,7 +456,7 @@ public DefaultGenericExecuteSpec bind(Object bean) {
456456

457457
@Override
458458
protected ExecuteSpecSupport createInstance(Map<Integer, SettableValue> byIndex, Map<String, SettableValue> byName,
459-
Supplier<String> sqlSupplier) {
459+
Supplier<String> sqlSupplier) {
460460
return createGenericExecuteSpec(byIndex, byName, sqlSupplier);
461461
}
462462
}
@@ -471,7 +471,7 @@ protected class DefaultTypedExecuteSpec<T> extends ExecuteSpecSupport implements
471471
private final BiFunction<Row, RowMetadata, T> mappingFunction;
472472

473473
DefaultTypedExecuteSpec(Map<Integer, SettableValue> byIndex, Map<String, SettableValue> byName,
474-
Supplier<String> sqlSupplier, Class<T> typeToRead) {
474+
Supplier<String> sqlSupplier, Class<T> typeToRead) {
475475

476476
super(byIndex, byName, sqlSupplier);
477477

@@ -480,7 +480,7 @@ protected class DefaultTypedExecuteSpec<T> extends ExecuteSpecSupport implements
480480
}
481481

482482
DefaultTypedExecuteSpec(Map<Integer, SettableValue> byIndex, Map<String, SettableValue> byName,
483-
Supplier<String> sqlSupplier, BiFunction<Row, RowMetadata, T> mappingFunction) {
483+
Supplier<String> sqlSupplier, BiFunction<Row, RowMetadata, T> mappingFunction) {
484484

485485
super(byIndex, byName, sqlSupplier);
486486

@@ -541,7 +541,7 @@ public DefaultTypedExecuteSpec<T> bind(Object bean) {
541541

542542
@Override
543543
protected DefaultTypedExecuteSpec<T> createInstance(Map<Integer, SettableValue> byIndex,
544-
Map<String, SettableValue> byName, Supplier<String> sqlSupplier) {
544+
Map<String, SettableValue> byName, Supplier<String> sqlSupplier) {
545545
return createTypedExecuteSpec(byIndex, byName, sqlSupplier, typeToRead);
546546
}
547547
}
@@ -628,7 +628,7 @@ <R> FetchSpec<R> execute(String sql, BiFunction<Row, RowMetadata, R> mappingFunc
628628
}
629629

630630
protected abstract DefaultSelectSpecSupport createInstance(String table, List<String> projectedFields, Sort sort,
631-
Pageable page);
631+
Pageable page);
632632
}
633633

634634
private class DefaultGenericSelectSpec extends DefaultSelectSpecSupport implements GenericSelectSpec {
@@ -695,7 +695,7 @@ private <R> FetchSpec<R> exchange(BiFunction<Row, RowMetadata, R> mappingFunctio
695695

696696
@Override
697697
protected DefaultGenericSelectSpec createInstance(String table, List<String> projectedFields, Sort sort,
698-
Pageable page) {
698+
Pageable page) {
699699
return new DefaultGenericSelectSpec(table, projectedFields, sort, page);
700700
}
701701
}
@@ -706,8 +706,7 @@ protected DefaultGenericSelectSpec createInstance(String table, List<String> pro
706706
@SuppressWarnings("unchecked")
707707
private class DefaultTypedSelectSpec<T> extends DefaultSelectSpecSupport implements TypedSelectSpec<T> {
708708

709-
private final @Nullable
710-
Class<T> typeToRead;
709+
private final @Nullable Class<T> typeToRead;
711710
private final BiFunction<Row, RowMetadata, T> mappingFunction;
712711

713712
DefaultTypedSelectSpec(Class<T> typeToRead) {
@@ -719,12 +718,12 @@ private class DefaultTypedSelectSpec<T> extends DefaultSelectSpecSupport impleme
719718
}
720719

721720
DefaultTypedSelectSpec(String table, List<String> projectedFields, Sort sort, Pageable page,
722-
BiFunction<Row, RowMetadata, T> mappingFunction) {
721+
BiFunction<Row, RowMetadata, T> mappingFunction) {
723722
this(table, projectedFields, sort, page, null, mappingFunction);
724723
}
725724

726725
DefaultTypedSelectSpec(String table, List<String> projectedFields, Sort sort, Pageable page, Class<T> typeToRead,
727-
BiFunction<Row, RowMetadata, T> mappingFunction) {
726+
BiFunction<Row, RowMetadata, T> mappingFunction) {
728727
super(table, projectedFields, sort, page);
729728
this.typeToRead = typeToRead;
730729
this.mappingFunction = mappingFunction;
@@ -784,7 +783,7 @@ private <R> FetchSpec<R> exchange(BiFunction<Row, RowMetadata, R> mappingFunctio
784783

785784
@Override
786785
protected DefaultTypedSelectSpec<T> createInstance(String table, List<String> projectedFields, Sort sort,
787-
Pageable page) {
786+
Pageable page) {
788787
return new DefaultTypedSelectSpec<>(table, projectedFields, sort, page, typeToRead, mappingFunction);
789788
}
790789
}
@@ -1022,8 +1021,7 @@ private static <T> Flux<T> doInConnectionMany(Connection connection, Function<Co
10221021
} catch (R2dbcException e) {
10231022

10241023
String sql = getSql(action);
1025-
return Flux.error(new UncategorizedR2dbcException("doInConnectionMany", sql, e) {
1026-
});
1024+
return Flux.error(new UncategorizedR2dbcException("doInConnectionMany", sql, e));
10271025
}
10281026
}
10291027

@@ -1034,8 +1032,7 @@ private static <T> Mono<T> doInConnection(Connection connection, Function<Connec
10341032
} catch (R2dbcException e) {
10351033

10361034
String sql = getSql(action);
1037-
return Mono.error(new UncategorizedR2dbcException("doInConnection", sql, e) {
1038-
});
1035+
return Mono.error(new UncategorizedR2dbcException("doInConnection", sql, e));
10391036
}
10401037
}
10411038

0 commit comments

Comments
 (0)