Value.* annotations got small changes incompatible and deleted

deprecated stuff Switched value-processor to use special generated annotation mirrors (only for Value.*) Annotations for other integrations moved into value.ext.* in processor Implemented new damn simple Jackson integration, tests passed Jdk collections got fixes for EnumMap and Map (fixed uncheked) A lot of small refinement and fixes
immutables · Jan 30, 2015 · 4bb0bee · 4bb0bee
1 parent 51ac8ff
commit 4bb0bee
Show file tree

Hide file tree

Showing 72 changed files with 1,030 additions and 579 deletions.
diff --git a/common/src/org/immutables/common/marshal/JaxrsMessageBodyProvider.java b/common/src/org/immutables/common/marshal/JaxrsMessageBodyProvider.java
@@ -41,7 +41,6 @@
 /**
  * JSON marshaling JAX-RS provider for immutable classes with generated marshaler.
  * @see org.immutables.value.Value.Immutable
- * @see org.immutables.value.Json.Marshaled
  */
 @Metainf.Service
 @Provider

diff --git a/common/src/org/immutables/common/marshal/Marshaling.java b/common/src/org/immutables/common/marshal/Marshaling.java
@@ -26,7 +26,7 @@
 
 /**
  * Contains convenient methods for marshaling and unmarshaling documents annotated with
- * {@link org.immutables.value.Json.Marshaled} to and from standard textual JSON.
+ * {@link org.immutables.value.ext.Json.Marshaled} to and from standard textual JSON.
  * <p>
  * You can avoid using this class in favor of using Marshalers directly. But It's not always
  * possible if dynamic lookup is needed.

diff --git a/dependency/technology/pom.xml b/dependency/technology/pom.xml
@@ -31,17 +31,17 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.4.4</version>
+      <version>2.5.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.4.4</version>
+      <version>2.5.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.4.4</version>
+      <version>2.5.0</version>
     </dependency>
     <dependency>
       <groupId>org.mongodb</groupId>

diff --git a/mirror/src/org/immutables/mirror/processor/Mirrors.generator b/mirror/src/org/immutables/mirror/processor/Mirrors.generator
@@ -28,6 +28,10 @@ import [guava].collect.ImmutableList;
 public class [m.name]Mirror implements [m.element.qualifiedName] {
   public static final String ANNOTATION_NAME = "[m.annotationTypeCommas]".replace(',', '.');
 
+  public static String simpleName() {
+    return "[m.simpleName]";
+  }
+
   public static boolean isPresent(Element annotatedElement) {
     for (AnnotationMirror mirror : annotatedElement.getAnnotationMirrors()) {
       TypeElement element = (TypeElement) mirror.getAnnotationType().asElement();
@@ -78,6 +82,15 @@ public class [m.name]Mirror implements [m.element.qualifiedName] {
     return builder.build();
   }
 
+  /**
+   * Creates mirror with default values using annotation element (i.e. declaration, not usage).
+   * @param element annotation type element
+   * @return {@code [m.name]Mirror}
+   */
+  public static [m.name]Mirror from(TypeElement element) {
+    return new [m.name]Mirror(element);
+  }
+
   /**
    * Tries to convert annotation mirror to this annotation type.
    * @param mirror annotation mirror
@@ -122,7 +135,7 @@ public class [m.name]Mirror implements [m.element.qualifiedName] {
   [/for]
 
     for (ExecutableElement attributeElement
-        : ElementFilter.methodsIn(annotationMirror.getAnnotationType().asElement().getEnclosedElements())) {
+        : ElementFilter.methodsIn(defaultAnnotationElement.getEnclosedElements())) {
       String name = attributeElement.getSimpleName().toString();
       [for a in m.attributes]
       if ("[a.name]".equals(name)) {
@@ -441,22 +454,22 @@ private static class [toUpper a.name]Extractor extends SimpleAnnotationValueVisi
     array.get(0).accept(this, null);
     return null;
   }
+
+  [targetType] get() {
+    return value;
+  }
   [if a.kind.type]
 
   public String name() {
     return value.toString();
   }
   [/if]
   [if a.mirrorModel]
-  [let mirrorType][a.mirrorModel.package].[a.mirrorModel.name]Mirror[/let]
 
   public [mirrorType a] mirror() {
     return [mirrorType a].from(value).get();
   }
   [/if]
-  [targetType] get() {
-    return value;
-  }
 [/if]
 
   @Override

diff --git a/mirror/src/org/immutables/mirror/processor/Mirrors.java b/mirror/src/org/immutables/mirror/processor/Mirrors.java
@@ -1,22 +1,20 @@
 package org.immutables.mirror.processor;
 
+import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+import org.immutables.generator.AbstractTemplate;
+import org.immutables.generator.Generator;
+import org.immutables.mirror.Mirror;
+
 import javax.annotation.Nullable;
-import javax.lang.model.element.Element;
+import javax.lang.model.element.*;
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.PackageElement;
-import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.ArrayType;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementFilter;
 import javax.tools.Diagnostic;
-import org.immutables.generator.AbstractTemplate;
-import org.immutables.generator.Generator;
-import org.immutables.mirror.Mirror;
 
 @Generator.Template
 @Generator.Import({Mirrors.MirrorModel.class, Mirrors.MirrorModel.AttributeModel.class})
@@ -67,6 +65,11 @@ String annotationTypeCommas() {
       return element.getAnnotation(Mirror.Annotation.class).value().replace('.', ',');
     }
 
+    String simpleName() {
+      return Iterables.getLast(
+          Splitter.on('.').splitToList(element.getAnnotation(Mirror.Annotation.class).value()));
+    }
+
     class AttributeModel {
       final ExecutableElement element;
       final String name;

diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -27,14 +28,15 @@
     <module>generator</module>
     <module>generator-processor</module>
     <module>generator-fixture</module>
+    <module>metainf</module>
+    <module>mirror</module>
     <module>value</module>
     <module>value-processor</module>
-    <module>value-fixture</module>
     <module>value-standalone</module>
+    <module>value-fixture</module>
     <module>quickstart</module>
     <module>json-runtime</module>
     <module>gson</module>
-    <module>metainf</module>
   </modules>
 
   <organization>

diff --git a/value-fixture/pom.xml b/value-fixture/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -52,6 +53,17 @@
       <artifactId>gson</artifactId>
       <version>2.3.1</version>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-guava</artifactId>
+      <version>2.5.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/value-fixture/src/org/immutables/fixture/GetterEncloser.java b/value-fixture/src/org/immutables/fixture/GetterEncloser.java
@@ -25,12 +25,10 @@
 
 @SuppressWarnings("deprecation")
 @Value.Immutable
-@Value.Getters
 public interface GetterEncloser {
   Optional<Integer> optional();
 
   @Value.Immutable
-  @Value.Getters
   public interface Getters {
     int ab();
 

diff --git a/value-fixture/src/org/immutables/fixture/HasNullable.java b/value-fixture/src/org/immutables/fixture/HasNullable.java
@@ -15,7 +15,7 @@
  */
 package org.immutables.fixture;
 
