Merge pull request #329 from hazendaz/master

[ci] Run Eclipse source cleanup
mybatis · Sep 3, 2022 · a0c664a · a0c664a
2 parents 24086b1 + d4e6dd5
commit a0c664a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/src/main/java/org/mybatis/cdi/Isolation.java b/src/main/java/org/mybatis/cdi/Isolation.java
@@ -39,7 +39,7 @@ public enum Isolation {
 
   private final TransactionIsolationLevel transactionIsolationLevel;
 
-  private Isolation(TransactionIsolationLevel value) {
+  Isolation(TransactionIsolationLevel value) {
     this.transactionIsolationLevel = value;
   }
 

diff --git a/src/main/java/org/mybatis/cdi/JtaTransactionInterceptor.java b/src/main/java/org/mybatis/cdi/JtaTransactionInterceptor.java
@@ -57,12 +57,10 @@ protected void endJta(boolean isExternaTransaction, boolean needsRollback)
       if (needsRollback) {
         this.userTransaction.get().setRollbackOnly();
       }
+    } else if (needsRollback) {
+      this.userTransaction.get().rollback();
     } else {
-      if (needsRollback) {
-        this.userTransaction.get().rollback();
-      } else {
-        this.userTransaction.get().commit();
-      }
+      this.userTransaction.get().commit();
     }
   }
 

diff --git a/src/main/java/org/mybatis/cdi/MyBatisBean.java b/src/main/java/org/mybatis/cdi/MyBatisBean.java
@@ -130,7 +130,7 @@ public Object create(CreationalContext<Object> creationalContext) {
     }
     ErrorContext.instance().reset();
     return Proxy.newProxyInstance(SqlSessionFactory.class.getClassLoader(), new Class[] { this.type },
-        new SerializableMapperProxy<Object>(this, creationalContext));
+        new SerializableMapperProxy<>(this, creationalContext));
   }
 
   @Override

diff --git a/src/test/java/org/mybatis/cdi/JtaDatasourceFactory.java b/src/test/java/org/mybatis/cdi/JtaDatasourceFactory.java
@@ -37,7 +37,7 @@ public void setProperties(Properties props) {
     props.remove("resourceName");
     this.ds.setXaDataSourceClassName(props.getProperty("driver"));
     props.remove("driver");
-    this.ds.setMaxPoolSize(Integer.valueOf(props.getProperty("maxPoolSize")));
+    this.ds.setMaxPoolSize(Integer.parseInt(props.getProperty("maxPoolSize")));
     props.remove("maxPoolSize");
     this.ds.setXaProperties(props);
   }