Skip to content
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

Jump to bottom

Removing proxy initializer. Closes #102 #112

Merged
merged 1 commit into from
Sep 25, 2013
Merged

Removing proxy initializer. Closes #102 #112

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
6 changes: 2 additions & 4 deletions ...tor-core/src/main/java/br/com/caelum/vraptor/restfulie/serialization/LinksSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

import java.io.Writer;

import br.com.caelum.vraptor.interceptor.TypeNameExtractor;
import br.com.caelum.vraptor.serialization.ProxyInitializer;
import br.com.caelum.vraptor.serialization.Serializer;
import br.com.caelum.vraptor.serialization.SerializerBuilder;
import br.com.caelum.vraptor.serialization.xstream.XStreamSerializer;
Expand All @@ -31,8 +29,8 @@ public class LinksSerializer implements SerializerBuilder {

private final XStreamSerializer serializer;

public LinksSerializer(XStream xstream, Writer writer, TypeNameExtractor extractor, ProxyInitializer initializer) {
this.serializer = new XStreamSerializer(xstream, writer, extractor, initializer);
public LinksSerializer(XStream xstream, Writer writer) {
serializer = new XStreamSerializer(xstream, writer);
}

public Serializer exclude(String... arg0) {
Expand Down
5 changes: 2 additions & 3 deletions ...ore/src/main/java/br/com/caelum/vraptor/restfulie/serialization/RestfulSerialization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import br.com.caelum.vraptor.config.Configuration;
import br.com.caelum.vraptor.interceptor.TypeNameExtractor;
import br.com.caelum.vraptor.restfulie.Restfulie;
import br.com.caelum.vraptor.serialization.ProxyInitializer;
import br.com.caelum.vraptor.serialization.xstream.XStreamBuilder;
import br.com.caelum.vraptor.serialization.xstream.XStreamXMLSerialization;

Expand All @@ -46,8 +45,8 @@ public class RestfulSerialization extends XStreamXMLSerialization {
public RestfulSerialization() {}

@Inject
public RestfulSerialization(HttpServletResponse response, TypeNameExtractor extractor, Restfulie restfulie, Configuration config, ProxyInitializer initializer, XStreamBuilder builder) {
super(response,extractor,initializer, builder);
public RestfulSerialization(HttpServletResponse response, TypeNameExtractor extractor, Restfulie restfulie, Configuration config, XStreamBuilder builder) {
super(response, builder);
this.restfulie = restfulie;
this.config = config;
}
Expand Down
5 changes: 2 additions & 3 deletions ...src/main/java/br/com/caelum/vraptor/restfulie/serialization/RestfulSerializationJSON.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import br.com.caelum.vraptor.config.Configuration;
import br.com.caelum.vraptor.interceptor.TypeNameExtractor;
import br.com.caelum.vraptor.restfulie.Restfulie;
import br.com.caelum.vraptor.serialization.ProxyInitializer;
import br.com.caelum.vraptor.serialization.xstream.XStreamBuilder;
import br.com.caelum.vraptor.serialization.xstream.XStreamJSONSerialization;

Expand All @@ -47,8 +46,8 @@ public class RestfulSerializationJSON extends XStreamJSONSerialization {
public RestfulSerializationJSON() {}

@Inject
public RestfulSerializationJSON(HttpServletResponse response, TypeNameExtractor extractor, Restfulie restfulie, Configuration config, ProxyInitializer initializer, XStreamBuilder builder) {
super(response,extractor,initializer, builder);
public RestfulSerializationJSON(HttpServletResponse response, TypeNameExtractor extractor, Restfulie restfulie, Configuration config, XStreamBuilder builder) {
super(response, extractor, builder);
this.restfulie = restfulie;
this.config = config;
}
Expand Down
41 changes: 0 additions & 41 deletions vraptor-core/src/main/java/br/com/caelum/vraptor/serialization/NullProxyInitializer.java
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions vraptor-core/src/main/java/br/com/caelum/vraptor/serialization/ProxyInitializer.java
View file
Open in desktop

This file was deleted.

9 changes: 3 additions & 6 deletions ...r-core/src/main/java/br/com/caelum/vraptor/serialization/gson/GsonJSONPSerialization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import br.com.caelum.vraptor.interceptor.TypeNameExtractor;
import br.com.caelum.vraptor.serialization.JSONPSerialization;
import br.com.caelum.vraptor.serialization.JSONSerialization;
import br.com.caelum.vraptor.serialization.ProxyInitializer;
import br.com.caelum.vraptor.serialization.Serializee;
import br.com.caelum.vraptor.serialization.SerializerBuilder;
import br.com.caelum.vraptor.view.ResultException;
Expand All @@ -37,26 +36,24 @@ public class GsonJSONPSerialization implements JSONPSerialization {

protected final HttpServletResponse response;
protected final TypeNameExtractor extractor;
protected final ProxyInitializer initializer;
protected final VRaptorGsonBuilder builder;
protected final Serializee serializee;

public GsonJSONPSerialization(HttpServletResponse response, TypeNameExtractor extractor,
ProxyInitializer initializer, VRaptorGsonBuilder builder, Serializee serializee) {
VRaptorGsonBuilder builder, Serializee serializee) {
this.response = response;
this.extractor = extractor;
this.initializer = initializer;
this.builder = builder;
this.serializee = serializee;
}

@Override
public JSONSerialization withCallback(final String callbackName) {
return new GsonJSONSerialization(response, extractor, initializer, builder, serializee) {
return new GsonJSONSerialization(response, extractor, builder, serializee) {
@Override
protected SerializerBuilder getSerializer() {
try {
return new GsonSerializer(builder, response.getWriter(), extractor, initializer, serializee) {
return new GsonSerializer(builder, response.getWriter(), extractor, serializee) {
@Override
public void serialize() {
try {
Expand Down
7 changes: 2 additions & 5 deletions ...or-core/src/main/java/br/com/caelum/vraptor/serialization/gson/GsonJSONSerialization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import br.com.caelum.vraptor.interceptor.TypeNameExtractor;
import br.com.caelum.vraptor.serialization.JSONSerialization;
import br.com.caelum.vraptor.serialization.NoRootSerialization;
import br.com.caelum.vraptor.serialization.ProxyInitializer;
import br.com.caelum.vraptor.serialization.Serializee;
import br.com.caelum.vraptor.serialization.Serializer;
import br.com.caelum.vraptor.serialization.SerializerBuilder;
Expand All @@ -39,15 +38,13 @@ public class GsonJSONSerialization implements JSONSerialization {

protected final HttpServletResponse response;
protected final TypeNameExtractor extractor;
protected final ProxyInitializer initializer;
protected final VRaptorGsonBuilder builder;
protected final Serializee serializee;

public GsonJSONSerialization(HttpServletResponse response, TypeNameExtractor extractor,
ProxyInitializer initializer, VRaptorGsonBuilder builder, Serializee serializee) {
VRaptorGsonBuilder builder, Serializee serializee) {
this.response = response;
this.extractor = extractor;
this.initializer = initializer;
this.builder = builder;
this.serializee = serializee;
}
Expand All @@ -67,7 +64,7 @@ public <T> Serializer from(T object, String alias) {

protected SerializerBuilder getSerializer() {
try {
return new GsonSerializer(builder, response.getWriter(), extractor, initializer, serializee);
return new GsonSerializer(builder, response.getWriter(), extractor, serializee);
} catch (IOException e) {
throw new ResultException("Unable to serialize data", e);
}
Expand Down
9 changes: 3 additions & 6 deletions vraptor-core/src/main/java/br/com/caelum/vraptor/serialization/gson/GsonSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

import br.com.caelum.vraptor.deserialization.gson.VRaptorGsonBuilder;
import br.com.caelum.vraptor.interceptor.TypeNameExtractor;
import br.com.caelum.vraptor.serialization.ProxyInitializer;
import br.com.caelum.vraptor.serialization.Serializee;
import br.com.caelum.vraptor.serialization.Serializer;
import br.com.caelum.vraptor.serialization.SerializerBuilder;
Expand All @@ -46,15 +45,13 @@ public class GsonSerializer implements SerializerBuilder {

private final Writer writer;
private final TypeNameExtractor extractor;
private final ProxyInitializer initializer;
private final Serializee serializee;
protected VRaptorGsonBuilder builder;

public GsonSerializer(VRaptorGsonBuilder builder, Writer writer, TypeNameExtractor extractor,
ProxyInitializer initializer, Serializee serializee) {
Serializee serializee) {
this.writer = writer;
this.extractor = extractor;
this.initializer = initializer;
this.builder = builder;
this.serializee = serializee;
}
Expand All @@ -74,7 +71,7 @@ public Serializer excludeAll() {
private void preConfigure(Object obj, String alias) {
checkNotNull(obj, "You can't serialize null objects");

serializee.setRootClass(initializer.getActualClass(obj));
serializee.setRootClass(obj.getClass());

if (alias == null) {
if (Collection.class.isInstance(obj) && (List.class.isInstance(obj))) {
Expand Down Expand Up @@ -122,7 +119,7 @@ private Set<Class<?>> findElementTypes(Collection<Object> list) {
Set<Class<?>> set = new HashSet<>();
for (Object element : list) {
if (element != null && !isPrimitive(element.getClass())) {
set.add(initializer.getActualClass(element));
set.add(element.getClass());
}
}
return set;
Expand Down
35 changes: 0 additions & 35 deletions vraptor-core/src/main/java/br/com/caelum/vraptor/serialization/xstream/ProxyConverter.java
View file
Open in desktop

This file was deleted.

9 changes: 3 additions & 6 deletions .../src/main/java/br/com/caelum/vraptor/serialization/xstream/XStreamJSONPSerialization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import br.com.caelum.vraptor.interceptor.TypeNameExtractor;
import br.com.caelum.vraptor.serialization.JSONPSerialization;
import br.com.caelum.vraptor.serialization.JSONSerialization;
import br.com.caelum.vraptor.serialization.ProxyInitializer;
import br.com.caelum.vraptor.serialization.SerializerBuilder;
import br.com.caelum.vraptor.view.ResultException;

Expand All @@ -45,28 +44,26 @@ public class XStreamJSONPSerialization implements JSONPSerialization {

private HttpServletResponse response;
private TypeNameExtractor extractor;
private ProxyInitializer initializer;
private XStreamBuilder builder;

@Deprecated // CDI eyes only
public XStreamJSONPSerialization() {}

@Inject
public XStreamJSONPSerialization(HttpServletResponse response, TypeNameExtractor extractor, ProxyInitializer initializer, XStreamBuilder builder) {
public XStreamJSONPSerialization(HttpServletResponse response, TypeNameExtractor extractor, XStreamBuilder builder) {
this.response = response;
this.extractor = extractor;
this.initializer = initializer;
this.builder = builder;
}

public JSONSerialization withCallback(final String callbackName) {
return new XStreamJSONSerialization(response, extractor, initializer, builder) {
return new XStreamJSONSerialization(response, extractor, builder) {
@Override
protected SerializerBuilder getSerializer() {
try {
final PrintWriter writer = response.getWriter();
final StringWriter out = new StringWriter();
return new XStreamSerializer(super.getXStream(), new PrintWriter(out), extractor, initializer) {
return new XStreamSerializer(super.getXStream(), new PrintWriter(out)) {
@Override
public void serialize() {
super.serialize();
Expand Down
7 changes: 2 additions & 5 deletions ...e/src/main/java/br/com/caelum/vraptor/serialization/xstream/XStreamJSONSerialization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import br.com.caelum.vraptor.interceptor.TypeNameExtractor;
import br.com.caelum.vraptor.serialization.JSONSerialization;
import br.com.caelum.vraptor.serialization.NoRootSerialization;
import br.com.caelum.vraptor.serialization.ProxyInitializer;
import br.com.caelum.vraptor.serialization.Serializer;
import br.com.caelum.vraptor.serialization.SerializerBuilder;
import br.com.caelum.vraptor.view.ResultException;
Expand All @@ -42,17 +41,15 @@ public class XStreamJSONSerialization implements JSONSerialization {

protected HttpServletResponse response;
protected TypeNameExtractor extractor;
protected ProxyInitializer initializer;
protected XStreamBuilder builder;

@Deprecated // CDI eyes only
public XStreamJSONSerialization() {}

@Inject
public XStreamJSONSerialization(HttpServletResponse response, TypeNameExtractor extractor, ProxyInitializer initializer, XStreamBuilder builder) {
public XStreamJSONSerialization(HttpServletResponse response, TypeNameExtractor extractor, XStreamBuilder builder) {
this.response = response;
this.extractor = extractor;
this.initializer = initializer;
this.builder = builder;
}

Expand All @@ -71,7 +68,7 @@ public <T> Serializer from(T object, String alias) {

protected SerializerBuilder getSerializer() {
try {
return new XStreamSerializer(getXStream(), response.getWriter(), extractor, initializer);
return new XStreamSerializer(getXStream(), response.getWriter());
} catch (IOException e) {
throw new ResultException("Unable to serialize data", e);
}
Expand Down
Loading