From 8b30d5be227ada7e88b1787445b6c0487af4c4d5 Mon Sep 17 00:00:00 2001 From: javahongxi Date: Thu, 28 Nov 2019 23:49:14 +0800 Subject: [PATCH] class name optimise --- .../config/{DubboConfig.java => DubboConfiguration.java} | 2 +- .../config/{DubboConfig.java => DubboConfiguration.java} | 2 +- .../config/{MybatisConfig.java => MybatisConfiguration.java} | 2 +- .../annotation/{AppConfig.java => AppConfiguration.java} | 2 +- .../annotation/{JustConfig.java => JustConfiguration.java} | 2 +- .../hongxi/whatsmars/spring/context/annotation/TestSpring.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename whatsmars-dubbo/whatsmars-dubbo-consumer-boot/src/main/java/org/hongxi/whatsmars/dubbo/demo/consumer/config/{DubboConfig.java => DubboConfiguration.java} (94%) rename whatsmars-dubbo/whatsmars-dubbo-provider-boot/src/main/java/org/hongxi/whatsmars/dubbo/demo/provider/config/{DubboConfig.java => DubboConfiguration.java} (94%) rename whatsmars-spring-boot-samples/whatsmars-boot-sample-mybatis/src/main/java/org/hongxi/whatsmars/boot/sample/mybatis/config/{MybatisConfig.java => MybatisConfiguration.java} (99%) rename whatsmars-spring/src/main/java/org/hongxi/whatsmars/spring/context/annotation/{AppConfig.java => AppConfiguration.java} (95%) rename whatsmars-spring/src/main/java/org/hongxi/whatsmars/spring/context/annotation/{JustConfig.java => JustConfiguration.java} (88%) diff --git a/whatsmars-dubbo/whatsmars-dubbo-consumer-boot/src/main/java/org/hongxi/whatsmars/dubbo/demo/consumer/config/DubboConfig.java b/whatsmars-dubbo/whatsmars-dubbo-consumer-boot/src/main/java/org/hongxi/whatsmars/dubbo/demo/consumer/config/DubboConfiguration.java similarity index 94% rename from whatsmars-dubbo/whatsmars-dubbo-consumer-boot/src/main/java/org/hongxi/whatsmars/dubbo/demo/consumer/config/DubboConfig.java rename to whatsmars-dubbo/whatsmars-dubbo-consumer-boot/src/main/java/org/hongxi/whatsmars/dubbo/demo/consumer/config/DubboConfiguration.java index 72ced12d..9be4ac39 100644 --- a/whatsmars-dubbo/whatsmars-dubbo-consumer-boot/src/main/java/org/hongxi/whatsmars/dubbo/demo/consumer/config/DubboConfig.java +++ b/whatsmars-dubbo/whatsmars-dubbo-consumer-boot/src/main/java/org/hongxi/whatsmars/dubbo/demo/consumer/config/DubboConfiguration.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration; * Created by shenhongxi on 2018/11/30. */ @Configuration -public class DubboConfig { +public class DubboConfiguration { /** * 配置文件里配置默认的,这里配置其他需要的 diff --git a/whatsmars-dubbo/whatsmars-dubbo-provider-boot/src/main/java/org/hongxi/whatsmars/dubbo/demo/provider/config/DubboConfig.java b/whatsmars-dubbo/whatsmars-dubbo-provider-boot/src/main/java/org/hongxi/whatsmars/dubbo/demo/provider/config/DubboConfiguration.java similarity index 94% rename from whatsmars-dubbo/whatsmars-dubbo-provider-boot/src/main/java/org/hongxi/whatsmars/dubbo/demo/provider/config/DubboConfig.java rename to whatsmars-dubbo/whatsmars-dubbo-provider-boot/src/main/java/org/hongxi/whatsmars/dubbo/demo/provider/config/DubboConfiguration.java index 50dd8b92..0ed2f2f3 100644 --- a/whatsmars-dubbo/whatsmars-dubbo-provider-boot/src/main/java/org/hongxi/whatsmars/dubbo/demo/provider/config/DubboConfig.java +++ b/whatsmars-dubbo/whatsmars-dubbo-provider-boot/src/main/java/org/hongxi/whatsmars/dubbo/demo/provider/config/DubboConfiguration.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration; * Created by shenhongxi on 2018/11/30. */ @Configuration -public class DubboConfig { +public class DubboConfiguration { /** * 配置文件里配置默认的,这里配置其他需要的 diff --git a/whatsmars-spring-boot-samples/whatsmars-boot-sample-mybatis/src/main/java/org/hongxi/whatsmars/boot/sample/mybatis/config/MybatisConfig.java b/whatsmars-spring-boot-samples/whatsmars-boot-sample-mybatis/src/main/java/org/hongxi/whatsmars/boot/sample/mybatis/config/MybatisConfiguration.java similarity index 99% rename from whatsmars-spring-boot-samples/whatsmars-boot-sample-mybatis/src/main/java/org/hongxi/whatsmars/boot/sample/mybatis/config/MybatisConfig.java rename to whatsmars-spring-boot-samples/whatsmars-boot-sample-mybatis/src/main/java/org/hongxi/whatsmars/boot/sample/mybatis/config/MybatisConfiguration.java index e5bc4de9..431c6c04 100644 --- a/whatsmars-spring-boot-samples/whatsmars-boot-sample-mybatis/src/main/java/org/hongxi/whatsmars/boot/sample/mybatis/config/MybatisConfig.java +++ b/whatsmars-spring-boot-samples/whatsmars-boot-sample-mybatis/src/main/java/org/hongxi/whatsmars/boot/sample/mybatis/config/MybatisConfiguration.java @@ -23,7 +23,7 @@ import java.util.List; * Created by shenhongxi on 2018/12/9. */ @Configuration -public class MybatisConfig { +public class MybatisConfiguration { @MapperScan(basePackages = "org.hongxi.whatsmars.boot.sample.mybatis.dao.user", sqlSessionTemplateRef = "userSqlSessionTemplate") private class userMapperScan {} diff --git a/whatsmars-spring/src/main/java/org/hongxi/whatsmars/spring/context/annotation/AppConfig.java b/whatsmars-spring/src/main/java/org/hongxi/whatsmars/spring/context/annotation/AppConfiguration.java similarity index 95% rename from whatsmars-spring/src/main/java/org/hongxi/whatsmars/spring/context/annotation/AppConfig.java rename to whatsmars-spring/src/main/java/org/hongxi/whatsmars/spring/context/annotation/AppConfiguration.java index 37f24fd3..037adb12 100644 --- a/whatsmars-spring/src/main/java/org/hongxi/whatsmars/spring/context/annotation/AppConfig.java +++ b/whatsmars-spring/src/main/java/org/hongxi/whatsmars/spring/context/annotation/AppConfiguration.java @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration; */ //@Configuration @ComponentScan //("org.hongxi.whatsmars.spring.context.annotation.service") -public class AppConfig { +public class AppConfiguration { @Autowired private DemoService demoService; diff --git a/whatsmars-spring/src/main/java/org/hongxi/whatsmars/spring/context/annotation/JustConfig.java b/whatsmars-spring/src/main/java/org/hongxi/whatsmars/spring/context/annotation/JustConfiguration.java similarity index 88% rename from whatsmars-spring/src/main/java/org/hongxi/whatsmars/spring/context/annotation/JustConfig.java rename to whatsmars-spring/src/main/java/org/hongxi/whatsmars/spring/context/annotation/JustConfiguration.java index b1cab65d..eced2fa7 100644 --- a/whatsmars-spring/src/main/java/org/hongxi/whatsmars/spring/context/annotation/JustConfig.java +++ b/whatsmars-spring/src/main/java/org/hongxi/whatsmars/spring/context/annotation/JustConfiguration.java @@ -3,7 +3,7 @@ package org.hongxi.whatsmars.spring.context.annotation; import org.hongxi.whatsmars.spring.model.Earth; import org.springframework.context.annotation.Bean; -public class JustConfig { +public class JustConfiguration { @Bean public Earth earth() { diff --git a/whatsmars-spring/src/main/java/org/hongxi/whatsmars/spring/context/annotation/TestSpring.java b/whatsmars-spring/src/main/java/org/hongxi/whatsmars/spring/context/annotation/TestSpring.java index 66c6e564..deb7d944 100644 --- a/whatsmars-spring/src/main/java/org/hongxi/whatsmars/spring/context/annotation/TestSpring.java +++ b/whatsmars-spring/src/main/java/org/hongxi/whatsmars/spring/context/annotation/TestSpring.java @@ -23,7 +23,7 @@ public class TestSpring { public static void main(String[] args) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - ctx.register(AppConfig.class, JustConfig.class); + ctx.register(AppConfiguration.class, JustConfiguration.class); ctx.scan("org.hongxi.whatsmars.spring.context.annotation.repository"); ctx.refresh(); Mars mars = ctx.getBean(Mars.class); -- GitLab