Issue #490 - Remove trailing L from long property values (#491)

Author: rakillen

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

@@ -22,6 +22,7 @@
 import org.python.core.Py;
 import org.python.core.PyDictionary;
 import org.python.core.PyException;
+import org.python.core.PyLong;
 import org.python.core.PyObject;
 import org.python.core.PyTuple;
 
@@ -323,7 +324,7 @@ private static Properties convertToProperties(Object value, String delimiter) th
             properties = new Properties();
             for (Object obj : dict.items()) {
                 PyTuple po = (PyTuple) obj;
-                properties.put( po.__finditem__(0).toString(), po.__finditem__(1).toString() );
+                properties.put( po.__finditem__(0).toString(), getPropertyText(po.__finditem__(1)) );
             }
         } else {
             AliasException ae = new AliasException("WLSDPLY-08503", value.getClass().getName());
@@ -332,6 +333,20 @@ private static Properties convertToProperties(Object value, String delimiter) th
         }
         return properties.isEmpty() ? null : properties;
     }
+
+    /**
+     * Returns text for the specified value, for use with property type.
+     * @param value the value to be examined
+     * @return text for the value
+     */
+    private static String getPropertyText(Object value) {
+        // toString() for PyLong includes trailing L, such as 25L
+        if(value instanceof PyLong) {
+            return ((PyLong) value).getValue().toString();
+        }
+        return value.toString();
+    }
+
     private static PyDictionary convertToDictionary(Object value, String delimiter, boolean useOrderedDict)
         throws AliasException {
         final String METHOD = "convertToDictionary";

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

@@ -13,6 +13,7 @@
 
 import org.junit.Test;
 import org.python.core.PyDictionary;
+import org.python.core.PyLong;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyTuple;
@@ -134,4 +135,20 @@ public void convertToProperties() throws Exception {
         assertEquals("Properties from Map failed", expected, TypeUtils.convertToType(Properties.class, map, ";"));
 
     }
+
+    @Test
+    public void convertDictToProperties() throws Exception {
+        PyDictionary dict = new PyDictionary();
+        // test special processing to remove trailing L from PyLong, such as 25L
+        dict.__setitem__("mail.smtp.port", new PyLong(25));
+        dict.__setitem__("mail.smtp.host", new PyString("192.168.56.1"));
+
+        Properties result = (Properties) TypeUtils.convertToType(Properties.class, dict);
+
+        Properties expected = new Properties();
+        expected.put("mail.smtp.port", "25");
+        expected.put("mail.smtp.host", "192.168.56.1");
+
+        assertEquals("Properties from dict failed", expected, result);
+    }
 }