Apply rename class name of velocity language driver

See gh-300
mybatis · May 4, 2019 · 03750bc · 03750bc
1 parent 69ceefc
commit 03750bc
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 19 deletions.
diff --git a/...in/java/org/mybatis/spring/boot/autoconfigure/MybatisLanguageDriverAutoConfiguration.java b/...in/java/org/mybatis/spring/boot/autoconfigure/MybatisLanguageDriverAutoConfiguration.java
@@ -20,7 +20,7 @@
 import org.mybatis.scripting.freemarker.FreeMarkerLanguageDriverConfig;
 import org.mybatis.scripting.thymeleaf.ThymeleafLanguageDriver;
 import org.mybatis.scripting.thymeleaf.ThymeleafLanguageDriverConfig;
-import org.mybatis.scripting.velocity.Driver;
+import org.mybatis.scripting.velocity.VelocityLanguageDriver;
 import org.mybatis.scripting.velocity.VelocityLanguageDriverConfig;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -80,26 +80,27 @@ public FreeMarkerLanguageDriverConfig freeMarkerLanguageDriverConfig() {
    * Configuration class for mybatis-velocity 2.0 or under.
    */
   @Configuration
-  @ConditionalOnClass(Driver.class)
+  @ConditionalOnClass(org.mybatis.scripting.velocity.Driver.class)
   @ConditionalOnMissingClass("org.mybatis.scripting.velocity.VelocityLanguageDriverConfig")
+  @SuppressWarnings("deprecation")
   public static class LegacyVelocityConfiguration {
     @Bean
     @ConditionalOnMissingBean
-    Driver velocityLanguageDriver() {
-      return new Driver();
+    org.mybatis.scripting.velocity.Driver velocityLanguageDriver() {
+      return new org.mybatis.scripting.velocity.Driver();
     }
   }
 
   /**
    * Configuration class for mybatis-velocity 2.1.x or above.
    */
   @Configuration
-  @ConditionalOnClass({ Driver.class, VelocityLanguageDriverConfig.class })
+  @ConditionalOnClass({ VelocityLanguageDriver.class, VelocityLanguageDriverConfig.class })
   public static class VelocityConfiguration {
     @Bean
     @ConditionalOnMissingBean
-    Driver velocityLanguageDriver(VelocityLanguageDriverConfig config) {
-      return new Driver(config);
+    VelocityLanguageDriver velocityLanguageDriver(VelocityLanguageDriverConfig config) {
+      return new VelocityLanguageDriver(config);
     }
 
     @Bean

diff --git a/...ure/src/test/java/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfigurationTest.java b/...ure/src/test/java/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfigurationTest.java
@@ -50,7 +50,7 @@
 import org.mockito.Mockito;
 import org.mybatis.scripting.freemarker.FreeMarkerLanguageDriver;
 import org.mybatis.scripting.thymeleaf.ThymeleafLanguageDriver;
-import org.mybatis.scripting.velocity.Driver;
+import org.mybatis.scripting.velocity.VelocityLanguageDriver;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.annotation.MapperScan;
@@ -144,15 +144,15 @@ void testDefaultConfiguration() {
     assertThat(languageDriverBeans).hasSize(3).containsKeys("freeMarkerLanguageDriver", "velocityLanguageDriver",
         "thymeleafLanguageDriver");
     assertThat(languageDriverBeans.get("freeMarkerLanguageDriver")).isInstanceOf(FreeMarkerLanguageDriver.class);
-    assertThat(languageDriverBeans.get("velocityLanguageDriver")).isInstanceOf(Driver.class);
+    assertThat(languageDriverBeans.get("velocityLanguageDriver")).isInstanceOf(VelocityLanguageDriver.class);
     assertThat(languageDriverBeans.get("thymeleafLanguageDriver")).isInstanceOf(ThymeleafLanguageDriver.class);
     LanguageDriverRegistry languageDriverRegistry = sqlSessionFactory.getConfiguration().getLanguageRegistry();
     assertThat(languageDriverRegistry.getDefaultDriverClass()).isEqualTo(XMLLanguageDriver.class);
     assertThat(languageDriverRegistry.getDefaultDriver()).isInstanceOf(XMLLanguageDriver.class);
     assertThat(languageDriverRegistry.getDriver(XMLLanguageDriver.class)).isNotNull();
     assertThat(languageDriverRegistry.getDriver(RawLanguageDriver.class)).isNotNull();
     assertThat(languageDriverRegistry.getDriver(FreeMarkerLanguageDriver.class)).isNotNull();
-    assertThat(languageDriverRegistry.getDriver(Driver.class)).isNotNull();
+    assertThat(languageDriverRegistry.getDriver(VelocityLanguageDriver.class)).isNotNull();
     assertThat(languageDriverRegistry.getDriver(ThymeleafLanguageDriver.class)).isNotNull();
   }
 

diff --git a/...ava/org/mybatis/spring/boot/autoconfigure/MybatisLanguageDriverAutoConfigurationTest.java b/...ava/org/mybatis/spring/boot/autoconfigure/MybatisLanguageDriverAutoConfigurationTest.java
@@ -40,8 +40,8 @@
 import org.mybatis.scripting.thymeleaf.TemplateEngineCustomizer;
 import org.mybatis.scripting.thymeleaf.ThymeleafLanguageDriver;
 import org.mybatis.scripting.thymeleaf.ThymeleafLanguageDriverConfig;
-import org.mybatis.scripting.velocity.Driver;
 import org.mybatis.scripting.velocity.VelocityFacade;
+import org.mybatis.scripting.velocity.VelocityLanguageDriver;
 import org.mybatis.scripting.velocity.VelocityLanguageDriverConfig;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.util.TestPropertyValues;
@@ -82,7 +82,7 @@ void testDefaultConfiguration() {
     assertThat(languageDriverBeans).hasSize(3).containsKeys("freeMarkerLanguageDriver", "velocityLanguageDriver",
         "thymeleafLanguageDriver");
     assertThat(languageDriverBeans.get("freeMarkerLanguageDriver")).isInstanceOf(FreeMarkerLanguageDriver.class);
-    assertThat(languageDriverBeans.get("velocityLanguageDriver")).isInstanceOf(Driver.class);
+    assertThat(languageDriverBeans.get("velocityLanguageDriver")).isInstanceOf(VelocityLanguageDriver.class);
     assertThat(languageDriverBeans.get("thymeleafLanguageDriver")).isInstanceOf(ThymeleafLanguageDriver.class);
     {
       ThymeleafLanguageDriverConfig config = this.context.getBean(ThymeleafLanguageDriverConfig.class);
@@ -107,7 +107,9 @@ void testDefaultConfiguration() {
     }
     {
       VelocityLanguageDriverConfig config = this.context.getBean(VelocityLanguageDriverConfig.class);
-      assertThat(config.getUserdirective()).hasSize(0);
+      @SuppressWarnings("deprecation")
+      String[] userDirective = config.getUserdirective();
+      assertThat(userDirective).hasSize(0);
       assertThat(config.getAdditionalContextAttributes()).hasSize(0);
       assertThat(config.getVelocitySettings()).hasSize(2);
       assertThat(config.getVelocitySettings().get(RuntimeConstants.RESOURCE_LOADERS)).isEqualTo("class");
@@ -185,7 +187,7 @@ class Param {
   void testCustomVelocityConfig() {
     this.context.register(VelocityMarkerCustomLanguageDriverConfig.class, MybatisLanguageDriverAutoConfiguration.class);
     this.context.refresh();
-    Driver driver = this.context.getBean(Driver.class);
+    VelocityLanguageDriver driver = this.context.getBean(VelocityLanguageDriver.class);
     @SuppressWarnings("unused")
     class Param {
       private Integer id;
@@ -198,7 +200,9 @@ class Param {
     BoundSql boundSql = sqlSource.getBoundSql(params);
     assertThat(boundSql.getSql()).isEqualTo("SELECT CURRENT_TIMESTAMP");
     VelocityLanguageDriverConfig config = this.context.getBean(VelocityLanguageDriverConfig.class);
-    assertThat(config.getUserdirective()).hasSize(0);
+    @SuppressWarnings("deprecation")
+    String[] userDirective = config.getUserdirective();
+    assertThat(userDirective).hasSize(0);
     assertThat(config.getAdditionalContextAttributes()).hasSize(0);
     assertThat(config.getVelocitySettings()).hasSize(3);
     assertThat(config.getVelocitySettings().get(RuntimeConstants.RESOURCE_LOADERS)).isEqualTo("class");
@@ -293,7 +297,7 @@ void testCustomVelocityConfigUsingConfigurationProperty() {
         .applyTo(this.context);
     this.context.register(MyAutoConfiguration.class, MybatisLanguageDriverAutoConfiguration.class);
     this.context.refresh();
-    Driver driver = this.context.getBean(Driver.class);
+    VelocityLanguageDriver driver = this.context.getBean(VelocityLanguageDriver.class);
     @SuppressWarnings("unused")
     class Param {
       private Integer id;
@@ -306,7 +310,9 @@ class Param {
     BoundSql boundSql = sqlSource.getBoundSql(params);
     assertThat(boundSql.getSql()).isEqualTo("SELECT CURRENT_TIMESTAMP");
     VelocityLanguageDriverConfig config = this.context.getBean(VelocityLanguageDriverConfig.class);
-    assertThat(config.getUserdirective()).hasSize(1).contains(NowDirective.class.getName());
+    @SuppressWarnings("deprecation")
+    String[] userDirective = config.getUserdirective();
+    assertThat(userDirective).hasSize(1).contains(NowDirective.class.getName());
     assertThat(config.getAdditionalContextAttributes()).hasSize(2);
     assertThat(config.getAdditionalContextAttributes().get("attribute1")).isEqualTo("java.lang.String");
     assertThat(config.getAdditionalContextAttributes().get("attribute2")).isEqualTo("java.util.HashMap");
@@ -342,8 +348,8 @@ FreeMarkerLanguageDriver myFreeMarkerLanguageDriver() {
     }
 
     @Bean
-    Driver myVelocityLanguageDriver() {
-      return new Driver();
+    VelocityLanguageDriver myVelocityLanguageDriver() {
+      return new VelocityLanguageDriver();
     }
 
     @Bean