Skip to content

Commit e10b55d

Browse files
author
talhadilber
committed
renamed argument resolvers
1 parent 3ceaa96 commit e10b55d

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

src/main/java/com/beyt/annotation/EnableDynamicQueryArgumentResolvers.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.beyt.annotation;
22

33
import com.beyt.config.ArgumentResolversInitConfig;
4-
import com.beyt.resolver.CriteriaFilterArgumentResolver;
4+
import com.beyt.resolver.CriteriaListArgumentResolver;
55
import com.beyt.resolver.DynamicQueryArgumentResolver;
66
import org.springframework.context.annotation.Import;
77

@@ -11,7 +11,7 @@
1111
import java.lang.annotation.Target;
1212

1313
@Retention(RetentionPolicy.RUNTIME)
14-
@Import({ArgumentResolversInitConfig.class, CriteriaFilterArgumentResolver.class, DynamicQueryArgumentResolver.class})
14+
@Import({ArgumentResolversInitConfig.class, CriteriaListArgumentResolver.class, DynamicQueryArgumentResolver.class})
1515
@Target({ElementType.TYPE})
1616
@EnableJpaDynamicQuery
1717
public @interface EnableDynamicQueryArgumentResolvers {

src/main/java/com/beyt/config/ArgumentResolversInitConfig.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.beyt.config;
22

3-
import com.beyt.resolver.CriteriaFilterArgumentResolver;
3+
import com.beyt.resolver.CriteriaListArgumentResolver;
44
import com.beyt.resolver.DynamicQueryArgumentResolver;
55
import org.springframework.beans.factory.config.BeanDefinition;
66
import org.springframework.context.annotation.Configuration;
@@ -14,17 +14,17 @@
1414
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
1515
public class ArgumentResolversInitConfig implements WebMvcConfigurer {
1616

17-
private final CriteriaFilterArgumentResolver criteriaFilterArgumentResolver;
17+
private final CriteriaListArgumentResolver criteriaListArgumentResolver;
1818
private final DynamicQueryArgumentResolver dynamicQueryArgumentResolver;
1919

20-
public ArgumentResolversInitConfig(CriteriaFilterArgumentResolver criteriaFilterArgumentResolver, DynamicQueryArgumentResolver dynamicQueryArgumentResolver) {
21-
this.criteriaFilterArgumentResolver = criteriaFilterArgumentResolver;
20+
public ArgumentResolversInitConfig(CriteriaListArgumentResolver criteriaListArgumentResolver, DynamicQueryArgumentResolver dynamicQueryArgumentResolver) {
21+
this.criteriaListArgumentResolver = criteriaListArgumentResolver;
2222
this.dynamicQueryArgumentResolver = dynamicQueryArgumentResolver;
2323
}
2424

2525
@Override
2626
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
27-
resolvers.add(criteriaFilterArgumentResolver);
27+
resolvers.add(criteriaListArgumentResolver);
2828
resolvers.add(dynamicQueryArgumentResolver);
2929
}
3030
}

src/main/java/com/beyt/resolver/CriteriaFilterArgumentResolver.java renamed to src/main/java/com/beyt/resolver/CriteriaListArgumentResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
@Component
1818
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
19-
public class CriteriaFilterArgumentResolver implements HandlerMethodArgumentResolver {
19+
public class CriteriaListArgumentResolver implements HandlerMethodArgumentResolver {
2020
private static final String KEY_FIELD_START = "key";
2121
private static final String OPERATION_FIELD_START = "operation";
2222
private static final String VALUES_FIELD_START = "values";

src/main/java/com/beyt/resolver/DynamicQueryArgumentResolver.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ public class DynamicQueryArgumentResolver implements HandlerMethodArgumentResolv
2626
private static final String PAGE_FIELD_START = "page";
2727
private static final String PAGE_SIZE_FIELD_START = "pageSize";
2828
private static final String DISTINCT_FIELD_START = "distinct";
29-
private final CriteriaFilterArgumentResolver criteriaFilterArgumentResolver;
29+
private final CriteriaListArgumentResolver criteriaListArgumentResolver;
3030

31-
public DynamicQueryArgumentResolver(CriteriaFilterArgumentResolver criteriaFilterArgumentResolver) {
32-
this.criteriaFilterArgumentResolver = criteriaFilterArgumentResolver;
31+
public DynamicQueryArgumentResolver(CriteriaListArgumentResolver criteriaListArgumentResolver) {
32+
this.criteriaListArgumentResolver = criteriaListArgumentResolver;
3333
}
3434

3535
@Override
@@ -58,7 +58,7 @@ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer m
5858
filter.setDistinct(true);
5959
}
6060

61-
CriteriaList criteriaList = (CriteriaList) criteriaFilterArgumentResolver.resolveArgument(parameter, mavContainer, webRequest, binderFactory);
61+
CriteriaList criteriaList = (CriteriaList) criteriaListArgumentResolver.resolveArgument(parameter, mavContainer, webRequest, binderFactory);
6262
filter.setWhere(criteriaList);
6363

6464
for (int i = 0; ; i++) {

src/test/java/com/beyt/testenv/config/GenericSpecificationRepositoryConfiguration.java renamed to src/test/java/com/beyt/testenv/config/DynamicSpecificationRepositoryConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77
@Configuration
88
@EnableJpaRepositories(repositoryFactoryBeanClass = DynamicSpecificationRepositoryFactoryBean.class, basePackages = "com.beyt.testenv.repository")
9-
public class GenericSpecificationRepositoryConfiguration {
9+
public class DynamicSpecificationRepositoryConfiguration {
1010

1111
}

0 commit comments

Comments
 (0)