Merge pull request #127 from domaframework/nested-domain-class

ドメインクラスをネストした型として定義することをサポート

Author: nakamura-to

src/main/java/org/seasar/doma/internal/Constants.java

@@ -39,4 +39,6 @@ public final class Constants {
 
     public static final String EXTERNAL_DOMAIN_METATYPE_ROOT_PACKAGE = "__";
 
+    public static final String BINARY_NAME_ENCLOSING_DELIMITER = "__";
+
 }

src/main/java/org/seasar/doma/internal/Conventions.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2004-2010 the Seasar Foundation and the Others.
+ *
+ * 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
+ *
+ *     http://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;
+
+import static java.util.stream.Collectors.joining;
+import static org.seasar.doma.internal.util.AssertionUtil.assertNotNull;
+
+import java.util.List;
+
+import org.seasar.doma.internal.util.ClassUtil;
+
+/**
+ * @author nakamura-to
+ *
+ */
+public class Conventions {
+
+    public static String normalizeBinaryName(String binaryName) {
+        assertNotNull(binaryName);
+        String packageName = ClassUtil.getPackageName(binaryName);
+        List<String> enclosingNames = ClassUtil.getEnclosingNames(binaryName);
+        String simpleName = ClassUtil.getSimpleName(binaryName);
+        String base = "";
+        if (packageName != null && packageName.length() > 0) {
+            base = packageName + ".";
+        }
+        return base
+                + enclosingNames
+                        .stream()
+                        .map(n -> n + Constants.BINARY_NAME_ENCLOSING_DELIMITER)
+                        .collect(joining()) + simpleName;
+    }
+
+    public static String toFullMetaName(String originalBinaryName) {
+        assertNotNull(originalBinaryName);
+        String binaryName = normalizeBinaryName(originalBinaryName);
+        String packageName = ClassUtil.getPackageName(binaryName);
+        String simpleName = ClassUtil.getSimpleName(binaryName);
+        String base = "";
+        if (packageName != null && packageName.length() > 0) {
+            base = packageName + ".";
+        }
+        return base + createSimpleMetaName(simpleName);
+    }
+
+    public static String toSimpleMetaName(String originalBinaryName) {
+        assertNotNull(originalBinaryName);
+        String binaryName = normalizeBinaryName(originalBinaryName);
+        String simpleName = ClassUtil.getSimpleName(binaryName);
+        return createSimpleMetaName(simpleName);
+    }
+
+    private static String createSimpleMetaName(String originalSimpleName) {
+        return Constants.METATYPE_PREFIX + originalSimpleName;
+    }
+
+}

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

@@ -15,7 +15,7 @@
  */
 package org.seasar.doma.internal.apt;
 
-import static org.seasar.doma.internal.util.AssertionUtil.*;
+import static org.seasar.doma.internal.util.AssertionUtil.assertNotNull;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -28,6 +28,7 @@
 import javax.tools.JavaFileObject;
 
 import org.seasar.doma.internal.Artifact;
+import org.seasar.doma.internal.Conventions;
 import org.seasar.doma.internal.apt.util.ElementUtil;
 import org.seasar.doma.internal.util.ClassUtil;
 import org.seasar.doma.message.Message;
@@ -44,7 +45,7 @@ public abstract class AbstractGenerator implements Generator {
 
     protected final TypeElement typeElement;
 
-    protected final String qualifiedName;
+    protected final String canonicalName;
 
     protected final String packageName;
 
@@ -72,24 +73,25 @@ protected AbstractGenerator(ProcessingEnvironment env,
         this.subpackage = subpackage;
         this.prefix = prefix;
         this.suffix = suffix;
-        this.qualifiedName = createQualifiedName(env, typeElement, fullpackage,
+        this.canonicalName = createCanonicalName(env, typeElement, fullpackage,
                 subpackage, prefix, suffix);
-        this.packageName = ClassUtil.getPackageName(qualifiedName);
-        this.simpleName = ClassUtil.getSimpleName(qualifiedName);
+        this.packageName = ClassUtil.getPackageName(canonicalName);
+        this.simpleName = ClassUtil.getSimpleName(canonicalName);
         Filer filer = env.getFiler();
         JavaFileObject file = filer
-                .createSourceFile(qualifiedName, typeElement);
+                .createSourceFile(canonicalName, typeElement);
         formatter = new Formatter(new BufferedWriter(file.openWriter()));
     }
 
-    protected String createQualifiedName(ProcessingEnvironment env,
+    protected String createCanonicalName(ProcessingEnvironment env,
             TypeElement typeElement, String fullpackage, String subpackage,
             String prefix, String suffix) {
         String qualifiedNamePrefix = getQualifiedNamePrefix(env, typeElement,
                 fullpackage, subpackage);
-        return qualifiedNamePrefix + prefix
-                + ElementUtil.getPackageExcludedBinaryName(typeElement, env)
-                + suffix;
+        String binaryName = Conventions.normalizeBinaryName(ElementUtil
+                .getBinaryName(typeElement, env));
+        String infix = ClassUtil.getSimpleName(binaryName);
+        return qualifiedNamePrefix + prefix + infix + suffix;
     }
 
     protected String getQualifiedNamePrefix(ProcessingEnvironment env,
@@ -138,7 +140,7 @@ protected void throwExceptionIfNecessary() {
         if (ioException != null) {
             formatter.close();
             throw new AptException(Message.DOMA4079, env, typeElement,
-                    ioException, qualifiedName, ioException);
+                    ioException, canonicalName, ioException);
         }
     }