Modernize processor declaration classes with Java 17+ features (#1357)

nakamura-to · web-flow · commit 1f73f3abf51b · 2025-06-06T06:49:30.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@
 .kotlin
 out
 .factorypath
+/.claude/settings.local.json
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/AbstractCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/AbstractCtType.java
@@ -23,7 +23,33 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public abstract class AbstractCtType implements CtType {
+public abstract sealed class AbstractCtType implements CtType
+    permits AggregateStrategyCtType,
+        AnyCtType,
+        ArrayCtType,
+        BasicCtType,
+        BatchResultCtType,
+        BiConsumerCtType,
+        BiFunctionCtType,
+        CollectorCtType,
+        ConfigCtType,
+        DomainCtType,
+        EmbeddableCtType,
+        EntityCtType,
+        FunctionCtType,
+        IterableCtType,
+        MapCtType,
+        MultiResultCtType,
+        NoneCtType,
+        OptionalCtType,
+        OptionalDoubleCtType,
+        OptionalIntCtType,
+        OptionalLongCtType,
+        PreparedSqlCtType,
+        ReferenceCtType,
+        ResultCtType,
+        SelectOptionsCtType,
+        StreamCtType {
 
   protected final RoundContext ctx;
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/AggregateStrategyCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/AggregateStrategyCtType.java
@@ -23,7 +23,7 @@
 import org.seasar.doma.internal.apt.annot.AggregateStrategyAnnot;
 import org.seasar.doma.internal.apt.generator.Code;
 
-public class AggregateStrategyCtType extends AbstractCtType {
+public final class AggregateStrategyCtType extends AbstractCtType {
 
   private final ClassName typeClassName;
   private final AggregateStrategyAnnot aggregateStrategyAnnot;
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/AnyCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/AnyCtType.java
@@ -18,7 +18,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class AnyCtType extends AbstractCtType {
+public final class AnyCtType extends AbstractCtType {
 
   AnyCtType(RoundContext ctx, TypeMirror type) {
     super(ctx, type);
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/ArrayCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/ArrayCtType.java
@@ -20,7 +20,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class ArrayCtType extends AbstractCtType {
+public final class ArrayCtType extends AbstractCtType {
 
   private final CtType elementCtType;
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/BasicCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/BasicCtType.java
@@ -25,7 +25,7 @@
 import org.seasar.doma.internal.jdbc.scalar.OptionalBasicScalarSuppliers;
 import org.seasar.doma.internal.wrapper.WrapperSuppliers;
 
-public class BasicCtType extends AbstractCtType {
+public final class BasicCtType extends AbstractCtType {
 
   private final TypeMirror boxedType;
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/BatchResultCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/BatchResultCtType.java
@@ -18,7 +18,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class BatchResultCtType extends AbstractCtType {
+public final class BatchResultCtType extends AbstractCtType {
   private final CtType elementCtType;
 
   BatchResultCtType(RoundContext ctx, TypeMirror type, CtType elementCtType) {
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/BiConsumerCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/BiConsumerCtType.java
@@ -20,7 +20,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class BiConsumerCtType extends AbstractCtType {
+public final class BiConsumerCtType extends AbstractCtType {
 
   private final CtType firstArgCtType;
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/BiFunctionCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/BiFunctionCtType.java
@@ -20,7 +20,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class BiFunctionCtType extends AbstractCtType {
+public final class BiFunctionCtType extends AbstractCtType {
 
   private final CtType firstArgCtType;
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/CollectorCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/CollectorCtType.java
@@ -20,7 +20,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class CollectorCtType extends AbstractCtType {
+public final class CollectorCtType extends AbstractCtType {
 
   private final CtType targetCtType;
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/ConfigCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/ConfigCtType.java
@@ -18,7 +18,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class ConfigCtType extends AbstractCtType {
+public final class ConfigCtType extends AbstractCtType {
 
   ConfigCtType(RoundContext ctx, TypeMirror type) {
     super(ctx, type);
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/CtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/CtType.java
@@ -17,7 +17,7 @@
 
 import javax.lang.model.type.TypeMirror;
 
-public interface CtType {
+public sealed interface CtType permits AbstractCtType {
 
   TypeMirror getType();
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/DomainCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/DomainCtType.java
@@ -24,7 +24,7 @@
 import org.seasar.doma.internal.apt.RoundContext;
 import org.seasar.doma.internal.apt.generator.Code;
 
-public class DomainCtType extends AbstractCtType {
+public final class DomainCtType extends AbstractCtType {
 
   private final BasicCtType basicCtType;
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/EmbeddableCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/EmbeddableCtType.java
@@ -22,7 +22,7 @@
 import org.seasar.doma.internal.apt.RoundContext;
 import org.seasar.doma.internal.apt.generator.Code;
 
-public class EmbeddableCtType extends AbstractCtType {
+public final class EmbeddableCtType extends AbstractCtType {
 
   private final ClassName typeClassName;
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/EntityCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/EntityCtType.java
@@ -23,7 +23,7 @@
 import org.seasar.doma.internal.apt.RoundContext;
 import org.seasar.doma.internal.apt.generator.Code;
 
-public class EntityCtType extends AbstractCtType {
+public final class EntityCtType extends AbstractCtType {
 
   private final boolean immutable;
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/FunctionCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/FunctionCtType.java
@@ -20,7 +20,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class FunctionCtType extends AbstractCtType {
+public final class FunctionCtType extends AbstractCtType {
 
   private final CtType targetCtType;
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/IterableCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/IterableCtType.java
@@ -21,7 +21,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class IterableCtType extends AbstractCtType {
+public final class IterableCtType extends AbstractCtType {
 
   private final CtType elementCtType;
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/MapCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/MapCtType.java
@@ -18,7 +18,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class MapCtType extends AbstractCtType {
+public final class MapCtType extends AbstractCtType {
 
   MapCtType(RoundContext ctx, TypeMirror type) {
     super(ctx, type);
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/MultiResultCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/MultiResultCtType.java
@@ -18,7 +18,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class MultiResultCtType extends AbstractCtType {
+public final class MultiResultCtType extends AbstractCtType {
   private final CtType elementCtType;
 
   MultiResultCtType(RoundContext ctx, TypeMirror type, CtType elementCtType) {
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/NoneCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/NoneCtType.java
@@ -18,7 +18,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class NoneCtType extends AbstractCtType {
+public final class NoneCtType extends AbstractCtType {
 
   NoneCtType(RoundContext ctx, TypeMirror type) {
     super(ctx, type);
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/OptionalCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/OptionalCtType.java
@@ -20,7 +20,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class OptionalCtType extends AbstractCtType {
+public final class OptionalCtType extends AbstractCtType {
 
   private final CtType elementCtType;
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/OptionalDoubleCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/OptionalDoubleCtType.java
@@ -20,7 +20,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class OptionalDoubleCtType extends AbstractCtType {
+public final class OptionalDoubleCtType extends AbstractCtType {
 
   private final BasicCtType elementCtType;
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/OptionalIntCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/OptionalIntCtType.java
@@ -20,7 +20,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class OptionalIntCtType extends AbstractCtType {
+public final class OptionalIntCtType extends AbstractCtType {
 
   private final BasicCtType elementCtType;
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/OptionalLongCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/OptionalLongCtType.java
@@ -20,7 +20,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class OptionalLongCtType extends AbstractCtType {
+public final class OptionalLongCtType extends AbstractCtType {
 
   private final BasicCtType elementCtType;
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/PreparedSqlCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/PreparedSqlCtType.java
@@ -18,7 +18,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class PreparedSqlCtType extends AbstractCtType {
+public final class PreparedSqlCtType extends AbstractCtType {
 
   PreparedSqlCtType(RoundContext ctx, TypeMirror type) {
     super(ctx, type);
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/ReferenceCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/ReferenceCtType.java
@@ -18,7 +18,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class ReferenceCtType extends AbstractCtType {
+public final class ReferenceCtType extends AbstractCtType {
 
   private final CtType referentCtType;
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/ResultCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/ResultCtType.java
@@ -18,7 +18,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class ResultCtType extends AbstractCtType {
+public final class ResultCtType extends AbstractCtType {
 
   private final CtType elementCtType;
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/SelectOptionsCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/SelectOptionsCtType.java
@@ -18,7 +18,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class SelectOptionsCtType extends AbstractCtType {
+public final class SelectOptionsCtType extends AbstractCtType {
 
   SelectOptionsCtType(RoundContext ctx, TypeMirror type) {
     super(ctx, type);
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/StreamCtType.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/StreamCtType.java
@@ -20,7 +20,7 @@
 import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.RoundContext;
 
-public class StreamCtType extends AbstractCtType {
+public final class StreamCtType extends AbstractCtType {
 
   private final CtType elementCtType;
 
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/decl/ConstructorDeclaration.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/decl/ConstructorDeclaration.java
@@ -15,20 +15,12 @@
  */
 package org.seasar.doma.internal.apt.decl;
 
-import static org.seasar.doma.internal.util.AssertionUtil.assertNotNull;
-
+import java.util.Objects;
 import javax.lang.model.element.ExecutableElement;
 
-public class ConstructorDeclaration {
-
-  private final ExecutableElement element;
-
-  ConstructorDeclaration(ExecutableElement element) {
-    assertNotNull(element);
-    this.element = element;
-  }
+public record ConstructorDeclaration(ExecutableElement element) {
 
-  public ExecutableElement getElement() {
-    return element;
+  public ConstructorDeclaration {
+    Objects.requireNonNull(element);
   }
 }
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/decl/Declarations.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/decl/Declarations.java
@@ -150,8 +150,8 @@ public TypeParameterDeclaration newTypeParameterDeclarationUsingTypeParams(
   private TypeMirror resolveTypeParameter(
       TypeMirror formalType, List<TypeParameterDeclaration> typeParameterDeclarations) {
     for (TypeParameterDeclaration typeParameterDecl : typeParameterDeclarations) {
-      if (formalType.equals(typeParameterDecl.getFormalType())) {
-        return typeParameterDecl.getActualType();
+      if (formalType.equals(typeParameterDecl.formalType())) {
+        return typeParameterDecl.actualType();
       }
       DeclaredType declaredType = ctx.getMoreTypes().toDeclaredType(formalType);
       if (declaredType == null) {
@@ -165,8 +165,8 @@ private TypeMirror resolveTypeParameter(
               .map(
                   arg ->
                       typeParameterDeclarations.stream()
-                          .filter(declaration -> arg.equals(declaration.getFormalType()))
-                          .map(TypeParameterDeclaration::getActualType)
+                          .filter(declaration -> arg.equals(declaration.formalType()))
+                          .map(TypeParameterDeclaration::actualType)
                           .findFirst())
               .toList();
       if (optTypeArgs.stream().allMatch(Optional::isPresent)) {
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/decl/FieldDeclaration.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/decl/FieldDeclaration.java
@@ -17,25 +17,13 @@
 
 import static org.seasar.doma.internal.util.AssertionUtil.*;
 
+import java.util.Objects;
 import javax.lang.model.element.VariableElement;
 
-public class FieldDeclaration {
+public record FieldDeclaration(VariableElement element, TypeDeclaration typeDeclaration) {
 
-  private final VariableElement element;
-
-  private final TypeDeclaration typeDeclaration;
-
-  FieldDeclaration(VariableElement element, TypeDeclaration typeDeclaration) {
-    assertNotNull(element, typeDeclaration);
-    this.element = element;
-    this.typeDeclaration = typeDeclaration;
-  }
-
-  public VariableElement getElement() {
-    return element;
-  }
-
-  public TypeDeclaration getTypeDeclaration() {
-    return typeDeclaration;
+  public FieldDeclaration {
+    Objects.requireNonNull(element);
+    Objects.requireNonNull(typeDeclaration);
   }
 }
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/decl/MethodDeclaration.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/decl/MethodDeclaration.java
@@ -15,29 +15,15 @@
  */
 package org.seasar.doma.internal.apt.decl;
 
-import static org.seasar.doma.internal.util.AssertionUtil.assertNotNull;
-
+import java.util.Objects;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
 
-public class MethodDeclaration {
-
-  private final ExecutableElement element;
-
-  private final TypeDeclaration returnTypeDeclaration;
-
-  MethodDeclaration(ExecutableElement element, TypeDeclaration returnTypeDeclaration) {
-    assertNotNull(element, returnTypeDeclaration);
-    this.element = element;
-    this.returnTypeDeclaration = returnTypeDeclaration;
-  }
-
-  public ExecutableElement getElement() {
-    return element;
-  }
+public record MethodDeclaration(ExecutableElement element, TypeDeclaration returnTypeDeclaration) {
 
-  public TypeDeclaration getReturnTypeDeclaration() {
-    return returnTypeDeclaration;
+  public MethodDeclaration {
+    Objects.requireNonNull(element);
+    Objects.requireNonNull(returnTypeDeclaration);
   }
 
   public boolean isStatic() {
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/decl/TypeDeclaration.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/decl/TypeDeclaration.java
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/decl/TypeParameterDeclaration.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/decl/TypeParameterDeclaration.java
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/meta/entity/ScopeClassMetaFactory.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/meta/entity/ScopeClassMetaFactory.java
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/validator/ExpressionValidator.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/validator/ExpressionValidator.java
diff --git a/doma-processor/src/test/java/org/seasar/doma/internal/apt/decl/TypeDeclarationTest.java b/doma-processor/src/test/java/org/seasar/doma/internal/apt/decl/TypeDeclarationTest.java
