From 668f4ce1570327f52ec7164d811bf55d0c7fbede Mon Sep 17 00:00:00 2001 From: LSmyrnaios Date: Fri, 10 Nov 2023 16:02:38 +0200 Subject: [PATCH] - Make some classes to implement the "Serializable" interface, in order to be used by Spark. - Move the "TestUtils" class to be used by other libraries calling this project. --- .../validator2/validation/StandardValidationResult.java | 3 ++- .../validator2/validation/guideline/StandardResult.java | 3 ++- .../validation/guideline/openaire/AbstractOpenAireProfile.java | 3 ++- .../eu/dnetlib/validator2/validation/utils}/TestUtils.java | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) rename src/{test/java/eu/dnetlib/validator2/engine => main/java/eu/dnetlib/validator2/validation/utils}/TestUtils.java (94%) diff --git a/src/main/java/eu/dnetlib/validator2/validation/StandardValidationResult.java b/src/main/java/eu/dnetlib/validator2/validation/StandardValidationResult.java index 1e7f635..3befcbf 100644 --- a/src/main/java/eu/dnetlib/validator2/validation/StandardValidationResult.java +++ b/src/main/java/eu/dnetlib/validator2/validation/StandardValidationResult.java @@ -1,10 +1,11 @@ package eu.dnetlib.validator2.validation; +import java.io.Serializable; import java.util.Map; import static eu.dnetlib.validator2.validation.guideline.Guideline.Result; -public class StandardValidationResult implements XMLApplicationProfile.ValidationResult { +public class StandardValidationResult implements XMLApplicationProfile.ValidationResult, Serializable { private final String id; private final double score; diff --git a/src/main/java/eu/dnetlib/validator2/validation/guideline/StandardResult.java b/src/main/java/eu/dnetlib/validator2/validation/guideline/StandardResult.java index 1dfb5f7..9e3c51e 100644 --- a/src/main/java/eu/dnetlib/validator2/validation/guideline/StandardResult.java +++ b/src/main/java/eu/dnetlib/validator2/validation/guideline/StandardResult.java @@ -2,10 +2,11 @@ package eu.dnetlib.validator2.validation.guideline; import eu.dnetlib.validator2.engine.Status; +import java.io.Serializable; import java.util.Collections; import java.util.List; -public final class StandardResult implements Guideline.Result { +public final class StandardResult implements Guideline.Result, Serializable { private static final List EMPTY = Collections.emptyList(); diff --git a/src/main/java/eu/dnetlib/validator2/validation/guideline/openaire/AbstractOpenAireProfile.java b/src/main/java/eu/dnetlib/validator2/validation/guideline/openaire/AbstractOpenAireProfile.java index bedf62b..ea66d3e 100644 --- a/src/main/java/eu/dnetlib/validator2/validation/guideline/openaire/AbstractOpenAireProfile.java +++ b/src/main/java/eu/dnetlib/validator2/validation/guideline/openaire/AbstractOpenAireProfile.java @@ -16,10 +16,11 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import java.io.Serializable; import java.util.HashMap; import java.util.Map; -public abstract class AbstractOpenAireProfile implements XMLApplicationProfile { +public abstract class AbstractOpenAireProfile implements XMLApplicationProfile, Serializable { private static final Logger logger = LoggerFactory.getLogger(AbstractOpenAireProfile.class); diff --git a/src/test/java/eu/dnetlib/validator2/engine/TestUtils.java b/src/main/java/eu/dnetlib/validator2/validation/utils/TestUtils.java similarity index 94% rename from src/test/java/eu/dnetlib/validator2/engine/TestUtils.java rename to src/main/java/eu/dnetlib/validator2/validation/utils/TestUtils.java index ae740f3..c87c974 100644 --- a/src/test/java/eu/dnetlib/validator2/engine/TestUtils.java +++ b/src/main/java/eu/dnetlib/validator2/validation/utils/TestUtils.java @@ -1,4 +1,4 @@ -package eu.dnetlib.validator2.engine; +package eu.dnetlib.validator2.validation.utils; import org.slf4j.LoggerFactory;