Browse Source

Polishing

pull/31886/head
Juergen Hoeller 2 years ago
parent
commit
b04803de99
  1. 4
      spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationInvoker.java
  2. 2
      spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java
  3. 2
      spring-core/src/main/java/org/springframework/core/SerializableTypeWrapper.java
  4. 7
      spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeComparatorTests.java
  5. 3
      spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java
  6. 2
      spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpRequestFactoryTests.java
  7. 4
      spring-web/src/test/java/org/springframework/http/client/reactive/ClientHttpConnectorTests.java

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

@ -1,5 +1,5 @@ @@ -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.
@ -22,7 +22,7 @@ import org.springframework.lang.Nullable; @@ -22,7 +22,7 @@ import org.springframework.lang.Nullable;
* Abstract the invocation of a cache operation.
*
* <p>Does not provide a way to transmit checked exceptions but
* provide a special exception that should be used to wrap any
* provides a special exception that should be used to wrap any
* exception that was thrown by the underlying invocation.
* Callers are expected to handle this issue type specifically.
*

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

@ -70,7 +70,7 @@ public interface TaskScheduler { @@ -70,7 +70,7 @@ public interface TaskScheduler {
* wrapping a cron expression
* @return a {@link ScheduledFuture} representing pending completion of the task,
* or {@code null} if the given Trigger object never fires (i.e. returns
* {@code null} from {@link Trigger#nextExecutionTime})
* {@code null} from {@link Trigger#nextExecution})
* @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted
* for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
* @see org.springframework.scheduling.support.CronTrigger

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

@ -159,7 +159,7 @@ final class SerializableTypeWrapper { @@ -159,7 +159,7 @@ final class SerializableTypeWrapper {
/**
* Return the source of the type, or {@code null} if not known.
* <p>The default implementations returns {@code null}.
* <p>The default implementation returns {@code null}.
*/
@Nullable
default Object getSource() {

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

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 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.
@ -23,7 +23,6 @@ import org.junit.jupiter.api.Test; @@ -23,7 +23,6 @@ import org.junit.jupiter.api.Test;
import org.springframework.expression.EvaluationException;
import org.springframework.expression.TypeComparator;
import org.springframework.expression.spel.support.StandardTypeComparator;
import org.springframework.lang.NonNull;
import static org.assertj.core.api.Assertions.assertThat;
@ -134,6 +133,7 @@ public class StandardTypeComparatorTests { @@ -134,6 +133,7 @@ public class StandardTypeComparatorTests {
assertThat(comparator.compare(t2, t1)).isPositive();
}
static class ComparableType implements Comparable<ComparableType> {
private final int id;
@ -143,10 +143,9 @@ public class StandardTypeComparatorTests { @@ -143,10 +143,9 @@ public class StandardTypeComparatorTests {
}
@Override
public int compareTo(@NonNull ComparableType other) {
public int compareTo(ComparableType other) {
return this.id - other.id;
}
}
}

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

@ -142,8 +142,7 @@ public class SimpleClientHttpRequestFactory implements ClientHttpRequestFactory @@ -142,8 +142,7 @@ public class SimpleClientHttpRequestFactory implements ClientHttpRequestFactory
* {@link HttpURLConnection#setChunkedStreamingMode} methods of the underlying connection will never
* be called.
* @param outputStreaming if output streaming is enabled
* @deprecated as of 6.1, this property is ignored with no direct replacement.
* @deprecated since 6.1 requests are always streamed, as if this property is {@code true}
* @deprecated as of 6.1 requests are always streamed, as if this property is {@code true}
*/
@Deprecated(since = "6.1", forRemoval = true)
public void setOutputStreaming(boolean outputStreaming) {

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

@ -105,7 +105,6 @@ public class SimpleClientHttpRequestFactoryTests extends AbstractHttpRequestFact @@ -105,7 +105,6 @@ public class SimpleClientHttpRequestFactoryTests extends AbstractHttpRequestFact
}
}
@Test // SPR-13225
public void headerWithNullValue() {
HttpURLConnection urlConnection = mock();
@ -117,7 +116,6 @@ public class SimpleClientHttpRequestFactoryTests extends AbstractHttpRequestFact @@ -117,7 +116,6 @@ public class SimpleClientHttpRequestFactoryTests extends AbstractHttpRequestFact
}
private static class TestHttpURLConnection extends HttpURLConnection {
public TestHttpURLConnection(URL uri) {

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

@ -1,5 +1,5 @@ @@ -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.
@ -51,7 +51,6 @@ import org.springframework.core.io.buffer.DefaultDataBufferFactory; @@ -51,7 +51,6 @@ import org.springframework.core.io.buffer.DefaultDataBufferFactory;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.ReactiveHttpOutputMessage;
import org.springframework.lang.NonNull;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
@ -173,7 +172,6 @@ public class ClientHttpConnectorTests { @@ -173,7 +172,6 @@ public class ClientHttpConnectorTests {
.verify();
}
@NonNull
private Buffer randomBody(int size) {
Buffer responseBody = new Buffer();
Random rnd = new Random();

Loading…
Cancel
Save