Spring/spring-data-couchbase
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Make fields final where applicable, move off deprecated API.

See #1696
This commit is contained in:
Mark Paluch
2023-03-20 08:17:58 +01:00
parent 0c8e7d9edd
commit 2dababc43b
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/springframework/data/couchbase/repository/query/N1qlCountQueryCreator.java
View File

@@ -45,7 +45,7 @@ public class N1qlCountQueryCreator extends OldN1qlQueryCreator {
private static class CountParameterAccessor implements ParameterAccessor {
private ParameterAccessor delegate;
private final ParameterAccessor delegate;
public CountParameterAccessor(ParameterAccessor delegate) {
this.delegate = delegate;
@@ -85,7 +85,7 @@ public class N1qlCountQueryCreator extends OldN1qlQueryCreator {
private static class CountPageable implements Pageable {
private Pageable delegate;
private final Pageable delegate;
public CountPageable(Pageable delegate) {
this.delegate = delegate;

2
src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseParameterAccessor.java
View File

@@ -28,7 +28,7 @@ import org.reactivestreams.Publisher;
import org.springframework.data.repository.query.ParametersParameterAccessor;
import org.springframework.data.repository.util.ReactiveWrapperConverters;
import org.springframework.data.repository.util.ReactiveWrappers;
import org.springframework.data.util.ReactiveWrappers;
/**
* Reactive {@link org.springframework.data.repository.query.ParametersParameterAccessor} implementation that subscribes

11
src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryMethod.java
View File

@@ -29,8 +29,7 @@ import org.springframework.data.domain.Sort;
import org.springframework.data.mapping.context.MappingContext;
import org.springframework.data.projection.ProjectionFactory;
import org.springframework.data.repository.core.RepositoryMetadata;
import org.springframework.data.repository.util.ReactiveWrappers;
import org.springframework.data.util.ClassTypeInformation;
import org.springframework.data.util.ReactiveWrappers;
import org.springframework.data.util.Lazy;
import org.springframework.data.util.TypeInformation;
import org.springframework.util.ClassUtils;
@@ -43,10 +42,9 @@ import org.springframework.util.ClassUtils;
*/
public class ReactiveCouchbaseQueryMethod extends CouchbaseQueryMethod {
private static final ClassTypeInformation<Page> PAGE_TYPE = ClassTypeInformation.from(Page.class);
private static final ClassTypeInformation<Slice> SLICE_TYPE = ClassTypeInformation.from(Slice.class);
private static final TypeInformation<Page> PAGE_TYPE = TypeInformation.of(Page.class);
private static final TypeInformation<Slice> SLICE_TYPE = TypeInformation.of(Slice.class);
private final Method method;
private final Lazy<Boolean> isCollectionQueryCouchbase; // not to be confused with QueryMethod.isCollectionQuery
/**
@@ -64,7 +62,7 @@ public class ReactiveCouchbaseQueryMethod extends CouchbaseQueryMethod {
if (hasParameterOfType(method, Pageable.class)) {
TypeInformation<?> returnType = ClassTypeInformation.fromReturnTypeOf(method);
TypeInformation<?> returnType = TypeInformation.fromReturnTypeOf(method);
boolean multiWrapper = ReactiveWrappers.isMultiValueType(returnType.getType());
boolean singleWrapperWithWrappedPageableResult = ReactiveWrappers.isSingleValueType(returnType.getType())
@@ -89,7 +87,6 @@ public class ReactiveCouchbaseQueryMethod extends CouchbaseQueryMethod {
}
}
this.method = method;
this.isCollectionQueryCouchbase = Lazy.of(() -> {
boolean result = !(isPageQuery() || isSliceQuery())
&& ReactiveWrappers.isMultiValueType(metadata.getReturnType(method).getType());