Centralize internal packages in ClassLoaderHelper

- Rename ClassloadHelper to the more consistent ClassLoaderHelper
- Add a few internal packages
- Centralize the internal packages now that we have a common CL artifact

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;

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;

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<ClassPathElement> res = cl
  .getElementsWithResource(resourceName, true);

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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) {

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;

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);

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);

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;

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;

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;

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;

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<String, Assert> assertStartsWith(String starts) {
  private static IndexView index(List<Class<?>> 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)) {

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;
 

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<Class<?>> 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)) {

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;

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;
 

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

independent-projects/bootstrap/classloader-commons/src/main/java/io/quarkus/commons/classloading/ClassloadHelper.java → 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);
+ }
 }

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"));
+ }
+}

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

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<String, Object> 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 {