Skip to content

Commit 3f0892b

Browse files
ngocnhan-tran1996rstoyanchev
authored andcommitted
Fix typos
Closes gh-34876 Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
1 parent 182d654 commit 3f0892b

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

spring-context/src/main/java/org/springframework/validation/ValidationUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2025 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.
@@ -250,7 +250,7 @@ public static void rejectIfEmptyOrWhitespace(
250250

251251
Assert.notNull(errors, "Errors object must not be null");
252252
Object value = errors.getFieldValue(field);
253-
if (value == null ||!StringUtils.hasText(value.toString())) {
253+
if (value == null || !StringUtils.hasText(value.toString())) {
254254
errors.rejectValue(field, errorCode, errorArgs, defaultMessage);
255255
}
256256
}

spring-core/src/test/java/org/springframework/core/annotation/AnnotationBackCompatibilityTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2025 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.
@@ -32,7 +32,7 @@
3232
class AnnotationBackCompatibilityTests {
3333

3434
@Test
35-
void multiplRoutesToMetaAnnotation() {
35+
void multipleRoutesToMetaAnnotation() {
3636
Class<?> source = WithMetaMetaTestAnnotation1AndMetaTestAnnotation2.class;
3737
// Merged annotation chooses lowest depth
3838
MergedAnnotation<TestAnnotation> mergedAnnotation = MergedAnnotations.from(source).get(TestAnnotation.class);

spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ void getDirectFromClassFavorsMoreLocallyDeclaredComposedAnnotationsOverInherited
983983
}
984984

985985
@Test
986-
void getDirectFromClassgetDirectFromClassMetaMetaAnnotatedClass() {
986+
void getDirectFromClassGetDirectFromClassMetaMetaAnnotatedClass() {
987987
MergedAnnotation<?> annotation = MergedAnnotations.from(
988988
MetaMetaAnnotatedClass.class, SearchStrategy.TYPE_HIERARCHY).get(Component.class);
989989
assertThat(annotation.getString("value")).isEqualTo("meta2");

spring-core/src/test/java/org/springframework/core/convert/converter/ConverterTests.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-2025 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.
@@ -46,7 +46,7 @@ void andThenWhenGivenConverterThenComposesInOrder() {
4646
}
4747

4848
@Test
49-
void andThenCanConvertfromDifferentSourceType() {
49+
void andThenCanConvertFromDifferentSourceType() {
5050
Converter<String, Integer> length = String::length;
5151
assertThat(length.andThen(this.moduloTwo).convert("example")).isEqualTo(1);
5252
assertThat(length.andThen(this.addOne).convert("example")).isEqualTo(8);

spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 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.
@@ -491,8 +491,8 @@ void patternComparator() {
491491
assertThat(comparator.compare("/hotels/{hotel}/bookings/{booking}", "/hotels/{hotel}/booking")).isEqualTo(1);
492492

493493
// SPR-10550
494-
assertThat(comparator.compare("/hotels/{hotel}/bookings/{booking}/cutomers/{customer}", "/**")).isEqualTo(-1);
495-
assertThat(comparator.compare("/**", "/hotels/{hotel}/bookings/{booking}/cutomers/{customer}")).isEqualTo(1);
494+
assertThat(comparator.compare("/hotels/{hotel}/bookings/{booking}/customers/{customer}", "/**")).isEqualTo(-1);
495+
assertThat(comparator.compare("/**", "/hotels/{hotel}/bookings/{booking}/customers/{customer}")).isEqualTo(1);
496496
assertThat(comparator.compare("/**", "/**")).isEqualTo(0);
497497

498498
assertThat(comparator.compare("/hotels/{hotel}", "/hotels/*")).isEqualTo(-1);
@@ -505,8 +505,8 @@ void patternComparator() {
505505
assertThat(comparator.compare("/hotels/{hotel}", "/hotels/{hotel}.*")).isEqualTo(2);
506506

507507
// SPR-6741
508-
assertThat(comparator.compare("/hotels/{hotel}/bookings/{booking}/cutomers/{customer}", "/hotels/**")).isEqualTo(-1);
509-
assertThat(comparator.compare("/hotels/**", "/hotels/{hotel}/bookings/{booking}/cutomers/{customer}")).isEqualTo(1);
508+
assertThat(comparator.compare("/hotels/{hotel}/bookings/{booking}/customers/{customer}", "/hotels/**")).isEqualTo(-1);
509+
assertThat(comparator.compare("/hotels/**", "/hotels/{hotel}/bookings/{booking}/customers/{customer}")).isEqualTo(1);
510510
assertThat(comparator.compare("/hotels/foo/bar/**", "/hotels/{hotel}")).isEqualTo(1);
511511
assertThat(comparator.compare("/hotels/{hotel}", "/hotels/foo/bar/**")).isEqualTo(-1);
512512

spring-core/src/test/kotlin/org/springframework/core/BridgeMethodResolverKotlinTests.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2025 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.
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test
2222
/**
2323
* Kotlin tests for [BridgeMethodResolver].
2424
*
25-
* @author Sebastien Deleuzes
25+
* @author Sebastien Deleuze
2626
*/
2727
class BridgeMethodResolverKotlinTests {
2828

spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 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.
@@ -103,7 +103,7 @@ void autowiredKeyDeserializer() throws IOException {
103103
}
104104

105105
@Test
106-
void applicationContextAwaretypeResolverBuilder() throws JsonProcessingException {
106+
void applicationContextAwareTypeResolverBuilder() throws JsonProcessingException {
107107
this.objectMapper.writeValueAsString(new Group());
108108
assertThat(CustomTypeResolverBuilder.isAutowiredFiledInitialized).isTrue();
109109
}

0 commit comments

Comments
 (0)