Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Use Comparable instead of dedicated implementations"

Browse Source 
See gh-25478
This commit is contained in:
Stephane Nicoll
2023-08-25 14:32:09 +02:00
parent 33454a4007
commit 49cafe07ed
8 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-core/src/test/java/org/springframework/core/convert/converter/ConvertingComparatorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.util.comparator.ComparableComparator;
import org.springframework.util.comparator.Comparators;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -95,17 +95,17 @@ class ConvertingComparatorTests {
}
@Test
void shouldGetMapEntryKeys() throws Exception {
void shouldGetMapEntryKeys() {
ArrayList<Entry<String, Integer>> list = createReverseOrderMapEntryList();
Comparator<Map.Entry<String, Integer>> comparator = ConvertingComparator.mapEntryKeys(new ComparableComparator<String>());
Comparator<Map.Entry<String, Integer>> comparator = ConvertingComparator.mapEntryKeys(Comparators.comparable());
list.sort(comparator);
assertThat(list.get(0).getKey()).isEqualTo("a");
}
@Test
void shouldGetMapEntryValues() throws Exception {
void shouldGetMapEntryValues() {
ArrayList<Entry<String, Integer>> list = createReverseOrderMapEntryList();
Comparator<Map.Entry<String, Integer>> comparator = ConvertingComparator.mapEntryValues(new ComparableComparator<Integer>());
Comparator<Map.Entry<String, Integer>> comparator = ConvertingComparator.mapEntryValues(Comparators.comparable());
list.sort(comparator);
assertThat(list.get(0).getValue()).isEqualTo(1);
}
@@ -130,7 +130,7 @@ class ConvertingComparatorTests {
}
private static class TestComparator extends ComparableComparator<Integer> {
private static class TestComparator implements Comparator<Integer> {
private boolean called;
@@ -139,7 +139,7 @@ class ConvertingComparatorTests {
assertThat(o1).isInstanceOf(Integer.class);
assertThat(o2).isInstanceOf(Integer.class);
this.called = true;
return super.compare(o1, o2);
return Comparators.comparable().compare(o1, o2);
}
public void assertCalled() {

8
spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -36,8 +36,7 @@ import org.springframework.lang.Nullable;
import org.springframework.util.ConcurrentReferenceHashMap.Entry;
import org.springframework.util.ConcurrentReferenceHashMap.Reference;
import org.springframework.util.ConcurrentReferenceHashMap.Restructure;
import org.springframework.util.comparator.ComparableComparator;
import org.springframework.util.comparator.NullSafeComparator;
import org.springframework.util.comparator.Comparators;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -51,8 +50,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
*/
class ConcurrentReferenceHashMapTests {
private static final Comparator<? super String> NULL_SAFE_STRING_SORT = new NullSafeComparator<>(
new ComparableComparator<String>(), true);
private static final Comparator<? super String> NULL_SAFE_STRING_SORT = Comparators.nullsLow();
private TestWeakConcurrentCache<Integer, String> map = new TestWeakConcurrentCache<>();

2
spring-core/src/test/java/org/springframework/util/comparator/BooleanComparatorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

1
spring-core/src/test/java/org/springframework/util/comparator/ComparableComparatorTests.java
View File

@@ -30,6 +30,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
* @author Chris Beams
* @author Phillip Webb
*/
@Deprecated
class ComparableComparatorTests {
@Test

1
spring-core/src/test/java/org/springframework/util/comparator/NullSafeComparatorTests.java
View File

@@ -29,6 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Chris Beams
* @author Phillip Webb
*/
@Deprecated
class NullSafeComparatorTests {
@SuppressWarnings("unchecked")