Skip to content

fix(starter): harden auto-configuration and fluent findBySpec robustness #188

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

Closed
shihyuho wants to merge 1 commit into from
Closed

fix(starter): harden auto-configuration and fluent findBySpec robustness #188

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 ...va/tw/com/softleader/data/jpa/spec/starter/autoconfigure/SpecMapperAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@
import static tw.com.softleader.data.jpa.spec.ASTWriterFactory.impersonation;
import static tw.com.softleader.data.jpa.spec.starter.autoconfigure.SpecMapperProperties.PREFIX_SPEC_MAPPER;

import java.util.List;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Role;
import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
import org.springframework.data.repository.core.support.RepositoryFactoryCustomizer;
Expand All @@ -57,7 +57,7 @@
*/
@Slf4j
@RequiredArgsConstructor
@Configuration(proxyBeanMethods = false)
@AutoConfiguration(after = JpaRepositoriesAutoConfiguration.class)
@EnableConfigurationProperties(SpecMapperProperties.class)
@ConditionalOnProperty(prefix = PREFIX_SPEC_MAPPER, value = "enabled", matchIfMissing = true)
public class SpecMapperAutoConfiguration {
Expand Down Expand Up @@ -113,8 +113,8 @@ static class RepositoryFactoryCustomizerAutoConfiguration {

@Bean
@ConditionalOnMissingBean
JpaRepositoryFactoryBeanPostProcessor jpaRepositoryFactoryBeanPostProcessor(
List<RepositoryFactoryCustomizer> customizers) {
static JpaRepositoryFactoryBeanPostProcessor jpaRepositoryFactoryBeanPostProcessor(
ObjectProvider<RepositoryFactoryCustomizer> customizers) {
return new JpaRepositoryFactoryBeanPostProcessor(customizers);
}

Expand Down
6 changes: 3 additions & 3 deletions ...eader/data/jpa/spec/starter/repository/support/JpaRepositoryFactoryBeanPostProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
*/
package tw.com.softleader.data.jpa.spec.starter.repository.support;

import java.util.List;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
import org.springframework.data.repository.core.support.RepositoryFactoryCustomizer;
Expand All @@ -37,13 +37,13 @@
@RequiredArgsConstructor
public class JpaRepositoryFactoryBeanPostProcessor implements BeanPostProcessor {

final List<RepositoryFactoryCustomizer> customizers;
final ObjectProvider<RepositoryFactoryCustomizer> customizers;

@Override
public Object postProcessBeforeInitialization(@NonNull Object bean, @NonNull String beanName)
throws BeansException {
if (bean instanceof JpaRepositoryFactoryBean<?, ?, ?> factoryBean) {
customizers.forEach(factoryBean::addRepositoryFactoryCustomizer);
customizers.orderedStream().forEach(factoryBean::addRepositoryFactoryCustomizer);
}
return bean;
}
Expand Down
3 changes: 2 additions & 1 deletion ...w/com/softleader/data/jpa/spec/starter/repository/support/QueryBySpecExecutorAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ default <S extends T, R> R findBySpec(
var domainClass = getDomainClass();
notNull(mapper, "getSpecMapper() must not returns null");
notNull(domainClass, "getDomainClass() must not returns null");
return findBy(mapper.toSpec(spec, domainClass), queryFunction);
var specification = mapper.toSpec(spec, domainClass);
return findBy(specification != null ? specification : (root, query, cb) -> null, queryFunction);
}

SpecMapper getSpecMapper();
Expand Down
11 changes: 11 additions & 0 deletions ...test/java/tw/com/softleader/data/jpa/spec/starter/repository/QueryBySpecExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,17 @@ void findBySpecAndQuery() {
assertThat(actual).hasSize(1).contains(matt);
}

@Test
void findByEmptySpecAndQuery() {
var matt = repository.save(Customer.builder().name("matt").build());
var bob = repository.save(Customer.builder().name("bob").build());
var mary = repository.save(Customer.builder().name("mary").build());

var criteria = MyCriteria.builder().build();
var actual = repository.findBySpec(criteria, FluentQuery.FetchableFluentQuery::all);
assertThat(actual).hasSize(3).contains(matt, bob, mary);
}

@Builder
@Data
static class MyCriteria {
Expand Down