Skip to content

Commit ec899d5

Browse files
committed
some very minor cleanups in o.h.e.t.jta.platform
1 parent 4fc57c0 commit ec899d5

File tree

3 files changed

+11
-25
lines changed

3 files changed

+11
-25
lines changed

hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultJtaPlatformSelector.java

-5
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,6 @@ private static Class<? extends JtaPlatform> legacy(
6161
case "org.hibernate.service.jta.platform.internal.JBossStandAloneJtaPlatform" -> {
6262
return JBossStandAloneJtaPlatform.class;
6363
}
64-
//This one shouldn't be necessary as it matches the implementation FQN,
65-
//but let's translate the existing code faithfully.
66-
case "org.hibernate.engine.transaction.jta.platform.internal.WebSphereLibertyJtaPlatform" -> {
67-
return WebSphereLibertyJtaPlatform.class;
68-
}
6964
}
7065

7166
//All other ones follow a pattern, beginning with the same prefix and ending with the same postfix,

hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java

+11-15
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,19 @@
1111
import jakarta.transaction.TransactionManager;
1212
import jakarta.transaction.UserTransaction;
1313

14-
import org.hibernate.cfg.AvailableSettings;
1514
import org.hibernate.engine.jndi.spi.JndiService;
1615
import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper;
1716
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
1817
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException;
19-
import org.hibernate.internal.util.config.ConfigurationHelper;
2018
import org.hibernate.service.ServiceRegistry;
2119
import org.hibernate.service.spi.Configurable;
2220
import org.hibernate.service.spi.ServiceRegistryAwareService;
2321
import org.hibernate.service.spi.ServiceRegistryImplementor;
2422

23+
import static org.hibernate.cfg.TransactionSettings.JTA_CACHE_TM;
24+
import static org.hibernate.cfg.TransactionSettings.JTA_CACHE_UT;
25+
import static org.hibernate.internal.util.config.ConfigurationHelper.getBoolean;
26+
2527
/**
2628
* @author Steve Ebersole
2729
*/
@@ -43,7 +45,7 @@ private final class TransactionManagerBasedSynchronizationStrategy implements Jt
4345
@Override
4446
public void registerSynchronization(Synchronization synchronization) {
4547
try {
46-
AbstractJtaPlatform.this.getTransactionManager().getTransaction().registerSynchronization( synchronization );
48+
getTransactionManager().getTransaction().registerSynchronization( synchronization );
4749
}
4850
catch (Exception e) {
4951
throw new JtaPlatformException( "Could not access JTA Transaction to register synchronization", e );
@@ -52,7 +54,7 @@ public void registerSynchronization(Synchronization synchronization) {
5254

5355
@Override
5456
public boolean canRegisterSynchronization() {
55-
return JtaStatusHelper.isActive( AbstractJtaPlatform.this.getTransactionManager() );
57+
return JtaStatusHelper.isActive( getTransactionManager() );
5658
}
5759
}
5860

@@ -68,16 +70,8 @@ protected JndiService jndiService() {
6870
protected abstract UserTransaction locateUserTransaction();
6971

7072
public void configure(Map<String, Object> configValues) {
71-
cacheTransactionManager = ConfigurationHelper.getBoolean(
72-
AvailableSettings.JTA_CACHE_TM,
73-
configValues,
74-
canCacheTransactionManagerByDefault()
75-
);
76-
cacheUserTransaction = ConfigurationHelper.getBoolean(
77-
AvailableSettings.JTA_CACHE_UT,
78-
configValues,
79-
canCacheUserTransactionByDefault()
80-
);
73+
cacheTransactionManager = getBoolean( JTA_CACHE_TM, configValues, canCacheTransactionManagerByDefault() );
74+
cacheUserTransaction = getBoolean( JTA_CACHE_UT, configValues, canCacheUserTransactionByDefault() );
8175
}
8276

8377
protected boolean canCacheTransactionManagerByDefault() {
@@ -126,7 +120,9 @@ public UserTransaction retrieveUserTransaction() {
126120
}
127121
return userTransaction;
128122
}
129-
return locateUserTransaction();
123+
else {
124+
return locateUserTransaction();
125+
}
130126
}
131127

132128
@Override

hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java

-5
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ protected boolean canCacheUserTransactionByDefault() {
2525
return true;
2626
}
2727

28-
@Override
29-
protected boolean canCacheTransactionManagerByDefault() {
30-
return true;
31-
}
32-
3328
@Override
3429
protected TransactionManager locateTransactionManager() {
3530
try {

0 commit comments

Comments
 (0)