Browse Source

Merge pull request #26673 from Rebwon

* pr/26673:
  Update copyright year of changed files
  Polish

Closes gh-26673
pull/26674/head
Stephane Nicoll 5 years ago
parent
commit
9c030bacb8
  1. 4
      spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
  2. 4
      spring-core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java

4
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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -515,7 +515,7 @@ public class TypeDescriptor implements Serializable {
for (Annotation ann : getAnnotations()) { for (Annotation ann : getAnnotations()) {
builder.append("@").append(ann.annotationType().getName()).append(' '); builder.append("@").append(ann.annotationType().getName()).append(' ');
} }
builder.append(getResolvableType().toString()); builder.append(getResolvableType());
return builder.toString(); return builder.toString();
} }

4
spring-core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java vendored

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -181,7 +181,7 @@ class JOptCommandLinePropertySourceTests {
} }
public enum OptionEnum { public enum OptionEnum {
VAL_1; VAL_1
} }
} }

Loading…
Cancel
Save