Refactor RoundContext to avoid leaking the 'this' reference

Author: nakamura-to

doma-processor/src/main/java/org/seasar/doma/internal/apt/DomaProcessor.java

@@ -116,6 +116,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     }
 
     var roundContext = new RoundContext(processingContext, roundEnv, annotations);
+    roundContext.init();
 
     for (var operator : operators) {
       var elements = roundContext.getElementsAnnotatedWith(operator.name);

doma-processor/src/main/java/org/seasar/doma/internal/apt/RoundContext.java

@@ -32,11 +32,12 @@ public class RoundContext {
   private final ProcessingContext processingContext;
   private final RoundEnvironment roundEnvironment;
   private final Set<? extends TypeElement> annotationElements;
-  private final Annotations annotations;
-  private final Declarations declarations;
-  private final CtTypes ctTypes;
-  private final Names names;
   private final List<ExternalDomainMeta> externalDomainMetaList = new ArrayList<>();
+  private boolean initialized;
+  private Annotations annotations;
+  private Declarations declarations;
+  private CtTypes ctTypes;
+  private Names names;
 
   public RoundContext(
       ProcessingContext processingContext,
@@ -45,62 +46,87 @@ public RoundContext(
     this.processingContext = Objects.requireNonNull(processingContext);
     this.roundEnvironment = Objects.requireNonNull(roundEnvironment);
     this.annotationElements = Objects.requireNonNull(annotationElements);
-    this.annotations = new Annotations(this);
-    this.declarations = new Declarations(this);
-    this.ctTypes = new CtTypes(this);
-    this.names = new Names(this);
+  }
+
+  public void init() {
+    if (initialized) {
+      throw new AptIllegalStateException("already initialized");
+    }
+    annotations = new Annotations(this);
+    declarations = new Declarations(this);
+    ctTypes = new CtTypes(this);
+    names = new Names(this);
+    initialized = true;
   }
 
   public RoundEnvironment getRoundEnvironment() {
+    assertInitialized();
     return roundEnvironment;
   }
 
   public MoreElements getMoreElements() {
+    assertInitialized();
     return processingContext.getMoreElements();
   }
 
   public MoreTypes getMoreTypes() {
+    assertInitialized();
     return processingContext.getMoreTypes();
   }
 
   public Options getOptions() {
+    assertInitialized();
     return processingContext.getOptions();
   }
 
   public Reporter getReporter() {
+    assertInitialized();
     return processingContext.getReporter();
   }
 
   public Resources getResources() {
+    assertInitialized();
     return processingContext.getResources();
   }
 
   public Annotations getAnnotations() {
+    assertInitialized();
     return annotations;
   }
 
   public Declarations getDeclarations() {
+    assertInitialized();
     return declarations;
   }
 
   public CtTypes getCtTypes() {
+    assertInitialized();
     return ctTypes;
   }
 
   public Names getNames() {
+    assertInitialized();
     return names;
   }
 
   public List<ExternalDomainMeta> getExternalDomainMetaList() {
+    assertInitialized();
     return externalDomainMetaList;
   }
 
   public Set<? extends Element> getElementsAnnotatedWith(String annotationName) {
+    assertInitialized();
     Objects.requireNonNull(annotationName);
     return annotationElements.stream()
         .filter(a -> a.getQualifiedName().contentEquals(annotationName))
         .findFirst()
         .map(roundEnvironment::getElementsAnnotatedWith)
         .orElse(Set.of());
   }
+
+  private void assertInitialized() {
+    if (!initialized) {
+      throw new AptIllegalStateException("not yet initialized");
+    }
+  }
 }

doma-processor/src/test/java/org/seasar/doma/internal/apt/TestProcessor.java

@@ -67,6 +67,7 @@ public boolean process(
       return true;
     }
     RoundContext roundContext = new RoundContext(ctx, roundEnv, annotations);
+    roundContext.init();
     run(roundContext);
     handled = true;
     return false;

doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/MyAnnotationProcessor.java

@@ -59,6 +59,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
       return true;
     }
     var roundContext = new RoundContext(ctx, roundEnv, annotations);
+    roundContext.init();
     var elements = roundContext.getElementsAnnotatedWith(MyAnnotation.class.getName());
     var processor = new MyElementProcessor(roundContext, handler);
     processor.process(elements);