Merge pull request #821 from hazendaz/master

Cleanup throughout code for newer java styles

Author: hazendaz

src/main/java/org/mybatis/guice/AbstractMyBatisModule.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2025 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 import com.google.inject.AbstractModule;
 import com.google.inject.Binder;
 import com.google.inject.Scopes;
-import com.google.inject.matcher.AbstractMatcher;
+import com.google.inject.matcher.Matcher;
 
 import java.lang.reflect.Method;
 import java.util.Set;
@@ -40,19 +40,9 @@
 
 abstract class AbstractMyBatisModule extends AbstractModule {
 
-  protected static final AbstractMatcher<Method> DECLARED_BY_OBJECT = new AbstractMatcher<Method>() {
-    @Override
-    public boolean matches(Method method) {
-      return method.getDeclaringClass() == Object.class;
-    }
-  };
+  protected static final Matcher<Method> DECLARED_BY_OBJECT = method -> method.getDeclaringClass() == Object.class;
 
-  protected static final AbstractMatcher<Method> SYNTHETIC = new AbstractMatcher<Method>() {
-    @Override
-    public boolean matches(Method method) {
-      return method.isSynthetic();
-    }
-  };
+  protected static final Matcher<Method> SYNTHETIC = Method::isSynthetic;
 
   private ClassLoader resourcesClassLoader = getDefaultClassLoader();
 
@@ -83,7 +73,7 @@ protected static Set<Class<?>> getClasses(String packageName) {
   protected static Set<Class<?>> getClasses(ResolverUtil.Test test, String packageName) {
     checkArgument(test != null, "Parameter 'test' must not be null");
     checkArgument(packageName != null, "Parameter 'packageName' must not be null");
-    return new ResolverUtil<Object>().find(test, packageName).getClasses();
+    return new ResolverUtil<>().find(test, packageName).getClasses();
   }
 
   @Override
@@ -129,7 +119,7 @@ protected void bindTransactionInterceptors() {
    *          the mapper type
    */
   final <T> void bindMapper(Class<T> mapperType) {
-    bind(mapperType).toProvider(guicify(new MapperProvider<T>(mapperType))).in(Scopes.SINGLETON);
+    bind(mapperType).toProvider(guicify(new MapperProvider<>(mapperType))).in(Scopes.SINGLETON);
   }
 
   /**

src/main/java/org/mybatis/guice/MyBatisJtaModule.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2025 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -41,10 +41,10 @@ public abstract class MyBatisJtaModule extends MyBatisModule {
   private TransactionManager transactionManager;
   private Class<? extends Provider<? extends XAResource>> xaResourceProvider = XASqlSessionManagerProvider.class;
 
-  public MyBatisJtaModule() {
+  protected MyBatisJtaModule() {
   }
 
-  public MyBatisJtaModule(TransactionManager transactionManager) {
+  protected MyBatisJtaModule(TransactionManager transactionManager) {
     this.transactionManager = transactionManager;
   }
 
@@ -72,7 +72,7 @@ protected void bindTransactionInterceptors() {
       bindInterceptor(any(), not(DECLARED_BY_OBJECT).and(annotatedWith(Transactional.class)), interceptorTx,
           interceptor);
       // Intercept classes annotated with Transactional, but avoid "double"
-      // interception when a mathod is also annotated inside an annotated
+      // interception when a method is also annotated inside an annotated
       // class.
       bindInterceptor(annotatedWith(Transactional.class),
           not(DECLARED_BY_OBJECT).and(not(annotatedWith(Transactional.class))), interceptorTx, interceptor);

src/main/java/org/mybatis/guice/MyBatisModule.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2024 the original author or authors.
+ *    Copyright 2009-2025 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -165,6 +165,7 @@ protected final void aggressiveLazyLoading(boolean aggressiveLazyLoading) {
    * @param multipleResultSetsEnabled
    *          the multiple result sets enabled
    */
+  @Deprecated
   protected final void multipleResultSetsEnabled(boolean multipleResultSetsEnabled) {
     bindConfigurationSetting(new MultipleResultSetsEnabledConfigurationSetting(multipleResultSetsEnabled));
   }
@@ -435,16 +436,11 @@ protected final void bindDefaultScriptingLanguageType(Class<? extends LanguageDr
    * @return the alias binder
    */
   protected final AliasBinder addAlias(final String alias) {
-    checkArgument(alias != null && alias.length() > 0, "Empty or null 'alias' is not valid");
-
-    return new AliasBinder() {
-
-      @Override
-      public void to(final Class<?> clazz) {
-        checkArgument(clazz != null, "Null type not valid for alias '%s'", alias);
-        bindConfigurationSetting(new AliasConfigurationSetting(alias, clazz));
-      }
+    checkArgument(alias != null && !alias.isEmpty(), "Empty or null 'alias' is not valid");
 
+    return clazz -> {
+      checkArgument(clazz != null, "Null type not valid for alias '%s'", alias);
+      bindConfigurationSetting(new AliasConfigurationSetting(alias, clazz));
     };
   }
 
@@ -559,7 +555,7 @@ final <TH extends TypeHandler<? extends T>> void bindTypeHandler(TypeLiteral<TH>
 
       final <TH extends TypeHandler<? extends T>> void bindProvidedTypeHandler(TypeLiteral<TH> typeHandlerType,
           Class<T> type) {
-        bind(typeHandlerType).toProvider(guicify(new TypeHandlerProvider<TH, T>(typeHandlerType, type)))
+        bind(typeHandlerType).toProvider(guicify(new TypeHandlerProvider<>(typeHandlerType, type)))
             .in(Scopes.SINGLETON);
       }
     };

src/main/java/org/mybatis/guice/configuration/settings/ObjectFactoryConfigurationSetting.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2025 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import jakarta.inject.Provider;
 
 import org.apache.ibatis.reflection.factory.ObjectFactory;
-import org.apache.ibatis.session.Configuration;
 
 public class ObjectFactoryConfigurationSetting implements Provider<ConfigurationSetting> {
 
@@ -41,12 +40,7 @@ public void setInjector(final Injector injector) {
   @Override
   public ConfigurationSetting get() {
     final ObjectFactory objectFactory = injector.getInstance(objectFactoryType);
-    return new ConfigurationSetting() {
-      @Override
-      public void applyConfigurationSetting(Configuration configuration) {
-        configuration.setObjectFactory(objectFactory);
-      }
-    };
+    return configuration -> configuration.setObjectFactory(objectFactory);
   }
 
 }

src/main/java/org/mybatis/guice/configuration/settings/ObjectWrapperFactoryConfigurationSetting.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2025 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import jakarta.inject.Provider;
 
 import org.apache.ibatis.reflection.wrapper.ObjectWrapperFactory;
-import org.apache.ibatis.session.Configuration;
 
 public class ObjectWrapperFactoryConfigurationSetting implements Provider<ConfigurationSetting> {
 
@@ -40,11 +39,6 @@ public void setInjector(final Injector injector) {
   @Override
   public ConfigurationSetting get() {
     final ObjectWrapperFactory objectWrapperFactory = injector.getInstance(objectWrapperFactoryType);
-    return new ConfigurationSetting() {
-      @Override
-      public void applyConfigurationSetting(Configuration configuration) {
-        configuration.setObjectWrapperFactory(objectWrapperFactory);
-      }
-    };
+    return configuration -> configuration.setObjectWrapperFactory(objectWrapperFactory);
   }
 }

src/main/java/org/mybatis/guice/configuration/settings/TypeHandlerConfigurationSettingProvider.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2025 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import jakarta.inject.Inject;
 import jakarta.inject.Provider;
 
-import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.type.TypeHandler;
 
 public final class TypeHandlerConfigurationSettingProvider implements Provider<ConfigurationSetting> {
@@ -37,12 +36,7 @@ public TypeHandlerConfigurationSettingProvider(final Key<? extends TypeHandler<?
   @Override
   public ConfigurationSetting get() {
     final TypeHandler<?> handlerInstance = injector.getInstance(key);
-    return new ConfigurationSetting() {
-      @Override
-      public void applyConfigurationSetting(Configuration configuration) {
-        configuration.getTypeHandlerRegistry().register(handlerInstance);
-      }
-    };
+    return configuration -> configuration.getTypeHandlerRegistry().register(handlerInstance);
   }
 
 }

src/main/java/org/mybatis/guice/datasource/dbcp/BasicDataSourceProvider.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2025 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import jakarta.inject.Named;
 import jakarta.inject.Provider;
 
+import java.time.Duration;
 import java.util.Map.Entry;
 import java.util.Properties;
 
@@ -205,7 +206,7 @@ public void setMaxOpenPreparedStatements(
    */
   @com.google.inject.Inject(optional = true)
   public void setMaxWaitMillis(@Named("DBCP.maxWaitMillis") final long maxWaitMillis) {
-    dataSource.setMaxWaitMillis(maxWaitMillis);
+    dataSource.setMaxWait(Duration.ofMillis(maxWaitMillis));
   }
 
   /**
@@ -217,7 +218,7 @@ public void setMaxWaitMillis(@Named("DBCP.maxWaitMillis") final long maxWaitMill
   @com.google.inject.Inject(optional = true)
   public void setMinEvictableIdleTimeMillis(
       @Named("DBCP.minEvictableIdleTimeMillis") final long minEvictableIdleTimeMillis) {
-    dataSource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
+    dataSource.setMinEvictableIdle(Duration.ofMillis(minEvictableIdleTimeMillis));
   }
 
   /**
@@ -295,7 +296,7 @@ public void setTestWhileIdle(@Named("DBCP.testWhileIdle") final boolean testWhil
   @com.google.inject.Inject(optional = true)
   public void setTimeBetweenEvictionRunsMillis(
       @Named("DBCP.timeBetweenEvictionRunsMillis") int timeBetweenEvictionRunsMillis) {
-    dataSource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
+    dataSource.setDurationBetweenEvictionRuns(Duration.ofMillis(timeBetweenEvictionRunsMillis));
   }
 
   /**

src/main/java/org/mybatis/guice/datasource/dbcp/DriverAdapterCPDSProvider.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2025 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@
 import jakarta.inject.Named;
 import jakarta.inject.Provider;
 
+import java.time.Duration;
+
 import javax.sql.ConnectionPoolDataSource;
 
 import org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS;
@@ -102,7 +104,7 @@ public void setMaxPreparedStatements(@Named("DBCP.maxOpenPreparedStatements") in
 
   @com.google.inject.Inject(optional = true)
   public void setMinEvictableIdleTimeMillis(@Named("DBCP.minEvictableIdleTimeMillis") int minEvictableIdleTimeMillis) {
-    adapter.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
+    adapter.setMinEvictableIdleDuration(Duration.ofMillis(minEvictableIdleTimeMillis));
   }
 
   @com.google.inject.Inject(optional = true)
@@ -118,7 +120,7 @@ public void setPoolPreparedStatements(@Named("DBCP.poolPreparedStatements") bool
   @com.google.inject.Inject(optional = true)
   public void setTimeBetweenEvictionRunsMillis(
       @Named("DBCP.timeBetweenEvictionRunsMillis") int timeBetweenEvictionRunsMillis) {
-    adapter.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
+    adapter.setDurationBetweenEvictionRuns(Duration.ofMillis(timeBetweenEvictionRunsMillis));
   }
 
   @Override

src/main/java/org/mybatis/guice/datasource/dbcp/PerUserPoolDataSourceProvider.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2025 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 import jakarta.inject.Named;
 import jakarta.inject.Provider;
 
+import java.time.Duration;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -71,13 +72,13 @@ public void setJndiEnvironment(@Named("DBCP.jndi.key") String key, @Named("DBCP.
 
   @com.google.inject.Inject(optional = true)
   public void setLoginTimeout(@Named("JDBC.loginTimeout") int loginTimeout) {
-    dataSource.setLoginTimeout(loginTimeout);
+    dataSource.setLoginTimeout(Duration.ofSeconds(loginTimeout));
   }
 
   @com.google.inject.Inject(optional = true)
   public void setDefaultMinEvictableIdleTimeMillis(
       @Named("DBCP.defaultMinEvictableIdleTimeMillis") int defaultMinEvictableIdleTimeMillis) {
-    dataSource.setDefaultMinEvictableIdleTimeMillis(defaultMinEvictableIdleTimeMillis);
+    dataSource.setDefaultMinEvictableIdle(Duration.ofMillis(defaultMinEvictableIdleTimeMillis));
   }
 
   @com.google.inject.Inject(optional = true)
@@ -109,7 +110,7 @@ public void setDefaultTestWhileIdle(@Named("DBCP.defaultTestWhileIdle") boolean
   @com.google.inject.Inject(optional = true)
   public void setDefaultTimeBetweenEvictionRunsMillis(
       @Named("DBCP.defaultTimeBetweenEvictionRunsMillis") int defaultTimeBetweenEvictionRunsMillis) {
-    dataSource.setDefaultTimeBetweenEvictionRunsMillis(defaultTimeBetweenEvictionRunsMillis);
+    dataSource.setDefaultDurationBetweenEvictionRuns(Duration.ofMillis(defaultTimeBetweenEvictionRunsMillis));
   }
 
   @com.google.inject.Inject(optional = true)
@@ -129,7 +130,7 @@ public void setDefaultMaxIdle(@Named("DBCP.defaultMaxIdle") int defaultMaxIdle)
 
   @com.google.inject.Inject(optional = true)
   public void setDefaultMaxWaitMillis(@Named("DBCP.defaultMaxWaitMillis") int defaultMaxWaitMillis) {
-    dataSource.setDefaultMaxWaitMillis(defaultMaxWaitMillis);
+    dataSource.setDefaultMaxWait(Duration.ofMillis(defaultMaxWaitMillis));
   }
 
   /**
@@ -207,7 +208,7 @@ public void setPerUserMaxIdle(@PerUserMaxIdle Map<String, Integer> perUserMaxIdl
   @com.google.inject.Inject(optional = true)
   public void setPerUserMaxWaitMillis(@PerUserMaxWaitMillis Map<String, Long> perUserMaxWaitMillis) {
     for (Entry<String, Long> entry : perUserMaxWaitMillis.entrySet()) {
-      dataSource.setPerUserMaxWaitMillis(entry.getKey(), entry.getValue());
+      dataSource.setPerUserMaxWait(entry.getKey(), Duration.ofMillis(entry.getValue()));
     }
   }
 

src/main/java/org/mybatis/guice/datasource/dbcp/SharedPoolDataSourceProvider.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2025 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 import jakarta.inject.Named;
 import jakarta.inject.Provider;
 
+import java.time.Duration;
+
 import javax.sql.ConnectionPoolDataSource;
 import javax.sql.DataSource;
 
@@ -68,13 +70,13 @@ public void setJndiEnvironment(@Named("DBCP.jndi.key") String key, @Named("DBCP.
 
   @com.google.inject.Inject(optional = true)
   public void setLoginTimeout(@Named("JDBC.loginTimeout") int loginTimeout) {
-    dataSource.setLoginTimeout(loginTimeout);
+    dataSource.setLoginTimeout(Duration.ofSeconds(loginTimeout));
   }
 
   @com.google.inject.Inject(optional = true)
   public void setDefaultMinEvictableIdleTimeMillis(
       @Named("DBCP.defaultMinEvictableIdleTimeMillis") int defaultMinEvictableIdleTimeMillis) {
-    dataSource.setDefaultMinEvictableIdleTimeMillis(defaultMinEvictableIdleTimeMillis);
+    dataSource.setDefaultMinEvictableIdle(Duration.ofMillis(defaultMinEvictableIdleTimeMillis));
   }
 
   @com.google.inject.Inject(optional = true)
@@ -106,7 +108,7 @@ public void setDefaultTestWhileIdle(@Named("DBCP.defaultTestWhileIdle") boolean
   @com.google.inject.Inject(optional = true)
   public void setDefaultTimeBetweenEvictionRunsMillis(
       @Named("DBCP.defaultTimeBetweenEvictionRunsMillis") int defaultTimeBetweenEvictionRunsMillis) {
-    dataSource.setDefaultTimeBetweenEvictionRunsMillis(defaultTimeBetweenEvictionRunsMillis);
+    dataSource.setDefaultDurationBetweenEvictionRuns(Duration.ofMillis((defaultTimeBetweenEvictionRunsMillis)));
   }
 
   @com.google.inject.Inject(optional = true)
@@ -144,7 +146,7 @@ public void setDefaultMaxIdle(@Named("DBCP.defaultMaxIdle") final int defaultMax
    */
   @com.google.inject.Inject(optional = true)
   public void setDefaultMaxWaitMillis(@Named("DBCP.defaultMaxWaitMillis") final int defaultMaxWaitMillis) {
-    dataSource.setDefaultMaxWaitMillis(defaultMaxWaitMillis);
+    dataSource.setDefaultMaxWait(Duration.ofMillis(defaultMaxWaitMillis));
   }
 
   @Override