package uk.ac.ebi.quickgo.client.service.loader.presets.evidence;

import org.springframework.batch.item.ItemProcessor;
import org.springframework.batch.item.validator.ValidationException;

import static uk.ac.ebi.quickgo.client.service.loader.presets.PresetsValidationHelper.checkIsNullOrEmpty;

/**
 * Validates the {@link RawEvidenceNamedPreset} instances being read from flat-files and mapped via
 * {@link StringToRawEvidenceNamedPresetMapper}.
 *
 * Created 05/03/18
 * @author Tony Wardell
 */
public class RawEvidenceNamedPresetValidator implements ItemProcessor<RawEvidenceNamedPreset, RawEvidenceNamedPreset> {
    @Override public RawEvidenceNamedPreset process(RawEvidenceNamedPreset rawEvidenceNamedPreset) {
        if (rawEvidenceNamedPreset == null) {
            throw new ValidationException("RawEvidenceNamedPreset cannot be null or empty");
        }

        checkIsNullOrEmpty(rawEvidenceNamedPreset.name);

        return rawEvidenceNamedPreset;
    }

}

package uk.ac.ebi.quickgo.client.service.loader.presets.evidence;

import org.springframework.batch.item.ItemProcessor;
import org.springframework.batch.item.validator.ValidationException;

import static uk.ac.ebi.quickgo.client.service.loader.presets.PresetsValidationHelper.checkIsNullOrEmpty;

/**
 * Validates the {@link RawEvidenceNamedPreset} instances being read from flat-files and mapped via
 * {@link StringToRawEvidenceNamedPresetMapper}.
 *
 * Created 05/03/18
 * @author Tony Wardell
 */
public class RawEvidenceNamedPresetValidator implements ItemProcessor<RawEvidenceNamedPreset, RawEvidenceNamedPreset> {
    @Override public RawEvidenceNamedPreset process(RawEvidenceNamedPreset rawNamedPreset) {
        if (rawNamedPreset == null) {
            throw new ValidationException("RawDBPreset cannot be null or empty");
        }

        checkIsNullOrEmpty(rawNamedPreset.name);

        return rawNamedPreset;
    }

}

--- 
+++ 
@@ -13,14 +13,14 @@
  * @author Tony Wardell
  */
 public class RawEvidenceNamedPresetValidator implements ItemProcessor<RawEvidenceNamedPreset, RawEvidenceNamedPreset> {
-    @Override public RawEvidenceNamedPreset process(RawEvidenceNamedPreset rawNamedPreset) {
-        if (rawNamedPreset == null) {
-            throw new ValidationException("RawDBPreset cannot be null or empty");
+    @Override public RawEvidenceNamedPreset process(RawEvidenceNamedPreset rawEvidenceNamedPreset) {
+        if (rawEvidenceNamedPreset == null) {
+            throw new ValidationException("RawEvidenceNamedPreset cannot be null or empty");
         }
 
-        checkIsNullOrEmpty(rawNamedPreset.name);
+        checkIsNullOrEmpty(rawEvidenceNamedPreset.name);
 
-        return rawNamedPreset;
+        return rawEvidenceNamedPreset;
     }
 
 }
Fix cut 'n' paster error RawDBPreset -> RawEvidenceNamedPreset. Code tidy.
