From c5336a794d6fb83685b29fee3a84df6838b9a731 Mon Sep 17 00:00:00 2001
From: Will Lehman <william.p.lehman@usace.army.mil>
Date: Thu, 23 Feb 2023 09:43:58 -0500
Subject: [PATCH] fixing issue with path substitution

---
 build.gradle                                        | 2 +-
 src/main/java/usace/wat/plugin/CcStoreS3.java       | 6 +++---
 src/main/java/usace/wat/plugin/FileDataStoreS3.java | 2 +-
 src/main/java/usace/wat/plugin/PluginManager.java   | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3be8e97..ade0fa6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,5 +51,5 @@ publishing {
     }
 
     group 'mil.army.usace.hec'
-    version '0.0.22'
+    version '0.0.23'
 }
diff --git a/src/main/java/usace/wat/plugin/CcStoreS3.java b/src/main/java/usace/wat/plugin/CcStoreS3.java
index 9f74414..4d535ee 100644
--- a/src/main/java/usace/wat/plugin/CcStoreS3.java
+++ b/src/main/java/usace/wat/plugin/CcStoreS3.java
@@ -99,7 +99,7 @@ public boolean HandlesDataStoreType(StoreType storeType){
     }
     @Override
     public boolean PutObject(PutObjectInput input) {
-        String path = remoteRootPath + "/" + manifestId + "/" + input.getFileName() + "." + input.getFileExtension();
+        String path = Constants.RemoteRootPath + "/" + manifestId + "/" + input.getFileName() + "." + input.getFileExtension();
         byte[] data;
         switch(input.getObjectState()){
             case LocalDisk:
@@ -126,7 +126,7 @@ public boolean PutObject(PutObjectInput input) {
     }
     @Override
     public boolean PullObject(PullObjectInput input) {
-        String path = remoteRootPath + "/" + manifestId + "/" + input.getFileName() + "." + input.getFileExtension();
+        String path = Constants.RemoteRootPath + "/" + manifestId + "/" + input.getFileName() + "." + input.getFileExtension();
         byte[] data;
         String localPath = input.getDestRootPath() + "/" + input.getFileName() + "." + input.getFileExtension();
         try {
@@ -155,7 +155,7 @@ private void writeInputStreamToDisk(InputStream input, String outputDestination)
     }
     @Override
     public byte[] GetObject(GetObjectInput input) throws RemoteException {
-        String path = remoteRootPath + "/" + manifestId + "/" + input.getFileName() + "." + input.getFileExtension();
+        String path = Constants.RemoteRootPath + "/" + manifestId + "/" + input.getFileName() + "." + input.getFileExtension();
         byte[] data;
         try {
             data = DownloadBytesFromS3(path);
diff --git a/src/main/java/usace/wat/plugin/FileDataStoreS3.java b/src/main/java/usace/wat/plugin/FileDataStoreS3.java
index 1e3767c..ca71e94 100644
--- a/src/main/java/usace/wat/plugin/FileDataStoreS3.java
+++ b/src/main/java/usace/wat/plugin/FileDataStoreS3.java
@@ -135,7 +135,7 @@ public FileDataStoreS3(DataStore ds){
             //error out?
             System.out.print("Missing S3 Root Paramter. Cannot create the store.");
         }
-        this.remoteRootPath = "/" + config.aws_bucket + "/" +tmpRoot;
+        this.remoteRootPath = config.aws_bucket ;
     }
     private byte[] GetObject(String path) throws RemoteException {
         byte[] data;
diff --git a/src/main/java/usace/wat/plugin/PluginManager.java b/src/main/java/usace/wat/plugin/PluginManager.java
index fa58793..e601ab2 100644
--- a/src/main/java/usace/wat/plugin/PluginManager.java
+++ b/src/main/java/usace/wat/plugin/PluginManager.java
@@ -51,17 +51,17 @@ public PluginManager(){
     private void substitutePathVariables() {
         for (DataSource ds : _payload.getInputs()){
             for(String path : ds.getPaths()){
-                substituteDataSourcePath(path);//is this a pointer? test
+                path = substituteDataSourcePath(path);//is this a pointer? test
             }
             
         }
         for (DataSource ds : _payload.getOutputs()){
             for(String path: ds.getPaths()){
-                substituteDataSourcePath(path);//is this a pointer? test
+                path = substituteDataSourcePath(path);//is this a pointer? test
             }
         }
     }
-    private void substituteDataSourcePath(String path) {
+    private String substituteDataSourcePath(String path) {
         Matcher m = p.matcher(path);
         while(m.find()){
             String result = m.group();
@@ -82,7 +82,7 @@ private void substituteDataSourcePath(String path) {
                 break;
             }
         }
-
+        return path;
     }
     public Payload getPayload(){
         return _payload;