Browse Source

Merge pull request #42682 from quaff

* pr/42682:
  Strengthen package-like assertions

Closes gh-42682
pull/42725/head
Phillip Webb 1 year ago
parent
commit
dc78bd468c
  1. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/EnvironmentEndpointDocumentationTests.java
  2. 2
      spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/filterscannedentitydefinitions/MyEntityScanConfiguration.java
  3. 2
      spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/filterscannedentitydefinitions/MyEntityScanConfiguration.kt
  4. 2
      spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java
  5. 2
      spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/jar/Handler.java
  6. 4
      spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java

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

@ -138,7 +138,7 @@ class EnvironmentEndpointDocumentationTests extends MockMvcEndpointDocumentation @@ -138,7 +138,7 @@ class EnvironmentEndpointDocumentationTests extends MockMvcEndpointDocumentation
}
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)

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

@ -25,7 +25,7 @@ public class MyEntityScanConfiguration { @@ -25,7 +25,7 @@ public class MyEntityScanConfiguration {
@Bean
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

@ -26,7 +26,7 @@ class MyEntityScanConfiguration { @@ -26,7 +26,7 @@ class MyEntityScanConfiguration {
@Bean
fun entityScanFilter() : ManagedClassNameFilter {
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

@ -280,7 +280,7 @@ public class AutoConfigureAnnotationProcessor extends AbstractProcessor { @@ -280,7 +280,7 @@ public class AutoConfigureAnnotationProcessor extends AbstractProcessor {
}
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

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

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

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

Loading…
Cancel
Save