diff --git a/spring-context/src/test/java/example/scannable/_package.java b/spring-context/src/test/java/example/scannable/PackageMarker.java
similarity index 83%
rename from spring-context/src/test/java/example/scannable/_package.java
rename to spring-context/src/test/java/example/scannable/PackageMarker.java
index 2f0de24204..5ee79482a7 100644
--- a/spring-context/src/test/java/example/scannable/_package.java
+++ b/spring-context/src/test/java/example/scannable/PackageMarker.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -16,10 +16,10 @@
package example.scannable;
-
/**
- * Marker class for example.scannable package.
+ * Marker class for {@code example.scannable} package.
*
* @see org.springframework.context.annotation.ComponentScan#basePackageClasses()
*/
-public class _package { }
+public class PackageMarker {
+}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationIntegrationTests.java
index 6c20e2dbff..86b6077292 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationIntegrationTests.java
@@ -78,7 +78,7 @@ public class ComponentScanAnnotationIntegrationTests {
@Test
public void controlScan() {
AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
- ctx.scan(example.scannable._package.class.getPackage().getName());
+ ctx.scan(example.scannable.PackageMarker.class.getPackage().getName());
ctx.refresh();
assertThat(ctx.containsBean("fooServiceImpl")).as(
"control scan for example.scannable package failed to register FooServiceImpl bean").isTrue();
@@ -326,7 +326,7 @@ public class ComponentScanAnnotationIntegrationTests {
@Configuration
-@ComponentScan(basePackageClasses = example.scannable._package.class)
+@ComponentScan(basePackageClasses = example.scannable.PackageMarker.class)
class ComponentScanAnnotatedConfig {
@Bean
@@ -456,7 +456,7 @@ class ComponentScanWithMultipleAnnotationIncludeFilters2 {}
@ComponentScan(
value = "example.scannable",
basePackages = "example.scannable",
- basePackageClasses = example.scannable._package.class)
+ basePackageClasses = example.scannable.PackageMarker.class)
class ComponentScanWithBasePackagesAndValueAlias {}
diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
index acbc9db090..96d98fb239 100644
--- a/src/checkstyle/checkstyle.xml
+++ b/src/checkstyle/checkstyle.xml
@@ -51,6 +51,14 @@
+
+
+
+
+
+
+