Merge pull request #44 from domaframework/issue-43

Issue 43 を修正しました

Author: nakamura-to

src/main/java/org/seasar/doma/internal/apt/ExternalDomainTypeGenerator.java

@@ -101,7 +101,7 @@ protected void printClass() {
         printGenerated();
         iprint("public final class %1$s extends %2$s<%3$s, %4$s> {%n",
                 simpleMetaTypeName, AbstractDomainType.class.getName(),
-                domainMeta.getValueElement().getQualifiedName(), domainTypeName);
+                domainMeta.getValueTypeName(), domainTypeName);
         print("%n");
         indent();
         printValidateVersionStaticInitializer();
@@ -129,8 +129,8 @@ protected void printConstructors() {
         iprint("private %1$s() {%n", simpleName);
         if (domainMeta.getWrapperCtType().getBasicCtType().isEnum()) {
             iprint("    super(() -> new %1$s(%2$s.class));%n", domainMeta
-                    .getWrapperCtType().getTypeName(), domainMeta
-                    .getValueElement().getQualifiedName());
+                    .getWrapperCtType().getTypeName(),
+                    domainMeta.getValueTypeName());
             iprint("}%n");
         } else {
             iprint("    super(() -> new %1$s());%n", domainMeta
@@ -154,7 +154,7 @@ protected void printNewDomainMethod() {
         }
         iprint("@Override%n");
         iprint("protected %1$s newDomain(%2$s value) {%n", domainTypeName,
-                domainMeta.getValueElement().getQualifiedName());
+                domainMeta.getValueTypeName());
         if (parametarized) {
             iprint("    return (%1$s) converter.fromValueToDomain(value);%n",
                     domainTypeName);
@@ -167,8 +167,8 @@ protected void printNewDomainMethod() {
 
     protected void printGetBasicValueMethod() {
         iprint("@Override%n");
-        iprint("protected %1$s getBasicValue(%2$s domain) {%n", domainMeta
-                .getValueElement().getQualifiedName(), domainTypeName);
+        iprint("protected %1$s getBasicValue(%2$s domain) {%n",
+                domainMeta.getValueTypeName(), domainTypeName);
         iprint("    if (domain == null) {%n");
         iprint("        return null;%n");
         iprint("    }%n");
@@ -180,8 +180,7 @@ protected void printGetBasicValueMethod() {
     protected void printGetBasicClassMethod() {
         iprint("@Override%n");
         iprint("public Class<?> getBasicClass() {%n");
-        iprint("    return %1$s.class;%n", domainMeta.getValueElement()
-                .getQualifiedName());
+        iprint("    return %1$s.class;%n", domainMeta.getValueTypeName());
         iprint("}%n");
         print("%n");
     }

src/main/java/org/seasar/doma/internal/apt/meta/ExternalDomainMeta.java

@@ -15,7 +15,7 @@
  */
 package org.seasar.doma.internal.apt.meta;
 
-import static org.seasar.doma.internal.util.AssertionUtil.*;
+import static org.seasar.doma.internal.util.AssertionUtil.assertNotNull;
 
 import javax.lang.model.element.TypeElement;
 
@@ -31,7 +31,7 @@ public class ExternalDomainMeta implements TypeElementMeta {
 
     protected WrapperCtType wrapperCtType;
 
-    protected TypeElement valueElement;
+    protected String valueTypeName;
 
     protected TypeElement domainElement;
 
@@ -52,12 +52,12 @@ public void setWrapperCtType(WrapperCtType wrapperCtType) {
         this.wrapperCtType = wrapperCtType;
     }
 
-    public TypeElement getValueElement() {
-        return valueElement;
+    public String getValueTypeName() {
+        return valueTypeName;
     }
 
-    public void setValueElement(TypeElement valueElement) {
-        this.valueElement = valueElement;
+    public void setValueTypeName(String valueTypeName) {
+        this.valueTypeName = valueTypeName;
     }
 
     public TypeElement getDomainElement() {

src/main/java/org/seasar/doma/internal/apt/meta/ExternalDomainMetaFactory.java

@@ -15,7 +15,8 @@
  */
 package org.seasar.doma.internal.apt.meta;
 
-import static org.seasar.doma.internal.util.AssertionUtil.*;
+import static org.seasar.doma.internal.util.AssertionUtil.assertEquals;
+import static org.seasar.doma.internal.util.AssertionUtil.assertNotNull;
 
 import java.util.List;
 
@@ -144,16 +145,13 @@ protected void doDomainType(TypeElement convElement, TypeMirror domainType,
 
     protected void doValueType(TypeElement convElement, TypeMirror valueType,
             ExternalDomainMeta meta) {
-        TypeElement valueElement = TypeMirrorUtil.toTypeElement(valueType, env);
-        if (valueElement == null) {
-            throw new AptIllegalStateException(valueType.toString());
-        }
-        meta.setValueElement(valueElement);
+        String valueTypeName = TypeMirrorUtil.getTypeName(valueType, env);
+        meta.setValueTypeName(valueTypeName);
 
         BasicCtType basicCtType = BasicCtType.newInstance(valueType, env);
         if (basicCtType == null) {
             throw new AptException(Message.DOMA4194, env, convElement,
-                    valueElement.getQualifiedName());
+                    valueTypeName);
         }
         meta.setWrapperCtType(basicCtType.getWrapperCtType());
     }

src/test/java/org/seasar/doma/internal/apt/domain/ExternalDomainProcessorTest.java

@@ -125,4 +125,12 @@ public void testIllegalParameterizedValueObjectConverter() throws Exception {
         assertMessage(Message.DOMA4203);
     }
 
+    public void testBytesConversion() throws Exception {
+        ExternalDomainProcessor processor = new ExternalDomainProcessor();
+        addProcessor(processor);
+        addCompilationUnit(UUIDConverter.class);
+        compile();
+        assertTrue(getCompiledResult());
+    }
+
 }

src/test/java/org/seasar/doma/internal/apt/domain/UUIDConverter.java

@@ -0,0 +1,21 @@
+package org.seasar.doma.internal.apt.domain;
+
+import java.util.UUID;
+
+import org.seasar.doma.ExternalDomain;
+import org.seasar.doma.jdbc.domain.DomainConverter;
+
+@ExternalDomain
+public class UUIDConverter implements DomainConverter<UUID, byte[]> {
+
+    @Override
+    public byte[] fromDomainToValue(UUID domain) {
+        return null;
+    }
+
+    @Override
+    public UUID fromValueToDomain(byte[] value) {
+        return null;
+    }
+
+}