In CodeGenerator, default the resourceDirectory to the sourcesDirectory when one is not explicitly specified. (#3604)

millems · web-flow · commit 5d593127ad87 · 2022-12-09T12:30:54.000-08:00
This fixes a backwards-incompatibility for customers we didn't know existed: those that use CodeGenerator directly.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/CodeGenerator.java b/codegen/src/main/java/software/amazon/awssdk/codegen/CodeGenerator.java
@@ -52,7 +52,8 @@ public CodeGenerator(Builder builder) {
         this.models = builder.models;
         this.sourcesDirectory = builder.sourcesDirectory;
         this.testsDirectory = builder.testsDirectory;
-        this.resourcesDirectory = builder.resourcesDirectory;
+        this.resourcesDirectory = builder.resourcesDirectory != null ? builder.resourcesDirectory
+                                                                     : builder.sourcesDirectory;
         this.fileNamePrefix = builder.fileNamePrefix;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,8 @@ public CodeGenerator(Builder builder) {`
`52`	`52`	`this.models = builder.models;`
`53`	`53`	`this.sourcesDirectory = builder.sourcesDirectory;`
`54`	`54`	`this.testsDirectory = builder.testsDirectory;`
`55`		`- this.resourcesDirectory = builder.resourcesDirectory;`
	`55`	`+ this.resourcesDirectory = builder.resourcesDirectory != null ? builder.resourcesDirectory`
	`56`	`+ : builder.sourcesDirectory;`
`56`	`57`	`this.fileNamePrefix = builder.fileNamePrefix;`
`57`	`58`	`}`
`58`	`59`