Bugfix/li 58415 handle no such method exception (#145)

grmeyer-hw-dev · web-flow · commit c16514c141ae · 2024-08-24T09:57:09.000-07:00
* LI_58415 - Replace get constructor method
diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ allprojects {
         mavenCentral()
         mavenLocal()
     }
-    project.version = "1.0.0-beta12"
+    project.version = "1.0.0-beta13"
 }
 
 task clean(type: Delete) {
diff --git a/core/build.gradle b/core/build.gradle
@@ -19,6 +19,13 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+
+            // Rename the artifact to core-<version>.aar, required since gradle 7
+            libraryVariants.all { variant ->
+                variant.outputs.all { output ->
+                    outputFileName = "${archivesBaseName}-${defaultConfig.versionName}.aar"
+                }
+            }
         }
         debug {
             testCoverageEnabled true
@@ -36,6 +43,7 @@ android {
 dependencies {
 
     implementation "androidx.appcompat:appcompat:1.2.0"
+    implementation "androidx.annotation:annotation:1.8.2"
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.robolectric:robolectric:4.12.2'
diff --git a/core/src/main/java/com/hyperwallet/android/model/graphql/Connection.java b/core/src/main/java/com/hyperwallet/android/model/graphql/Connection.java
@@ -60,7 +60,7 @@ public Connection(@NonNull final JSONObject data, @NonNull final Class clazz) th
             mPageInfo = new PageInfo(pageInfoObject);
         }
 
-        Constructor<?> constructor = clazz.getConstructor(JSONObject.class);
+        Constructor<?> constructor = clazz.getDeclaredConstructor(JSONObject.class);
         JSONArray jsonArray = data.optJSONArray(NODES);
         if (jsonArray != null) {
             mNodes = new ArrayList<>(jsonArray.length());
diff --git a/core/src/main/java/com/hyperwallet/android/model/graphql/GqlResponse.java b/core/src/main/java/com/hyperwallet/android/model/graphql/GqlResponse.java
@@ -45,7 +45,7 @@ public class GqlResponse<T> {
      */
     public GqlResponse(@NonNull final JSONObject response, @NonNull final Class clazz)
             throws ReflectiveOperationException, JSONException {
-        Constructor<?> constructor = clazz.getConstructor(JSONObject.class);
+        Constructor<?> constructor = clazz.getDeclaredConstructor(JSONObject.class);
         mData = (T) constructor.newInstance(response.get(DATA));
         mGqlErrors = new GqlErrors(response);
     }
diff --git a/core/src/main/java/com/hyperwallet/android/model/graphql/keyed/MappedConnection.java b/core/src/main/java/com/hyperwallet/android/model/graphql/keyed/MappedConnection.java
@@ -56,7 +56,7 @@ public MappedConnection(@NonNull final JSONObject data, @NonNull Class clazz) th
             JSONException, IllegalAccessException, InstantiationException, InvocationTargetException {
 
         super(data, clazz);
-        Constructor<?> constructor = clazz.getConstructor(JSONObject.class);
+        Constructor<?> constructor = clazz.getDeclaredConstructor(JSONObject.class);
         JSONArray jsonArray = data.optJSONArray(NODES);
         if (jsonArray != null && jsonArray.length() != 0) {
             mNodes = new LinkedHashMap<>(jsonArray.length());
diff --git a/core/src/main/java/com/hyperwallet/android/model/paging/PageList.java b/core/src/main/java/com/hyperwallet/android/model/paging/PageList.java
@@ -59,7 +59,7 @@ public PageList(@NonNull final JSONObject page, @NonNull final Class<T> clazz)
             if (jsonArray != null) {
                 mDataList = new ArrayList<>();
                 for (int i = 0; i < jsonArray.length(); i++) {
-                    Constructor<T> constructor = clazz.getConstructor(JSONObject.class);
+                    Constructor<T> constructor = clazz.getDeclaredConstructor(JSONObject.class);
                     mDataList.add(constructor.newInstance(jsonArray.getJSONObject(i)));
                 }
             }
diff --git a/core/src/main/java/com/hyperwallet/android/util/JsonUtils.java b/core/src/main/java/com/hyperwallet/android/util/JsonUtils.java
@@ -179,7 +179,7 @@ public static <T> T fromJsonString(@NonNull final String data, @NonNull final Ty
         Class<T> parameterType =
                 (Class<T>) ((ParameterizedType) typeReference.getType()).getActualTypeArguments()[0];
         JSONObject jsonObject = new JSONObject(data);
-        Constructor<T> rawTypeConstructor = rawType.getConstructor(JSONObject.class, parameterType.getClass());
+        Constructor<T> rawTypeConstructor = rawType.getDeclaredConstructor(JSONObject.class, parameterType.getClass());
         return rawTypeConstructor.newInstance(jsonObject, parameterType);
     }
 
@@ -196,7 +196,7 @@ private static <T> T fromJsonString(@Nullable final String jsonString, @NonNull
             throws JSONException, InvocationTargetException, NoSuchMethodException, InstantiationException,
             IllegalAccessException {
         JSONObject jsonObject = new JSONObject(jsonString);
-        Constructor<T> constructor = fromClass.getConstructor(JSONObject.class);
+        Constructor<T> constructor = fromClass.getDeclaredConstructor(JSONObject.class);
         return constructor.newInstance(jsonObject);
     }
 }
diff --git a/core/src/test/java/com/hyperwallet/android/RestTransactionBuilderTest.java b/core/src/test/java/com/hyperwallet/android/RestTransactionBuilderTest.java
@@ -67,7 +67,7 @@ public void testBuild_withRequiredParametersOnly() throws JSONException {
         assertThat(headers.get("Content-Type"), is("application/json"));
         assertThat(headers.get("User-Agent"), is("HyperwalletSDK/Android/" + BuildConfig.VERSION_NAME +
                 "; App: HyperwalletSDK; Android: " + Build.VERSION.RELEASE));
-        assertThat(headers.get("X-Sdk-Version"), is("1.0.0-beta12"));
+        assertThat(headers.get("X-Sdk-Version"), is("1.0.0-beta13"));
         assertThat(headers.get("X-Sdk-Type"), is("android"));
         assertThat(headers.get("X-Sdk-ContextId"), is(notNullValue()));
         assertThat(headers.get("X-Sdk-ContextId"), is(contextId));
@@ -104,7 +104,7 @@ public void testBuild_withJsonModelOptionalParameter() throws JSONException {
         assertThat(headers.get("Content-Type"), is("application/json"));
         assertThat(headers.get("User-Agent"), is("HyperwalletSDK/Android/" + BuildConfig.VERSION_NAME +
                 "; App: HyperwalletSDK; Android: " + Build.VERSION.RELEASE));
-        assertThat(headers.get("X-Sdk-Version"), is("1.0.0-beta12"));
+        assertThat(headers.get("X-Sdk-Version"), is("1.0.0-beta13"));
         assertThat(headers.get("X-Sdk-Type"), is("android"));
         assertThat(headers.get("X-Sdk-ContextId"), is(notNullValue()));
         assertThat(headers.get("X-Sdk-ContextId"), is(contextId));
@@ -140,7 +140,7 @@ public void testBuild_withQueryModelOptionalParameter() throws JSONException {
         assertThat(headers.get("Content-Type"), is("application/json"));
         assertThat(headers.get("User-Agent"), is("HyperwalletSDK/Android/" + BuildConfig.VERSION_NAME +
                 "; App: HyperwalletSDK; Android: " + Build.VERSION.RELEASE));
-        assertThat(headers.get("X-Sdk-Version"), is("1.0.0-beta12"));
+        assertThat(headers.get("X-Sdk-Version"), is("1.0.0-beta13"));
         assertThat(headers.get("X-Sdk-Type"), is("android"));
         assertThat(headers.get("X-Sdk-ContextId"), is(notNullValue()));
         assertThat(headers.get("X-Sdk-ContextId"), is(contextId));
diff --git a/core/src/test/java/com/hyperwallet/android/transfermethod/CreateVenmoAccountTest.java b/core/src/test/java/com/hyperwallet/android/transfermethod/CreateVenmoAccountTest.java
@@ -78,7 +78,7 @@ public void testCreateVenmoAccount_withSuccess() throws InterruptedException {
         assertThat(venmoAccount.getField(VENMO_ACCOUNT_ID), is("9876543210"));
 
         Hyperwallet.getDefault().createVenmoAccount(venmoAccount, mListener);
-        mAwait.await(50, TimeUnit.MILLISECONDS);
+        mAwait.await(300, TimeUnit.MILLISECONDS);
 
         RecordedRequest recordedRequest = mServer.getRequest();
         assertThat(recordedRequest.getMethod(), is(POST.name()));

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ allprojects {`
`20`	`20`	`mavenCentral()`
`21`	`21`	`mavenLocal()`
`22`	`22`	`}`
`23`		`- project.version = "1.0.0-beta12"`
	`23`	`+ project.version = "1.0.0-beta13"`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`task clean(type: Delete) {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public Connection(@NonNull final JSONObject data, @NonNull final Class clazz) th`
`60`	`60`	`mPageInfo = new PageInfo(pageInfoObject);`
`61`	`61`	`}`
`62`	`62`
`63`		`- Constructor<?> constructor = clazz.getConstructor(JSONObject.class);`
	`63`	`+ Constructor<?> constructor = clazz.getDeclaredConstructor(JSONObject.class);`
`64`	`64`	`JSONArray jsonArray = data.optJSONArray(NODES);`
`65`	`65`	`if (jsonArray != null) {`
`66`	`66`	`mNodes = new ArrayList<>(jsonArray.length());`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public class GqlResponse<T> {`
`45`	`45`	`*/`
`46`	`46`	`public GqlResponse(@NonNull final JSONObject response, @NonNull final Class clazz)`
`47`	`47`	`throws ReflectiveOperationException, JSONException {`
`48`		`- Constructor<?> constructor = clazz.getConstructor(JSONObject.class);`
	`48`	`+ Constructor<?> constructor = clazz.getDeclaredConstructor(JSONObject.class);`
`49`	`49`	`mData = (T) constructor.newInstance(response.get(DATA));`
`50`	`50`	`mGqlErrors = new GqlErrors(response);`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public PageList(@NonNull final JSONObject page, @NonNull final Class<T> clazz)`
`59`	`59`	`if (jsonArray != null) {`
`60`	`60`	`mDataList = new ArrayList<>();`
`61`	`61`	`for (int i = 0; i < jsonArray.length(); i++) {`
`62`		`- Constructor<T> constructor = clazz.getConstructor(JSONObject.class);`
	`62`	`+ Constructor<T> constructor = clazz.getDeclaredConstructor(JSONObject.class);`
`63`	`63`	`mDataList.add(constructor.newInstance(jsonArray.getJSONObject(i)));`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ public static <T> T fromJsonString(@NonNull final String data, @NonNull final Ty`
`179`	`179`	`Class<T> parameterType =`
`180`	`180`	`(Class<T>) ((ParameterizedType) typeReference.getType()).getActualTypeArguments()[0];`
`181`	`181`	`JSONObject jsonObject = new JSONObject(data);`
`182`		`- Constructor<T> rawTypeConstructor = rawType.getConstructor(JSONObject.class, parameterType.getClass());`
	`182`	`+ Constructor<T> rawTypeConstructor = rawType.getDeclaredConstructor(JSONObject.class, parameterType.getClass());`
`183`	`183`	`return rawTypeConstructor.newInstance(jsonObject, parameterType);`
`184`	`184`	`}`
`185`	`185`
`@@ -196,7 +196,7 @@ private static <T> T fromJsonString(@Nullable final String jsonString, @NonNull`
`196`	`196`	`throws JSONException, InvocationTargetException, NoSuchMethodException, InstantiationException,`
`197`	`197`	`IllegalAccessException {`
`198`	`198`	`JSONObject jsonObject = new JSONObject(jsonString);`
`199`		`- Constructor<T> constructor = fromClass.getConstructor(JSONObject.class);`
	`199`	`+ Constructor<T> constructor = fromClass.getDeclaredConstructor(JSONObject.class);`
`200`	`200`	`return constructor.newInstance(jsonObject);`
`201`	`201`	`}`
`202`	`202`	`}`