Fail soft on malformed Json, workaround for #7

marvk · Mar 23, 2019 · 2998925 · 2998925
1 parent 8e0e118
commit 2998925
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/lichess4j/src/main/java/net/marvk/chess/lichess4j/EventResponseConsumer.java b/lichess4j/src/main/java/net/marvk/chess/lichess4j/EventResponseConsumer.java
@@ -2,6 +2,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonParseException;
 import lombok.extern.log4j.Log4j2;
 import net.marvk.chess.lichess4j.model.Challenge;
 import net.marvk.chess.lichess4j.model.EventResponse;
@@ -43,7 +44,7 @@ protected void onCharReceived(final CharBuffer buf, final IOControl ioControl) {
         log.trace("Received event response:\n" + response);
 
         Arrays.stream(response.split("\n"))
-              .map(line -> GSON.fromJson(line, EventResponse.class))
+              .map(EventResponseConsumer::safeJson)
               .forEach(this::acceptEvent);
     }
 
@@ -76,4 +77,13 @@ protected void onResponseReceived(final HttpResponse response) {
     protected Boolean buildResult(final HttpContext context) {
         return Boolean.TRUE;
     }
+
+    private static EventResponse safeJson(final String line) {
+        try {
+            return GSON.fromJson(line, EventResponse.class);
+        } catch (final JsonParseException e) {
+            log.error("Failed to parse line:\n " + line, e);
+            return null;
+        }
+    }
 }
diff --git a/lichess4j/src/main/java/net/marvk/chess/lichess4j/GameStateResponseConsumer.java b/lichess4j/src/main/java/net/marvk/chess/lichess4j/GameStateResponseConsumer.java
@@ -2,6 +2,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonParseException;
 import lombok.extern.log4j.Log4j2;
 import net.marvk.chess.core.board.UciMove;
 import net.marvk.chess.lichess4j.model.*;
@@ -55,7 +56,7 @@ protected void onCharReceived(final CharBuffer buf, final IOControl ioControl) {
         log.trace("Received game state response:\n" + response);
 
         Arrays.stream(response.split("\n"))
-              .map(line -> GSON.fromJson(line, GameStateResponse.class))
+              .map(GameStateResponseConsumer::safeJson)
               .forEach(this::acceptGameStateResponse);
     }
 
@@ -96,4 +97,12 @@ protected Boolean buildResult(final HttpContext httpContext) {
         return Boolean.TRUE;
     }
 
+    private static GameStateResponse safeJson(final String line) {
+        try {
+            return GSON.fromJson(line, GameStateResponse.class);
+        } catch (final JsonParseException e) {
+            log.error("Failed to parse line:\n " + line, e);
+            return null;
+        }
+    }
 }