From 3100fdba2add7e0fe38c0925a9c43829477e42e2 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 6 Feb 2022 18:28:29 -0500 Subject: [PATCH 1/3] [fix] Move legacy jsr305 nullable to use spotbugs annotations nullable instead The original is throwing issue with jdk 11 release with javadocs, try using the one from spotbugs instead to see if that helps. --- .../org/mybatis/guice/configuration/ConfigurationProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/mybatis/guice/configuration/ConfigurationProvider.java b/src/main/java/org/mybatis/guice/configuration/ConfigurationProvider.java index ec0db5f9..6c27ef2f 100644 --- a/src/main/java/org/mybatis/guice/configuration/ConfigurationProvider.java +++ b/src/main/java/org/mybatis/guice/configuration/ConfigurationProvider.java @@ -20,7 +20,6 @@ import java.util.HashSet; import java.util.Set; -import javax.annotation.Nullable; import javax.inject.Named; import javax.inject.Provider; import javax.inject.Singleton; @@ -35,6 +34,8 @@ import org.mybatis.guice.configuration.settings.ConfigurationSetting; import org.mybatis.guice.configuration.settings.MapperConfigurationSetting; +import edu.umd.cs.findbugs.annotations.Nullable; + /** * Provides the myBatis Configuration. */ From 6d4942a5042a2821821b4dc6ce1a0ce7064b86c4 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 6 Feb 2022 19:06:57 -0500 Subject: [PATCH 2/3] [ci] Use diamond operator --- .../mybatis/guice/configuration/ConfigurationProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/mybatis/guice/configuration/ConfigurationProvider.java b/src/main/java/org/mybatis/guice/configuration/ConfigurationProvider.java index 6c27ef2f..40d3fff6 100644 --- a/src/main/java/org/mybatis/guice/configuration/ConfigurationProvider.java +++ b/src/main/java/org/mybatis/guice/configuration/ConfigurationProvider.java @@ -102,8 +102,8 @@ public class ConfigurationProvider implements Provider, Configura @com.google.inject.Inject private DataSource dataSource; - private Set configurationSettings = new HashSet(); - private Set mapperConfigurationSettings = new HashSet(); + private Set configurationSettings = new HashSet<>(); + private Set mapperConfigurationSettings = new HashSet<>(); /** * @since 1.0.1 From 9a66c9ce9eca165e72e5b89e2209f1e935aead8e Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 6 Feb 2022 19:07:15 -0500 Subject: [PATCH 3/3] [ci] Combine try catch --- .../mybatis/guice/transactional/TransactionAttribute.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/org/mybatis/guice/transactional/TransactionAttribute.java b/src/main/java/org/mybatis/guice/transactional/TransactionAttribute.java index 8e7fbd30..cdfed9b5 100644 --- a/src/main/java/org/mybatis/guice/transactional/TransactionAttribute.java +++ b/src/main/java/org/mybatis/guice/transactional/TransactionAttribute.java @@ -101,10 +101,7 @@ public TransactionToken begin(TransactionManager man) try { man.begin(); - } catch (SystemException e) { - man.resume(tranToken.getSuspendedTransaction()); - throw e; - } catch (NotSupportedException e) { + } catch (NotSupportedException | SystemException e) { man.resume(tranToken.getSuspendedTransaction()); throw e; }