diff --git a/framework-docs/modules/ROOT/pages/core/aot.adoc b/framework-docs/modules/ROOT/pages/core/aot.adoc index 8a3f9113e17..b16ac2728da 100644 --- a/framework-docs/modules/ROOT/pages/core/aot.adoc +++ b/framework-docs/modules/ROOT/pages/core/aot.adoc @@ -378,7 +378,7 @@ The container also supports creating a bean with {spring-framework-api}++/beans/ . The custom arguments require dynamic introspection of a matching constructor or factory method. Those arguments cannot be detected by AOT, so the necessary reflection hints will have to be provided manually. -. By-passing the instance supplier means that all other optimizations after creation are skipped as well. +. Bypassing the instance supplier means that all other optimizations after creation are skipped as well. For instance, autowiring on fields and methods will be skipped as they are handled in the instance supplier. Rather than having prototype-scoped beans created with custom arguments, we recommend a manual factory pattern where a bean is responsible for the creation of the instance. diff --git a/framework-docs/modules/ROOT/pages/core/beans/annotation-config/autowired-qualifiers.adoc b/framework-docs/modules/ROOT/pages/core/beans/annotation-config/autowired-qualifiers.adoc index d8c24257da2..08dd2c5fbe9 100644 --- a/framework-docs/modules/ROOT/pages/core/beans/annotation-config/autowired-qualifiers.adoc +++ b/framework-docs/modules/ROOT/pages/core/beans/annotation-config/autowired-qualifiers.adoc @@ -274,7 +274,7 @@ Kotlin:: Next, you can provide the information for the candidate bean definitions. You can add `` tags as sub-elements of the `` tag and then specify the `type` and `value` to match your custom qualifier annotations. The type is matched against the -fully-qualified class name of the annotation. Alternately, as a convenience if no risk of +fully-qualified class name of the annotation. Alternatively, as a convenience if no risk of conflicting names exists, you can use the short class name. The following example demonstrates both approaches: diff --git a/framework-docs/modules/ROOT/pages/core/expressions/language-ref/properties-arrays.adoc b/framework-docs/modules/ROOT/pages/core/expressions/language-ref/properties-arrays.adoc index f00e2485c36..a55e91a8acb 100644 --- a/framework-docs/modules/ROOT/pages/core/expressions/language-ref/properties-arrays.adoc +++ b/framework-docs/modules/ROOT/pages/core/expressions/language-ref/properties-arrays.adoc @@ -270,7 +270,7 @@ is applicable for typical implementations of indexed structures. NOTE: `ReflectiveIndexAccessor` also implements `CompilableIndexAccessor` in order to support xref:core/expressions/evaluation.adoc#expressions-spel-compilation[compilation] to bytecode for read access. Note, however, that the configured read-method must be -invokable via a `public` class or `public` interface for compilation to succeed. +invocable via a `public` class or `public` interface for compilation to succeed. The following code listings define a `Color` enum and `FruitMap` type that behaves like a map but does not implement the `java.util.Map` interface. Thus, if you want to index into diff --git a/framework-docs/modules/ROOT/pages/core/validation/beans-beans.adoc b/framework-docs/modules/ROOT/pages/core/validation/beans-beans.adoc index 2a968765e22..0996d28ca47 100644 --- a/framework-docs/modules/ROOT/pages/core/validation/beans-beans.adoc +++ b/framework-docs/modules/ROOT/pages/core/validation/beans-beans.adoc @@ -351,10 +351,10 @@ recognized and used as the `PropertyEditor` for `Something`-typed properties. [literal,subs="verbatim,quotes"] ---- com - chank - pop - Something - SomethingEditor // the PropertyEditor for the Something class +└── example + └── things + ├── *Something* + └── *SomethingEditor* // the PropertyEditor for the Something class ---- Note that you can also use the standard `BeanInfo` JavaBeans mechanism here as well @@ -366,10 +366,10 @@ following example uses the `BeanInfo` mechanism to explicitly register one or mo [literal,subs="verbatim,quotes"] ---- com - chank - pop - Something - SomethingBeanInfo // the BeanInfo for the Something class +└── example + └── things + ├── *Something* + └── *SomethingBeanInfo* // the BeanInfo for the Something class ---- The following Java source code for the referenced `SomethingBeanInfo` class diff --git a/framework-docs/modules/ROOT/pages/testing/testcontext-framework/bootstrapping.adoc b/framework-docs/modules/ROOT/pages/testing/testcontext-framework/bootstrapping.adoc index 8e83014d251..51f0861f055 100644 --- a/framework-docs/modules/ROOT/pages/testing/testcontext-framework/bootstrapping.adoc +++ b/framework-docs/modules/ROOT/pages/testing/testcontext-framework/bootstrapping.adoc @@ -19,6 +19,6 @@ meta-annotation. If a bootstrapper is not explicitly configured by using `WebTestContextBootstrapper` is used, depending on the presence of `@WebAppConfiguration`. Since the `TestContextBootstrapper` SPI is likely to change in the future (to accommodate -new requirements), we strongly encourage implementers not to implement this interface +new requirements), we strongly encourage implementors not to implement this interface directly but rather to extend `AbstractTestContextBootstrapper` or one of its concrete subclasses instead. diff --git a/framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-freemarker.adoc b/framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-freemarker.adoc index f9c312d5251..5fd59bd74cd 100644 --- a/framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-freemarker.adoc +++ b/framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-freemarker.adoc @@ -269,7 +269,7 @@ The parameters to any of the above macros have consistent meanings: For strictly sorted maps, you can use a `SortedMap` (such as a `TreeMap`) with a suitable `Comparator` and, for arbitrary Maps that should return values in insertion order, use a `LinkedHashMap` or a `LinkedMap` from `commons-collections`. -* `separator`: Where multiple options are available as discreet elements (radio buttons +* `separator`: Where multiple options are available as discrete elements (radio buttons or checkboxes), the sequence of characters used to separate each one in the list (such as `
`). * `attributes`: An additional string of arbitrary tags or text to be included within diff --git a/framework-docs/modules/ROOT/pages/web/webmvc/mvc-controller/ann-exceptionhandler.adoc b/framework-docs/modules/ROOT/pages/web/webmvc/mvc-controller/ann-exceptionhandler.adoc index 545c158678d..49c0fed3a5d 100644 --- a/framework-docs/modules/ROOT/pages/web/webmvc/mvc-controller/ann-exceptionhandler.adoc +++ b/framework-docs/modules/ROOT/pages/web/webmvc/mvc-controller/ann-exceptionhandler.adoc @@ -188,7 +188,7 @@ the content negotiation during the error handling phase will decide which conten | `View` | A `View` instance to use for rendering together with the implicit model -- determined through command objects and `@ModelAttribute` methods. The handler method may also - programmatically enrich the model by declaring a `Model` argument (descried earlier). + programmatically enrich the model by declaring a `Model` argument (described earlier). | `java.util.Map`, `org.springframework.ui.Model` | Attributes to be added to the implicit model with the view name implicitly determined diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/ConstructorResolverAotTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ConstructorResolverAotTests.java index b38e67df345..21982dc7226 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/ConstructorResolverAotTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/ConstructorResolverAotTests.java @@ -600,7 +600,7 @@ class ConstructorResolverAotTests { } } - @SuppressWarnings("unnused") + @SuppressWarnings("unused") static class ConstructorPrimitiveFallback { public ConstructorPrimitiveFallback(boolean useDefaultExecutor) { diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java index 02804c8ef11..180d6fd3690 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java +++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java @@ -113,7 +113,7 @@ public class MimeMessageHelper { /** * Constant indicating a multipart message with a single root multipart - * element of type "mixed". Texts, inline elements and attachements + * element of type "mixed". Texts, inline elements and attachments * will all get added to that root element. *

This was Spring 1.0's default behavior. It is known to work properly * on Outlook. However, other mail clients tend to misinterpret inline @@ -123,7 +123,7 @@ public class MimeMessageHelper { /** * Constant indicating a multipart message with a single root multipart - * element of type "related". Texts, inline elements and attachements + * element of type "related". Texts, inline elements and attachments * will all get added to that root element. *

This was the default behavior from Spring 1.1 up to 1.2 final. * This is the "Microsoft multipart mode", as natively sent by Outlook. diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Bean.java b/spring-context/src/main/java/org/springframework/context/annotation/Bean.java index f32df085292..27f116150b4 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/Bean.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/Bean.java @@ -204,7 +204,7 @@ import org.springframework.core.annotation.AliasFor; * ({@code BPP}) types. Because {@code BPP} objects must be instantiated early in the container * lifecycle, a non-static {@code @Bean} method that returns a {@code BPP} will cause eager * initialization of its declaring {@code @Configuration} class, which can make other beans in the - * {@code @Configuration} class (as well as depencencies of those beans) ineligible for full + * {@code @Configuration} class (as well as dependencies of those beans) ineligible for full * post-processing. To avoid these lifecycle issues, mark {@code BPP}-returning {@code @Bean} * methods as {@code static}. For example: * diff --git a/spring-context/src/main/kotlin/org/springframework/context/support/BeanDefinitionDsl.kt b/spring-context/src/main/kotlin/org/springframework/context/support/BeanDefinitionDsl.kt index 26ff4079a08..5945d93b65f 100644 --- a/spring-context/src/main/kotlin/org/springframework/context/support/BeanDefinitionDsl.kt +++ b/spring-context/src/main/kotlin/org/springframework/context/support/BeanDefinitionDsl.kt @@ -74,7 +74,7 @@ fun beans(init: BeanDefinitionDsl.() -> Unit) = BeanDefinitionDsl(init) * Class implementing functional bean definition Kotlin DSL. * * @constructor Create a new bean definition DSL. - * @param condition the predicate to fulfill in order to take in account the inner + * @param condition the predicate to fulfill in order to take into account the inner * bean definition block * @author Sebastien Deleuze * @since 5.0 @@ -1191,7 +1191,7 @@ open class BeanDefinitionDsl internal constructor (private val init: BeanDefinit /** * Take in account bean definitions enclosed in the provided lambda only when the * specified environment-based predicate is true. - * @param condition the predicate to fulfill in order to take in account the inner + * @param condition the predicate to fulfill in order to take into account the inner * bean definition block */ fun environment(condition: ConfigurableEnvironment.() -> Boolean, diff --git a/spring-core/src/main/java/org/springframework/core/convert/Property.java b/spring-core/src/main/java/org/springframework/core/convert/Property.java index b9c79611274..b0ee7bb0561 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/Property.java +++ b/spring-core/src/main/java/org/springframework/core/convert/Property.java @@ -162,7 +162,7 @@ public final class Property { return StringUtils.uncapitalize(this.writeMethod.getName().substring(index)); } else { - throw new IllegalStateException("Property is neither readable nor writeable"); + throw new IllegalStateException("Property is neither readable nor writable"); } } @@ -171,7 +171,7 @@ public final class Property { MethodParameter write = resolveWriteMethodParameter(); if (write == null) { if (read == null) { - throw new IllegalStateException("Property is neither readable nor writeable"); + throw new IllegalStateException("Property is neither readable nor writable"); } return read; } diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java index 4ad7c7f0096..78e27ddece7 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java @@ -256,7 +256,7 @@ class GenericConversionServiceTests { void interfaceToString() { conversionService.addConverter(new MyBaseInterfaceToStringConverter()); conversionService.addConverter(new ObjectToStringConverter()); - Object converted = conversionService.convert(new MyInterfaceImplementer(), String.class); + Object converted = conversionService.convert(new MyInterfaceImplementor(), String.class); assertThat(converted).isEqualTo("RESULT"); } @@ -264,7 +264,7 @@ class GenericConversionServiceTests { void interfaceArrayToStringArray() { conversionService.addConverter(new MyBaseInterfaceToStringConverter()); conversionService.addConverter(new ArrayToArrayConverter(conversionService)); - String[] converted = conversionService.convert(new MyInterface[] {new MyInterfaceImplementer()}, String[].class); + String[] converted = conversionService.convert(new MyInterface[] {new MyInterfaceImplementor()}, String[].class); assertThat(converted[0]).isEqualTo("RESULT"); } @@ -272,7 +272,7 @@ class GenericConversionServiceTests { void objectArrayToStringArray() { conversionService.addConverter(new MyBaseInterfaceToStringConverter()); conversionService.addConverter(new ArrayToArrayConverter(conversionService)); - String[] converted = conversionService.convert(new MyInterfaceImplementer[] {new MyInterfaceImplementer()}, String[].class); + String[] converted = conversionService.convert(new MyInterfaceImplementor[] {new MyInterfaceImplementor()}, String[].class); assertThat(converted[0]).isEqualTo("RESULT"); } @@ -631,7 +631,7 @@ class GenericConversionServiceTests { } - private static class MyInterfaceImplementer implements MyInterface { + private static class MyInterfaceImplementor implements MyInterface { } diff --git a/spring-expression/src/main/java/org/springframework/expression/TypeLocator.java b/spring-expression/src/main/java/org/springframework/expression/TypeLocator.java index e831adcce98..4d3570563f6 100644 --- a/spring-expression/src/main/java/org/springframework/expression/TypeLocator.java +++ b/spring-expression/src/main/java/org/springframework/expression/TypeLocator.java @@ -17,7 +17,7 @@ package org.springframework.expression; /** - * Implementers of this interface are expected to be able to locate types. + * Implementors of this interface are expected to be able to locate types. * *

They may use a custom {@link ClassLoader} and/or deal with common package * prefixes (for example, {@code java.lang}) however they wish. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveIndexAccessor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveIndexAccessor.java index 73ac07158fd..35248bd72ae 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveIndexAccessor.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveIndexAccessor.java @@ -44,7 +44,7 @@ import org.springframework.util.ReflectionUtils; * *

{@code ReflectiveIndexAccessor} also implements {@link CompilableIndexAccessor} * in order to support compilation to bytecode for read access. Note, however, - * that the configured read-method must be invokable via a public class or public + * that the configured read-method must be invocable via a public class or public * interface for compilation to succeed. * *

Example

diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java index 06f436dd0af..be538450a1a 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java @@ -310,7 +310,7 @@ class SetValueTests extends AbstractExpressionTests { if (DEBUG) { SpelUtilities.printAbstractSyntaxTree(System.out, e); } - assertThat(e.isWritable(context)).as("Expression is not writeable but should be").isTrue(); + assertThat(e.isWritable(context)).as("Expression is not writable but should be").isTrue(); e.setValue(context, value); assertThat(e.getValue(context, expectedType)).as("Retrieved value was not equal to set value").isEqualTo(value); } @@ -330,7 +330,7 @@ class SetValueTests extends AbstractExpressionTests { if (DEBUG) { SpelUtilities.printAbstractSyntaxTree(System.out, e); } - assertThat(e.isWritable(context)).as("Expression is not writeable but should be").isTrue(); + assertThat(e.isWritable(context)).as("Expression is not writable but should be").isTrue(); e.setValue(context, value); assertThat(expectedValue).isEqualTo(e.getValue(context)); } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java index 04e97a67e1a..ed95ac45fba 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java @@ -186,11 +186,11 @@ class ReflectionHelperTests extends AbstractExpressionTests { // Passing (Super) on call to (Sub[]) is not a match checkMatchVarargs(new Class[] {Super.class}, new Class[] {Sub[].class}, tc, null); - checkMatchVarargs(new Class[] {Unconvertable.class, String.class}, new Class[] {Sub.class, Super[].class}, tc, null); + checkMatchVarargs(new Class[] {Unconvertible.class, String.class}, new Class[] {Sub.class, Super[].class}, tc, null); checkMatchVarargs(new Class[] {Integer.class, Integer.class, String.class}, new Class[] {String.class, String.class, Super[].class}, tc, null); - checkMatchVarargs(new Class[] {Unconvertable.class, String.class}, new Class[] {Sub.class, Super[].class}, tc, null); + checkMatchVarargs(new Class[] {Unconvertible.class, String.class}, new Class[] {Sub.class, Super[].class}, tc, null); checkMatchVarargs(new Class[] {Integer.class, Integer.class, String.class}, new Class[] {String.class, String.class, Super[].class}, tc, null); @@ -519,7 +519,7 @@ class ReflectionHelperTests extends AbstractExpressionTests { } - static class Unconvertable { + static class Unconvertible { } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java index 8a93253df98..fff60f687eb 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java @@ -42,7 +42,7 @@ public abstract class AbstractDataFieldMaxValueIncrementer implements DataFieldM @Nullable private String incrementerName; - /** The length to which a string result should be pre-pended with zeroes. */ + /** The length to which a string result should be prepended with zeroes. */ protected int paddingLength = 0; @@ -99,7 +99,7 @@ public abstract class AbstractDataFieldMaxValueIncrementer implements DataFieldM /** * Set the padding length, i.e. the length to which a string result - * should be pre-pended with zeroes. + * should be prepended with zeroes. */ public void setPaddingLength(int paddingLength) { this.paddingLength = paddingLength; diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java index e199f36064b..bb516eec552 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java @@ -318,7 +318,7 @@ class StoredProcedureTests { List rs2 = (List) res.get("#result-set-2"); assertThat(rs2).hasSize(1); Object o2 = rs2.get(0); - assertThat(o2).as("wron type returned for result set 2").isInstanceOf(Map.class); + assertThat(o2).as("wrong type returned for result set 2").isInstanceOf(Map.class); Map m2 = (Map) o2; assertThat(m2.get("spam")).isEqualTo("Spam"); assertThat(m2.get("eggs")).isEqualTo("Eggs"); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/DestinationPatternsMessageConditionTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/DestinationPatternsMessageConditionTests.java index 21bcdf3e0af..b8da38121d9 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/DestinationPatternsMessageConditionTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/DestinationPatternsMessageConditionTests.java @@ -43,7 +43,7 @@ class DestinationPatternsMessageConditionTests { new DestinationPatternsMessageCondition(new String[] {"foo"}, new AntPathMatcher(".")); assertThat(c.getPatterns()) - .as("Pre-pending should be disabled when not using '/' as path separator") + .as("Prepending should be disabled when not using '/' as path separator") .containsExactly("foo"); } diff --git a/spring-test/src/main/java/org/springframework/test/context/TestContextBootstrapper.java b/spring-test/src/main/java/org/springframework/test/context/TestContextBootstrapper.java index bebef379685..8799bf3d19b 100644 --- a/spring-test/src/main/java/org/springframework/test/context/TestContextBootstrapper.java +++ b/spring-test/src/main/java/org/springframework/test/context/TestContextBootstrapper.java @@ -45,7 +45,7 @@ import java.util.List; *

Concrete implementations must provide a {@code public} no-args constructor. * *

WARNING: this SPI will likely change in the future in - * order to accommodate new requirements. Implementers are therefore strongly encouraged + * order to accommodate new requirements. Implementors are therefore strongly encouraged * not to implement this interface directly but rather to extend * {@link org.springframework.test.context.support.AbstractTestContextBootstrapper * AbstractTestContextBootstrapper} or one of its concrete subclasses instead. diff --git a/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java index 8d3a9d75ba0..2dae9c787d5 100644 --- a/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java +++ b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java @@ -73,8 +73,8 @@ class HttpHeadersTests { void writableHttpHeadersUnwrapsMultiple() { HttpHeaders originalExchangeHeaders = HttpHeaders.readOnlyHttpHeaders(new HttpHeaders()); HttpHeaders firewallHeaders = new HttpHeaders(originalExchangeHeaders); - HttpHeaders writeable = new HttpHeaders(firewallHeaders); - writeable.setContentType(MediaType.APPLICATION_JSON); + HttpHeaders writable = new HttpHeaders(firewallHeaders); + writable.setContentType(MediaType.APPLICATION_JSON); } @Test diff --git a/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java b/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java index b9f6eac126e..ff520a51282 100644 --- a/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java @@ -843,10 +843,10 @@ class PathPatternTests { parse("/hotels/{hotel}/booking"))).isEqualTo(1); assertThat(comparator.compare( - parse("/hotels/{hotel}/bookings/{booking}/cutomers/{customer}"), + parse("/hotels/{hotel}/bookings/{booking}/customers/{customer}"), parse("/**"))).isEqualTo(-1); assertThat(comparator.compare(parse("/**"), - parse("/hotels/{hotel}/bookings/{booking}/cutomers/{customer}"))).isEqualTo(1); + parse("/hotels/{hotel}/bookings/{booking}/customers/{customer}"))).isEqualTo(1); assertThat(comparator.compare(parse("/**"), parse("/**"))).isEqualTo(0); assertThat(comparator.compare(parse("/hotels/{hotel}"), parse("/hotels/*"))).isEqualTo(-1); @@ -855,16 +855,16 @@ class PathPatternTests { assertThat(comparator.compare(parse("/hotels/*"), parse("/hotels/*/**"))).isEqualTo(-1); assertThat(comparator.compare(parse("/hotels/*/**"), parse("/hotels/*"))).isEqualTo(1); -// TODO: shouldn't the wildcard lower the score? -// assertEquals(-1, -// comparator.compare(parse("/hotels/new"), parse("/hotels/new.*"))); + // TODO: shouldn't the wildcard lower the score? + // assertEquals(-1, + // comparator.compare(parse("/hotels/new"), parse("/hotels/new.*"))); // SPR-6741 assertThat(comparator.compare( parse("/hotels/{hotel}/bookings/{booking}/cutomers/{customer}"), parse("/hotels/**"))).isEqualTo(-1); assertThat(comparator.compare(parse("/hotels/**"), - parse("/hotels/{hotel}/bookings/{booking}/cutomers/{customer}"))).isEqualTo(1); + parse("/hotels/{hotel}/bookings/{booking}/customers/{customer}"))).isEqualTo(1); assertThat(comparator.compare(parse("/hotels/foo/bar/**"), parse("/hotels/{hotel}"))).isEqualTo(1); assertThat(comparator.compare(parse("/hotels/{hotel}"), diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java index 95b39fa0b5f..6a7b5e739e9 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java @@ -182,7 +182,7 @@ public class RedirectView extends AbstractUrlBasedView { } /** - * Create the target URL and, if necessary, pre-pend the contextPath, expand + * Create the target URL and, if necessary, prepend the contextPath, expand * URI template variables, append the current request query, and apply the * configured {@link #getRequestDataValueProcessor() * RequestDataValueProcessor}. diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java index 3d84fee8760..fabda435e6c 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java @@ -59,7 +59,7 @@ import org.springframework.web.context.ContextLoader; *

Since JSR-356 only allows Encoder/Decoder to be registered by type, instances * of this class are therefore managed by the WebSocket runtime, and do not need to * be registered as Spring Beans. They can, however, by injected with Spring-managed - * dependencies via {@link Autowired @Autowire}. + * dependencies via {@link Autowired @Autowired}. * *

Converters to convert between the {@link #getType() type} and {@code String} or * {@code ByteBuffer} should be registered.