closed #96 ResultMap support constructor

Author: Jarvis

src/main/java/org/springframework/data/mybatis/mapping/MybatisManyToManyAssociation.java

@@ -0,0 +1,11 @@
+package org.springframework.data.mybatis.mapping;
+
+/**
+ * @author Jarvis Song
+ */
+public class MybatisManyToManyAssociation extends MybatisOneToManyAssociation {
+
+    public MybatisManyToManyAssociation(MybatisPersistentProperty inverse, MybatisPersistentProperty obverse) {
+        super(inverse, obverse);
+    }
+}

src/main/java/org/springframework/data/mybatis/mapping/MybatisOneToManyAssociation.java

@@ -0,0 +1,11 @@
+package org.springframework.data.mybatis.mapping;
+
+/**
+ * @author Jarvis Song
+ */
+public class MybatisOneToManyAssociation extends MybatisAssociation {
+
+    public MybatisOneToManyAssociation(MybatisPersistentProperty inverse, MybatisPersistentProperty obverse) {
+        super(inverse, obverse);
+    }
+}

src/main/java/org/springframework/data/mybatis/mapping/MybatisPersistentPropertyImpl.java

@@ -98,6 +98,14 @@ protected Association<MybatisPersistentProperty> createAssociation() {
             return new MybatisOneToOneAssociation(this, null);
         }
 
+        if (null != findAnnotation(OneToMany.class)) {
+            return new MybatisOneToManyAssociation(this, null);
+        }
+
+        if (null != findAnnotation(ManyToMany.class)) {
+            return new MybatisManyToManyAssociation(this, null);
+        }
+
         return new MybatisAssociation(this, null);
 
     }

src/main/java/org/springframework/data/mybatis/repository/support/MybatisSimpleRepositoryMapperGenerator.java

@@ -787,24 +787,85 @@ public void doWithPersistentProperty(PersistentProperty<?> pp) {
 
     private void buildInnerResultMap(final StringBuilder builder, final MybatisPersistentEntity<?> persistentEntity, final String prefix) {
 
+        final StringBuilder constructorBuilder = new StringBuilder();
+        final StringBuilder resultBuilder = new StringBuilder();
+
+        PreferredConstructor<?, MybatisPersistentProperty> persistenceConstructor = persistentEntity.getPersistenceConstructor();
+        if (null != persistenceConstructor && persistenceConstructor.hasParameters()) {
+            constructorBuilder.append("<constructor>");
+        }
+
+
         persistentEntity.doWithProperties(new SimplePropertyHandler() {
             @Override
             public void doWithPersistentProperty(PersistentProperty<?> pp) {
                 MybatisPersistentProperty property = (MybatisPersistentProperty) pp;
+
+                if (persistentEntity.isConstructorArgument(property)) {
+                    if (property.isIdProperty()) {
+
+                        if (property.isCompositeId()) {
+
+                            MybatisPersistentEntityImpl<?> idEntity = context.getPersistentEntity(property.getActualType());
+                            if (null != idEntity) {
+                                idEntity.doWithProperties(new SimplePropertyHandler() {
+                                    @Override
+                                    public void doWithPersistentProperty(PersistentProperty<?> pp) {
+                                        MybatisPersistentProperty property = (MybatisPersistentProperty) pp;
+                                        builder.append(String.format("<idArg property=\"%s\" column=\"%s\" javaType=\"%s\" jdbcType=\"%s\"/>",
+                                                property.getName() + "." + property.getName(),
+                                                alias(prefix + property.getName()),
+                                                property.getActualType().getName(),
+                                                property.getJdbcType()
+                                        ));
+                                    }
+                                });
+                            }
+
+                        } else {
+                            builder.append(String.format("<idArg property=\"%s\" column=\"%s\" javaType=\"%s\" jdbcType=\"%s\"/>",
+                                    property.getName(),
+                                    alias(prefix + property.getName()),
+                                    property.getActualType().getName(),
+                                    property.getJdbcType()
+                            ));
+                        }
+
+
+                    } else {
+                        constructorBuilder.append(String.format("<arg property=\"%s\" column=\"%s\" javaType=\"%s\" jdbcType=\"%s\""
+                                        + (null != property.getSpecifiedTypeHandler() ? (" typeHandler=\"" + property.getSpecifiedTypeHandler().getName() + "\"") : "")
+                                        + " />",
+                                property.getName(),
+                                alias(prefix + property.getName()),
+                                property.getActualType().getName(),
+                                property.getJdbcType()
+                        ));
+                    }
+                    return;
+                }
+
+
                 if (property.isIdProperty()) {
-                    buildInnerResultMapId(builder, property, prefix);
+                    buildInnerResultMapId(resultBuilder, property, prefix);
                     return;
                 }
-                builder.append(String.format("<result property=\"%s\" column=\"%s\" javaType=\"%s\" jdbcType=\"%s\"" + (
-                                null != property.getSpecifiedTypeHandler() ? (" typeHandler=\"" + property.getSpecifiedTypeHandler().getName() + "\"") : ""
-                        ) + " />",
+                resultBuilder.append(String.format("<result property=\"%s\" column=\"%s\" javaType=\"%s\" jdbcType=\"%s\""
+                                + (null != property.getSpecifiedTypeHandler() ? (" typeHandler=\"" + property.getSpecifiedTypeHandler().getName() + "\"") : "")
+                                + " />",
                         property.getName(),
                         alias(prefix + property.getName()),
                         property.getActualType().getName(),
                         property.getJdbcType()
                 ));
             }
         });
+
+
+        if (null != persistenceConstructor && persistenceConstructor.hasParameters()) {
+            constructorBuilder.append("</constructor>");
+        }
+        builder.append(constructorBuilder).append(resultBuilder);
     }
 
     private void buildInnerToOneAssociationResultMap(final StringBuilder builder, final PersistentProperty<? extends PersistentProperty<?>> inverse) {
@@ -880,13 +941,16 @@ private void buildInnerToManyAssociationResultMap(final StringBuilder builder, P
         MybatisPersistentEntityImpl<?> inversePersistentEntity = context.getPersistentEntity(actualType);
         if (null != inversePersistentEntity) {
             buildInnerResultMap(builder, inversePersistentEntity, inverse.getName() + ".");
+
+
         }
         builder.append("</collection>");
     }
 
     private void buildResultMap(final StringBuilder builder) {
         builder.append("<resultMap id=\"ResultMap\" type=\"" + domainClass.getName() + "\">");
 
+
         buildInnerResultMap(builder, persistentEntity, "");
 
         persistentEntity.doWithAssociations(new AssociationHandler<MybatisPersistentProperty>() {
@@ -902,8 +966,10 @@ public void doWithAssociation(Association<MybatisPersistentProperty> ass) {
                     buildInnerToOneAssociationResultMap(builder, inverse);
                     return;
                 }
-                if (null != inverse.findAnnotation(OneToMany.class) || null != inverse.findAnnotation(ManyToMany.class)) {
+
+                if (ass instanceof MybatisOneToManyAssociation) {
                     buildInnerToManyAssociationResultMap(builder, inverse);
+                    return;
                 }
 
             }