Skip to content

Commit b71e3b9

Browse files
committed
Polishing.
Refine name and visibility of runtime hints registrars. See #1279 see #1269
1 parent 70eca3a commit b71e3b9

File tree

6 files changed

+19
-17
lines changed

6 files changed

+19
-17
lines changed

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/aot/DataJdbcRuntimeHints.java renamed to spring-data-jdbc/src/main/java/org/springframework/data/jdbc/aot/JdbcRuntimeHintsRegistrar.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@
3232
import org.springframework.lang.Nullable;
3333

3434
/**
35+
* {@link RuntimeHintsRegistrar} for JDBC.
36+
*
3537
* @author Christoph Strobl
3638
* @since 3.0
3739
*/
38-
public class DataJdbcRuntimeHints implements RuntimeHintsRegistrar {
40+
class JdbcRuntimeHintsRegistrar implements RuntimeHintsRegistrar {
3941

4042
@Override
4143
public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfiguration.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,9 @@ public JdbcMappingContext jdbcMappingContext(Optional<NamingStrategy> namingStra
123123

124124
/**
125125
* Creates a {@link RelationalConverter} using the configured
126-
* {@link #jdbcMappingContext(Optional, JdbcCustomConversions)}. Will get {@link #jdbcCustomConversions()} ()}
127-
* applied.
126+
* {@link #jdbcMappingContext(Optional, JdbcCustomConversions, RelationalManagedTypes)}.
128127
*
129-
* @see #jdbcMappingContext(Optional, JdbcCustomConversions)
128+
* @see #jdbcMappingContext(Optional, JdbcCustomConversions, RelationalManagedTypes)
130129
* @see #jdbcCustomConversions()
131130
* @return must not be {@literal null}.
132131
*/
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
org.springframework.aot.hint.RuntimeHintsRegistrar=\
2-
org.springframework.data.jdbc.aot.DataJdbcRuntimeHints
2+
org.springframework.data.jdbc.aot.JdbcRuntimeHintsRegistrar

spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/aot/R2dbcRuntimeHints.java renamed to spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/aot/R2dbcRuntimeHintsRegistrar.java

+9-8
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,22 @@
2828
import org.springframework.data.r2dbc.repository.support.SimpleR2dbcRepository;
2929

3030
/**
31+
* {@link RuntimeHintsRegistrar} for R2DBC.
32+
*
3133
* @author Christoph Strobl
3234
* @since 3.0
3335
*/
34-
public class R2dbcRuntimeHints implements RuntimeHintsRegistrar {
36+
class R2dbcRuntimeHintsRegistrar implements RuntimeHintsRegistrar {
3537

3638
@Override
3739
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
3840

39-
hints.reflection().registerTypes(Arrays.asList(
40-
TypeReference.of(SimpleR2dbcRepository.class),
41-
TypeReference.of(AfterConvertCallback.class),
42-
TypeReference.of(BeforeConvertCallback.class),
43-
TypeReference.of(BeforeSaveCallback.class),
44-
TypeReference.of(AfterSaveCallback.class)
45-
),
41+
hints.reflection()
42+
.registerTypes(
43+
Arrays.asList(TypeReference.of(SimpleR2dbcRepository.class), TypeReference.of(AfterConvertCallback.class),
44+
TypeReference
45+
.of(BeforeConvertCallback.class),
46+
TypeReference.of(BeforeSaveCallback.class), TypeReference.of(AfterSaveCallback.class)),
4647
hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.INVOKE_PUBLIC_METHODS));
4748
}
4849
}

spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/config/AbstractR2dbcConfiguration.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,12 @@ public ReactiveDataAccessStrategy reactiveDataAccessStrategy(R2dbcConverter conv
208208

209209
/**
210210
* Creates a {@link org.springframework.data.r2dbc.convert.R2dbcConverter} using the configured
211-
* {@link #r2dbcMappingContext(Optional, R2dbcCustomConversions)} R2dbcMappingContext}.
211+
* {@link #r2dbcMappingContext(Optional, R2dbcCustomConversions, RelationalManagedTypes)} R2dbcMappingContext}.
212212
*
213213
* @param mappingContext the configured {@link R2dbcMappingContext}.
214214
* @param r2dbcCustomConversions customized R2DBC conversions.
215215
* @return must not be {@literal null}.
216-
* @see #r2dbcMappingContext(Optional, R2dbcCustomConversions)
216+
* @see #r2dbcMappingContext(Optional, R2dbcCustomConversions, RelationalManagedTypes)
217217
* @see #getDialect(ConnectionFactory)
218218
* @throws IllegalArgumentException if any of the {@literal mappingContext} is {@literal null}.
219219
* @since 1.2
@@ -230,7 +230,7 @@ public MappingR2dbcConverter r2dbcConverter(R2dbcMappingContext mappingContext,
230230
/**
231231
* Register custom {@link Converter}s in a {@link CustomConversions} object if required. These
232232
* {@link CustomConversions} will be registered with the {@link BasicRelationalConverter} and
233-
* {@link #r2dbcMappingContext(Optional, R2dbcCustomConversions)}. Returns an empty {@link R2dbcCustomConversions}
233+
* {@link #r2dbcMappingContext(Optional, R2dbcCustomConversions, RelationalManagedTypes)}. Returns an empty {@link R2dbcCustomConversions}
234234
* instance by default. Override {@link #getCustomConverters()} to supply custom converters.
235235
*
236236
* @return must not be {@literal null}.
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
org.springframework.aot.hint.RuntimeHintsRegistrar=\
2-
org.springframework.data.r2dbc.aot.R2dbcRuntimeHints
2+
org.springframework.data.r2dbc.aot.R2dbcRuntimeHintsRegistrar

0 commit comments

Comments
 (0)