Skip to content

Commit 141d31a

Browse files
gavinkinggavinking
committed
more use of 'var'
1 parent b3f7dbd commit 141d31a

File tree

4 files changed

+112
-101
lines changed

4 files changed

+112
-101
lines changed

‎hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import java.lang.reflect.InvocationTargetException;
88
import java.sql.Connection;
9-
import java.util.Collection;
109
import java.util.HashSet;
1110
import java.util.Map;
1211
import java.util.Properties;
@@ -24,6 +23,7 @@
2423
import org.hibernate.resource.beans.internal.Helper;
2524
import org.hibernate.service.spi.ServiceRegistryImplementor;
2625

26+
import static java.lang.Integer.parseInt;
2727
import static java.sql.Connection.TRANSACTION_NONE;
2828
import static java.sql.Connection.TRANSACTION_READ_COMMITTED;
2929
import static java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
@@ -90,8 +90,8 @@ public ConnectionProvider initiateService(
9090
return null;
9191
}
9292

93-
final BeanContainer beanContainer = Helper.getBeanContainer( registry );
94-
final StrategySelector strategySelector = registry.requireService( StrategySelector.class );
93+
final var beanContainer = Helper.getBeanContainer( registry );
94+
final var strategySelector = registry.requireService( StrategySelector.class );
9595
final Object explicitSetting = configurationValues.get( CONNECTION_PROVIDER );
9696
if ( explicitSetting != null ) {
9797
// if we are explicitly supplied a ConnectionProvider to use (in some form) -> use it..
@@ -119,16 +119,14 @@ private static Class<? extends ConnectionProvider> connectionProviderClass(Class
119119
+ "' does not implement 'ConnectionProvider'" );
120120
}
121121
@SuppressWarnings("unchecked")
122-
final Class<? extends ConnectionProvider> connectionProviderClass =
123-
(Class<? extends ConnectionProvider>) providerClass;
122+
final var connectionProviderClass = (Class<? extends ConnectionProvider>) providerClass;
124123
return connectionProviderClass;
125124
}
126125

