From c7b27a8400f0be068751b4c7c2b1d97a03858868 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 10 Feb 2021 12:24:52 -0500
Subject: [PATCH 1/2] - adds exception in reflection methods to facilitate
 detection of issues

---
 .../java/com/microsoft/graph/http/BaseCollectionRequest.java | 2 +-
 .../microsoft/graph/http/BaseCollectionRequestBuilder.java   | 5 +++--
 .../http/BaseCollectionWithReferencesRequestBuilder.java     | 3 ++-
 .../microsoft/graph/http/BaseReferenceRequestBuilder.java    | 3 ++-
 .../graph/http/BaseWithReferenceRequestBuilder.java          | 5 +++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
index 5ff5921af..d34dd3222 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
@@ -126,7 +126,7 @@ public T3 buildFromResponse(@Nonnull final T2 response) {
             final T3 page = (T3)this.collectionPageClass.getConstructor(response.getClass(), builder.getClass()).newInstance(response, response.nextLink() == null ? null : builder);
             return page;
         } catch(IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
-            return null;
+            throw new ClientException("Could not find the required class", ex);
         }
     }
 
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java
index 2428cefc7..f2c0f1b02 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java
@@ -1,5 +1,6 @@
 package com.microsoft.graph.http;
 
+import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
 
 import java.lang.reflect.InvocationTargetException;
@@ -61,7 +62,7 @@ public T5 buildRequest(@Nullable final java.util.List<? extends com.microsoft.gr
             return collRequestClass.getConstructor(String.class, IBaseClient.class, java.util.List.class)
                                     .newInstance(getRequestUrl(), getClient(), requestOptions);
         } catch (IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
-            return null;
+            throw new ClientException("Could not find the required class", ex);
 		}
     }
 
@@ -77,7 +78,7 @@ public T2 byId(@Nonnull final String id) {
             return reqBuilderClass.getConstructor(String.class, IBaseClient.class, java.util.List.class)
                                 .newInstance(getRequestUrlWithAdditionalSegment(id), getClient(), getOptions());
         } catch (IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
-            return null;
+            throw new ClientException("Could not find the required class", ex);
 		}
     }
 }
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java
index e9005b43c..b6e0fe1df 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java
@@ -22,6 +22,7 @@
 
 package com.microsoft.graph.http;
 
+import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
 
 import java.lang.reflect.InvocationTargetException;
@@ -70,7 +71,7 @@ public T8 references() {
                     .getConstructor(String.class, IBaseClient.class, java.util.List.class)
                     .newInstance(getRequestUrl() + "/$ref", getClient(), getOptions());
         } catch(IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
-            return null;
+            throw new ClientException("Could not find the required class", ex);
         }
     }
 }
diff --git a/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java
index aea14506c..b5f49f938 100644
--- a/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java
@@ -22,6 +22,7 @@
 
 package com.microsoft.graph.http;
 
+import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
 
 import java.lang.reflect.InvocationTargetException;
@@ -72,7 +73,7 @@ public T2 buildRequest(@Nullable final java.util.List<? extends com.microsoft.gr
             return refRequestClass.getConstructor(String.class, IBaseClient.class, java.util.List.class)
                                 .newInstance(getRequestUrl(), getClient(), requestOptions);
         } catch (IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
-            return null;
+            throw new ClientException("Could not find the required class", ex);
 		}
     }
 }
diff --git a/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java
index a87e67a43..5ecddab1a 100644
--- a/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java
@@ -22,6 +22,7 @@
 
 package com.microsoft.graph.http;
 
+import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
 
 import java.lang.reflect.InvocationTargetException;
@@ -78,7 +79,7 @@ public T2 buildRequest(@Nullable final java.util.List<? extends com.microsoft.gr
             return wReferenceRequestClass.getConstructor(String.class, IBaseClient.class, java.util.List.class)
                                 .newInstance(getRequestUrl(), getClient(), requestOptions);
         } catch (IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
-            return null;
+            throw new ClientException("Could not find the required class", ex);
 		}
     }
 
@@ -93,7 +94,7 @@ public T3 reference(){
             return refRequestBuilderClass.getConstructor(String.class, IBaseClient.class, java.util.List.class)
                                 .newInstance(getRequestUrl() + "/$ref", getClient(), getOptions());
         } catch (IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
-            return null;
+            throw new ClientException("Could not find the required class", ex);
 		}
     }
 }

From 480b52178878a854cd48adac2fef75cd2fa38b21 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 10 Feb 2021 13:26:15 -0500
Subject: [PATCH 2/2] - avoid instantiating a builder when it's not needed

---
 .../java/com/microsoft/graph/http/BaseCollectionRequest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
index d34dd3222..78d0ed44a 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
@@ -120,10 +120,10 @@ protected java.util.concurrent.CompletableFuture<T2> sendAsync() throws ClientEx
     public T3 buildFromResponse(@Nonnull final T2 response) {
         final List<com.microsoft.graph.options.Option> options = new java.util.ArrayList<com.microsoft.graph.options.Option>();
         try {
-            final Object builder = this.collRequestBuilderClass
+            final Object builder = response.nextLink() == null ? null : this.collRequestBuilderClass
                     .getConstructor(String.class, IBaseClient.class, java.util.List.class)
                     .newInstance(response.nextLink(), getBaseRequest().getClient(), options);
-            final T3 page = (T3)this.collectionPageClass.getConstructor(response.getClass(), builder.getClass()).newInstance(response, response.nextLink() == null ? null : builder);
+            final T3 page = (T3)this.collectionPageClass.getConstructor(response.getClass(), this.collRequestBuilderClass).newInstance(response, builder);
             return page;
         } catch(IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
             throw new ClientException("Could not find the required class", ex);