From 8d3c8324ae9d809999e0b23300e1c7fe31bbef96 Mon Sep 17 00:00:00 2001 From: LSmyrnaios Date: Thu, 25 Jan 2024 12:54:24 +0200 Subject: [PATCH] Change the type of the "warnings" and "errors" fields of "Guideline.Result" to "List", in order to be encoded by Spark. --- .../validator2/validation/guideline/Guideline.java | 9 +++++---- .../validation/guideline/StandardResult.java | 13 ++++++------- .../FAIR_Literature_GuidelinesV4Profile.java | 11 +++++------ .../validator2/validation/utils/ResultUtils.java | 12 ++++++------ 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/main/java/eu/dnetlib/validator2/validation/guideline/Guideline.java b/src/main/java/eu/dnetlib/validator2/validation/guideline/Guideline.java index 712878a..0e3ae9c 100644 --- a/src/main/java/eu/dnetlib/validator2/validation/guideline/Guideline.java +++ b/src/main/java/eu/dnetlib/validator2/validation/guideline/Guideline.java @@ -3,6 +3,7 @@ package eu.dnetlib.validator2.validation.guideline; import eu.dnetlib.validator2.engine.Status; import java.io.Serializable; +import java.util.List; public interface Guideline { @@ -36,14 +37,14 @@ public interface Guideline { // When status == SUCCESS, potential warnings are held here // This may also contain messages when status == FAILURE - Iterable getWarnings(); - void setWarnings(Iterable warnings); + List getWarnings(); + void setWarnings(List warnings); // When status == FAILURE, the errors are held here // We currently hold a single error (and fail fast) - Iterable getErrors(); - void setErrors(Iterable errors); + List getErrors(); + void setErrors(List errors); // When status == ERROR, the internal error is held here 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 9b2a5f0..e8eabce 100644 --- a/src/main/java/eu/dnetlib/validator2/validation/guideline/StandardResult.java +++ b/src/main/java/eu/dnetlib/validator2/validation/guideline/StandardResult.java @@ -1,6 +1,5 @@ package eu.dnetlib.validator2.validation.guideline; -import com.google.common.collect.Lists; import eu.dnetlib.validator2.engine.Status; import java.io.Serializable; @@ -50,23 +49,23 @@ public final class StandardResult implements Guideline.Result, Serializable { } @Override - public Iterable getWarnings() { + public List getWarnings() { return warnings; } @Override - public void setWarnings(Iterable warnings) { - this.warnings = Lists.newArrayList(warnings); + public void setWarnings(List warnings) { + this.warnings = warnings; } @Override - public Iterable getErrors() { + public List getErrors() { return errors; } @Override - public void setErrors(Iterable errors) { - this.errors = Lists.newArrayList(errors); + public void setErrors(List errors) { + this.errors = errors; } @Override diff --git a/src/main/java/eu/dnetlib/validator2/validation/guideline/openaire/FAIR_Literature_GuidelinesV4Profile.java b/src/main/java/eu/dnetlib/validator2/validation/guideline/openaire/FAIR_Literature_GuidelinesV4Profile.java index 066a036..e73ddea 100644 --- a/src/main/java/eu/dnetlib/validator2/validation/guideline/openaire/FAIR_Literature_GuidelinesV4Profile.java +++ b/src/main/java/eu/dnetlib/validator2/validation/guideline/openaire/FAIR_Literature_GuidelinesV4Profile.java @@ -2,7 +2,6 @@ package eu.dnetlib.validator2.validation.guideline.openaire; //import com.google.gson.Gson; -import com.google.common.collect.Lists; import eu.dnetlib.validator2.validation.XMLApplicationProfile; import eu.dnetlib.validator2.validation.guideline.*; import eu.dnetlib.validator2.validation.utils.ResultUtils; @@ -397,7 +396,7 @@ class F2_01M_SPEC_LIT extends AbstractGuideline { final Result ress = getResult(warnings2, errors2, score); - return new StandardResult(ress.getScore(), ress.getStatus(), Lists.newArrayList(ress.getWarnings()), Lists.newArrayList(ress.getErrors()), ress.getInternalError()); + return new StandardResult(ress.getScore(), ress.getStatus(), ress.getWarnings(), ress.getErrors(), ress.getInternalError()); } catch (Exception e) { logger.error("", e); @@ -454,7 +453,7 @@ class F3_01M_SPEC_LIT extends AbstractGuideline { final Result ress = getResult(warnings2, errors2, MaxScoreF3_01M_LIT_SPEC); - return new StandardResult(ress.getScore(), ress.getStatus(), Lists.newArrayList(ress.getWarnings()), Lists.newArrayList(ress.getErrors()), ress.getInternalError()); + return new StandardResult(ress.getScore(), ress.getStatus(), ress.getWarnings(), ress.getErrors(), ress.getInternalError()); } catch (Exception e) { logger.error("", e); @@ -509,7 +508,7 @@ class I2_01M_SPEC_LIT extends AbstractGuideline { final Result ress = getResult(warnings2, errors2, MaxScoreI2_01M_LIT_SPEC); - return new StandardResult(ress.getScore(), ress.getStatus(), Lists.newArrayList(ress.getWarnings()), Lists.newArrayList(ress.getErrors()), ress.getInternalError()); + return new StandardResult(ress.getScore(), ress.getStatus(), ress.getWarnings(), ress.getErrors(), ress.getInternalError()); } catch (Exception e) { logger.error("", e); @@ -561,7 +560,7 @@ class R1_01M_SPEC_LIT extends AbstractGuideline { final Result ress = getResult(warnings2, errors2, score); - return new StandardResult(ress.getScore(), ress.getStatus(), Lists.newArrayList(ress.getWarnings()), Lists.newArrayList(ress.getErrors()), ress.getInternalError()); + return new StandardResult(ress.getScore(), ress.getStatus(), ress.getWarnings(), ress.getErrors(), ress.getInternalError()); } catch (Exception e) { logger.error("", e); @@ -613,7 +612,7 @@ class R1_2_01M_SPEC_LIT extends AbstractGuideline { final Result ress = getResult(warnings2, errors2, score); - return new StandardResult(ress.getScore(), ress.getStatus(), Lists.newArrayList(ress.getWarnings()), Lists.newArrayList(ress.getErrors()), ress.getInternalError()); + return new StandardResult(ress.getScore(), ress.getStatus(), ress.getWarnings(), ress.getErrors(), ress.getInternalError()); } catch (Exception e) { logger.error("", e); diff --git a/src/main/java/eu/dnetlib/validator2/validation/utils/ResultUtils.java b/src/main/java/eu/dnetlib/validator2/validation/utils/ResultUtils.java index 2a409b4..223c7ee 100644 --- a/src/main/java/eu/dnetlib/validator2/validation/utils/ResultUtils.java +++ b/src/main/java/eu/dnetlib/validator2/validation/utils/ResultUtils.java @@ -14,8 +14,8 @@ public class ResultUtils { private int score; private Status status; - private Iterable warnings; - private Iterable errors; + private List warnings; + private List errors; private String internalError; @@ -40,22 +40,22 @@ public class ResultUtils { } @Override - public Iterable getWarnings() { + public List getWarnings() { return this.warnings; } @Override - public void setWarnings(Iterable warnings) { + public void setWarnings(List warnings) { this.warnings = warnings; } @Override - public Iterable getErrors() { + public List getErrors() { return this.errors; } @Override - public void setErrors(Iterable errors) { + public void setErrors(List errors) { this.errors = errors; }