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

DATAREST-288 - Removed javax.validation dependency from schema controller.

Browse Source
This commit is contained in:
Oliver Gierke
2014-04-10 09:23:41 +02:00
parent d0ccd7251d
commit 9f1a08d412
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositorySchemaController.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013 the original author or authors.
* Copyright 2013-2014 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,13 +15,16 @@
*/
package org.springframework.data.rest.webmvc;
import static org.springframework.web.bind.annotation.RequestMethod.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.rest.webmvc.json.JsonSchema;
import org.springframework.data.rest.webmvc.json.PersistentEntityToJsonSchemaConverter;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
/**
* Controller to expose a JSON schema via {@code / repository}/schema}.
@@ -54,10 +57,10 @@ class RepositorySchemaController {
* @param resourceInformation will never be {@literal null}.
* @return
*/
@RequestMapping(value = BASE_MAPPING + "/schema", method = RequestMethod.GET,
produces = { "application/schema+json" })
@ResponseBody
public JsonSchema schema(RootResourceInformation resourceInformation) {
return jsonSchemaConverter.convert(resourceInformation.getPersistentEntity().getType());
@RequestMapping(value = BASE_MAPPING + "/schema", method = GET, produces = { "application/schema+json" })
public HttpEntity<JsonSchema> schema(RootResourceInformation resourceInformation) {
JsonSchema schema = jsonSchemaConverter.convert(resourceInformation.getPersistentEntity().getType());
return new ResponseEntity<JsonSchema>(schema, HttpStatus.OK);
}
}

8
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/PersistentEntityToJsonSchemaConverter.java
View File

@@ -20,8 +20,6 @@ import static org.springframework.util.StringUtils.*;
import java.util.HashSet;
import java.util.Set;
import javax.validation.constraints.NotNull;
import org.springframework.context.support.MessageSourceAccessor;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.ConditionalGenericConverter;
@@ -132,14 +130,12 @@ public class PersistentEntityToJsonSchemaConverter implements ConditionalGeneric
String type = uncapitalize(propertyType.getSimpleName());
ResourceMapping propertyMapping = metadata.getMappingFor(persistentProperty);
boolean notNull = persistentProperty.isAnnotationPresent(NotNull.class);
ResourceDescription description = propertyMapping.getDescription();
String message = accessor.getMessage(description);
Property property = persistentProperty.isCollectionLike() ? //
new ArrayProperty("array", message, notNull)
: new Property(type, message, notNull);
new ArrayProperty("array", message, false)
: new Property(type, message, false);
jsonSchema.addProperty(persistentProperty.getName(), property);
}