From 465534509abb58c3320d203e550978b14d53c9fc Mon Sep 17 00:00:00 2001 From: LSmyrnaios Date: Fri, 22 Dec 2023 15:53:22 +0200 Subject: [PATCH] - Fix not overriding the methods of the "Result" interface, where needed. - Fix the parameter-type of the "Result.setStatus()" method. - Group duplicate code in one utilities-method. --- .../validation/guideline/Guideline.java | 2 +- .../validation/guideline/StandardResult.java | 60 ++++++- .../openaire/FAIR_Data_GuidelinesProfile.java | 146 ++---------------- .../FAIR_Literature_GuidelinesV4Profile.java | 145 ++--------------- .../validation/utils/ResultUtils.java | 97 ++++++++++++ .../validator2/engine/Test_FAIR_LIT.java | 4 +- 6 files changed, 177 insertions(+), 277 deletions(-) create mode 100644 src/main/java/eu/dnetlib/validator2/validation/utils/ResultUtils.java 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 35af589..c4bd718 100644 --- a/src/main/java/eu/dnetlib/validator2/validation/guideline/Guideline.java +++ b/src/main/java/eu/dnetlib/validator2/validation/guideline/Guideline.java @@ -46,7 +46,7 @@ public interface Guideline { int getScore(); void setScore(int score); Status getStatus(); - void setStatus(String status); + void setStatus(Status status); Iterable getWarnings(); void setWarnings(Iterable warnings); Iterable getErrors(); 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 9e3c51e..275c884 100644 --- a/src/main/java/eu/dnetlib/validator2/validation/guideline/StandardResult.java +++ b/src/main/java/eu/dnetlib/validator2/validation/guideline/StandardResult.java @@ -10,11 +10,11 @@ public final class StandardResult implements Guideline.Result, Serializable { private static final List EMPTY = Collections.emptyList(); - private final List warnings; - private final List errors; - private final String internalError; - private final Status status; - private final int score; + private List warnings; + private List errors; + private String internalError; + private Status status; + private int score; public StandardResult(int score, Status status, List warnings, List errors, String internalError) { this.status = status; @@ -49,6 +49,56 @@ public final class StandardResult implements Guideline.Result, Serializable { return internalError; } + @Override + public int getScore() { + return score; + } + + @Override + public void setScore(int score) { + this.score = score; + } + + @Override + public Status getStatus() { + return status; + } + + @Override + public void setStatus(Status status) { + this.status = status; + } + + @Override + public Iterable getWarnings() { + return warnings; + } + + @Override + public void setWarnings(Iterable warnings) { + this.warnings = (List) warnings; + } + + @Override + public Iterable getErrors() { + return errors; + } + + @Override + public void setErrors(Iterable errors) { + this.errors = (List) errors; + } + + @Override + public String getInternalError() { + return internalError; + } + + @Override + public void setInternalError(String internalError) { + this.internalError = internalError; + } + public static StandardResult forError(String message) { return new StandardResult(-1, Status.ERROR, EMPTY, EMPTY, message); } diff --git a/src/main/java/eu/dnetlib/validator2/validation/guideline/openaire/FAIR_Data_GuidelinesProfile.java b/src/main/java/eu/dnetlib/validator2/validation/guideline/openaire/FAIR_Data_GuidelinesProfile.java index a104045..1082ddb 100644 --- a/src/main/java/eu/dnetlib/validator2/validation/guideline/openaire/FAIR_Data_GuidelinesProfile.java +++ b/src/main/java/eu/dnetlib/validator2/validation/guideline/openaire/FAIR_Data_GuidelinesProfile.java @@ -5,6 +5,7 @@ package eu.dnetlib.validator2.validation.guideline.openaire; import eu.dnetlib.validator2.engine.Status; import eu.dnetlib.validator2.validation.XMLApplicationProfile; import eu.dnetlib.validator2.validation.guideline.*; +import eu.dnetlib.validator2.validation.utils.ResultUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; @@ -447,34 +448,9 @@ class F2_01M_SPEC extends AbstractGuideline { } - private static Result getResult(List warnings2, List errors2, int score) { + private static Result getResult(List warnings2, List errors2, int score2) { - return new Result() { - @Override - public int score() { - return score; - } - - @Override - public Status status() { - return Status.valueOf((score > 0) ? "SUCCESS" : "FAILURE"); - } - - @Override - public Iterable warnings() { - return warnings2; - } - - @Override - public Iterable errors() { - return errors2; - } - - @Override - public String internalError() { - return null; - } - }; + return ResultUtils.getNewResult(warnings2, errors2, score2); } } @@ -527,34 +503,9 @@ class F3_01M_SPEC extends AbstractGuideline { return null; } } - private static Result getResult(ArrayList warnings2, ArrayList errors2, int score) { + private static Result getResult(ArrayList warnings2, ArrayList errors2, int score2) { - return new Result() { - @Override - public int score() { - return score; - } - - @Override - public Status status() { - return Status.valueOf((score > 0) ? "SUCCESS" : "FAILURE"); - } - - @Override - public Iterable warnings() { - return warnings2; - } - - @Override - public Iterable errors() { - return errors2; - } - - @Override - public String internalError() { - return null; - } - }; + return ResultUtils.getNewResult(warnings2, errors2, score2); } } @@ -607,34 +558,9 @@ class I2_01M_SPEC extends AbstractGuideline { return null; } - private static Result getResult(ArrayList warnings2, ArrayList errors2, int score) { + private static Result getResult(ArrayList warnings2, ArrayList errors2, int score2) { - return new Result() { - @Override - public int score() { - return score; - } - - @Override - public Status status() { - return Status.valueOf((score > 0) ? "SUCCESS" : "FAILURE"); - } - - @Override - public Iterable warnings() { - return warnings2; - } - - @Override - public Iterable errors() { - return errors2; - } - - @Override - public String internalError() { - return null; - } - }; + return ResultUtils.getNewResult(warnings2, errors2, score2); } } @@ -684,34 +610,9 @@ class R1_01M_SPEC extends AbstractGuideline { return null; } - private static Result getResult(ArrayList warnings2, ArrayList errors2, int score) { + private static Result getResult(ArrayList warnings2, ArrayList errors2, int score2) { - return new Result() { - @Override - public int score() { - return score; - } - - @Override - public Status status() { - return Status.valueOf((score > 0) ? "SUCCESS" : "FAILURE"); - } - - @Override - public Iterable warnings() { - return warnings2; - } - - @Override - public Iterable errors() { - return errors2; - } - - @Override - public String internalError() { - return null; - } - }; + return ResultUtils.getNewResult(warnings2, errors2, score2); } } @@ -761,33 +662,8 @@ class R1_2_01M_SPEC extends AbstractGuideline { return null; } - private static Result getResult(ArrayList warnings2, ArrayList errors2, int score) { + private static Result getResult(ArrayList warnings2, ArrayList errors2, int score2) { - return new Result() { - @Override - public int score() { - return score; - } - - @Override - public Status status() { - return Status.valueOf((score > 0) ? "SUCCESS" : "FAILURE"); - } - - @Override - public Iterable warnings() { - return warnings2; - } - - @Override - public Iterable errors() { - return errors2; - } - - @Override - public String internalError() { - return null; - } - }; + return ResultUtils.getNewResult(warnings2, errors2, score2); } } 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 f647ba7..34c7947 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 @@ -5,6 +5,7 @@ package eu.dnetlib.validator2.validation.guideline.openaire; import eu.dnetlib.validator2.engine.Status; import eu.dnetlib.validator2.validation.XMLApplicationProfile; import eu.dnetlib.validator2.validation.guideline.*; +import eu.dnetlib.validator2.validation.utils.ResultUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; @@ -405,34 +406,9 @@ class F2_01M_SPEC_LIT extends AbstractGuideline { } - private static Result getResult(List warnings2, List errors2, int score) { + private static Result getResult(List warnings2, List errors2, int score2) { - return new Result() { - @Override - public int score() { - return score; - } - - @Override - public Status status() { - return Status.valueOf((score > 0) ? "SUCCESS" : "FAILURE"); - } - - @Override - public Iterable warnings() { - return warnings2; - } - - @Override - public Iterable errors() { - return errors2; - } - - @Override - public String internalError() { - return null; - } - }; + return ResultUtils.getNewResult(warnings2, errors2, score2); } } @@ -485,34 +461,10 @@ class F3_01M_SPEC_LIT extends AbstractGuideline { return null; } } - private static Result getResult(ArrayList warnings2, ArrayList errors2, int score) { + private static Result getResult(ArrayList warnings2, ArrayList errors2, int score2) { - return new Result() { - @Override - public int score() { - return score; - } + return ResultUtils.getNewResult(warnings2, errors2, score2); - @Override - public Status status() { - return Status.valueOf((score > 0) ? "SUCCESS" : "FAILURE"); - } - - @Override - public Iterable warnings() { - return warnings2; - } - - @Override - public Iterable errors() { - return errors2; - } - - @Override - public String internalError() { - return null; - } - }; } } @@ -565,34 +517,9 @@ class I2_01M_SPEC_LIT extends AbstractGuideline { return null; } - private static Result getResult(ArrayList warnings2, ArrayList errors2, int score) { + private static Result getResult(ArrayList warnings2, ArrayList errors2, int score2) { - return new Result() { - @Override - public int score() { - return score; - } - - @Override - public Status status() { - return Status.valueOf((score > 0) ? "SUCCESS" : "FAILURE"); - } - - @Override - public Iterable warnings() { - return warnings2; - } - - @Override - public Iterable errors() { - return errors2; - } - - @Override - public String internalError() { - return null; - } - }; + return ResultUtils.getNewResult(warnings2, errors2, score2); } } @@ -642,34 +569,9 @@ class R1_01M_SPEC_LIT extends AbstractGuideline { return null; } - private static Result getResult(ArrayList warnings2, ArrayList errors2, int score) { + private static Result getResult(ArrayList warnings2, ArrayList errors2, int score2) { - return new Result() { - @Override - public int score() { - return score; - } - - @Override - public Status status() { - return Status.valueOf((score > 0) ? "SUCCESS" : "FAILURE"); - } - - @Override - public Iterable warnings() { - return warnings2; - } - - @Override - public Iterable errors() { - return errors2; - } - - @Override - public String internalError() { - return null; - } - }; + return ResultUtils.getNewResult(warnings2, errors2, score2); } } @@ -719,33 +621,8 @@ class R1_2_01M_SPEC_LIT extends AbstractGuideline { return null; } - private static Result getResult(ArrayList warnings2, ArrayList errors2, int score) { + private static Result getResult(ArrayList warnings2, ArrayList errors2, int score2) { - return new Result() { - @Override - public int score() { - return score; - } - - @Override - public Status status() { - return Status.valueOf((score > 0) ? "SUCCESS" : "FAILURE"); - } - - @Override - public Iterable warnings() { - return warnings2; - } - - @Override - public Iterable errors() { - return errors2; - } - - @Override - public String internalError() { - return null; - } - }; + return ResultUtils.getNewResult(warnings2, errors2, score2); } } diff --git a/src/main/java/eu/dnetlib/validator2/validation/utils/ResultUtils.java b/src/main/java/eu/dnetlib/validator2/validation/utils/ResultUtils.java new file mode 100644 index 0000000..595bfe5 --- /dev/null +++ b/src/main/java/eu/dnetlib/validator2/validation/utils/ResultUtils.java @@ -0,0 +1,97 @@ +package eu.dnetlib.validator2.validation.utils; + +import eu.dnetlib.validator2.engine.Status; +import eu.dnetlib.validator2.validation.guideline.Guideline; + +import java.util.List; + +public class ResultUtils { + + + public static Guideline.Result getNewResult(List warnings2, List errors2, int score2) { + return new Guideline.Result() { + + int score; + Status status; + Iterable warnings; + Iterable errors; + String internalError; + + @Override + public int score() { + return score2; + } + + @Override + public Status status() { + return Status.valueOf((score2 > 0) ? "SUCCESS" : "FAILURE"); + } + + @Override + public Iterable warnings() { + return warnings2; + } + + @Override + public Iterable errors() { + return errors2; + } + + @Override + public String internalError() { + return internalError; + } + + @Override + public int getScore() { + return score(); + } + + @Override + public void setScore(int score) { + this.score = score; + } + + @Override + public Status getStatus() { + return status(); + } + + @Override + public void setStatus(Status status) { + this.status = status; + } + + @Override + public Iterable getWarnings() { + return warnings(); + } + + @Override + public void setWarnings(Iterable warnings) { + this.warnings = warnings; + } + + @Override + public Iterable getErrors() { + return errors(); + } + + @Override + public void setErrors(Iterable errors) { + this.errors = errors; + } + + @Override + public String getInternalError() { + return internalError(); + } + + @Override + public void setInternalError(String internalError) { + this.internalError = internalError; + } + }; + } + +} diff --git a/src/test/java/eu/dnetlib/validator2/engine/Test_FAIR_LIT.java b/src/test/java/eu/dnetlib/validator2/engine/Test_FAIR_LIT.java index 9ea30a9..bb1bed7 100644 --- a/src/test/java/eu/dnetlib/validator2/engine/Test_FAIR_LIT.java +++ b/src/test/java/eu/dnetlib/validator2/engine/Test_FAIR_LIT.java @@ -27,8 +27,8 @@ public class Test_FAIR_LIT { // "src/test/resources/openaireguidelinesV3/cris.vtt.fi/04_data.xml", // "src/test/resources/openaireguidelinesV3/cris.vtt.fi/03_data.xml", // "src/test/resources/openaireguidelinesV4/01_gv4.xml", -// "src/test/resources/openaireguidelinesV4/v4_literature_all_guidelines_record.xml" - "src/test/resources/openaireguidelinesV4/test_minho.xml", + "src/test/resources/openaireguidelinesV4/v4_literature_all_guidelines_record.xml" +// "src/test/resources/openaireguidelinesV4/test_minho.xml", }; public static void main(String[] args) {