@@ -56,7 +56,7 @@ public class JpaRepositoryFactoryBean<T extends Repository<S, ID>, S, ID>
56
56
private EntityPathResolver entityPathResolver ;
57
57
private EscapeCharacter escapeCharacter = EscapeCharacter .DEFAULT ;
58
58
private JpaQueryMethodFactory queryMethodFactory ;
59
- private @ Nullable Function <BeanFactory , QueryEnhancerSelector > queryEnhancerSelector ;
59
+ private @ Nullable Function <BeanFactory , QueryEnhancerSelector > queryEnhancerSelectorSource ;
60
60
61
61
/**
62
62
* Creates a new {@link JpaRepositoryFactoryBean} for the given repository interface.
@@ -118,35 +118,36 @@ public void setQueryMethodFactory(@Nullable JpaQueryMethodFactory factory) {
118
118
* Configures the {@link QueryEnhancerSelector} to be used. Defaults to
119
119
* {@link QueryEnhancerSelector#DEFAULT_SELECTOR}.
120
120
*
121
- * @param queryEnhancerSelector must not be {@literal null}.
121
+ * @param queryEnhancerSelectorSource must not be {@literal null}.
122
122
*/
123
- public void setQueryEnhancerSelector (QueryEnhancerSelector queryEnhancerSelector ) {
124
- this .queryEnhancerSelector = bf -> queryEnhancerSelector ;
123
+ public void setQueryEnhancerSelectorSource (QueryEnhancerSelector queryEnhancerSelectorSource ) {
124
+ this .queryEnhancerSelectorSource = bf -> queryEnhancerSelectorSource ;
125
125
}
126
126
127
127
/**
128
128
* Configures the {@link QueryEnhancerSelector} to be used.
129
129
*
130
- * @param queryEnhancerSelector must not be {@literal null}.
130
+ * @param queryEnhancerSelectorType must not be {@literal null}.
131
131
*/
132
- public void setQueryEnhancerSelector (Class <? extends QueryEnhancerSelector > queryEnhancerSelector ) {
133
- this .queryEnhancerSelector = bf -> {
132
+ public void setQueryEnhancerSelector (Class <? extends QueryEnhancerSelector > queryEnhancerSelectorType ) {
133
+
134
+ this .queryEnhancerSelectorSource = bf -> {
134
135
135
136
if (bf != null ) {
136
137
137
- ObjectProvider <? extends QueryEnhancerSelector > beanProvider = bf .getBeanProvider (queryEnhancerSelector );
138
+ ObjectProvider <? extends QueryEnhancerSelector > beanProvider = bf .getBeanProvider (queryEnhancerSelectorType );
138
139
QueryEnhancerSelector selector = beanProvider .getIfAvailable ();
139
140
140
141
if (selector != null ) {
141
142
return selector ;
142
143
}
143
144
144
145
if (bf instanceof AutowireCapableBeanFactory acbf ) {
145
- return acbf .createBean (queryEnhancerSelector );
146
+ return acbf .createBean (queryEnhancerSelectorType );
146
147
}
147
148
}
148
149
149
- return BeanUtils .instantiateClass (queryEnhancerSelector );
150
+ return BeanUtils .instantiateClass (queryEnhancerSelectorType );
150
151
};
151
152
}
152
153
@@ -171,8 +172,8 @@ protected RepositoryFactorySupport createRepositoryFactory(EntityManager entityM
171
172
factory .setQueryMethodFactory (queryMethodFactory );
172
173
}
173
174
174
- if (queryEnhancerSelector != null ) {
175
- factory .setQueryEnhancerSelector (queryEnhancerSelector .apply (beanFactory ));
175
+ if (queryEnhancerSelectorSource != null ) {
176
+ factory .setQueryEnhancerSelector (queryEnhancerSelectorSource .apply (beanFactory ));
176
177
}
177
178
178
179
return factory ;
0 commit comments