Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-18 00:55:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-11651 - Fix checkstyle errors

Browse Source
This commit is contained in:
Andrea Boriero 2017-09-21 16:24:42 +01:00
parent 5566b423e3
commit 7a897d5285
2 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hibernate-testing/src/main/java/org/hibernate/testing/env/ConnectionProviderBuilder.java vendored
View File

@ -71,11 +71,16 @@ public static DatasourceConnectionProviderImpl buildDataSourceConnectionProvider
try { try {
Class dataSourceClass = ReflectHelper.classForName( DATA_SOURCE, ConnectionProviderBuilder.class ); Class dataSourceClass = ReflectHelper.classForName( DATA_SOURCE, ConnectionProviderBuilder.class );
DataSource actualDataSource = (DataSource) dataSourceClass.newInstance(); DataSource actualDataSource = (DataSource) dataSourceClass.newInstance();
ReflectHelper.findSetterMethod( dataSourceClass, "URL", String.class ).invoke( actualDataSource, String.format( URL, dbName ) ); ReflectHelper.findSetterMethod( dataSourceClass, "URL", String.class ).invoke(
actualDataSource,
String.format( URL, dbName )
);
ReflectHelper.findSetterMethod( dataSourceClass, "user", String.class ).invoke( actualDataSource, USER ); ReflectHelper.findSetterMethod( dataSourceClass, "user", String.class ).invoke( actualDataSource, USER );
ReflectHelper.findSetterMethod( dataSourceClass, "password", String.class ).invoke( actualDataSource, PASS ); ReflectHelper.findSetterMethod( dataSourceClass, "password", String.class )
.invoke( actualDataSource, PASS );
final DataSourceInvocationHandler dataSourceInvocationHandler = new DataSourceInvocationHandler( actualDataSource ); final DataSourceInvocationHandler dataSourceInvocationHandler = new DataSourceInvocationHandler(
actualDataSource );
DatasourceConnectionProviderImpl connectionProvider = new DatasourceConnectionProviderImpl() { DatasourceConnectionProviderImpl connectionProvider = new DatasourceConnectionProviderImpl() {
@Override @Override
@ -85,13 +90,14 @@ public void stop() {
}; };
connectionProvider.configure( connectionProvider.configure(
Collections.singletonMap( Environment.DATASOURCE, Collections.singletonMap(
Proxy.newProxyInstance( Environment.DATASOURCE,
Thread.currentThread().getContextClassLoader(), Proxy.newProxyInstance(
new Class[] { DataSource.class }, Thread.currentThread().getContextClassLoader(),
dataSourceInvocationHandler new Class[] {DataSource.class},
) dataSourceInvocationHandler
) )
)
); );
return connectionProvider; return connectionProvider;
} }

32
hibernate-testing/src/main/java/org/hibernate/testing/transaction/TransactionUtil.java
View File

@ -368,13 +368,17 @@ public static void doInHibernate(
.openSession(); .openSession();
txn = session.getTransaction(); txn = session.getTransaction();
txn.begin(); txn.begin();
function.accept(session); function.accept( session );
txn.commit(); txn.commit();
} catch (Throwable e) { }
if ( txn != null ) txn.rollback(); catch (Throwable e) {
if ( txn != null ) {
txn.rollback();
}
throw e; throw e;
} finally { }
if (session != null) { finally {
if ( session != null ) {
session.close(); session.close();
} }
} }
@ -391,8 +395,8 @@ public static void doInHibernate(
*/ */
public static <R> R doInHibernate( public static <R> R doInHibernate(
Supplier<SessionFactory> factorySupplier, Supplier<SessionFactory> factorySupplier,
String tenant, String tenant,
Function<Session, R> function) { Function<Session, R> function) {
Session session = null; Session session = null;
Transaction txn = null; Transaction txn = null;
try { try {
@ -402,14 +406,18 @@ public static <R> R doInHibernate(
.openSession(); .openSession();
txn = session.getTransaction(); txn = session.getTransaction();
txn.begin(); txn.begin();
R returnValue = function.apply(session); R returnValue = function.apply( session );
txn.commit(); txn.commit();
return returnValue; return returnValue;
} catch (Throwable e) { }
if ( txn != null ) txn.rollback(); catch (Throwable e) {
if ( txn != null ) {
txn.rollback();
}
throw e; throw e;
} finally { }
if (session != null) { finally {
if ( session != null ) {
session.close(); session.close();
} }
} }