(camel-quarkus) branch main updated: Fix generated BrotliInputStream constructor

[jamesnetherton]

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


The following commit(s) were added to refs/heads/main by this push:
     new cb765cb293 Fix generated BrotliInputStream constructor
cb765cb293 is described below

commit cb765cb2930191d0bdbbd05f840c1a3edb49ceae
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Thu Jan 9 11:06:14 2025 +0000

    Fix generated BrotliInputStream constructor
    
    Fixes #6896
---
 .../support/httpclient5/deployment/HttpClient5Processor.java   | 10 ++++------
 .../support/httpclient5/graal/BrotliAbsentBooleanSupplier.java |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git 
a/extensions-support/httpclient5/deployment/src/main/java/org/apache/camel/quarkus/support/httpclient5/deployment/HttpClient5Processor.java
 
b/extensions-support/httpclient5/deployment/src/main/java/org/apache/camel/quarkus/support/httpclient5/deployment/HttpClient5Processor.java
index 919fa54fb7..5586c9fd89 100644
--- 
a/extensions-support/httpclient5/deployment/src/main/java/org/apache/camel/quarkus/support/httpclient5/deployment/HttpClient5Processor.java
+++ 
b/extensions-support/httpclient5/deployment/src/main/java/org/apache/camel/quarkus/support/httpclient5/deployment/HttpClient5Processor.java
@@ -73,19 +73,17 @@ class HttpClient5Processor {
 
             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/extensions-support/httpclient5/runtime/src/main/java/org/apache/camel/quarkus/support/httpclient5/graal/BrotliAbsentBooleanSupplier.java
 
b/extensions-support/httpclient5/runtime/src/main/java/org/apache/camel/quarkus/support/httpclient5/graal/BrotliAbsentBooleanSupplier.java
index 62b0c600d2..ad39e64d11 100644
--- 
a/extensions-support/httpclient5/runtime/src/main/java/org/apache/camel/quarkus/support/httpclient5/graal/BrotliAbsentBooleanSupplier.java
+++ 
b/extensions-support/httpclient5/runtime/src/main/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;