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

fixed extras build

Browse Source
This commit is contained in:
Inderjeet Singh 2014-12-04 22:07:13 +00:00
parent 33e74101e5
commit 1d9e86e27c
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
extras/pom.xml
View File

@ -9,7 +9,7 @@
<parent> <parent>
<groupId>org.sonatype.oss</groupId> <groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId> <artifactId>oss-parent</artifactId>
<version>7</version> <version>9</version>
</parent> </parent>
<url>http://code.google.com/p/google-gson/</url> <url>http://code.google.com/p/google-gson/</url>
<description>Google Gson grab bag of utilities, type adapters, etc.</description> <description>Google Gson grab bag of utilities, type adapters, etc.</description>
@ -40,7 +40,7 @@
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>2.2.3-SNAPSHOT</version> <version>2.3.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -65,7 +65,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId> <artifactId>maven-gpg-plugin</artifactId>
<version>1.4</version> <version>1.5</version>
<executions> <executions>
<execution> <execution>
<id>sign-artifacts</id> <id>sign-artifacts</id>
@ -86,7 +86,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version> <version>3.2</version>
<configuration> <configuration>
<source>1.5</source> <source>1.5</source>
<target>1.5</target> <target>1.5</target>
@ -95,7 +95,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.4</version> <version>2.5</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@ -113,7 +113,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version> <version>2.4</version>
<executions> <executions>
<execution> <execution>
<id>attach-sources</id> <id>attach-sources</id>
@ -127,7 +127,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.8.1</version> <version>2.10.1</version>
<executions> <executions>
<execution> <execution>
<id>attach-javadocs</id> <id>attach-javadocs</id>
@ -173,7 +173,6 @@
<developers> <developers>
<developer> <developer>
<name>Inderjeet Singh</name> <name>Inderjeet Singh</name>
<organization>Trymph Inc.</organization>
</developer> </developer>
<developer> <developer>
<name>Joel Leitch</name> <name>Joel Leitch</name>

9
extras/src/main/java/com/google/gson/graph/GraphAdapterBuilder.java
View File

@ -42,10 +42,13 @@ import java.util.Queue;
// TODO: proper documentation // TODO: proper documentation
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public final class GraphAdapterBuilder { public final class GraphAdapterBuilder {
private final ConstructorConstructor constructorConstructor = new ConstructorConstructor(); private final Map<Type, InstanceCreator<?>> instanceCreators;
private final Map<Type, InstanceCreator<?>> instanceCreators private final ConstructorConstructor constructorConstructor;
= new HashMap<Type, InstanceCreator<?>>();
public GraphAdapterBuilder() {
this.instanceCreators = new HashMap<Type, InstanceCreator<?>>();
this.constructorConstructor = new ConstructorConstructor(instanceCreators);
}
public GraphAdapterBuilder addType(Type type) { public GraphAdapterBuilder addType(Type type) {
final ObjectConstructor<?> objectConstructor = constructorConstructor.get(TypeToken.get(type)); final ObjectConstructor<?> objectConstructor = constructorConstructor.get(TypeToken.get(type));
InstanceCreator<Object> instanceCreator = new InstanceCreator<Object>() { InstanceCreator<Object> instanceCreator = new InstanceCreator<Object>() {

1
gson/pom.xml
View File

@ -232,7 +232,6 @@
<developers> <developers>
<developer> <developer>
<name>Inderjeet Singh</name> <name>Inderjeet Singh</name>
<organization>Trymph Inc.</organization>
</developer> </developer>
<developer> <developer>
<name>Joel Leitch</name> <name>Joel Leitch</name>