エンティティクラスのコンストラクタで @ParameterName を利用できるように変更

Author: nakamura-to

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

@@ -28,6 +28,7 @@
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 
+import org.seasar.doma.ParameterName;
 import org.seasar.doma.internal.apt.mirror.EntityMirror;
 import org.seasar.doma.internal.apt.mirror.TableMirror;
 import org.seasar.doma.jdbc.entity.NamingType;
@@ -141,8 +142,13 @@ public List<EntityPropertyMeta> getAllPropertyMetasInCtorArgsOrder() {
         }
         List<EntityPropertyMeta> results = new ArrayList<EntityPropertyMeta>();
         for (VariableElement param : constructor.getParameters()) {
-            results.add(allPropertyMetaMap
-                    .get(param.getSimpleName().toString()));
+            String name = param.getSimpleName().toString();
+            ParameterName parameterName = param
+                    .getAnnotation(ParameterName.class);
+            if (parameterName != null) {
+                name = parameterName.value();
+            }
+            results.add(allPropertyMetaMap.get(name));
         }
         return results;
     }

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

@@ -43,6 +43,7 @@
 import org.seasar.doma.Entity;
 import org.seasar.doma.EntityField;
 import org.seasar.doma.OriginalStates;
+import org.seasar.doma.ParameterName;
 import org.seasar.doma.Transient;
 import org.seasar.doma.internal.apt.AptException;
 import org.seasar.doma.internal.apt.AptIllegalStateException;
@@ -591,6 +592,11 @@ protected ExecutableElement getSuitableConstructor(
             int validCount = 0;
             for (VariableElement param : constructor.getParameters()) {
                 String name = param.getSimpleName().toString();
+                ParameterName parameterName = param
+                        .getAnnotation(ParameterName.class);
+                if (parameterName != null) {
+                    name = parameterName.value();
+                }
                 TypeMirror paramType = param.asType();
                 TypeMirror propertyType = types.get(name);
                 if (propertyType == null) {