fix: Fix mergeMaps function (box/box-codegen#734) (#324)

Co-authored-by: box-sdk-build <[email protected]>

Author: box-sdk-build

.codegen.json

@@ -1 +1 @@
-{ "engineHash": "20cb559", "specHash": "630fc85", "version": "0.7.0" }
+{ "engineHash": "8db92f5", "specHash": "630fc85", "version": "0.7.0" }

src/main/java/com/box/sdkgen/internal/utils/UtilsManager.java

@@ -76,8 +76,12 @@ public static <K, V> Entry<K, V> entryOf(K key, V value) {
 
   public static <K, V> Map<K, V> mergeMaps(Map<K, V> map1, Map<K, V> map2) {
     Map<K, V> mergedMap = new HashMap<>();
-    mergedMap.putAll(map1);
-    mergedMap.putAll(map2);
+    if (map1 != null) {
+      mergedMap.putAll(map1);
+    }
+    if (map2 != null) {
+      mergedMap.putAll(map2);
+    }
     return mergedMap;
   }
 

src/main/java/com/box/sdkgen/managers/ai/AiManager.java

@@ -189,6 +189,10 @@ public static class AiManagerBuilder {
 
     protected NetworkSession networkSession;
 
+    public AiManagerBuilder() {
+      this.networkSession = new NetworkSession();
+    }
+
     public AiManagerBuilder auth(Authentication auth) {
       this.auth = auth;
       return this;

src/main/java/com/box/sdkgen/managers/ai/CreateAiAskHeaders.java

@@ -24,6 +24,10 @@ public static class CreateAiAskHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public CreateAiAskHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public CreateAiAskHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/ai/CreateAiExtractHeaders.java

@@ -24,6 +24,10 @@ public static class CreateAiExtractHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public CreateAiExtractHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public CreateAiExtractHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/ai/CreateAiExtractStructuredHeaders.java

@@ -24,6 +24,10 @@ public static class CreateAiExtractStructuredHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public CreateAiExtractStructuredHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public CreateAiExtractStructuredHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/ai/CreateAiTextGenHeaders.java

@@ -24,6 +24,10 @@ public static class CreateAiTextGenHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public CreateAiTextGenHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public CreateAiTextGenHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/ai/GetAiAgentDefaultConfigHeaders.java

@@ -24,6 +24,10 @@ public static class GetAiAgentDefaultConfigHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public GetAiAgentDefaultConfigHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public GetAiAgentDefaultConfigHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/aistudio/AiStudioManager.java

@@ -202,6 +202,10 @@ public static class AiStudioManagerBuilder {
 
     protected NetworkSession networkSession;
 
+    public AiStudioManagerBuilder() {
+      this.networkSession = new NetworkSession();
+    }
+
     public AiStudioManagerBuilder auth(Authentication auth) {
       this.auth = auth;
       return this;

src/main/java/com/box/sdkgen/managers/aistudio/CreateAiAgentHeaders.java

@@ -24,6 +24,10 @@ public static class CreateAiAgentHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public CreateAiAgentHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public CreateAiAgentHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/aistudio/DeleteAiAgentByIdHeaders.java

@@ -24,6 +24,10 @@ public static class DeleteAiAgentByIdHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public DeleteAiAgentByIdHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public DeleteAiAgentByIdHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/aistudio/GetAiAgentByIdHeaders.java

@@ -24,6 +24,10 @@ public static class GetAiAgentByIdHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public GetAiAgentByIdHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public GetAiAgentByIdHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/aistudio/GetAiAgentsHeaders.java

@@ -24,6 +24,10 @@ public static class GetAiAgentsHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public GetAiAgentsHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public GetAiAgentsHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/aistudio/UpdateAiAgentByIdHeaders.java

@@ -24,6 +24,10 @@ public static class UpdateAiAgentByIdHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public UpdateAiAgentByIdHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public UpdateAiAgentByIdHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/appitemassociations/AppItemAssociationsManager.java

@@ -144,6 +144,10 @@ public static class AppItemAssociationsManagerBuilder {
 
     protected NetworkSession networkSession;
 
+    public AppItemAssociationsManagerBuilder() {
+      this.networkSession = new NetworkSession();
+    }
+
     public AppItemAssociationsManagerBuilder auth(Authentication auth) {
       this.auth = auth;
       return this;

src/main/java/com/box/sdkgen/managers/appitemassociations/GetFileAppItemAssociationsHeaders.java

@@ -24,6 +24,10 @@ public static class GetFileAppItemAssociationsHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public GetFileAppItemAssociationsHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public GetFileAppItemAssociationsHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/appitemassociations/GetFolderAppItemAssociationsHeaders.java

@@ -25,6 +25,10 @@ public static class GetFolderAppItemAssociationsHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public GetFolderAppItemAssociationsHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public GetFolderAppItemAssociationsHeadersBuilder extraHeaders(
         Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;

src/main/java/com/box/sdkgen/managers/authorization/AuthorizationManager.java

@@ -152,6 +152,10 @@ public static class AuthorizationManagerBuilder {
 
     protected NetworkSession networkSession;
 
+    public AuthorizationManagerBuilder() {
+      this.networkSession = new NetworkSession();
+    }
+
     public AuthorizationManagerBuilder auth(Authentication auth) {
       this.auth = auth;
       return this;

src/main/java/com/box/sdkgen/managers/authorization/AuthorizeUserHeaders.java

@@ -24,6 +24,10 @@ public static class AuthorizeUserHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public AuthorizeUserHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public AuthorizeUserHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/authorization/RefreshAccessTokenHeaders.java

@@ -24,6 +24,10 @@ public static class RefreshAccessTokenHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public RefreshAccessTokenHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public RefreshAccessTokenHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/authorization/RequestAccessTokenHeaders.java

@@ -24,6 +24,10 @@ public static class RequestAccessTokenHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public RequestAccessTokenHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public RequestAccessTokenHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/authorization/RevokeAccessTokenHeaders.java

@@ -24,6 +24,10 @@ public static class RevokeAccessTokenHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public RevokeAccessTokenHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public RevokeAccessTokenHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/avatars/AvatarsManager.java

@@ -132,6 +132,10 @@ public static class AvatarsManagerBuilder {
 
     protected NetworkSession networkSession;
 
+    public AvatarsManagerBuilder() {
+      this.networkSession = new NetworkSession();
+    }
+
     public AvatarsManagerBuilder auth(Authentication auth) {
       this.auth = auth;
       return this;

src/main/java/com/box/sdkgen/managers/avatars/CreateUserAvatarHeaders.java

@@ -24,6 +24,10 @@ public static class CreateUserAvatarHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public CreateUserAvatarHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public CreateUserAvatarHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/avatars/DeleteUserAvatarHeaders.java

@@ -24,6 +24,10 @@ public static class DeleteUserAvatarHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public DeleteUserAvatarHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public DeleteUserAvatarHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/avatars/GetUserAvatarHeaders.java

@@ -24,6 +24,10 @@ public static class GetUserAvatarHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public GetUserAvatarHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public GetUserAvatarHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/chunkeduploads/ChunkedUploadsManager.java

@@ -499,6 +499,10 @@ public static class ChunkedUploadsManagerBuilder {
 
     protected NetworkSession networkSession;
 
+    public ChunkedUploadsManagerBuilder() {
+      this.networkSession = new NetworkSession();
+    }
+
     public ChunkedUploadsManagerBuilder auth(Authentication auth) {
       this.auth = auth;
       return this;

src/main/java/com/box/sdkgen/managers/chunkeduploads/CreateFileUploadSessionForExistingFileHeaders.java

@@ -25,6 +25,10 @@ public static class CreateFileUploadSessionForExistingFileHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public CreateFileUploadSessionForExistingFileHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public CreateFileUploadSessionForExistingFileHeadersBuilder extraHeaders(
         Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;

src/main/java/com/box/sdkgen/managers/chunkeduploads/CreateFileUploadSessionHeaders.java

@@ -24,6 +24,10 @@ public static class CreateFileUploadSessionHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public CreateFileUploadSessionHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public CreateFileUploadSessionHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/chunkeduploads/DeleteFileUploadSessionByIdHeaders.java

@@ -24,6 +24,10 @@ public static class DeleteFileUploadSessionByIdHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public DeleteFileUploadSessionByIdHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public DeleteFileUploadSessionByIdHeadersBuilder extraHeaders(
         Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;

src/main/java/com/box/sdkgen/managers/chunkeduploads/DeleteFileUploadSessionByUrlHeaders.java

@@ -25,6 +25,10 @@ public static class DeleteFileUploadSessionByUrlHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public DeleteFileUploadSessionByUrlHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public DeleteFileUploadSessionByUrlHeadersBuilder extraHeaders(
         Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;

src/main/java/com/box/sdkgen/managers/chunkeduploads/GetFileUploadSessionByIdHeaders.java

@@ -24,6 +24,10 @@ public static class GetFileUploadSessionByIdHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public GetFileUploadSessionByIdHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public GetFileUploadSessionByIdHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/chunkeduploads/GetFileUploadSessionByUrlHeaders.java

@@ -24,6 +24,10 @@ public static class GetFileUploadSessionByUrlHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public GetFileUploadSessionByUrlHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public GetFileUploadSessionByUrlHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/chunkeduploads/GetFileUploadSessionPartsByUrlHeaders.java

@@ -25,6 +25,10 @@ public static class GetFileUploadSessionPartsByUrlHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public GetFileUploadSessionPartsByUrlHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public GetFileUploadSessionPartsByUrlHeadersBuilder extraHeaders(
         Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;

src/main/java/com/box/sdkgen/managers/chunkeduploads/GetFileUploadSessionPartsHeaders.java

@@ -24,6 +24,10 @@ public static class GetFileUploadSessionPartsHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public GetFileUploadSessionPartsHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public GetFileUploadSessionPartsHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;

src/main/java/com/box/sdkgen/managers/classifications/AddClassificationHeaders.java

@@ -24,6 +24,10 @@ public static class AddClassificationHeadersBuilder {
 
     protected Map<String, String> extraHeaders;
 
+    public AddClassificationHeadersBuilder() {
+      this.extraHeaders = mapOf();
+    }
+
     public AddClassificationHeadersBuilder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;