Quality Improvements (#3697)

cookieMr · web-flow · commit d92ba37948c7 · 2024-12-18T18:23:22.000+01:00
diff --git a/assertj-core/src/main/java/org/assertj/core/error/AssertJMultipleFailuresError.java b/assertj-core/src/main/java/org/assertj/core/error/AssertJMultipleFailuresError.java
@@ -68,7 +68,7 @@ private boolean hasDescription(String message) {
   }
 
   private static boolean isBlank(String str) {
-    return str == null || str.trim().length() == 0;
+    return str == null || str.trim().isEmpty();
   }
 
   private static String pluralize(int count, String singular, String plural) {
diff --git a/assertj-core/src/main/java/org/assertj/core/error/ShouldHaveMethods.java b/assertj-core/src/main/java/org/assertj/core/error/ShouldHaveMethods.java
@@ -77,7 +77,7 @@ private ShouldHaveMethods(Class<?> actual, String modifier, boolean declared,
           "Expecting%n" +
           "  %s%n" +
           "not to have any " + (declared ? "declared " : "")
-          + (modifier != null && modifier.length() > 0 ? modifier + " " : "") + "methods but it has the following:%n" +
+          + (modifier != null && !modifier.isEmpty() ? modifier + " " : "") + "methods but it has the following:%n" +
           "  %s", actual, actualMethodsHavingModifier);
   }
 }
