Revert "Remove invalid association handling and related tests (#1285)" (#1286)

Author: nakamura-to

doma-processor/src/main/java/org/seasar/doma/internal/apt/meta/entity/EntityMetaFactory.java

@@ -56,6 +56,8 @@
 import org.seasar.doma.internal.apt.annot.MetamodelAnnot;
 import org.seasar.doma.internal.apt.annot.TableAnnot;
 import org.seasar.doma.internal.apt.annot.ValueAnnot;
+import org.seasar.doma.internal.apt.cttype.CtType;
+import org.seasar.doma.internal.apt.cttype.EntityCtType;
 import org.seasar.doma.internal.apt.meta.TypeElementMetaFactory;
 import org.seasar.doma.internal.apt.util.AnnotationValueUtil;
 import org.seasar.doma.jdbc.entity.EntityListener;
@@ -596,10 +598,16 @@ void doOriginalStatesField(
     }
 
     void doAssociationPropertyMeta(
-        @SuppressWarnings("unused") TypeElement classElement,
-        VariableElement fieldElement,
-        EntityMeta entityMeta) {
+        TypeElement classElement, VariableElement fieldElement, EntityMeta entityMeta) {
       validateFieldAnnotation(fieldElement, entityMeta);
+      CtType ctType = ctx.getCtTypes().newCtType(fieldElement.asType());
+      EntityCtType entityCtType = EntityCtType.resolveEntityCtType(ctType);
+      if (entityCtType == null) {
+        throw new AptException(
+            Message.DOMA4485,
+            fieldElement,
+            new Object[] {fieldElement.getSimpleName(), classElement, fieldElement.asType()});
+      }
       AssociationPropertyMeta associationPropertyMeta =
           new AssociationPropertyMeta(fieldElement.getSimpleName().toString());
       entityMeta.addAssociationPropertyMeta(associationPropertyMeta);

doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/entity/association/EntityProcessorTest.java

@@ -15,6 +15,7 @@
  */
 package org.seasar.doma.internal.apt.processor.entity.association;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.net.URL;
@@ -33,6 +34,7 @@
 import org.seasar.doma.internal.apt.ResourceParameterResolver;
 import org.seasar.doma.internal.apt.SimpleParameterResolver;
 import org.seasar.doma.internal.apt.processor.EntityProcessor;
+import org.seasar.doma.message.Message;
 
 class EntityProcessorTest extends CompilerSupport {
 
@@ -116,4 +118,45 @@ public List<Extension> getAdditionalExtensions() {
       };
     }
   }
+
+  @TestTemplate
+  @ExtendWith(ErrorInvocationContextProvider.class)
+  void error(Class<?> clazz, Message message, String... options) throws Exception {
+    addOption(options);
+    addCompilationUnit(clazz);
+    compile();
+    assertFalse(getCompiledResult());
+    assertMessage(message);
+  }
+
+  static class ErrorInvocationContextProvider implements TestTemplateInvocationContextProvider {
+    @Override
+    public boolean supportsTestTemplate(ExtensionContext context) {
+      return true;
+    }
+
+    @Override
+    public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContexts(
+        ExtensionContext context) {
+      return Stream.of(invocationContext(IllegalAssociation.class, Message.DOMA4485));
+    }
+
+    private TestTemplateInvocationContext invocationContext(
+        Class<?> clazz, Message message, String... options) {
+      return new TestTemplateInvocationContext() {
+        @Override
+        public String getDisplayName(int invocationIndex) {
+          return clazz.getSimpleName();
+        }
+
+        @Override
+        public List<Extension> getAdditionalExtensions() {
+          return Arrays.asList(
+              new SimpleParameterResolver(clazz),
+              new SimpleParameterResolver(message),
+              new SimpleParameterResolver(options));
+        }
+      };
+    }
+  }
 }

doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/entity/association/IllegalAssociation.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright Doma Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.seasar.doma.internal.apt.processor.entity.association;
+
+import org.seasar.doma.Association;
+import org.seasar.doma.Entity;
+
+@Entity
+class IllegalAssociation {
+
+  @Association String value;
+}