Skip to content

Commit bb06e92

Browse files
garyrussellartembilan
authored andcommitted
Upgrade checkstyle; fix violations
- a checkstyle bug prevented detection of javadoc tag ordering - `allowMissingJavadoc` is no longer available on `JavadocMethod` (replaced by `MissingJavadocMethod`)
1 parent ed82463 commit bb06e92

File tree

7 files changed

+9
-12
lines changed

7 files changed

+9
-12
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ subprojects { subproject ->
288288

289289
checkstyle {
290290
configDirectory.set(rootProject.file("src/checkstyle"))
291-
toolVersion = '8.24'
291+
toolVersion = '9.0'
292292
}
293293

294294
jar {

spring-amqp/src/main/java/org/springframework/amqp/core/Message.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ public Message(byte[] body, MessageProperties messageProperties) { //NOSONAR
7272

7373
/**
7474
* No longer used.
75-
* @deprecated toString() no longer deserializes the body.
7675
* @param patterns the patterns.
7776
* @since 1.5.7
77+
* @deprecated toString() no longer deserializes the body.
7878
*/
7979
@Deprecated
8080
public static void addAllowedListPatterns(String... patterns) {

spring-amqp/src/main/java/org/springframework/amqp/support/converter/DefaultJackson2JavaTypeMapper.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-2021 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.
@@ -52,8 +52,8 @@ public class DefaultJackson2JavaTypeMapper extends AbstractJavaTypeMapper implem
5252
/**
5353
* Return the precedence.
5454
* @return the precedence.
55-
* @see #setTypePrecedence(Jackson2JavaTypeMapper.TypePrecedence)
5655
* @since 1.6.
56+
* @see #setTypePrecedence(Jackson2JavaTypeMapper.TypePrecedence)
5757
*/
5858
@Override
5959
public TypePrecedence getTypePrecedence() {

spring-rabbit-test/src/main/java/org/springframework/amqp/rabbit/test/mockito/LatchCountDownAndCallRealMethodAnswer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2020 the original author or authors.
2+
* Copyright 2016-2021 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.
@@ -48,9 +48,9 @@ public class LatchCountDownAndCallRealMethodAnswer extends ForwardsInvocations {
4848

4949
/**
5050
* Get an instance with no delegate.
51+
* @param count to set in a {@link CountDownLatch}.
5152
* @deprecated in favor of
5253
* {@link #LatchCountDownAndCallRealMethodAnswer(int, Object)}.
53-
* @param count to set in a {@link CountDownLatch}.
5454
*/
5555
@Deprecated
5656
public LatchCountDownAndCallRealMethodAnswer(int count) {

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/AbstractConnectionFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,8 +529,8 @@ protected String getBeanName() {
529529
* connection to the broker will be attempted in random order.
530530
* @param shuffleAddresses true to shuffle the list.
531531
* @since 2.1.8
532-
* @see Collections#shuffle(List)
533532
* @deprecated since 2.3 in favor of
533+
* @see Collections#shuffle(List)
534534
* {@link #setAddressShuffleMode(AddressShuffleMode)}.
535535
*/
536536
@Deprecated

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CorrelationData.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ public SettableListenableFuture<Confirm> getFuture() {
9999
* Return a returned message, if any; requires a unique
100100
* {@link #CorrelationData(String) id}. Guaranteed to be populated before the future
101101
* is set.
102-
* @deprecated in favor of {@link #getReturned()}.
103102
* @return the message or null.
104103
* @since 2.1
104+
* @deprecated in favor of {@link #getReturned()}.
105105
*/
106106
@Deprecated
107107
@Nullable
@@ -117,8 +117,8 @@ public Message getReturnedMessage() {
117117
/**
118118
* Set a returned message for this correlation data.
119119
* @param returnedMessage the returned message.
120-
* @deprecated in favor of {@link #setReturned(ReturnedMessage)}.
121120
* @since 1.7.13
121+
* @deprecated in favor of {@link #setReturned(ReturnedMessage)}.
122122
*/
123123
@Deprecated
124124
public void setReturnedMessage(Message returnedMessage) {

src/checkstyle/checkstyle.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,6 @@
100100
<module name="JavadocType">
101101
<property name="scope" value="package"/>
102102
</module>
103-
<module name="JavadocMethod">
104-
<property name="allowMissingJavadoc" value="true"/>
105-
</module>
106103
<module name="JavadocVariable">
107104
<property name="scope" value="public"/>
108105
<property name="ignoreNamePattern" value="[A-Z_0-9]*"/>

0 commit comments

Comments
 (0)