root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Sam Brannen 2020-06-03 15:05:58 +02:00
parent 0b163fa536
commit da7ead8914
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-core/src/main/java/org/springframework/core/convert/converter/ConvertingComparator.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -26,8 +26,9 @@ import org.springframework.util.comparator.Comparators;
/** /**
* A {@link Comparator} that converts values before they are compared. * A {@link Comparator} that converts values before they are compared.
* The specified {@link Converter} will be used to convert each value *
* before it passed to the underlying {@code Comparator}. * <p>The specified {@link Converter} will be used to convert each value
* before it is passed to the underlying {@code Comparator}.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 3.2 * @since 3.2
@ -82,8 +83,8 @@ public class ConvertingComparator<S, T> implements Comparator<S> {
} }
/** /**
* Create a new {@link ConvertingComparator} that compares {@link java.util.Map.Entry * Create a new {@link ConvertingComparator} that compares {@linkplain java.util.Map.Entry
* map * entries} based on their {@link java.util.Map.Entry#getKey() keys}. * map entries} based on their {@linkplain java.util.Map.Entry#getKey() keys}.
* @param comparator the underlying comparator used to compare keys * @param comparator the underlying comparator used to compare keys
* @return a new {@link ConvertingComparator} instance * @return a new {@link ConvertingComparator} instance
*/ */
@ -92,8 +93,8 @@ public class ConvertingComparator<S, T> implements Comparator<S> {
} }
/** /**
* Create a new {@link ConvertingComparator} that compares {@link java.util.Map.Entry * Create a new {@link ConvertingComparator} that compares {@linkplain java.util.Map.Entry
* map entries} based on their {@link java.util.Map.Entry#getValue() values}. * map entries} based on their {@linkplain java.util.Map.Entry#getValue() values}.
* @param comparator the underlying comparator used to compare values * @param comparator the underlying comparator used to compare values
* @return a new {@link ConvertingComparator} instance * @return a new {@link ConvertingComparator} instance
*/ */
@ -111,8 +112,7 @@ public class ConvertingComparator<S, T> implements Comparator<S> {
private final Class<? extends T> targetType; private final Class<? extends T> targetType;
public ConversionServiceConverter(ConversionService conversionService, public ConversionServiceConverter(ConversionService conversionService, Class<? extends T> targetType) {
Class<? extends T> targetType) {
Assert.notNull(conversionService, "ConversionService must not be null"); Assert.notNull(conversionService, "ConversionService must not be null");
Assert.notNull(targetType, "TargetType must not be null"); Assert.notNull(targetType, "TargetType must not be null");
this.conversionService = conversionService; this.conversionService = conversionService;

8
spring-core/src/main/java/org/springframework/util/comparator/InstanceComparator.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -23,12 +23,12 @@ import org.springframework.util.Assert;
/** /**
* Compares objects based on an arbitrary class order. Allows objects to be sorted based * Compares objects based on an arbitrary class order. Allows objects to be sorted based
* on the types of class that they inherit, for example: this comparator can be used to * on the types of class that they inherit &mdash; for example, this comparator can be used
* sort a list {@code Number}s such that {@code Long}s occur before {@code Integer}s. * to sort a list of {@code Number}s such that {@code Long}s occur before {@code Integer}s.
* *
* <p>Only the specified {@code instanceOrder} classes are considered during comparison. * <p>Only the specified {@code instanceOrder} classes are considered during comparison.
* If two objects are both instances of the ordered type this comparator will return a * If two objects are both instances of the ordered type this comparator will return a
* {@code 0}. Consider combining with {@link Comparator#thenComparing(Comparator)} * value of {@code 0}. Consider combining with {@link Comparator#thenComparing(Comparator)}
* if additional sorting is required. * if additional sorting is required.
* *
* @author Phillip Webb * @author Phillip Webb