Skip to content
This repository was archived by the owner on May 28, 2018. It is now read-only.

JERSEY-2863 Get values from uriInfo instead of having to declare them #163

Merged
merged 1 commit into from
May 20, 2015
Merged

JERSEY-2863 Get values from uriInfo instead of having to declare them #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions incubator/declarative-linking/src/main/java/org/glassfish/jersey/linking/ELLinkBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ static URI buildURI(InjectLinkDescriptor link,
UriBuilder ub = applyLinkStyle(template, link.getLinkStyle(), uriInfo);
UriTemplateParser parser = new UriTemplateParser(template);
List<String> parameterNames = parser.getNames();
Map<String, Object> valueMap = getParameterValues(parameterNames, link, context);
Map<String, Object> valueMap = getParameterValues(parameterNames, link, context, uriInfo);
return ub.buildFromMap(valueMap);
}

Expand All @@ -131,24 +131,29 @@ private static UriBuilder applyLinkStyle(String template, InjectLink.Style style

private static Map<String, Object> getParameterValues(List<String> parameterNames,
InjectLinkDescriptor linkField,
LinkELContext context) {
LinkELContext context,
UriInfo uriInfo) {
Map<String, Object> values = new HashMap<>();
for (String name : parameterNames) {
String elExpression = getEL(name, linkField);
String elExpression = linkField.getBinding(name);
if (elExpression == null) {
String value = uriInfo.getPathParameters().getFirst(name);
if (value == null) {
value = uriInfo.getQueryParameters().getFirst(name);
}
if (value != null) {
values.put(name, value);
continue;
}
elExpression = "${" + ResponseContextResolver.INSTANCE_OBJECT + "." + name + "}";
}
ValueExpression expr = expressionFactory.createValueExpression(context,
elExpression, String.class);
elExpression, String.class);

Object value = expr.getValue(context);
values.put(name, value != null ? value.toString() : null);
}
}
return values;
}

private static String getEL(String name, InjectLinkDescriptor linkField) {
String binding = linkField.getBinding(name);
if (binding != null) {
return binding;
}
return "${" + ResponseContextResolver.INSTANCE_OBJECT + "." + name + "}";
}
}
32 changes: 28 additions & 4 deletions ...or/declarative-linking/src/test/java/org/glassfish/jersey/linking/FieldProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@

import javax.xml.bind.annotation.XmlTransient;

import org.glassfish.jersey.internal.util.collection.MultivaluedStringMap;
import org.glassfish.jersey.linking.mapping.ResourceMappingContext;
import org.glassfish.jersey.server.ExtendedUriInfo;
import org.glassfish.jersey.server.model.Resource;
Expand All @@ -84,6 +85,8 @@ public class FieldProcessorTest {

private static final String baseURI = "http://example.com/application/resources";

private MultivaluedMap queryParams = new MultivaluedStringMap();

@Override
public String getPath() {
throw new UnsupportedOperationException("Not supported yet.");
Expand Down Expand Up @@ -136,22 +139,22 @@ public UriBuilder getBaseUriBuilder() {

@Override
public MultivaluedMap<String, String> getPathParameters() {
throw new UnsupportedOperationException("Not supported yet.");
return new MultivaluedStringMap();
}

@Override
public MultivaluedMap<String, String> getPathParameters(boolean decode) {
throw new UnsupportedOperationException("Not supported yet.");
return new MultivaluedStringMap();
}

@Override
public MultivaluedMap<String, String> getQueryParameters() {
throw new UnsupportedOperationException("Not supported yet.");
return queryParams;
}

@Override
public MultivaluedMap<String, String> getQueryParameters(boolean decode) {
throw new UnsupportedOperationException("Not supported yet.");
return queryParams;
}

@Override
Expand Down Expand Up @@ -646,6 +649,13 @@ public String getQueryParam2() {
public String uri;
}

public static class QueryResourceBeanNoBindings {
//query parameters will be populated from uriInfo
//JERSEY-2863
@InjectLink(resource = QueryResource.class, method = "getB")
public String uri;
}

@Test
public void testQueryResource() {
LOG.info("QueryResource");
Expand All @@ -664,6 +674,20 @@ public void testDoubleQueryResource() {
assertEquals("/application/resources/a/b?query=queryExample&query2=queryExample2", testClass.uri);
}

@Test
public void testQueryResourceWithoutBindings() {
LOG.info("QueryResource");
FieldProcessor<QueryResourceBeanNoBindings> instance = new FieldProcessor(QueryResourceBeanNoBindings.class);
QueryResourceBeanNoBindings testClass = new QueryResourceBeanNoBindings();
mockUriInfo.getQueryParameters().putSingle("query", "queryExample");
mockUriInfo.getQueryParameters().putSingle("query2", "queryExample2");
assertEquals("queryExample", mockUriInfo.getQueryParameters().getFirst("query"));
instance.processLinks(testClass, mockUriInfo, mockRmc);
assertEquals("/application/resources/a/b?query=queryExample&query2=queryExample2", testClass.uri);
//clean mock
mockUriInfo.getQueryParameters().clear();
}

public static class TestClassK {

public static final ZipEntry zipEntry = new ZipEntry("entry");
Expand Down
9 changes: 5 additions & 4 deletions ...r/declarative-linking/src/test/java/org/glassfish/jersey/linking/HeaderProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import javax.ws.rs.core.PathSegment;
import javax.ws.rs.core.UriBuilder;

import org.glassfish.jersey.internal.util.collection.MultivaluedStringMap;
import org.glassfish.jersey.linking.InjectLink.Extension;
import org.glassfish.jersey.linking.mapping.ResourceMappingContext;
import org.glassfish.jersey.server.ExtendedUriInfo;
Expand Down Expand Up @@ -114,19 +115,19 @@ public UriBuilder getBaseUriBuilder() {
}

public MultivaluedMap<String, String> getPathParameters() {
throw new UnsupportedOperationException("Not supported yet.");
return new MultivaluedStringMap();
}

public MultivaluedMap<String, String> getPathParameters(boolean decode) {
throw new UnsupportedOperationException("Not supported yet.");
return new MultivaluedStringMap();
}

public MultivaluedMap<String, String> getQueryParameters() {
throw new UnsupportedOperationException("Not supported yet.");
return new MultivaluedStringMap();
}

public MultivaluedMap<String, String> getQueryParameters(boolean decode) {
throw new UnsupportedOperationException("Not supported yet.");
return new MultivaluedStringMap();
}

public List<String> getMatchedURIs() {
Expand Down