Johannes/gson-comments
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

deleted support for the magic GSON_TYPE_ADAPTER field

Browse Source
This commit is contained in:
Inderjeet Singh 2014-03-09 07:30:37 +00:00
parent bf549f0589
commit b9998e511f
3 changed files with 0 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gson/src/main/java/com/google/gson/Gson.java
View File

@ -23,7 +23,6 @@ import com.google.gson.internal.Streams;
import com.google.gson.internal.bind.ArrayTypeAdapter;
import com.google.gson.internal.bind.CollectionTypeAdapterFactory;
import com.google.gson.internal.bind.DateTypeAdapter;
import com.google.gson.internal.bind.FieldTypeAdapterFactory;
import com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory;
import com.google.gson.internal.bind.JsonTreeReader;
import com.google.gson.internal.bind.JsonTreeWriter;
@ -240,7 +239,6 @@ public final class Gson {
factories.add(new CollectionTypeAdapterFactory(constructorConstructor));
factories.add(new MapTypeAdapterFactory(constructorConstructor, complexMapKeySerialization));
factories.add(new JsonAdapterAnnotationTypeAdapterFactory(constructorConstructor));
factories.add(new FieldTypeAdapterFactory());
factories.add(new ReflectiveTypeAdapterFactory(
constructorConstructor, fieldNamingPolicy, excluder));

60
gson/src/main/java/com/google/gson/internal/bind/FieldTypeAdapterFactory.java
View File

@ -1,60 +0,0 @@
/*
* Copyright (C) 2014 Google Inc.
*
* 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 com.google.gson.internal.bind;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import com.google.gson.Gson;
import com.google.gson.TypeAdapter;
import com.google.gson.TypeAdapterFactory;
import com.google.gson.internal.$Gson$Types;
import com.google.gson.reflect.TypeToken;
/**
* Given a type T, looks for the magic static field named GSON_TYPE_ADAPTER of type
* TypeAdapter<T> and uses it as the default type adapter.
*
* @since 2.3
*/
public final class FieldTypeAdapterFactory implements TypeAdapterFactory {
private static final String FIELD_ADAPTER_NAME = "GSON_TYPE_ADAPTER";
@SuppressWarnings({ "rawtypes", "unchecked" })
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> targetType) {
Class<? super T> clazz = targetType.getRawType();
try {
Field typeAdapterField = clazz.getDeclaredField(FIELD_ADAPTER_NAME);
typeAdapterField.setAccessible(true);
if (!Modifier.isStatic(typeAdapterField.getModifiers())) return null;
Object fieldAdapterValue = typeAdapterField.get(null);
if (fieldAdapterValue != null && fieldAdapterValue instanceof TypeAdapter) {
// We know that the GSON_TYPE_ADAPTER field is of type TypeAdapter.
// However, we need to assert that its type variable TypeAdapter<TypeVariable> matches
// the target type
Type fieldTypeVariable = $Gson$Types.getFirstTypeArgument(typeAdapterField.getGenericType());
if (targetType.getType().equals(fieldTypeVariable)) {
return (TypeAdapter) fieldAdapterValue;
}
}
} catch (Exception e) { // ignore1
}
return null;
}
}

188
gson/src/test/java/com/google/gson/functional/GsonFieldTypeAdapterTest.java
View File

