Polishing

jhoeller · jhoeller · commit cbd19153c48b · 2017-02-22T16:53:54.000+01:00
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr15275Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr15275Tests.java
@@ -216,7 +216,7 @@ public Foo getObject() {
 		public Class<?> getObjectType() {
 			return FooInterface.class;
 		}
-	};
+	}
 
 
 	protected interface FooInterface {
diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -518,22 +518,20 @@ private static String changeFirstCharacterCase(String str, boolean capitalize) {
 		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);
 	}
 
 	/**
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java
@@ -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 @@ static class SimpleConfigTestCase {
 	static class GroupOfCharsClass {
 	}
 
-
 	@Retention(RetentionPolicy.RUNTIME)
 	@interface AliasForWithMissingAttributeDeclaration {
 

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ public Foo getObject() {`
`216`	`216`	`public Class<?> getObjectType() {`
`217`	`217`	`return FooInterface.class;`
`218`	`218`	`}`
`219`		`- };`
	`219`	`+ }`
`220`	`220`
`221`	`221`
`222`	`222`	`protected interface FooInterface {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-20167the original author or authors.`
	`2`	`+ * Copyright 2002-2017 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -1985,7 +1985,6 @@ static class SimpleConfigTestCase {`
`1985`	`1985`	`static class GroupOfCharsClass {`
`1986`	`1986`	`}`
`1987`	`1987`
`1988`		`-`
`1989`	`1988`	`@Retention(RetentionPolicy.RUNTIME)`
`1990`	`1989`	`@interface AliasForWithMissingAttributeDeclaration {`
`1991`	`1990`