diff --git a/core/deployment/src/main/java/io/quarkus/deployment/CodeGenerator.java b/core/deployment/src/main/java/io/quarkus/deployment/CodeGenerator.java index 92abc57bd3e642..36dae8b38f8f3f 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/CodeGenerator.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/CodeGenerator.java @@ -1,6 +1,6 @@ package io.quarkus.deployment; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import java.io.BufferedWriter; import java.io.IOException; diff --git a/core/deployment/src/main/java/io/quarkus/deployment/GeneratedClassGizmoAdaptor.java b/core/deployment/src/main/java/io/quarkus/deployment/GeneratedClassGizmoAdaptor.java index eaff60bf8855aa..1d34bdc33380e7 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/GeneratedClassGizmoAdaptor.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/GeneratedClassGizmoAdaptor.java @@ -1,6 +1,6 @@ package io.quarkus.deployment; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import java.io.StringWriter; import java.io.Writer; diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedDevModeMain.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedDevModeMain.java index 7fb810f807708b..d6864a09457fa2 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedDevModeMain.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedDevModeMain.java @@ -37,7 +37,7 @@ import io.quarkus.builder.BuildChainBuilder; import io.quarkus.builder.BuildContext; import io.quarkus.builder.BuildStep; -import io.quarkus.commons.classloading.ClassloadHelper; +import io.quarkus.commons.classloading.ClassLoaderHelper; import io.quarkus.deployment.builditem.ApplicationClassPredicateBuildItem; import io.quarkus.deployment.console.ConsoleCommand; import io.quarkus.deployment.console.ConsoleStateManager; @@ -481,7 +481,7 @@ public void execute(BuildContext context) { public boolean test(String s) { QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread() .getContextClassLoader(); - String resourceName = ClassloadHelper.fromClassNameToResourceName(s); + String resourceName = ClassLoaderHelper.fromClassNameToResourceName(s); //if the class file is present in this (and not the parent) CL then it is an application class List res = cl .getElementsWithResource(resourceName, true); diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/filesystem/ReloadableFileManager.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/filesystem/ReloadableFileManager.java index f3ae3a718453bf..f2b6043d06244c 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/filesystem/ReloadableFileManager.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/filesystem/ReloadableFileManager.java @@ -1,6 +1,6 @@ package io.quarkus.deployment.dev.filesystem; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import java.io.File; import java.io.IOException; diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java index d1b59bbb95935a..f33f204c47bb05 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java @@ -1,6 +1,6 @@ package io.quarkus.deployment.dev.testing; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import java.io.IOException; import java.io.InputStream; diff --git a/core/deployment/src/main/java/io/quarkus/deployment/index/IndexWrapper.java b/core/deployment/src/main/java/io/quarkus/deployment/index/IndexWrapper.java index 03d59b48f2d258..3ad7a589dbb010 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/index/IndexWrapper.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/index/IndexWrapper.java @@ -1,6 +1,6 @@ package io.quarkus.deployment.index; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import java.io.IOException; import java.io.InputStream; diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java index 4329186938c63e..7791e149c73b88 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java @@ -1,6 +1,6 @@ package io.quarkus.deployment.pkg.steps; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import static io.quarkus.deployment.pkg.PackageConfig.JarConfig.JarType.*; import java.io.BufferedInputStream; diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/AdditionalClassLoaderResourcesBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/AdditionalClassLoaderResourcesBuildStep.java index 2b1a8fbdf8d5ca..9eb2aacd91fe26 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/AdditionalClassLoaderResourcesBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/AdditionalClassLoaderResourcesBuildStep.java @@ -1,6 +1,6 @@ package io.quarkus.deployment.steps; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import java.util.ArrayList; import java.util.Collections; diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/BannerProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/BannerProcessor.java index b881235bd7375d..bce66170f08006 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/BannerProcessor.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/BannerProcessor.java @@ -1,6 +1,6 @@ package io.quarkus.deployment.steps; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ClassTransformingBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ClassTransformingBuildStep.java index d318e12f5a584a..b91ed1874d636e 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ClassTransformingBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ClassTransformingBuildStep.java @@ -1,6 +1,6 @@ package io.quarkus.deployment.steps; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import java.io.File; import java.io.FileOutputStream; diff --git a/core/deployment/src/main/java/io/quarkus/deployment/util/IoUtil.java b/core/deployment/src/main/java/io/quarkus/deployment/util/IoUtil.java index 132efb7da3d528..a4400f8a8b79c9 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/util/IoUtil.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/util/IoUtil.java @@ -1,6 +1,6 @@ package io.quarkus.deployment.util; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import java.io.IOException; import java.io.InputStream; diff --git a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java index 4589a5d5407c79..14036bffd70db5 100644 --- a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java +++ b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java @@ -1,6 +1,6 @@ package io.quarkus.runner.bootstrap; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import java.io.Closeable; import java.io.File; diff --git a/core/deployment/src/test/java/io/quarkus/deployment/pkg/steps/BannerProcessorTest.java b/core/deployment/src/test/java/io/quarkus/deployment/pkg/steps/BannerProcessorTest.java index 37a61aa51272b6..2260e1bb3def4a 100644 --- a/core/deployment/src/test/java/io/quarkus/deployment/pkg/steps/BannerProcessorTest.java +++ b/core/deployment/src/test/java/io/quarkus/deployment/pkg/steps/BannerProcessorTest.java @@ -1,6 +1,6 @@ package io.quarkus.deployment.pkg.steps; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/core/deployment/src/test/java/io/quarkus/deployment/util/JandexUtilTest.java b/core/deployment/src/test/java/io/quarkus/deployment/util/JandexUtilTest.java index 518a550c787a7a..d92f7d07bda51d 100644 --- a/core/deployment/src/test/java/io/quarkus/deployment/util/JandexUtilTest.java +++ b/core/deployment/src/test/java/io/quarkus/deployment/util/JandexUtilTest.java @@ -16,7 +16,7 @@ import org.jboss.jandex.Type.Kind; import org.junit.jupiter.api.Test; -import io.quarkus.commons.classloading.ClassloadHelper; +import io.quarkus.commons.classloading.ClassLoaderHelper; public class JandexUtilTest { @@ -309,7 +309,7 @@ private static Index index(Class... classes) { for (Class clazz : classes) { try { try (InputStream stream = JandexUtilTest.class.getClassLoader() - .getResourceAsStream(ClassloadHelper.fromClassNameToResourceName(clazz.getName()))) { + .getResourceAsStream(ClassLoaderHelper.fromClassNameToResourceName(clazz.getName()))) { indexer.index(stream); } } catch (IOException e) { diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/scan/QuarkusScanner.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/scan/QuarkusScanner.java index 945a92c98f17f2..6332d9f64c5b8c 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/scan/QuarkusScanner.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/scan/QuarkusScanner.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.runtime.boot.scan; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import java.util.Collections; import java.util.HashSet; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TypeInfosTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TypeInfosTest.java index 9094b70283d169..79ab0046416cae 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TypeInfosTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TypeInfosTest.java @@ -19,7 +19,7 @@ import org.jboss.jandex.ParameterizedType; import org.junit.jupiter.api.Test; -import io.quarkus.commons.classloading.ClassloadHelper; +import io.quarkus.commons.classloading.ClassLoaderHelper; import io.quarkus.qute.Engine; import io.quarkus.qute.Expression; import io.quarkus.qute.deployment.TypeInfos.Info; @@ -95,7 +95,7 @@ private void assertHints(String hintStr, String... expectedHints) { private static Index index(Class... classes) throws IOException { Indexer indexer = new Indexer(); for (Class clazz : classes) { - final String resourceName = ClassloadHelper.fromClassNameToResourceName(clazz.getName()); + final String resourceName = ClassLoaderHelper.fromClassNameToResourceName(clazz.getName()); try (InputStream stream = TypeInfosTest.class.getClassLoader() .getResourceAsStream(resourceName)) { indexer.index(stream); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TypesTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TypesTest.java index 98568867acfcfc..4ad91ce74408f1 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TypesTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TypesTest.java @@ -19,7 +19,7 @@ import org.jboss.jandex.Type; import org.junit.jupiter.api.Test; -import io.quarkus.commons.classloading.ClassloadHelper; +import io.quarkus.commons.classloading.ClassLoaderHelper; import io.quarkus.qute.EvalContext; import io.quarkus.qute.ValueResolver; import io.quarkus.qute.deployment.Types.AssignabilityCheck; @@ -79,7 +79,7 @@ public void testIsImplementorOf() throws IOException { private static Index index(Class... classes) throws IOException { Indexer indexer = new Indexer(); for (Class clazz : classes) { - final String resourceName = ClassloadHelper.fromClassNameToResourceName(clazz.getName()); + final String resourceName = ClassLoaderHelper.fromClassNameToResourceName(clazz.getName()); try (InputStream stream = TypesTest.class.getClassLoader() .getResourceAsStream(resourceName)) { indexer.index(stream); diff --git a/extensions/resteasy-reactive/rest/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/FilterClassIntrospector.java b/extensions/resteasy-reactive/rest/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/FilterClassIntrospector.java index fdd721de53765b..6593b783df768f 100644 --- a/extensions/resteasy-reactive/rest/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/FilterClassIntrospector.java +++ b/extensions/resteasy-reactive/rest/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/FilterClassIntrospector.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.deployment; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import java.io.IOException; import java.io.InputStream; diff --git a/extensions/resteasy-reactive/rest/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MessageBodyWriterTransformerUtils.java b/extensions/resteasy-reactive/rest/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MessageBodyWriterTransformerUtils.java index 988f75fc26e5e9..3eb111e0edf2eb 100644 --- a/extensions/resteasy-reactive/rest/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MessageBodyWriterTransformerUtils.java +++ b/extensions/resteasy-reactive/rest/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MessageBodyWriterTransformerUtils.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.deployment; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import java.io.IOException; import java.io.InputStream; diff --git a/extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/IllegalClassExceptionMapper.java b/extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/IllegalClassExceptionMapper.java index a4f30d79703b52..47468017db37a0 100644 --- a/extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/IllegalClassExceptionMapper.java +++ b/extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/IllegalClassExceptionMapper.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.simple; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import java.io.InputStream; import java.io.PrintWriter; diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/rolesallowed/ConfigExpressionDetectionTest.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/rolesallowed/ConfigExpressionDetectionTest.java index 745cd1ab9a18fb..7b2a2e7fb4a109 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/rolesallowed/ConfigExpressionDetectionTest.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/rolesallowed/ConfigExpressionDetectionTest.java @@ -1,6 +1,6 @@ package io.quarkus.security.test.rolesallowed; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import java.io.IOException; import java.io.InputStream; diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.java index edac2469c210b3..b1296dc69bb5b9 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.java @@ -41,7 +41,7 @@ import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; -import io.quarkus.commons.classloading.ClassloadHelper; +import io.quarkus.commons.classloading.ClassLoaderHelper; import io.quarkus.deployment.builditem.GeneratedClassBuildItem; import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; @@ -147,7 +147,7 @@ Function assertStartsWith(String starts) { private static IndexView index(List> classes) { Indexer indexer = new Indexer(); for (Class clazz : classes) { - final String resourceName = ClassloadHelper.fromClassNameToResourceName(clazz.getName()); + final String resourceName = ClassLoaderHelper.fromClassNameToResourceName(clazz.getName()); try { try (InputStream stream = DefaultSerdeConfigTest.class.getClassLoader() .getResourceAsStream(resourceName)) { diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/ReflectiveClassForValueSerializerPayloadTest.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/ReflectiveClassForValueSerializerPayloadTest.java index 3ba622207a71cf..1d6a1e87739a02 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/ReflectiveClassForValueSerializerPayloadTest.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/ReflectiveClassForValueSerializerPayloadTest.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.reactivemessaging.kafka.deployment; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.groups.Tuple.tuple; diff --git a/extensions/smallrye-reactive-messaging-pulsar/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/pulsar/deployment/DefaultSchemaConfigTest.java b/extensions/smallrye-reactive-messaging-pulsar/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/pulsar/deployment/DefaultSchemaConfigTest.java index cae0686c4c4498..898ade58c059d6 100644 --- a/extensions/smallrye-reactive-messaging-pulsar/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/pulsar/deployment/DefaultSchemaConfigTest.java +++ b/extensions/smallrye-reactive-messaging-pulsar/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/pulsar/deployment/DefaultSchemaConfigTest.java @@ -41,7 +41,7 @@ import org.reactivestreams.Subscriber; import io.quarkus.arc.deployment.SyntheticBeanBuildItem; -import io.quarkus.commons.classloading.ClassloadHelper; +import io.quarkus.commons.classloading.ClassLoaderHelper; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem; import io.quarkus.deployment.recording.RecorderContext; @@ -137,7 +137,7 @@ String generateId(Type type, String targetType) { private static IndexView index(List> classes) { Indexer indexer = new Indexer(); for (Class clazz : classes) { - final String resourceName = ClassloadHelper.fromClassNameToResourceName(clazz.getName()); + final String resourceName = ClassLoaderHelper.fromClassNameToResourceName(clazz.getName()); try { try (InputStream stream = DefaultSchemaConfigTest.class.getClassLoader() .getResourceAsStream(resourceName)) { diff --git a/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ConfigPropertyBuildItemCandidateUtil.java b/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ConfigPropertyBuildItemCandidateUtil.java index dd7394ffcd2f8d..9101cffd3a93d1 100644 --- a/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ConfigPropertyBuildItemCandidateUtil.java +++ b/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ConfigPropertyBuildItemCandidateUtil.java @@ -1,6 +1,6 @@ package io.quarkus.spring.boot.properties.deployment; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import java.io.IOException; import java.io.InputStream; diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/MethodNameParserTest.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/MethodNameParserTest.java index e30104afa08626..6f11148faf8d34 100644 --- a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/MethodNameParserTest.java +++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/MethodNameParserTest.java @@ -1,6 +1,6 @@ package io.quarkus.spring.data.deployment; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/independent-projects/bootstrap/benchmarks/src/main/java/io/quarkus/commons/benchmarks/BenchmarkClassnameToResourceName.java b/independent-projects/bootstrap/benchmarks/src/main/java/io/quarkus/commons/benchmarks/BenchmarkClassnameToResourceName.java index c3974b21551c22..13ea544c0eaf25 100644 --- a/independent-projects/bootstrap/benchmarks/src/main/java/io/quarkus/commons/benchmarks/BenchmarkClassnameToResourceName.java +++ b/independent-projects/bootstrap/benchmarks/src/main/java/io/quarkus/commons/benchmarks/BenchmarkClassnameToResourceName.java @@ -14,7 +14,7 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Warmup; -import io.quarkus.commons.classloading.ClassloadHelper; +import io.quarkus.commons.classloading.ClassLoaderHelper; /** * We benchmark this strategy with CompilerControl.Mode.EXCLUDE as this code @@ -36,7 +36,7 @@ public class BenchmarkClassnameToResourceName { @Benchmark public String checkNewMethod() { - return ClassloadHelper.fromClassNameToResourceName(arg); + return ClassLoaderHelper.fromClassNameToResourceName(arg); } @Benchmark diff --git a/independent-projects/bootstrap/classloader-commons/src/main/java/io/quarkus/commons/classloading/ClassloadHelper.java b/independent-projects/bootstrap/classloader-commons/src/main/java/io/quarkus/commons/classloading/ClassLoaderHelper.java similarity index 55% rename from independent-projects/bootstrap/classloader-commons/src/main/java/io/quarkus/commons/classloading/ClassloadHelper.java rename to independent-projects/bootstrap/classloader-commons/src/main/java/io/quarkus/commons/classloading/ClassLoaderHelper.java index fcf911a83e508b..92fc1c3bb4082e 100644 --- a/independent-projects/bootstrap/classloader-commons/src/main/java/io/quarkus/commons/classloading/ClassloadHelper.java +++ b/independent-projects/bootstrap/classloader-commons/src/main/java/io/quarkus/commons/classloading/ClassLoaderHelper.java @@ -1,8 +1,12 @@ package io.quarkus.commons.classloading; -public final class ClassloadHelper { +public final class ClassLoaderHelper { - private ClassloadHelper() { + private static final String JAVA = "java."; + private static final String JDK_INTERNAL = "jdk.internal."; + private static final String SUN_MISC = "sun.misc."; + + private ClassLoaderHelper() { //Not meant to be instantiated } @@ -18,4 +22,7 @@ public static String fromClassNameToResourceName(final String className) { return className.replace('.', '/').concat(".class"); } + public static boolean isInJdkPackage(String name) { + return name.startsWith(JAVA) || name.startsWith(JDK_INTERNAL) || name.startsWith(SUN_MISC); + } } diff --git a/independent-projects/bootstrap/classloader-commons/src/test/java/io/quarkus/commons/classloading/ClassLoaderHelperTest.java b/independent-projects/bootstrap/classloader-commons/src/test/java/io/quarkus/commons/classloading/ClassLoaderHelperTest.java new file mode 100644 index 00000000000000..52865306bb3ea6 --- /dev/null +++ b/independent-projects/bootstrap/classloader-commons/src/test/java/io/quarkus/commons/classloading/ClassLoaderHelperTest.java @@ -0,0 +1,22 @@ +package io.quarkus.commons.classloading; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class ClassLoaderHelperTest { + + @Test + public void testFromClassToResourceName() { + Assertions.assertEquals("java/lang/String.class", ClassLoaderHelper.fromClassNameToResourceName("java.lang.String")); + Assertions.assertEquals(".class", ClassLoaderHelper.fromClassNameToResourceName("")); + } + + @Test + public void testIsInJdkPackage() { + Assertions.assertFalse(ClassLoaderHelper.isInJdkPackage("io.quarkus.runtime.Test")); + Assertions.assertFalse(ClassLoaderHelper.isInJdkPackage("javax.validation.Validation")); + Assertions.assertTrue(ClassLoaderHelper.isInJdkPackage("java.lang.String")); + Assertions.assertTrue(ClassLoaderHelper.isInJdkPackage("jdk.internal.misc.Unsafe")); + Assertions.assertTrue(ClassLoaderHelper.isInJdkPackage("sun.misc.SignalHandler")); + } +} diff --git a/independent-projects/bootstrap/classloader-commons/src/test/java/io/quarkus/commons/classloading/ClassloadHelperTest.java b/independent-projects/bootstrap/classloader-commons/src/test/java/io/quarkus/commons/classloading/ClassloadHelperTest.java deleted file mode 100644 index 89f53fd0712bf5..00000000000000 --- a/independent-projects/bootstrap/classloader-commons/src/test/java/io/quarkus/commons/classloading/ClassloadHelperTest.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.quarkus.commons.classloading; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -public class ClassloadHelperTest { - - @Test - public void testFromClassToResourceName() { - Assertions.assertEquals("java/lang/String.class", ClassloadHelper.fromClassNameToResourceName("java.lang.String")); - Assertions.assertEquals(".class", ClassloadHelper.fromClassNameToResourceName("")); - } - -} diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java index 016dbdd191b44b..58b402043f4b44 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java @@ -1,6 +1,7 @@ package io.quarkus.bootstrap.classloading; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.isInJdkPackage; import java.io.ByteArrayInputStream; import java.io.Closeable; @@ -44,7 +45,6 @@ public class QuarkusClassLoader extends ClassLoader implements Closeable { private static final byte STATUS_CLOSED = -1; protected static final String META_INF_SERVICES = "META-INF/services/"; - protected static final String JAVA = "java."; static { registerAsParallelCapable(); @@ -186,7 +186,7 @@ private String sanitizeName(String name) { public boolean isParentFirst(String name) { ensureOpen(); - if (name.startsWith(JAVA)) { + if (isInJdkPackage(name)) { return true; } @@ -516,7 +516,7 @@ protected Class loadClass(String name, boolean resolve) throws ClassNotFoundE for (ClassLoaderEventListener l : classLoaderEventListeners) { l.loadClass(name, this.name); } - if (name.startsWith(JAVA)) { + if (isInJdkPackage(name)) { return parent.loadClass(name); } //even if the thread is interrupted we still want to be able to load classes diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptions.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptions.java index 3a2999a7da632e..c8fb1247fc64f9 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptions.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptions.java @@ -22,7 +22,7 @@ import org.apache.maven.shared.utils.cli.CommandLineUtils; import io.quarkus.bootstrap.util.PropertyUtils; -import io.quarkus.commons.classloading.ClassloadHelper; +import io.quarkus.commons.classloading.ClassLoaderHelper; /** * This class resolves relevant Maven command line options in case it's called @@ -257,7 +257,7 @@ private static Map invokeParser(ClassLoader cl, String[] args) t * classpath of the context classloader */ public static Path getClassOrigin(Class cls) throws IOException { - return getResourceOrigin(cls.getClassLoader(), ClassloadHelper.fromClassNameToResourceName(cls.getName())); + return getResourceOrigin(cls.getClassLoader(), ClassLoaderHelper.fromClassNameToResourceName(cls.getName())); } public static Path getResourceOrigin(ClassLoader cl, final String name) throws IOException { diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.java index 2ff5b966de87ae..42599e6ab11315 100644 --- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.java +++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.java @@ -1,6 +1,7 @@ package io.quarkus.bootstrap.runner; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.isInJdkPackage; import java.net.URL; import java.util.ArrayList; @@ -76,7 +77,7 @@ public Class loadClass(String name, boolean resolve) throws ClassNotFoundExce //note that for performance reasons this CL does not do parent first delegation //although the intention is not for it to be a true isolated parent first CL //'delegation misses' where the parent throws a ClassNotFoundException are very expensive - if (name.startsWith("java.")) { + if (isInJdkPackage(name)) { return getParent().loadClass(name); } String packageName = getPackageNameFromClassName(name); diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/maven/utilities/MojoUtils.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/maven/utilities/MojoUtils.java index b7ad89af505172..ace6c0bbfa14a5 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/maven/utilities/MojoUtils.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/maven/utilities/MojoUtils.java @@ -28,7 +28,7 @@ import io.fabric8.maven.Maven; import io.fabric8.maven.XMLFormat; -import io.quarkus.commons.classloading.ClassloadHelper; +import io.quarkus.commons.classloading.ClassLoaderHelper; /** * @author kameshs @@ -320,7 +320,7 @@ public static String[] readGavFromSettingsGradle(ByteArrayInputStream buildFileI * classpath of the context classloader */ public static Path getClassOrigin(Class cls) throws IOException { - return getResourceOrigin(cls.getClassLoader(), ClassloadHelper.fromClassNameToResourceName(cls.getName())); + return getResourceOrigin(cls.getClassLoader(), ClassLoaderHelper.fromClassNameToResourceName(cls.getName())); } public static Path getResourceOrigin(ClassLoader cl, final String name) throws IOException { diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/PathTestHelper.java b/test-framework/common/src/main/java/io/quarkus/test/common/PathTestHelper.java index d28982f69a6537..17d6c874fe54db 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/common/PathTestHelper.java +++ b/test-framework/common/src/main/java/io/quarkus/test/common/PathTestHelper.java @@ -1,6 +1,6 @@ package io.quarkus.test.common; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import java.io.File; import java.net.MalformedURLException; diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestExtension.java b/test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestExtension.java index 5896ee4f04115d..8a2ae5017d1d82 100644 --- a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestExtension.java +++ b/test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestExtension.java @@ -1,6 +1,6 @@ package io.quarkus.test.component; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import java.io.File; import java.io.FileOutputStream; diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java index 7ec294c594874b..a7bf610f10f448 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java @@ -1,6 +1,6 @@ package io.quarkus.test.junit; -import static io.quarkus.commons.classloading.ClassloadHelper.fromClassNameToResourceName; +import static io.quarkus.commons.classloading.ClassLoaderHelper.fromClassNameToResourceName; import static io.quarkus.test.common.PathTestHelper.getAppClassLocationForTestLocation; import static io.quarkus.test.common.PathTestHelper.getTestClassesLocation;