Skip to content

Add support for JsonUnwrapped #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2020
Merged

Add support for JsonUnwrapped #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 32 additions & 5 deletions ...te4/src/main/java/com/fasterxml/jackson/datatype/hibernate4/HibernateProxySerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
import com.fasterxml.jackson.databind.ser.ContextualSerializer;
import com.fasterxml.jackson.databind.ser.impl.PropertySerializerMap;
import com.fasterxml.jackson.databind.util.NameTransformer;

import org.hibernate.engine.spi.Mapping;
import org.hibernate.engine.spi.SessionImplementor;
Expand Down Expand Up @@ -47,6 +48,7 @@ public class HibernateProxySerializer
protected final boolean _serializeIdentifier;
protected final boolean _nullMissingEntities;
protected final Mapping _mapping;
protected final NameTransformer _unwrapper;

/**
* For efficient serializer lookup, let's use this; most
Expand All @@ -62,35 +64,56 @@ public class HibernateProxySerializer

public HibernateProxySerializer(boolean forceLazyLoading)
{
this(forceLazyLoading, false, false, null, null);
this(forceLazyLoading, false, false, null, null, null);
}

public HibernateProxySerializer(boolean forceLazyLoading, boolean serializeIdentifier) {
this(forceLazyLoading, serializeIdentifier, false, null, null);
this(forceLazyLoading, serializeIdentifier, false, null, null, null);
}

public HibernateProxySerializer(boolean forceLazyLoading, boolean serializeIdentifier, Mapping mapping) {
this(forceLazyLoading, serializeIdentifier, false, mapping, null);
this(forceLazyLoading, serializeIdentifier, false, mapping, null, null);
}

public HibernateProxySerializer(boolean forceLazyLoading, boolean serializeIdentifier, boolean nullMissingEntities, Mapping mapping) {
this(forceLazyLoading, serializeIdentifier, nullMissingEntities, mapping, null);
this(forceLazyLoading, serializeIdentifier, nullMissingEntities, mapping, null, null);
}

public HibernateProxySerializer(boolean forceLazyLoading, boolean serializeIdentifier, boolean nullMissingEntities, Mapping mapping,
BeanProperty property) {
this(forceLazyLoading, serializeIdentifier, nullMissingEntities, mapping, property, null);
}


protected HibernateProxySerializer(boolean forceLazyLoading, boolean serializeIdentifier, boolean nullMissingEntities, Mapping mapping,
BeanProperty property, NameTransformer unwrapper) {
_forceLazyLoading = forceLazyLoading;
_serializeIdentifier = serializeIdentifier;
_nullMissingEntities = nullMissingEntities;
_mapping = mapping;
_dynamicSerializers = PropertySerializerMap.emptyForProperties();
_property = property;
_unwrapper = unwrapper;
}

@Override
public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty property) {
return new HibernateProxySerializer(this._forceLazyLoading, _serializeIdentifier, _nullMissingEntities,
_mapping, property);
_mapping, property, _unwrapper);
}

@Override
public JsonSerializer<HibernateProxy> unwrappingSerializer(
final NameTransformer unwrapper)
{
return new HibernateProxySerializer(_forceLazyLoading, _serializeIdentifier, _nullMissingEntities,
_mapping, _property, unwrapper == null ? NameTransformer.NOP : unwrapper);
}

@Override
public boolean isUnwrappingSerializer()
{
return _unwrapper != null;
}

/*
Expand Down Expand Up @@ -174,6 +197,10 @@ protected JsonSerializer<Object> findSerializer(SerializerProvider provider, Obj
if (_dynamicSerializers != result.map) {
_dynamicSerializers = result.map;
}
if (_unwrapper != null)
{
return result.serializer.unwrappingSerializer(_unwrapper);
}
return result.serializer;
}

Expand Down
64 changes: 64 additions & 0 deletions hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/UnwrappedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
package com.fasterxml.jackson.datatype.hibernate4;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonUnwrapped;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.hibernate4.data.Customer;
import com.fasterxml.jackson.datatype.hibernate4.data.Product;
import org.hibernate.Hibernate;

import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import java.util.Map;

/**
* Unit test for [#97]
*/
public class UnwrappedTest extends BaseTest
{
static class HasUnwrapped<T>
{
private final T content;

@JsonCreator
public HasUnwrapped(T content)
{
this.content = content;
}

@JsonUnwrapped
public T getContent()
{
return content;
}
}

public void testSimpleUnwrapped() throws JsonProcessingException
{
EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit");
try {
EntityManager em = emf.createEntityManager();

ObjectMapper mapper = mapperWithModule(true);

Customer customer = em.find(Customer.class, 500);
Product product = customer.getMissingProduct();
assertFalse(Hibernate.isInitialized(product));

String json = mapper.writeValueAsString(new HasUnwrapped<>(product));

assertTrue(Hibernate.isInitialized(product));
assertNotNull(json);
HasUnwrapped<Product> deserialized = mapper.readValue(json, new TypeReference<HasUnwrapped<Product>>(){});
assertTrue(deserialized != null);
assertTrue(deserialized.getContent() != null);
assertTrue(deserialized.getContent().getProductCode() != null);

} finally {
emf.close();
}
}
}
41 changes: 34 additions & 7 deletions ...te5/src/main/java/com/fasterxml/jackson/datatype/hibernate5/HibernateProxySerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
import com.fasterxml.jackson.databind.ser.ContextualSerializer;
import com.fasterxml.jackson.databind.ser.impl.PropertySerializerMap;
import com.fasterxml.jackson.databind.util.NameTransformer;

