returned back tests in fixture module

resurrected almost all tests, some were irrelevant and removed some may be resurrected later
immutables · Feb 13, 2015 · 2f14f43 · 2f14f43
1 parent b6ef9a6
commit 2f14f43
Show file tree

Hide file tree

Showing 47 changed files with 217 additions and 1,047 deletions.
diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@
     <module>value-ordinal</module>
     <module>value-processor</module>
     <module>value-standalone</module>
-    <!-- <module>value-fixture</module> -->
+    <module>value-fixture</module>
     <module>gson</module>
     <module>mongo</module>
   </modules>

diff --git a/value-fixture/pom.xml b/value-fixture/pom.xml
@@ -16,11 +16,6 @@
   </description>
 
   <dependencies>
-<!--<dependency>
-      <groupId>org.immutables</groupId>
-      <artifactId>common</artifactId>
-      <version>${project.version}</version>
-    </dependency> -->
     <dependency>
       <groupId>org.immutables.dependency</groupId>
       <artifactId>technology</artifactId>
@@ -42,6 +37,16 @@
       <artifactId>value-ordinal</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.immutables</groupId>
+      <artifactId>immutables-gson</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.immutables</groupId>
+      <artifactId>immutables-mongo</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.immutables</groupId>
       <artifactId>testing</artifactId>

diff --git a/value-fixture/src/InDefaultPackage.java b/value-fixture/src/InDefaultPackage.java
@@ -17,6 +17,7 @@
 
 @Value.Immutable
 interface InDefaultPackage {
+  int attr();
   @Value.Immutable
   static class ButNested {}
 }
diff --git a/value-fixture/src/META-INF/services/org.glassfish.hk2.extension.ServiceLocatorGenerator b/value-fixture/src/META-INF/services/org.glassfish.hk2.extension.ServiceLocatorGenerator
diff --git a/value-fixture/src/org/immutables/fixture/HasNullable.java b/value-fixture/src/org/immutables/fixture/HasNullable.java
@@ -15,16 +15,15 @@
  */
 package org.immutables.fixture;
 
-import org.immutables.value.ext.Json;
+import org.immutables.gson.Gson;
 import org.immutables.value.Value;
 import javax.annotation.Nullable;
 
 @Value.Immutable(singleton = true)
