From 3b9f7ff57c8b351dbab9142714abf48d82279cd1 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 11 May 2018 22:13:19 +0100
Subject: [PATCH] Refactor Validator construction

---
 .../api/ValidatorsApiController.java          | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/main/java/uk/org/iay/incommon/validator/api/ValidatorsApiController.java b/src/main/java/uk/org/iay/incommon/validator/api/ValidatorsApiController.java
index e3f2584..935f9e8 100644
--- a/src/main/java/uk/org/iay/incommon/validator/api/ValidatorsApiController.java
+++ b/src/main/java/uk/org/iay/incommon/validator/api/ValidatorsApiController.java
@@ -62,20 +62,6 @@ public ValidatorsApiController(final HttpServletRequest req, final ValidatorColl
         validatorCollection = valc;
     }
 
-    /**
-     * Make a {@link Validator} from an identifier and description.
-     *
-     * @param id identifier for the validator
-     * @param description description of the validator
-     * @return a {@link Validator}
-     */
-    private Validator makeValidator(final String id, final String description) {
-        final Validator v = new Validator();
-        v.setValidatorId(id);
-        v.setDescription(description);
-        return v;
-    }
-
     @Override
     public ResponseEntity<List<Validator>> getValidators() {
         final String accept = request.getHeader("Accept");
@@ -83,7 +69,10 @@ public ResponseEntity<List<Validator>> getValidators() {
         if (accept != null && accept.contains("application/json")) {
             final List<Validator> validators = new ArrayList<>();
             for (final ValidatorCollection.Entry entry : validatorCollection.getEntries()) {
-                validators.add(makeValidator(entry.getId(), entry.getDescription()));
+                final Validator v = new Validator();
+                v.setValidatorId(entry.getId());
+                v.setDescription(entry.getDescription());
+                validators.add(v);
             }
             return new ResponseEntity<List<Validator>>(validators, HttpStatus.OK);
         }