From 6fe63e035c0bbc3b0af18052a51800f17b2e3208 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Thu, 9 May 2013 15:19:02 -0500 Subject: [PATCH] HHH-8211 - Checkstyle and FindBugs fix-ups --- .../EhcacheHibernateMBeanRegistrationImpl.java | 17 +++++------------ .../impl/EhcacheHibernateMbeanNames.java | 7 +++---- .../impl/ProviderMBeanRegistrationHelper.java | 6 ++---- .../ehcache/management/impl/QueryStats.java | 4 ++-- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/EhcacheHibernateMBeanRegistrationImpl.java b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/EhcacheHibernateMBeanRegistrationImpl.java index 38c0e1409a..8b39cd7b27 100644 --- a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/EhcacheHibernateMBeanRegistrationImpl.java +++ b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/EhcacheHibernateMBeanRegistrationImpl.java @@ -56,20 +56,15 @@ public class EhcacheHibernateMBeanRegistrationImpl EhcacheHibernateMBeanRegistrationImpl.class.getName() ); private static final int MAX_MBEAN_REGISTRATION_RETRIES = 50; - private String cacheManagerClusterUUID; - private String registeredCacheManagerName; private Status status = Status.STATUS_UNINITIALISED; private volatile EhcacheHibernate ehcacheHibernate; private volatile ObjectName cacheManagerObjectName; - /** - * {@inheritDoc} - */ @Override public synchronized void registerMBeanForCacheManager(final CacheManager manager, final Properties properties) throws Exception { final String sessionFactoryName = properties.getProperty( Environment.SESSION_FACTORY_NAME ); - String name = null; + final String name; if ( sessionFactoryName == null ) { name = manager.getName(); } @@ -82,11 +77,12 @@ public class EhcacheHibernateMBeanRegistrationImpl private void registerBean(String name, CacheManager manager) throws Exception { ehcacheHibernate = new EhcacheHibernate( manager ); int tries = 0; - boolean success = false; + boolean success; Exception exception = null; - cacheManagerClusterUUID = manager.getClusterUUID(); + final String cacheManagerClusterUUID = manager.getClusterUUID(); + String registeredCacheManagerName; do { - this.registeredCacheManagerName = name; + registeredCacheManagerName = name; if ( tries != 0 ) { registeredCacheManagerName += "_" + tries; } @@ -121,9 +117,6 @@ public class EhcacheHibernateMBeanRegistrationImpl return ManagementFactory.getPlatformMBeanServer(); } - /** - * {@inheritDoc} - */ @Override public void enableHibernateStatisticsSupport(SessionFactory sessionFactory) { ehcacheHibernate.enableHibernateStatistics( sessionFactory ); diff --git a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/EhcacheHibernateMbeanNames.java b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/EhcacheHibernateMbeanNames.java index 02362916aa..4d4c5c5872 100644 --- a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/EhcacheHibernateMbeanNames.java +++ b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/EhcacheHibernateMbeanNames.java @@ -69,11 +69,10 @@ public abstract class EhcacheHibernateMbeanNames { */ public static ObjectName getCacheManagerObjectName(String cacheManagerClusterUUID, String name) throws MalformedObjectNameException { - final ObjectName objectName = new ObjectName( - GROUP_ID + ":type=" + EHCACHE_HIBERNATE_TYPE + ",name=" + mbeanSafe( name ) - + getBeanNameSuffix( cacheManagerClusterUUID ) + return new ObjectName( + GROUP_ID + ":type=" + EHCACHE_HIBERNATE_TYPE + + ",name=" + mbeanSafe( name ) + getBeanNameSuffix( cacheManagerClusterUUID ) ); - return objectName; } private static String getBeanNameSuffix(String cacheManagerClusterUUID) { diff --git a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/ProviderMBeanRegistrationHelper.java b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/ProviderMBeanRegistrationHelper.java index 7b720e49ce..7bfa2d7856 100644 --- a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/ProviderMBeanRegistrationHelper.java +++ b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/ProviderMBeanRegistrationHelper.java @@ -130,7 +130,6 @@ public class ProviderMBeanRegistrationHelper { ); this.cancel(); } - return; } else { ehcacheHibernateMBeanRegistration.enableHibernateStatisticsSupport( sessionFactory ); @@ -152,9 +151,8 @@ public class ProviderMBeanRegistrationHelper { if ( map == null ) { return null; } - final Iterator values = map.values().iterator(); - while ( values.hasNext() ) { - final SessionFactory sessionFactory = (SessionFactory) values.next(); + for ( Object o : map.values() ) { + final SessionFactory sessionFactory = (SessionFactory) o; final Class sessionFactoryType = sessionFactory.getClass(); final Field propertiesField = getField( sessionFactoryType, "properties" ); if ( propertiesField != null ) { diff --git a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/QueryStats.java b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/QueryStats.java index 4eba0d82e7..5be104df11 100644 --- a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/QueryStats.java +++ b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/QueryStats.java @@ -324,8 +324,8 @@ public class QueryStats implements Serializable { */ public static QueryStats[] fromTabularData(final TabularData tabularData) { final List countList = new ArrayList( tabularData.size() ); - for ( final Iterator pos = tabularData.values().iterator(); pos.hasNext(); ) { - countList.add( new QueryStats( (CompositeData) pos.next() ) ); + for ( Object o : tabularData.values() ) { + countList.add( new QueryStats( (CompositeData) o ) ); } return countList.toArray( new QueryStats[countList.size()] ); }