diff --git a/Templates/templates/Java/requests/BaseClient.java.tt b/Templates/templates/Java/requests/BaseClient.java.tt
index a5673198a..bf76b7d96 100644
--- a/Templates/templates/Java/requests/BaseClient.java.tt
+++ b/Templates/templates/Java/requests/BaseClient.java.tt
@@ -50,7 +50,7 @@ import okhttp3.Request;
      * @return builder to start configuring the client
      */
     @Nonnull
-    public static <nativeClient, nativeRequest> Builder<nativeClient, nativeRequest> builder(Class<nativeClient> nativeClientClass, Class<nativeRequest> nativeRequestClass) {
+    public static <nativeClient, nativeRequest> Builder<nativeClient, nativeRequest> builder(@Nonnull final Class<nativeClient> nativeClientClass, @Nonnull final Class<nativeRequest> nativeRequestClass) {
         return new Builder<>();
     }
     /**
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/GraphServiceClient.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/GraphServiceClient.java
index 197fe38c0..4a935e55d 100644
--- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/GraphServiceClient.java
+++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/GraphServiceClient.java
@@ -67,7 +67,7 @@ public static Builder<OkHttpClient, Request> builder() {
      * @return builder to start configuring the client
      */
     @Nonnull
-    public static <nativeClient, nativeRequest> Builder<nativeClient, nativeRequest> builder(Class<nativeClient> nativeClientClass, Class<nativeRequest> nativeRequestClass) {
+    public static <nativeClient, nativeRequest> Builder<nativeClient, nativeRequest> builder(@Nonnull final Class<nativeClient> nativeClientClass, @Nonnull final Class<nativeRequest> nativeRequestClass) {
         return new Builder<>();
     }
     /**
diff --git a/test/Typewriter.Test/TestDataJavaBeta/com/microsoft/graph/requests/GraphServiceClient.java b/test/Typewriter.Test/TestDataJavaBeta/com/microsoft/graph/requests/GraphServiceClient.java
index d23a7bea0..e8c54b2af 100644
--- a/test/Typewriter.Test/TestDataJavaBeta/com/microsoft/graph/requests/GraphServiceClient.java
+++ b/test/Typewriter.Test/TestDataJavaBeta/com/microsoft/graph/requests/GraphServiceClient.java
@@ -67,7 +67,7 @@ public static Builder<OkHttpClient, Request> builder() {
      * @return builder to start configuring the client
      */
     @Nonnull
-    public static <nativeClient, nativeRequest> Builder<nativeClient, nativeRequest> builder(Class<nativeClient> nativeClientClass, Class<nativeRequest> nativeRequestClass) {
+    public static <nativeClient, nativeRequest> Builder<nativeClient, nativeRequest> builder(@Nonnull final Class<nativeClient> nativeClientClass, @Nonnull final Class<nativeRequest> nativeRequestClass) {
         return new Builder<>();
     }
     /**