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

Address #10 by changing the way views are selected.

Browse Source 
Now returns a ModelAndView with view names specific to the representation being sent back. Added a new helper class: RepositoryRestViewResolver that always hands back a default View unless overriden by the user who might set `customViewMappings` so that the exporter will use their own custom views instead of the default one.
This commit is contained in:
Jon Brisbin
2012-05-15 12:03:31 -05:00
parent d177cc7753
commit 0b6175f005
4 changed files with 200 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

232
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestController.java
View File

@@ -73,6 +73,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.context.request.WebRequest;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.util.UriComponentsBuilder;
/**
@@ -229,8 +230,7 @@ public class RepositoryRestController
"application/json"
}
)
public void listRepositories(UriComponentsBuilder uriBuilder,
Model model) {
public ModelAndView listRepositories(UriComponentsBuilder uriBuilder) {
URI baseUri = uriBuilder.build().toUri();
Links links = new Links();
@@ -243,8 +243,10 @@ public class RepositoryRestController
}
}
model.addAttribute(STATUS, HttpStatus.OK);
model.addAttribute(RESOURCE, links);
Map model = new HashMap();
model.put(STATUS, HttpStatus.OK);
model.put(RESOURCE, links);
return new ModelAndView(viewName("list_links"), model);
}
@SuppressWarnings({"unchecked"})
@@ -255,9 +257,8 @@ public class RepositoryRestController
"application/json"
}
)
public void listEntities(UriComponentsBuilder uriBuilder,
@PathVariable String repository,
Model model) {
public ModelAndView listEntities(UriComponentsBuilder uriBuilder,
@PathVariable String repository) {
URI baseUri = uriBuilder.build().toUri();
RepositoryMetadata repoMeta = repositoryMetadataFor(repository);
@@ -273,8 +274,10 @@ public class RepositoryRestController
links.add(new SimpleLink(repoMeta.rel() + ".search",
buildUri(baseUri, repository, "search")));
model.addAttribute(STATUS, HttpStatus.OK);
model.addAttribute(RESOURCE, links);
Map model = new HashMap();
model.put(STATUS, HttpStatus.OK);
model.put(RESOURCE, links);
return new ModelAndView(viewName("list_entities"), model);
}
@SuppressWarnings({"unchecked"})
@@ -285,9 +288,8 @@ public class RepositoryRestController
"application/json"
}
)
public void listQueryMethods(UriComponentsBuilder uriBuilder,
@PathVariable String repository,
Model model) {
public ModelAndView listQueryMethods(UriComponentsBuilder uriBuilder,
@PathVariable String repository) {
URI baseUri = uriBuilder.build().toUri();
RepositoryMetadata repoMeta = repositoryMetadataFor(repository);
@@ -309,8 +311,10 @@ public class RepositoryRestController
links.add(new SimpleLink(rel, path));
}
model.addAttribute(STATUS, HttpStatus.OK);
model.addAttribute(RESOURCE, links);
Map model = new HashMap();
model.put(STATUS, HttpStatus.OK);
model.put(RESOURCE, links);
return new ModelAndView(viewName("list_queries"), model);
}
@SuppressWarnings({"unchecked"})
@@ -321,17 +325,17 @@ public class RepositoryRestController
"application/json"
}
)
public void query(WebRequest request,
UriComponentsBuilder uriBuilder,
@PathVariable String repository,
@PathVariable String query,
Model model) {
public ModelAndView query(WebRequest request,
UriComponentsBuilder uriBuilder,
@PathVariable String repository,
@PathVariable String query) {
URI baseUri = uriBuilder.build().toUri();
RepositoryMetadata repoMeta = repositoryMetadataFor(repository);
Repository repo = repoMeta.repository();
RepositoryQueryMethod queryMethod = repoMeta.queryMethod(query);
Map model = new HashMap();
Class<?>[] paramTypes = queryMethod.paramTypes();
String[] paramNames = queryMethod.paramNames();
Object[] paramVals = new Object[paramTypes.length];
@@ -373,8 +377,8 @@ public class RepositoryRestController
}
}
model.addAttribute(RESOURCE, coll);
model.addAttribute(STATUS, HttpStatus.OK);
model.put(RESOURCE, coll);
model.put(STATUS, HttpStatus.OK);
} else {
RepositoryMetadata elemRepoMeta = repositoryMetadataFor(result.getClass());
if (null != elemRepoMeta) {
@@ -382,17 +386,19 @@ public class RepositoryRestController
String rel = elemRepoMeta.rel() + "." + elemRepoMeta.entityMetadata().type().getSimpleName();
URI path = buildUri(baseUri, repository, id);
Link link = new SimpleLink(rel, path);
model.addAttribute(RESOURCE, link);
model.put(RESOURCE, link);
} else {
model.addAttribute(RESOURCE, result);
model.put(RESOURCE, result);
}
model.addAttribute(STATUS, HttpStatus.OK);
model.put(STATUS, HttpStatus.OK);
}
} catch (IllegalAccessException e) {
throw new DataRetrievalFailureException(e.getMessage(), e);
} catch (InvocationTargetException e) {
throw new DataRetrievalFailureException(e.getMessage(), e);
}
return new ModelAndView(viewName("query_results"), model);
}
@SuppressWarnings({"unchecked"})
@@ -403,18 +409,18 @@ public class RepositoryRestController
"application/json"
}
)
public void create(ServerHttpRequest request,
UriComponentsBuilder uriBuilder,
@PathVariable String repository,
Model model) throws IOException {
public ModelAndView create(ServerHttpRequest request,
UriComponentsBuilder uriBuilder,
@PathVariable String repository) throws IOException {
URI baseUri = uriBuilder.build().toUri();
Map model = new HashMap();
RepositoryMetadata repoMeta = repositoryMetadataFor(repository);
CrudRepository repo = repoMeta.repository();
MediaType incomingMediaType = request.getHeaders().getContentType();
final Object incoming = readIncoming(request, incomingMediaType, repoMeta.entityMetadata().type());
if (null == incoming) {
model.addAttribute(STATUS, HttpStatus.NOT_ACCEPTABLE);
model.put(STATUS, HttpStatus.NOT_ACCEPTABLE);
} else {
if (null != applicationContext) {
applicationContext.publishEvent(new BeforeSaveEvent(incoming));
@@ -430,9 +436,10 @@ public class RepositoryRestController
HttpHeaders headers = new HttpHeaders();
headers.set(LOCATION, selfUri.toString());
model.addAttribute(HEADERS, headers);
model.addAttribute(STATUS, HttpStatus.CREATED);
model.put(HEADERS, headers);
model.put(STATUS, HttpStatus.CREATED);
}
return new ModelAndView(viewName("after_create"), model);
}
@SuppressWarnings({"unchecked"})
@@ -443,13 +450,13 @@ public class RepositoryRestController
"application/json"
}
)
public void entity(ServerHttpRequest request,
UriComponentsBuilder uriBuilder,
@PathVariable String repository,
@PathVariable String id,
Model model) {
public ModelAndView entity(ServerHttpRequest request,
UriComponentsBuilder uriBuilder,
@PathVariable String repository,
@PathVariable String id) {
URI baseUri = uriBuilder.build().toUri();
Map model = new HashMap();
RepositoryMetadata repoMeta = repositoryMetadataFor(repository);
Serializable serId = stringToSerializable(id,
(Class<? extends Serializable>) repoMeta.entityMetadata()
@@ -458,7 +465,7 @@ public class RepositoryRestController
CrudRepository repo = repoMeta.repository();
Object entity = repo.findOne(serId);
if (null == entity) {
model.addAttribute(STATUS, HttpStatus.NOT_FOUND);
model.put(STATUS, HttpStatus.NOT_FOUND);
} else {
HttpHeaders headers = new HttpHeaders();
if (null != repoMeta.entityMetadata().versionAttribute()) {
@@ -467,8 +474,8 @@ public class RepositoryRestController
List<String> etags = request.getHeaders().getIfNoneMatch();
for (String etag : etags) {
if (("\"" + version.toString() + "\"").equals(etag)) {
model.addAttribute(STATUS, HttpStatus.NOT_MODIFIED);
return;
model.put(STATUS, HttpStatus.NOT_MODIFIED);
return new ModelAndView(viewName("empty"), model);
}
}
headers.set("ETag", "\"" + version.toString() + "\"");
@@ -480,10 +487,12 @@ public class RepositoryRestController
buildUri(baseUri, repository, id));
addSelfLink(baseUri, entityDto, repository, id);
model.addAttribute(HEADERS, headers);
model.addAttribute(STATUS, HttpStatus.OK);
model.addAttribute(RESOURCE, entityDto);
model.put(HEADERS, headers);
model.put(STATUS, HttpStatus.OK);
model.put(RESOURCE, entityDto);
}
return new ModelAndView(viewName("entity"), model);
}
@SuppressWarnings({"unchecked"})
@@ -500,16 +509,16 @@ public class RepositoryRestController
"application/json"
}
)
public void createOrUpdate(ServerHttpRequest request,
UriComponentsBuilder uriBuilder,
@PathVariable String repository,
@PathVariable String id,
Model model)
public ModelAndView createOrUpdate(ServerHttpRequest request,
UriComponentsBuilder uriBuilder,
@PathVariable String repository,
@PathVariable String id)
throws IOException,
IllegalAccessException,
InstantiationException {
URI baseUri = uriBuilder.build().toUri();
Map model = new HashMap();
RepositoryMetadata repoMeta = repositoryMetadataFor(repository);
Serializable serId = stringToSerializable(id,
(Class<? extends Serializable>) repoMeta.entityMetadata()
@@ -535,12 +544,12 @@ public class RepositoryRestController
URI selfUri = buildUri(baseUri, repository, id);
HttpHeaders headers = new HttpHeaders();
headers.set(LOCATION, selfUri.toString());
model.addAttribute(HEADERS, headers);
model.addAttribute(STATUS, HttpStatus.CREATED);
model.put(HEADERS, headers);
model.put(STATUS, HttpStatus.CREATED);
} else {
Object entity = repo.findOne(serId);
if (null == entity) {
model.addAttribute(STATUS, HttpStatus.NOT_FOUND);
model.put(STATUS, HttpStatus.NOT_FOUND);
} else {
for (AttributeMetadata attrMeta : (Collection<AttributeMetadata>) repoMeta.entityMetadata()
.embeddedAttributes()
@@ -557,10 +566,12 @@ public class RepositoryRestController
if (null != applicationContext) {
applicationContext.publishEvent(new AfterSaveEvent(savedEntity));
}
model.addAttribute(STATUS, HttpStatus.NO_CONTENT);
model.put(STATUS, HttpStatus.NO_CONTENT);
}
}
}
return new ModelAndView(viewName("empty"), model);
}
@SuppressWarnings({"unchecked"})
@@ -568,9 +579,8 @@ public class RepositoryRestController
value = "/{repository}/{id}",
method = RequestMethod.DELETE
)
public void deleteEntity(@PathVariable String repository,
@PathVariable String id,
Model model) {
public ModelAndView deleteEntity(@PathVariable String repository,
@PathVariable String id) {
RepositoryMetadata repoMeta = repositoryMetadataFor(repository);
Serializable serId = stringToSerializable(id,
(Class<? extends Serializable>) repoMeta.entityMetadata()
@@ -586,7 +596,9 @@ public class RepositoryRestController
applicationContext.publishEvent(new AfterDeleteEvent(serId));
}
model.addAttribute(STATUS, HttpStatus.NO_CONTENT);
Map model = new HashMap();
model.put(STATUS, HttpStatus.NO_CONTENT);
return new ModelAndView(viewName("empty"), model);
}
@@ -599,13 +611,13 @@ public class RepositoryRestController
"text/uri-list"
}
)
public void propertyOfEntity(UriComponentsBuilder uriBuilder,
@PathVariable String repository,
@PathVariable String id,
@PathVariable String property,
Model model) {
public ModelAndView propertyOfEntity(UriComponentsBuilder uriBuilder,
@PathVariable String repository,
@PathVariable String id,
@PathVariable String property) {
URI baseUri = uriBuilder.build().toUri();
Map model = new HashMap();
RepositoryMetadata repoMeta = repositoryMetadataFor(repository);
Serializable serId = stringToSerializable(id,
(Class<? extends Serializable>) repoMeta.entityMetadata()
@@ -614,11 +626,11 @@ public class RepositoryRestController
CrudRepository repo = repoMeta.repository();
Object entity = repo.findOne(serId);
if (null == entity) {
model.addAttribute(STATUS, HttpStatus.NOT_FOUND);
model.put(STATUS, HttpStatus.NOT_FOUND);
} else {
AttributeMetadata attrMeta = repoMeta.entityMetadata().attribute(property);
if (null == attrMeta) {
model.addAttribute(STATUS, HttpStatus.NOT_FOUND);
model.put(STATUS, HttpStatus.NOT_FOUND);
} else {
Class<?> attrType = attrMeta.elementType();
if (null == attrType) {
@@ -626,7 +638,7 @@ public class RepositoryRestController
}
RepositoryMetadata propRepoMeta = repositoryMetadataFor(attrType);
model.addAttribute(STATUS, HttpStatus.OK);
model.put(STATUS, HttpStatus.OK);
Object propVal = attrMeta.get(entity);
AttributeMetadata idAttr = propRepoMeta.entityMetadata().idAttribute();
if (null != propVal) {
@@ -658,12 +670,14 @@ public class RepositoryRestController
URI path = buildUri(baseUri, repository, id, property, propValId);
links.add(new SimpleLink(rel, path));
}
model.addAttribute(RESOURCE, links);
model.put(RESOURCE, links);
} else {
model.addAttribute(STATUS, HttpStatus.NOT_FOUND);
model.put(STATUS, HttpStatus.NOT_FOUND);
}
}
}
return new ModelAndView(viewName("entity_property"), model);
}
@SuppressWarnings({"unchecked"})
@@ -682,14 +696,14 @@ public class RepositoryRestController
"text/uri-list"
}
)
public void updatePropertyOfEntity(final ServerHttpRequest request,
UriComponentsBuilder uriBuilder,
@PathVariable String repository,
@PathVariable String id,
final @PathVariable String property,
final Model model) throws IOException {
public ModelAndView updatePropertyOfEntity(final ServerHttpRequest request,
UriComponentsBuilder uriBuilder,
@PathVariable String repository,
@PathVariable String id,
final @PathVariable String property) throws IOException {
URI baseUri = uriBuilder.build().toUri();
final Map model = new HashMap();
final RepositoryMetadata repoMeta = repositoryMetadataFor(repository);
Serializable serId = stringToSerializable(id,
(Class<? extends Serializable>) repoMeta.entityMetadata()
@@ -698,11 +712,11 @@ public class RepositoryRestController
CrudRepository repo = repoMeta.repository();
final Object entity = repo.findOne(serId);
if (null == entity) {
model.addAttribute(STATUS, HttpStatus.NOT_FOUND);
model.put(STATUS, HttpStatus.NOT_FOUND);
} else {
final AttributeMetadata attrMeta = repoMeta.entityMetadata().attribute(property);
if (null == attrMeta) {
model.addAttribute(STATUS, HttpStatus.NOT_FOUND);
model.put(STATUS, HttpStatus.NOT_FOUND);
} else {
Object linked = attrMeta.get(entity);
final AtomicReference<String> rel = new AtomicReference<String>();
@@ -732,7 +746,7 @@ public class RepositoryRestController
}
String key = rel.get();
if (null == key) {
model.addAttribute(STATUS, HttpStatus.NOT_ACCEPTABLE);
model.put(STATUS, HttpStatus.NOT_ACCEPTABLE);
return null;
} else {
m.put(rel.get(), linkedEntity);
@@ -781,12 +795,14 @@ public class RepositoryRestController
}
if (request.getMethod() == HttpMethod.PUT) {
model.addAttribute(STATUS, HttpStatus.NO_CONTENT);
model.put(STATUS, HttpStatus.NO_CONTENT);
} else {
model.addAttribute(STATUS, HttpStatus.CREATED);
model.put(STATUS, HttpStatus.CREATED);
}
}
}
return new ModelAndView(viewName("empty"), model);
}
@SuppressWarnings({"unchecked"})
@@ -796,10 +812,10 @@ public class RepositoryRestController
RequestMethod.DELETE
}
)
public void clearLinks(@PathVariable String repository,
@PathVariable String id,
@PathVariable String property,
Model model) {
public ModelAndView clearLinks(@PathVariable String repository,
@PathVariable String id,
@PathVariable String property) {
Map model = new HashMap();
RepositoryMetadata repoMeta = repositoryMetadataFor(repository);
Serializable serId = stringToSerializable(id,
(Class<? extends Serializable>) repoMeta.entityMetadata()
@@ -808,7 +824,7 @@ public class RepositoryRestController
CrudRepository repo = repoMeta.repository();
final Object entity = repo.findOne(serId);
if (null == entity) {
model.addAttribute(STATUS, HttpStatus.NOT_FOUND);
model.put(STATUS, HttpStatus.NOT_FOUND);
} else {
AttributeMetadata attrMeta = repoMeta.entityMetadata().attribute(property);
if (null != attrMeta) {
@@ -823,11 +839,13 @@ public class RepositoryRestController
applicationContext.publishEvent(new AfterLinkSaveEvent(savedEntity, null));
}
model.addAttribute(STATUS, HttpStatus.NO_CONTENT);
model.put(STATUS, HttpStatus.NO_CONTENT);
} else {
model.addAttribute(STATUS, HttpStatus.NOT_FOUND);
model.put(STATUS, HttpStatus.NOT_FOUND);
}
}
return new ModelAndView(viewName("empty"), model);
}
@SuppressWarnings({"unchecked"})
@@ -840,14 +858,14 @@ public class RepositoryRestController
"application/json"
}
)
public void linkedEntity(UriComponentsBuilder uriBuilder,
@PathVariable String repository,
@PathVariable String id,
@PathVariable String property,
@PathVariable String linkedId,
Model model) {
public ModelAndView linkedEntity(UriComponentsBuilder uriBuilder,
@PathVariable String repository,
@PathVariable String id,
@PathVariable String property,
@PathVariable String linkedId) {
URI baseUri = uriBuilder.build().toUri();
Map model = new HashMap();
RepositoryMetadata repoMeta = repositoryMetadataFor(repository);
Serializable serId = stringToSerializable(id,
(Class<? extends Serializable>) repoMeta.entityMetadata()
@@ -876,16 +894,17 @@ public class RepositoryRestController
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Location", selfUri.toString());
model.addAttribute(HEADERS, headers);
model.addAttribute(STATUS, HttpStatus.OK);
model.addAttribute(RESOURCE, entityDto);
return;
model.put(HEADERS, headers);
model.put(STATUS, HttpStatus.OK);
model.put(RESOURCE, entityDto);
return new ModelAndView(viewName("linked_entity"), model);
}
}
}
}
model.addAttribute(STATUS, HttpStatus.NOT_FOUND);
model.put(STATUS, HttpStatus.NOT_FOUND);
return new ModelAndView(viewName("empty"), model);
}
@SuppressWarnings({"unchecked"})
@@ -895,20 +914,20 @@ public class RepositoryRestController
RequestMethod.DELETE
}
)
public void deleteLink(@PathVariable String repository,
@PathVariable String id,
@PathVariable String property,
@PathVariable String linkedId,
Model model) {
public ModelAndView deleteLink(@PathVariable String repository,
@PathVariable String id,
@PathVariable String property,
@PathVariable String linkedId) {
Map model = new HashMap();
RepositoryMetadata repoMeta = repositoryMetadataFor(repository);
Serializable serId = stringToSerializable(id,
(Class<? extends Serializable>) repoMeta.entityMetadata()
.idAttribute()
.type());
CrudRepository repo = repoMeta.repository();
final Object entity = repo.findOne(serId);
Object entity = repo.findOne(serId);
if (null == entity) {
model.addAttribute(STATUS, HttpStatus.NOT_FOUND);
model.put(STATUS, HttpStatus.NOT_FOUND);
} else {
AttributeMetadata attrMeta = repoMeta.entityMetadata().attribute(property);
if (null != attrMeta) {
@@ -952,14 +971,15 @@ public class RepositoryRestController
attrMeta.set(linkedEntity, entity);
}
model.addAttribute(STATUS, HttpStatus.NO_CONTENT);
return;
model.put(STATUS, HttpStatus.NO_CONTENT);
return new ModelAndView(viewName("empty"), model);
}
}
}
}
model.addAttribute(STATUS, HttpStatus.NOT_FOUND);
model.put(STATUS, HttpStatus.NOT_FOUND);
return new ModelAndView(viewName("empty"), model);
}
@SuppressWarnings({"unchecked"})
@@ -1084,4 +1104,8 @@ public class RepositoryRestController
return entityDto;
}
private String viewName(String name) {
return "org.springframework.data.rest." + name;
}
}

22
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestMvcConfiguration.java
View File

@@ -21,7 +21,7 @@ import org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor;
import org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor;
import org.springframework.util.Assert;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.View;
import org.springframework.web.servlet.ViewResolver;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
@@ -98,19 +98,27 @@ public class RepositoryRestMvcConfiguration extends WebMvcConfigurerAdapter {
}
}
@Bean JsonView jsonView() {
return new JsonView("application/json");
}
@Bean UriListView urilistView() {
return new UriListView();
}
@Bean ContentNegotiatingViewResolver contentNegotiatingViewResolver() {
if (null == viewResolver) {
viewResolver = new ContentNegotiatingViewResolver();
Map<String, String> jsonTypes = new HashMap<String, String>() {{
Map<String, String> mediaTypes = new HashMap<String, String>() {{
put("json", "application/json");
put("urilist", "text/uri-list");
}};
viewResolver.setMediaTypes(mediaTypes);
viewResolver.setMediaTypes(jsonTypes);
viewResolver.setDefaultViews(
Arrays.asList((View) new JsonView("application/json"),
(View) new UriListView())
);
RepositoryRestViewResolver jsonvr = new RepositoryRestViewResolver(jsonView());
RepositoryRestViewResolver urilistvr = new RepositoryRestViewResolver(urilistView());
viewResolver.setViewResolvers(Arrays.<ViewResolver>asList(jsonvr, urilistvr));
}
return viewResolver;
}

34
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestViewResolver.java Normal file
View File

@@ -0,0 +1,34 @@
package org.springframework.data.rest.webmvc;
import java.util.Collections;
import java.util.Locale;
import java.util.Map;
import org.springframework.web.servlet.View;
import org.springframework.web.servlet.ViewResolver;
/**
* @author Jon Brisbin <jon@jbrisbin.com>
*/
public class RepositoryRestViewResolver implements ViewResolver {
private View view;
private Map<String, View> customViewMappings = Collections.emptyMap();
public RepositoryRestViewResolver(View view) {
this.view = view;
}
public RepositoryRestViewResolver setCustomViewMappings(Map<String, View> customViewMappings) {
this.customViewMappings = customViewMappings;
return this;
}
@Override public View resolveViewName(String viewName, Locale locale) throws Exception {
if (customViewMappings.containsKey(viewName)) {
return customViewMappings.get(viewName);
}
return view;
}
}

