commit a46510252356f058154393f9960d81db690f95f5
author Robert Munteanu <rombert@apache.org> Wed Jun 12 18:02:59 2019 +0200
committer Robert Munteanu <robert.munteanu@gmail.com> Thu Jun 13 11:37:04 2019 +0200
tree f7abc992987ee8dc43aa19354ae509e113e5bc51
parent 138a516df8d17c3d3839079b7b2a10b9a8272cb9

Explicitly look for the default contructors when needed instead of relying on the declaration order.

src/main/java/org/apache/sling/uca/impl/HttpClient4TimeoutTransformer.java

diff --git a/src/main/java/org/apache/sling/uca/impl/HttpClient4TimeoutTransformer.java b/src/main/java/org/apache/sling/uca/impl/HttpClient4TimeoutTransformer.java
index 230c1db..d389518 100644
--- a/src/main/java/org/apache/sling/uca/impl/HttpClient4TimeoutTransformer.java
+++ b/src/main/java/org/apache/sling/uca/impl/HttpClient4TimeoutTransformer.java
@@ -56,8 +56,7 @@
                 ClassPool defaultPool = ClassPool.getDefault();
                 CtClass cc = defaultPool.get(Descriptor.toJavaName(className));
                 
-                // TODO - access the default constructor explicitly in case it changes
-                CtConstructor noArgCtor =  cc.getConstructors()[0];
+                CtConstructor noArgCtor = cc.getConstructor(Descriptor.ofConstructor(new CtClass[0]));
                 CtField connectTimeout = cc.getDeclaredField("connectTimeout");
                 CtField socketTimeout = cc.getDeclaredField("socketTimeout");
                 noArgCtor.insertAfter("this." + connectTimeout.getName() + " = " + connectTimeoutMillis + ";");

src/main/java/org/apache/sling/uca/impl/OkHttpTimeoutTransformer.java

diff --git a/src/main/java/org/apache/sling/uca/impl/OkHttpTimeoutTransformer.java b/src/main/java/org/apache/sling/uca/impl/OkHttpTimeoutTransformer.java
index a93e223..22a660e 100644
--- a/src/main/java/org/apache/sling/uca/impl/OkHttpTimeoutTransformer.java
+++ b/src/main/java/org/apache/sling/uca/impl/OkHttpTimeoutTransformer.java
@@ -54,8 +54,7 @@
                 ClassPool defaultPool = ClassPool.getDefault();
                 CtClass cc = defaultPool.get(Descriptor.toJavaName(className));
                 
-                // TODO - access the default constructor explicitly in case it changes
-                CtConstructor noArgCtor =  cc.getConstructors()[0];
+                CtConstructor noArgCtor = cc.getConstructor(Descriptor.ofConstructor(new CtClass[0]));
                 CtField connectTimeout = cc.getDeclaredField("connectTimeout");
                 CtField readTimeout = cc.getDeclaredField("readTimeout");
                 noArgCtor.insertAfter("this." + connectTimeout.getName() + " = " + connectTimeoutMillis + ";");