Fix SimpleJsonSerializer when exception on prop

When the target Java Bean reader throws an exception it is wrapped to
the `InvocationTargetException` which `getMessage()` returns `null`.

* Extract the `cause` when `InvocationTargetException` and check the
`message` for null anyway.
* Also check for `null` before calling `toString()` in the
`SimpleJsonSerializer.toElement()`

Author: artembilan

spring-integration-core/src/main/java/org/springframework/integration/json/SimpleJsonSerializer.java

@@ -33,6 +33,8 @@
  * properties accessed by getters.
  *
  * @author Gary Russell
+ * @author Artem Bilan
+ *
  * @since 5.0
  *
  */
@@ -66,10 +68,19 @@ public static String toJson(Object bean, String... propertiesToExclude) {
 					result = readMethod.invoke(bean, emptyArgs);
 				}
 				catch (InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
+					Throwable exception = e;
+					if (e instanceof InvocationTargetException) {
+						exception = e.getCause();
+					}
+
 					if (logger.isDebugEnabled()) {
-						logger.debug("Failed to serialize property " + propertyName, e);
+						logger.debug("Failed to serialize property " + propertyName, exception);
 					}
-					result = e.getMessage();
+
+					result =
+							exception.getMessage() != null
+									? exception.getMessage()
+									: exception.toString();
 				}
 				stringBuilder.append(toElement(result)).append(",");
 			}
@@ -89,7 +100,7 @@ private static String toElement(Object result) {
 			return result.toString();
 		}
 		else {
-			return "\"" + result.toString() + "\"";
+			return "\"" + (result == null ? "null" : result.toString()) + "\"";
 		}
 	}
 

spring-integration-core/src/test/java/org/springframework/integration/json/SimpleJsonSerializerTests.java

@@ -26,6 +26,8 @@
 
 /**
  * @author Gary Russell
+ * @author Artem Bilan
+ *
  * @since 5.0
  *
  */
@@ -83,6 +85,10 @@ public String fileInfo() {
 			return this.fileInfo;
 		}
 
+		public String getPermissions() {
+			throw new UnsupportedOperationException("Permissions are not supported");
+		}
+
 	}
 
 }