[#1438] Improve GDL error handling (#1473)

fixes #1438
dbs-leipzig · Jan 21, 2020 · a32d88c · a32d88c
1 parent b936844
commit a32d88c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/gradoop-common/src/main/java/org/gradoop/common/util/AsciiGraphLoader.java b/gradoop-common/src/main/java/org/gradoop/common/util/AsciiGraphLoader.java
@@ -27,6 +27,7 @@
 import org.gradoop.common.model.impl.id.GradoopIdSet;
 import org.gradoop.common.model.impl.properties.Properties;
 import org.s1ck.gdl.GDLHandler;
+import org.s1ck.gdl.exceptions.BailSyntaxErrorStrategy;
 import org.s1ck.gdl.model.Graph;
 import org.s1ck.gdl.model.GraphElement;
 
@@ -139,6 +140,7 @@ AsciiGraphLoader<G, V, E> fromString(String asciiGraph,
       .setDefaultGraphLabel(GradoopConstants.DEFAULT_GRAPH_LABEL)
       .setDefaultVertexLabel(GradoopConstants.DEFAULT_VERTEX_LABEL)
       .setDefaultEdgeLabel(GradoopConstants.DEFAULT_EDGE_LABEL)
+      .setErrorStrategy(new BailSyntaxErrorStrategy())
       .buildFromString(asciiGraph),
       elementFactoryProvider);
   }
@@ -164,6 +166,7 @@ AsciiGraphLoader<G, V, E> fromFile(String fileName,
       .setDefaultGraphLabel(GradoopConstants.DEFAULT_GRAPH_LABEL)
       .setDefaultVertexLabel(GradoopConstants.DEFAULT_VERTEX_LABEL)
       .setDefaultEdgeLabel(GradoopConstants.DEFAULT_EDGE_LABEL)
+      .setErrorStrategy(new BailSyntaxErrorStrategy())
       .buildFromFile(fileName),
       elementFactoryProvider);
   }
@@ -189,6 +192,7 @@ AsciiGraphLoader<G, V, E> fromStream(InputStream inputStream,
       .setDefaultGraphLabel(GradoopConstants.DEFAULT_GRAPH_LABEL)
       .setDefaultVertexLabel(GradoopConstants.DEFAULT_VERTEX_LABEL)
       .setDefaultEdgeLabel(GradoopConstants.DEFAULT_EDGE_LABEL)
+      .setErrorStrategy(new BailSyntaxErrorStrategy())
       .buildFromStream(inputStream),
       elementFactoryProvider);
   }

diff --git a/.../main/java/org/gradoop/flink/model/impl/operators/matching/common/query/QueryHandler.java b/.../main/java/org/gradoop/flink/model/impl/operators/matching/common/query/QueryHandler.java
@@ -22,6 +22,7 @@
 import org.gradoop.flink.model.impl.operators.matching.common.query.predicates.CNF;
 import org.gradoop.flink.model.impl.operators.matching.common.query.predicates.QueryPredicate;
 import org.s1ck.gdl.GDLHandler;
+import org.s1ck.gdl.exceptions.BailSyntaxErrorStrategy;
 import org.s1ck.gdl.model.Edge;
 import org.s1ck.gdl.model.GraphElement;
 import org.s1ck.gdl.model.Vertex;
@@ -101,6 +102,7 @@ public QueryHandler(String gdlString) {
       .setDefaultGraphLabel(GradoopConstants.DEFAULT_GRAPH_LABEL)
       .setDefaultVertexLabel(GradoopConstants.DEFAULT_VERTEX_LABEL)
       .setDefaultEdgeLabel(GradoopConstants.DEFAULT_EDGE_LABEL)
+      .setErrorStrategy(new BailSyntaxErrorStrategy())
       .buildFromString(gdlString);
     edgeCache = gdlHandler.getEdgeCache(true, true);
     vertexCache = gdlHandler.getVertexCache(true, true);

diff --git a/pom.xml b/pom.xml
@@ -159,7 +159,7 @@
         <dep.commons-cli.version>1.4</dep.commons-cli.version>
         <dep.commons-lang.version>2.6</dep.commons-lang.version>
         <dep.flink.version>1.7.2</dep.flink.version>
-        <dep.gdl.version>0.3</dep.gdl.version>
+        <dep.gdl.version>0.3.2</dep.gdl.version>
         <dep.guava.version>11.0.2</dep.guava.version>
         <dep.hbase.version>1.4.3</dep.hbase.version>
         <dep.javafastpfor.version>0.1.10</dep.javafastpfor.version>