Browse Source

Polishing

pull/1336/head
Juergen Hoeller 9 years ago
parent
commit
cbd19153c4
  1. 2
      spring-context/src/test/java/org/springframework/context/annotation/Spr15275Tests.java
  2. 26
      spring-core/src/main/java/org/springframework/util/StringUtils.java
  3. 3
      spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java

2
spring-context/src/test/java/org/springframework/context/annotation/Spr15275Tests.java

@ -216,7 +216,7 @@ public class Spr15275Tests { @@ -216,7 +216,7 @@ public class Spr15275Tests {
public Class<?> getObjectType() {
return FooInterface.class;
}
};
}
protected interface FooInterface {

26
spring-core/src/main/java/org/springframework/util/StringUtils.java

@ -518,22 +518,20 @@ public abstract class StringUtils { @@ -518,22 +518,20 @@ public abstract class StringUtils {
if (!hasLength(str)) {
return str;
}
char baseChar = str.charAt(0);
char updatedChar;
if (capitalize) {
updatedChar = Character.toUpperCase(baseChar);
}
else {
char baseChar = str.charAt(0);
char updatedChar;
if (capitalize) {
updatedChar = Character.toUpperCase(baseChar);
}
else {
updatedChar = Character.toLowerCase(baseChar);
}
if (baseChar == updatedChar) {
return str;
}
char[] chars = str.toCharArray();
chars[0] = updatedChar;
return new String(chars, 0, chars.length);
updatedChar = Character.toLowerCase(baseChar);
}
if (baseChar == updatedChar) {
return str;
}
char[] chars = str.toCharArray();
chars[0] = updatedChar;
return new String(chars, 0, chars.length);
}
/**

3
spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-20167the original author or authors.
* Copyright 2002-2017 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.
@ -1985,7 +1985,6 @@ public class AnnotationUtilsTests { @@ -1985,7 +1985,6 @@ public class AnnotationUtilsTests {
static class GroupOfCharsClass {
}
@Retention(RetentionPolicy.RUNTIME)
@interface AliasForWithMissingAttributeDeclaration {

Loading…
Cancel
Save