throw new IllegalArgumentException("Could not retrieve lab : " + lab.toString());
}
ValidationDbTestResult vNexusResult = nexusService.getResult(name, version, labInfo.getSilo(), timestamp);
- if (!dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
- return null;
+ if (vNexusResult != null && dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
+ vNexusResult.setLab(labInfo);
+ return vNexusResult;
}
- vNexusResult.setLab(labInfo);
- return vNexusResult;
+ return null;
}
public ValidationDbTestResult getLastResultBasedOnOutcomeFromNexus(@Nonnull String name, @Nonnull String version,
}
ValidationDbTestResult vNexusResult = nexusService.getLastResultBasedOnOutcome(name, version, labInfo.getSilo(),
allLayers, optional, outcome);
- if (!dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
- return null;
+ if (vNexusResult != null && dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
+ vNexusResult.setLab(labInfo);
+ return vNexusResult;
}
- vNexusResult.setLab(labInfo);
- return vNexusResult;
+ return null;
}
public ValidationDbTestResult getLastResultBasedOnOutcomeFromNexus(@Nonnull String name, @Nonnull String version,
}
ValidationDbTestResult vNexusResult = nexusService.getLastResultBasedOnOutcome(name, version, labInfo.getSilo(),
layers, optional, outcome);
- if (!dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
- return null;
+ if (vNexusResult != null && dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
+ vNexusResult.setLab(labInfo);
+ return vNexusResult;
}
- vNexusResult.setLab(labInfo);
- return vNexusResult;
+ return null;
}
public List<ValidationDbTestResult> getBasedOnDateFromNexus(@Nonnull String name, @Nonnull String version,
}
List<ValidationDbTestResult> vNexusResults = new ArrayList<ValidationDbTestResult>();
List<ValidationDbTestResult> vResults = nexusService.getResults(name, version, labInfo.getSilo(), date);
- if (vResults != null && vResults.size() > 1) {
+ if (vResults != null && vResults.size() >= 1) {
for (ValidationDbTestResult vNexusResult : vResults) {
if (dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
vNexusResult.setLab(labInfo);