From af6fd6c303252a2bf83770419bfd829849d12e70 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 19 Aug 2021 08:54:15 +0200 Subject: [PATCH] Polish "Fix duplicate "the" in Javadoc and XSD" See gh-27291 --- .../java/org/springframework/asm/RecordComponentWriter.java | 2 +- .../main/java/org/springframework/cglib/core/KeyFactory.java | 2 +- .../java/org/springframework/util/ConcurrentLruCache.java | 2 +- .../simp/config/AbstractMessageBrokerConfiguration.java | 4 ++-- .../web/servlet/mvc/condition/PatternsRequestCondition.java | 2 +- .../mvc/method/annotation/ServletInvocableHandlerMethod.java | 4 ++-- .../socket/config/annotation/SockJsServiceRegistration.java | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java b/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java index c36d2054fcb3..bd007ac26d61 100644 --- a/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java +++ b/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java @@ -37,7 +37,7 @@ final class RecordComponentWriter extends RecordComponentVisitor { /** The name_index field of the Record attribute. */ private final int nameIndex; - /** The descriptor_index field of the Record attribute. */ + /** The descriptor_index field of the the Record attribute. */ private final int descriptorIndex; /** diff --git a/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java b/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java index efcbc4c04486..e1503b85c13b 100644 --- a/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java +++ b/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java @@ -28,7 +28,7 @@ /** * Generates classes to handle multi-valued keys, for use in things such as Maps and Sets. - * Code for equals and hashCode methods follow + * Code for equals and hashCode methods follow the * the rules laid out in Effective Java by Joshua Bloch. *

* To generate a KeyFactory, you need to supply an interface which diff --git a/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java b/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java index ceee603e1720..1d99b4cd093f 100644 --- a/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java +++ b/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2021 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. diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java index b2e180686f12..fb4150ad7b0e 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java @@ -82,8 +82,8 @@ *

  • {@link #userDestinationMessageHandler}
    • * * - *

    {@link #brokerChannel} delivers messages from within the application to - * the respective message handlers. {@link #brokerMessagingTemplate} can be injected + *

    {@link #brokerChannel} delivers messages from within the application to the + * respective message handlers. {@link #brokerMessagingTemplate} can be injected * into any application component to send messages. * *

    Subclasses are responsible for the parts of the configuration that feed messages diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java index 875002618eeb..9539415ae388 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2021 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. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java index 1cc9d203ae4b..ae3473873dee 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java @@ -194,8 +194,8 @@ private String formatErrorForReturnValue(@Nullable Object returnValue) { } /** - * Create a nested ServletInvocableHandlerMethod subclass that returns - * the given value (or raises an Exception if the value is one) rather than + * Create a nested ServletInvocableHandlerMethod subclass that returns the + * given value (or raises an Exception if the value is one) rather than * actually invoking the controller method. This is useful when processing * async return values (e.g. Callable, DeferredResult, ListenableFuture). */ diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java index 6cd9c30cbb74..edc4e568a871 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2021 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. @@ -106,7 +106,7 @@ public SockJsServiceRegistration setTaskScheduler(TaskScheduler scheduler) { * also be set to point to a URL served by the application. *

    Note that it's possible to specify a relative URL in which case the URL * must be relative to the iframe URL. For example assuming a SockJS endpoint - * mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", + * mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then * the relative URL must start with "../../" to traverse up to the location * above the SockJS mapping. In case of a prefix-based Servlet mapping one more * traversal may be needed.