diff --git a/base/pom.xml b/base/pom.xml index a571def0..423a38d3 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -26,6 +26,12 @@ org.junit.jupiterjunit-jupitertest org.mockitomockito-coretest org.mockitomockito-junit-jupitertest + + com.google.guava + guava + 31.1-jre + + diff --git a/base/src/main/java/com/calpano/graphinout/base/gio/GioDocument.java b/base/src/main/java/com/calpano/graphinout/base/gio/GioDocument.java index 234c041b..95f07dcb 100644 --- a/base/src/main/java/com/calpano/graphinout/base/gio/GioDocument.java +++ b/base/src/main/java/com/calpano/graphinout/base/gio/GioDocument.java @@ -1,6 +1,7 @@ package com.calpano.graphinout.base.gio; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.experimental.SuperBuilder; import java.util.List; @@ -9,6 +10,7 @@ /** * The root document of a Gio model graph stream. */ +@EqualsAndHashCode(callSuper = true) @Data @SuperBuilder public class GioDocument extends GioElementWithDescription { diff --git a/base/src/main/java/com/calpano/graphinout/base/gio/ValidatingGioWriter.java b/base/src/main/java/com/calpano/graphinout/base/gio/ValidatingGioWriter.java index 1189ca6c..ec5fcf3c 100644 --- a/base/src/main/java/com/calpano/graphinout/base/gio/ValidatingGioWriter.java +++ b/base/src/main/java/com/calpano/graphinout/base/gio/ValidatingGioWriter.java @@ -1,5 +1,6 @@ package com.calpano.graphinout.base.gio; +import com.google.common.collect.Sets; import lombok.RequiredArgsConstructor; import javax.annotation.Nullable; @@ -39,7 +40,7 @@ public void endEdge() throws IOException { @Override public void endGraph(@Nullable URL locator) throws IOException { if (!nodesIds.containsAll(endpointsNode)) - throw new IllegalStateException("All GioEdge endpoints should refer to an existing GioNode ID."); + throw new IllegalStateException("All GioEdge endpoints should refer to an existing GioNode ID. Missing: " + Sets.difference(endpointsNode,nodesIds)); if (!nodePortName.isEmpty()) { List missingPorts = new ArrayList<>(); for (String port : endpointsPort) { diff --git a/engine/pom.xml b/engine/pom.xml index 5f39150f..a45d9dfe 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -18,31 +18,12 @@ org.projectlombok lombok - - com.calpano.graphinout - base - 1.0-SNAPSHOT - - - com.calpano.graphinout - reader-tgf - 1.0-SNAPSHOT - - - com.calpano.graphinout - reader-jgrapht - 1.0-SNAPSHOT - - - com.calpano.graphinout - reader-graphml - 1.0-SNAPSHOT - - - com.calpano.graphinout - reader-json - 1.0-SNAPSHOT - + com.calpano.graphinoutbase1.0-SNAPSHOT + com.calpano.graphinoutreader-tgf1.0-SNAPSHOT + com.calpano.graphinoutreader-jgrapht1.0-SNAPSHOT + com.calpano.graphinoutreader-graphml1.0-SNAPSHOT + com.calpano.graphinoutreader-json1.0-SNAPSHOT + com.calpano.graphinoutreader-tripletext1.0-SNAPSHOT org.junit.jupiterjunit-jupitertest org.mockitomockito-coretest @@ -55,30 +36,11 @@ tests test - - com.calpano.graphinout - reader-tgf - 1.0-SNAPSHOT - test-jar - tests - test - - - com.calpano.graphinout - reader-jgrapht - 1.0-SNAPSHOT - test-jar - tests - test - - - com.calpano.graphinout - reader-graphml - 1.0-SNAPSHOT - test-jar - tests - test - + + com.calpano.graphinoutreader-tgf1.0-SNAPSHOTtest-jarteststest + com.calpano.graphinoutreader-jgrapht1.0-SNAPSHOTtest-jarteststest + com.calpano.graphinoutreader-graphml1.0-SNAPSHOTtest-jarteststest + com.calpano.graphinoutreader-tripletext1.0-SNAPSHOTtest-jarteststest diff --git a/engine/src/test/java/com/calpano/graphinout/engine/GioEngineCoreTest.java b/engine/src/test/java/com/calpano/graphinout/engine/GioEngineCoreTest.java index d646e046..6446c719 100644 --- a/engine/src/test/java/com/calpano/graphinout/engine/GioEngineCoreTest.java +++ b/engine/src/test/java/com/calpano/graphinout/engine/GioEngineCoreTest.java @@ -45,7 +45,7 @@ static void beforeAll() { @Test void test() { // find all resources - ReaderTests.getAllTestResourceFilePaths().forEach(r -> testResource(r)); + ReaderTests.getAllTestResourceFilePaths().forEach(this::testResource); // byte[] graphmlBytes1;