Stop generating whole profile, just create key schema files

Author: velo

sqrl-tools/sqrl-packager/src/main/java/com/datasqrl/packager/Packager.java

@@ -30,11 +30,13 @@
 import freemarker.template.Configuration;
 import freemarker.template.DefaultMapAdapter;
 import freemarker.template.Template;
+import freemarker.template.TemplateException;
 import freemarker.template.TemplateExceptionHandler;
 import freemarker.template.TemplateMethodModelEx;
 import freemarker.template.TemplateModelException;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.FileVisitResult;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
@@ -43,8 +45,11 @@
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import java.io.File;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
@@ -323,17 +328,64 @@ public void postprocess(PackageJson sqrlConfig, Path rootDir, Path targetDir, Ph
           ? rootDir.resolve(profile)
           : namepath2Path(buildDir.getBuildDir(), NamePath.parse(profile));
 
-      copyToDeploy(targetDir, profilePath, plan, testPlan, sqrlConfig, plans);
+//      copyToDeploy(targetDir, profilePath, plan, testPlan, sqrlConfig, plans);
     }
 
     copyDataFiles(buildDir.getBuildDir());
     moveFolder(targetDir, DATA_DIR);
     copyJarFiles(buildDir.getBuildDir());
     moveFolder(targetDir, LIB_DIR);
     copyCompiledPlan(buildDir.getBuildDir(), targetDir);
+    
+    // copy deployment files
+    Map<String, Object> config = collectConfiguration(sqrlConfig, plans);
+    writePostgresSchema(targetDir, config);
+  }
+
+  private void writePostgresSchema(Path targetDir, Map<String, Object> config) {
+	  if(config.containsKey("postgres") || config.containsKey("postgres_log")) {
+    //postgres
+    copyTemplate(targetDir, config, "templates/database-schema.sql.ftl", "postgres/database-schema.sql");
+    copyTemplate(targetDir, config, "templates/database-schema.sql.ftl", "files/postgres-schema.sql");
+	  }
+
+    if(config.containsKey("flink")) {
+    //flink
+    copyTemplate(targetDir, config, "templates/flink.sql.ftl", "flink/src/main/resources/flink.sql");
+    copyTemplate(targetDir, config, "templates/flink.sql.ftl", "files/flink.sql");
+    }
+    
+    if(config.containsKey("vertx")) {
+    //vertx server-config
+    copyTemplate(targetDir, config, "templates/server-config.json.ftl", "vertx/server-config.json");
+    copyTemplate(targetDir, config, "templates/server-config.json.ftl", "files/vertx-config.json");
+
+    //vertx server-config
+    copyTemplate(targetDir, config, "templates/server-model.json.ftl", "vertx/server-model.json");
+    copyTemplate(targetDir, config, "templates/server-model.json.ftl", "files/vertx-model.json");
+    }
   }
 
   @SneakyThrows
+  private void copyTemplate(Path targetDir, Map<String, Object> config, String source, String destination) {
+    // Set up the FreeMarker configuration to load templates from the classpath.
+	    Configuration cfg = new Configuration(Configuration.VERSION_2_3_32);
+	    cfg.setDefaultEncoding("UTF-8");
+	    cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
+	    cfg.setNumberFormat("computer");
+	    cfg.setSharedVariable("jsonEncode", new JsonEncoderMethod());    // Set the base directory for templates to the root of the classpath.
+	    cfg.setClassLoaderForTemplateLoading(getClass().getClassLoader(), "/");
+
+    Template template = cfg.getTemplate(source);
+
+    Path postgresSchemaFile = targetDir.resolve(destination);
+    Files.createDirectories(postgresSchemaFile.getParent());  
+    try (Writer writer = new OutputStreamWriter(Files.newOutputStream(postgresSchemaFile), StandardCharsets.UTF_8)) {
+        template.process(config, writer);
+    }
+  }
+
+@SneakyThrows
   private void copyCompiledPlan(Path buildDir, Path targetDir) {
     if (Files.exists(buildDir.resolve(COMPILED_PLAN_JSON))) {
       Path destFolder = targetDir.resolve("flink");
@@ -422,10 +474,7 @@ private void copyToDeploy(Path targetDir, Path profile, PhysicalPlan plan, TestP
       Files.createDirectories(targetDir);
     }
 
-    Map<String, Object> templateConfig = new HashMap<>();
-    templateConfig.put("config", sqrlConfig.toMap()); //Add SQRL config
-    templateConfig.put("environment", System.getenv()); //Add environmental variables
-    templateConfig.putAll(plans);
+    Map<String, Object> templateConfig = collectConfiguration(sqrlConfig, plans);
     // Copy each file and directory from the profile path to the target directory
     if (!Files.isDirectory(profile)) {
       throw new RuntimeException("Could not find profile: " + profile);
@@ -455,6 +504,14 @@ private void copyToDeploy(Path targetDir, Path profile, PhysicalPlan plan, TestP
     }
   }
 
+private Map<String, Object> collectConfiguration(PackageJson sqrlConfig, Map<String, Object> plans) {
+	Map<String, Object> templateConfig = new HashMap<>();
+    templateConfig.put("config", sqrlConfig.toMap()); //Add SQRL config
+    templateConfig.put("environment", System.getenv()); //Add environmental variables
+    templateConfig.putAll(plans);
+	return templateConfig;
+}
+
   private Path trimFtl(Path destinationPath) {
     return destinationPath.getFileName().toString().endsWith(".ftl") ?
         destinationPath.getParent().resolve(destinationPath.getFileName().toString().substring(0,destinationPath.getFileName().toString().length()-4 ))
@@ -490,18 +547,17 @@ public void processTemplate(Path path, Path destination, Map config) throws Exce
       return;
     }
 
+    // extract the template filename
+    String templateName = path.getFileName().toString();
+
     // configure Freemarker
     Configuration cfg = new Configuration(Configuration.VERSION_2_3_32);
     cfg.setDirectoryForTemplateLoading(path.getParent().toFile());
     cfg.setDefaultEncoding("UTF-8");
     cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
     cfg.setNumberFormat("computer");
-
     cfg.setSharedVariable("jsonEncode", new JsonEncoderMethod());
 
-    // extract the template filename
-    String templateName = path.getFileName().toString();
-
     // load and process the template
     Template template = cfg.getTemplate(templateName);
     Writer out = new StringWriter();

profiles/default/postgres/database-schema.sql.ftl renamed to sqrl-tools/sqrl-packager/src/main/resources/templates/database-schema.sql.ftl

@@ -126,11 +126,13 @@
     "reconnectAttempts": 0,
     "reconnectInterval": 1000,
     "hostnameVerificationAlgorithm": "",
+<#noparse>
     "host": "${PGHOST}",
     "port": 5432,
     "user": "${PGUSER}",
     "password": "${PGPASSWORD}",
     "database": "${PGDATABASE}",
+</#noparse>
     "cachePreparedStatements": false,
     "preparedStatementCacheMaxSize": 256,
     "preparedStatementCacheSqlFilter": {},

profiles/default/flink/src/main/resources/flink.sql.ftl renamed to sqrl-tools/sqrl-packager/src/main/resources/templates/flink.sql.ftl

@@ -209,7 +209,7 @@ public CompiledPlan compileFlink() {
 
     Path flinkPath = path.resolve("flink.json");
     if (!flinkPath.toFile().exists()) {
-      throw new RuntimeException("Could not find flink plan.");
+      throw new RuntimeException("Could not find flink plan: " + flinkPath);
     }
 
     Map map = objectMapper.readValue(path.resolve("flink.json").toFile(), Map.class);