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

Merge branch '5.3.x'

This commit is contained in:
Brian Clozel 2022-03-24 13:32:31 +01:00
parent 72e7ae60d4 acf2955b96
commit 7161940b53
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-core/src/main/java/org/springframework/core/metrics/jfr/FlightRecorderStartupStep.java
View File

@ -20,9 +20,8 @@ import java.util.Iterator;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.jetbrains.annotations.NotNull;
import org.springframework.core.metrics.StartupStep; import org.springframework.core.metrics.StartupStep;
import org.springframework.lang.NonNull;
/** /**
* {@link StartupStep} implementation for the Java Flight Recorder. * {@link StartupStep} implementation for the Java Flight Recorder.
@ -115,7 +114,7 @@ class FlightRecorderStartupStep implements StartupStep {
add(key, value.get()); add(key, value.get());
} }
@NotNull @NonNull
@Override @Override
public Iterator<Tag> iterator() { public Iterator<Tag> iterator() {
return new TagsIterator(); return new TagsIterator();

4
spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeComparatorTests.java
View File

@ -18,12 +18,12 @@ package org.springframework.expression.spel;
import java.math.BigDecimal; import java.math.BigDecimal;
import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.expression.EvaluationException; import org.springframework.expression.EvaluationException;
import org.springframework.expression.TypeComparator; import org.springframework.expression.TypeComparator;
import org.springframework.expression.spel.support.StandardTypeComparator; import org.springframework.expression.spel.support.StandardTypeComparator;
import org.springframework.lang.NonNull;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -143,7 +143,7 @@ public class StandardTypeComparatorTests {
} }
@Override @Override
public int compareTo(@NotNull ComparableType other) { public int compareTo(@NonNull ComparableType other) {
return this.id - other.id; return this.id - other.id;
} }

4
spring-web/src/main/java/org/springframework/http/DefaultHttpStatusCode.java
View File

@ -18,7 +18,7 @@ package org.springframework.http;
import java.io.Serializable; import java.io.Serializable;
import org.jetbrains.annotations.NotNull; import org.springframework.lang.NonNull;
/** /**
* Default implementation of {@link HttpStatusCode}. * Default implementation of {@link HttpStatusCode}.
@ -79,7 +79,7 @@ final class DefaultHttpStatusCode
} }
@Override @Override
public int compareTo(@NotNull HttpStatusCode o) { public int compareTo(@NonNull HttpStatusCode o) {
return Integer.compare(this.value, o.value()); return Integer.compare(this.value, o.value());
} }

5
src/checkstyle/checkstyle.xml
View File

@ -134,6 +134,11 @@
<property name="regexp" value="true" /> <property name="regexp" value="true" />
<property name="illegalClasses" value="^org\.hamcrest\..+" /> <property name="illegalClasses" value="^org\.hamcrest\..+" />
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
<property name="id" value="bannedJetbrainsAnnotationsImports"/>
<property name="regexp" value="true" />
<property name="illegalClasses" value="^org\.jetbrains\.annotations\..+" />
</module>
<!-- Javadoc Comments --> <!-- Javadoc Comments -->
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck">