Skip to content

Commit b04803d

Browse files
committed
Polishing
1 parent f443cf9 commit b04803d

File tree

7 files changed

+9
-15
lines changed

7 files changed

+9
-15
lines changed

spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationInvoker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2020 the original author or authors.
2+
* Copyright 2002-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
2222
* Abstract the invocation of a cache operation.
2323
*
2424
* <p>Does not provide a way to transmit checked exceptions but
25-
* provide a special exception that should be used to wrap any
25+
* provides a special exception that should be used to wrap any
2626
* exception that was thrown by the underlying invocation.
2727
* Callers are expected to handle this issue type specifically.
2828
*

spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ default Clock getClock() {
7070
* wrapping a cron expression
7171
* @return a {@link ScheduledFuture} representing pending completion of the task,
7272
* or {@code null} if the given Trigger object never fires (i.e. returns
73-
* {@code null} from {@link Trigger#nextExecutionTime})
73+
* {@code null} from {@link Trigger#nextExecution})
7474
* @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted
7575
* for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
7676
* @see org.springframework.scheduling.support.CronTrigger

spring-core/src/main/java/org/springframework/core/SerializableTypeWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ interface TypeProvider extends Serializable {
159159

160160
/**
161161
* Return the source of the type, or {@code null} if not known.
162-
* <p>The default implementations returns {@code null}.
162+
* <p>The default implementation returns {@code null}.
163163
*/
164164
@Nullable
165165
default Object getSource() {

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
2323
import org.springframework.expression.EvaluationException;
2424
import org.springframework.expression.TypeComparator;
2525
import org.springframework.expression.spel.support.StandardTypeComparator;
26-
import org.springframework.lang.NonNull;
2726

2827
import static org.assertj.core.api.Assertions.assertThat;
2928

@@ -134,6 +133,7 @@ public void shouldUseCustomComparator() {
134133
assertThat(comparator.compare(t2, t1)).isPositive();
135134
}
136135

136+
137137
static class ComparableType implements Comparable<ComparableType> {
138138

139139
private final int id;
@@ -143,10 +143,9 @@ public ComparableType(int id) {
143143
}
144144

145145
@Override
146-
public int compareTo(@NonNull ComparableType other) {
146+
public int compareTo(ComparableType other) {
147147
return this.id - other.id;
148148
}
149-
150149
}
151150

152151
}

spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,7 @@ public void setReadTimeout(Duration readTimeout) {
142142
* {@link HttpURLConnection#setChunkedStreamingMode} methods of the underlying connection will never
143143
* be called.
144144
* @param outputStreaming if output streaming is enabled
145-
* @deprecated as of 6.1, this property is ignored with no direct replacement.
146-
* @deprecated since 6.1 requests are always streamed, as if this property is {@code true}
145+
* @deprecated as of 6.1 requests are always streamed, as if this property is {@code true}
147146
*/
148147
@Deprecated(since = "6.1", forRemoval = true)
149148
public void setOutputStreaming(boolean outputStreaming) {

spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpRequestFactoryTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ public void interceptor() throws Exception {
105105
}
106106
}
107107

108-
109108
@Test // SPR-13225
110109
public void headerWithNullValue() {
111110
HttpURLConnection urlConnection = mock();
@@ -117,7 +116,6 @@ public void headerWithNullValue() {
117116
}
118117

119118

120-
121119
private static class TestHttpURLConnection extends HttpURLConnection {
122120

123121
public TestHttpURLConnection(URL uri) {

spring-web/src/test/java/org/springframework/http/client/reactive/ClientHttpConnectorTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -51,7 +51,6 @@
5151
import org.springframework.http.HttpMethod;
5252
import org.springframework.http.HttpStatus;
5353
import org.springframework.http.ReactiveHttpOutputMessage;
54-
import org.springframework.lang.NonNull;
5554

5655
import static org.assertj.core.api.Assertions.assertThat;
5756
import static org.assertj.core.api.Assertions.fail;
@@ -173,7 +172,6 @@ void cancelResponseBody(ClientHttpConnector connector) {
173172
.verify();
174173
}
175174

176-
@NonNull
177175
private Buffer randomBody(int size) {
178176
Buffer responseBody = new Buffer();
179177
Random rnd = new Random();

0 commit comments

Comments
 (0)