Skip to content

Commit 4f83001

Browse files
committed
Remove invalid association handling and related tests
1 parent 0acb4bb commit 4f83001

File tree

3 files changed

+3
-79
lines changed

3 files changed

+3
-79
lines changed

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@
5656
import org.seasar.doma.internal.apt.annot.MetamodelAnnot;
5757
import org.seasar.doma.internal.apt.annot.TableAnnot;
5858
import org.seasar.doma.internal.apt.annot.ValueAnnot;
59-
import org.seasar.doma.internal.apt.cttype.CtType;
60-
import org.seasar.doma.internal.apt.cttype.EntityCtType;
6159
import org.seasar.doma.internal.apt.meta.TypeElementMetaFactory;
6260
import org.seasar.doma.internal.apt.util.AnnotationValueUtil;
6361
import org.seasar.doma.jdbc.entity.EntityListener;
@@ -598,16 +596,10 @@ void doOriginalStatesField(
598596
}
599597

600598
void doAssociationPropertyMeta(
601-
TypeElement classElement, VariableElement fieldElement, EntityMeta entityMeta) {
599+
@SuppressWarnings("unused") TypeElement classElement,
600+
VariableElement fieldElement,
601+
EntityMeta entityMeta) {
602602
validateFieldAnnotation(fieldElement, entityMeta);
603-
CtType ctType = ctx.getCtTypes().newCtType(fieldElement.asType());
604-
EntityCtType entityCtType = EntityCtType.resolveEntityCtType(ctType);
605-
if (entityCtType == null) {
606-
throw new AptException(
607-
Message.DOMA4485,
608-
fieldElement,
609-
new Object[] {fieldElement.getSimpleName(), classElement, fieldElement.asType()});
610-
}
611603
AssociationPropertyMeta associationPropertyMeta =
612604
new AssociationPropertyMeta(fieldElement.getSimpleName().toString());
613605
entityMeta.addAssociationPropertyMeta(associationPropertyMeta);

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

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package org.seasar.doma.internal.apt.processor.entity.association;
1717

18-
import static org.junit.jupiter.api.Assertions.assertFalse;
1918
import static org.junit.jupiter.api.Assertions.assertTrue;
2019

2120
import java.net.URL;
@@ -34,7 +33,6 @@
3433
import org.seasar.doma.internal.apt.ResourceParameterResolver;
3534
import org.seasar.doma.internal.apt.SimpleParameterResolver;
3635
import org.seasar.doma.internal.apt.processor.EntityProcessor;
37-
import org.seasar.doma.message.Message;
3836

3937
class EntityProcessorTest extends CompilerSupport {
4038

@@ -118,45 +116,4 @@ public List<Extension> getAdditionalExtensions() {
118116
};
119117
}
120118
}
121-
122-
@TestTemplate
123-
@ExtendWith(ErrorInvocationContextProvider.class)
124-
void error(Class<?> clazz, Message message, String... options) throws Exception {
125-
addOption(options);
126-
addCompilationUnit(clazz);
127-
compile();
128-
assertFalse(getCompiledResult());
129-
assertMessage(message);
130-
}
131-
132-
static class ErrorInvocationContextProvider implements TestTemplateInvocationContextProvider {
133-
@Override
134-
public boolean supportsTestTemplate(ExtensionContext context) {
135-
return true;
136-
}
137-
138-
@Override
139-
public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContexts(
140-
ExtensionContext context) {
141-
return Stream.of(invocationContext(IllegalAssociation.class, Message.DOMA4485));
142-
}
143-
144-
private TestTemplateInvocationContext invocationContext(
145-
Class<?> clazz, Message message, String... options) {
146-
return new TestTemplateInvocationContext() {
147-
@Override
148-
public String getDisplayName(int invocationIndex) {
149-
return clazz.getSimpleName();
150-
}
151-
152-
@Override
153-
public List<Extension> getAdditionalExtensions() {
154-
return Arrays.asList(
155-
new SimpleParameterResolver(clazz),
156-
new SimpleParameterResolver(message),
157-
new SimpleParameterResolver(options));
158-
}
159-
};
160-
}
161-
}
162119
}

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

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)