fix(api): Fix JsonMessage asynchronous methods don't catch all poss…

…ible thrown exceptions during decoding
wuespace · Mar 23, 2022 · d40074e · d40074e
1 parent 8f78d07
commit d40074e
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/modules/telestion-api/src/main/java/de/wuespace/telestion/api/message/JsonMessage.java b/modules/telestion-api/src/main/java/de/wuespace/telestion/api/message/JsonMessage.java
@@ -50,11 +50,11 @@ public interface JsonMessage {
 	 * @return {@code true} when the conversion was successful
 	 */
 	static <T extends JsonMessage> boolean on(Class<T> type, Buffer json, Handler<T> handler,
-											  Handler<DecodeException> exceptionHandler) {
+											  Handler<RuntimeException> exceptionHandler) {
 		try {
 			handler.handle(from(json, type));
 			return true;
-		} catch (DecodeException e) {
+		} catch (DecodeException | IllegalArgumentException e) {
 			logger.warn("Cannot convert buffer to JsonMessage {}:", type.getName(), e);
 			exceptionHandler.handle(e);
 			return false;
@@ -73,11 +73,11 @@ static <T extends JsonMessage> boolean on(Class<T> type, Buffer json, Handler<T>
 	 * @return {@code true} when the conversion was successful
 	 */
 	static <T extends JsonMessage> boolean on(Class<T> type, String json, Handler<T> handler,
-											  Handler<DecodeException> exceptionHandler) {
+											  Handler<RuntimeException> exceptionHandler) {
 		try {
 			handler.handle(from(json, type));
 			return true;
-		} catch (DecodeException e) {
+		} catch (DecodeException | IllegalArgumentException e) {
 			logger.warn("Cannot convert JSON string to JsonMessage {}:", type.getName(), e);
 			exceptionHandler.handle(e);
 			return false;
@@ -96,11 +96,11 @@ static <T extends JsonMessage> boolean on(Class<T> type, String json, Handler<T>
 	 * @return {@code true} when the conversion was successful
 	 */
 	static <T extends JsonMessage> boolean on(Class<T> type, Object json, Handler<T> handler,
-											  Handler<DecodeException> exceptionHandler) {
+											  Handler<RuntimeException> exceptionHandler) {
 		try {
 			handler.handle(from(json, type));
 			return true;
-		} catch (DecodeException e) {
+		} catch (DecodeException | IllegalArgumentException e) {
 			logger.warn("Cannot convert Object to JsonMessage {}:", type.getName(), e);
 			exceptionHandler.handle(e);
 			return false;
@@ -119,11 +119,11 @@ static <T extends JsonMessage> boolean on(Class<T> type, Object json, Handler<T>
 	 * @return {@code true} when the conversion was successful
 	 */
 	static <T extends JsonMessage> boolean on(Class<T> type, Message<?> message, Handler<T> handler,
-											  Handler<DecodeException> exceptionHandler) {
+											  Handler<RuntimeException> exceptionHandler) {
 		try {
 			handler.handle(from(message, type));
 			return true;
-		} catch (DecodeException e) {
+		} catch (DecodeException | IllegalArgumentException e) {
 			logger.warn("Cannot convert Vertx Message to JsonMessage {}:", type.getName(), e);
 			exceptionHandler.handle(e);
 			return false;