-import org.immutables.value.Json;
+import org.immutables.value.ext.Json;
 import org.immutables.value.Value;
 import javax.annotation.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.Json;
+import org.immutables.value.ext.Json;
 import org.immutables.value.Value;
 
 @Target(ElementType.TYPE_USE)

diff --git a/value-fixture/src/org/immutables/fixture/JsonIgnore.java b/value-fixture/src/org/immutables/fixture/JsonIgnore.java
@@ -17,7 +17,7 @@
 
 import java.util.List;
 import org.immutables.value.Value;
-import org.immutables.value.Json;
+import org.immutables.value.ext.Json;
 
 @Value.Immutable
 @Json.Marshaled

diff --git a/value-fixture/src/org/immutables/fixture/PrimitiveDefault.java b/value-fixture/src/org/immutables/fixture/PrimitiveDefault.java
@@ -15,10 +15,11 @@
  */
 package org.immutables.fixture;
 
-import org.immutables.value.Value.Immutable.ImplementationVisibility;
+import org.immutables.value.Value.Style.ImplementationVisibility;
 import org.immutables.value.Value;
 
-@Value.Immutable(visibility = ImplementationVisibility.PACKAGE)
+@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,7 +15,7 @@
  */
 package org.immutables.fixture;
 
-import org.immutables.value.Json;
+import org.immutables.value.ext.Json;
 
 @Json.Subclasses({
     SillySub1.class,

diff --git a/value-fixture/src/org/immutables/fixture/SillyDumb.java b/value-fixture/src/org/immutables/fixture/SillyDumb.java
@@ -17,7 +17,7 @@
 
 import com.google.common.base.Optional;
 import java.util.List;
-import org.immutables.value.Json;
+import org.immutables.value.ext.Json;
 import org.immutables.value.Value;
 
 @Value.Immutable

diff --git a/value-fixture/src/org/immutables/fixture/SillyEntity.java b/value-fixture/src/org/immutables/fixture/SillyEntity.java
@@ -22,8 +22,8 @@
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
-import org.immutables.value.Json;
+import org.immutables.value.ext.Json;
-import org.immutables.value.Mongo;
+import org.immutables.value.ext.Mongo;
 import org.immutables.value.Value;
 
 @Value.Immutable

diff --git a/value-fixture/src/org/immutables/fixture/SillyEntitySecond.java b/value-fixture/src/org/immutables/fixture/SillyEntitySecond.java
@@ -15,9 +15,9 @@
  */
 package org.immutables.fixture;
 
-import org.immutables.value.Mongo;
+import org.immutables.value.ext.Mongo;
 import org.immutables.common.repository.Id;
-import org.immutables.value.Json;
+import org.immutables.value.ext.Json;
 import org.immutables.value.Value;
 
 @Value.Immutable

diff --git a/value-fixture/src/org/immutables/fixture/SillyIntWrap.java b/value-fixture/src/org/immutables/fixture/SillyIntWrap.java
@@ -15,7 +15,7 @@
  */
 package org.immutables.fixture;
 
-import org.immutables.value.Json;
+import org.immutables.value.ext.Json;
 import org.immutables.value.Value;
 
 @Value.Immutable(builder = false)

diff --git a/value-fixture/src/org/immutables/fixture/SillyMapHolder.java b/value-fixture/src/org/immutables/fixture/SillyMapHolder.java
@@ -18,7 +18,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.util.Map;
 import java.util.Set;
-import org.immutables.value.Json;
+import org.immutables.value.ext.Json;
 import org.immutables.value.Value;
 
 @Value.Immutable

diff --git a/value-fixture/src/org/immutables/fixture/SillyMapTup.java b/value-fixture/src/org/immutables/fixture/SillyMapTup.java
@@ -17,7 +17,7 @@
 
 import java.lang.annotation.RetentionPolicy;
 import java.util.Map;
-import org.immutables.value.Json;
+import org.immutables.value.ext.Json;
 import org.immutables.value.Value;
 
 @Value.Immutable(builder = false)

diff --git a/value-fixture/src/org/immutables/fixture/SillyPolyHost.java b/value-fixture/src/org/immutables/fixture/SillyPolyHost.java
@@ -16,7 +16,7 @@
 package org.immutables.fixture;
 
 import java.util.List;
-import org.immutables.value.Json;
+import org.immutables.value.ext.Json;
 import org.immutables.value.Value;
 
 @Value.Immutable

diff --git a/value-fixture/src/org/immutables/fixture/SillyPolyHost2.java b/value-fixture/src/org/immutables/fixture/SillyPolyHost2.java
@@ -16,7 +16,7 @@
 package org.immutables.fixture;
 
 import com.google.common.base.Optional;
-import org.immutables.value.Json;
+import org.immutables.value.ext.Json;
 import org.immutables.value.Value;
 
 @Value.Immutable

diff --git a/value-fixture/src/org/immutables/fixture/SillyStructure.java b/value-fixture/src/org/immutables/fixture/SillyStructure.java
@@ -17,7 +17,7 @@
 
 import com.google.common.base.Optional;
 import java.util.List;
-import org.immutables.value.Json;
+import org.immutables.value.ext.Json;
 import org.immutables.value.Value;
 
 @Value.Immutable

diff --git a/value-fixture/src/org/immutables/fixture/SillyStructureWithId.java b/value-fixture/src/org/immutables/fixture/SillyStructureWithId.java
@@ -15,10 +15,10 @@
  */
 package org.immutables.fixture;
 
-import org.immutables.value.Mongo;
+import org.immutables.value.ext.Mongo;
 import com.google.common.base.Optional;
 import java.util.List;
-import org.immutables.value.Json;
+import org.immutables.value.ext.Json;
 import org.immutables.value.Value;
 
 @Value.Immutable

diff --git a/value-fixture/src/org/immutables/fixture/SillySub1.java b/value-fixture/src/org/immutables/fixture/SillySub1.java
@@ -15,7 +15,7 @@
  */
 package org.immutables.fixture;
 
-import org.immutables.value.Json;
+import org.immutables.value.ext.Json;
 import org.immutables.value.Value;
 
 @Value.Immutable

diff --git a/value-fixture/src/org/immutables/fixture/SillySub2.java b/value-fixture/src/org/immutables/fixture/SillySub2.java
@@ -15,7 +15,7 @@
  */
 package org.immutables.fixture;
 
-import org.immutables.value.Json;
+import org.immutables.value.ext.Json;
 import org.immutables.value.Value;
 
 @Value.Immutable

diff --git a/value-fixture/src/org/immutables/fixture/SillySub3.java b/value-fixture/src/org/immutables/fixture/SillySub3.java
@@ -16,7 +16,7 @@
 package org.immutables.fixture;
 
 import java.util.List;
-import org.immutables.value.Json;
+import org.immutables.value.ext.Json;
 import org.immutables.value.Value;
 
 @Value.Immutable

diff --git a/value-fixture/src/org/immutables/fixture/SillySubstructure.java b/value-fixture/src/org/immutables/fixture/SillySubstructure.java
@@ -15,12 +15,12 @@
  */
 package org.immutables.fixture;
 
-import org.immutables.value.Mongo;
+import org.immutables.value.ext.Mongo;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.RetentionPolicy;
 import java.util.List;
 import java.util.Set;
-import org.immutables.value.Json;
+import org.immutables.value.ext.Json;
 import org.immutables.value.Value;
 
 @Value.Immutable