fix(boxsdkgen): Move assigning default values from builder constructor to build() method (box/box-codegen#922)

.codegen.json

@@ -1 +1 @@
-{ "engineHash": "9ec9ae4", "specHash": "ccdb456", "version": "5.3.0" }
+{ "engineHash": "406023b", "specHash": "ccdb456", "version": "5.3.0" }

src/intTest/java/com/box/sdkgen/chunkeduploads/TestPartAccumulator.java

@@ -79,8 +79,6 @@ public Builder(int lastIndex, List<UploadPart> parts, long fileSize, Hash fileHa
       this.parts = parts;
       this.fileSize = fileSize;
       this.fileHash = fileHash;
-      this.uploadPartUrl = "";
-      this.uploadSessionId = "";
     }
 
     public Builder uploadPartUrl(String uploadPartUrl) {
@@ -94,6 +92,12 @@ public Builder uploadSessionId(String uploadSessionId) {
     }
 
     public TestPartAccumulator build() {
+      if (this.uploadPartUrl == null) {
+        this.uploadPartUrl = "";
+      }
+      if (this.uploadSessionId == null) {
+        this.uploadSessionId = "";
+      }
       return new TestPartAccumulator(this);
     }
   }

src/main/java/com/box/sdkgen/box/ccgauth/CCGConfig.java

@@ -75,7 +75,6 @@ public static class Builder {
     public Builder(String clientId, String clientSecret) {
       this.clientId = clientId;
       this.clientSecret = clientSecret;
-      this.tokenStorage = new InMemoryTokenStorage();
     }
 
     public Builder enterpriseId(String enterpriseId) {
@@ -94,6 +93,9 @@ public Builder tokenStorage(TokenStorage tokenStorage) {
     }
 
     public CCGConfig build() {
+      if (this.tokenStorage == null) {
+        this.tokenStorage = new InMemoryTokenStorage();
+      }
       return new CCGConfig(this);
     }
   }

src/main/java/com/box/sdkgen/box/developertokenauth/BoxDeveloperTokenAuth.java

@@ -171,7 +171,6 @@ public static class Builder {
 
     public Builder(String token) {
       this.token = token;
-      this.config = new DeveloperTokenConfig();
     }
 
     public Builder config(DeveloperTokenConfig config) {
@@ -180,6 +179,9 @@ public Builder config(DeveloperTokenConfig config) {
     }
 
     public BoxDeveloperTokenAuth build() {
+      if (this.config == null) {
+        this.config = new DeveloperTokenConfig();
+      }
       return new BoxDeveloperTokenAuth(this);
     }
   }

src/main/java/com/box/sdkgen/box/jwtauth/JWTConfig.java

@@ -265,9 +265,6 @@ public Builder(
       this.jwtKeyId = jwtKeyId;
       this.privateKey = privateKey;
       this.privateKeyPassphrase = privateKeyPassphrase;
-      this.algorithm = new EnumWrapper<JwtAlgorithm>(JwtAlgorithm.RS256);
-      this.tokenStorage = new InMemoryTokenStorage();
-      this.privateKeyDecryptor = new DefaultPrivateKeyDecryptor();
     }
 
     public Builder enterpriseId(String enterpriseId) {
@@ -301,6 +298,15 @@ public Builder privateKeyDecryptor(PrivateKeyDecryptor privateKeyDecryptor) {
     }
 
     public JWTConfig build() {
+      if (this.algorithm == null) {
+        this.algorithm = new EnumWrapper<JwtAlgorithm>(JwtAlgorithm.RS256);
+      }
+      if (this.tokenStorage == null) {
+        this.tokenStorage = new InMemoryTokenStorage();
+      }
+      if (this.privateKeyDecryptor == null) {
+        this.privateKeyDecryptor = new DefaultPrivateKeyDecryptor();
+      }
       return new JWTConfig(this);
     }
   }

src/main/java/com/box/sdkgen/box/oauth/OAuthConfig.java

@@ -46,7 +46,6 @@ public static class Builder {
     public Builder(String clientId, String clientSecret) {
       this.clientId = clientId;
       this.clientSecret = clientSecret;
-      this.tokenStorage = new InMemoryTokenStorage();
     }
 
     public Builder tokenStorage(TokenStorage tokenStorage) {
@@ -55,6 +54,9 @@ public Builder tokenStorage(TokenStorage tokenStorage) {
     }
 
     public OAuthConfig build() {
+      if (this.tokenStorage == null) {
+        this.tokenStorage = new InMemoryTokenStorage();
+      }
       return new OAuthConfig(this);
     }
   }

src/main/java/com/box/sdkgen/client/BoxClient.java

@@ -1402,7 +1402,6 @@ public static class Builder {
 
     public Builder(Authentication auth) {
       this.auth = auth;
-      this.networkSession = new NetworkSession.Builder().baseUrls(new BaseUrls()).build();
     }
 
     public Builder networkSession(NetworkSession networkSession) {
@@ -1411,6 +1410,9 @@ public Builder networkSession(NetworkSession networkSession) {
     }
 
     public BoxClient build() {
+      if (this.networkSession == null) {
+        this.networkSession = new NetworkSession.Builder().baseUrls(new BaseUrls()).build();
+      }
       return new BoxClient(this);
     }
   }

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

@@ -276,9 +276,7 @@ public static class Builder {
 
     protected NetworkSession networkSession;
 
-    public Builder() {
-      this.networkSession = new NetworkSession();
-    }
+    public Builder() {}
 
     public Builder auth(Authentication auth) {
       this.auth = auth;
@@ -291,6 +289,9 @@ public Builder networkSession(NetworkSession networkSession) {
     }
 
     public AiManager build() {
+      if (this.networkSession == null) {
+        this.networkSession = new NetworkSession();
+      }
       return new AiManager(this);
     }
   }

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

@@ -25,16 +25,17 @@ public static class Builder {
 
     protected Map<String, String> extraHeaders;
 
-    public Builder() {
-      this.extraHeaders = mapOf();
-    }
+    public Builder() {}
 
     public Builder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;
     }
 
     public CreateAiAskHeaders build() {
+      if (this.extraHeaders == null) {
+        this.extraHeaders = mapOf();
+      }
       return new CreateAiAskHeaders(this);
     }
   }

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

@@ -25,16 +25,17 @@ public static class Builder {
 
     protected Map<String, String> extraHeaders;
 
-    public Builder() {
-      this.extraHeaders = mapOf();
-    }
+    public Builder() {}
 
     public Builder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;
     }
 
     public CreateAiExtractHeaders build() {
+      if (this.extraHeaders == null) {
+        this.extraHeaders = mapOf();
+      }
       return new CreateAiExtractHeaders(this);
     }
   }

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

@@ -25,16 +25,17 @@ public static class Builder {
 
     protected Map<String, String> extraHeaders;
 
-    public Builder() {
-      this.extraHeaders = mapOf();
-    }
+    public Builder() {}
 
     public Builder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;
     }
 
     public CreateAiExtractStructuredHeaders build() {
+      if (this.extraHeaders == null) {
+        this.extraHeaders = mapOf();
+      }
       return new CreateAiExtractStructuredHeaders(this);
     }
   }

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

@@ -25,16 +25,17 @@ public static class Builder {
 
     protected Map<String, String> extraHeaders;
 
-    public Builder() {
-      this.extraHeaders = mapOf();
-    }
+    public Builder() {}
 
     public Builder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;
     }
 
     public CreateAiTextGenHeaders build() {
+      if (this.extraHeaders == null) {
+        this.extraHeaders = mapOf();
+      }
       return new CreateAiTextGenHeaders(this);
     }
   }

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

@@ -25,16 +25,17 @@ public static class Builder {
 
     protected Map<String, String> extraHeaders;
 
-    public Builder() {
-      this.extraHeaders = mapOf();
-    }
+    public Builder() {}
 
     public Builder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;
     }
 
     public GetAiAgentDefaultConfigHeaders build() {
+      if (this.extraHeaders == null) {
+        this.extraHeaders = mapOf();
+      }
       return new GetAiAgentDefaultConfigHeaders(this);
     }
   }

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

@@ -280,9 +280,7 @@ public static class Builder {
 
     protected NetworkSession networkSession;
 
-    public Builder() {
-      this.networkSession = new NetworkSession();
-    }
+    public Builder() {}
 
     public Builder auth(Authentication auth) {
       this.auth = auth;
@@ -295,6 +293,9 @@ public Builder networkSession(NetworkSession networkSession) {
     }
 
     public AiStudioManager build() {
+      if (this.networkSession == null) {
+        this.networkSession = new NetworkSession();
+      }
       return new AiStudioManager(this);
     }
   }

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

@@ -25,16 +25,17 @@ public static class Builder {
 
     protected Map<String, String> extraHeaders;
 
-    public Builder() {
-      this.extraHeaders = mapOf();
-    }
+    public Builder() {}
 
     public Builder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;
     }
 
     public CreateAiAgentHeaders build() {
+      if (this.extraHeaders == null) {
+        this.extraHeaders = mapOf();
+      }
       return new CreateAiAgentHeaders(this);
     }
   }

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

@@ -25,16 +25,17 @@ public static class Builder {
 
     protected Map<String, String> extraHeaders;
 
-    public Builder() {
-      this.extraHeaders = mapOf();
-    }
+    public Builder() {}
 
     public Builder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;
     }
 
     public DeleteAiAgentByIdHeaders build() {
+      if (this.extraHeaders == null) {
+        this.extraHeaders = mapOf();
+      }
       return new DeleteAiAgentByIdHeaders(this);
     }
   }

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

