fix(infrastructure): fix java compilation issue without api, and skip unused constructs in java/py

packages/infrastructure/samples/infrastructure/java/src/java/groupId/constructs/WebsiteConstruct.java.mustache

@@ -16,9 +16,6 @@ import software.constructs.Construct;
  * Construct to deploy a Static Website
  */
 public class WebsiteConstruct extends Construct {
-    public WebsiteConstruct(Construct scope, String id, UserIdentity userIdentity) {
-        this(scope, id, userIdentity{{^hasApi}}/* {{/hasApi}}, null{{^hasApi}} */{{/hasApi}});
-    }
 
     public WebsiteConstruct(Construct scope, String id, UserIdentity userIdentity{{^hasApi}}/* {{/hasApi}}, ApiConstruct apiConstruct{{^hasApi}} */{{/hasApi}}) {
         super(scope, id);
@@ -31,7 +28,8 @@ public class WebsiteConstruct extends Construct {
                                 "identityPoolId", userIdentity.getIdentityPool().getIdentityPoolId(),
                                 "userPoolId", userIdentity.getUserPool().getUserPoolId(),
                                 "userPoolWebClientId", userIdentity.getUserPoolClient().getUserPoolClientId(){{#hasApi}},{{/hasApi}}
-                                {{^hasApi}}// {{/hasApi}}"apiUrl", apiConstruct.api.getApi().urlForPath())))
+                                {{^hasApi}}// {{/hasApi}}"apiUrl", apiConstruct.api.getApi().urlForPath()
+                                )))
                         .build())
                 .distributionProps(DistributionProps.builder()
                     .geoRestriction(GeoRestriction.allowlist(

packages/infrastructure/src/projects/java/infrastructure-java-project.ts

@@ -142,13 +142,16 @@ export class InfrastructureJavaProject extends AwsCdkJavaApp {
   ) {
     fs.readdirSync(dir, { withFileTypes: true })
       .filter((f) => {
+        let shouldIncludeFile = true;
         if (!mustacheConfig.hasApi) {
-          return !f.name.endsWith("api.ts.mustache");
-        } else if (!mustacheConfig.hasWebsite) {
-          return !f.name.endsWith("website.ts.mustache");
-        } else {
-          return true;
+          shouldIncludeFile &&= !f.name.endsWith("ApiConstruct.java.mustache");
+        }
+        if (!mustacheConfig.hasWebsite) {
+          shouldIncludeFile &&= !f.name.endsWith(
+            "WebsiteConstruct.java.mustache"
+          );
         }
+        return shouldIncludeFile;
       })
       .forEach((f) => {
         if (f.isDirectory()) {

packages/infrastructure/src/projects/python/infrastructure-py-project.ts

@@ -130,13 +130,14 @@ export class InfrastructurePyProject extends AwsCdkPythonApp {
   ) {
     fs.readdirSync(dir, { withFileTypes: true })
       .filter((f) => {
+        let shouldIncludeFile = true;
         if (!mustacheConfig.hasApi) {
-          return !f.name.endsWith("api.ts.mustache");
-        } else if (!mustacheConfig.hasWebsite) {
-          return !f.name.endsWith("website.ts.mustache");
-        } else {
-          return true;
+          shouldIncludeFile &&= !f.name.endsWith("api.py.mustache");
+        }
+        if (!mustacheConfig.hasWebsite) {
+          shouldIncludeFile &&= !f.name.endsWith("website.py.mustache");
         }
+        return shouldIncludeFile;
       })
       .forEach((f) => {
         if (f.isDirectory()) {

packages/infrastructure/src/projects/typescript/infrastructure-ts-project.ts

@@ -128,13 +128,14 @@ export class InfrastructureTsProject extends AwsCdkTypeScriptApp {
   ) {
     fs.readdirSync(dir, { withFileTypes: true })
       .filter((f) => {
+        let shouldIncludeFile = true;
         if (!mustacheConfig.hasApi) {
-          return !f.name.endsWith("api.ts.mustache");
-        } else if (!mustacheConfig.hasWebsite) {
-          return !f.name.endsWith("website.ts.mustache");
-        } else {
-          return true;
+          shouldIncludeFile &&= !f.name.endsWith("api.ts.mustache");
         }
+        if (!mustacheConfig.hasWebsite) {
+          shouldIncludeFile &&= !f.name.endsWith("website.ts.mustache");
+        }
+        return shouldIncludeFile;
       })
       .forEach((f) =>
         f.isDirectory()