Merge pull request #435 from boozallen/414-java-upgrade-filestore-pipeline-configuration

#414 - JDK 17 Upgrade Support Series - Filestore & Pipeline model config

Author: habibimoiz

foundation/foundation-core-java/src/main/java/com/boozallen/aissemble/core/filestore/AbstractFileStore.java

@@ -45,10 +45,13 @@ public AbstractFileStore(final String name) {
      * @return a fully connected context
      */
     public BlobStoreContext openContext() {
-        return ContextBuilder.newBuilder(fileStoreConfig.getProvider())
-                .credentials(fileStoreConfig.getAccessKeyId(), fileStoreConfig.getSecretAccessKey())
-                .overrides(fileStoreConfig.getOverrides())
-                .buildView(BlobStoreContext.class);
+        ContextBuilder contextBuilder = ContextBuilder.newBuilder(fileStoreConfig.getProvider())
+                .credentials(fileStoreConfig.getAccessKeyId(), fileStoreConfig.getSecretAccessKey());
+
+        if (fileStoreConfig.getOverrides() != null) {
+            contextBuilder.overrides(fileStoreConfig.getOverrides());
+        }
+        return contextBuilder.buildView(BlobStoreContext.class);
     }
 
     /**

foundation/foundation-core-java/src/main/java/com/boozallen/aissemble/core/filestore/EnvironmentVariableFileStoreConfig.java

@@ -28,6 +28,7 @@ public EnvironmentVariableFileStoreConfig(final String name) {
 
     /**
      * Get the configurations for the given filestore name.
+     *
      * @param name the name of the filestore
      * @return the configurations from the environment variables.
      */
@@ -58,11 +59,12 @@ public String getSecretAccessKey() {
     public Properties getOverrides() {
         // Convert namespaced override values to property names understood by JClouds
         final String overridesJsonString = this.config.get(getName() + "_FS_OVERRIDES");
-        final Gson gson = new Gson();
-        final Map overrides = gson.fromJson(overridesJsonString, Map.class);
-
         final Properties propertyOverrides = new Properties();
-        propertyOverrides.putAll(overrides);
+        if (overridesJsonString != null && !overridesJsonString.isBlank()) {
+            final Gson gson = new Gson();
+            final Map overrides = gson.fromJson(overridesJsonString, Map.class);
+            propertyOverrides.putAll(overrides);
+        }
         return propertyOverrides;
     }
 }

foundation/foundation-mda/src/main/resources/templates/file-store/file.store.impl.java.vm

@@ -5,8 +5,7 @@ import jakarta.enterprise.context.ApplicationScoped;
 /**
  * Utility for accessing the ${fileStore.name} file storage. To customize
  * the file store connection modify the environment variables as per the documentation at
- * https://boozallen.github.io/aissemble/current/pipeline-metamodel.html
- *
+ * https://boozallen.github.io/aissemble/aissemble/current/pipeline-metamodel.html
  * Please **DO** modify with your customizations, as appropriate.
  *
  * Originally generated from: ${templateName}