@@ -25,16 +25,17 @@ public static class Builder {
 
     protected Map<String, String> extraHeaders;
 
-    public Builder() {
-      this.extraHeaders = mapOf();
-    }
+    public Builder() {}
 
     public Builder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;
     }
 
     public GetAiAgentByIdHeaders build() {
+      if (this.extraHeaders == null) {
+        this.extraHeaders = mapOf();
+      }
       return new GetAiAgentByIdHeaders(this);
     }
   }

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

@@ -25,16 +25,17 @@ public static class Builder {
 
     protected Map<String, String> extraHeaders;
 
-    public Builder() {
-      this.extraHeaders = mapOf();
-    }
+    public Builder() {}
 
     public Builder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;
     }
 
     public GetAiAgentsHeaders build() {
+      if (this.extraHeaders == null) {
+        this.extraHeaders = mapOf();
+      }
       return new GetAiAgentsHeaders(this);
     }
   }

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

@@ -25,16 +25,17 @@ public static class Builder {
 
     protected Map<String, String> extraHeaders;
 
-    public Builder() {
-      this.extraHeaders = mapOf();
-    }
+    public Builder() {}
 
     public Builder extraHeaders(Map<String, String> extraHeaders) {
       this.extraHeaders = extraHeaders;
       return this;
     }
 
     public UpdateAiAgentByIdHeaders build() {
+      if (this.extraHeaders == null) {
+        this.extraHeaders = mapOf();
+      }
       return new UpdateAiAgentByIdHeaders(this);
     }
   }

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

@@ -244,9 +244,7 @@ public static class Builder {
 
     protected NetworkSession networkSession;
 
-    public Builder() {
-      this.networkSession = new NetworkSession();
-    }
+    public Builder() {}
 
     public Builder auth(Authentication auth) {
       this.auth = auth;
@@ -259,6 +257,9 @@ public Builder networkSession(NetworkSession networkSession) {
     }
 
     public AppItemAssociationsManager build() {
+      if (this.networkSession == null) {
+        this.networkSession = new NetworkSession();
+      }
       return new AppItemAssociationsManager(this);
     }
   }