diff --git a/assertj-core/src/main/java/org/assertj/core/groups/Properties.java b/assertj-core/src/main/java/org/assertj/core/groups/Properties.java
@@ -70,7 +70,7 @@ public static Properties<Object> extractProperty(String propertyName) {
 
   private static void checkIsNotNullOrEmpty(String propertyName) {
     requireNonNull(propertyName, "The name of the property to read should not be null");
-    checkArgument(propertyName.length() > 0, "The name of the property to read should not be empty");
+    checkArgument(!propertyName.isEmpty(), "The name of the property to read should not be empty");
   }
 
   @VisibleForTesting
diff --git a/assertj-core/src/main/java/org/assertj/core/internal/Arrays.java b/assertj-core/src/main/java/org/assertj/core/internal/Arrays.java
@@ -272,7 +272,7 @@ void assertContainsOnlyNulls(AssertionInfo info, Failures failures, Object[] act
     for (Object element : actual) {
       if (element != null) nonNullElements.add(element);
     }
-    if (nonNullElements.size() > 0) throw failures.failure(info, shouldContainOnlyNulls(actual, nonNullElements));
+    if (!nonNullElements.isEmpty()) throw failures.failure(info, shouldContainOnlyNulls(actual, nonNullElements));
   }
 
   void assertContainsExactly(AssertionInfo info, Failures failures, Object actual, Object values) {
@@ -541,7 +541,7 @@ public void assertIsSubsetOf(AssertionInfo info, Failures failures, Object actua
         extra.add(actualElement);
       }
     }
-    if (extra.size() > 0) {
+    if (!extra.isEmpty()) {
       throw failures.failure(info, shouldBeSubsetOf(actual, values, extra, comparisonStrategy));
     }
   }
@@ -704,7 +704,7 @@ static <T> void assertIsSortedAccordingToComparator(AssertionInfo info, Failures
     try {
       List<T> arrayAsList = asList(array);
       // empty arrays are considered sorted even if comparator can't be applied to <T>.
-      if (arrayAsList.size() == 0) return;
+      if (arrayAsList.isEmpty()) return;
       if (arrayAsList.size() == 1) {
         // call compare to see if unique element is compatible with comparator.
         comparator.compare(arrayAsList.get(0), arrayAsList.get(0));
diff --git a/assertj-core/src/main/java/org/assertj/core/internal/Lists.java b/assertj-core/src/main/java/org/assertj/core/internal/Lists.java
@@ -183,7 +183,7 @@ public void assertIsSortedAccordingToComparator(AssertionInfo info, List<?> actu
     try {
       // Empty collections are considered sorted even if comparator can't be applied to their element type
       // We can't verify that point because of erasure type at runtime.
-      if (actual.size() == 0) return;
+      if (actual.isEmpty()) return;
       Comparator rawComparator = comparator;
       if (actual.size() == 1) {
         // Compare unique element with itself to verify that it is compatible with comparator (a ClassCastException is
diff --git a/assertj-core/src/main/java/org/assertj/core/internal/Maps.java b/assertj-core/src/main/java/org/assertj/core/internal/Maps.java
@@ -145,7 +145,7 @@ public <K, V> void assertNoneSatisfy(AssertionInfo info, Map<K, V> actual, BiCon
                                                .map(Optional::get)
                                                .collect(toList());
 
-    if (erroneousEntries.size() > 0) throw failures.failure(info, noElementsShouldSatisfy(actual, erroneousEntries));
+    if (!erroneousEntries.isEmpty()) throw failures.failure(info, noElementsShouldSatisfy(actual, erroneousEntries));
   }
 
   private <V, K> Optional<Entry<K, V>> failsRestrictions(Entry<K, V> entry,
diff --git a/assertj-core/src/main/java/org/assertj/core/internal/Paths.java b/assertj-core/src/main/java/org/assertj/core/internal/Paths.java
@@ -458,7 +458,7 @@ private void assertIsDirectoryRecursivelyContaining(AssertionInfo info, Path act
 
   private void assertIsDirectoryNotContaining(AssertionInfo info, Path actual, Filter<Path> filter, String filterPresentation) {
     List<Path> matchingPaths = filterDirectory(info, actual, filter);
-    if (matchingPaths.size() > 0) {
+    if (!matchingPaths.isEmpty()) {
       throw failures.failure(info, directoryShouldNotContain(actual, matchingPaths, filterPresentation));
     }
   }
diff --git a/assertj-core/src/main/java/org/assertj/core/util/Strings.java b/assertj-core/src/main/java/org/assertj/core/util/Strings.java
@@ -30,7 +30,7 @@ public final class Strings {
    * @return {@code true} if the given {@code String} is {@code null} or empty, otherwise {@code false}.
    */
   public static boolean isNullOrEmpty(String s) {
-    return s == null || s.length() == 0;
+    return s == null || s.isEmpty();
   }
 
   /**
diff --git a/assertj-core/src/test/java/org/assertj/core/api/AutoCloseableBDDSoftAssertionsTest.java b/assertj-core/src/test/java/org/assertj/core/api/AutoCloseableBDDSoftAssertionsTest.java
@@ -140,7 +140,7 @@ public String toString() {
       softly.then(OptionalInt.of(0)).isEqualTo(1);
       softly.then(OptionalDouble.of(0.0)).isEqualTo(1.0);
       softly.then(OptionalLong.of(0L)).isEqualTo(1L);
-      softly.then(LocalTime.of(12, 00)).isEqualTo(LocalTime.of(13, 00));
+      softly.then(LocalTime.of(12, 0)).isEqualTo(LocalTime.of(13, 0));
       softly.then(OffsetTime.of(12, 0, 0, 0, ZoneOffset.UTC)).isEqualTo(OffsetTime.of(13, 0, 0, 0, ZoneOffset.UTC));
       softly.then(OffsetDateTime.MIN).isEqualTo(OffsetDateTime.MAX);
 
diff --git a/assertj-core/src/test/java/org/assertj/core/api/BDDSoftAssertionsTest.java b/assertj-core/src/test/java/org/assertj/core/api/BDDSoftAssertionsTest.java
@@ -278,7 +278,7 @@ public String toString() {
     softly.then(LocalDateTime.now()).withFailMessage("LocalDateTime check").isBefore(LocalDateTime.now().minusSeconds(10));
     softly.then(LocalDate.now()).withFailMessage("LocalDate check").isBefore(LocalDate.now().minusDays(1));
     softly.then(emptySpliterator()).withFailMessage("Spliterator check").hasCharacteristics(123);
-    softly.then(new LongAdder()).withFailMessage("LongAdder check").hasValue(123l);
+    softly.then(new LongAdder()).withFailMessage("LongAdder check").hasValue(123L);
     // WHEN
     MultipleFailuresError error = catchThrowableOfType(() -> softly.assertAll(), MultipleFailuresError.class);
     // THEN
diff --git a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_isNotEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_isNotEqualTo_Test.java
@@ -29,7 +29,7 @@ class AbstractAssert_isNotEqualTo_Test extends AbstractAssertBaseTest {
 
   @Override
   protected ConcreteAssert invoke_api_method() {
-    return assertions.isNotEqualTo(Long.valueOf(8l));
+    return assertions.isNotEqualTo(Long.valueOf(8L));
   }
 
   @Test
diff --git a/assertj-core/src/test/java/org/assertj/core/api/localdatetime/LocalDateTimeAssert_hasMinute_Test.java b/assertj-core/src/test/java/org/assertj/core/api/localdatetime/LocalDateTimeAssert_hasMinute_Test.java
@@ -27,15 +27,15 @@ class LocalDateTimeAssert_hasMinute_Test {
   @Test
   void should_pass_if_actual_is_in_given_minute() {
     // GIVEN
-    LocalDateTime actual = LocalDateTime.of(2021, 12, 31, 23, 59, 00);
+    LocalDateTime actual = LocalDateTime.of(2021, 12, 31, 23, 59, 0);
     // WHEN/THEN
     then(actual).hasMinute(59);
   }
 
   @Test
   void should_fail_if_actual_is_not_in_given_minute() {
     // GIVEN
-    LocalDateTime actual = LocalDateTime.of(2021, 12, 31, 23, 59, 00);
+    LocalDateTime actual = LocalDateTime.of(2021, 12, 31, 23, 59, 0);
     int expectedMinute = 58;
     // WHEN
     AssertionError assertionError = expectAssertionError(() -> assertThat(actual).hasMinute(expectedMinute));
diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/DualValueDequeTest.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/DualValueDequeTest.java
@@ -108,6 +108,6 @@ private static DualValue dualValue(String value1, String value2) {
   }
 
   static List<String> randomPath() {
-    return list(RandomStringUtils.random(RandomUtils.nextInt(01, 10), true, false));
+    return list(RandomStringUtils.random(RandomUtils.nextInt(1, 10), true, false));
   }
 }
diff --git a/assertj-core/src/test/java/org/assertj/core/util/DateUtil_format_with_date_time_format_Test.java b/assertj-core/src/test/java/org/assertj/core/util/DateUtil_format_with_date_time_format_Test.java
@@ -45,7 +45,7 @@ void should_return_null_if_date_is_null() {
   @Test
   void should_format_calendar_with_date_time_format() {
     Calendar calendar = new GregorianCalendar();
-    calendar.set(2011, 04, 15, 14, 59, 33);
+    calendar.set(2011, 4, 15, 14, 59, 33);
     assertThat(formatAsDatetime(calendar)).isEqualTo("2011-05-15T14:59:33");
   }
 
diff --git a/assertj-core/src/test/java/org/assertj/core/util/DateUtil_toCalendar_Test.java b/assertj-core/src/test/java/org/assertj/core/util/DateUtil_toCalendar_Test.java
@@ -37,7 +37,7 @@ void should_convert_date_to_calendar() throws ParseException {
     Calendar calendar = new GregorianCalendar();
     // clear all fields to have a Date without time (no hours, minutes...).
     calendar.clear();
-    calendar.set(1994, 07, 26); // month is 0 value based.
+    calendar.set(1994, 7, 26); // month is 0 value based.
     assertThat(toCalendar(date)).isEqualTo(calendar);
   }
 
diff --git a/assertj-tests/assertj-integration-tests/assertj-core-tests/src/test/java/org/assertj/tests/core/api/recursive/assertion/RecursiveAssertionDriver_OptionalPolicy_Test.java b/assertj-tests/assertj-integration-tests/assertj-core-tests/src/test/java/org/assertj/tests/core/api/recursive/assertion/RecursiveAssertionDriver_OptionalPolicy_Test.java
@@ -75,7 +75,7 @@ void should_assert_over_optional_object_and_its_value_when_policy_is_OPTIONAL_OB
   }
 
   private static Stream<Wrapper> wrapper_object_with_Optional_and_primitive_Optional_types() {
-    return Stream.of(new Wrapper(Optional.of("foo")), new Wrapper(OptionalLong.of(1l)),
+    return Stream.of(new Wrapper(Optional.of("foo")), new Wrapper(OptionalLong.of(1L)),
                      new Wrapper(OptionalDouble.of(1.0)), new Wrapper(OptionalInt.of(1)));
   }
 
diff --git a/assertj-tests/assertj-integration-tests/assertj-core-tests/src/test/java/org/assertj/tests/core/api/recursive/comparison/DualValueUtil.java b/assertj-tests/assertj-integration-tests/assertj-core-tests/src/test/java/org/assertj/tests/core/api/recursive/comparison/DualValueUtil.java
@@ -27,7 +27,7 @@ static DualValue dualValueWithPath(String... pathElements) {
   }
 
   static List<String> randomPath() {
-    return list(RandomStringUtils.random(RandomUtils.nextInt(01, 10), true, false));
+    return list(RandomStringUtils.random(RandomUtils.nextInt(1, 10), true, false));
   }
 
 }
diff --git a/assertj-tests/assertj-integration-tests/assertj-core-tests/src/test/java/org/assertj/tests/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_with_optional_Test.java b/assertj-tests/assertj-integration-tests/assertj-core-tests/src/test/java/org/assertj/tests/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_with_optional_Test.java
@@ -81,7 +81,7 @@ void should_fail_when_comparing_non_optional_expected_field_with_optional_actual
     BookWithCoAuthor expected = new BookWithCoAuthor(pratchett);
     // WHEN/THEN
     compareRecursivelyFailsWithDifferences(actual, expected,
-                                           diff("bookId", null, 0l),
+                                           diff("bookId", null, 0L),
                                            javaTypeDiff("coAuthor", Optional.of(pratchett), pratchett),
                                            diff("numberOfPages", null, 0),
                                            diff("price", null, 0.0));
@@ -95,7 +95,7 @@ void should_fail_when_comparing_optional_expected_field_with_non_optional_actual
     BookWithOptionalCoAuthor expected = new BookWithOptionalCoAuthor(pratchett.name);
     // WHEN/THEN
     compareRecursivelyFailsWithDifferences(actual, expected,
-                                           diff("bookId", 0l, null),
+                                           diff("bookId", 0L, null),
                                            diff("coAuthor", pratchett, Optional.of(pratchett),
                                                 "expected field is an Optional but actual field is not (org.assertj.tests.core.api.recursive.comparison.Author)"),
                                            diff("numberOfPages", 0, null),

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private boolean hasDescription(String message) {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`private static boolean isBlank(String str) {`
`71`		`- return str == null \|\| str.trim().length() == 0;`
	`71`	`+ return str == null \|\| str.trim().isEmpty();`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`private static String pluralize(int count, String singular, String plural) {`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ private ShouldHaveMethods(Class<?> actual, String modifier, boolean declared,`
`77`	`77`	`"Expecting%n" +`
`78`	`78`	`" %s%n" +`
`79`	`79`	`"not to have any " + (declared ? "declared " : "")`
`80`		`- + (modifier != null && modifier.length() > 0 ? modifier + " " : "") + "methods but it has the following:%n" +`
	`80`	`+ + (modifier != null && !modifier.isEmpty() ? modifier + " " : "") + "methods but it has the following:%n" +`
`81`	`81`	`" %s", actual, actualMethodsHavingModifier);`
`82`	`82`	`}`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public static Properties<Object> extractProperty(String propertyName) {`
`70`	`70`
`71`	`71`	`private static void checkIsNotNullOrEmpty(String propertyName) {`
`72`	`72`	`requireNonNull(propertyName, "The name of the property to read should not be null");`
`73`		`- checkArgument(propertyName.length() > 0, "The name of the property to read should not be empty");`
	`73`	`+ checkArgument(!propertyName.isEmpty(), "The name of the property to read should not be empty");`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`@VisibleForTesting`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ void assertContainsOnlyNulls(AssertionInfo info, Failures failures, Object[] act`
`272`	`272`	`for (Object element : actual) {`
`273`	`273`	`if (element != null) nonNullElements.add(element);`
`274`	`274`	`}`
`275`		`- if (nonNullElements.size() > 0) throw failures.failure(info, shouldContainOnlyNulls(actual, nonNullElements));`
	`275`	`+ if (!nonNullElements.isEmpty()) throw failures.failure(info, shouldContainOnlyNulls(actual, nonNullElements));`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`void assertContainsExactly(AssertionInfo info, Failures failures, Object actual, Object values) {`
`@@ -541,7 +541,7 @@ public void assertIsSubsetOf(AssertionInfo info, Failures failures, Object actua`
`541`	`541`	`extra.add(actualElement);`
`542`	`542`	`}`
`543`	`543`	`}`
`544`		`- if (extra.size() > 0) {`
	`544`	`+ if (!extra.isEmpty()) {`
`545`	`545`	`throw failures.failure(info, shouldBeSubsetOf(actual, values, extra, comparisonStrategy));`
`546`	`546`	`}`
`547`	`547`	`}`
`@@ -704,7 +704,7 @@ static <T> void assertIsSortedAccordingToComparator(AssertionInfo info, Failures`
`704`	`704`	`try {`
`705`	`705`	`List<T> arrayAsList = asList(array);`
`706`	`706`	`// empty arrays are considered sorted even if comparator can't be applied to <T>.`
`707`		`- if (arrayAsList.size() == 0) return;`
	`707`	`+ if (arrayAsList.isEmpty()) return;`
`708`	`708`	`if (arrayAsList.size() == 1) {`
`709`	`709`	`// call compare to see if unique element is compatible with comparator.`
`710`	`710`	`comparator.compare(arrayAsList.get(0), arrayAsList.get(0));`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public <K, V> void assertNoneSatisfy(AssertionInfo info, Map<K, V> actual, BiCon`
`145`	`145`	`.map(Optional::get)`
`146`	`146`	`.collect(toList());`
`147`	`147`
`148`		`- if (erroneousEntries.size() > 0) throw failures.failure(info, noElementsShouldSatisfy(actual, erroneousEntries));`
	`148`	`+ if (!erroneousEntries.isEmpty()) throw failures.failure(info, noElementsShouldSatisfy(actual, erroneousEntries));`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`private <V, K> Optional<Entry<K, V>> failsRestrictions(Entry<K, V> entry,`
Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ private void assertIsDirectoryRecursivelyContaining(AssertionInfo info, Path act`
`458`	`458`
`459`	`459`	`private void assertIsDirectoryNotContaining(AssertionInfo info, Path actual, Filter<Path> filter, String filterPresentation) {`
`460`	`460`	`List<Path> matchingPaths = filterDirectory(info, actual, filter);`
`461`		`- if (matchingPaths.size() > 0) {`
	`461`	`+ if (!matchingPaths.isEmpty()) {`
`462`	`462`	`throw failures.failure(info, directoryShouldNotContain(actual, matchingPaths, filterPresentation));`
`463`	`463`	`}`
`464`	`464`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public final class Strings {`
`30`	`30`	`* @return {@code true} if the given {@code String} is {@code null} or empty, otherwise {@code false}.`
`31`	`31`	`*/`
`32`	`32`	`public static boolean isNullOrEmpty(String s) {`
`33`		`- return s == null \|\| s.length() == 0;`
	`33`	`+ return s == null \|\| s.isEmpty();`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/**`