De-Lombok (#214)

Signed-off-by: Anders Swanson <anders.swanson@oracle.com>

Author: anders-swanson

database/starters/oracle-spring-boot-json-data-tools/pom.xml

@@ -121,11 +121,5 @@
             <artifactId>spring-boot-starter-data-jdbc</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

database/starters/oracle-spring-boot-json-data-tools/src/test/java/com/oracle/spring/json/test/Student.java

@@ -1,16 +1,10 @@
-// Copyright (c) 2024, Oracle and/or its affiliates.
+// Copyright (c) 2024, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 package com.oracle.spring.json.test;
 
+import java.util.Objects;
 import java.util.UUID;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
 public class Student {
     String id;
     String name;
@@ -19,4 +13,51 @@ public class Student {
     public static String newId() {
         return UUID.randomUUID().toString();
     }
+
+    public Student() {}
+
+    public Student(String id, String name, StudentDetails details) {
+        this.id = id;
+        this.name = name;
+        this.details = details;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public StudentDetails getDetails() {
+        return details;
+    }
+
+    public void setDetails(StudentDetails details) {
+        this.details = details;
+    }
+
+    @Override
+    public final boolean equals(Object o) {
+        if (!(o instanceof Student student)) return false;
+
+        return Objects.equals(getId(), student.getId()) && Objects.equals(getName(), student.getName()) && Objects.equals(getDetails(), student.getDetails());
+    }
+
+    @Override
+    public int hashCode() {
+        int result = Objects.hashCode(getId());
+        result = 31 * result + Objects.hashCode(getName());
+        result = 31 * result + Objects.hashCode(getDetails());
+        return result;
+    }
 }

database/starters/oracle-spring-boot-json-data-tools/src/test/java/com/oracle/spring/json/test/StudentDetails.java

@@ -1,16 +1,58 @@
-// Copyright (c) 2024, Oracle and/or its affiliates.
+// Copyright (c) 2024, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 package com.oracle.spring.json.test;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import java.util.Objects;
 
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
 public class StudentDetails {
     String major;
     double gpa;
     double credits;
+
+    public StudentDetails() {}
+
+    public StudentDetails(String major, double gpa, double credits) {
+        this.major = major;
+        this.gpa = gpa;
+        this.credits = credits;
+    }
+
+    public String getMajor() {
+        return major;
+    }
+
+    public void setMajor(String major) {
+        this.major = major;
+    }
+
+    public double getGpa() {
+        return gpa;
+    }
+
+    public void setGpa(double gpa) {
+        this.gpa = gpa;
+    }
+
+    public double getCredits() {
+        return credits;
+    }
+
+    public void setCredits(double credits) {
+        this.credits = credits;
+    }
+
+    @Override
+    public final boolean equals(Object o) {
+        if (!(o instanceof StudentDetails that)) return false;
+
+        return Double.compare(getGpa(), that.getGpa()) == 0 && Double.compare(getCredits(), that.getCredits()) == 0 && Objects.equals(getMajor(), that.getMajor());
+    }
+
+    @Override
+    public int hashCode() {
+        int result = Objects.hashCode(getMajor());
+        result = 31 * result + Double.hashCode(getGpa());
+        result = 31 * result + Double.hashCode(getCredits());
+        return result;
+    }
 }

database/starters/oracle-spring-boot-json-relational-duality-views/pom.xml

@@ -88,11 +88,5 @@
             <artifactId>spring-boot-testcontainers</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

database/starters/oracle-spring-boot-json-relational-duality-views/src/test/java/com/oracle/spring/json/duality/model/book/Book.java

@@ -13,8 +13,6 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-import lombok.Getter;
-import lombok.Setter;
 
 import static com.oracle.spring.json.duality.builder.Annotations._ID_FIELD;
 
@@ -24,8 +22,6 @@
         insert = true,
         update = true
 ))
-@Getter
-@Setter
 public class Book {
 
     @Id
@@ -50,4 +46,20 @@ public int hashCode() {
         result = 31 * result + Objects.hashCode(title);
         return result;
     }
+
+    public Long getBookId() {
+        return bookId;
+    }
+
+    public void setBookId(Long bookId) {
+        this.bookId = bookId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
 }

database/starters/oracle-spring-boot-json-relational-duality-views/src/test/java/com/oracle/spring/json/duality/model/book/Loan.java

@@ -17,15 +17,11 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
-import lombok.Getter;
-import lombok.Setter;
 
 import static com.oracle.spring.json.duality.builder.Annotations._ID_FIELD;
 
 @Entity
 @Table(name = "loans")
-@Getter
-@Setter
 @JsonRelationalDualityView(name = "loan_dv", accessMode = @AccessMode(
         insert = true,
         update = true
@@ -62,4 +58,28 @@ public final boolean equals(Object o) {
     public int hashCode() {
         return Objects.hashCode(getLoanId());
     }
+
+    public Long getLoanId() {
+        return loanId;
+    }
+
+    public void setLoanId(Long loanId) {
+        this.loanId = loanId;
+    }
+
+    public Member getMember() {
+        return member;
+    }
+
+    public void setMember(Member member) {
+        this.member = member;
+    }
+
+    public Book getBook() {
+        return book;
+    }
+
+    public void setBook(Book book) {
+        this.book = book;
+    }
 }

database/starters/oracle-spring-boot-json-relational-duality-views/src/test/java/com/oracle/spring/json/duality/model/book/Member.java

@@ -15,8 +15,6 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
-import lombok.Getter;
-import lombok.Setter;
 
 import static com.oracle.spring.json.duality.builder.Annotations._ID_FIELD;
 
@@ -27,8 +25,6 @@
         update = true,
         delete = true
 ))
-@Getter
-@Setter
 public class Member {
 
     @Id
@@ -46,4 +42,28 @@ public class Member {
     ))
     @OneToMany(mappedBy = "member", cascade = CascadeType.ALL)
     private List<Loan> loans;
+
+    public Long getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(Long memberId) {
+        this.memberId = memberId;
+    }
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    public void setFullName(String fullName) {
+        this.fullName = fullName;
+    }
+
+    public List<Loan> getLoans() {
+        return loans;
+    }
+
+    public void setLoans(List<Loan> loans) {
+        this.loans = loans;
+    }
 }

database/starters/oracle-spring-boot-json-relational-duality-views/src/test/java/com/oracle/spring/json/duality/model/employee/Employee.java

@@ -17,8 +17,6 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
-import lombok.Getter;
-import lombok.Setter;
 
 import static com.oracle.spring.json.duality.builder.Annotations._ID_FIELD;
 
@@ -29,8 +27,6 @@
         update = true,
         delete = true
 ))
-@Getter
-@Setter
 public class Employee {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -67,4 +63,36 @@ public final boolean equals(Object o) {
     public int hashCode() {
         return Objects.hashCode(getId());
     }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Employee getManager() {
+        return manager;
+    }
+
+    public void setManager(Employee manager) {
+        this.manager = manager;
+    }
+
+    public List<Employee> getReports() {
+        return reports;
+    }
+
+    public void setReports(List<Employee> reports) {
+        this.reports = reports;
+    }
 }

database/starters/oracle-spring-boot-json-relational-duality-views/src/test/java/com/oracle/spring/json/duality/model/employee/SimpleEmployee.java

@@ -2,12 +2,23 @@
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 package com.oracle.spring.json.duality.model.employee;
 
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
 public class SimpleEmployee {
     private Long _id;
     private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long get_id() {
+        return _id;
+    }
+
+    public void set_id(Long _id) {
+        this._id = _id;
+    }
 }