[exo-jcr-commits] exo-jcr SVN: r5341 - in kernel/trunk: exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/io and 8 other directories.

Author: andrew.plotnikov Date: 2011-12-22 08:08:06 -0500 (Thu, 22 Dec 2011) New Revision: 5341 Modified: kernel/trunk/exo.kernel.commons.test/src/main/java/org/exoplatform/commons/test/TestSecurityManager.java kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ExoExpression.java kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ExoProperties.java kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ISO8601.java kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/PropertiesLoader.java kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/io/ZipUtil.java kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/concurrent/SynchronizedQueue.java kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/CacheServiceImpl.java kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/compress/CompressData.java kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/rpc/impl/AbstractRPCService.java kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/Namespaces.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ObjectParam.java Log: EXOJCR-1687: Fixed new sonar violations in project Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ExoExpression.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ExoExpression.java 2011-12-21 14:09:54 UTC (rev 5340) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ExoExpression.java 2011-12-22 13:08:06 UTC (rev 5341) @@ -244,26 +244,42 @@ return new ByteArrayInputStream(baos.toByteArray()); for (File f : list) { - String filePath = f.getAbsolutePath(); - if (filePath.startsWith(path)) + StringBuffer filePath = new StringBuffer(f.getAbsolutePath()); + + if (f.getAbsolutePath().startsWith(path)) { if (containParent && input.isDirectory()) - filePath = input.getName() + File.separator + filePath.substring(path.length() + 1); + { + filePath = new StringBuffer(input.getName()); + filePath.append(File.separator); + filePath.append(f.getAbsolutePath().substring(path.length() + 1)); + } else if (input.isDirectory()) - filePath = filePath.substring(path.length() + 1); + { + filePath = new StringBuffer(f.getAbsolutePath().substring(path.length() + 1)); + } else - filePath = input.getName(); + { + filePath = new StringBuffer(input.getName()); + } } + if (f.isFile()) { FileInputStream fileInput = new FileInputStream(f); bufInput = new BufferedInputStream(fileInput, BUFFER); } else - filePath += "/"; - addToArchive(zipOutput, bufInput, filePath); + { + filePath.append("/"); + } + + addToArchive(zipOutput, bufInput, filePath.toString()); + if (bufInput != null) + { bufInput.close(); + } } zipOutput.close(); ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ExoProperties.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ExoProperties.java 2011-12-21 14:09:54 UTC (rev 5340) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ExoProperties.java 2011-12-22 13:08:06 UTC (rev 5341) @@ -18,7 +18,6 @@ */ package org.exoplatform.commons.utils; -import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; @@ -57,7 +56,7 @@ String[] temp = text.split("\n"); for (int i = 0; i < temp.length; i++) { - temp[i] = temp[i].trim(); + temp[i] = temp[i].trim(); //NOSONAR if (temp[i].length() > 0) { String[] value = temp[i].split("="); Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ISO8601.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ISO8601.java 2011-12-21 14:09:54 UTC (rev 5340) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ISO8601.java 2011-12-22 13:08:06 UTC (rev 5341) @@ -263,7 +263,8 @@ */ public static Calendar parse(String dateString, String[] formats) throws ParseException { - String problems = ""; + StringBuffer problems = new StringBuffer(); + int errOffset = 0; for (String format : formats) { @@ -276,12 +277,24 @@ { if (errOffset == 0) errOffset = e.getErrorOffset(); - problems += format + " - " + e.getMessage() + ", error offset " + e.getErrorOffset() + " \n"; + + problems.append(format); + problems.append(" - "); + problems.append(e.getMessage()); + problems.append(", error offset "); + problems.append(e.getErrorOffset()); + problems.append(" \n"); + } catch (NumberFormatException e) { errOffset = 0; - problems += format + " - " + e.getMessage() + " \n"; + + problems.append(format); + problems.append(" - "); + problems.append(e.getMessage()); + problems.append(" \n"); + } } Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java 2011-12-21 14:09:54 UTC (rev 5340) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java 2011-12-22 13:08:06 UTC (rev 5341) @@ -153,7 +153,7 @@ { String mimeType = getMimeType(fileName); - if (mimeType == defaultMimeType) + if (mimeType.equals(defaultMimeType)) { Collection<?> mimeTypes = MimeUtil.getMimeTypes(is); if (!mimeTypes.isEmpty()) Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/PropertiesLoader.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/PropertiesLoader.java 2011-12-21 14:09:54 UTC (rev 5340) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/PropertiesLoader.java 2011-12-22 13:08:06 UTC (rev 5341) @@ -20,7 +20,6 @@ import java.io.IOException; import java.io.InputStream; -import java.io.Reader; import java.util.LinkedHashMap; import java.util.Properties; Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/io/ZipUtil.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/io/ZipUtil.java 2011-12-21 14:09:54 UTC (rev 5340) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/io/ZipUtil.java 2011-12-22 13:08:06 UTC (rev 5341) @@ -72,26 +72,42 @@ return zipOutput; for (File f : list) { - String filePath = f.getAbsolutePath(); - if (filePath.startsWith(path)) + StringBuffer filePath = new StringBuffer(f.getAbsolutePath()); + + if (f.getAbsolutePath().startsWith(path)) { if (containParent && input.isDirectory()) - filePath = input.getName() + File.separator + filePath.substring(path.length() + 1); + { + filePath = new StringBuffer(input.getName()); + filePath.append(File.separator); + filePath.append(f.getAbsolutePath().substring(path.length() + 1)); + } else if (input.isDirectory()) - filePath = filePath.substring(path.length() + 1); + { + filePath = new StringBuffer(f.getAbsolutePath().substring(path.length() + 1)); + } else - filePath = input.getName(); + { + filePath = new StringBuffer(input.getName()); + } } + if (f.isFile()) { FileInputStream fileInput = new FileInputStream(f); bufInput = new BufferedInputStream(fileInput, BUFFER); } else - filePath += "/"; - addToArchive(zipOutput, bufInput, filePath); + { + filePath.append("/"); + } + + addToArchive(zipOutput, bufInput, filePath.toString()); + if (bufInput != null) + { bufInput.close(); + } } return zipOutput; } Modified: kernel/trunk/exo.kernel.commons.test/src/main/java/org/exoplatform/commons/test/TestSecurityManager.java =================================================================== --- kernel/trunk/exo.kernel.commons.test/src/main/java/org/exoplatform/commons/test/TestSecurityManager.java 2011-12-21 14:09:54 UTC (rev 5340) +++ kernel/trunk/exo.kernel.commons.test/src/main/java/org/exoplatform/commons/test/TestSecurityManager.java 2011-12-22 13:08:06 UTC (rev 5341) @@ -112,15 +112,15 @@ { return; } - + // Only for debug purpose - // if (!se - // .getMessage() - // .equals( - // "access denied (java.lang.RuntimePermission accessClassInPackage.com.sun.xml.internal.bind.v2.runtime.reflect)")) - // { - // se.printStackTrace(); - // } + //if (!se + // .getMessage() + // .equals( + // "access denied (java.lang.RuntimePermission accessClassInPackage.com.sun.xml.internal.bind.v2.runtime.reflect)")) + //{ + // se.printStackTrace(); //NOSONAR + //} throw se; } Modified: kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/concurrent/SynchronizedQueue.java =================================================================== --- kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/concurrent/SynchronizedQueue.java 2011-12-21 14:09:54 UTC (rev 5340) +++ kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/concurrent/SynchronizedQueue.java 2011-12-22 13:08:06 UTC (rev 5341) @@ -81,12 +81,11 @@ { int cachedQueueSize = queueSize; int effectiveQueueSize = 0; - for (Item item = head.next; item != tail; item = item.next) + for (Item item = head.next; item != tail; item = item.next) //NOSONAR { effectiveQueueSize++; } - // if (effectiveQueueSize != cachedQueueSize) { throw new AssertionError("The cached queue size " + cachedQueueSize Modified: kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/CacheServiceImpl.java =================================================================== --- kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/CacheServiceImpl.java 2011-12-21 14:09:54 UTC (rev 5340) +++ kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/CacheServiceImpl.java 2011-12-22 13:08:06 UTC (rev 5341) @@ -169,7 +169,7 @@ ExoCache simple = null; if (factory_ != DEFAULT_FACTORY && safeConfig.getClass().isAssignableFrom(ExoCacheConfig.class) - && safeConfig.getImplementation() != null) + && safeConfig.getImplementation() != null) //NOSONAR { // The implementation exists and the config is not a sub class of ExoCacheConfig // we assume that we expect to use the default cache factory Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/compress/CompressData.java =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/compress/CompressData.java 2011-12-21 14:09:54 UTC (rev 5340) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/compress/CompressData.java 2011-12-22 13:08:06 UTC (rev 5341) @@ -354,25 +354,37 @@ throw new Exception("nothing in the list"); for (File f : list) { - String filePath = f.getAbsolutePath(); - if (filePath.startsWith(path)) + StringBuffer filePath = new StringBuffer(f.getAbsolutePath()); + + if (f.getAbsolutePath().startsWith(path)) { if (containParent && file_.isDirectory()) - filePath = file_.getName() + File.separator + filePath.substring(path.length() + 1); + { + filePath = new StringBuffer(file_.getName()); + filePath.append(File.separator); + filePath.append(f.getAbsolutePath().substring(path.length() + 1)); + } else if (file_.isDirectory()) - filePath = filePath.substring(path.length() + 1); + { + filePath = new StringBuffer(f.getAbsolutePath().substring(path.length() + 1)); + } else - filePath = file_.getName(); + { + filePath = new StringBuffer(file_.getName()); + } } + if (f.isFile()) { bufInput = PrivilegedFileHelper.fileInputStream(f); } else - filePath += "/"; - addToArchive(jos, bufInput, filePath); + { + filePath.append("/"); + } + + addToArchive(jos, bufInput, filePath.toString()); } - } private List<File> listFile(File dir) @@ -440,23 +452,36 @@ throw new Exception("nothing in the list"); for (File f : list) { - String filePath = f.getAbsolutePath(); - if (filePath.startsWith(path)) + StringBuffer filePath = new StringBuffer(f.getAbsolutePath()); + + if (f.getAbsolutePath().startsWith(path)) { if (containParent && file_.isDirectory()) - filePath = file_.getName() + File.separator + filePath.substring(path.length() + 1); + { + filePath = new StringBuffer(file_.getName()); + filePath.append(File.separator); + filePath.append(f.getAbsolutePath().substring(path.length() + 1)); + } else if (file_.isDirectory()) - filePath = filePath.substring(path.length() + 1); + { + filePath = new StringBuffer(f.getAbsolutePath().substring(path.length() + 1)); + } else - filePath = file_.getName(); + { + filePath = new StringBuffer(file_.getName()); + } } + if (f.isFile()) { bufInput = new FileInputStream(f); } else - filePath += "/"; - addToArchive(zos, bufInput, filePath); + { + filePath.append("/"); + } + + addToArchive(zos, bufInput, filePath.toString()); } } Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/rpc/impl/AbstractRPCService.java =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/rpc/impl/AbstractRPCService.java 2011-12-21 14:09:54 UTC (rev 5340) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/rpc/impl/AbstractRPCService.java 2011-12-22 13:08:06 UTC (rev 5341) @@ -411,7 +411,7 @@ throw new RPCException("Command " + commandId + " unknown, please register your command first"); } final Message msg = new Message(); - setObject(msg, new MessageBody(dests.size() == 1 && dests != members ? dests.get(0) : null, commandId, args)); + setObject(msg, new MessageBody(dests.size() == 1 && dests != members ? dests.get(0) : null, commandId, args)); //NOSONAR RspList rsps = SecurityHelper.doPrivilegedAction(new PrivilegedAction<RspList>() { public RspList run() Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java 2011-12-21 14:09:54 UTC (rev 5340) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java 2011-12-22 13:08:06 UTC (rev 5341) @@ -137,7 +137,8 @@ ALLOW_SHAREABLE_CACHE, ALLOW_SHAREABLE_CACHE_DEFAULT)); } - ExoCacheFactoryImpl(ExoContainerContext ctx, String cacheConfigTemplate, ConfigurationManager configManager, boolean allowShareableCache) + ExoCacheFactoryImpl(ExoContainerContext ctx, String cacheConfigTemplate, ConfigurationManager configManager, + boolean allowShareableCache) { this.ctx = ctx; this.configManager = configManager; Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/Namespaces.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/Namespaces.java 2011-12-21 14:09:54 UTC (rev 5340) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/Namespaces.java 2011-12-22 13:08:06 UTC (rev 5341) @@ -90,7 +90,8 @@ */ public static String[] getKernelNamespaces() { - return new String[]{KERNEL_1_0_URI, KERNEL_1_1_URI, KERNEL_1_2_URI, KERNEL_1_0_URI_OLD, KERNEL_1_1_URI_OLD, KERNEL_1_2_URI_OLD}; + return new String[]{KERNEL_1_0_URI, KERNEL_1_1_URI, KERNEL_1_2_URI, KERNEL_1_0_URI_OLD, KERNEL_1_1_URI_OLD, + KERNEL_1_2_URI_OLD}; } /** Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ObjectParam.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ObjectParam.java 2011-12-21 14:09:54 UTC (rev 5340) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ObjectParam.java 2011-12-22 13:08:06 UTC (rev 5341) @@ -149,10 +149,15 @@ { String[] temp = value.split(" "); String className = temp[1]; + if (className.indexOf(".") < 0) { - className = package_ + "." + className; - Class clazz = Class.forName(className); + StringBuffer fullName = new StringBuffer(); + fullName.append(package_); + fullName.append("."); + fullName.append(className); + + Class clazz = Class.forName(fullName.toString()); return clazz.newInstance(); } }