Added support for AtomicInteger, AtomicBoolean, AtomicLong and AtomicIntegerArray.
This commit is contained in:
parent
64107353a3
commit
7821b73202
@ -30,6 +30,10 @@ import java.util.Collections;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
import java.util.concurrent.atomic.AtomicIntegerArray;
|
||||||
|
import java.util.concurrent.atomic.AtomicLong;
|
||||||
|
|
||||||
import com.google.gson.internal.ConstructorConstructor;
|
import com.google.gson.internal.ConstructorConstructor;
|
||||||
import com.google.gson.internal.Excluder;
|
import com.google.gson.internal.Excluder;
|
||||||
@ -210,13 +214,17 @@ public final class Gson {
|
|||||||
factories.add(TypeAdapters.BOOLEAN_FACTORY);
|
factories.add(TypeAdapters.BOOLEAN_FACTORY);
|
||||||
factories.add(TypeAdapters.BYTE_FACTORY);
|
factories.add(TypeAdapters.BYTE_FACTORY);
|
||||||
factories.add(TypeAdapters.SHORT_FACTORY);
|
factories.add(TypeAdapters.SHORT_FACTORY);
|
||||||
factories.add(TypeAdapters.newFactory(long.class, Long.class,
|
TypeAdapter<Number> longAdapter = longAdapter(longSerializationPolicy);
|
||||||
longAdapter(longSerializationPolicy)));
|
factories.add(TypeAdapters.newFactory(long.class, Long.class, longAdapter));
|
||||||
factories.add(TypeAdapters.newFactory(double.class, Double.class,
|
factories.add(TypeAdapters.newFactory(double.class, Double.class,
|
||||||
doubleAdapter(serializeSpecialFloatingPointValues)));
|
doubleAdapter(serializeSpecialFloatingPointValues)));
|
||||||
factories.add(TypeAdapters.newFactory(float.class, Float.class,
|
factories.add(TypeAdapters.newFactory(float.class, Float.class,
|
||||||
floatAdapter(serializeSpecialFloatingPointValues)));
|
floatAdapter(serializeSpecialFloatingPointValues)));
|
||||||
factories.add(TypeAdapters.NUMBER_FACTORY);
|
factories.add(TypeAdapters.NUMBER_FACTORY);
|
||||||
|
factories.add(TypeAdapters.newFactory(AtomicInteger.class, TypeAdapters.ATOMIC_INTEGER));
|
||||||
|
factories.add(TypeAdapters.newFactory(AtomicBoolean.class, TypeAdapters.ATOMIC_BOOLEAN));
|
||||||
|
factories.add(TypeAdapters.newFactory(AtomicLong.class, atomicLongAdapter(longAdapter)));
|
||||||
|
factories.add(TypeAdapters.newFactory(AtomicIntegerArray.class, TypeAdapters.ATOMIC_INTEGER_ARRAY));
|
||||||
factories.add(TypeAdapters.CHARACTER_FACTORY);
|
factories.add(TypeAdapters.CHARACTER_FACTORY);
|
||||||
factories.add(TypeAdapters.STRING_BUILDER_FACTORY);
|
factories.add(TypeAdapters.STRING_BUILDER_FACTORY);
|
||||||
factories.add(TypeAdapters.STRING_BUFFER_FACTORY);
|
factories.add(TypeAdapters.STRING_BUFFER_FACTORY);
|
||||||
@ -325,6 +333,17 @@ public final class Gson {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private TypeAdapter<AtomicLong> atomicLongAdapter(final TypeAdapter<Number> longAdapter) {
|
||||||
|
return new TypeAdapter<AtomicLong>() {
|
||||||
|
@Override public void write(JsonWriter out, AtomicLong value) throws IOException {
|
||||||
|
longAdapter.write(out, value.get());
|
||||||
|
}
|
||||||
|
@Override public AtomicLong read(JsonReader in) throws IOException {
|
||||||
|
Number value = longAdapter.read(in);
|
||||||
|
return new AtomicLong(value.longValue());
|
||||||
|
}
|
||||||
|
}.nullSafe();
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* Returns the type adapter for {@code} type.
|
* Returns the type adapter for {@code} type.
|
||||||
*
|
*
|
||||||
|
@ -16,6 +16,29 @@
|
|||||||
|
|
||||||
package com.google.gson.internal.bind;
|
package com.google.gson.internal.bind;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.math.BigInteger;
|
||||||
|
import java.net.InetAddress;
|
||||||
|
import java.net.URI;
|
||||||
|
import java.net.URISyntaxException;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.sql.Timestamp;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.BitSet;
|
||||||
|
import java.util.Calendar;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.GregorianCalendar;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.StringTokenizer;
|
||||||
|
import java.util.UUID;
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
import java.util.concurrent.atomic.AtomicIntegerArray;
|
||||||
|
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.google.gson.JsonArray;
|
import com.google.gson.JsonArray;
|
||||||
import com.google.gson.JsonElement;
|
import com.google.gson.JsonElement;
|
||||||
@ -32,23 +55,6 @@ import com.google.gson.reflect.TypeToken;
|
|||||||
import com.google.gson.stream.JsonReader;
|
import com.google.gson.stream.JsonReader;
|
||||||
import com.google.gson.stream.JsonToken;
|
import com.google.gson.stream.JsonToken;
|
||||||
import com.google.gson.stream.JsonWriter;
|
import com.google.gson.stream.JsonWriter;
|
||||||
import java.io.IOException;
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.math.BigInteger;
|
|
||||||
import java.net.InetAddress;
|
|
||||||
import java.net.URI;
|
|
||||||
import java.net.URISyntaxException;
|
|
||||||
import java.net.URL;
|
|
||||||
import java.sql.Timestamp;
|
|
||||||
import java.util.BitSet;
|
|
||||||
import java.util.Calendar;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.GregorianCalendar;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Locale;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.StringTokenizer;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Type adapters for basic types.
|
* Type adapters for basic types.
|
||||||
@ -247,10 +253,60 @@ public final class TypeAdapters {
|
|||||||
out.value(value);
|
out.value(value);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
public static final TypeAdapterFactory INTEGER_FACTORY
|
public static final TypeAdapterFactory INTEGER_FACTORY
|
||||||
= newFactory(int.class, Integer.class, INTEGER);
|
= newFactory(int.class, Integer.class, INTEGER);
|
||||||
|
|
||||||
|
public static final TypeAdapter<AtomicInteger> ATOMIC_INTEGER = new TypeAdapter<AtomicInteger>() {
|
||||||
|
@Override public AtomicInteger read(JsonReader in) throws IOException {
|
||||||
|
try {
|
||||||
|
return new AtomicInteger(in.nextInt());
|
||||||
|
} catch (NumberFormatException e) {
|
||||||
|
throw new JsonSyntaxException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@Override public void write(JsonWriter out, AtomicInteger value) throws IOException {
|
||||||
|
out.value(value.get());
|
||||||
|
}
|
||||||
|
}.nullSafe();
|
||||||
|
|
||||||
|
public static final TypeAdapter<AtomicBoolean> ATOMIC_BOOLEAN = new TypeAdapter<AtomicBoolean>() {
|
||||||
|
@Override public AtomicBoolean read(JsonReader in) throws IOException {
|
||||||
|
return new AtomicBoolean(in.nextBoolean());
|
||||||
|
}
|
||||||
|
@Override public void write(JsonWriter out, AtomicBoolean value) throws IOException {
|
||||||
|
out.value(value.get());
|
||||||
|
}
|
||||||
|
}.nullSafe();
|
||||||
|
|
||||||
|
public static final TypeAdapter<AtomicIntegerArray> ATOMIC_INTEGER_ARRAY = new TypeAdapter<AtomicIntegerArray>() {
|
||||||
|
@Override public AtomicIntegerArray read(JsonReader in) throws IOException {
|
||||||
|
List<Integer> list = new ArrayList<Integer>();
|
||||||
|
in.beginArray();
|
||||||
|
while (in.hasNext()) {
|
||||||
|
try {
|
||||||
|
int integer = in.nextInt();
|
||||||
|
list.add(integer);
|
||||||
|
} catch (NumberFormatException e) {
|
||||||
|
throw new JsonSyntaxException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
in.endArray();
|
||||||
|
int length = list.size();
|
||||||
|
AtomicIntegerArray array = new AtomicIntegerArray(length);
|
||||||
|
for (int i = 0; i < length; ++i) {
|
||||||
|
array.set(i, list.get(i));
|
||||||
|
}
|
||||||
|
return array;
|
||||||
|
}
|
||||||
|
@Override public void write(JsonWriter out, AtomicIntegerArray value) throws IOException {
|
||||||
|
out.beginArray();
|
||||||
|
for (int i = 0, length = value.length(); i < length; i++) {
|
||||||
|
out.value(value.get(i));
|
||||||
|
}
|
||||||
|
out.endArray();
|
||||||
|
}
|
||||||
|
}.nullSafe();
|
||||||
|
|
||||||
public static final TypeAdapter<Number> LONG = new TypeAdapter<Number>() {
|
public static final TypeAdapter<Number> LONG = new TypeAdapter<Number>() {
|
||||||
@Override
|
@Override
|
||||||
public Number read(JsonReader in) throws IOException {
|
public Number read(JsonReader in) throws IOException {
|
||||||
|
@ -0,0 +1,70 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2015 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.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
import java.util.concurrent.atomic.AtomicIntegerArray;
|
||||||
|
import java.util.concurrent.atomic.AtomicLong;
|
||||||
|
|
||||||
|
import com.google.gson.Gson;
|
||||||
|
|
||||||
|
import junit.framework.TestCase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Functional test for Json serialization and deserialization for java.util.concurrent.locks classes
|
||||||
|
*/
|
||||||
|
public class JavaUtilConcurrentLocksTest extends TestCase {
|
||||||
|
private Gson gson;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void setUp() throws Exception {
|
||||||
|
super.setUp();
|
||||||
|
gson = new Gson();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testAtomicBoolean() throws Exception {
|
||||||
|
AtomicBoolean target = gson.fromJson("true", AtomicBoolean.class);
|
||||||
|
assertTrue(target.get());
|
||||||
|
String json = gson.toJson(target);
|
||||||
|
assertEquals("true", json);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testAtomicInteger() throws Exception {
|
||||||
|
AtomicInteger target = gson.fromJson("10", AtomicInteger.class);
|
||||||
|
assertEquals(10, target.get());
|
||||||
|
String json = gson.toJson(target);
|
||||||
|
assertEquals("10", json);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testAtomicLong() throws Exception {
|
||||||
|
AtomicLong target = gson.fromJson("10", AtomicLong.class);
|
||||||
|
assertEquals(10, target.get());
|
||||||
|
String json = gson.toJson(target);
|
||||||
|
assertEquals("10", json);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testAtomicIntegerArray() throws Exception {
|
||||||
|
AtomicIntegerArray target = gson.fromJson("[10, 13, 14]", AtomicIntegerArray.class);
|
||||||
|
assertEquals(3, target.length());
|
||||||
|
assertEquals(10, target.get(0));
|
||||||
|
assertEquals(13, target.get(1));
|
||||||
|
assertEquals(14, target.get(2));
|
||||||
|
String json = gson.toJson(target);
|
||||||
|
assertEquals("[10,13,14]", json);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user