From 2daefedf5edad34c69fd97d65230bc57d39621ca Mon Sep 17 00:00:00 2001 From: Rebwon Date: Sat, 13 Mar 2021 21:32:01 +0900 Subject: [PATCH 1/2] Polish See gh-26673 --- .../java/org/springframework/core/convert/TypeDescriptor.java | 2 +- .../core/env/JOptCommandLinePropertySourceTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java index 3e2aee82955..52f5f08ee40 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java +++ b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java @@ -515,7 +515,7 @@ public class TypeDescriptor implements Serializable { for (Annotation ann : getAnnotations()) { builder.append("@").append(ann.annotationType().getName()).append(' '); } - builder.append(getResolvableType().toString()); + builder.append(getResolvableType()); return builder.toString(); } diff --git a/spring-core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java b/spring-core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java index 0ebb4e99e8b..e630e4cb8dd 100644 --- a/spring-core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java +++ b/spring-core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java @@ -181,7 +181,7 @@ class JOptCommandLinePropertySourceTests { } public enum OptionEnum { - VAL_1; + VAL_1 } } From 12f8cdd71571449a9d583f1ecfaa16d334a566a0 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 13 Mar 2021 18:03:26 +0100 Subject: [PATCH 2/2] Update copyright year of changed files See gh-26673 --- .../java/org/springframework/core/convert/TypeDescriptor.java | 2 +- .../core/env/JOptCommandLinePropertySourceTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java index 52f5f08ee40..de43740b852 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java +++ b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2021 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. diff --git a/spring-core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java b/spring-core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java index e630e4cb8dd..8a11ab6cceb 100644 --- a/spring-core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java +++ b/spring-core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2021 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.