From 1100693c53e853965f9f38707beb1e8b01c76405 Mon Sep 17 00:00:00 2001 From: Jon Brisbin Date: Tue, 2 Oct 2012 10:06:53 -0500 Subject: [PATCH] Fixed a bug introduced by a change in how the validators were looked up. Not sure why I made the original change to begin with but the functionality has been been reverted to its previous behavior. --- .../ValidatingRepositoryEventListener.java | 21 +------------------ .../data/rest/test/ApplicationRestConfig.java | 2 +- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/ValidatingRepositoryEventListener.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/ValidatingRepositoryEventListener.java index b9f57b2ff..0e168f214 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/ValidatingRepositoryEventListener.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/ValidatingRepositoryEventListener.java @@ -121,26 +121,7 @@ public class ValidatingRepositoryEventListener o, repositoryMetadataFor(domainType).entityMetadata()); - String eventName = null; - if("beforeSave".equals(event)) { - eventName = "before" + domainType.getSimpleName() + "Save"; - } else if("afterSave".equals(event)) { - eventName = "after" + domainType.getSimpleName() + "Save"; - } else if("beforeLinkSave".equals(event)) { - eventName = "before" + domainType.getSimpleName() + "LinkSave"; - } else if("afterLinkSave".equals(event)) { - eventName = "after" + domainType.getSimpleName() + "LinkSave"; - } else if("beforeDelete".equals(event)) { - eventName = "before" + domainType.getSimpleName() + "Delete"; - } else if("afterDelete".equals(event)) { - eventName = "after" + domainType.getSimpleName() + "Delete"; - } - - if(null == eventName) { - return errors; - } - - Collection validators = this.validators.get(eventName); + Collection validators = this.validators.get(event); if(null != validators) { for(Validator v : validators) { if(v.supports(o.getClass())) { diff --git a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/ApplicationRestConfig.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/ApplicationRestConfig.java index b0f255dda..de60a5116 100644 --- a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/ApplicationRestConfig.java +++ b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/ApplicationRestConfig.java @@ -88,7 +88,7 @@ public class ApplicationRestConfig { * * @return */ - @Bean public PersonValidator beforePersonSaveValidator() { + @Bean public PersonValidator beforeSavePersonValidator() { return new PersonValidator(); }