Hide Gson.getNextAdapter() for the current release.
This commit is contained in:
parent
4057b98bab
commit
ecdf9150f6
@ -20,6 +20,7 @@ import com.google.gson.Gson;
|
|||||||
import com.google.gson.JsonElement;
|
import com.google.gson.JsonElement;
|
||||||
import com.google.gson.TypeAdapter;
|
import com.google.gson.TypeAdapter;
|
||||||
import com.google.gson.TypeAdapterFactory;
|
import com.google.gson.TypeAdapterFactory;
|
||||||
|
import com.google.gson.internal.GsonInternalAccess;
|
||||||
import com.google.gson.internal.bind.JsonTreeReader;
|
import com.google.gson.internal.bind.JsonTreeReader;
|
||||||
import com.google.gson.reflect.TypeToken;
|
import com.google.gson.reflect.TypeToken;
|
||||||
import com.google.gson.stream.JsonReader;
|
import com.google.gson.stream.JsonReader;
|
||||||
@ -58,7 +59,7 @@ public final class GraphTypeAdapterFactory implements TypeAdapterFactory {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
final TypeAdapter<T> typeAdapter = gson.getNextAdapter(this, type);
|
final TypeAdapter<T> typeAdapter = GsonInternalAccess.INSTANCE.getNextAdapter(gson, this, type);
|
||||||
final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
|
final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
|
||||||
return new TypeAdapter<T>() {
|
return new TypeAdapter<T>() {
|
||||||
@Override public void write(JsonWriter out, T value) throws IOException {
|
@Override public void write(JsonWriter out, T value) throws IOException {
|
||||||
|
@ -24,6 +24,7 @@ import com.google.gson.JsonParseException;
|
|||||||
import com.google.gson.JsonPrimitive;
|
import com.google.gson.JsonPrimitive;
|
||||||
import com.google.gson.TypeAdapter;
|
import com.google.gson.TypeAdapter;
|
||||||
import com.google.gson.TypeAdapterFactory;
|
import com.google.gson.TypeAdapterFactory;
|
||||||
|
import com.google.gson.internal.GsonInternalAccess;
|
||||||
import com.google.gson.internal.Streams;
|
import com.google.gson.internal.Streams;
|
||||||
import com.google.gson.internal.bind.JsonTreeWriter;
|
import com.google.gson.internal.bind.JsonTreeWriter;
|
||||||
import com.google.gson.internal.bind.JsonTreeReader;
|
import com.google.gson.internal.bind.JsonTreeReader;
|
||||||
@ -193,7 +194,8 @@ public final class RuntimeTypeAdapterFactory<T> implements TypeAdapterFactory {
|
|||||||
final Map<Class<?>, TypeAdapter<?>> subtypeToDelegate
|
final Map<Class<?>, TypeAdapter<?>> subtypeToDelegate
|
||||||
= new LinkedHashMap<Class<?>, TypeAdapter<?>>();
|
= new LinkedHashMap<Class<?>, TypeAdapter<?>>();
|
||||||
for (Map.Entry<String, Class<?>> entry : labelToSubtype.entrySet()) {
|
for (Map.Entry<String, Class<?>> entry : labelToSubtype.entrySet()) {
|
||||||
TypeAdapter<?> delegate = gson.getNextAdapter(this, TypeToken.get(entry.getValue()));
|
TypeAdapter<?> delegate = GsonInternalAccess.INSTANCE
|
||||||
|
.getNextAdapter(gson, this, TypeToken.get(entry.getValue()));
|
||||||
labelToDelegate.put(entry.getKey(), delegate);
|
labelToDelegate.put(entry.getKey(), delegate);
|
||||||
subtypeToDelegate.put(entry.getValue(), delegate);
|
subtypeToDelegate.put(entry.getValue(), delegate);
|
||||||
}
|
}
|
||||||
|
@ -18,6 +18,7 @@ package com.google.gson;
|
|||||||
|
|
||||||
import com.google.gson.internal.ConstructorConstructor;
|
import com.google.gson.internal.ConstructorConstructor;
|
||||||
import com.google.gson.internal.Excluder;
|
import com.google.gson.internal.Excluder;
|
||||||
|
import com.google.gson.internal.GsonInternalAccess;
|
||||||
import com.google.gson.internal.Primitives;
|
import com.google.gson.internal.Primitives;
|
||||||
import com.google.gson.internal.Streams;
|
import com.google.gson.internal.Streams;
|
||||||
import com.google.gson.internal.bind.ArrayTypeAdapter;
|
import com.google.gson.internal.bind.ArrayTypeAdapter;
|
||||||
@ -362,32 +363,29 @@ public final class Gson {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
static {
|
||||||
* Returns a type adapter for {@code} type that isn't {@code skipPast}. This
|
GsonInternalAccess.INSTANCE = new GsonInternalAccess() {
|
||||||
* can be used for type adapters to compose other, simpler type adapters.
|
@Override public <T> TypeAdapter<T> getNextAdapter(
|
||||||
*
|
Gson gson, TypeAdapterFactory skipPast, TypeToken<T> type) {
|
||||||
* @throws IllegalArgumentException if this GSON cannot serialize and
|
boolean skipPastFound = false;
|
||||||
* deserialize {@code type}.
|
|
||||||
* @since 2.1
|
|
||||||
*/
|
|
||||||
public <T> TypeAdapter<T> getNextAdapter(TypeAdapterFactory skipPast, TypeToken<T> type) {
|
|
||||||
boolean skipPastFound = false;
|
|
||||||
|
|
||||||
for (TypeAdapterFactory factory : factories) {
|
for (TypeAdapterFactory factory : gson.factories) {
|
||||||
if (!skipPastFound) {
|
if (!skipPastFound) {
|
||||||
if (factory == skipPast) {
|
if (factory == skipPast) {
|
||||||
skipPastFound = true;
|
skipPastFound = true;
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
TypeAdapter<T> candidate = factory.create(gson, type);
|
||||||
|
if (candidate != null) {
|
||||||
|
return candidate;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
TypeAdapter<T> candidate = factory.create(this, type);
|
throw new IllegalArgumentException("GSON cannot serialize " + type);
|
||||||
if (candidate != null) {
|
|
||||||
return candidate;
|
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
throw new IllegalArgumentException("GSON cannot serialize " + type);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
package com.google.gson;
|
package com.google.gson;
|
||||||
|
|
||||||
import com.google.gson.internal.$Gson$Preconditions;
|
import com.google.gson.internal.$Gson$Preconditions;
|
||||||
|
import com.google.gson.internal.GsonInternalAccess;
|
||||||
import com.google.gson.internal.Streams;
|
import com.google.gson.internal.Streams;
|
||||||
import com.google.gson.reflect.TypeToken;
|
import com.google.gson.reflect.TypeToken;
|
||||||
import com.google.gson.stream.JsonReader;
|
import com.google.gson.stream.JsonReader;
|
||||||
@ -75,7 +76,7 @@ final class TreeTypeAdapter<T> extends TypeAdapter<T> {
|
|||||||
TypeAdapter<T> d = delegate;
|
TypeAdapter<T> d = delegate;
|
||||||
return d != null
|
return d != null
|
||||||
? d
|
? d
|
||||||
: (delegate = gson.getNextAdapter(skipPast, typeToken));
|
: (delegate = GsonInternalAccess.INSTANCE.getNextAdapter(gson, skipPast, typeToken));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -68,7 +68,7 @@ import java.io.Writer;
|
|||||||
* nextLong()}, {@code nextString()} or {@code nextNull()}. Writers should make
|
* nextLong()}, {@code nextString()} or {@code nextNull()}. Writers should make
|
||||||
* exactly one call to one of <code>value()</code> or <code>nullValue()</code>.
|
* exactly one call to one of <code>value()</code> or <code>nullValue()</code>.
|
||||||
* For arrays, type adapters should start with a call to {@code beginArray()},
|
* For arrays, type adapters should start with a call to {@code beginArray()},
|
||||||
* convert all elements, and finish with a call to {@code endArray}. For
|
* convert all elements, and finish with a call to {@code endArray()}. For
|
||||||
* objects, they should start with {@code beginObject()}, convert the object,
|
* objects, they should start with {@code beginObject()}, convert the object,
|
||||||
* and finish with {@code endObject()}. Failing to convert a value or converting
|
* and finish with {@code endObject()}. Failing to convert a value or converting
|
||||||
* too many values may cause the application to crash.
|
* too many values may cause the application to crash.
|
||||||
|
@ -141,7 +141,7 @@ public final class Excluder implements TypeAdapterFactory, Cloneable {
|
|||||||
TypeAdapter<T> d = delegate;
|
TypeAdapter<T> d = delegate;
|
||||||
return d != null
|
return d != null
|
||||||
? d
|
? d
|
||||||
: (delegate = gson.getNextAdapter(Excluder.this, type));
|
: (delegate = GsonInternalAccess.INSTANCE.getNextAdapter(gson, Excluder.this, type));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,39 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2011 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;
|
||||||
|
|
||||||
|
import com.google.gson.Gson;
|
||||||
|
import com.google.gson.TypeAdapter;
|
||||||
|
import com.google.gson.TypeAdapterFactory;
|
||||||
|
import com.google.gson.reflect.TypeToken;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Internal-only APIs of Gson available only to other classes in Gson.
|
||||||
|
*/
|
||||||
|
public abstract class GsonInternalAccess {
|
||||||
|
public static GsonInternalAccess INSTANCE;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a type adapter for {@code} type that isn't {@code skipPast}. This
|
||||||
|
* can be used for type adapters to compose other, simpler type adapters.
|
||||||
|
*
|
||||||
|
* @throws IllegalArgumentException if this GSON cannot serialize and
|
||||||
|
* deserialize {@code type}.
|
||||||
|
*/
|
||||||
|
public abstract <T> TypeAdapter<T> getNextAdapter(
|
||||||
|
Gson gson, TypeAdapterFactory skipPast, TypeToken<T> type);
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user