Jira wdt 79 catch number format exception (#623)

* Fix java.lang.Boolean issues for ActiveDirectoryAuthenticator

* convert to number catches format exception

Author: CarolynRountree

core/src/main/java/oracle/weblogic/deploy/aliases/TypeUtils.java

@@ -1,11 +1,12 @@
 /*
- * Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 package oracle.weblogic.deploy.aliases;
 
 import java.io.File;
 import java.lang.reflect.Array;
+import java.lang.NumberFormatException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -168,7 +169,7 @@ public static Object convertToType(Class<?> targetType, Object value) throws Ali
      *                        or the requested data type is not supported.
      * @throws AliasException if classType is a primitive class type such as int, short, etc. or if a multi-valued
      *                        type is detected where the delimiter is null and a delimiter is required to handle
-     *                        the conversion.
+     *                        the conversion. Or if the numeric value cannot be converted to the numeric format.
      */
     public static Object convertToType(Class<?> targetType, Object value, String delimiter) throws AliasException {
         final String METHOD = "convertToType";
@@ -194,38 +195,44 @@ public static Object convertToType(Class<?> targetType, Object value, String del
         }
 
         Object result;
-        if (targetType == String.class) {
-            result = strValue;
-        } else if (targetType == Boolean.class) {
-            result = convertToBoolean(strValue);
-        } else if (targetType == Integer.class) {
-            result = Integer.valueOf(strValue);
-        } else if (targetType == Short.class) {
-            result = Short.valueOf(strValue);
-        } else if (targetType == Long.class) {
-            result = Long.valueOf(strValue);
-        } else if (targetType == Float.class) {
-            result = Float.valueOf(strValue);
-        } else if (targetType == Double.class) {
-            result = Double.valueOf(strValue);
-        } else if (targetType == Character.class) {
-            result = convertToCharacter(strValue);
-        } else if (targetType == char[].class) {
-            result = convertToCharArray(strValue);
-        } else if (Object[].class.isAssignableFrom(targetType)) {
-            result = convertToObjectArray(value, strValue, delimiter);
-        } else if (List.class.isAssignableFrom(targetType)) {
-            result = convertToList(value, strValue, delimiter);
-        } else if (Properties.class.isAssignableFrom(targetType)) {
-            result = convertToProperties(value, delimiter);
-        } else if (PyOrderedDict.class.isAssignableFrom(targetType)) {
-            result = convertToDictionary(value, delimiter, true);
-        } else if (PyDictionary.class.isAssignableFrom(targetType)) {
-            result = convertToDictionary(value, delimiter, false);
-        } else if (Map.class.isAssignableFrom(targetType)) {
-            result = convertToMap(value, strValue, delimiter);
-        } else {
-            AliasException ae = new AliasException("WLSDPLY-08502", strValue, targetType.getName());
+        try {
+            if (targetType == String.class) {
+                result = strValue;
+            } else if (targetType == Boolean.class) {
+                result = convertToBoolean(strValue);
+            } else if (targetType == Integer.class) {
+                result = Integer.valueOf(strValue);
+            } else if (targetType == Short.class) {
+                result = Short.valueOf(strValue);
+            } else if (targetType == Long.class) {
+                result = Long.valueOf(strValue);
+            } else if (targetType == Float.class) {
+                result = Float.valueOf(strValue);
+            } else if (targetType == Double.class) {
+                result = Double.valueOf(strValue);
+            } else if (targetType == Character.class) {
+                result = convertToCharacter(strValue);
+            } else if (targetType == char[].class) {
+                result = convertToCharArray(strValue);
+            } else if (Object[].class.isAssignableFrom(targetType)) {
+                result = convertToObjectArray(value, strValue, delimiter);
+            } else if (List.class.isAssignableFrom(targetType)) {
+                result = convertToList(value, strValue, delimiter);
+            } else if (Properties.class.isAssignableFrom(targetType)) {
+                result = convertToProperties(value, delimiter);
+            } else if (PyOrderedDict.class.isAssignableFrom(targetType)) {
+                result = convertToDictionary(value, delimiter, true);
+            } else if (PyDictionary.class.isAssignableFrom(targetType)) {
+                result = convertToDictionary(value, delimiter, false);
+            } else if (Map.class.isAssignableFrom(targetType)) {
+                result = convertToMap(value, strValue, delimiter);
+            } else {
+                AliasException ae = new AliasException("WLSDPLY-08502", strValue, targetType.getName());
+                LOGGER.throwing(CLASS, METHOD, ae);
+                throw ae;
+            }
+        } catch (NumberFormatException nfe) {
+            AliasException ae = new AliasException("WLSDPLY-08508", strValue, targetType.getSimpleName(), nfe);
             LOGGER.throwing(CLASS, METHOD, ae);
             throw ae;
         }

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -928,6 +928,7 @@ WLSDPLY-08504=Unable to convert type {0} to a PyDictionary type
 WLSDPLY-08505=Unable to convert string {0} to a List since the delimiter is null
 WLSDPLY-08506=Unable to add property {0} to a PyDictionary type
 WLSDPLY-08507=Unable to convert type {0} to a PyObject type
+WLSDPLY-08508=Unable to convert String value {0} to numeric type {0}
 
 ###############################################################################
 #                     Deploy messages (9000 - 9999)                           #

core/src/test/java/oracle/weblogic/deploy/aliases/TypeUtilsTest.java

@@ -49,6 +49,11 @@ public void convertToTypeInvalidPrimitiveType() throws Exception {
         TypeUtils.convertToType( int.class, "123" );
     }
 
+    @Test(expected = AliasException.class)
+    public void convertInvalidInteger() throws Exception {
+        TypeUtils.convertToType(Integer.class, "this is a string");
+    }
+
     @Test
     public void convertToTypeNullTest() throws Exception {
         assertEquals("String null conversion failed", null, TypeUtils.convertToType( String.class, null ));;