From ee3654dfd3d0f7de04cf6dbe6b3781c03014b4f8 Mon Sep 17 00:00:00 2001
From: kwoyke <krzysztofwoyke@gmail.com>
Date: Sat, 27 Jun 2020 18:20:22 +0200
Subject: [PATCH] BAEL-4323: Rename getters to follow Java Beans convention
 (#9569)

---
 .../com/baeldung/comparing/PersonWithEquals.java     |  6 +++---
 .../comparing/PersonWithEqualsAndComparable.java     | 12 ++++++++++++
 ...PersonWithEqualsAndComparableUsingComparator.java | 12 ++++++------
 .../PersonWithEqualsAndWrongComparable.java          | 12 ++++++++++++
 .../com/baeldung/comparing/PersonWithoutEquals.java  |  8 ++++++++
 .../comparing/ComparatorInterfaceUnitTest.java       |  4 ++--
 .../java/com/baeldung/comparing/GuavaUnitTest.java   |  4 ++--
 7 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithEquals.java b/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithEquals.java
index e3a61fc05a..1358393538 100644
--- a/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithEquals.java
+++ b/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithEquals.java
@@ -22,15 +22,15 @@ public class PersonWithEquals {
         this.birthDate = birthDate;
     }
 
-    public String firstName() {
+    public String getFirstName() {
         return firstName;
     }
 
-    public String lastName() {
+    public String getLastName() {
         return lastName;
     }
 
-    public LocalDate birthDate() {
+    public LocalDate getBirthDate() {
         return birthDate;
     }
 
diff --git a/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithEqualsAndComparable.java b/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithEqualsAndComparable.java
index 5611ce8a09..b358271cae 100644
--- a/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithEqualsAndComparable.java
+++ b/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithEqualsAndComparable.java
@@ -22,6 +22,18 @@ public class PersonWithEqualsAndComparable implements Comparable<PersonWithEqual
         this.birthDate = birthDate;
     }
 
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public LocalDate getBirthDate() {
+        return birthDate;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithEqualsAndComparableUsingComparator.java b/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithEqualsAndComparableUsingComparator.java
index ed322cb353..d5607c9a14 100644
--- a/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithEqualsAndComparableUsingComparator.java
+++ b/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithEqualsAndComparableUsingComparator.java
@@ -23,15 +23,15 @@ public class PersonWithEqualsAndComparableUsingComparator implements Comparable<
         this.birthDate = birthDate;
     }
 
-    public String firstName() {
+    public String getFirstName() {
         return firstName;
     }
 
-    public String lastName() {
+    public String getLastName() {
         return lastName;
     }
 
-    public LocalDate birthDate() {
+    public LocalDate getBirthDate() {
         return birthDate;
     }
 
@@ -52,9 +52,9 @@ public class PersonWithEqualsAndComparableUsingComparator implements Comparable<
 
     @Override
     public int compareTo(PersonWithEqualsAndComparableUsingComparator o) {
-        return Comparator.comparing(PersonWithEqualsAndComparableUsingComparator::lastName)
-          .thenComparing(PersonWithEqualsAndComparableUsingComparator::firstName)
-          .thenComparing(PersonWithEqualsAndComparableUsingComparator::birthDate, Comparator.nullsLast(Comparator.naturalOrder()))
+        return Comparator.comparing(PersonWithEqualsAndComparableUsingComparator::getLastName)
+          .thenComparing(PersonWithEqualsAndComparableUsingComparator::getFirstName)
+          .thenComparing(PersonWithEqualsAndComparableUsingComparator::getBirthDate, Comparator.nullsLast(Comparator.naturalOrder()))
           .compare(this, o);
     }
 }
diff --git a/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithEqualsAndWrongComparable.java b/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithEqualsAndWrongComparable.java
index e0bdaa413a..df95373f3f 100644
--- a/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithEqualsAndWrongComparable.java
+++ b/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithEqualsAndWrongComparable.java
@@ -22,6 +22,18 @@ public class PersonWithEqualsAndWrongComparable implements Comparable<PersonWith
         this.birthDate = birthDate;
     }
 
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public LocalDate getBirthDate() {
+        return birthDate;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithoutEquals.java b/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithoutEquals.java
index bb4c6b958b..8ff49e6c3b 100644
--- a/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithoutEquals.java
+++ b/core-java-modules/core-java-lang-2/src/main/java/com/baeldung/comparing/PersonWithoutEquals.java
@@ -8,4 +8,12 @@ public class PersonWithoutEquals {
         this.firstName = firstName;
         this.lastName = lastName;
     }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
 }
diff --git a/core-java-modules/core-java-lang-2/src/test/java/com/baeldung/comparing/ComparatorInterfaceUnitTest.java b/core-java-modules/core-java-lang-2/src/test/java/com/baeldung/comparing/ComparatorInterfaceUnitTest.java
index 769ae60bed..e2f66a5ebd 100644
--- a/core-java-modules/core-java-lang-2/src/test/java/com/baeldung/comparing/ComparatorInterfaceUnitTest.java
+++ b/core-java-modules/core-java-lang-2/src/test/java/com/baeldung/comparing/ComparatorInterfaceUnitTest.java
@@ -20,7 +20,7 @@ class ComparatorInterfaceUnitTest {
         Comparator<PersonWithEquals> compareByFirstNames = new Comparator<PersonWithEquals>() {
             @Override
             public int compare(PersonWithEquals o1, PersonWithEquals o2) {
-                return o1.firstName().compareTo(o2.firstName());
+                return o1.getFirstName().compareTo(o2.getFirstName());
             }
         };
         people.sort(compareByFirstNames);
@@ -37,7 +37,7 @@ class ComparatorInterfaceUnitTest {
         people.add(joe);
         people.add(allan);
 
-        Comparator<PersonWithEquals> compareByFirstNames = Comparator.comparing(PersonWithEquals::firstName);
+        Comparator<PersonWithEquals> compareByFirstNames = Comparator.comparing(PersonWithEquals::getFirstName);
         people.sort(compareByFirstNames);
 
         assertThat(people).containsExactly(allan, joe);
diff --git a/core-java-modules/core-java-lang-2/src/test/java/com/baeldung/comparing/GuavaUnitTest.java b/core-java-modules/core-java-lang-2/src/test/java/com/baeldung/comparing/GuavaUnitTest.java
index 5c8591e134..129efd54ea 100644
--- a/core-java-modules/core-java-lang-2/src/test/java/com/baeldung/comparing/GuavaUnitTest.java
+++ b/core-java-modules/core-java-lang-2/src/test/java/com/baeldung/comparing/GuavaUnitTest.java
@@ -63,8 +63,8 @@ class GuavaUnitTest {
             PersonWithEquals joe = new PersonWithEquals("Joe", "Portman");
 
             int comparisonResult = ComparisonChain.start()
-              .compare(natalie.lastName(), joe.lastName())
-              .compare(natalie.firstName(), joe.firstName())
+              .compare(natalie.getLastName(), joe.getLastName())
+              .compare(natalie.getFirstName(), joe.getFirstName())
               .result();
 
             assertThat(comparisonResult).isPositive();