Delombok code.

Closes #2286

Author: mp911de

lombok.config

@@ -133,7 +133,6 @@
 			<version>${hamcrest}</version>
 			<scope>test</scope>
 		</dependency>
-
 	</dependencies>
 
 	<repositories>

pom.xml

@@ -18,8 +18,6 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import lombok.Value;
-
 import java.net.URI;
 import java.util.List;
 import java.util.Optional;
@@ -49,6 +47,7 @@
 import org.springframework.data.util.Streamable;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.format.support.DefaultFormattingConversionService;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Unit tests for {@link UriToEntityConverter}.
@@ -197,9 +196,37 @@ public JMoleculesIdentifier getId() {
 			return JMoleculesIdentifier.of(UUID.randomUUID());
 		}
 
-		@Value(staticConstructor = "of")
-		static class JMoleculesIdentifier implements Identifier {
-			UUID id;
+		static final class JMoleculesIdentifier implements Identifier {
+			private final UUID id;
+
+			private JMoleculesIdentifier(UUID id) {
+				this.id = id;
+			}
+
+			public static JMoleculesIdentifier of(UUID id) {
+				return new JMoleculesIdentifier(id);
+			}
+
+			public UUID getId() {
+				return this.id;
+			}
+
+			@Override
+			public boolean equals(Object o) {
+				if (this == o)
+					return true;
+				if (o == null || getClass() != o.getClass())
+					return false;
+
+				JMoleculesIdentifier that = (JMoleculesIdentifier) o;
+
+				return ObjectUtils.nullSafeEquals(id, that.id);
+			}
+
+			@Override
+			public int hashCode() {
+				return ObjectUtils.nullSafeHashCode(id);
+			}
 		}
 	}
 

spring-data-rest-core/src/test/java/org/springframework/data/rest/core/UriToEntityConverterUnitTests.java

@@ -15,8 +15,6 @@
  */
 package org.springframework.data.rest.core.domain;
 
-import lombok.Value;
-
 import java.util.UUID;
 
 import org.springframework.data.annotation.Id;
@@ -25,9 +23,20 @@
 /**
  * @author Oliver Gierke
  */
