Author: xcoulon Date: 2012-02-13 04:56:54 -0500 (Mon, 13 Feb 2012) New Revision: 38648 Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsEndpoint.java trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JaxrsMetamodelChangedProcessorTestCase.java Log: Open - https://issues.jboss.org/browse/JBIDE-10865 [WSTester] Prompt user for values when the URL contains path params Reformating the URI Path Template Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsEndpoint.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsEndpoint.java 2012-02-13 08:53:01 UTC (rev 38647) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsEndpoint.java 2012-02-13 09:56:54 UTC (rev 38648) @@ -281,11 +281,13 @@ for (Iterator<JavaMethodParameter> iterator = queryParameters.iterator(); iterator.hasNext();) { JavaMethodParameter queryParam = iterator.next(); final Annotation queryParamAnnotation = queryParam.getAnnotation(QueryParam.class.getName()); - uriPathTemplateBuilder.append(queryParamAnnotation.getValue("value")).append("={"); - uriPathTemplateBuilder.append(queryParam.getTypeName()); + final String paramName = queryParamAnnotation.getValue("value"); + final String paramType = queryParam.getTypeName(); + uriPathTemplateBuilder.append(paramName).append("={"); + uriPathTemplateBuilder.append(paramName).append(":").append(paramType); final Annotation defaultValueAnnotation = queryParam.getAnnotation(DefaultValue.class.getName()); if (defaultValueAnnotation != null) { - uriPathTemplateBuilder.append(':').append(defaultValueAnnotation.getValue("value")); + uriPathTemplateBuilder.append('=').append(defaultValueAnnotation.getValue("value")); } uriPathTemplateBuilder.append('}'); Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JaxrsMetamodelChangedProcessorTestCase.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JaxrsMetamodelChangedProcessorTestCase.java 2012-02-13 08:53:01 UTC (rev 38647) +++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JaxrsMetamodelChangedProcessorTestCase.java 2012-02-13 09:56:54 UTC (rev 38648) @@ -194,7 +194,7 @@ JaxrsEndpoint endpoint = createEndpoint(httpMethod, customerResourceMethod); // verifications assertThat(endpoint.getHttpMethod(), equalTo((IJaxrsHttpMethod) httpMethod)); - assertThat(endpoint.getUriPathTemplate(), equalTo("/customers?start={int}&size={int:2}")); + assertThat(endpoint.getUriPathTemplate(), equalTo("/customers?start={start:int}&size={size:int=2}")); } @Test