TAP5-1334: Id attribute of the @decorate annotation should be optional

git-svn-id: https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk@1031229 13f79535-47bb-0310-9956-ffa450edef68
karesti · Nov 4, 2010 · 7ae6235 · 7ae6235
1 parent 02fa5b6
commit 7ae6235
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Decorate.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Decorate.java
@@ -41,5 +41,5 @@
     /**
      * Id of the decorator.
      */
-    String id();
+    String id() default "";
 }
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule.java
@@ -30,7 +30,7 @@
 public class DecorateByMarkerModule
 {
 
-    @Decorate(serviceInterface=Greeter.class, id="foo")
+    @Decorate(serviceInterface=Greeter.class)
     @GreenMarker
     public static <T> T greeter(ServiceResources resources, T delegate, AspectDecorator aspectDecorator)
     {
@@ -39,15 +39,15 @@ public static <T> T greeter(ServiceResources resources, T delegate, AspectDecora
 
     @Decorate(serviceInterface=Greeter.class, id="bar")
     @GreenMarker
-    @Order("after:foo")
+    @Order("after:Greeter")
     public static <T> T greeter2(ServiceResources resources, T delegate, AspectDecorator aspectDecorator)
     {
         return doDecorate("bar", resources, delegate, aspectDecorator);
     }
 
     @Decorate(serviceInterface=Greeter.class, id="baz")
     @GreenMarker
-    @Order({"after:foo", "before:bar"})
+    @Order({"after:Greeter", "before:bar"})
     public static <T> T greeter3(ServiceResources resources, T delegate, AspectDecorator aspectDecorator)
     {
         return doDecorate("baz", resources, delegate, aspectDecorator);