diff --git a/README.md b/README.md index 53d539d..4a0b919 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@
fenix logo
-[![Build Status](https://secure.travis-ci.org/blinkfox/fenix.svg)](https://travis-ci.org/blinkfox/fenix) [![Javadocs](http://www.javadoc.io/badge/com.blinkfox/fenix.svg)](http://www.javadoc.io/doc/com.blinkfox/fenix) [![GitHub license](https://img.shields.io/github/license/blinkfox/fenix.svg)](https://github.com/blinkfox/fenix/blob/develop/LICENSE) [![fenix](https://img.shields.io/badge/fenix-v2.6.1-blue)](https://search.maven.org/artifact/com.blinkfox/fenix/2.6.1/jar) [![fenix starter](https://img.shields.io/badge/fenix%20spring%20boot%20starter-v2.6.1-blue)](https://search.maven.org/artifact/com.blinkfox/fenix-spring-boot-starter/2.6.1/jar) [![codecov](https://codecov.io/gh/blinkfox/fenix/branch/develop/graph/badge.svg)](https://codecov.io/gh/blinkfox/fenix) +[![Build Status](https://secure.travis-ci.org/blinkfox/fenix.svg)](https://travis-ci.org/blinkfox/fenix) [![Javadocs](http://www.javadoc.io/badge/com.blinkfox/fenix.svg)](http://www.javadoc.io/doc/com.blinkfox/fenix) [![GitHub license](https://img.shields.io/github/license/blinkfox/fenix.svg)](https://github.com/blinkfox/fenix/blob/develop/LICENSE) [![fenix](https://img.shields.io/badge/fenix-v2.7.0-blue)](https://search.maven.org/artifact/com.blinkfox/fenix/2.7.0/jar) [![fenix starter](https://img.shields.io/badge/fenix%20spring%20boot%20starter-v2.7.0-blue)](https://search.maven.org/artifact/com.blinkfox/fenix-spring-boot-starter/2.7.0/jar) [![codecov](https://codecov.io/gh/blinkfox/fenix/branch/develop/graph/badge.svg)](https://codecov.io/gh/blinkfox/fenix) > [🔥 Fenix](https://github.com/blinkfox/fenix)(菲尼克斯)是一个为了解决复杂动态 SQL (`JPQL`) 而生的 `Spring Data JPA` 扩展库,能辅助开发者更方便快捷的书写复杂、动态且易于维护的 SQL,支持 ActiveRecord 模式和多种查询方式。 @@ -40,14 +40,14 @@ com.blinkfox fenix-spring-boot-starter - 2.6.1 + 2.7.0 ``` ### 🌵 2. Gradle ```bash -compile 'com.blinkfox:fenix-spring-boot-starter:2.6.1' +compile 'com.blinkfox:fenix-spring-boot-starter:2.7.0' ``` ### 🏕️ 3. 激活 Fenix (@EnableFenix) diff --git a/docs/quick-install.md b/docs/quick-install.md index ebf0ae2..9b4e2d8 100644 --- a/docs/quick-install.md +++ b/docs/quick-install.md @@ -16,14 +16,14 @@ com.blinkfox fenix-spring-boot-starter - 2.6.1 + 2.7.0 ``` ### 🌵 2. Gradle :id=spring-boot-gradle ```bash -compile 'com.blinkfox:fenix-spring-boot-starter:2.6.1' +compile 'com.blinkfox:fenix-spring-boot-starter:2.7.0' ``` ### 🏕️ 3. 激活 Fenix (@EnableFenix) :id=enable-fenix @@ -100,14 +100,14 @@ fenix: com.blinkfox fenix - 2.6.1 + 2.7.0 ``` ### 🌻 2. Gradle :id=project-gradle ```bash -compile 'com.blinkfox:fenix:2.6.1' +compile 'com.blinkfox:fenix:2.7.0' ``` ### 🏔️ 3. 激活 Fenix :id=project-enable-fenix diff --git a/pom.xml b/pom.xml index a6134c9..d622054 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.blinkfox fenix - 2.7.0-SNAPSHOT + 2.7.0 jar fenix diff --git a/src/main/java/com/blinkfox/fenix/ar/repo/JpaModel.java b/src/main/java/com/blinkfox/fenix/ar/repo/JpaModel.java index 6bac632..8337a99 100644 --- a/src/main/java/com/blinkfox/fenix/ar/repo/JpaModel.java +++ b/src/main/java/com/blinkfox/fenix/ar/repo/JpaModel.java @@ -45,6 +45,7 @@ default void flush() { /** * 保存实体对象中的数据,并立即刷新到数据库中. * + * @param 本实体类或其子类 * @return 保存后的实体对象 */ @Transactional diff --git a/src/main/java/com/blinkfox/fenix/jpa/FenixResultTransformer.java b/src/main/java/com/blinkfox/fenix/jpa/FenixResultTransformer.java index 98c8f58..fea5d6c 100644 --- a/src/main/java/com/blinkfox/fenix/jpa/FenixResultTransformer.java +++ b/src/main/java/com/blinkfox/fenix/jpa/FenixResultTransformer.java @@ -21,8 +21,9 @@ * * @author blinkfox on 2019-10-08. * @author blinkfox on 2022-03-25 (v2.7.0) 做了代码重构,公共代码集成自 {@link AbstractResultTransformer} - * @see com.blinkfox.fenix.jpa.transformer.PrefixUnderscoreTransformer * @see com.blinkfox.fenix.jpa.transformer.UnderscoreTransformer + * @see com.blinkfox.fenix.jpa.transformer.PrefixUnderscoreTransformer + * @see com.blinkfox.fenix.jpa.transformer.ColumnAnnotationTransformer * @since v1.1.0 */ public class FenixResultTransformer extends AbstractResultTransformer { @@ -55,7 +56,7 @@ public class FenixResultTransformer extends AbstractResultTransformer { /** * 做一些初始化操作. * - *

本方法为了保持向以前的版本兼容,重写了父类中的 {@link super#init()} 方法,本方法中的字段都是小写的,不区分大小写.

+ *

本方法的功能能向兼容的以前版本,重写了父类中的 {@code init()} 方法,结果类中属性的字段都是小写的,不区分大小写.

*/ @Override public void init() { diff --git a/src/main/java/com/blinkfox/fenix/jpa/QueryFenix.java b/src/main/java/com/blinkfox/fenix/jpa/QueryFenix.java index 4e478f1..a5c90a5 100755 --- a/src/main/java/com/blinkfox/fenix/jpa/QueryFenix.java +++ b/src/main/java/com/blinkfox/fenix/jpa/QueryFenix.java @@ -83,6 +83,7 @@ *

该属性和 Fenix XML 文件中的 {@code resultType} 同义,后续推荐使用本属性来设置结果类型的 class, * 这样能更好的利用 Java 类的静态编译检查和代码重构后发现一些类路径修改所造成的隐患问题.

* + * @return 结果类型的 class,默认为 {@link Void} 的 class * @since 2.7.0 */ Class resultType() default Void.class; @@ -92,6 +93,7 @@ * *

为了保持向前兼容,默认的转换器仍然使用的是之前版本使用的 {@link FenixResultTransformer} 类的 Class.

* + * @return Fenix 中约定的 {@link AbstractResultTransformer} 的子类 * @see com.blinkfox.fenix.jpa.transformer.UnderscoreTransformer * @see com.blinkfox.fenix.jpa.transformer.PrefixUnderscoreTransformer * @see com.blinkfox.fenix.jpa.transformer.ColumnAnnotationTransformer diff --git a/src/main/java/com/blinkfox/fenix/jpa/transformer/ColumnAnnotationTransformer.java b/src/main/java/com/blinkfox/fenix/jpa/transformer/ColumnAnnotationTransformer.java index 6c60b5d..d2c794c 100644 --- a/src/main/java/com/blinkfox/fenix/jpa/transformer/ColumnAnnotationTransformer.java +++ b/src/main/java/com/blinkfox/fenix/jpa/transformer/ColumnAnnotationTransformer.java @@ -53,7 +53,7 @@ public void init() { } /** - * 用来将各个查询结果列的别名和值注入到 {@link super#resultClass} 的结果对象中的方法. + * 这是用来将各个查询结果列的别名和值注入到父类的 {@code resultClass} 结果对象中的方法. * * @param tuple 值数组 * @param aliases 别名数组 diff --git a/src/main/java/com/blinkfox/fenix/jpa/transformer/UnderscoreTransformer.java b/src/main/java/com/blinkfox/fenix/jpa/transformer/UnderscoreTransformer.java index bd9f0b6..2b1c5d0 100644 --- a/src/main/java/com/blinkfox/fenix/jpa/transformer/UnderscoreTransformer.java +++ b/src/main/java/com/blinkfox/fenix/jpa/transformer/UnderscoreTransformer.java @@ -45,7 +45,7 @@ public void init() { } /** - * 用来将各个查询结果列的别名和值注入到 {@link super#resultClass} 的结果对象中的方法. + * 这是用来将各个查询结果列的别名和值注入到父类 {@code resultClass} 的结果对象中的方法. * * @param tuple 值数组 * @param aliases 别名数组