root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Strengthen package-like assertions 

See gh-42682
This commit is contained in:
Yanming Zhou 2024-10-15 14:49:07 +08:00 committed by Phillip Webb
parent 98dd7b2758
commit 87cc2efb64
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/EnvironmentEndpointDocumentationTests.java
View File

@ -138,7 +138,7 @@ class EnvironmentEndpointDocumentationTests extends MockMvcEndpointDocumentation
} }
private boolean retainKey(String key) { private boolean retainKey(String key) {
return key.startsWith("java.") || key.equals("JAVA_HOME") || key.startsWith("com.example"); return key.startsWith("java.") || key.equals("JAVA_HOME") || key.startsWith("com.example.");
} }
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)

2
spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/filterscannedentitydefinitions/MyEntityScanConfiguration.java
View File

@ -25,7 +25,7 @@ public class MyEntityScanConfiguration {
@Bean @Bean
public ManagedClassNameFilter entityScanFilter() { public ManagedClassNameFilter entityScanFilter() {
return (className) -> className.startsWith("com.example.app.customer"); return (className) -> className.startsWith("com.example.app.customer.");
} }
} }

2
spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/filterscannedentitydefinitions/MyEntityScanConfiguration.kt
View File

@ -26,7 +26,7 @@ class MyEntityScanConfiguration {
@Bean @Bean
fun entityScanFilter() : ManagedClassNameFilter { fun entityScanFilter() : ManagedClassNameFilter {
return ManagedClassNameFilter { className -> return ManagedClassNameFilter { className ->
className.startsWith("com.example.app.customer") className.startsWith("com.example.app.customer.")
} }
} }
} }

2
spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java
View File

@ -280,7 +280,7 @@ public class AutoConfigureAnnotationProcessor extends AbstractProcessor {
} }
private boolean isSpringClass(String type) { private boolean isSpringClass(String type) {
return type.startsWith("org.springframework"); return type.startsWith("org.springframework.");
} }
} }

2
spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/jar/Handler.java
View File

@ -150,7 +150,7 @@ public class Handler extends URLStreamHandler {
if (file.startsWith(TOMCAT_WARFILE_PROTOCOL) || !file.contains("*/")) { if (file.startsWith(TOMCAT_WARFILE_PROTOCOL) || !file.contains("*/")) {
try { try {
URLConnection connection = new URL(file).openConnection(); URLConnection connection = new URL(file).openConnection();
if (connection.getClass().getName().startsWith("org.apache.catalina")) { if (connection.getClass().getName().startsWith("org.apache.catalina.")) {
return true; return true;
} }
} }

4
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java
View File

@ -88,8 +88,8 @@ final class ModifiedClassPathClassLoader extends URLClassLoader {
@Override @Override
public Class<?> loadClass(String name) throws ClassNotFoundException { public Class<?> loadClass(String name) throws ClassNotFoundException {
if (name.startsWith("org.junit") || name.startsWith("org.hamcrest") if (name.startsWith("org.junit.") || name.startsWith("org.hamcrest.")
|| name.startsWith("io.netty.internal.tcnative")) { || name.startsWith("io.netty.internal.tcnative.")) {
return Class.forName(name, false, this.junitLoader); return Class.forName(name, false, this.junitLoader);
} }
String packageName = ClassUtils.getPackageName(name); String packageName = ClassUtils.getPackageName(name);