Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing (typo fixes etc, aligned with 5.0.x)

Browse Source
This commit is contained in:
Juergen Hoeller
2018-08-09 13:04:57 +02:00
parent 45598ca53a
commit 5a66a339a6
34 changed files with 159 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2018 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.
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
*/
public class LocalizedResourceHelper {
/** The default separator to use inbetween file name parts: an underscore */
/** The default separator to use in-between file name parts: an underscore */
public static final String DEFAULT_SEPARATOR = "_";
@@ -59,7 +59,7 @@ public class LocalizedResourceHelper {
}
/**
* Set the separator to use inbetween file name parts.
* Set the separator to use in-between file name parts.
* Default is an underscore ("_").
*/
public void setSeparator(String separator) {

9
spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java
View File

@@ -144,7 +144,8 @@ public class AnnotationUtilsTests {
assertNull(getAnnotation(bridgeMethod, Order.class));
assertNotNull(findAnnotation(bridgeMethod, Order.class));
assertNotNull(bridgeMethod.getAnnotation(Transactional.class));
// Inconsistent behavior between javac and Eclipse compiler
// assertNotNull(bridgeMethod.getAnnotation(Transactional.class));
assertNotNull(getAnnotation(bridgeMethod, Transactional.class));
assertNotNull(findAnnotation(bridgeMethod, Transactional.class));
}
@@ -186,7 +187,7 @@ public class AnnotationUtilsTests {
assertNotNull(order);
}
/** @since 4.1.2 */
// @since 4.1.2
@Test
public void findClassAnnotationFavorsMoreLocallyDeclaredComposedAnnotationsOverAnnotationsOnInterfaces() {
Component component = findAnnotation(ClassWithLocalMetaAnnotationAndMetaAnnotatedInterface.class, Component.class);
@@ -194,7 +195,7 @@ public class AnnotationUtilsTests {
assertEquals("meta2", component.value());
}
/** @since 4.0.3 */
// @since 4.0.3
@Test
public void findClassAnnotationFavorsMoreLocallyDeclaredComposedAnnotationsOverInheritedAnnotations() {
Transactional transactional = findAnnotation(SubSubClassWithInheritedAnnotation.class, Transactional.class);
@@ -202,7 +203,7 @@ public class AnnotationUtilsTests {
assertTrue("readOnly flag for SubSubClassWithInheritedAnnotation", transactional.readOnly());
}
/** @since 4.0.3 */
// @since 4.0.3
@Test
public void findClassAnnotationFavorsMoreLocallyDeclaredComposedAnnotationsOverInheritedComposedAnnotations() {
Component component = findAnnotation(SubSubClassWithInheritedMetaAnnotation.class, Component.class);