Change HttpMethod parse to allow the definition of a default method.

rdllopes · Oct 16, 2010 · 7d938c2 · 7d938c2
1 parent 164fd04
commit 7d938c2
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 7 deletions.
diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/Delete.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/Delete.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target(ElementType.METHOD)
+@Target({ElementType.TYPE, ElementType.METHOD})
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Delete {

diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/Get.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/Get.java
@@ -29,7 +29,7 @@
  * 
  * @author Guilherme Silveira
  */
-@Target(ElementType.METHOD)
+@Target({ElementType.TYPE, ElementType.METHOD})
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Get {

diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/Head.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/Head.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target(ElementType.METHOD)
+@Target({ElementType.TYPE, ElementType.METHOD})
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Head {

diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/Post.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/Post.java
@@ -28,7 +28,7 @@
  * 
  * @author Guilherme Silveira
  */
-@Target(ElementType.METHOD)
+@Target({ElementType.TYPE, ElementType.METHOD})
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Post {

diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/Put.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/Put.java
@@ -28,7 +28,7 @@
  * 
  * @author Guilherme Silveira
  */
-@Target(ElementType.METHOD)
+@Target({ElementType.TYPE, ElementType.METHOD})
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Put {

diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/Trace.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/Trace.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target(ElementType.METHOD)
+@Target({ElementType.TYPE, ElementType.METHOD})
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Trace {

diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/http/route/PathAnnotationRoutesParser.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/http/route/PathAnnotationRoutesParser.java
@@ -60,18 +60,30 @@ public List<Route> rulesFor(ResourceClass resource) {
 	}
 
 	protected List<Route> registerRulesFor(Class<?> baseType) {
+		HttpMethod commonHttpMethod = null;
+		for (HttpMethod m : HttpMethod.values()) {
+			if (baseType.isAnnotationPresent(m.getAnnotation())) {
+				commonHttpMethod = m;
+				break;
+			}
+		}
 		List<Route> routes = new ArrayList<Route>();
 		for (Method javaMethod : baseType.getMethods()) {
 			if (isEligible(javaMethod)) {
 				String[] uris = getURIsFor(javaMethod, baseType);
 
 				for (String uri : uris) {
+					boolean isNotHttpMethodAnnotationPresent = true;
 					RouteBuilder rule = router.builderFor(uri);
 					for (HttpMethod m : HttpMethod.values()) {
 						if (javaMethod.isAnnotationPresent(m.getAnnotation())) {
 							rule.with(m);
+							isNotHttpMethodAnnotationPresent = false;
 						}
-					}
+					}					
+					if( isNotHttpMethodAnnotationPresent && commonHttpMethod!=null ){
+						rule.with( commonHttpMethod );
+					}					
 					if (javaMethod.isAnnotationPresent(Path.class)) {
 						rule.withPriority(javaMethod.getAnnotation(Path.class).priority());
 					}

diff --git a/vraptor-site/src/content/equipe.jsp b/vraptor-site/src/content/equipe.jsp
@@ -42,6 +42,8 @@
 		<dt>Lucas H. G. Toniazzo - <fmt:message key="colaborador"/></dt>
 		<dt>Otávio Scherer Garcia - <fmt:message key="colaborador"/></dt>
 		<dt>Rafael Carneiro - <fmt:message key="colaborador"/></dt>
+		<dt>Allan de Queiroz - <fmt:message key="colaborador"/></dt>
+		<dd><a href="mailto:alsoqz@gmail.com">alsoqz@gmail.com</a></dd>
 	</dl>
   </div>  
 </div>