-@Value
-class Order {
+final class Order {
+
+	@Id private final UUID id = UUID.randomUUID();
+	@Reference private final Person creator;
+
+		public Order(Person creator) {
+			this.creator = creator;
+		}
+
+		public UUID getId() {
+			return this.id;
+		}
 
-	@Id UUID id = UUID.randomUUID();
-	@Reference Person creator;
+		public Person getCreator() {
+			return this.creator;
+		}
 }

spring-data-rest-core/src/test/java/org/springframework/data/rest/core/domain/Order.java

@@ -15,18 +15,14 @@
  */
 package org.springframework.data.rest.core.domain;
 
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.RequiredArgsConstructor;
-
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 import org.springframework.data.annotation.Reference;
 import org.springframework.data.rest.core.annotation.RestResource;
 
@@ -36,8 +32,6 @@
  * @author Jon Brisbin
  * @author Oliver Gierke
  */
-@Data
-@RequiredArgsConstructor(access = AccessLevel.PRIVATE, onConstructor = @__(@PersistenceConstructor))
 public class Person {
 
 	private final @Id UUID id;
@@ -51,8 +45,51 @@ public Person(String firstName, String lastName) {
 	private @RestResource(path = "father-mapped") @Reference Person father;
 	private Date created = Calendar.getInstance().getTime();
 
+	@PersistenceCreator
+	private Person(UUID id, String firstName, String lastName) {
+		this.id = id;
+		this.firstName = firstName;
+		this.lastName = lastName;
+	}
+
 	public Person addSibling(Person p) {
 		siblings.add(p);
 		return this;
 	}
+
+	public UUID getId() {
+		return this.id;
+	}
+
+	public String getFirstName() {
+		return this.firstName;
+	}
+
+	public String getLastName() {
+		return this.lastName;
+	}
+
+	public List<Person> getSiblings() {
+		return this.siblings;
+	}
+
+	public Person getFather() {
+		return this.father;
+	}
+
+	public Date getCreated() {
+		return this.created;
+	}
+
+	public void setSiblings(List<Person> siblings) {
+		this.siblings = siblings;
+	}
+
+	public void setFather(Person father) {
+		this.father = father;
+	}
+
+	public void setCreated(Date created) {
+		this.created = created;
+	}
 }

spring-data-rest-core/src/test/java/org/springframework/data/rest/core/domain/Person.java

@@ -15,9 +15,6 @@
  */
 package org.springframework.data.rest.core.domain;
 
-import lombok.Value;
-import lombok.experimental.NonFinal;
-
 import java.util.UUID;
 
 import org.springframework.data.annotation.Id;
@@ -26,10 +23,25 @@
  * @author Jon Brisbin
  * @author Oliver Gierke
  */
-@NonFinal
-@Value
 public class Profile {
 
-	@Id UUID id = UUID.randomUUID();
-	String name, type;
+	@Id private final UUID id = UUID.randomUUID();
+	private final String name, type;
+
+	public Profile(String name, String type) {
+		this.name = name;
+		this.type = type;
+	}
+
+	public UUID getId() {
+		return this.id;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public String getType() {
+		return this.type;
+	}
 }

spring-data-rest-core/src/test/java/org/springframework/data/rest/core/domain/Profile.java

@@ -17,8 +17,6 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import lombok.Value;
-
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.DynamicTest;
@@ -34,36 +32,31 @@ class ResourceStringUtilsTests {
 	@TestFactory
 	Stream<DynamicTest> shouldDetectTextPresence() {
 
-		return DynamicTest.stream(fixtures(), Fixture::getName, it -> {
-			assertThat(ResourceStringUtils.hasTextExceptSlash(it.getActual())).isEqualTo(it.hasText);
+		return DynamicTest.stream(fixtures(), Fixture::name, it -> {
+			assertThat(ResourceStringUtils.hasTextExceptSlash(it.actual())).isEqualTo(it.hasText);
 		});
 	}
 
 	@TestFactory
 	Stream<DynamicTest> shouldRemoveLeadingSlashIfAny() {
 
-		return DynamicTest.stream(fixtures(), Fixture::getName, it -> {
-			assertThat(ResourceStringUtils.removeLeadingSlash(it.getActual())).isEqualTo(it.getExpected());
+		return DynamicTest.stream(fixtures(), Fixture::name, it -> {
+			assertThat(ResourceStringUtils.removeLeadingSlash(it.actual())).isEqualTo(it.expected());
 		});
 	}
 
 	static Stream<Fixture> fixtures() {
 
-		return Stream.of(
-				Fixture.of("empty string has no text and should remain empty", "", "", false),
-				Fixture.of("blank string has no text and should remain as is", "  ", "  ", false),
-				Fixture.of("string made of only a leading slash has no text and should be returned empty", "/", "", false),
-				Fixture.of("blank string with only slashes has no text and should be returned as is", "   /   ", "   /   ",
+		return Stream.of(new Fixture("empty string has no text and should remain empty", "", "", false),
+				new Fixture("blank string has no text and should remain as is", "  ", "  ", false),
+				new Fixture("string made of only a leading slash has no text and should be returned empty", "/", "", false),
+				new Fixture("blank string with only slashes has no text and should be returned as is", "   /   ", "   /   ",
 						false),
-				Fixture.of("normal string has text and should be returned as such", "hello", "hello", true),
-				Fixture.of("normal string with leading slash has text and should be returned without leading slash", "/hello",
+				new Fixture("normal string has text and should be returned as such", "hello", "hello", true),
+				new Fixture("normal string with leading slash has text and should be returned without leading slash", "/hello",
 						"hello", true));
 	}
 
-	@Value(staticConstructor = "of")
-	static class Fixture {
-
-		String name, actual, expected;
-		boolean hasText;
+	record Fixture(String name, String actual, String expected, boolean hasText) {
 	}
 }

spring-data-rest-core/src/test/java/org/springframework/data/rest/core/support/ResourceStringUtilsTests.java

@@ -39,13 +39,6 @@
 			<version>${groovy.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>${lombok}</version>
-			<scope>provided</scope>
-		</dependency>
-
 	</dependencies>
 
 </project>

spring-data-rest-tests/pom.xml

@@ -21,9 +21,6 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToMany;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -68,13 +65,33 @@ public Book(String isbn, String title, long soldUnits, Iterable<Author> authors,
 		this.offer = offer;
 	}
 
-	@Getter
 	@Embeddable
-	@AllArgsConstructor
-	@NoArgsConstructor
 	static class Offer {
 
 		double price;
 		String currency;
+
+		public Offer(double price, String currency) {
+			this.price = price;
+			this.currency = currency;
+		}
+
+		public Offer() {}
+
+		public double getPrice() {
+			return price;
+		}
+
+		public void setPrice(double price) {
+			this.price = price;
+		}
+
+		public String getCurrency() {
+			return currency;
+		}
+
+		public void setCurrency(String currency) {
+			this.currency = currency;
+		}
 	}
 }

spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/Book.java

@@ -19,12 +19,10 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.Version;
-import lombok.Data;
 
 /**
  * @author Dario Seidl
  */
-@Data
 @Entity
 class Category {
 
@@ -38,4 +36,28 @@ private Category() {}
 	public Category(String name) {
 		this.name = name;
 	}
+
+	public Long getId() {
+		return this.id;
+	}
+
+	public Long getVersion() {
+		return this.version;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public void setVersion(Long version) {
+		this.version = version;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
 }