Merge pull request #26448 from weixsun

* pr/26448:
  Update copyright year of changed files
  Remove redundant suppression

Closes gh-26448
This commit is contained in:
Stephane Nicoll 2021-05-16 15:30:35 +02:00
commit ce5b13a67c
10 changed files with 7 additions and 17 deletions

View File

@ -420,7 +420,6 @@ abstract class AbstractJpaAutoConfigurationTests {
} }
@SuppressWarnings("serial")
static class CustomJpaTransactionManager extends JpaTransactionManager { static class CustomJpaTransactionManager extends JpaTransactionManager {
} }

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-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.
@ -61,7 +61,6 @@ class ResourcePropertiesBindingTests {
}; };
} }
@SuppressWarnings("deprecation")
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(ResourceProperties.class) @EnableConfigurationProperties(ResourceProperties.class)
static class TestConfiguration { static class TestConfiguration {

View File

@ -847,7 +847,6 @@ class WebMvcAutoConfigurationTests {
@Test @Test
@Deprecated @Deprecated
@SuppressWarnings("deprecation")
void useSuffixPatternMatch() { void useSuffixPatternMatch() {
this.contextRunner.withPropertyValues("spring.mvc.pathmatch.use-suffix-pattern:true", this.contextRunner.withPropertyValues("spring.mvc.pathmatch.use-suffix-pattern:true",
"spring.mvc.pathmatch.use-registered-suffix-pattern:true").run((context) -> { "spring.mvc.pathmatch.use-registered-suffix-pattern:true").run((context) -> {

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-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.
@ -34,7 +34,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Phillip Webb * @author Phillip Webb
*/ */
@Deprecated @Deprecated
@SuppressWarnings("deprecation")
@ExtendWith(SpringExtension.class) @ExtendWith(SpringExtension.class)
@DirtiesContext @DirtiesContext
@ContextConfiguration(classes = ConfigFileApplicationContextInitializerTests.Config.class, @ContextConfiguration(classes = ConfigFileApplicationContextInitializerTests.Config.class,

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-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.
@ -42,7 +42,6 @@ class AtomikosConnectionFactoryBeanTests {
verify(bean).close(); verify(bean).close();
} }
@SuppressWarnings("serial")
static class MockAtomikosConnectionFactoryBean extends AtomikosConnectionFactoryBean { static class MockAtomikosConnectionFactoryBean extends AtomikosConnectionFactoryBean {
@Override @Override

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-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.
@ -42,7 +42,6 @@ class AtomikosDataSourceBeanTests {
verify(bean).close(); verify(bean).close();
} }
@SuppressWarnings("serial")
static class MockAtomikosDataSourceBean extends AtomikosDataSourceBean { static class MockAtomikosDataSourceBean extends AtomikosDataSourceBean {
@Override @Override

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-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.
@ -142,7 +142,6 @@ class AnnotationConfigServletWebServerApplicationContextTests {
} }
@Component @Component
@SuppressWarnings("serial")
static class ExampleServletWithAutowired extends GenericServlet { static class ExampleServletWithAutowired extends GenericServlet {
@Autowired @Autowired

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-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.
@ -28,7 +28,6 @@ import javax.servlet.ServletResponse;
* *
* @author Phillip Webb * @author Phillip Webb
*/ */
@SuppressWarnings("serial")
public class MockServlet extends GenericServlet { public class MockServlet extends GenericServlet {
@Override @Override

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-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.
@ -44,7 +44,6 @@ class SampleCouchbaseApplicationTests {
} }
private boolean serverNotRunning(RuntimeException ex) { private boolean serverNotRunning(RuntimeException ex) {
@SuppressWarnings("serial")
NestedCheckedException nested = new NestedCheckedException("failed", ex) { NestedCheckedException nested = new NestedCheckedException("failed", ex) {
}; };
if (nested.contains(FeatureNotAvailableException.class)) { if (nested.contains(FeatureNotAvailableException.class)) {

View File

@ -67,7 +67,6 @@ class SampleLiquibaseApplicationTests {
.contains("Successfully released change log lock"); .contains("Successfully released change log lock");
} }
@SuppressWarnings("serial")
private boolean serverNotRunning(IllegalStateException ex) { private boolean serverNotRunning(IllegalStateException ex) {
NestedCheckedException nested = new NestedCheckedException("failed", ex) { NestedCheckedException nested = new NestedCheckedException("failed", ex) {
}; };