diff --git a/src/main/java/org/springframework/hateoas/alps/AlpsLinkDiscoverer.java b/src/main/java/org/springframework/hateoas/alps/AlpsLinkDiscoverer.java index 533521b3..9d1bec4a 100644 --- a/src/main/java/org/springframework/hateoas/alps/AlpsLinkDiscoverer.java +++ b/src/main/java/org/springframework/hateoas/alps/AlpsLinkDiscoverer.java @@ -29,5 +29,4 @@ public class AlpsLinkDiscoverer extends JsonPathLinkDiscoverer { public AlpsLinkDiscoverer() { super("$.descriptors[?(@.name == '%s')].href", MediaTypes.ALPS_JSON); } - } diff --git a/src/test/java/org/springframework/hateoas/alps/AlpsLinkDiscoverUnitTest.java b/src/test/java/org/springframework/hateoas/alps/AlpsLinkDiscoverUnitTest.java index d591f1be..192712c6 100644 --- a/src/test/java/org/springframework/hateoas/alps/AlpsLinkDiscoverUnitTest.java +++ b/src/test/java/org/springframework/hateoas/alps/AlpsLinkDiscoverUnitTest.java @@ -16,29 +16,28 @@ package org.springframework.hateoas.alps; import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.*; import java.io.IOException; import java.nio.charset.Charset; import org.junit.Test; - -import org.springframework.core.io.DefaultResourceLoader; -import org.springframework.core.io.ResourceLoader; +import org.springframework.core.io.ClassPathResource; import org.springframework.hateoas.Link; import org.springframework.hateoas.LinkDiscoverer; import org.springframework.hateoas.core.AbstractLinkDiscovererUnitTest; import org.springframework.util.StreamUtils; /** + * Unit tests for {@link AlpsLinkDiscoverer}. + * * @author Greg Turnquist + * @author Oliver Gierke */ public class AlpsLinkDiscoverUnitTest extends AbstractLinkDiscovererUnitTest { LinkDiscoverer discoverer = new AlpsLinkDiscoverer(); - ResourceLoader loader = new DefaultResourceLoader(); - @Test public void discoversFullyQualifiedRel() { @@ -65,10 +64,10 @@ public class AlpsLinkDiscoverUnitTest extends AbstractLinkDiscovererUnitTest { */ @Override protected String getInputString() { + try { - return StreamUtils.copyToString( - loader.getResource("classpath:org/springframework/hateoas/alps/link-discoverer.json").getInputStream(), - Charset.defaultCharset()); + return StreamUtils.copyToString(new ClassPathResource("link-discoverer.json", getClass()).getInputStream(), + Charset.defaultCharset()); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/src/test/resources/org/springframework/hateoas/alps/link-discoverer.json b/src/test/resources/org/springframework/hateoas/alps/link-discoverer.json index fa149fab..993e277e 100644 --- a/src/test/resources/org/springframework/hateoas/alps/link-discoverer.json +++ b/src/test/resources/org/springframework/hateoas/alps/link-discoverer.json @@ -20,4 +20,4 @@ "name" : "http://foo.com/bar", "href" : "fullRelHref" } ] -} \ No newline at end of file +}