import org.hibernate.engine.spi.Mapping;
import org.hibernate.engine.spi.SessionFactoryImplementor;
Expand Down Expand Up @@ -48,6 +49,7 @@ public class HibernateProxySerializer
protected final boolean _serializeIdentifier;
protected final boolean _nullMissingEntities;
protected final Mapping _mapping;
protected final NameTransformer _unwrapper;

/**
* For efficient serializer lookup, let's use this; most
Expand All @@ -63,36 +65,57 @@ public class HibernateProxySerializer

public HibernateProxySerializer(boolean forceLazyLoading)
{
this(forceLazyLoading, false, false, null, null);
this(forceLazyLoading, false, false, null, null, null);
}

public HibernateProxySerializer(boolean forceLazyLoading, boolean serializeIdentifier) {
this(forceLazyLoading, serializeIdentifier, false, null, null);
this(forceLazyLoading, serializeIdentifier, false, null, null, null);
}

public HibernateProxySerializer(boolean forceLazyLoading, boolean serializeIdentifier, Mapping mapping) {
this(forceLazyLoading, serializeIdentifier, false, mapping, null);
this(forceLazyLoading, serializeIdentifier, false, mapping, null, null);
}

public HibernateProxySerializer(boolean forceLazyLoading, boolean serializeIdentifier, boolean nullMissingEntities, Mapping mapping) {
this(forceLazyLoading, serializeIdentifier, nullMissingEntities, mapping, null);
this(forceLazyLoading, serializeIdentifier, nullMissingEntities, mapping, null, null);
}

public HibernateProxySerializer(boolean forceLazyLoading, boolean serializeIdentifier, boolean nullMissingEntities, Mapping mapping,
BeanProperty property) {
BeanProperty property) {
this(forceLazyLoading, serializeIdentifier, nullMissingEntities, mapping, property, null);
}


protected HibernateProxySerializer(boolean forceLazyLoading, boolean serializeIdentifier, boolean nullMissingEntities, Mapping mapping,
BeanProperty property, NameTransformer unwrapper) {
_forceLazyLoading = forceLazyLoading;
_serializeIdentifier = serializeIdentifier;
_nullMissingEntities = nullMissingEntities;
_mapping = mapping;
_dynamicSerializers = PropertySerializerMap.emptyForProperties();
_property = property;
_unwrapper = unwrapper;
}

@Override
public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty property) {
return new HibernateProxySerializer(this._forceLazyLoading, _serializeIdentifier, _nullMissingEntities,
_mapping, property);
}
_mapping, property, _unwrapper);
}

@Override
public JsonSerializer<HibernateProxy> unwrappingSerializer(
final NameTransformer unwrapper)
{
return new HibernateProxySerializer(_forceLazyLoading, _serializeIdentifier, _nullMissingEntities,
_mapping, _property, unwrapper == null ? NameTransformer.NOP : unwrapper);
}

@Override
public boolean isUnwrappingSerializer()
{
return _unwrapper != null;
}

/*
/**********************************************************************
Expand Down Expand Up @@ -175,6 +198,10 @@ protected JsonSerializer<Object> findSerializer(SerializerProvider provider, Obj
if (_dynamicSerializers != result.map) {
_dynamicSerializers = result.map;
}
if (_unwrapper != null)
{
return result.serializer.unwrappingSerializer(_unwrapper);
}
return result.serializer;
}

Expand Down
64 changes: 64 additions & 0 deletions hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/UnwrappedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
package com.fasterxml.jackson.datatype.hibernate5;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonUnwrapped;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.hibernate5.data.Customer;
import com.fasterxml.jackson.datatype.hibernate5.data.Product;
import org.hibernate.Hibernate;

import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import java.util.Map;

/**
* Unit test for [#97]
*/
public class UnwrappedTest extends BaseTest
{
static class HasUnwrapped<T>
{
private final T content;

@JsonCreator
public HasUnwrapped(T content)
{
this.content = content;
}

@JsonUnwrapped
public T getContent()
{
return content;
}
}

public void testSimpleUnwrapped() throws JsonProcessingException
{
EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit");
try {
EntityManager em = emf.createEntityManager();

ObjectMapper mapper = mapperWithModule(true);

Customer customer = em.find(Customer.class, 500);
Product product = customer.getMissingProduct();
assertFalse(Hibernate.isInitialized(product));

String json = mapper.writeValueAsString(new HasUnwrapped<>(product));

assertTrue(Hibernate.isInitialized(product));
assertNotNull(json);
HasUnwrapped<Product> deserialized = mapper.readValue(json, new TypeReference<HasUnwrapped<Product>>(){});
assertTrue(deserialized != null);
assertTrue(deserialized.getContent() != null);
assertTrue(deserialized.getContent().getProductCode() != null);

} finally {
emf.close();
}
}
}