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

DATAREST-662 - Polishing.

Browse Source 
Simplified test case. Added author tags.
This commit is contained in:
Oliver Gierke
2015-08-29 15:32:42 +02:00
parent b7e650af5e
commit 71cfe235ad
2 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/PersistentEntityJackson2Module.java
View File

@@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.CollectionFactory;
@@ -68,6 +67,7 @@ import com.fasterxml.jackson.databind.deser.ValueInstantiator;
import com.fasterxml.jackson.databind.deser.std.CollectionDeserializer;
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
import com.fasterxml.jackson.databind.ser.BeanSerializerBuilder;
@@ -366,6 +366,7 @@ public class PersistentEntityJackson2Module extends SimpleModule {
* {@link UriToEntityConverter}.
*
* @author Oliver Gierke
* @author Valentin Rentschler
*/
static class UriStringDeserializer extends StdDeserializer<Object> {
@@ -414,10 +415,16 @@ public class PersistentEntityJackson2Module extends SimpleModule {
}
/**
* Deserialize by ignoring typeDeserializer, as URI will either resolve to null or concrete instance
* Deserialize by ignoring the {@link TypeDeserializer}, as URIs will either resolve to {@literal null} or a
* concrete instance anyway.
*
* @see com.fasterxml.jackson.databind.deser.std.StdDeserializer#deserializeWithType(com.fasterxml.jackson.core.JsonParser,
* com.fasterxml.jackson.databind.DeserializationContext,
* com.fasterxml.jackson.databind.jsontype.TypeDeserializer)
*/
@Override
public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt, TypeDeserializer typeDeserializer) throws IOException {
public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt, TypeDeserializer typeDeserializer)
throws IOException {
return deserialize(jp, ctxt);
}
}

47
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/PersistentEntityJackson2ModuleUnitTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014 the original author or authors.
* Copyright 2014-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.
@@ -23,14 +23,12 @@ import java.io.IOException;
import java.net.URI;
import java.util.Arrays;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.data.mapping.PersistentEntity;
import org.springframework.data.mapping.PersistentProperty;
import org.springframework.data.mapping.context.PersistentEntities;
import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
@@ -40,25 +38,27 @@ import org.springframework.data.rest.core.config.MetadataConfiguration;
import org.springframework.data.rest.core.config.ProjectionDefinitionConfiguration;
import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
import org.springframework.data.rest.webmvc.mapping.AssociationLinks;
import org.springframework.hateoas.UriTemplate;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.jayway.jsonpath.JsonPath;
import org.springframework.hateoas.UriTemplate;
/**
* Unit tests for {@link PersistentEntityJackson2Module}.
*
* @author Oliver Gierke
* @author Valentin Rentschler
*/
@RunWith(MockitoJUnitRunner.class)
public class PersistentEntityJackson2ModuleUnitTests {
@Mock AssociationLinks associationLinks;
@Mock PersistentEntities repositories;
@Mock UriToEntityConverter converter;
PersistentEntities persistentEntities;
ObjectMapper mapper;
@Before
@@ -67,19 +67,21 @@ public class PersistentEntityJackson2ModuleUnitTests {
MongoMappingContext mappingContext = new MongoMappingContext();
mappingContext.getPersistentEntity(Sample.class);
mappingContext.getPersistentEntity(SampleWithAdditionalGetters.class);
mappingContext.getPersistentEntity(PersistentEntityJackson2ModuleUnitTests.PetOwner.class);
PersistentEntities persistentEntities = new PersistentEntities(Arrays.asList(mappingContext));
this.persistentEntities = new PersistentEntities(Arrays.asList(mappingContext));
SimpleModule module = new SimpleModule();
module.setSerializerModifier(new PersistentEntityJackson2Module.AssociationOmittingSerializerModifier(
persistentEntities, associationLinks, new RepositoryRestConfiguration(new ProjectionDefinitionConfiguration(),
new MetadataConfiguration(), mock(EnumTranslationConfiguration.class))));
module.setDeserializerModifier(new PersistentEntityJackson2Module.
AssociationUriResolvingDeserializerModifier(repositories, converter, associationLinks));
module.setDeserializerModifier(new PersistentEntityJackson2Module.AssociationUriResolvingDeserializerModifier(
persistentEntities, converter, associationLinks));
this.mapper = new ObjectMapper();
this.mapper.registerModule(module);
}
/**
@@ -112,41 +114,34 @@ public class PersistentEntityJackson2ModuleUnitTests {
* @see DATAREST-662
*/
@Test
public void isAbleToResolveSubclassedProperty() throws IOException {
PersistentEntity petOwnerPersistentEntity = mock(PersistentEntity.class);
PersistentProperty petProperty = mock(PersistentProperty.class);
when(petProperty.isCollectionLike()).thenReturn(false);
when(petProperty.getActualType()).thenReturn(Pet.class);
when(petOwnerPersistentEntity.getPersistentProperty("pet")).thenReturn(petProperty);
when(repositories.getPersistentEntity(PetOwner.class)).thenReturn(petOwnerPersistentEntity);
when(associationLinks.isLinkableAssociation(petProperty)).thenReturn(true);
public void resolvesReferenceToSubtypeCorrectly() throws IOException {
PersistentProperty<?> property = persistentEntities.getPersistentEntity(PetOwner.class)
.getPersistentProperty("pet");
when(associationLinks.isLinkableAssociation(property)).thenReturn(true);
when(converter.convert(new UriTemplate("/pets/1").expand(), TypeDescriptor.valueOf(URI.class),
TypeDescriptor.valueOf(Pet.class))).thenReturn(new Cat());
PetOwner petOwner = mapper.readValue("{\"pet\":\"/pets/1\"}", PetOwner.class);
assertNotNull(petOwner);
assertNotNull(petOwner.getPet());
assertThat(petOwner, is(notNullValue()));
assertThat(petOwner.getPet(), is(notNullValue()));
}
static class PetOwner {
private Pet pet;
Pet pet;
public Pet getPet() {
return pet;
}
}
@JsonTypeInfo(include = JsonTypeInfo.As.PROPERTY, use = JsonTypeInfo.Id.MINIMAL_CLASS)
static class Pet {
static class Pet {}
}
static class Cat extends Pet {
}
static class Cat extends Pet {}
static class Sample {
public @JsonProperty("foo") String name;