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

DATAREST-494 - ALPS metadata now links to JSON Schema.

Browse Source 
The ALPS document rendered now links to the JSON Schema document from within the core representation descriptor to allow clients to obtain more detailed information about the payloads to send and receive.
This commit is contained in:
Oliver Gierke
2015-03-23 08:49:48 +01:00
parent e5ce6156f9
commit c12009337b
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/alps/RootResourceInformationToAlpsDescriptorConverter.java
View File

@@ -150,6 +150,7 @@ public class RootResourceInformationToAlpsDescriptorConverter {
return descriptor().//
id(metadata.getItemResourceRel().concat("-representation")).//
href(entityLinks.linkFor(type).slash("schema").toString()).//
doc(getDocFor(metadata.getItemResourceDescription())).//
descriptors(buildPropertyDescriptors(type, metadata.getItemResourceRel())).//
build();

27
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/alps/AlpsControllerIntegrationTests.java
View File

@@ -18,7 +18,6 @@ package org.springframework.data.rest.webmvc.alps;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
import org.junit.Before;
@@ -37,6 +36,7 @@ import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.web.WebAppConfiguration;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext;
@@ -104,7 +104,6 @@ public class AlpsControllerIntegrationTests extends AbstractControllerIntegratio
Link peopleLink = discoverUnique(profileLink.getHref(), "people");
mvc.perform(get(peopleLink.getHref())).//
andDo(print()).//
andExpect(jsonPath("$.version").value("1.0")).//
andExpect(jsonPath("$.descriptors[*].name", hasItems("people", "person")));
}
@@ -121,12 +120,26 @@ public class AlpsControllerIntegrationTests extends AbstractControllerIntegratio
assertThat(usersLink, is(nullValue()));
mvc.perform(get(itemsLink.getHref())).//
andDo(print()).//
andExpect(jsonPath("$.descriptors[*].descriptors[*].name", hasItems("id", "name"))).//
andExpect(jsonPath("$.descriptors[*].descriptors[*].name",
everyItem(not(isIn(new String[]{"owner", "manager", "curator"})))));
mvc.perform(get(itemsLink.getHref()))
.andExpect(jsonPath("$.descriptors[*].descriptors[*].name", hasItems("id", "name")))
.andExpect(
jsonPath("$.descriptors[*].descriptors[*].name", everyItem(not(isIn(new String[] { "owner", "manager",
"curator" })))));
}
/**
* @see DATAREST-494
*/
@Test
public void linksToJsonSchemaFromRepresentationDescriptor() throws Exception {
Link profileLink = discoverUnique("/", "profile");
Link usersLink = discoverUnique(profileLink.getHref(), "items");
assertThat(usersLink, is(notNullValue()));
mvc.perform(get(usersLink.getHref())).andDo(MockMvcResultHandlers.print())
.andExpect(jsonPath("$.descriptors[?(@.id == 'item-representation')].href", is(notNullValue())));
}
private Link discoverUnique(String href, String rel) throws Exception {