Fix generated BrotliInputStream constructor

Fixes apache#6896
jamesnetherton · Jan 9, 2025 · ccec32c · ccec32c
1 parent a90f8e7
commit ccec32c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/...in/java/org/apache/camel/quarkus/support/httpclient5/deployment/HttpClient5Processor.java b/...in/java/org/apache/camel/quarkus/support/httpclient5/deployment/HttpClient5Processor.java
@@ -73,19 +73,17 @@ void generateBrotliInputStreamClass(BuildProducer<GeneratedClassBuildItem> gener
 
             try (MethodCreator defaultConstructor = classCreator.getMethodCreator("<init>", void.class)) {
                 defaultConstructor.setModifiers(Modifier.PUBLIC);
-                defaultConstructor.invokeSpecialMethod(
-                        MethodDescriptor.ofMethod(BROTLI_INPUT_STREAM_CLASS_NAME, "<init>", void.class),
+                defaultConstructor.invokeSpecialMethod(MethodDescriptor.ofConstructor(InputStream.class),
                         defaultConstructor.getThis());
-                defaultConstructor.returnValue(null);
+                defaultConstructor.returnNull();
             }
 
             try (MethodCreator constructorWithInputStreamArg = classCreator.getMethodCreator("<init>", void.class,
                     InputStream.class)) {
                 constructorWithInputStreamArg.setModifiers(Modifier.PUBLIC);
-                constructorWithInputStreamArg.invokeSpecialMethod(
-                        MethodDescriptor.ofMethod(BROTLI_INPUT_STREAM_CLASS_NAME, "<init>", void.class),
+                constructorWithInputStreamArg.invokeSpecialMethod(MethodDescriptor.ofConstructor(InputStream.class),
                         constructorWithInputStreamArg.getThis());
-                constructorWithInputStreamArg.returnValue(null);
+                constructorWithInputStreamArg.returnNull();
             }
 
             try (MethodCreator readMethod = classCreator.getMethodCreator("read", int.class)) {

diff --git a/.../java/org/apache/camel/quarkus/support/httpclient5/graal/BrotliAbsentBooleanSupplier.java b/.../java/org/apache/camel/quarkus/support/httpclient5/graal/BrotliAbsentBooleanSupplier.java
@@ -22,7 +22,7 @@ public class BrotliAbsentBooleanSupplier implements BooleanSupplier {
     @Override
     public boolean getAsBoolean() {
         try {
-            Thread.currentThread().getContextClassLoader().loadClass("org.brotli.dec.BrotliInputStream");
+            Thread.currentThread().getContextClassLoader().loadClass("org.brotli.dec.Decoder");
             return false;
         } catch (ClassNotFoundException e) {
             return true;