Author: heiko.braun(a)jboss.com Date: 2007-11-20 07:59:52 -0500 (Tue, 20 Nov 2007) New Revision: 5073 Modified: stack/native/branches/rest/src/main/java/org/jboss/rs/model/ParameterBinding.java stack/native/branches/rest/src/test/java/org/jboss/test/rs/Widget.java stack/native/branches/rest/src/test/java/org/jboss/test/rs/WidgetList.java stack/native/branches/rest/src/test/java/org/jboss/test/rs/invocation/InvocationBuilderTestCase.java Log: Cleanup Modified: stack/native/branches/rest/src/main/java/org/jboss/rs/model/ParameterBinding.java =================================================================== --- stack/native/branches/rest/src/main/java/org/jboss/rs/model/ParameterBinding.java 2007-11-20 11:51:01 UTC (rev 5072) +++ stack/native/branches/rest/src/main/java/org/jboss/rs/model/ParameterBinding.java 2007-11-20 12:59:52 UTC (rev 5073) @@ -66,9 +66,6 @@ /* Pattern of the owning ResourceMethod */ private final Pattern regex; - /* Pattern to strip prefix from runtime path */ - private static final String PREFIX_PATTERN = "(.*?)"; - /*the total number of parameters */ private int totalParameters = 0; Modified: stack/native/branches/rest/src/test/java/org/jboss/test/rs/Widget.java =================================================================== --- stack/native/branches/rest/src/test/java/org/jboss/test/rs/Widget.java 2007-11-20 11:51:01 UTC (rev 5072) +++ stack/native/branches/rest/src/test/java/org/jboss/test/rs/Widget.java 2007-11-20 12:59:52 UTC (rev 5073) @@ -25,6 +25,8 @@ import javax.ws.rs.UriParam; import javax.ws.rs.UriTemplate; import javax.ws.rs.ProduceMime; +import java.util.List; +import java.util.ArrayList; /** * @author Heiko.Braun(a)jboss.com @@ -51,8 +53,10 @@ @GET @UriTemplate("spec") - public Specification[] getSpecification() { - return new Specification[]{ new Specification() }; + public List<Specification> getSpecifications() { + List<Specification> specs = new ArrayList<Specification>(); + specs.add( new Specification()); + return specs; } @GET Modified: stack/native/branches/rest/src/test/java/org/jboss/test/rs/WidgetList.java =================================================================== --- stack/native/branches/rest/src/test/java/org/jboss/test/rs/WidgetList.java 2007-11-20 11:51:01 UTC (rev 5072) +++ stack/native/branches/rest/src/test/java/org/jboss/test/rs/WidgetList.java 2007-11-20 12:59:52 UTC (rev 5073) @@ -53,7 +53,7 @@ Widget special ) { - + } @UriTemplate("{id}") Modified: stack/native/branches/rest/src/test/java/org/jboss/test/rs/invocation/InvocationBuilderTestCase.java =================================================================== --- stack/native/branches/rest/src/test/java/org/jboss/test/rs/invocation/InvocationBuilderTestCase.java 2007-11-20 11:51:01 UTC (rev 5072) +++ stack/native/branches/rest/src/test/java/org/jboss/test/rs/invocation/InvocationBuilderTestCase.java 2007-11-20 12:59:52 UTC (rev 5073) @@ -114,6 +114,7 @@ // setup a builder InvocationBuilder builder = new DefaultInvocationBuilder(); builder.addInvocationModel(method.getParameterBinding()); + builder.addInvocationModel(method.getOperationBinding()); // create an Invocation instance Invocation invocation = builder.build(context);