[exo-jcr-commits] exo-jcr SVN: r5488 - in jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services: jcr/impl/core/query/ispn and 3 other directories.

Author: nfilotto Date: 2012-01-19 14:55:28 -0500 (Thu, 19 Jan 2012) New Revision: 5488 Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexInfos.java jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexUpdateMonitor.java jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/LocalIndexChangesFilter.java jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/BufferedISPNCache.java jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/ISPNCacheFactory.java jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/transaction/infinispan/JBossStandaloneJTAManagerLookup.java Log: EXOJCR-1682: Sonar violations fixed for these projects Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java 2012-01-19 19:54:39 UTC (rev 5487) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java 2012-01-19 19:55:28 UTC (rev 5488) @@ -83,7 +83,7 @@ /** * Logger */ - private final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.InfinispanLockManagerImpl"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.InfinispanLockManagerImpl");//NOSONAR private Cache<Serializable, Object> cache; @@ -237,7 +237,7 @@ Throwable cause = pae.getCause(); if (cause instanceof SQLException) { - throw (SQLException)cause; + throw (SQLException)cause;//NOSONAR } else if (cause instanceof RuntimeException) { @@ -245,7 +245,7 @@ } else { - throw new RuntimeException(cause); + throw new RuntimeException(cause);//NOSONAR } } @@ -266,7 +266,7 @@ } } } - catch (Exception e) + catch (Exception e)//NOSONAR { throw new RepositoryException("Error configuring JDBC cache loader", e); } Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java 2012-01-19 19:54:39 UTC (rev 5487) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java 2012-01-19 19:55:28 UTC (rev 5488) @@ -58,7 +58,7 @@ */ protected final Map<String, Indexer> indexers = new HashMap<String, Indexer>(); - protected static final Log log = ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.IndexerCacheLoader"); + protected static final Log log = ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.IndexerCacheLoader");//NOSONAR /** * Executor used to remove all the entries that have already been treated. We Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java 2012-01-19 19:54:39 UTC (rev 5487) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java 2012-01-19 19:55:28 UTC (rev 5488) @@ -53,7 +53,7 @@ /** * Logger instance for this class. */ - private final Log log = ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.ISPNIndexChangesFilter"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.ISPNIndexChangesFilter");//NOSONAR public static final String PARAM_INFINISPAN_CACHESTORE_CLASS = "infinispan-cachestore-classname"; @@ -109,7 +109,7 @@ protected Log getLogger() { - return log; + return LOG; } protected void doUpdateIndex(ChangesFilterListsWrapper changes) Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexInfos.java =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexInfos.java 2012-01-19 19:54:39 UTC (rev 5487) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexInfos.java 2012-01-19 19:55:28 UTC (rev 5488) @@ -61,7 +61,7 @@ /** * Logger. */ - private final Log log = ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.ISPNIndexInfos"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.ISPNIndexInfos");//NOSONAR private static final String INDEX_NAMES = "$names".intern(); @@ -98,7 +98,7 @@ } @Override - protected Void execute(Void arg) throws RuntimeException + protected Void execute(Void arg) { PrivilegedISPNCacheHelper.put(cache, namesKey, getNames()); return null; @@ -170,7 +170,7 @@ } catch (IOException e) { - log.error("Cannot read the list of index names", e); + LOG.error("Cannot read the list of index names", e); } } else @@ -225,7 +225,7 @@ } catch (IOException e) { - log.error("Failed to update indexes! " + e.getMessage(), e); + LOG.error("Failed to update indexes! " + e.getMessage(), e); } } } Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexUpdateMonitor.java =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexUpdateMonitor.java 2012-01-19 19:54:39 UTC (rev 5487) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexUpdateMonitor.java 2012-01-19 19:55:28 UTC (rev 5488) @@ -53,7 +53,7 @@ /** * Logger instance for this class */ - private final Log log = ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.ISPNIndexUpdateMonitor"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.ISPNIndexUpdateMonitor");//NOSONAR /** * ISPN cache. @@ -84,7 +84,7 @@ } @Override - protected Void execute(Boolean updateInProgress) throws RuntimeException + protected Void execute(Boolean updateInProgress) { PrivilegedISPNCacheHelper.put(cache, updateKey, updateInProgress); return null; @@ -188,7 +188,7 @@ } catch (CacheException e) { - log.error("Fail to change updateInProgress mode to " + updateInProgress, e); + LOG.error("Fail to change updateInProgress mode to " + updateInProgress, e); } } Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/LocalIndexChangesFilter.java =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/LocalIndexChangesFilter.java 2012-01-19 19:54:39 UTC (rev 5487) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/LocalIndexChangesFilter.java 2012-01-19 19:55:28 UTC (rev 5488) @@ -58,7 +58,7 @@ /** * Logger instance for this class */ - private final Log log = ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.LocalIndexChangesFilter"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.LocalIndexChangesFilter");//NOSONAR public static final String PARAM_INFINISPAN_CACHESTORE_CLASS = "infinispan-cachestore-classname"; @@ -103,7 +103,7 @@ protected Log getLogger() { - return log; + return LOG; } protected void doUpdateIndex(ChangesFilterListsWrapper changes) Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/BufferedISPNCache.java =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/BufferedISPNCache.java 2012-01-19 19:54:39 UTC (rev 5487) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/BufferedISPNCache.java 2012-01-19 19:55:28 UTC (rev 5488) @@ -70,7 +70,7 @@ */ private final Boolean allowLocalChanges; - protected static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.BufferedISPNCache"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.BufferedISPNCache");//NOSONAR public static enum ChangesType { REMOVE, PUT; @@ -1065,7 +1065,7 @@ isTxCreated = true; } } - catch (Exception e) + catch (Exception e)//NOSONAR { LOG.warn("Could not create a new tx", e); } @@ -1073,7 +1073,7 @@ { cacheChange.apply(); } - catch (RuntimeException e) + catch (RuntimeException e)//NOSONAR { if (isTxCreated) { @@ -1083,7 +1083,7 @@ LOG.trace("An error occurs the tx will be rollbacked"); tm.rollback(); } - catch (Exception e1) + catch (Exception e1)//NOSONAR { LOG.warn("Could not rollback the tx", e1); } @@ -1098,7 +1098,7 @@ LOG.trace("The tx will be committed"); tm.commit(); } - catch (Exception e) + catch (Exception e)//NOSONAR { LOG.warn("Could not commit the tx", e); } Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java 2012-01-19 19:54:39 UTC (rev 5487) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java 2012-01-19 19:55:28 UTC (rev 5488) @@ -121,7 +121,7 @@ public class ISPNCacheWorkspaceStorageCache implements WorkspaceStorageCache, Backupable { private static final Log LOG = ExoLogger - .getLogger("exo.jcr.component.core.impl.infinispan.v5.ISPNCacheWorkspaceStorageCache"); + .getLogger("exo.jcr.component.core.impl.infinispan.v5.ISPNCacheWorkspaceStorageCache");//NOSONAR /** * Name of the cache in case of the distributed cache @@ -1335,11 +1335,17 @@ } catch (IllegalStateException e) { - // Do nothing. Never happens. + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } catch (IOException e) { - // Do nothing. Never happens. + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } cache.addToList(new CacheRefsId(getOwnerId(), nodeIdentifier), prop.getIdentifier(), modifyListsOfChild == ModifyChildOption.FORCE_MODIFY); @@ -1655,7 +1661,7 @@ { listener.onCacheEntryUpdated(data); } - catch (Exception e) + catch (RuntimeException e) //NOSONAR { LOG.warn("The method onCacheEntryUpdated fails for the listener " + listener.getClass(), e); } @@ -1683,7 +1689,10 @@ } catch (IllegalPathException e) { - // Do nothing. Never happens. + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } // make new path - no matter node or property Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/ISPNCacheFactory.java =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/ISPNCacheFactory.java 2012-01-19 19:54:39 UTC (rev 5487) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/ISPNCacheFactory.java 2012-01-19 19:55:28 UTC (rev 5488) @@ -76,8 +76,8 @@ private final TemplateConfigurationHelper configurationHelper; - private static final Log log = ExoLogger - .getLogger("exo.jcr.component.core.impl.infinispan.v5.InfinispanCacheFactory"); + private static final Log LOG = ExoLogger + .getLogger("exo.jcr.component.core.impl.infinispan.v5.InfinispanCacheFactory");//NOSONAR /** * A Map that contains all the registered CacheManager order by cluster name. @@ -132,7 +132,7 @@ { // get Infinispan configuration file path final String configurationPath = parameterEntry.getParameterValue(INFINISPAN_CONFIG); - log.info("Infinispan Cache configuration used: " + configurationPath); + LOG.info("Infinispan Cache configuration used: " + configurationPath); // avoid dashes in cache name. Some SQL servers doesn't allow dashes in table names final String regionIdEscaped = regionId.replace("-", "_"); // prepare configuration @@ -221,9 +221,9 @@ // template to define a new configuration manager = new DefaultCacheManager(gc); CACHE_MANAGERS.put(clusterName, manager); - if (log.isInfoEnabled()) + if (LOG.isInfoEnabled()) { - log.info("A new ISPN Cache Manager instance has been registered for the region " + regionId + LOG.info("A new ISPN Cache Manager instance has been registered for the region " + regionId + " and the container " + container.getContext().getName()); } } @@ -251,9 +251,9 @@ Configuration conf = holder.getDefaultConfigurationBuilder().build(); // Define the configuration of the cache manager.defineConfiguration(regionId, conf); - if (log.isInfoEnabled()) + if (LOG.isInfoEnabled()) { - log.info("The region " + regionId + " has been registered for the container " + LOG.info("The region " + regionId + " has been registered for the container " + container.getContext().getName()); } return manager; Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/transaction/infinispan/JBossStandaloneJTAManagerLookup.java =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/transaction/infinispan/JBossStandaloneJTAManagerLookup.java 2012-01-19 19:54:39 UTC (rev 5487) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/transaction/infinispan/JBossStandaloneJTAManagerLookup.java 2012-01-19 19:55:28 UTC (rev 5488) @@ -49,7 +49,7 @@ * The logger */ private static final Log LOG = - ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.JBossStandaloneJTAManagerLookup"); + ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.JBossStandaloneJTAManagerLookup");//NOSONAR private Method manager, user; @@ -60,9 +60,9 @@ manager = loadClassStrict("com.arjuna.ats.jta.TransactionManager").getMethod("transactionManager"); user = loadClassStrict("com.arjuna.ats.jta.UserTransaction").getMethod("userTransaction"); } - catch (Exception e) + catch (Exception e)//NOSONAR { - throw new RuntimeException(e); + throw new RuntimeException(e);//NOSONAR } }