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

DATACMNS-1592 - Use Lombok's With and move off deprecated Wither.

Browse Source 
We now migrate off Lombok's `@Wither` in favor of `@With`.
This commit is contained in:
Mark Paluch
2019-11-26 13:55:23 +01:00
parent 3fb7ff1dd2
commit e9a0ed7123
7 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/springframework/data/convert/DefaultConverterBuilder.java
View File

@@ -19,7 +19,7 @@ import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.experimental.Wither;
import lombok.With;
import java.util.Collections;
import java.util.Optional;
@@ -44,12 +44,13 @@ import org.springframework.lang.Nullable;
* factory methods on {@link ConverterBuilder} to create instances of this class.
*
* @author Oliver Gierke
* @author Mark Paluch
* @since 2.0
* @see ConverterBuilder#writing(Class, Class, Function)
* @see ConverterBuilder#reading(Class, Class, Function)
* @soundtrack John Mayer - Still Feel Like Your Man (The Search for Everything)
*/
@Wither(AccessLevel.PACKAGE)
@With(AccessLevel.PACKAGE)
@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
class DefaultConverterBuilder<S, T>
implements ConverterAware, ReadingConverterBuilder<T, S>, WritingConverterBuilder<S, T> {

5
src/main/java/org/springframework/data/domain/TypedExampleMatcher.java
View File

@@ -19,7 +19,7 @@ import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.RequiredArgsConstructor;
import lombok.ToString;
import lombok.experimental.Wither;
import lombok.With;
import java.util.Arrays;
import java.util.Collections;
@@ -32,6 +32,7 @@ import org.springframework.util.Assert;
* Default implementation of {@link ExampleMatcher}.
*
* @author Christoph Strobl
* @author Mark Paluch
* @since 2.0
*/
@ToString
@@ -44,7 +45,7 @@ class TypedExampleMatcher implements ExampleMatcher {
private final PropertySpecifiers propertySpecifiers;
private final Set<String> ignoredPaths;
private final boolean defaultIgnoreCase;
private final @Wither(AccessLevel.PACKAGE) MatchMode mode;
private final @With(AccessLevel.PACKAGE) MatchMode mode;
TypedExampleMatcher() {

10
src/main/java/org/springframework/data/mapping/PersistentProperty.java
View File

@@ -114,11 +114,11 @@ public interface PersistentProperty<P extends PersistentProperty<P>> {
}
/**
* Returns the wither {@link Method} to set a property value on a new object instance. Might return {@literal null} in
* case there is no wither available.
* Returns the with {@link Method} to set a property value on a new object instance. Might return {@literal null} in
* case there is no with available.
* <p/>
* Wither {@link Method methods} are property-bound instance {@link Method methods} that accept a single argument of
* the property type creating a new object instance.
* With {@link Method methods} are property-bound instance {@link Method methods} that accept a single argument of the
* property type creating a new object instance.
*
* <pre class="code">
* class Person {
@@ -133,7 +133,7 @@ public interface PersistentProperty<P extends PersistentProperty<P>> {
* }
* </pre>
*
* @return the wither {@link Method} to set a property value on a new object instance if available, otherwise
* @return the with {@link Method} to set a property value on a new object instance if available, otherwise
* {@literal null}.
* @since 2.1
*/