spring-projects#282 - Get rid of Lombok annotations in new code

Author: rchigvintsev

Diff for: src/main/java/org/springframework/data/r2dbc/repository/query/ParameterMetadata.java

@@ -15,25 +15,40 @@
  */
 package org.springframework.data.r2dbc.repository.query;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.NonNull;
-
 import org.springframework.data.repository.query.parser.Part;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
  * Helper class for holding information about query parameter and preparing query parameter value.
  */
-@Builder
-@AllArgsConstructor
 class ParameterMetadata {
-	@Nullable private final String name;
-	@NonNull private final Class<?> type;
-	@NonNull private final Part.Type partType;
+	private final String name;
+	private final Class<?> type;
+	private final Part.Type partType;
 	private final boolean isNullParameter;
-	@NonNull private final LikeEscaper likeEscaper;
+	private final LikeEscaper likeEscaper;
+
+	private ParameterMetadata(Builder builder) {
+		Assert.notNull(builder.type, "Parameter type must not be null");
+		Assert.notNull(builder.partType, "Parameter part type must not be null");
+		Assert.notNull(builder.likeEscaper, "Like escaper must not be null");
+		
+		this.name = builder.name;
+		this.type = builder.type;
+		this.partType = builder.partType;
+		this.isNullParameter = builder.isNullParameter;
+		this.likeEscaper = builder.likeEscaper;
+	}
+
+	/**
+	 * Creates new instance of {@link Builder}.
+	 *
+	 * @return new instance of {@link Builder}
+	 */
+	public static Builder builder() {
+		return new Builder();
+	}
 
 	/**
 	 * Prepares parameter value before it's actually bound to the query.
@@ -76,4 +91,44 @@ public Class<?> getType() {
 	public boolean isIsNullParameter() {
 		return isNullParameter;
 	}
+
+	/**
+	 * Parameter metadata builder.
+	 */
+	public static class Builder {
+		private String name;
+		private Class<?> type;
+		private Part.Type partType;
+		private boolean isNullParameter;
+		private LikeEscaper likeEscaper;
+
+		public Builder name(String name) {
+			this.name = name;
+			return this;
+		}
+
+		public Builder type(Class<?> type) {
+			this.type = type;
+			return this;
+		}
+
+		public Builder partType(Part.Type partType) {
+			this.partType = partType;
+			return this;
+		}
+
+		public Builder isNullParameter(boolean isNullParameter) {
+			this.isNullParameter = isNullParameter;
+			return this;
+		}
+
+		public Builder likeEscaper(LikeEscaper likeEscaper) {
+			this.likeEscaper = likeEscaper;
+			return this;
+		}
+
+		public ParameterMetadata build() {
+			return new ParameterMetadata(this);
+		}
+	}
 }

Diff for: src/main/java/org/springframework/data/r2dbc/repository/query/ParameterMetadataProvider.java

@@ -87,10 +87,13 @@ public ParameterMetadata next(Part part) {
 		Assert.isTrue(bindableParameterIterator.hasNext(),
 				() -> String.format("No parameter available for part %s.", part));
 		Parameter parameter = bindableParameterIterator.next();
-		ParameterMetadata metadata = ParameterMetadata.builder().type(parameter.getType()).partType(part.getType())
+		ParameterMetadata metadata = ParameterMetadata.builder()
+				.type(parameter.getType())
+				.partType(part.getType())
 				.name(getParameterName(parameter, part.getProperty().getSegment()))
 				.isNullParameter(getParameterValue() == null && Part.Type.SIMPLE_PROPERTY.equals(part.getType()))
-				.likeEscaper(likeEscaper).build();
+				.likeEscaper(likeEscaper)
+				.build();
 		parameterMetadata.add(metadata);
 		return metadata;
 	}
@@ -99,7 +102,6 @@ public ParameterMetadata getParameterMetadata(int index) {
 		return parameterMetadata.get(index);
 	}
 
-	@Nullable
 	private String getParameterName(Parameter parameter, String defaultName) {
 		if (parameter.isExplicitlyNamed()) {
 			return parameter.getName().orElseThrow(() -> new IllegalArgumentException("Parameter needs to be named"));

Diff for: src/main/java/org/springframework/data/r2dbc/repository/query/PartTreeR2dbcQuery.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.r2dbc.repository.query;
 
-import lombok.Setter;
+import java.util.Collection;
 
 import org.springframework.data.domain.Sort;
 import org.springframework.data.r2dbc.convert.R2dbcConverter;
@@ -28,8 +28,6 @@
 import org.springframework.data.repository.query.parser.PartTree;
 import org.springframework.data.util.Streamable;
 
-import java.util.Collection;
-
 /**
  * An {@link AbstractR2dbcQuery} implementation based on a {@link PartTree}.
  * <p>
@@ -43,7 +41,7 @@ public class PartTreeR2dbcQuery extends AbstractR2dbcQuery {
 	private final RelationalParameters parameters;
 	private final PartTree tree;
 
-	@Setter private LikeEscaper likeEscaper = LikeEscaper.DEFAULT;
+	private LikeEscaper likeEscaper = LikeEscaper.DEFAULT;
 
 	/**
 	 * Creates new instance of this class with the given {@link R2dbcQueryMethod}, {@link DatabaseClient},
@@ -69,6 +67,10 @@ public PartTreeR2dbcQuery(R2dbcQueryMethod method, DatabaseClient databaseClient
 		}
 	}
 
+	public void setLikeEscaper(LikeEscaper likeEscaper) {
+		this.likeEscaper = likeEscaper;
+	}
+
 	/**
 	 * Creates new {@link BindableQuery} for the given {@link RelationalParameterAccessor}.
 	 *

Diff for: src/test/java/org/springframework/data/r2dbc/repository/query/PartTreeR2dbcQueryIntegrationTests.java

@@ -20,7 +20,6 @@
 
 import io.r2dbc.spi.ConnectionFactory;
 import io.r2dbc.spi.ConnectionFactoryMetadata;
-import lombok.Data;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -618,13 +617,60 @@ private interface UserRepository extends Repository<User, Long> {
 	}
 
 	@Table("users")
-	@Data
 	private static class User {
 		@Id private Long id;
 		private String firstName;
 		private String lastName;
 		private Date dateOfBirth;
 		private Integer age;
 		private Boolean active;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getFirstName() {
+			return firstName;
+		}
+
+		public void setFirstName(String firstName) {
+			this.firstName = firstName;
+		}
+
+		public String getLastName() {
+			return lastName;
+		}
+
+		public void setLastName(String lastName) {
+			this.lastName = lastName;
+		}
+
+		public Date getDateOfBirth() {
+			return dateOfBirth;
+		}
+
+		public void setDateOfBirth(Date dateOfBirth) {
+			this.dateOfBirth = dateOfBirth;
+		}
+
+		public Integer getAge() {
+			return age;
+		}
+
+		public void setAge(Integer age) {
+			this.age = age;
+		}
+
+		public Boolean getActive() {
+			return active;
+		}
+
+		public void setActive(Boolean active) {
+			this.active = active;
+		}
 	}
 }