diff --git a/pom.xml b/pom.xml index ed92c7d351849dbe43dfd7f24cf68d5198ac93a0..1d608e4964e59cb31fb53d3812f9d7264dfb3c24 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.easybest spring-data-mybatis-build - ${revision} + 2.0.1.3 pom Spring Data MyBatis Build @@ -46,7 +46,6 @@ ${basedir} 0.0.24 0.0.5.RELEASE - 3.0.0 1.0.2 1.1.0 @@ -79,278 +78,20 @@ - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.1.1 - - - com.puppycrawl.tools - checkstyle - 8.34 - - - io.spring.javaformat - spring-javaformat-checkstyle - ${spring-javaformat.version} - - - io.spring.nohttp - nohttp-checkstyle - ${nohttp-checkstyle.version} - - - - - checkstyle-validation - validate - - ${disable.checks} - src/checkstyle/checkstyle.xml - - src/checkstyle/checkstyle-suppressions.xml - - true - main.basedir=${main.basedir} - - UTF-8 - - - check - - - - nohttp-checkstyle-validation - validate - - ${disable.checks} - src/checkstyle/nohttp-checkstyle.xml - - - src/checkstyle/nohttp-checkstyle-suppressions.xml - - main.basedir=${main.basedir} - - UTF-8 - ${basedir} - **/* - - **/.git/**/*,**/target/**/,**/.flattened-pom.xml,**/*.class,**/spring-boot-gradle-plugin/build/**,**/spring-boot-gradle-plugin/bin/** - - - - check - - false - - - - - io.spring.javaformat - spring-javaformat-maven-plugin - ${spring-javaformat.version} - - - validate - - ${disable.checks} - - - validate - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - regex-property - - regex-property - - - modulename - ${project.artifactId} - - - . - true - - - - - - org.codehaus.mojo - flatten-maven-plugin - true - - - - flatten - process-resources - - flatten - - - true - oss - - expand - remove - remove - - - - - - + - - - release - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-release-rules - - enforce - - - - - [1.8,12) - - - - - - - - - - - - - - central - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - true - - oss - https://oss.sonatype.org/ - false - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - - org.sonatype.plugins - nexus-staging-maven-plugin - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - - attach-javadocs - - jar - - - - - UTF-8 - UTF-8 - - -Xdoclint:none - - - - - - - - - - - oss - https://oss.sonatype.org/content/repositories/snapshots - - - oss - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - + + + + + + snapshots + http://192.168.150.83:8081/nexus/content/repositories/snapshots/ + + + releases + http://192.168.150.83:8081/nexus/content/repositories/releases/ + + + diff --git a/spring-data-mybatis-boot-starter/pom.xml b/spring-data-mybatis-boot-starter/pom.xml index 9205fee6c1a6138f25246aeee29b07f0fd6996d0..b1336f152d6ad9fdcb1997578881aee1dc7a70f5 100644 --- a/spring-data-mybatis-boot-starter/pom.xml +++ b/spring-data-mybatis-boot-starter/pom.xml @@ -5,7 +5,7 @@ spring-data-mybatis-parent io.easybest - ${revision} + 2.0.1.3 ../spring-data-mybatis-parent 4.0.0 @@ -54,7 +54,7 @@ io.easybest spring-data-mybatis - ${revision} + 2.0.1.3 org.mybatis diff --git a/spring-data-mybatis-core/pom.xml b/spring-data-mybatis-core/pom.xml index 12778568bfbb8454633755cf5da01ccc7f26ae38..42733c8b72419a07c87c0ade56ae1ed6b926e6f4 100644 --- a/spring-data-mybatis-core/pom.xml +++ b/spring-data-mybatis-core/pom.xml @@ -5,7 +5,7 @@ spring-data-mybatis-parent io.easybest - ${revision} + 2.0.1.3 ../spring-data-mybatis-parent 4.0.0 diff --git a/spring-data-mybatis-parent/pom.xml b/spring-data-mybatis-parent/pom.xml index b66235b8eb2e5f5756db4cdd2ab26a676d612229..187757a1ae158fceffb12152539e2bf52d86e31c 100644 --- a/spring-data-mybatis-parent/pom.xml +++ b/spring-data-mybatis-parent/pom.xml @@ -5,7 +5,7 @@ spring-data-mybatis-build io.easybest - ${revision} + 2.0.1.3 ../pom.xml 4.0.0 @@ -55,9 +55,9 @@ 2.3.3.RELEASE - 3.5.5 - 2.0.5 - 2.1.3 + 3.5.6 + 2.0.6 + 2.1.4 1.1.3 1.9.6 @@ -100,17 +100,17 @@ io.easybest spring-data-mybatis-core - ${revision} + 2.0.1.3 io.easybest spring-data-mybatis - ${revision} + 2.0.1.3 io.easybest spring-data-mybatis-processor - ${revision} + 2.0.1.3 org.springframework.data @@ -135,7 +135,7 @@ io.easybest spring-data-mybatis-boot-starter - ${revision} + 2.0.1.3 javax.persistence diff --git a/spring-data-mybatis-processor/pom.xml b/spring-data-mybatis-processor/pom.xml index 2489b69ce2b82e021e07c802fcf092f0bc342001..59d7bdb6d1e7c18a205457e621eb9124a47e87bc 100644 --- a/spring-data-mybatis-processor/pom.xml +++ b/spring-data-mybatis-processor/pom.xml @@ -5,7 +5,7 @@ spring-data-mybatis-parent io.easybest - ${revision} + 2.0.1.3 ../spring-data-mybatis-parent 4.0.0 diff --git a/spring-data-mybatis-querydsl/pom.xml b/spring-data-mybatis-querydsl/pom.xml index ef2cb10ff72e12b6ad6884933934420210f18fdf..84848ef43fd37d7cac08af0fc32b6ab9445e0737 100644 --- a/spring-data-mybatis-querydsl/pom.xml +++ b/spring-data-mybatis-querydsl/pom.xml @@ -5,7 +5,7 @@ spring-data-mybatis-parent io.easybest - ${revision} + 2.0.1.3 ../spring-data-mybatis-parent 4.0.0 diff --git a/spring-data-mybatis/pom.xml b/spring-data-mybatis/pom.xml index 0bea1f5b406d0f8c1990a07c2deb1ad981be1265..54d732991d1d37fe298489b46f1e1bdf8f61e235 100644 --- a/spring-data-mybatis/pom.xml +++ b/spring-data-mybatis/pom.xml @@ -5,7 +5,7 @@ spring-data-mybatis-parent io.easybest - ${revision} + 2.0.1.3 ../spring-data-mybatis-parent 4.0.0 @@ -117,13 +117,12 @@ io.easybest spring-data-mybatis-querydsl - ${revision} + 2.0.1.3 provided com.querydsl querydsl-sql - ${querydsl} true diff --git a/spring-data-mybatis/src/main/java/org/springframework/data/mybatis/dialect/Database.java b/spring-data-mybatis/src/main/java/org/springframework/data/mybatis/dialect/Database.java index d2b6007ff0d411e0687f67ed34dddcdd3baedf23..b67b5f29f349b997d3552f9e41c0c7f6c2d6cfb4 100644 --- a/spring-data-mybatis/src/main/java/org/springframework/data/mybatis/dialect/Database.java +++ b/spring-data-mybatis/src/main/java/org/springframework/data/mybatis/dialect/Database.java @@ -284,7 +284,7 @@ public enum Database { public Dialect resolveDialect(DialectResolutionInfo info) { final String databaseName = info.getDatabaseName(); - if ("MySQL".equals(databaseName)) { + if ("MySQL".equalsIgnoreCase(databaseName) ||"mariadb".equalsIgnoreCase(databaseName)) { return latestDialectInstance(this); } diff --git a/spring-data-mybatis/src/main/java/org/springframework/data/mybatis/repository/query/MybatisParameters.java b/spring-data-mybatis/src/main/java/org/springframework/data/mybatis/repository/query/MybatisParameters.java index a106f4fcc2a55b2946003e5bb0b24da9d1e22239..65028c51763958830956364fe99837f1c1cda9f4 100644 --- a/spring-data-mybatis/src/main/java/org/springframework/data/mybatis/repository/query/MybatisParameters.java +++ b/spring-data-mybatis/src/main/java/org/springframework/data/mybatis/repository/query/MybatisParameters.java @@ -18,6 +18,7 @@ package org.springframework.data.mybatis.repository.query; import java.lang.reflect.Method; import java.util.Date; import java.util.List; +import java.util.Optional; import javax.persistence.TemporalType; @@ -60,10 +61,12 @@ public class MybatisParameters extends Parameters getName() { + Optional name = super.getName(); + if (name.isPresent()) { + return name; + } + org.apache.ibatis.annotations.Param annotation = parameter + .getParameterAnnotation(org.apache.ibatis.annotations.Param.class); + if(annotation!=null) { + return Optional.ofNullable(annotation.value()); + }else { + org.springframework.data.repository.query.Param pmp = parameter + .getParameterAnnotation(org.springframework.data.repository.query.Param.class); + if(pmp!=null) { + return Optional.ofNullable(pmp.value()); + } + } + + return Optional.ofNullable(parameter.getParameterName()); + } + } } diff --git a/spring-data-mybatis/src/main/java/org/springframework/data/mybatis/repository/query/MybatisQueryMethod.java b/spring-data-mybatis/src/main/java/org/springframework/data/mybatis/repository/query/MybatisQueryMethod.java index 857abeab3eb3a411d318a8e09cd008461e2ed249..1b5d2b9fdebf32cd6d029eac68a697312f678a85 100644 --- a/spring-data-mybatis/src/main/java/org/springframework/data/mybatis/repository/query/MybatisQueryMethod.java +++ b/spring-data-mybatis/src/main/java/org/springframework/data/mybatis/repository/query/MybatisQueryMethod.java @@ -219,10 +219,11 @@ public class MybatisQueryMethod extends QueryMethod { if (!parameter.isNamedParameter()) { continue; } - + String paramName=parameter.getName().get(); if (StringUtils.isEmpty(annotatedQuery) - || !annotatedQuery.contains(String.format(":%s", parameter.getName().get())) - && !annotatedQuery.contains(String.format("#%s", parameter.getName().get()))) { + || (annotatedQuery.contains(String.format(":%s", paramName)) + || annotatedQuery.contains(String.format("#%s", paramName)) + || annotatedQuery.contains(String.format("#{%s}", paramName)))) { throw new IllegalStateException(String.format( "Using named parameters for method %s but parameter '%s' not found in annotated query '%s'!", this.method, parameter.getName(), annotatedQuery)); diff --git a/spring-data-mybatis/src/main/java/org/springframework/data/mybatis/repository/support/SimpleMybatisRepository.java b/spring-data-mybatis/src/main/java/org/springframework/data/mybatis/repository/support/SimpleMybatisRepository.java index 584f2c539a2d8efd2e4746ccdb9f3f8ff4e299ee..718fcb23fdb8cb0b6ab33e12a8a4ef51230419ab 100644 --- a/spring-data-mybatis/src/main/java/org/springframework/data/mybatis/repository/support/SimpleMybatisRepository.java +++ b/spring-data-mybatis/src/main/java/org/springframework/data/mybatis/repository/support/SimpleMybatisRepository.java @@ -227,15 +227,17 @@ public class SimpleMybatisRepository extends SqlSessionRepositorySupport @Override @Transactional public S save(S entity) { - if (this.entityInformation.hasCompositeId()) { - T target = this.getById(this.entityInformation.getId(entity)); - if (null == target) { - return this.insert(entity); - } - return this.update(entity); + // if (this.entityInformation.hasCompositeId()) { + // T target = this.getById(this.entityInformation.getId(entity)); + // if (null == target) { + // return this.insert(entity); + // } + // return this.update(entity); - } - return this.entityInformation.isNew(entity) ? this.insert(entity) : this.update(entity); + // } + // return this.entityInformation.isNew(entity) ? this.insert(entity) : + // this.update(entity); + return this.insert(entity); } @Override