DATAREST-492 - Fixed JSON Schema type detection for primitive numbers.

We now correctly detect primitive numbers in domain objects so that the JSON Schema type of the property is number as expected.
This commit is contained in:
Oliver Gierke
2015-03-22 20:06:43 +01:00
parent 462570fc24
commit e5ce6156f9
2 changed files with 51 additions and 1 deletions

View File

@@ -30,6 +30,7 @@ import org.springframework.data.rest.core.config.JsonSchemaFormat;
import org.springframework.data.util.ClassTypeInformation;
import org.springframework.data.util.TypeInformation;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.StringUtils;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -127,7 +128,7 @@ public class JsonSchema {
return "string";
} else if (INTEGER_TYPES.contains(type)) {
return "integer";
} else if (Number.class.isAssignableFrom(type)) {
} else if (ClassUtils.isAssignable(Number.class, type)) {
return "number";
} else {
return "object";

View File

@@ -0,0 +1,49 @@
/*
* Copyright 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.rest.webmvc.json;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.data.rest.webmvc.json.JsonSchema.Property;
import org.springframework.data.util.ClassTypeInformation;
import org.springframework.data.util.TypeInformation;
/**
* Unit tests for {@link JsonSchema}.
*
* @author Oliver Gierke
*/
public class JsonSchemaUnitTests {
static final TypeInformation<?> type = ClassTypeInformation.from(Sample.class);
/**
* @see DATAREST-492
*/
@Test
public void considersNumberPrimitivesJsonSchemaNumbers() {
Property property = new JsonSchema.Property("foo", "bar", false);
assertThat(property.with(type.getProperty("foo")).type, is("number"));
}
static class Sample {
double foo;
}
}