fixing issues related to using the RCU connection string and the resulting JDBC URL used in create domain

Author: robertpatrick

core/src/main/java/oracle/weblogic/deploy/create/RCURunner.java

@@ -94,7 +94,11 @@ private RCURunner(String domainType, String oracleHome, String javaHome, String
 
         this.oracleHome = validateExistingDirectory(oracleHome, "ORACLE_HOME");
         this.javaHome = validateExistingDirectory(javaHome, "JAVA_HOME");
-        this.rcuDb = validateNonEmptyString(rcuDb, "rcu_db");
+
+        // The rcu_db string could be in the long format so quote the argument to prevent the shell
+        // from trying to interpret the parens...
+        //
+        this.rcuDb = quoteStringForCommandLine(rcuDb, "rcu_db");
         this.rcuPrefix = validateNonEmptyString(rcuPrefix, "rcu_prefix");
         this.rcuSchemas = validateNonEmptyListOfStrings(rcuSchemas, "rcu_schema_list");
         this.rcuVariables = rcuVariables;
@@ -383,6 +387,11 @@ private static File validateExistingDirectory(String directoryName, String direc
         return result;
     }
 
+    private static String quoteStringForCommandLine(String text, String textTypeName) throws CreateException {
+        String result = validateNonEmptyString(text, textTypeName);
+        return StringUtils.quoteString(result);
+    }
+
     private static String validateNonEmptyString(String text, String textTypeName) throws CreateException {
         return validateNonEmptyString(text, textTypeName, false);
     }

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

@@ -66,7 +66,7 @@ public static String getStringFromList(List<String> list, char separator) {
     }
 
     /**
-     * String surrounding quotes from the string, if they are present.
+     * Strip surrounding quotes from the string, if they are present.
      *
      * @param string the string from which to remove the surround quotes
      * @return the string without any surrounding quotes or the string itself if no quotes were present
@@ -83,6 +83,24 @@ public static String stripQuotes(String string) {
         return result;
     }
 
+    /**
+     * Add surrounding quotes to the string, if not already present.
+     *
+     * @param string the string to surround with double quotes
+     * @return the string with surrounding double quotes or the string itself is single or double quotes were present
+     */
+    public static String quoteString(String string) {
+        String result = "\"" + string + "\"";
+        if (!StringUtils.isEmpty(string) && string.length() > 1) {
+            char first = string.charAt(0);
+            char last = string.charAt(string.length() - 1);
+            if ((first == '"' && last == '"') || (first == '\'' && last == '\'')) {
+                result = string;
+            }
+        }
+        return result;
+    }
+
     /**
      * Determine if the provided string value matches the provided pattern.
      *

core/src/main/python/wlsdeploy/util/weblogic_helper.py

@@ -123,7 +123,18 @@ def get_jdbc_url_from_rcu_connect_string(self, rcu_connect_string):
         :param rcu_connect_string: the RCU connect string
         :return: the JDBC URL
         """
-        return 'jdbc:oracle:thin:@' + rcu_connect_string
+        jdbc_url = rcu_connect_string
+        if not rcu_connect_string.startswith('jdbc:oracle:'):
+            if rcu_connect_string.startswith('('):
+                # Long format
+                jdbc_url = 'jdbc:oracle:thin:@' + rcu_connect_string
+            elif rcu_connect_string.rfind('/') != -1:
+                # host:port/service format
+                jdbc_url = 'jdbc:oracle:thin:@//' + rcu_connect_string
+            else:
+                # host:port:sid format
+                jdbc_url = 'jdbc:oracle:thin:@' + rcu_connect_string
+        return jdbc_url
 
     def get_stb_data_source_jdbc_driver_name(self):
         """