Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 797: moved JsonLiteral out of the gson package hierarchy as it is unnecessarily there

This commit is contained in:
Adrian Cole 2012-01-01 16:30:26 -08:00
parent ef7b91bfea
commit 8b492a63e3
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/com/google/gson/internal/Streams.java
View File

@ -18,7 +18,6 @@ package com.google.gson.internal;
import com.google.gson.JsonElement;
import com.google.gson.JsonIOException;
import com.google.gson.JsonLiteral;
import com.google.gson.JsonNull;
import com.google.gson.JsonParseException;
import com.google.gson.JsonSyntaxException;
@ -30,6 +29,8 @@ import java.io.EOFException;
import java.io.IOException;
import java.io.Writer;
import org.jclouds.json.internal.JsonLiteral;
/**
* Reads and writes GSON parse trees over streams.
*/

3
core/src/main/java/com/google/gson/stream/JsonWriter.java
View File

@ -22,7 +22,8 @@ import java.io.Writer;
import java.util.ArrayList;
import java.util.List;
import com.google.gson.JsonLiteral;
import org.jclouds.json.internal.JsonLiteral;
/**
* Writes a JSON (<a href="http://www.ietf.org/rfc/rfc4627.txt">RFC 4627</a>)

2
core/src/main/java/org/jclouds/json/config/GsonModule.java
View File

@ -36,6 +36,7 @@ import org.jclouds.domain.JsonBall;
import org.jclouds.json.Json;
import org.jclouds.json.internal.EnumTypeAdapterThatReturnsFromValue;
import org.jclouds.json.internal.GsonWrapper;
import org.jclouds.json.internal.JsonLiteral;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMap.Builder;
@ -46,7 +47,6 @@ import com.google.gson.GsonBuilder;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonLiteral;
import com.google.gson.JsonParseException;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;

6
core/src/main/java/com/google/gson/JsonLiteral.java → core/src/main/java/org/jclouds/json/internal/JsonLiteral.java
View File

@ -16,13 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.google.gson;
package org.jclouds.json.internal;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.gson.JsonElement;
/**
* The gson project use package to control access to their objects. However, this prevents us from
* doing valid work, like controling the json emitted on a per-object basis. This is here to afford
* doing valid work, like controlling the json emitted on a per-object basis. This is here to afford
* us to do this.
*
* @author Adrian Cole