diff --git a/app-rest-service/pom.xml b/app-rest-service/pom.xml index 517c6ea..ce094e0 100644 --- a/app-rest-service/pom.xml +++ b/app-rest-service/pom.xml @@ -62,12 +62,15 @@ com.calpano.graphinout engine 1.0-SNAPSHOT - org.springframework.boot spring-boot-starter-actuator + + org.mockitomockito-coretest + org.mockitomockito-junit-jupitertest + org.junit.jupiterjunit-jupitertest diff --git a/app-rest-service/src/test/java/com/calpano/graphinout/apprestservice/service/GraphmlReaderServiceTest.java b/app-rest-service/src/test/java/com/calpano/graphinout/apprestservice/service/GraphmlReaderServiceTest.java index a985749..3982676 100644 --- a/app-rest-service/src/test/java/com/calpano/graphinout/apprestservice/service/GraphmlReaderServiceTest.java +++ b/app-rest-service/src/test/java/com/calpano/graphinout/apprestservice/service/GraphmlReaderServiceTest.java @@ -12,7 +12,6 @@ import java.io.File; import java.io.IOException; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -23,6 +22,8 @@ import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Bean; +import javax.annotation.Nonnull; + @Slf4j @SpringBootTest @@ -59,7 +60,7 @@ public SaveOutputSink saveOutputSink() { private static class MockLoadInputSource implements LoadInputSource { @Override - public IOResource load(@NotNull String sessionID, Type type) throws IOException { + public IOResource load(@Nonnull String sessionID, Type type) throws IOException { FilesMultiInputSource dataAndMapping = new FilesMultiInputSource() // // TODO use constants for 'data' and 'mapping' @@ -75,7 +76,7 @@ private static class MockSaveOutputSink implements SaveOutputSink { @Override public String save( - @NotNull IOResource outputSink, @NotNull String sessionId, Type type) + @Nonnull IOResource outputSink, @Nonnull String sessionId, Type type) throws IOException { if (outputSink.getResource() instanceof InMemoryOutputSink data) { log.info(data.toString()); diff --git a/base/pom.xml b/base/pom.xml index 10e0cd5..a571def 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -13,27 +13,19 @@ base - - org.projectlombok - lombok + org.projectlomboklombok provided - - ch.qos.logback - logback-classic + ch.qos.logbacklogback-classic - - commons-io - commons-io - 2.11.0 + commons-iocommons-io + com.github.spotbugsspotbugs-annotations - - org.jetbrains - annotations - RELEASE - compile - + io.github.classgraphclassgraphtest + org.junit.jupiterjunit-jupitertest + org.mockitomockito-coretest + org.mockitomockito-junit-jupitertest diff --git a/base/src/main/java/com/calpano/graphinout/base/output/ValidatingGraphMlWriter.java b/base/src/main/java/com/calpano/graphinout/base/output/ValidatingGraphMlWriter.java index 42b6917..1dab738 100644 --- a/base/src/main/java/com/calpano/graphinout/base/output/ValidatingGraphMlWriter.java +++ b/base/src/main/java/com/calpano/graphinout/base/output/ValidatingGraphMlWriter.java @@ -1,9 +1,9 @@ package com.calpano.graphinout.base.output; import com.calpano.graphinout.base.graphml.*; -import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.io.IOException; import java.util.*; @@ -168,7 +168,7 @@ private void investigatingTheExistenceOfTheNode(GraphmlEdge edge) throws Illegal } } - private void investigatingTheExistenceOfThePort(@NotNull GraphmlEdge edge) throws IllegalStateException { + private void investigatingTheExistenceOfThePort(@Nonnull GraphmlEdge edge) throws IllegalStateException { for (String portName : Arrays.asList(edge.getSourcePortId(), edge.getTargetPortId())) { if (portName != null) if (!existingPortNames.contains(portName)) { nonExistingPortNames.computeIfAbsent(portName, key -> new ArrayList<>()) // @@ -177,7 +177,7 @@ private void investigatingTheExistenceOfThePort(@NotNull GraphmlEdge edge) throw } } - private void investigatingTheExistenceOfThePort(@NotNull GraphmlHyperEdge hyperEdge) throws IllegalStateException { + private void investigatingTheExistenceOfThePort(@Nonnull GraphmlHyperEdge hyperEdge) throws IllegalStateException { for (GraphmlEndpoint endpoint : hyperEdge.getEndpoints()) { if (endpoint.getPort() != null) if (!existingPortNames.contains(endpoint.getPort())) { nonExistingPortNames.computeIfAbsent(endpoint.getPort(), key -> new ArrayList<>()) // diff --git a/engine/pom.xml b/engine/pom.xml index e9a6cb9..5f39150 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -17,7 +17,6 @@ org.projectlombok lombok - 1.18.24 com.calpano.graphinout @@ -45,6 +44,9 @@ 1.0-SNAPSHOT + org.junit.jupiterjunit-jupitertest + org.mockitomockito-coretest + org.mockitomockito-junit-jupitertest com.calpano.graphinout base diff --git a/pom.xml b/pom.xml index 5ec0fe2..44f5422 100644 --- a/pom.xml +++ b/pom.xml @@ -30,8 +30,7 @@ 1.7.36 1.2.11 5.9.0 - 1.10.19 - 5.1.1 + 5.6.0 5.1.1 1.18.24 3.0.0-M7 @@ -41,68 +40,20 @@ - - com.calpano.graphinout - base - 1.0-SNAPSHOT - - - - org.slf4j - slf4j-api - ${slf4j-version} - - - ch.qos.logback - logback-classic - ${logback-classic-version} - - - com.fasterxml.jackson.core - jackson-databind - ${fasterxml-jackson.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${fasterxml-jackson.version} - - - commons-io - commons-io - 2.11.0 - - - org.projectlombok - lombok - ${lombok-version} - provided - - - - org.junit.jupiter - junit-jupiter - ${junit-jupiter.version} - test - - - org.mockito - mockito-all - ${mockito-all-version} - test - - - org.mockito - mockito-core - ${mockito-core-version} - test - - - org.mockito - mockito-junit-jupiter - ${mockito-junit-jupiter-version} - test - + ch.qos.logbacklogback-classic${logback-classic-version} + com.calpano.graphinoutbase1.0-SNAPSHOT + com.fasterxml.jackson.corejackson-databind${fasterxml-jackson.version} + com.fasterxml.jackson.datatypejackson-datatype-jsr310${fasterxml-jackson.version} + com.google.code.findbugsjsr3053.0.2 + commons-iocommons-io2.11.0 + io.github.classgraphclassgraph4.8.157 + io.github.classgraphclassgraph4.8.157test + com.github.spotbugsspotbugs-annotations4.7.3 + org.junit.jupiterjunit-jupiter${junit-jupiter.version}test + org.mockitomockito-core${mockito-core-version}test + org.mockitomockito-junit-jupiter${mockito-junit-jupiter-version}test + org.projectlomboklombok${lombok-version}provided + org.slf4jslf4j-api${slf4j-version} @@ -166,35 +117,4 @@ - - - - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - org.junit.jupiter - junit-jupiter - test - - - io.github.classgraph - classgraph - 4.8.154 - test - - - org.mockito - mockito-junit-jupiter - test - - - org.mockito - mockito-core - test - - diff --git a/reader-graphml/pom.xml b/reader-graphml/pom.xml index ced78cd..317faf2 100644 --- a/reader-graphml/pom.xml +++ b/reader-graphml/pom.xml @@ -24,12 +24,14 @@ io.github.classgraph classgraph - 4.8.154 + + org.junit.jupiterjunit-jupitertest + org.mockitomockito-coretest + org.mockitomockito-junit-jupitertest commons-io commons-io - 2.11.0 test diff --git a/reader-graphml/src/test/java/com/calpano/graphinout/reader/graphml/GraphmlSAXSchemaValidationTest.java b/reader-graphml/src/test/java/com/calpano/graphinout/reader/graphml/GraphmlSAXSchemaValidationTest.java index 2d7e6e8..1194a87 100644 --- a/reader-graphml/src/test/java/com/calpano/graphinout/reader/graphml/GraphmlSAXSchemaValidationTest.java +++ b/reader-graphml/src/test/java/com/calpano/graphinout/reader/graphml/GraphmlSAXSchemaValidationTest.java @@ -4,7 +4,6 @@ import com.calpano.graphinout.base.input.SingleInputSource; import com.calpano.graphinout.base.reader.ContentError; import org.apache.commons.io.IOUtils; -import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -12,6 +11,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.slf4j.Logger; +import javax.annotation.Nonnull; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; @@ -41,7 +41,7 @@ private static Stream getAllGraphmlFiles() { return ReaderTests.getAllTestResourceFilePaths().filter(path -> path.endsWith(".graphml")); } - protected Map expectedErrors(@NotNull String resourceName) { + protected Map expectedErrors(@Nonnull String resourceName) { Map errorLongMap = new HashMap<>(); switch (resourceName) { diff --git a/reader-jgrapht/pom.xml b/reader-jgrapht/pom.xml index 1e44128..9bd4b7e 100644 --- a/reader-jgrapht/pom.xml +++ b/reader-jgrapht/pom.xml @@ -17,7 +17,6 @@ com.calpano.graphinout base - 1.0-SNAPSHOT @@ -37,6 +36,11 @@ + + org.mockitomockito-coretest + org.mockitomockito-junit-jupitertest + io.github.classgraphclassgraphtest + org.junit.jupiterjunit-jupitertest com.calpano.graphinout base @@ -48,10 +52,9 @@ commons-io commons-io - 2.11.0 test - \ No newline at end of file + diff --git a/reader-json/src/main/java/com/calpano/graphinout/reader/json/mapper/Link.java b/reader-json/src/main/java/com/calpano/graphinout/reader/json/mapper/Link.java index bdb1d10..eb9e646 100644 --- a/reader-json/src/main/java/com/calpano/graphinout/reader/json/mapper/Link.java +++ b/reader-json/src/main/java/com/calpano/graphinout/reader/json/mapper/Link.java @@ -6,7 +6,8 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo.As; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Data; -import org.jetbrains.annotations.NotNull; + +import javax.annotation.Nonnull; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = As.PROPERTY, property = "refer") @JsonSubTypes({ // @@ -21,7 +22,7 @@ public class Link { public String linkLabel; - public int compareTo(@NotNull Link o) { + public int compareTo(@Nonnull Link o) { return this.getClass().getName().compareTo(o.getClass().getName()) ; } diff --git a/reader-tgf/pom.xml b/reader-tgf/pom.xml index d35cf9f..e26098c 100644 --- a/reader-tgf/pom.xml +++ b/reader-tgf/pom.xml @@ -27,8 +27,8 @@ commons-io commons-io - 2.11.0 + com.calpano.graphinout base @@ -37,6 +37,8 @@ test-jar test + org.junit.jupiterjunit-jupitertest + io.github.classgraphclassgraphtest org.mockito mockito-junit-jupiter @@ -48,4 +50,4 @@ test - \ No newline at end of file +