Skip to content

Commit 60a57dd

Browse files
committed
Rebase findings.
1 parent debdeba commit 60a57dd

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/DeclaredQuery.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 the original author or authors.
2+
* Copyright 2018-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,7 +18,10 @@
1818
/**
1919
* Interface defining the contract to represent a declared query.
2020
*
21+
* @author Jens Schauder
22+
* @author Diego Krupitza
2123
* @author Mark Paluch
24+
* @since 2.0.3
2225
*/
2326
public interface DeclaredQuery {
2427

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBean.java

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class JpaRepositoryFactoryBean<T extends Repository<S, ID>, S, ID>
5656
private EntityPathResolver entityPathResolver;
5757
private EscapeCharacter escapeCharacter = EscapeCharacter.DEFAULT;
5858
private JpaQueryMethodFactory queryMethodFactory;
59-
private @Nullable Function<BeanFactory, QueryEnhancerSelector> queryEnhancerSelector;
59+
private @Nullable Function<BeanFactory, QueryEnhancerSelector> queryEnhancerSelectorSource;
6060

6161
/**
6262
* Creates a new {@link JpaRepositoryFactoryBean} for the given repository interface.
@@ -118,35 +118,36 @@ public void setQueryMethodFactory(@Nullable JpaQueryMethodFactory factory) {
118118
* Configures the {@link QueryEnhancerSelector} to be used. Defaults to
119119
* {@link QueryEnhancerSelector#DEFAULT_SELECTOR}.
120120
*
121-
* @param queryEnhancerSelector must not be {@literal null}.
121+
* @param queryEnhancerSelectorSource must not be {@literal null}.
122122
*/
123-
public void setQueryEnhancerSelector(QueryEnhancerSelector queryEnhancerSelector) {
124-
this.queryEnhancerSelector = bf -> queryEnhancerSelector;
123+
public void setQueryEnhancerSelectorSource(QueryEnhancerSelector queryEnhancerSelectorSource) {
124+
this.queryEnhancerSelectorSource = bf -> queryEnhancerSelectorSource;
125125
}
126126

127127
/**
128128
* Configures the {@link QueryEnhancerSelector} to be used.
129129
*
130-
* @param queryEnhancerSelector must not be {@literal null}.
130+
* @param queryEnhancerSelectorType must not be {@literal null}.
131131
*/
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 -> {
134135

135136
if (bf != null) {
136137

137-
ObjectProvider<? extends QueryEnhancerSelector> beanProvider = bf.getBeanProvider(queryEnhancerSelector);
138+
ObjectProvider<? extends QueryEnhancerSelector> beanProvider = bf.getBeanProvider(queryEnhancerSelectorType);
138139
QueryEnhancerSelector selector = beanProvider.getIfAvailable();
139140

140141
if (selector != null) {
141142
return selector;
142143
}
143144

144145
if (bf instanceof AutowireCapableBeanFactory acbf) {
145-
return acbf.createBean(queryEnhancerSelector);
146+
return acbf.createBean(queryEnhancerSelectorType);
146147
}
147148
}
148149

149-
return BeanUtils.instantiateClass(queryEnhancerSelector);
150+
return BeanUtils.instantiateClass(queryEnhancerSelectorType);
150151
};
151152
}
152153

@@ -171,8 +172,8 @@ protected RepositoryFactorySupport createRepositoryFactory(EntityManager entityM
171172
factory.setQueryMethodFactory(queryMethodFactory);
172173
}
173174

174-
if (queryEnhancerSelector != null) {
175-
factory.setQueryEnhancerSelector(queryEnhancerSelector.apply(beanFactory));
175+
if (queryEnhancerSelectorSource != null) {
176+
factory.setQueryEnhancerSelector(queryEnhancerSelectorSource.apply(beanFactory));
176177
}
177178

178179
return factory;

0 commit comments

Comments
 (0)