diff --git a/README.md b/README.md index d09271c..5564159 100644 --- a/README.md +++ b/README.md @@ -192,7 +192,7 @@ public class User { ```xml - 1.4.6 + 1.4.8 diff --git a/docs/README.md b/docs/README.md index e4b15d1..b9ccde3 100644 --- a/docs/README.md +++ b/docs/README.md @@ -61,18 +61,24 @@ footer: io.github.linpeilie mapstruct-plus-spring-boot-starter - 1.4.6 + 1.4.8 ``` - gradle ```groovy -implementation group: 'io.github.linpeilie', name: 'mapstruct-plus-spring-boot-starter', version: '1.4.6' +implementation group: 'io.github.linpeilie', name: 'mapstruct-plus-spring-boot-starter', version: '1.4.8' ``` ## 更新日志 +### 1.4.8 + +- 修复在 Vscode 软件中，默认使用 Eclipse jdt.core 环境下，生成的转换实现类冲突的问题； +- 重新打包 javapoet，防止与其他项目冲突； +- 升级 `spring-boot-autoconfigure` 版本号 `2.7.9` ---> `2.7.18` + ### 1.4.6 - 修改 `SpringContextUtils` 类名，防止与其他项目类名冲突； @@ -87,39 +93,6 @@ implementation group: 'io.github.linpeilie', name: 'mapstruct-plus-spring-boot-s - fix: 修复部分Spring版本下找不到类的问题 -### 1.4.3 - -- feat: `ComponentModel` 增加 `spring-lazy` 可选项，懒加载 Spring Bean，解决互相依赖的问题，并将默认配置改为该选项； -- fix: 解决 `unmappedTargetPolicy` 默认配置不生效的问题； -- enhance: 优化 IDEA 本地开发构建效率，一定程度上缩短构建时间、减小元空间占用；[Issue #89](https://github.com/linpeilie/mapstruct-plus/issues/89) - -### 1.4.2 - -- feat: `AutoMapper` 注解增加 `mapperNameSuffix` 属性，支持配置生成的转换接口名称增加后缀，默认规则下生成的反向转换接口同时生效； -- feat : 适配 `Mapper` 注解的 `unmappedSourcePolicy`、`unmappedTargetPolicy`、`typeConversionPolicy`、`collectionMappingStrategy`、`nullValueMappingStrategy`、`nullValueIterableMappingStrategy`、`nullValuePropertyMappingStrategy`、`nullValueCheckStrategy`、`mappingControl` 属性； -- feat : 适配 `Mapping` 注解的 `constant`、`qualifiedBy`、`nullValueCheckStrategy`、`nullValuePropertyMappingStrategy`、`mappingControl`； -- feat : 适配 MapStruct 配置的 `typeConversionPolicy`、`collectionMappingStrategy`、`nullValueIterableMappingStrategy`、`nullValueMapMappingStrategy`、`nullValueCheckStrategy`、`mappingControl`、`unexpectedValueMappingException`、`suppressTimestampInGenerated` 属性； -- fix : 适配同一个模块中同类不同包生成类名冲突的问题； -- feat : `AutoMapping` 注解增加 `reverseConvertGenerate`，控制是否生成反向转换逻辑，适配更加复杂的应用场景； -- fix : 修复 `targetClass` 同时配置父类和子类时，转换规则冲突的问题； -- fix : 修复不同模块配置类、代理类类名冲突的问题； -- feat : `AutoMapper` 增加 `useEnums` 属性，支持手动配置转换时需要的枚举，解决跨模块枚举无法自动转换的问题； -- 优化转换接口生成逻辑； - -### 1.4.0 - -- **优化复杂对象转换逻辑，占用元空间更小！性能更快！** -- 去除 hutool 等依赖，目前项目中只依赖了 MapStruct -- 适配对象循环嵌套场景 -- [feature#63](https://github.com/linpeilie/mapstruct-plus/pull/63)`AutoMapping`、`ReverseAutoMapping` 支持 `qualifiedByName`、`conditionQualifiedByName` 和 `dependsOn` 属性 -- [issue#I93Z2Z](https://gitee.com/easii/mapstruct-plus/issues/I93Z2Z)`AutoMappings` 支持配置在方法上面 - -> 升级 1.4.0 注意事项： -> - 1.4.0 及以后的版本，复杂对象比较依赖项目中生成的 `ConvertMapperAdapter`， -> 在多模块下，由于类加载机制只会加载一个的原因，可能会导致 [`NoSuchMethodError`](/guide/faq.html) 的异常， -> 当然，这个问题在之前也会有，几率可能低一些，所以多模块下，务必配置 `adapterPackage` 来避免该问题。 -> - Map 与对象的转换，还是依赖 hutool 中的类转换实现，如果需要该功能，需要额外引入 `hutool-core` 依赖包。 - …… ## 代码仓库 diff --git a/docs/en/README.md b/docs/en/README.md index d3063e7..297338a 100644 --- a/docs/en/README.md +++ b/docs/en/README.md @@ -58,18 +58,24 @@ fotter: io.github.linpeilie mapstruct-plus-spring-boot-starter - 1.4.6 + 1.4.8 ``` - gradle ```groovy -implementation group: 'io.github.linpeilie', name: 'mapstruct-plus-spring-boot-starter', version: '1.4.6' +implementation group: 'io.github.linpeilie', name: 'mapstruct-plus-spring-boot-starter', version: '1.4.8' ``` ## Change Log +### 1.4.8 + +- Fixed the issue where the generated conversion implementation class conflicted when using the default `Eclipse jdt.core` environment in Vscode; +- Repackaged `javapoet` to prevent conflicts with other projects. +- Upgraded spring-boot-autoconfigure version from 2.7.9 to 2.7.18. + ### 1.4.6 - Modify the `SpringContextUtils` class name to prevent conflicts with other project class names; @@ -91,42 +97,6 @@ implementation group: 'io.github.linpeilie', name: 'mapstruct-plus-spring-boot-s - **fix**: Fixed the issue where the default configuration for `unmappedTargetPolicy` was not effective. - **enhance**: Optimized IDEA local development build efficiency, reducing build time and metaspace usage to some extent.[Issue #89](https://github.com/linpeilie/mapstruct-plus/issues/89) -### 1.4.2 - -- **feat**: Added the `mapperNameSuffix` attribute to the `AutoMapper` annotation. This supports adding a suffix to the generated conversion interface name, and the reverse conversion interface will be effective under the default rules. -- **feat**: Adapted the `Mapper` annotation to support the following attributes: `unmappedSourcePolicy`, `unmappedTargetPolicy`, `typeConversionPolicy`, `collectionMappingStrategy`, `nullValueMappingStrategy`, `nullValueIterableMappingStrategy`, `nullValuePropertyMappingStrategy`, `nullValueCheckStrategy`, and `mappingControl`. -- **feat**: Adapted the `Mapping` annotation to support the following attributes: `constant`, `qualifiedBy`, `nullValueCheckStrategy`, `nullValuePropertyMappingStrategy`, and `mappingControl`. -- **feat**: Adapted MapStruct configuration to support the following attributes: `typeConversionPolicy`, `collectionMappingStrategy`, `nullValueIterableMappingStrategy`, `nullValueMapMappingStrategy`, `nullValueCheckStrategy`, `mappingControl`, `unexpectedValueMappingException`, and `suppressTimestampInGenerated`. -- **fix**: Resolved the issue of class name conflicts generated in different packages within the same module. -- **feat**: Added the `reverseConvertGenerate` attribute to the `AutoMapping` annotation to control whether to generate reverse conversion logic, adapting to more complex application scenarios. -- **fix**: Fixed the issue of conversion rule conflicts when both parent and child classes are configured in `targetClass`. -- **fix**: Resolved class name conflicts of configuration classes and proxy classes in different modules. -- **feat**: Added the `useEnums` attribute to `AutoMapper`, supporting manual configuration of required enums for conversion, solving the issue of automatic conversion of enums across modules. -- Optimized the logic for generating conversion interfaces. - -### 1.4.0 - -- **Optimize complex object conversion logic, take up less meta-space! and faster!** -- Get rid of dependencies such as hutool, which currently only rely on MapStruct in the project. -- The adaptation object loop nesting scenario -- [feature#63](https://github.com/linpeilie/mapstruct-plus/pull/63) `AutoMapping`、`ReverseAutoMapping` supports `qualifiedByName`,`conditionQualifiedByName`,and `dependsOn` properties. -- [issue#I93Z2Z](https://gitee.com/easii/mapstruct-plus/issues/I93Z2Z) `AutoMappings` supports configuration on methods. - -> Points to note for upgrading 1.4.0 -> - 1.4.0 and later versions, complex object comparisons reply on `ConvertMapperAdapter` generated in the project, - which may cause [`NoSuchMethodError`](/guide/faq.html) exceptions under multiple modules because the Class Loading mechanism - will load only one, of course, this problem has been around before, and the odds are probably lower, - so be sure to configure the `adapterPackage` to avoid this problem with multiple modules. -> - Map to object conversions still rely on class conversions in hutool, and additional `hutool-core` dependencies need to be introduced if this - functionality is required. - -### 1.3.6 - -- Compatible with internal class conversion. -- The targetClass in the AutoMapping annotation supports configuring the parent class. -- AutoMapperConfig and AutoMapMapperConfig package and class name generated automatically by the framework support configuration. -- Supports AutoMapping annotations configured in the parent class. - …… ## Code Warehouse diff --git a/docs/en/release/log.md b/docs/en/release/log.md index d7b0a78..3c3f5c2 100644 --- a/docs/en/release/log.md +++ b/docs/en/release/log.md @@ -6,6 +6,12 @@ category: description: MapStructPlus release log --- +### 1.4.8 + +- Fixed the issue where the generated conversion implementation class conflicted when using the default `Eclipse jdt.core` environment in Vscode; +- Repackaged `javapoet` to prevent conflicts with other projects. +- Upgraded spring-boot-autoconfigure version from 2.7.9 to 2.7.18. + ### 1.4.6 - Modify the `SpringContextUtils` class name to prevent conflicts with other project class names; diff --git a/docs/release/log.md b/docs/release/log.md index 4ca52a4..52950ef 100644 --- a/docs/release/log.md +++ b/docs/release/log.md @@ -6,6 +6,12 @@ category: description: MapStructPlus release log --- +### 1.4.8 + +- 修复在 Vscode 软件中，默认使用 Eclipse jdt.core 环境下，生成的转换实现类冲突的问题； +- 重新打包 javapoet，防止与其他项目冲突； +- 升级 `spring-boot-autoconfigure` 版本号 `2.7.9` ---> `2.7.18` + ### 1.4.6 - 修改 `SpringContextUtils` 类名，防止与其他项目类名冲突； diff --git a/example/pom.xml b/example/pom.xml index c822a19..b7883e0 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -18,7 +18,7 @@ UTF-8 1.5.1.Final - 1.4.6 + 1.4.8 1.18.22 5.8.26 32.1.3-jre diff --git a/mapstruct-plus-processor/pom.xml b/mapstruct-plus-processor/pom.xml index 6676744..24b2bc4 100644 --- a/mapstruct-plus-processor/pom.xml +++ b/mapstruct-plus-processor/pom.xml @@ -24,8 +24,8 @@ mapstruct-plus - com.baidu.lbsyun - javapoet + cn.easii + tutelary-repackage-javapoet org.mapstruct diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AbstractAdapterMapperGenerator.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AbstractAdapterMapperGenerator.java index 426b5c3..5c1398e 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AbstractAdapterMapperGenerator.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AbstractAdapterMapperGenerator.java @@ -1,13 +1,13 @@ package io.github.linpeilie.processor; -import com.squareup.javapoet.ClassName; -import com.squareup.javapoet.CodeBlock; -import com.squareup.javapoet.JavaFile; -import com.squareup.javapoet.MethodSpec; -import com.squareup.javapoet.ParameterSpec; -import com.squareup.javapoet.ParameterizedTypeName; -import com.squareup.javapoet.TypeName; -import com.squareup.javapoet.TypeSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.ClassName; +import cn.easii.tutelary.deps.com.squareup.javapoet.CodeBlock; +import cn.easii.tutelary.deps.com.squareup.javapoet.JavaFile; +import cn.easii.tutelary.deps.com.squareup.javapoet.MethodSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.ParameterSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.ParameterizedTypeName; +import cn.easii.tutelary.deps.com.squareup.javapoet.TypeName; +import cn.easii.tutelary.deps.com.squareup.javapoet.TypeSpec; import io.github.linpeilie.processor.metadata.AbstractAdapterMethodMetadata; import io.github.linpeilie.processor.metadata.AdapterMapMethodMetadata; import io.github.linpeilie.processor.metadata.AdapterMethodMetadata; diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AutoMapperProcessor.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AutoMapperProcessor.java index 97d52fd..d2906c0 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AutoMapperProcessor.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AutoMapperProcessor.java @@ -1,9 +1,9 @@ package io.github.linpeilie.processor; -import com.squareup.javapoet.ArrayTypeName; -import com.squareup.javapoet.ClassName; -import com.squareup.javapoet.ParameterizedTypeName; -import com.squareup.javapoet.TypeName; +import cn.easii.tutelary.deps.com.squareup.javapoet.ArrayTypeName; +import cn.easii.tutelary.deps.com.squareup.javapoet.ClassName; +import cn.easii.tutelary.deps.com.squareup.javapoet.ParameterizedTypeName; +import cn.easii.tutelary.deps.com.squareup.javapoet.TypeName; import io.github.linpeilie.annotations.AutoEnumMapper; import io.github.linpeilie.annotations.AutoMapMapper; import io.github.linpeilie.annotations.ComponentModelConfig; diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AutoMapperProperties.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AutoMapperProperties.java index 6631d1e..f6ac6d2 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AutoMapperProperties.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AutoMapperProperties.java @@ -1,6 +1,7 @@ package io.github.linpeilie.processor; -import com.squareup.javapoet.ClassName; +import cn.easii.tutelary.deps.com.squareup.javapoet.ClassName; +import io.github.linpeilie.processor.utils.FileUtils; import io.github.linpeilie.processor.utils.IncrementMarkUtils; import javax.lang.model.type.TypeMirror; diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/BuildCollator.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/BuildCollator.java index 8f2f222..e1ff884 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/BuildCollator.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/BuildCollator.java @@ -1,7 +1,7 @@ package io.github.linpeilie.processor; -import com.squareup.javapoet.ClassName; -import com.squareup.javapoet.TypeName; +import cn.easii.tutelary.deps.com.squareup.javapoet.ClassName; +import cn.easii.tutelary.deps.com.squareup.javapoet.TypeName; import io.github.linpeilie.processor.utils.FileUtils; import io.github.linpeilie.utils.CollectionUtils; import java.io.File; diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/AutoEnumMapperGenerator.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/AutoEnumMapperGenerator.java index 6674c53..8bce1c3 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/AutoEnumMapperGenerator.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/AutoEnumMapperGenerator.java @@ -1,10 +1,10 @@ package io.github.linpeilie.processor.generator; -import com.squareup.javapoet.CodeBlock; -import com.squareup.javapoet.JavaFile; -import com.squareup.javapoet.MethodSpec; -import com.squareup.javapoet.ParameterSpec; -import com.squareup.javapoet.TypeSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.CodeBlock; +import cn.easii.tutelary.deps.com.squareup.javapoet.JavaFile; +import cn.easii.tutelary.deps.com.squareup.javapoet.MethodSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.ParameterSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.TypeSpec; import io.github.linpeilie.processor.metadata.AutoEnumMapperMetadata; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/AutoMapperGenerator.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/AutoMapperGenerator.java index f53bb48..40a674c 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/AutoMapperGenerator.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/AutoMapperGenerator.java @@ -1,14 +1,14 @@ package io.github.linpeilie.processor.generator; -import com.squareup.javapoet.AnnotationSpec; -import com.squareup.javapoet.ClassName; -import com.squareup.javapoet.CodeBlock; -import com.squareup.javapoet.JavaFile; -import com.squareup.javapoet.MethodSpec; -import com.squareup.javapoet.ParameterSpec; -import com.squareup.javapoet.ParameterizedTypeName; -import com.squareup.javapoet.TypeName; -import com.squareup.javapoet.TypeSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.AnnotationSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.ClassName; +import cn.easii.tutelary.deps.com.squareup.javapoet.CodeBlock; +import cn.easii.tutelary.deps.com.squareup.javapoet.JavaFile; +import cn.easii.tutelary.deps.com.squareup.javapoet.MethodSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.ParameterSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.ParameterizedTypeName; +import cn.easii.tutelary.deps.com.squareup.javapoet.TypeName; +import cn.easii.tutelary.deps.com.squareup.javapoet.TypeSpec; import io.github.linpeilie.processor.ContextConstants; import io.github.linpeilie.processor.metadata.AutoMapperMetadata; import io.github.linpeilie.processor.metadata.AutoMappingMetadata; diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/DefaultAdapterMapperGenerator.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/DefaultAdapterMapperGenerator.java index 67c604c..f660863 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/DefaultAdapterMapperGenerator.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/DefaultAdapterMapperGenerator.java @@ -1,10 +1,10 @@ package io.github.linpeilie.processor.generator; -import com.squareup.javapoet.ClassName; -import com.squareup.javapoet.CodeBlock; -import com.squareup.javapoet.MethodSpec; -import com.squareup.javapoet.ParameterSpec; -import com.squareup.javapoet.TypeSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.ClassName; +import cn.easii.tutelary.deps.com.squareup.javapoet.CodeBlock; +import cn.easii.tutelary.deps.com.squareup.javapoet.MethodSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.ParameterSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.TypeSpec; import io.github.linpeilie.processor.AbstractAdapterMapperGenerator; import io.github.linpeilie.processor.metadata.AbstractAdapterMethodMetadata; import java.util.Collection; diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/IocAdapterMapperGenerator.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/IocAdapterMapperGenerator.java index 540edbd..9c023fc 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/IocAdapterMapperGenerator.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/IocAdapterMapperGenerator.java @@ -1,11 +1,11 @@ package io.github.linpeilie.processor.generator; -import com.squareup.javapoet.AnnotationSpec; -import com.squareup.javapoet.ClassName; -import com.squareup.javapoet.CodeBlock; -import com.squareup.javapoet.FieldSpec; -import com.squareup.javapoet.MethodSpec; -import com.squareup.javapoet.TypeSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.AnnotationSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.ClassName; +import cn.easii.tutelary.deps.com.squareup.javapoet.CodeBlock; +import cn.easii.tutelary.deps.com.squareup.javapoet.FieldSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.MethodSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.TypeSpec; import io.github.linpeilie.processor.AbstractAdapterMapperGenerator; import io.github.linpeilie.processor.metadata.AbstractAdapterMethodMetadata; import io.github.linpeilie.utils.CollectionUtils; diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/MapperConfigGenerator.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/MapperConfigGenerator.java index 4246e38..dbf0e1f 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/MapperConfigGenerator.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/MapperConfigGenerator.java @@ -1,10 +1,10 @@ package io.github.linpeilie.processor.generator; -import com.squareup.javapoet.AnnotationSpec; -import com.squareup.javapoet.ClassName; -import com.squareup.javapoet.CodeBlock; -import com.squareup.javapoet.JavaFile; -import com.squareup.javapoet.TypeSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.AnnotationSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.ClassName; +import cn.easii.tutelary.deps.com.squareup.javapoet.CodeBlock; +import cn.easii.tutelary.deps.com.squareup.javapoet.JavaFile; +import cn.easii.tutelary.deps.com.squareup.javapoet.TypeSpec; import io.github.linpeilie.processor.AutoMapperProperties; import io.github.linpeilie.utils.CollectionUtils; import java.io.IOException; diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/SolonAdapterMapperGenerator.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/SolonAdapterMapperGenerator.java index bbc26bf..0420fc7 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/SolonAdapterMapperGenerator.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/SolonAdapterMapperGenerator.java @@ -1,7 +1,7 @@ package io.github.linpeilie.processor.generator; -import com.squareup.javapoet.AnnotationSpec; -import com.squareup.javapoet.ClassName; +import cn.easii.tutelary.deps.com.squareup.javapoet.AnnotationSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.ClassName; import io.github.linpeilie.utils.CollectionUtils; import java.util.Collection; import java.util.List; diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/SpringAdapterMapperGenerator.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/SpringAdapterMapperGenerator.java index e8f3337..4cf947c 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/SpringAdapterMapperGenerator.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/SpringAdapterMapperGenerator.java @@ -1,7 +1,7 @@ package io.github.linpeilie.processor.generator; -import com.squareup.javapoet.AnnotationSpec; -import com.squareup.javapoet.ClassName; +import cn.easii.tutelary.deps.com.squareup.javapoet.AnnotationSpec; +import cn.easii.tutelary.deps.com.squareup.javapoet.ClassName; import io.github.linpeilie.utils.CollectionUtils; import java.util.List; diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AbstractAdapterMethodMetadata.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AbstractAdapterMethodMetadata.java index ec5de7a..5668464 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AbstractAdapterMethodMetadata.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AbstractAdapterMethodMetadata.java @@ -1,7 +1,7 @@ package io.github.linpeilie.processor.metadata; -import com.squareup.javapoet.ClassName; -import com.squareup.javapoet.TypeName; +import cn.easii.tutelary.deps.com.squareup.javapoet.ClassName; +import cn.easii.tutelary.deps.com.squareup.javapoet.TypeName; public abstract class AbstractAdapterMethodMetadata { diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AbstractMapperMetadata.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AbstractMapperMetadata.java index b36a605..e02526c 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AbstractMapperMetadata.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AbstractMapperMetadata.java @@ -1,6 +1,6 @@ package io.github.linpeilie.processor.metadata; -import com.squareup.javapoet.ClassName; +import cn.easii.tutelary.deps.com.squareup.javapoet.ClassName; import io.github.linpeilie.processor.AutoMapperProperties; import io.github.linpeilie.processor.utils.MapperUtils; import io.github.linpeilie.utils.StrUtil; diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AdapterEnumMethodMetadata.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AdapterEnumMethodMetadata.java index 53fecf3..a54d57c 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AdapterEnumMethodMetadata.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AdapterEnumMethodMetadata.java @@ -1,7 +1,7 @@ package io.github.linpeilie.processor.metadata; -import com.squareup.javapoet.ClassName; -import com.squareup.javapoet.TypeName; +import cn.easii.tutelary.deps.com.squareup.javapoet.ClassName; +import cn.easii.tutelary.deps.com.squareup.javapoet.TypeName; public class AdapterEnumMethodMetadata extends AbstractAdapterMethodMetadata { diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AdapterMapMethodMetadata.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AdapterMapMethodMetadata.java index b6cae0f..8f492c2 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AdapterMapMethodMetadata.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AdapterMapMethodMetadata.java @@ -1,6 +1,6 @@ package io.github.linpeilie.processor.metadata; -import com.squareup.javapoet.ClassName; +import cn.easii.tutelary.deps.com.squareup.javapoet.ClassName; import java.lang.annotation.Target; public class AdapterMapMethodMetadata extends AbstractAdapterMethodMetadata { diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AdapterMethodMetadata.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AdapterMethodMetadata.java index 6788406..0fa2f8e 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AdapterMethodMetadata.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AdapterMethodMetadata.java @@ -1,6 +1,6 @@ package io.github.linpeilie.processor.metadata; -import com.squareup.javapoet.ClassName; +import cn.easii.tutelary.deps.com.squareup.javapoet.ClassName; import io.github.linpeilie.utils.ClassUtil; public class AdapterMethodMetadata extends AbstractAdapterMethodMetadata { diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoEnumMapperMetadata.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoEnumMapperMetadata.java index 55e8df4..83d8861 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoEnumMapperMetadata.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoEnumMapperMetadata.java @@ -1,6 +1,6 @@ package io.github.linpeilie.processor.metadata; -import com.squareup.javapoet.TypeName; +import cn.easii.tutelary.deps.com.squareup.javapoet.TypeName; import io.github.linpeilie.processor.utils.MapperUtils; public class AutoEnumMapperMetadata extends AbstractMapperMetadata { diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoMapMapperMetadata.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoMapMapperMetadata.java index 36a55ab..da7d2b8 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoMapMapperMetadata.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoMapMapperMetadata.java @@ -1,6 +1,6 @@ package io.github.linpeilie.processor.metadata; -import com.squareup.javapoet.ClassName; +import cn.easii.tutelary.deps.com.squareup.javapoet.ClassName; import io.github.linpeilie.processor.AutoMapperProperties; import io.github.linpeilie.utils.StrUtil; diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoMapperMetadata.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoMapperMetadata.java index e8b248e..3dbc81d 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoMapperMetadata.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoMapperMetadata.java @@ -1,7 +1,7 @@ package io.github.linpeilie.processor.metadata; -import com.squareup.javapoet.ClassName; -import com.squareup.javapoet.TypeName; +import cn.easii.tutelary.deps.com.squareup.javapoet.ClassName; +import cn.easii.tutelary.deps.com.squareup.javapoet.TypeName; import io.github.linpeilie.processor.utils.MapperUtils; import io.github.linpeilie.utils.StrUtil; import java.util.ArrayList; diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoMappingMetadata.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoMappingMetadata.java index 1fb66a5..6188e64 100644 --- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoMappingMetadata.java +++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoMappingMetadata.java @@ -1,6 +1,6 @@ package io.github.linpeilie.processor.metadata; -import com.squareup.javapoet.ClassName; +import cn.easii.tutelary.deps.com.squareup.javapoet.ClassName; import io.github.linpeilie.processor.ContextConstants; import java.util.ArrayList; import java.util.List; diff --git a/mapstruct-plus-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/mapstruct-plus-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 78ca476..b709847 100644 --- a/mapstruct-plus-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/mapstruct-plus-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1 @@ -io.github.linpeilie.processor.AutoMapperProcessor -org.mapstruct.ap.MappingProcessor \ No newline at end of file +io.github.linpeilie.processor.AutoMapperProcessor \ No newline at end of file diff --git a/mapstruct-plus-spring-boot-starter/pom.xml b/mapstruct-plus-spring-boot-starter/pom.xml index 852a752..1a383bd 100644 --- a/mapstruct-plus-spring-boot-starter/pom.xml +++ b/mapstruct-plus-spring-boot-starter/pom.xml @@ -16,7 +16,7 @@ 8 8 UTF-8 - 2.7.9 + 2.7.18 diff --git a/pom.xml b/pom.xml index 6f70c27..57c5cc2 100644 --- a/pom.xml +++ b/pom.xml @@ -46,9 +46,9 @@ ${mapstruct-plus.version} - com.baidu.lbsyun - javapoet - 1.9.0 + cn.easii + tutelary-repackage-javapoet + 1.0.5 org.mapstruct @@ -185,6 +185,7 @@ ossrh https://s01.oss.sonatype.org/ false + 20