X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fakraino%2Fvalidation%2Fui%2Fservice%2FDbAdapter.java;fp=ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fakraino%2Fvalidation%2Fui%2Fservice%2FDbAdapter.java;h=65154e0a9df0174a7ca6089faa1a545cc5932b4c;hb=c4f35d65a835e53a7847524eea61cb172a2433f5;hp=756c03a86579ea0bc971141ecb55c00f26bd4b7f;hpb=6956370b1e022b7fb4da42107542fc49964bfc72;p=validation.git diff --git a/ui/src/main/java/org/akraino/validation/ui/service/DbAdapter.java b/ui/src/main/java/org/akraino/validation/ui/service/DbAdapter.java index 756c03a..65154e0 100644 --- a/ui/src/main/java/org/akraino/validation/ui/service/DbAdapter.java +++ b/ui/src/main/java/org/akraino/validation/ui/service/DbAdapter.java @@ -220,7 +220,7 @@ public class DbAdapter { public List readResultFromDb(String blueprintName, String version, String lab, List layers, Boolean allLayers, Boolean optional, Boolean outcome) - throws JsonParseException, JsonMappingException, IOException { + throws JsonParseException, JsonMappingException, IOException { synchronized (LOCK) { LabInfo actualLabInfo = null; if (lab != null) { @@ -625,8 +625,8 @@ public class DbAdapter { .equals(vNexusResult.getBlueprintInstance().getBlueprint().getBlueprintName())) { LOGGER.error(EELFLoggerDelegate.errorLogger, "Nexus has different data for blueprint : " + blueprint.getBlueprintName() - + ". Name inconsistency : " + blueprint.getBlueprintName() + " " - + vNexusResult.getBlueprintInstance().getBlueprint().getBlueprintName()); + + ". Name inconsistency : " + blueprint.getBlueprintName() + " " + + vNexusResult.getBlueprintInstance().getBlueprint().getBlueprintName()); return false; } } @@ -634,8 +634,8 @@ public class DbAdapter { if (!bluInst.getVersion().equals(vNexusResult.getBlueprintInstance().getVersion())) { LOGGER.error(EELFLoggerDelegate.errorLogger, "Nexus has different data for blueprint : " + bluInst.getBlueprint().getBlueprintName() - + ", version: " + bluInst.getVersion() + ". Version inconsistency : " - + bluInst.getVersion() + " " + vNexusResult.getBlueprintInstance().getVersion()); + + ", version: " + bluInst.getVersion() + ". Version inconsistency : " + + bluInst.getVersion() + " " + vNexusResult.getBlueprintInstance().getVersion()); return false; } } @@ -679,7 +679,7 @@ public class DbAdapter { if (vDbTimestamp.equals(vDbSubmission) || (vDbTimestamp.getSubmission() != null && !jnksJobNotify.getSubmissionId().equals(vDbTimestamp.getSubmission().getSubmissionId()))) { LOGGER.error(EELFLoggerDelegate.errorLogger, "Received same timestamp: " + jnksJobNotify.getTimestamp() - + " from nexus for submission id: " + jnksJobNotify.getSubmissionId()); + + " from nexus for submission id: " + jnksJobNotify.getSubmissionId()); return false; } if (!vDbSubmission.getAllLayers()) { @@ -707,7 +707,7 @@ public class DbAdapter { if (!vDbSubmission.getBlueprintInstance().getBlueprint().getBlueprintName() .equals(vDbTimestamp.getBlueprintInstance().getBlueprint().getBlueprintName()) || !vDbSubmission.getBlueprintInstance().getVersion() - .equals(vDbTimestamp.getBlueprintInstance().getVersion()) + .equals(vDbTimestamp.getBlueprintInstance().getVersion()) || !compareLabInfos(vDbSubmission.getLab(), vDbTimestamp.getLab())) { LOGGER.error(EELFLoggerDelegate.errorLogger, "No consistency exists in database records."); return false;