Fix parent package traversal in JDK 9+

Fixes #736.
immutables · Dec 18, 2018 · cfcae50 · cfcae50
1 parent 0e81280
commit cfcae50
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/value-processor/src/org/immutables/value/processor/meta/Proto.java b/value-processor/src/org/immutables/value/processor/meta/Proto.java
@@ -723,7 +723,7 @@ public String name() {
     @Value.Lazy
     Optional<DeclaringPackage> namedParentPackage() {
       String parentPackageName = SourceNames.parentPackageName(element());
-      if (!parentPackageName.isEmpty()) {
+      while (!parentPackageName.isEmpty()) {
         @Nullable PackageElement parentPackage =
             environment().processing()
                 .getElementUtils()
@@ -737,6 +737,11 @@ Optional<DeclaringPackage> namedParentPackage() {
                   .element(parentPackage)
                   .build()));
         }
+
+        // With JDK 9+ package elements are only returned for packages with a
+        // `package-info.class` file. So although the parent may not be found,
+        // there may be "ancestor packages" further up the hierarchy.
+        parentPackageName = SourceNames.parentPackageName(parentPackageName);
       }
       return Optional.absent();
     }

diff --git a/value-processor/src/org/immutables/value/processor/meta/SourceNames.java b/value-processor/src/org/immutables/value/processor/meta/SourceNames.java
@@ -46,7 +46,10 @@ private static boolean isTypeElement(Element element) {
   }
 
   static String parentPackageName(PackageElement element) {
-    String qualifiedName = element.getQualifiedName().toString();
+    return parentPackageName(element.getQualifiedName().toString());
+  }
+
+  static String parentPackageName(String qualifiedName) {
     int lastIndexOfDot = qualifiedName.lastIndexOf('.');
     if (lastIndexOfDot > 0) {
       return qualifiedName.substring(0, lastIndexOfDot);