Spring/spring-hateoas
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#314 - HalLinkDiscoverer now also works for URI rels.

Browse Source 
Relation names can be fully qualified URIs. HalLinkDiscoverer now quotes the relation name handed into the constructor so that the expression parsing works as expected.
This commit is contained in:
Oliver Gierke
2015-03-09 23:30:24 +01:00
parent 15e2eb1f75
commit dc90d23da7
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/hateoas/hal/HalLinkDiscoverer.java
View File

@@ -27,6 +27,6 @@ import org.springframework.hateoas.core.JsonPathLinkDiscoverer;
public class HalLinkDiscoverer extends JsonPathLinkDiscoverer {
public HalLinkDiscoverer() {
super("$._links..%s..href", MediaTypes.HAL_JSON);
super("$._links..['%s']..href", MediaTypes.HAL_JSON);
}
}

21
src/test/java/org/springframework/hateoas/hal/HalLinkDiscovererUnitTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013 the original author or authors.
* Copyright 2013-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,6 +15,10 @@
*/
package org.springframework.hateoas.hal;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.hateoas.LinkDiscoverer;
import org.springframework.hateoas.core.AbstractLinkDiscovererUnitTest;
@@ -26,10 +30,17 @@ import org.springframework.hateoas.core.AbstractLinkDiscovererUnitTest;
public class HalLinkDiscovererUnitTest extends AbstractLinkDiscovererUnitTest {
static final LinkDiscoverer discoverer = new HalLinkDiscoverer();
static final String SAMPLE = "{ _links : { " + //
"self : { href : 'selfHref' }, " + //
"relation : [ " + //
"{ href : 'firstHref' }, { href : 'secondHref' }]}}";
static final String SAMPLE = "{ _links : { self : { href : 'selfHref' }, " + //
"relation : [ { href : 'firstHref' }, { href : 'secondHref' }], " + //
"'http://foo.com/bar' : { href : 'fullRelHref' }, " + "}}";
/**
* @see #314
*/
@Test
public void discoversFullyQualifiedRel() {
assertThat(getDiscoverer().findLinkWithRel("http://foo.com/bar", SAMPLE), is(notNullValue()));
}
@Override
protected LinkDiscoverer getDiscoverer() {