Index: branches/grails3_dealer-service/grails-app/controllers/com/lemans/dealer/ImprovedDealerController.groovy =================================================================== diff -u -r9525 -r9530 --- branches/grails3_dealer-service/grails-app/controllers/com/lemans/dealer/ImprovedDealerController.groovy (.../ImprovedDealerController.groovy) (revision 9525) +++ branches/grails3_dealer-service/grails-app/controllers/com/lemans/dealer/ImprovedDealerController.groovy (.../ImprovedDealerController.groovy) (revision 9530) @@ -3,7 +3,7 @@ import com.lemans.LemansApiController import com.lemans.LemansLegacyPackager -class ImprovedDealerController extends LemansApiController implements LemansLegacyPackager { +class ImprovedDealerController extends AbstractDealerCheckingController { def dealerService @@ -17,13 +17,4 @@ Map data = dealerService.findDealer(criteria) render toJson(legacyPackage(data)) } - - protected final List checkDealer(String dealerCode) { - if (dealerCode) { - boolean dealerExists = dealerService.dealerExists(dealerCode) - if (!dealerExists) { - [[field: 'dealerCode', message: "Dealer $dealerCode cannot be found", code: 'WM-200']] - } - } - } } Index: branches/grails3_dealer-service/grails-app/controllers/com/lemans/dealer/activities/DealerActivityReportingController.groovy =================================================================== diff -u -r9525 -r9530 --- branches/grails3_dealer-service/grails-app/controllers/com/lemans/dealer/activities/DealerActivityReportingController.groovy (.../DealerActivityReportingController.groovy) (revision 9525) +++ branches/grails3_dealer-service/grails-app/controllers/com/lemans/dealer/activities/DealerActivityReportingController.groovy (.../DealerActivityReportingController.groovy) (revision 9530) @@ -2,6 +2,7 @@ import com.lemans.LemansApiController import com.lemans.LemansLegacyPackager +import com.lemans.dealer.AbstractDealerCheckingController import grails.converters.JSON import org.json.JSONObject @@ -10,7 +11,7 @@ import java.text.ParseException import java.text.SimpleDateFormat -class DealerActivityReportingController extends LemansApiController implements LemansLegacyPackager { +class DealerActivityReportingController extends AbstractDealerCheckingController { static final String ACTIVITY_LOG_DATE_FORMAT = 'MM/dd/yyyy' @@ -167,13 +168,4 @@ private String message(String code) { messageSource.getMessage(code, [] as Object[], Locale.default) } - - protected final List checkDealer(String dealerCode) { - if (dealerCode) { - boolean dealerExists = dealerService.dealerExists(dealerCode) - if (!dealerExists) { - [[field: 'dealerCode', message: "Dealer $dealerCode cannot be found", code: 'WM-200']] - } - } - } } Index: branches/grails3_dealer-service/grails-app/controllers/com/lemans/dealer/AbstractDealerCheckingController.groovy =================================================================== diff -u -r9353 -r9530 --- branches/grails3_dealer-service/grails-app/controllers/com/lemans/dealer/AbstractDealerCheckingController.groovy (.../AbstractDealerCheckingController.groovy) (revision 9353) +++ branches/grails3_dealer-service/grails-app/controllers/com/lemans/dealer/AbstractDealerCheckingController.groovy (.../AbstractDealerCheckingController.groovy) (revision 9530) @@ -1,9 +1,11 @@ package com.lemans.dealer -import com.lemans.LemansController +import com.lemans.LemansApiController +import com.lemans.LemansLegacyPackager -abstract class AbstractDealerCheckingController extends LemansController { +abstract class AbstractDealerCheckingController extends LemansApiController implements LemansLegacyPackager { + def dealerService /** * Provides an error List if the dealerCode is specified and does not exist. *