Renamed CsrfValid annotation to CsrfProtected

Author: chkal

core/src/main/java/org/mvcspec/ozark/security/CsrfProtectFilter.java

@@ -21,7 +21,7 @@
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.security.Csrf;
-import javax.mvc.security.CsrfValid;
+import javax.mvc.security.CsrfProtected;
 import javax.ws.rs.Priorities;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerResponseContext;
@@ -38,7 +38,7 @@
  * <p>CSRF can be enabled by setting the property {@link javax.mvc.security.Csrf#CSRF_PROTECTION}
  * to {@link javax.mvc.security.Csrf.CsrfOptions#IMPLICIT}, to by setting it to
  * {@link javax.mvc.security.Csrf.CsrfOptions#EXPLICIT} and annotating the desired
- * controllers with {@link CsrfValid}. Note that validation only
+ * controllers with {@link CsrfProtected}. Note that validation only
  * applies to controllers also annotated by {@link javax.ws.rs.POST}.</p>
  *
  * @author Santiago Pericas-Geertsen

core/src/main/java/org/mvcspec/ozark/security/CsrfValidateInterceptor.java

@@ -21,7 +21,7 @@
 import javax.annotation.Priority;
 import javax.inject.Inject;
 import javax.mvc.Controller;
-import javax.mvc.security.CsrfValid;
+import javax.mvc.security.CsrfProtected;
 import javax.mvc.security.CsrfValidationException;
 import javax.ws.rs.POST;
 import javax.ws.rs.Priorities;
@@ -179,7 +179,7 @@ private boolean needsValidation(Method controller) {
             case IMPLICIT:
                 return true;
             case EXPLICIT:
-                return hasAnnotation(controller, CsrfValid.class);
+                return hasAnnotation(controller, CsrfProtected.class);
         }
         return false;
     }

test/csrf/src/main/java/org/mvcspec/ozark/test/csrf/CsrfController.java

@@ -16,7 +16,7 @@
 package org.mvcspec.ozark.test.csrf;
 
 import javax.mvc.Controller;
-import javax.mvc.security.CsrfValid;
+import javax.mvc.security.CsrfProtected;
 import javax.mvc.View;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
@@ -38,7 +38,7 @@ public String getForm() {
     }
 
     @POST
-    @CsrfValid
+    @CsrfProtected
     public String postForm(@FormParam("greeting") String greeting) {
         return "redirect:/csrf/ok";
     }