limiting retention of expensive objects #105

+ fighting maven 3.3.1 which exposes both relocated and non-relocated classes during reactor compilation. Had to change bunch of internal dependency references for annotation + processor instead of value. the problem is that there's no module to test fully shaded jar ((
immutables · Apr 19, 2015 · 978ab75 · 978ab75
1 parent 8a8da55
commit 978ab75
Show file tree

Hide file tree

Showing 16 changed files with 440 additions and 69 deletions.
diff --git a/builder/pom.xml b/builder/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>
     <artifactId>immutables</artifactId>
@@ -22,11 +23,20 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <!-- it's better have just 'value' dep, but due to some maven 3.3.1 bug,
+    it exposes both relocated and not relocated classess, having processor to run twice -->
     <dependency>
       <groupId>org.immutables</groupId>
-      <artifactId>value</artifactId>
+      <artifactId>value-annotations</artifactId>
       <version>${project.version}</version>
+      <scope>provided</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.immutables</groupId>
+      <artifactId>value-processor</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/generator/src/org/immutables/generator/Output.java b/generator/src/org/immutables/generator/Output.java
@@ -297,12 +297,12 @@ void complete() {
           writer.append(sourceCode);
         }
       } catch (FilerException ex) {
-        if (!identicalFileIsAlreadyGenerated(sourceCode)) {
+        if (identicalFileIsAlreadyGenerated(sourceCode)) {
-          getMessager().printMessage(Kind.ERROR,
+          getMessager().printMessage(Kind.MANDATORY_WARNING, "Regenerated file with the same content: " + key);
-              "Generated source file name collission. Attempt to overwrite already generated file: " + key);
         } else {
-          getMessager().printMessage(Kind.MANDATORY_WARNING,
+          getMessager().printMessage(Kind.ERROR, String.format(
-              "Regenerated file with the same content: " + key);
+                  "Generated source file name collission. Attempt to overwrite already generated file: %s, %s",
+                  key, ex));
         }
       } catch (IOException ex) {
         throw Throwables.propagate(ex);
@@ -312,10 +312,14 @@ void complete() {
     private boolean identicalFileIsAlreadyGenerated(CharSequence sourceCode) {
       try {
         String existingContent = new CharSource() {
+          final String packagePath = !key.packageName.isEmpty() ? (key.packageName.replace('.', '/') + '/') : "";
+          final String filename = key.relativeName + ".java";
+
           @Override
           public Reader openStream() throws IOException {
             return getFiler()
-                .getResource(StandardLocation.SOURCE_OUTPUT, key.packageName, key.relativeName)
+                .getResource(StandardLocation.SOURCE_OUTPUT,
+                    "", packagePath + filename)
                 .openReader(true);
           }
         }.read();

diff --git a/gson/pom.xml b/gson/pom.xml
@@ -57,14 +57,24 @@
       <version>2.0</version>
       <optional>true</optional>
     </dependency>
+
+    <!-- it's better have just 'value' dep, but due to some maven 3.3.1 bug,
+    it exposes both relocated and not relocated classess, having processor to run twice -->
+    <dependency>
+      <groupId>org.immutables</groupId>
+      <artifactId>value-annotations</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
     <dependency>
-      <!-- Compile only immutablesp processor -->
       <groupId>org.immutables</groupId>
-      <artifactId>value</artifactId>
+      <artifactId>value-processor</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
+
     <dependency>
       <!-- Test only utilities -->
       <groupId>org.immutables</groupId>

diff --git a/mongo/pom.xml b/mongo/pom.xml
@@ -29,14 +29,21 @@
       <type>pom</type>
     </dependency>
 
+    <!-- it's better have just 'value' dep, but due to some maven 3.3.1 bug,
+    it exposes both relocated and not relocated classess, having processor to run twice -->
     <dependency>
-      <!-- Compile only processor -->
       <groupId>org.immutables</groupId>
-      <artifactId>value</artifactId>
+      <artifactId>value-annotations</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.immutables</groupId>
+      <artifactId>value-processor</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <!-- compile only meta-inf/services generator -->

diff --git a/mongo/test/org/immutables/mongo/fixture/sub/Item2.java b/mongo/test/org/immutables/mongo/fixture/sub/Item2.java
@@ -16,13 +16,10 @@
 package org.immutables.mongo.fixture.sub;
 
 import java.util.List;
-import java.util.Set;
+import org.immutables.gson.Gson;
 import org.immutables.mongo.Mongo;
-import org.immutables.mongo.types.Binary;
-import org.immutables.mongo.types.Id;
-import org.immutables.value.Value;
 import org.immutables.mongo.fixture.*;
-import org.immutables.gson.Gson;
+import org.immutables.value.Value;
 
 @Mongo.Repository
 @Value.Immutable

diff --git a/ordinal/pom.xml b/ordinal/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>
     <artifactId>immutables</artifactId>
@@ -28,9 +29,17 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <!-- it's better have just 'value' dep, but due to some maven 3.3.1 bug,
+    it exposes both relocated and not relocated classess, having processor to run twice -->
     <dependency>
       <groupId>org.immutables</groupId>
-      <artifactId>value</artifactId>
+      <artifactId>value-annotations</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.immutables</groupId>
+      <artifactId>value-processor</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/pom.xml b/pom.xml
@@ -106,11 +106,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
+        <version>3.3</version>
         <configuration>
           <compilerVersion>1.7</compilerVersion>
           <source>1.7</source>
           <target>1.7</target>
+          <useIncrementalCompilation>false</useIncrementalCompilation>
           <compilerArgs>
             <!-- <arg>-Xlint:deprecation</arg> -->
             <arg>-Xlint:unchecked</arg>

diff --git a/value-fixture/pom.xml b/value-fixture/pom.xml
@@ -15,11 +15,21 @@
   </description>
 
   <dependencies>
+    <!-- it's better have just 'value' dep, but due to some maven 3.3.1 bug,
+    it exposes both relocated and not relocated classess, having processor to run twice -->
     <dependency>
       <groupId>org.immutables</groupId>
-      <artifactId>value</artifactId>
+      <artifactId>value-annotations</artifactId>
       <version>${project.version}</version>
+      <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.immutables</groupId>
+      <artifactId>value-processor</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
+
     <dependency>
       <groupId>org.immutables</groupId>
       <artifactId>gson</artifactId>

diff --git a/value-processor/src/org/immutables/value/processor/meta/Constitution.java b/value-processor/src/org/immutables/value/processor/meta/Constitution.java
@@ -148,7 +148,7 @@ public NameForms typeAbstract() {
         .build();
   }
 
-  public StyleMirror style() {
+  public StyleInfo style() {
     return protoclass().styles().style();
   }
 

diff --git a/value-processor/src/org/immutables/value/processor/meta/Proto.java b/value-processor/src/org/immutables/value/processor/meta/Proto.java
@@ -54,8 +54,8 @@ public static abstract class MetaAnnotated {
 
     @Value.Derived
     @Value.Auxiliary
-    public Optional<StyleMirror> style() {
+    public Optional<StyleInfo> style() {
-      return StyleMirror.find(element());
+      return StyleMirror.find(element()).transform(ToStyleInfo.FUNCTION);
     }
 
     public static MetaAnnotated from(AnnotationMirror mirror) {
@@ -99,12 +99,12 @@ abstract static class Environment {
     abstract Round round();
 
     @Value.Derived
-    StyleMirror defaultStyles() {
+    StyleInfo defaultStyles() {
       TypeElement typeElement = processing()
           .getElementUtils()
           .getTypeElement(StyleMirror.qualifiedName());
 
-      return StyleMirror.from(typeElement);
+      return ToStyleInfo.FUNCTION.apply(StyleMirror.from(typeElement));
     }
 
     /**
@@ -185,16 +185,16 @@ public List<TypeElement> includedTypes() {
     }
 
     @Value.Lazy
-    public Optional<StyleMirror> style() {
+    public Optional<StyleInfo> style() {
-      Optional<StyleMirror> style = StyleMirror.find(element());
+      Optional<StyleInfo> style = StyleMirror.find(element()).transform(ToStyleInfo.FUNCTION);
 
       if (style.isPresent()) {
         return style;
       }
 
       for (AnnotationMirror mirror : element().getAnnotationMirrors()) {
         MetaAnnotated metaAnnotated = MetaAnnotated.from(mirror);
-        Optional<StyleMirror> metaStyle = metaAnnotated.style();
+        Optional<StyleInfo> metaStyle = metaAnnotated.style();
         if (metaStyle.isPresent()) {
           return metaStyle;
         }
@@ -285,8 +285,8 @@ Optional<DeclaringPackage> namedParentPackage() {
 
     @Override
     @Value.Lazy
-    public Optional<StyleMirror> style() {
+    public Optional<StyleInfo> style() {
-      Optional<StyleMirror> style = super.style();
+      Optional<StyleInfo> style = super.style();
       if (style.isPresent()) {
         return style;
       }
@@ -365,15 +365,15 @@ public DeclaringPackage packageOf() {
     }
 
     @Value.Lazy
-    public Optional<ImmutableMirror> features() {
+    public Optional<ValueImmutableInfo> features() {
-      return ImmutableMirror.find(element());
+      return ImmutableMirror.find(element()).transform(ToImmutableInfo.FUNCTION);
     }
 
     @Value.Lazy
     public boolean useImmutableDefaults() {
-      Optional<ImmutableMirror> immutables = features();
+      Optional<ValueImmutableInfo> immutables = features();
       if (immutables.isPresent()) {
-        return immutables.get().getAnnotationMirror().getElementValues().isEmpty();
+        return immutables.get().isDefault();
       }
       return true;
     }
@@ -580,10 +580,10 @@ public Element element() {
     }
 
     @Value.Lazy
-    public ImmutableMirror features() {
+    public ValueImmutableInfo features() {
       if (declaringType().isPresent()
           && !declaringType().get().useImmutableDefaults()) {
-        Optional<ImmutableMirror> features = declaringType().get().features();
+        Optional<ValueImmutableInfo> features = declaringType().get().features();
         if (features.isPresent()) {
           return features.get();
         }
@@ -593,27 +593,27 @@ public ImmutableMirror features() {
 
     @Value.Lazy
     public Styles styles() {
-      return Styles.using(determineStyle().or(environment().defaultStyles()));
+      return determineStyle().or(environment().defaultStyles()).getStyles();
     }
 
-    private Optional<StyleMirror> determineStyle() {
+    private Optional<StyleInfo> determineStyle() {
       if (declaringType().isPresent()) {
         DeclaringType type = declaringType().get();
 
         Optional<DeclaringType> enclosing = type.enclosingOf();
         if (enclosing.isPresent()) {
           if (enclosing.get() != type) {
-            Optional<StyleMirror> style = type.style();
+            Optional<StyleInfo> style = type.style();
             if (style.isPresent()) {
               warnAboutIncompatibleStyles();
             }
           }
-          Optional<StyleMirror> enclosingStyle = enclosing.get().style();
+          Optional<StyleInfo> enclosingStyle = enclosing.get().style();
           if (enclosingStyle.isPresent()) {
             return enclosingStyle;
           }
         } else {
-          Optional<StyleMirror> style = type.style();
+          Optional<StyleInfo> style = type.style();
           if (style.isPresent()) {
             return style;
           }
@@ -767,4 +767,48 @@ public boolean apply(Element input) {
       return input.getModifiers().contains(Modifier.PUBLIC);
     }
   }
+
+  enum ToImmutableInfo implements Function<ImmutableMirror, ValueImmutableInfo> {
+    FUNCTION;
+    @Override
+    public ValueImmutableInfo apply(ImmutableMirror input) {
+      return ImmutableValueImmutableInfo.theOf(
+          input.builder(),
+          input.copy(),
+          input.intern(),
+          input.prehash(),
+          input.singleton())
+          .withIsDefault(input.getAnnotationMirror().getElementValues().isEmpty());
+    }
+  }
+
+  enum ToStyleInfo implements Function<StyleMirror, StyleInfo> {
+    FUNCTION;
+    @Override
+    public StyleInfo apply(StyleMirror input) {
+      return ImmutableStyleInfo.of(input.get(),
+          input.init(),
+          input.with(),
+          input.add(),
+          input.addAll(),
+          input.put(),
+          input.putAll(),
+          input.copyOf(),
+          input.of(),
+          input.instance(),
+          input.builder(),
+          input.newBuilder(),
+          input.from(),
+          input.build(),
+          input.typeBuilder(),
+          input.typeAbstract(),
+          input.typeImmutable(),
+          input.typeImmutableEnclosing(),
+          input.typeImmutableNested(),
+          ToImmutableInfo.FUNCTION.apply(input.defaults()),
+          input.strictBuilder(),
+          input.visibility(),
+          input.jdkOnly());
+    }
+  }
 }