diff --git a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java index 1674a2de99..0689f317cb 100644 --- a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java +++ b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java @@ -231,7 +231,7 @@ public void setCache(Cache cache) { * list of plugins * */ - public void setPlugins(Interceptor[] plugins) { + public void setPlugins(Interceptor... plugins) { this.plugins = plugins; } @@ -289,7 +289,7 @@ public void setTypeHandlersPackage(String typeHandlersPackage) { * @param typeHandlers * Type handler list */ - public void setTypeHandlers(TypeHandler[] typeHandlers) { + public void setTypeHandlers(TypeHandler... typeHandlers) { this.typeHandlers = typeHandlers; } @@ -301,7 +301,7 @@ public void setTypeHandlers(TypeHandler[] typeHandlers) { * @param typeAliases * Type aliases list */ - public void setTypeAliases(Class[] typeAliases) { + public void setTypeAliases(Class... typeAliases) { this.typeAliases = typeAliases; } @@ -351,7 +351,7 @@ public void setConfiguration(Configuration configuration) { * @param mapperLocations * location of MyBatis mapper files */ - public void setMapperLocations(Resource[] mapperLocations) { + public void setMapperLocations(Resource... mapperLocations) { this.mapperLocations = mapperLocations; } diff --git a/src/test/java/org/mybatis/spring/AbstractMyBatisSpringTest.java b/src/test/java/org/mybatis/spring/AbstractMyBatisSpringTest.java index 784686f6fe..7c01b9d1c3 100644 --- a/src/test/java/org/mybatis/spring/AbstractMyBatisSpringTest.java +++ b/src/test/java/org/mybatis/spring/AbstractMyBatisSpringTest.java @@ -53,10 +53,10 @@ public abstract class AbstractMyBatisSpringTest { public static void setupBase() throws Exception { // create an SqlSessionFactory that will use SpringManagedTransactions SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean(); - factoryBean.setMapperLocations(new Resource[] { new ClassPathResource("org/mybatis/spring/TestMapper.xml") }); + factoryBean.setMapperLocations(new ClassPathResource("org/mybatis/spring/TestMapper.xml")); // note running without SqlSessionFactoryBean.configLocation set => default configuration factoryBean.setDataSource(dataSource); - factoryBean.setPlugins(new Interceptor[] { executorInterceptor }); + factoryBean.setPlugins(executorInterceptor); exceptionTranslator = new MyBatisExceptionTranslator(dataSource, true); diff --git a/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java b/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java index 27a156e346..396c8011d1 100644 --- a/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java +++ b/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java @@ -301,7 +301,7 @@ void testSpecifyConfigurationAndConfigLocation() throws Exception { void testFragmentsAreReadWithMapperLocations() throws Exception { setupFactoryBean(); - factoryBean.setMapperLocations(new Resource[] { new ClassPathResource("org/mybatis/spring/TestMapper.xml") }); + factoryBean.setMapperLocations(new ClassPathResource("org/mybatis/spring/TestMapper.xml")); SqlSessionFactory factory = factoryBean.getObject(); @@ -321,7 +321,7 @@ void testNullMapperLocations() throws Exception { @Test void testEmptyMapperLocations() throws Exception { setupFactoryBean(); - factoryBean.setMapperLocations(new org.springframework.core.io.Resource[0]); + factoryBean.setMapperLocations(); assertDefaultConfig(factoryBean.getObject()); } @@ -337,7 +337,7 @@ void testMapperLocationsWithNullEntry() throws Exception { @Test void testAddATypeHandler() throws Exception { setupFactoryBean(); - factoryBean.setTypeHandlers(new TypeHandler[] { new DummyTypeHandler() }); + factoryBean.setTypeHandlers(new DummyTypeHandler()); TypeHandlerRegistry typeHandlerRegistry = factoryBean.getObject().getConfiguration().getTypeHandlerRegistry(); assertThat(typeHandlerRegistry.hasTypeHandler(BigInteger.class)).isTrue(); @@ -347,7 +347,7 @@ void testAddATypeHandler() throws Exception { void testAddATypeAlias() throws Exception { setupFactoryBean(); - factoryBean.setTypeAliases(new Class[] { DummyTypeAlias.class }); + factoryBean.setTypeAliases(DummyTypeAlias.class); TypeAliasRegistry typeAliasRegistry = factoryBean.getObject().getConfiguration().getTypeAliasRegistry(); typeAliasRegistry.resolveAlias("testAlias"); } diff --git a/src/test/java/org/mybatis/spring/mapper/MapperFactoryBeanTest.java b/src/test/java/org/mybatis/spring/mapper/MapperFactoryBeanTest.java index 953c7ef4dd..bf08452d2c 100644 --- a/src/test/java/org/mybatis/spring/mapper/MapperFactoryBeanTest.java +++ b/src/test/java/org/mybatis/spring/mapper/MapperFactoryBeanTest.java @@ -64,7 +64,7 @@ void testAddToConfigTrue() throws Exception { factoryBean.setDatabaseIdProvider(null); // mapperLocations properties defaults to null factoryBean.setDataSource(dataSource); - factoryBean.setPlugins(new Interceptor[] { executorInterceptor }); + factoryBean.setPlugins(executorInterceptor); SqlSessionFactory sqlSessionFactory = factoryBean.getObject(); diff --git a/src/test/java/org/mybatis/spring/sample/config/SampleConfig.java b/src/test/java/org/mybatis/spring/sample/config/SampleConfig.java index 7682170aa7..b09bbe07c0 100644 --- a/src/test/java/org/mybatis/spring/sample/config/SampleConfig.java +++ b/src/test/java/org/mybatis/spring/sample/config/SampleConfig.java @@ -50,7 +50,7 @@ public PlatformTransactionManager transactionalManager() { public SqlSessionFactory sqlSessionFactory() throws Exception { SqlSessionFactoryBean ss = new SqlSessionFactoryBean(); ss.setDataSource(dataSource()); - ss.setMapperLocations(new Resource[] { new ClassPathResource("org/mybatis/spring/sample/mapper/UserMapper.xml") }); + ss.setMapperLocations(new ClassPathResource("org/mybatis/spring/sample/mapper/UserMapper.xml")); return ss.getObject(); }