fixing issue with the name returned when adding a file to a database wallet (#1378)

Author: robertpatrick

core/src/main/java/oracle/weblogic/deploy/util/WLSDeployArchive.java

@@ -4502,11 +4502,6 @@ protected String addDatabaseWallet(String walletName, String sourceLocation, boo
             newName = addItemToZip(ARCHIVE_DB_WALLETS_DIR + ZIP_SEP + walletName, sourceFile, false);
         } else {
             newName = addItemToZip(ARCHIVE_DB_WALLETS_DIR + ZIP_SEP + walletName, sourceFile);
-
-            // When adding a file (e.g., zip file), the wallet name returned should always point
-            // to the wallet directory containing the file.
-            //
-            newName = getDatabaseWalletArchivePathFromAddedFile(ARCHIVE_DB_WALLETS_DIR, newName);
         }
 
         LOGGER.exiting(CLASS, METHOD, newName);
@@ -4931,20 +4926,6 @@ private String getDatabaseWalletNameFromArchivePath(String archivePath) {
         return result;
     }
 
-    private String getDatabaseWalletArchivePathFromAddedFile(String walletParentPath, String walletFileName) {
-        String result = null;
-
-        int fromIndex = walletParentPath.length();
-        if (!walletParentPath.endsWith(ZIP_SEP)) {
-            fromIndex++;
-        }
-        int endIndex = walletParentPath.indexOf(ZIP_SEP, fromIndex);
-        if (endIndex != -1) {
-            result = walletFileName.substring(0, endIndex);
-        }
-        return result;
-    }
-
     private String getNameFromPath(String path, int startIndex) throws WLSDeployArchiveIOException {
         final String METHOD = "getNameFromPath";
         LOGGER.entering(CLASS, METHOD, path, startIndex);

core/src/test/java/oracle/weblogic/deploy/tool/ArchiveHelperAddTest.java

@@ -1285,6 +1285,30 @@ void testAddNewDatabaseWalletDir_ReturnsExceptedResult() throws Exception {
         assertArchiveInExpectedState(LIST_DATABASE_WALLETS, EMPTY_ARRAY, DATABASE_WALLET_WALLET1_CONTENTS);
     }
 
+    @Test
+    void testAddNewDatabaseWalletFile_ReturnsExpectedResult() throws Exception {
+        StringWriter outStringWriter = new StringWriter();
+        StringWriter errStringWriter = new StringWriter();
+        String[] args = new String[]{
+            "add",
+            "databaseWallet",
+            "-archive_file",
+            NEW_ARCHIVE_VALUE,
+            "-wallet_name",
+            "wallet1",
+            "-source",
+            getSourcePath(ArchiveEntryType.DB_WALLET, "wallet1/atpwallet.zip")
+        };
+        int actual = -1;
+        try (PrintWriter out = new PrintWriter(outStringWriter);
+             PrintWriter err = new PrintWriter(errStringWriter)) {
+            actual = ArchiveHelper.executeCommand(out, err, args);
+        }
+
+        assertEquals(ExitCode.OK, actual, "expected command to exit with exit code " + ExitCode.OK);
+        assertEquals("wlsdeploy/dbWallets/wallet1/atpwallet.zip", outStringWriter.toString().trim());
+    }
+
     @Test
     void testAddDatabaseWalletDirOverwrite_ReturnsExceptedResult() throws Exception {
         StringWriter outStringWriter = new StringWriter();
@@ -1318,6 +1342,41 @@ void testAddDatabaseWalletDirOverwrite_ReturnsExceptedResult() throws Exception
         assertArchiveInExpectedState(LIST_DATABASE_WALLETS, EMPTY_ARRAY, DATABASE_WALLET_WALLET1_CONTENTS);
     }
 
+    @Test
+    void testAddNewDatabaseWalletFileOverwrite_ReturnsExpectedResult() throws Exception {
+        StringWriter outStringWriter = new StringWriter();
+        StringWriter errStringWriter = new StringWriter();
+        String[] args = new String[]{
+            "add",
+            "databaseWallet",
+            "-archive_file",
+            NEW_ARCHIVE_VALUE,
+            "-wallet_name",
+            "wallet1",
+            "-source",
+            getSourcePath(ArchiveEntryType.DB_WALLET, "wallet1/atpwallet.zip")
+        };
+
+        int actual = -1;
+        try (PrintWriter out = new PrintWriter(outStringWriter);
+             PrintWriter err = new PrintWriter(errStringWriter)) {
+            actual = ArchiveHelper.executeCommand(out, err, args);
+        }
+
+        assertEquals(ExitCode.OK, actual, "expected command to exit with exit code " + ExitCode.OK);
+
+        outStringWriter = new StringWriter();
+        errStringWriter = new StringWriter();
+        String[] overwriteArgs = getOverwriteArgs(args);
+        try (PrintWriter out = new PrintWriter(outStringWriter);
+             PrintWriter err = new PrintWriter(errStringWriter)) {
+            actual = ArchiveHelper.executeCommand(out, err, overwriteArgs);
+        }
+
+        assertEquals(ExitCode.OK, actual, "expected command to exit with exit code " + ExitCode.OK);
+        assertEquals("wlsdeploy/dbWallets/wallet1/atpwallet.zip", outStringWriter.toString().trim());
+    }
+
     @Test
     void testAddDatabaseWalletDirTwice_ReturnsExceptedResult() throws Exception {
         StringWriter outStringWriter = new StringWriter();
@@ -1351,6 +1410,40 @@ void testAddDatabaseWalletDirTwice_ReturnsExceptedResult() throws Exception {
             DATABASE_WALLET_WALLET1_DUP_CONTENTS);
     }
 
+    @Test
+    void testAddDatabaseWalletFileTwice_ReturnsExceptedResult() throws Exception {
+        StringWriter outStringWriter = new StringWriter();
+        StringWriter errStringWriter = new StringWriter();
+        String[] args = new String[] {
+            "add",
+            "databaseWallet",
+            "-archive_file",
+            NEW_ARCHIVE_VALUE,
+            "-wallet_name",
+            "wallet1",
+            "-source",
+            getSourcePath(ArchiveEntryType.DB_WALLET, "wallet1/atpwallet.zip")
+        };
+
+        int actual = -1;
+        try (PrintWriter out = new PrintWriter(outStringWriter);
+             PrintWriter err = new PrintWriter(errStringWriter)) {
+            actual = ArchiveHelper.executeCommand(out, err, args);
+        }
+
+        assertEquals(ExitCode.OK, actual, "expected command to exit with exit code " + ExitCode.OK);
+
+        outStringWriter = new StringWriter();
+        errStringWriter = new StringWriter();
+        try (PrintWriter out = new PrintWriter(outStringWriter);
+             PrintWriter err = new PrintWriter(errStringWriter)) {
+            actual = ArchiveHelper.executeCommand(out, err, args);
+        }
+
+        assertEquals(ExitCode.OK, actual, "expected command to exit with exit code " + ExitCode.OK);
+        assertEquals("wlsdeploy/dbWallets/wallet1/atpwallet(1).zip", outStringWriter.toString().trim());
+    }
+
     ///////////////////////////////////////////////////////////////////////////////////////////////
     //                              $DOMAIN_HOME/bin script                                      //
     ///////////////////////////////////////////////////////////////////////////////////////////////