File tree Expand file tree Collapse file tree 7 files changed +9
-15
lines changed
spring-context/src/main/java/org/springframework
spring-core/src/main/java/org/springframework/core
spring-expression/src/test/java/org/springframework/expression/spel
main/java/org/springframework/http/client
test/java/org/springframework/http/client Expand file tree Collapse file tree 7 files changed +9
-15
lines changed Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2002-2020 the original author or authors.
2
+ * Copyright 2002-2023 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
22
22
* Abstract the invocation of a cache operation.
23
23
*
24
24
* <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
26
26
* exception that was thrown by the underlying invocation.
27
27
* Callers are expected to handle this issue type specifically.
28
28
*
Original file line number Diff line number Diff line change @@ -70,7 +70,7 @@ default Clock getClock() {
70
70
* wrapping a cron expression
71
71
* @return a {@link ScheduledFuture} representing pending completion of the task,
72
72
* 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 })
74
74
* @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted
75
75
* for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
76
76
* @see org.springframework.scheduling.support.CronTrigger
Original file line number Diff line number Diff line change @@ -159,7 +159,7 @@ interface TypeProvider extends Serializable {
159
159
160
160
/**
161
161
* 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}.
163
163
*/
164
164
@ Nullable
165
165
default Object getSource () {
Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2002-2021 the original author or authors.
2
+ * Copyright 2002-2023 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
23
23
import org .springframework .expression .EvaluationException ;
24
24
import org .springframework .expression .TypeComparator ;
25
25
import org .springframework .expression .spel .support .StandardTypeComparator ;
26
- import org .springframework .lang .NonNull ;
27
26
28
27
import static org .assertj .core .api .Assertions .assertThat ;
29
28
@@ -134,6 +133,7 @@ public void shouldUseCustomComparator() {
134
133
assertThat (comparator .compare (t2 , t1 )).isPositive ();
135
134
}
136
135
136
+
137
137
static class ComparableType implements Comparable <ComparableType > {
138
138
139
139
private final int id ;
@@ -143,10 +143,9 @@ public ComparableType(int id) {
143
143
}
144
144
145
145
@ Override
146
- public int compareTo (@ NonNull ComparableType other ) {
146
+ public int compareTo (ComparableType other ) {
147
147
return this .id - other .id ;
148
148
}
149
-
150
149
}
151
150
152
151
}
Original file line number Diff line number Diff line change @@ -142,8 +142,7 @@ public void setReadTimeout(Duration readTimeout) {
142
142
* {@link HttpURLConnection#setChunkedStreamingMode} methods of the underlying connection will never
143
143
* be called.
144
144
* @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}
147
146
*/
148
147
@ Deprecated (since = "6.1" , forRemoval = true )
149
148
public void setOutputStreaming (boolean outputStreaming ) {
Original file line number Diff line number Diff line change @@ -105,7 +105,6 @@ public void interceptor() throws Exception {
105
105
}
106
106
}
107
107
108
-
109
108
@ Test // SPR-13225
110
109
public void headerWithNullValue () {
111
110
HttpURLConnection urlConnection = mock ();
@@ -117,7 +116,6 @@ public void headerWithNullValue() {
117
116
}
118
117
119
118
120
-
121
119
private static class TestHttpURLConnection extends HttpURLConnection {
122
120
123
121
public TestHttpURLConnection (URL uri ) {
Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2002-2022 the original author or authors.
2
+ * Copyright 2002-2023 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
51
51
import org .springframework .http .HttpMethod ;
52
52
import org .springframework .http .HttpStatus ;
53
53
import org .springframework .http .ReactiveHttpOutputMessage ;
54
- import org .springframework .lang .NonNull ;
55
54
56
55
import static org .assertj .core .api .Assertions .assertThat ;
57
56
import static org .assertj .core .api .Assertions .fail ;
@@ -173,7 +172,6 @@ void cancelResponseBody(ClientHttpConnector connector) {
173
172
.verify ();
174
173
}
175
174
176
- @ NonNull
177
175
private Buffer randomBody (int size ) {
178
176
Buffer responseBody = new Buffer ();
179
177
Random rnd = new Random ();
You can’t perform that action at this time.
0 commit comments