@ -1,188 +0,0 @@
/*
* Copyright (C) 2014 Google Inc.
*
* 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 com.google.gson.functional;
import java.io.IOException;
import java.lang.reflect.Type;
import junit.framework.TestCase;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import com.google.gson.TypeAdapter;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
/**
* Functional tests for the magic field GSON_TYPE_ADAPTER present in a class.
*/
@SuppressWarnings("unused")
public final class GsonFieldTypeAdapterTest extends TestCase {
public void testFieldAdapterInvoked() {
String json = new Gson().toJson(new ClassWithFieldAdapter("bar"));
assertEquals("\"fieldAdapter\"", json);
}
public void testRegisteredAdapterOverridesFieldAdapter() {
TypeAdapter<ClassWithFieldAdapter> typeAdapter = new TypeAdapter<ClassWithFieldAdapter>() {
@Override public void write(JsonWriter out, ClassWithFieldAdapter value) throws IOException {
out.value("registeredAdapter");
}
@Override public ClassWithFieldAdapter read(JsonReader in) throws IOException {
return new ClassWithFieldAdapter(in.nextString());
}
};
Gson gson = new GsonBuilder()
.registerTypeAdapter(ClassWithFieldAdapter.class, typeAdapter)
.create();
String json = gson.toJson(new ClassWithFieldAdapter("abcd"));
assertEquals("\"registeredAdapter\"", json);
}
/**
* The serializer overrides field adapter, but for deserializer the fieldAdapter is used.
*/
public void testRegisteredSerializerOverridesFieldAdapter() {
JsonSerializer<ClassWithFieldAdapter> serializer = new JsonSerializer<ClassWithFieldAdapter>() {
public JsonElement serialize(ClassWithFieldAdapter src, Type typeOfSrc,
JsonSerializationContext context) {
return new JsonPrimitive("registeredSerializer");
}
};
Gson gson = new GsonBuilder()
.registerTypeAdapter(ClassWithFieldAdapter.class, serializer)
.create();
String json = gson.toJson(new ClassWithFieldAdapter("abcd"));
assertEquals("\"registeredSerializer\"", json);
ClassWithFieldAdapter target = gson.fromJson("abcd", ClassWithFieldAdapter.class);
assertEquals("fieldAdapter", target.value);
}
/**
* The deserializer overrides field adapter, but for serializer the fieldAdapter is used.
*/
public void testRegisteredDeserializerOverridesFieldAdapter() {
JsonDeserializer<ClassWithFieldAdapter> deserializer = new JsonDeserializer<ClassWithFieldAdapter>() {
public ClassWithFieldAdapter deserialize(JsonElement json, Type typeOfT,
JsonDeserializationContext context) throws JsonParseException {
return new ClassWithFieldAdapter("registeredDeserializer");
}
};
Gson gson = new GsonBuilder()
.registerTypeAdapter(ClassWithFieldAdapter.class, deserializer)
.create();
String json = gson.toJson(new ClassWithFieldAdapter("abcd"));
assertEquals("\"fieldAdapter\"", json);
ClassWithFieldAdapter target = gson.fromJson("abcd", ClassWithFieldAdapter.class);
assertEquals("registeredDeserializer", target.value);
}
public void testFieldAdapterNotInvokedIfNull() {
String json = new Gson().toJson(new ClassWithNullFieldAdapter("bar"));
assertEquals("{\"value\":\"bar\"}", json);
}
public void testNonStaticFieldAdapterNotInvoked() {
String json = new Gson().toJson(new ClassWithNonStaticFieldAdapter("bar"));
assertFalse(json.contains("fieldAdapter"));
}
public void testIncorrectTypeAdapterNotInvoked() {
String json = new Gson().toJson(new ClassWithIncorrectFieldAdapter("bar"));
assertFalse(json.contains("fieldAdapter"));
}
public void testSuperclassTypeAdapterNotInvoked() {
String json = new Gson().toJson(new ClassWithSuperClassFieldAdapter("bar"));
assertFalse(json.contains("fieldAdapter"));
}
private static class ClassWithFieldAdapter {
final String value;
ClassWithFieldAdapter(String value) {
this.value = value;
}
private static final TypeAdapter<ClassWithFieldAdapter> GSON_TYPE_ADAPTER =
new TypeAdapter<GsonFieldTypeAdapterTest.ClassWithFieldAdapter>() {
@Override public void write(JsonWriter out, ClassWithFieldAdapter value) throws IOException {
out.value("fieldAdapter");
}
@Override public ClassWithFieldAdapter read(JsonReader in) throws IOException {
in.nextString();
return new ClassWithFieldAdapter("fieldAdapter");
}
};
}
private static final class ClassWithSuperClassFieldAdapter extends ClassWithFieldAdapter {
ClassWithSuperClassFieldAdapter(String value) {
super(value);
}
}
private static final class ClassWithNullFieldAdapter {
final String value;
ClassWithNullFieldAdapter(String value) {
this.value = value;
}
private static final TypeAdapter<ClassWithFieldAdapter> GSON_TYPE_ADAPTER = null;
}
private static final class ClassWithNonStaticFieldAdapter {
final String value;
ClassWithNonStaticFieldAdapter(String value) {
this.value = value;
}
private final TypeAdapter<ClassWithNonStaticFieldAdapter> GSON_TYPE_ADAPTER =
new TypeAdapter<ClassWithNonStaticFieldAdapter>() {
@Override public void write(JsonWriter out, ClassWithNonStaticFieldAdapter value) throws IOException {
out.value("fieldAdapter");
}
@Override public ClassWithNonStaticFieldAdapter read(JsonReader in) throws IOException {
in.nextString();
return new ClassWithNonStaticFieldAdapter("fieldAdapter");
}
};
}
private static final class ClassWithIncorrectFieldAdapter {
final String value;
ClassWithIncorrectFieldAdapter(String value) {
this.value = value;
}
// Note that the type is NOT TypeAdapter<ClassWithIncorrectFieldAdapter> so this
// field should be ignored.
private static final TypeAdapter<ClassWithFieldAdapter> GSON_TYPE_ADAPTER =
new TypeAdapter<GsonFieldTypeAdapterTest.ClassWithFieldAdapter>() {
@Override public void write(JsonWriter out, ClassWithFieldAdapter value) throws IOException {
out.value("fieldAdapter");
}
@Override public ClassWithFieldAdapter read(JsonReader in) throws IOException {
in.nextString();
return new ClassWithFieldAdapter("fieldAdapter");
}
};
}
}