Fixed bugs: Failing deserialization of Element and SimpleContext-classes; Failing SentencePreprocessorTest.

Author: Mischn

src/main/java/org/lambda3/text/simplification/discourse/model/Element.java

@@ -22,6 +22,7 @@
 
 package org.lambda3.text.simplification.discourse.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import edu.stanford.nlp.trees.Tree;
 import org.lambda3.text.simplification.discourse.utils.IDGenerator;
@@ -36,6 +37,7 @@
 /**
  *
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Element {
     private String id;
     private Tree parseTree;

src/main/java/org/lambda3/text/simplification/discourse/model/SimpleContext.java

@@ -22,6 +22,7 @@
 
 package org.lambda3.text.simplification.discourse.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import edu.stanford.nlp.trees.Tree;
 import org.lambda3.text.simplification.discourse.runner.discourse_tree.Relation;
@@ -34,6 +35,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class SimpleContext {
     private static final Pattern PHRASE_PATTERN = Pattern.compile("^\\W*this\\W+\\w+\\W+(?<phrase>.*\\w+.*)$", Pattern.CASE_INSENSITIVE);
     private static final Pattern ATTRIBUTION_PHRASE_PATTERN = Pattern.compile("^\\W*this\\W+\\w+\\W+what\\W+(?<phrase>.*\\w+.*)$", Pattern.CASE_INSENSITIVE);

src/main/java/org/lambda3/text/simplification/discourse/processing/SentencePreprocessor.java

@@ -37,12 +37,16 @@ public class SentencePreprocessor {
 
     private static String WHITESPACE_PATTERN = "\\s+";
 
-    public final boolean removeBrackets;
+    public boolean removeBrackets;
 
     public SentencePreprocessor(Config config) {
         this.removeBrackets = config.getBoolean("remove-brackets");
     }
 
+    public void setRemoveBrackets(boolean removeBrackets) {
+        this.removeBrackets = removeBrackets;
+    }
+
     public String preprocessSentence(String sentence) {
         String res = sentence;
 

src/test/java/org/lambda3/text/simplification/discourse/processing/DiscourseSimplifierTest.java

@@ -62,6 +62,8 @@ void serializationTest() throws IOException {
         log.info("LOAD FROM FILE...");
         SimplificationContent loaded = SimplificationContent.deserializeFromJSON(new File(filename), SimplificationContent.class);
 
+        log.info(loaded.prettyPrintJSON());
+        log.info("---------------------------------");
         log.info(loaded.defaultFormat(false));
 
         log.info("DELETE FILE...");

src/test/java/org/lambda3/text/simplification/discourse/processing/SentencePreprocessorTest.java

@@ -33,6 +33,8 @@ public class SentencePreprocessorTest {
 
     @Test
     void preprocessSentence() {
+        preprocessor.setRemoveBrackets(true);
+
         String sentence = "This is a test (in brackets) and [the last (one)].";
         String sentence2 = "This is -LRB- a second test -RRB-.";