46
spring-data-rest-webmvc/src/test/groovy/org/springframework/data/rest/webmvc/spec/RepositoryRestControllerSpec.groovy
View File

@@ -81,11 +81,11 @@ class RepositoryRestControllerSpec extends Specification {
def model = new ExtendedModelMap()
when: "listing available repositories"
controller.listRepositories(uriBuilder, model)
def reposLinks = model.resource?.links
def mv = controller.listRepositories(uriBuilder)
def reposLinks = mv.model.resource?.links
then:
model.status == HttpStatus.OK
mv.model.status == HttpStatus.OK
reposLinks?.size() == 3
when: "adding an entity"
@@ -93,63 +93,63 @@ class RepositoryRestControllerSpec extends Specification {
def req = createRequest("POST", "people")
def data = mapper.writeValueAsBytes([name: "John Doe"])
req.content = data
controller.create(new ServletServerHttpRequest(req), uriBuilder, "people", model)
mv = controller.create(new ServletServerHttpRequest(req), uriBuilder, "people")
then:
model.status == HttpStatus.CREATED
mv.model.status == HttpStatus.CREATED
when: "getting a specific entity"
model.clear()
req = createRequest("GET", "people/1")
controller.entity(new ServletServerHttpRequest(req), uriBuilder, "people", "1", model)
mv = controller.entity(new ServletServerHttpRequest(req), uriBuilder, "people", "1")
then:
model.resource?.name == "John Doe"
mv.model.resource?.name == "John Doe"
when: "updating an entity"
model.clear()
mv.model.clear()
req = createRequest("PUT", "people/1")
data = mapper.writeValueAsBytes([name: "Johnnie Doe", version: 0])
req.content = data
controller.createOrUpdate(new ServletServerHttpRequest(req), uriBuilder, "people", "1", model)
mv = controller.createOrUpdate(new ServletServerHttpRequest(req), uriBuilder, "people", "1")
then:
model.status == HttpStatus.NO_CONTENT
mv.model.status == HttpStatus.NO_CONTENT
when: "listing available entities"
model.clear()
controller.listEntities(uriBuilder, "people", model)
def peopleLinks = model.resource?.links
mv.model.clear()
mv = controller.listEntities(uriBuilder, "people")
def peopleLinks = mv.model.resource?.links
then:
model.status == HttpStatus.OK
mv.model.status == HttpStatus.OK
peopleLinks[0].href().toString() == "http://localhost:8080/data/people/1"
when: "creating a child entity"
model.clear()
mv.model.clear()
req = createRequest("POST", "address")
data = mapper.writeValueAsBytes(new Address(["1 W. 1st St."] as String[], "Univille", "ST", "12345"))
req.content = data
controller.create(new ServletServerHttpRequest(req), uriBuilder, "address", model)
mv = controller.create(new ServletServerHttpRequest(req), uriBuilder, "address")
then:
model.status == HttpStatus.CREATED
mv.model.status == HttpStatus.CREATED
when: "linking child to parent entity"
model.clear()
mv.model.clear()
req = createRequest("POST", "people/1/addresses")
req.contentType = "text/uri-list"
data = "http://localhost:8080/data/address/1".bytes
req.content = data
controller.updatePropertyOfEntity(new ServletServerHttpRequest(req), uriBuilder, "people", "1", "addresses", model)
mv = controller.updatePropertyOfEntity(new ServletServerHttpRequest(req), uriBuilder, "people", "1", "addresses")
then:
model.status == HttpStatus.CREATED
mv.model.status == HttpStatus.CREATED
when: "getting property of an entity"
model.clear()
controller.propertyOfEntity(uriBuilder, "people", "1", "addresses", model)
def addrLinks = model.resource?.links
mv.model.clear()
mv = controller.propertyOfEntity(uriBuilder, "people", "1", "addresses")
def addrLinks = mv.model.resource?.links
then:
null != addrLinks