127126
private ConnectionProvider instantiateNamedConnectionProvider(
128127
String providerName, StrategySelector strategySelector, BeanContainer beanContainer) {
129128
LOG.instantiatingExplicitConnectionProvider( providerName );
130-
final Class<? extends ConnectionProvider> providerClass =
131-
strategySelector.selectStrategyImplementor( ConnectionProvider.class, providerName );
129+
final var providerClass = strategySelector.selectStrategyImplementor( ConnectionProvider.class, providerName );
132130
try {
133131
return instantiateExplicitConnectionProvider( providerClass, beanContainer );
134132
}
@@ -143,8 +141,7 @@ private ConnectionProvider instantiateConnectionProvider(
143141
return new DataSourceConnectionProvider();
144142
}
145143

146-
final Class<? extends ConnectionProvider> singleRegisteredProvider =
147-
getSingleRegisteredProvider( strategySelector );
144+
final var singleRegisteredProvider = getSingleRegisteredProvider( strategySelector );
148145
if ( singleRegisteredProvider != null ) {
149146
try {
150147
return singleRegisteredProvider.getConstructor().newInstance();
@@ -188,8 +185,7 @@ private ConnectionProvider noAppropriateConnectionProvider() {
188185
}
189186

190187
private Class<? extends ConnectionProvider> getSingleRegisteredProvider(StrategySelector strategySelector) {
191-
final Collection<Class<? extends ConnectionProvider>> implementors =
192-
strategySelector.getRegisteredStrategyImplementors( ConnectionProvider.class );
188+
final var implementors = strategySelector.getRegisteredStrategyImplementors( ConnectionProvider.class );
193189
return implementors != null && implementors.size() == 1
194190
? implementors.iterator().next()
195191
: null;
@@ -245,7 +241,7 @@ private static ConnectionProvider instantiateProvider(StrategySelector selector,
245241
* @return The connection properties.
246242
*/
247243
public static Properties getConnectionProperties(Map<String, Object> properties) {
248-
final Properties result = new Properties();
244+
final var result = new Properties();
249245
for ( var entry : properties.entrySet() ) {
250246
if ( entry.getValue() instanceof String value ) {
251247
final String key = entry.getKey();
@@ -343,7 +339,7 @@ else if ( ISOLATION_VALUE_MAP.containsKey( string ) ) {
343339
else {
344340
// it could be a String representation of the isolation numeric value
345341
try {
346-
final int isolationLevel = Integer.parseInt( string );
342+
final int isolationLevel = parseInt( string );
347343
checkIsolationLevel( isolationLevel );
348344
return isolationLevel;
349345
}
@@ -397,8 +393,8 @@ public static String toIsolationNiceName(Integer isolation) {
397393

398394
public static String extractSetting(Map<String, Object> settings, String... names) {
399395
for ( String name : names ) {
400-
if ( settings.containsKey(name) ) {
401-
return (String) settings.get(name);
396+
if ( settings.containsKey( name ) ) {
397+
return (String) settings.get( name );
402398
}
403399
}
404400
return null;

‎hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/MultiTenantConnectionProviderInitiator.java‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.hibernate.boot.registry.StandardServiceInitiator;
1010
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
1111
import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
12-
import org.hibernate.cfg.AvailableSettings;
12+
import org.hibernate.cfg.JdbcSettings;
1313
import org.hibernate.engine.jdbc.connections.spi.DataSourceBasedMultiTenantConnectionProviderImpl;
1414
import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
1515
import org.hibernate.resource.beans.internal.Helper;
@@ -18,6 +18,8 @@
1818

1919
import org.jboss.logging.Logger;
2020

21+
import static org.hibernate.cfg.MultiTenancySettings.MULTI_TENANT_CONNECTION_PROVIDER;
22+
2123
/**
2224
* A service initiator for the {@link MultiTenantConnectionProvider} service.
2325
*
@@ -39,7 +41,7 @@ public Class<MultiTenantConnectionProvider<?>> getServiceInitiated() {
3941

4042
@Override
4143
public MultiTenantConnectionProvider<?> initiateService(Map<String, Object> configurationValues, ServiceRegistryImplementor registry) {
42-
if ( !configurationValues.containsKey( AvailableSettings.MULTI_TENANT_CONNECTION_PROVIDER ) ) {
44+
if ( !configurationValues.containsKey( MULTI_TENANT_CONNECTION_PROVIDER ) ) {
4345
return Helper.getBean(
4446
Helper.getBeanContainer( registry ),
4547
MultiTenantConnectionProvider.class,
@@ -49,40 +51,20 @@ public MultiTenantConnectionProvider<?> initiateService(Map<String, Object> conf
4951
);
5052
}
5153

52-
final Object configValue = configurationValues.get( AvailableSettings.MULTI_TENANT_CONNECTION_PROVIDER );
54+
final Object configValue = configurationValues.get( MULTI_TENANT_CONNECTION_PROVIDER );
5355
if ( configValue == null ) {
54-
// if they also specified the data source *name*, then lets assume they want
56+
// if they also specified the data source *name*, then let's assume they want
5557
// DataSourceBasedMultiTenantConnectionProviderImpl
56-
final Object dataSourceConfigValue = configurationValues.get( AvailableSettings.DATASOURCE );
57-
if ( dataSourceConfigValue instanceof String ) {
58-
return new DataSourceBasedMultiTenantConnectionProviderImpl<>();
59-
}
60-
61-
return null;
58+
final Object dataSourceConfigValue = configurationValues.get( JdbcSettings.DATASOURCE );
59+
return dataSourceConfigValue instanceof String
60+
? new DataSourceBasedMultiTenantConnectionProviderImpl<>()
61+
: null;
6262
}
63-
64-
if ( configValue instanceof MultiTenantConnectionProvider<?> multiTenantConnectionProvider ) {
63+
else if ( configValue instanceof MultiTenantConnectionProvider<?> multiTenantConnectionProvider ) {
6564
return multiTenantConnectionProvider;
6665
}
6766
else {
68-
final Class<MultiTenantConnectionProvider<?>> implClass;
69-
if ( configValue instanceof Class ) {
70-
@SuppressWarnings("unchecked")
71-
Class<MultiTenantConnectionProvider<?>> clazz = (Class<MultiTenantConnectionProvider<?>>) configValue;
72-
implClass = clazz;
73-
}
74-
else {
75-
final String className = configValue.toString();
76-
final ClassLoaderService classLoaderService = registry.requireService( ClassLoaderService.class );
77-
try {
78-
implClass = classLoaderService.classForName( className );
79-
}
80-
catch (ClassLoadingException cle) {
81-
log.warn( "Unable to locate specified class [" + className + "]", cle );
82-
throw new ServiceException( "Unable to locate specified multi-tenant connection provider [" + className + "]" );
83-
}
84-
}
85-
67+
final var implClass = multiTenantConnectionProviderClass( registry, configValue );
8668
try {
8769
return implClass.newInstance();
8870
}
@@ -92,4 +74,24 @@ public MultiTenantConnectionProvider<?> initiateService(Map<String, Object> conf
9274
}
9375
}
9476
}
77+
78+
private static Class<MultiTenantConnectionProvider<?>> multiTenantConnectionProviderClass(
79+
ServiceRegistryImplementor registry, Object configValue) {
80+
if ( configValue instanceof Class ) {
81+
@SuppressWarnings("unchecked")
82+
final var clazz = (Class<MultiTenantConnectionProvider<?>>) configValue;
83+
return clazz;
84+
}
85+
else {
86+
final String className = configValue.toString();
87+
final var classLoaderService = registry.requireService( ClassLoaderService.class );
88+
try {
89+
return classLoaderService.classForName( className );
90+
}
91+
catch (ClassLoadingException cle) {
92+
log.warn( "Unable to locate specified class [" + className + "]", cle );
93+
throw new ServiceException( "Unable to locate specified multi-tenant connection provider [" + className + "]" );
94+
}
95+
}
96+
}
9597
}

0 commit comments

Comments
 (0)