-@Json.Marshaled
+@Gson.TypeAdapters
 public abstract class HasNullable {
   @Nullable
   @Value.Parameter
-  @Json.ForceEmpty
   public abstract Integer in();
 
   @Nullable

diff --git a/value-fixture/src/org/immutables/fixture/HasTypeAnnotation.java b/value-fixture/src/org/immutables/fixture/HasTypeAnnotation.java
@@ -19,7 +19,7 @@
 import java.lang.annotation.Target;
 import java.util.Map;
 import javax.annotation.Nullable;
-import org.immutables.value.ext.Json;
+import org.immutables.gson.Gson;
 import org.immutables.value.Value;
 
 @Target(ElementType.TYPE_USE)
@@ -28,8 +28,8 @@
 @Target(ElementType.TYPE_USE)
 @interface TypeB {}
 
-@Value.Immutable
+//FIXME @Value.Immutable
-@Json.Marshaled
+//FIXME @Gson.TypeAdapters
 public abstract class HasTypeAnnotation {
   @Nullable
   public abstract @TypeA @TypeB String str();

diff --git a/value-fixture/src/org/immutables/fixture/JsonIgnore.java b/value-fixture/src/org/immutables/fixture/JsonIgnore.java
@@ -16,15 +16,15 @@
 package org.immutables.fixture;
 
 import java.util.List;
+import org.immutables.gson.Gson;
 import org.immutables.value.Value;
-import org.immutables.value.ext.Json;
 
 @Value.Immutable
-@Json.Marshaled
+@Gson.TypeAdapters
 public interface JsonIgnore {
   @Value.Parameter
   int value();
 
-  @Json.Ignore
+  @Gson.Ignore
   List<Integer> values();
 }
diff --git a/value-fixture/src/org/immutables/fixture/PrimitiveDefault.java b/value-fixture/src/org/immutables/fixture/PrimitiveDefault.java
@@ -15,11 +15,9 @@
  */
 package org.immutables.fixture;
 
-import org.immutables.value.Value.Style.ImplementationVisibility;
 import org.immutables.value.Value;
 
 @Value.Immutable
-@Value.Style(visibility = ImplementationVisibility.PACKAGE)
 public abstract class PrimitiveDefault {
   @Value.Default
   public boolean def() {

diff --git a/value-fixture/src/org/immutables/fixture/SillyAbstract.java b/value-fixture/src/org/immutables/fixture/SillyAbstract.java
@@ -15,9 +15,9 @@
  */
 package org.immutables.fixture;
 
-import org.immutables.value.ext.Json;
+import org.immutables.gson.Gson;
 
-@Json.Subclasses({
+@Gson.ExpectedSubtypes({
     SillySub1.class,
     SillySub2.class
 })

diff --git a/value-fixture/src/org/immutables/fixture/SillyDumb.java b/value-fixture/src/org/immutables/fixture/SillyDumb.java
@@ -17,24 +17,22 @@
 
 import com.google.common.base.Optional;
 import java.util.List;
-import org.immutables.value.ext.Json;
+import org.immutables.gson.Gson;
 import org.immutables.value.Value;
 
 @Value.Immutable
-@Json.Marshaled
+@Gson.TypeAdapters
 public abstract class SillyDumb {
 
-  @Json.Named("a")
+  @Gson.Named("a")
-  @Json.ForceEmpty
   public abstract Optional<Integer> a1();
 
-  @Json.Named("b")
+  @Gson.Named("b")
-  @Json.ForceEmpty
   public abstract List<String> b2();
 
-  @Json.Named("c")
+  @Gson.Named("c")
   public abstract Optional<Integer> c3();
 
-  @Json.Named("d")
+  @Gson.Named("d")
   public abstract List<String> d4();
 }
diff --git a/value-fixture/src/org/immutables/fixture/SillyEntity.java b/value-fixture/src/org/immutables/fixture/SillyEntity.java
@@ -15,56 +15,31 @@
  */
 package org.immutables.fixture;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
 import com.google.common.primitives.UnsignedInteger;
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nullable;
+import org.immutables.gson.Gson;
-import org.immutables.value.ext.Json;
+import org.immutables.mongo.Mongo;
-import org.immutables.value.ext.Mongo;
 import org.immutables.value.Value;
 
 @Value.Immutable
-@Json.Import({SillyEntity.class})
 @Mongo.Repository
 public abstract class SillyEntity {
 
   @Mongo.Id
   public abstract int id();
 
-  @Json.Named("v")
+  @Gson.Named("v")
   public abstract String val();
 
-  @Json.Named("p")
+  @Gson.Named("p")
   public abstract Map<String, Integer> payload();
 
-  @Json.Named("i")
+  @Gson.Named("i")
   public abstract List<Integer> ints();
 
   @Value.Derived
   public UnsignedInteger der() {
     return UnsignedInteger.valueOf(1);
   }
-
-  public static void marshal(JsonGenerator generator, UnsignedInteger integer) throws IOException {
-    generator.writeNumber(integer.doubleValue());
-  }
-
-  /**
-   * Unmarshal.
-   * @param parser the parser
-   * @param integerNull the integer null
-   * @param expectedClass the expected class
-   * @return the unsigned integer
-   * @throws IOException Signals that an I/O exception has occurred.
-   */
-  public static UnsignedInteger unmarshal(
-      JsonParser parser,
-      @Nullable UnsignedInteger integerNull,
-      Class<UnsignedInteger> expectedClass)
-      throws IOException {
-    return UnsignedInteger.valueOf((long) parser.getDoubleValue());
-  }
 }
diff --git a/value-fixture/src/org/immutables/fixture/SillyEntitySecond.java b/value-fixture/src/org/immutables/fixture/SillyEntitySecond.java
@@ -15,16 +15,16 @@
  */
 package org.immutables.fixture;
 
-import org.immutables.value.ext.Mongo;
+import org.immutables.gson.Gson;
-import org.immutables.common.repository.Id;
+import org.immutables.mongo.Mongo;
-import org.immutables.value.ext.Json;
+import org.immutables.mongo.types.Id;
 import org.immutables.value.Value;
 
 @Value.Immutable
 @Mongo.Repository("ent2")
 public abstract class SillyEntitySecond {
 
-  @Json.Named("_id")
+  @Gson.Named("_id")
   @Value.Default
   public Id id() {
     return Id.generate();

diff --git a/value-fixture/src/org/immutables/fixture/SillyIntWrap.java b/value-fixture/src/org/immutables/fixture/SillyIntWrap.java
@@ -15,11 +15,11 @@
  */
 package org.immutables.fixture;
 
-import org.immutables.value.ext.Json;
+import org.immutables.gson.Gson;
 import org.immutables.value.Value;
 
 @Value.Immutable(builder = false)
-@Json.Marshaled
+@Gson.TypeAdapters
 public abstract class SillyIntWrap {
 
   @Value.Parameter

diff --git a/value-fixture/src/org/immutables/fixture/SillyMapHolder.java b/value-fixture/src/org/immutables/fixture/SillyMapHolder.java
@@ -18,16 +18,14 @@
 import java.lang.annotation.RetentionPolicy;
 import java.util.Map;
 import java.util.Set;
-import org.immutables.value.ext.Json;
+import org.immutables.gson.Gson;
 import org.immutables.value.Value;
 
 @Value.Immutable
-@Json.Marshaled
+@Gson.TypeAdapters
-@Json.Import(SillyMarshalingRoutines.class)
 public abstract class SillyMapHolder {
 
   @Value.Parameter(order = 0)
-  @Json.ForceEmpty
   public abstract Map<SillyValue, Integer> holder1();
 
   @Value.Parameter(order = 1)

diff --git a/value-fixture/src/org/immutables/fixture/SillyMapTup.java b/value-fixture/src/org/immutables/fixture/SillyMapTup.java
@@ -17,11 +17,11 @@
 
 import java.lang.annotation.RetentionPolicy;
 import java.util.Map;
-import org.immutables.value.ext.Json;
+import org.immutables.gson.Gson;
 import org.immutables.value.Value;
 
 @Value.Immutable(builder = false)
-@Json.Marshaled
+@Gson.TypeAdapters
 public abstract class SillyMapTup {
 
   @Value.Parameter(order = 0)

diff --git a/value-fixture/src/org/immutables/fixture/SillyPolyHost.java b/value-fixture/src/org/immutables/fixture/SillyPolyHost.java
@@ -16,11 +16,11 @@
 package org.immutables.fixture;
 
 import java.util.List;
-import org.immutables.value.ext.Json;
+import org.immutables.gson.Gson;
 import org.immutables.value.Value;
 
 @Value.Immutable
-@Json.Marshaled
+@Gson.TypeAdapters
 public abstract class SillyPolyHost {
 
   public abstract List<SillyAbstract> s();

diff --git a/value-fixture/src/org/immutables/fixture/SillyPolyHost2.java b/value-fixture/src/org/immutables/fixture/SillyPolyHost2.java
@@ -16,20 +16,20 @@
 package org.immutables.fixture;
 
 import com.google.common.base.Optional;
-import org.immutables.value.ext.Json;
+import org.immutables.gson.Gson;
 import org.immutables.value.Value;
 
 @Value.Immutable
-@Json.Marshaled
+@Gson.TypeAdapters
 public abstract class SillyPolyHost2 {
 
-  @Json.Subclasses({
+  @Gson.ExpectedSubtypes({
       SillySub2.class,
       SillySub3.class
   })
   public abstract SillyAbstract s();
 
-  @Json.Subclasses({
+  @Gson.ExpectedSubtypes({
       SillySub2.class,
       SillySub3.class
   })

diff --git a/value-fixture/src/org/immutables/fixture/SillyStructure.java b/value-fixture/src/org/immutables/fixture/SillyStructure.java
@@ -17,11 +17,11 @@
 
 import com.google.common.base.Optional;
 import java.util.List;
-import org.immutables.value.ext.Json;
+import org.immutables.gson.Gson;
 import org.immutables.value.Value;
 
 @Value.Immutable
-@Json.Marshaled
+@Gson.TypeAdapters
 public abstract class SillyStructure {
 
   public abstract String attr1();

diff --git a/value-fixture/src/org/immutables/fixture/SillyStructureWithId.java b/value-fixture/src/org/immutables/fixture/SillyStructureWithId.java
@@ -15,18 +15,18 @@
  */
 package org.immutables.fixture;
 
-import org.immutables.value.ext.Mongo;
 import com.google.common.base.Optional;
 import java.util.List;
-import org.immutables.value.ext.Json;
+import org.immutables.gson.Gson;
+import org.immutables.mongo.Mongo;
 import org.immutables.value.Value;
 
 @Value.Immutable
 @Mongo.Repository
-@Json.Marshaled
+@Gson.TypeAdapters
 public interface SillyStructureWithId {
 
-  @Json.Named("_id")
+  @Gson.Named("_id")
   String id();
 
   String attr1();

diff --git a/value-fixture/src/org/immutables/fixture/SillySub1.java b/value-fixture/src/org/immutables/fixture/SillySub1.java
@@ -15,11 +15,11 @@
  */
 package org.immutables.fixture;
 
-import org.immutables.value.ext.Json;
+import org.immutables.gson.Gson;
 import org.immutables.value.Value;
 
 @Value.Immutable
-@Json.Marshaled
+@Gson.TypeAdapters
 public abstract class SillySub1 extends SillyAbstract {
   public abstract int a();
 }
diff --git a/value-fixture/src/org/immutables/fixture/SillySub2.java b/value-fixture/src/org/immutables/fixture/SillySub2.java
@@ -15,11 +15,11 @@
  */
 package org.immutables.fixture;
 
-import org.immutables.value.ext.Json;
+import org.immutables.gson.Gson;
 import org.immutables.value.Value;
 
 @Value.Immutable
-@Json.Marshaled
+@Gson.TypeAdapters
 public abstract class SillySub2 extends SillyAbstract {
   public abstract String b();
 }