You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2014/02/21 04:15:26 UTC
svn commit: r1570436 - in
/tomee/tomee/trunk/container/openejb-core/src/main: config/pmd/
java/org/apache/openejb/assembler/classic/ java/org/apache/openejb/config/
java/org/apache/openejb/config/sys/
java/org/apache/openejb/config/typed/util/ java/org...
Author: tveronezi
Date: Fri Feb 21 03:15:25 2014
New Revision: 1570436
URL: http://svn.apache.org/r1570436
Log:
openejb-core PMD - AddEmptyString
Do not add empty strings
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-optimizations.xml
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConvertDataSourceDefinitions.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/PropertiesLoginModule.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbObjectHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/FileHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/commonslogging/OpenEJBCommonsLog.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Index.java
Modified: tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-optimizations.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-optimizations.xml?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-optimizations.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-optimizations.xml Fri Feb 21 03:15:25 2014
@@ -32,7 +32,6 @@ limitations under the License.
<exclude name="RedundantFieldInitializer"/>
<exclude name="SimplifyStartsWith"/>
<exclude name="UseStringBufferForStringAppends"/>
- <exclude name="AddEmptyString"/>
<exclude name="UseArrayListInsteadOfVector"/>
</rule>
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Fri Feb 21 03:15:25 2014
@@ -1604,7 +1604,7 @@ public class Assembler extends Assembler
// stop
for (final BeanContext deployment : deployments) {
- final String deploymentID = deployment.getDeploymentID() + "";
+ final String deploymentID = String.valueOf(deployment.getDeploymentID());
try {
final Container container = deployment.getContainer();
container.stop(deployment);
@@ -1615,7 +1615,7 @@ public class Assembler extends Assembler
// undeploy
for (final BeanContext bean : deployments) {
- final String deploymentID = bean.getDeploymentID() + "";
+ final String deploymentID = String.valueOf(bean.getDeploymentID());
try {
final Container container = bean.getContainer();
container.undeploy(bean);
@@ -1654,7 +1654,7 @@ public class Assembler extends Assembler
// Clear out naming for all components first
for (final BeanContext deployment : deployments) {
- final String deploymentID = deployment.getDeploymentID() + "";
+ final String deploymentID = String.valueOf(deployment.getDeploymentID());
try {
containerSystem.removeBeanContext(deployment);
} catch (final Throwable t) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java Fri Feb 21 03:15:25 2014
@@ -115,7 +115,7 @@ public class JaccPermissionsBuilder {
final MethodInfo bm = new MethodInfo();
bm.ejbName = beanContext.getEjbName();
- bm.ejbDeploymentId = beanContext.getDeploymentID() + "";
+ bm.ejbDeploymentId = String.valueOf(beanContext.getDeploymentID());
bm.methodIntf = am.methodIntf;
bm.className = method.getDeclaringClass().getName();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java Fri Feb 21 03:15:25 2014
@@ -346,7 +346,7 @@ public class JndiBuilder {
}
public String getName(final Class interfce, final String key, final Interface type) {
- String id = beanContext.getDeploymentID() + "";
+ String id = String.valueOf(beanContext.getDeploymentID());
if (id.charAt(0) == '/') {
id = id.substring(1);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java Fri Feb 21 03:15:25 2014
@@ -118,7 +118,7 @@ public class ReloadableEntityManagerFact
throw new OpenEJBRuntimeException(e);
} finally {
final long time = TimeUnit.MILLISECONDS.convert(System.nanoTime() - start, TimeUnit.NANOSECONDS);
- LOGGER.info("assembler.buildingPersistenceUnit", unitInfoImpl.getPersistenceUnitName(), unitInfoImpl.getPersistenceProviderClassName(), time + "");
+ LOGGER.info("assembler.buildingPersistenceUnit", unitInfoImpl.getPersistenceUnitName(), unitInfoImpl.getPersistenceProviderClassName(), String.valueOf(time));
if (LOGGER.isDebugEnabled()) {
for (final Map.Entry<Object, Object> entry : unitInfoImpl.getProperties().entrySet()) {
LOGGER.debug(entry.getKey() + "=" + entry.getValue());
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java Fri Feb 21 03:15:25 2014
@@ -88,8 +88,8 @@ public class ActivationConfigPropertyOve
for (final Map.Entry<Object, Object> entry : overrides.entrySet()) {
- final Object property = entry.getKey() + "";
- final Object value = entry.getValue() + "";
+ final Object property = String.valueOf(entry.getKey());
+ final Object value = String.valueOf(entry.getValue());
ActivationConfigProperty activationConfigProperty = this.findActivationProperty(activationConfigList, property.toString());
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Fri Feb 21 03:15:25 2014
@@ -2826,7 +2826,7 @@ public class AnnotationDeployer implemen
final ValidationContext validation = ejbModule.getValidation();
final String ejbName = sessionBean.getEjbName();
- final boolean strict = getProperty(STRICT_INTERFACE_DECLARATION, false + "").equalsIgnoreCase("true");
+ final boolean strict = getProperty(STRICT_INTERFACE_DECLARATION, "false").equalsIgnoreCase("true");
/*
* Collect all interfaces explicitly declared via xml.
@@ -4921,9 +4921,9 @@ public class AnnotationDeployer implemen
if (methodAttributes == null) return null;
for (final MethodAttribute methodAttribute : methodAttributes) {
- final String className = clazz != null ? clazz.getName() : null + "";
+ final String className = clazz != null ? clazz.getName() : String.valueOf((Object) null);
- if (className.equals(methodAttribute.getClassName() + "")) {
+ if (className.equals(methodAttribute.getClassName())) {
return methodAttribute;
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java Fri Feb 21 03:15:25 2014
@@ -1076,7 +1076,7 @@ public class AutoConfig implements Dynam
return (Integer) number;
} catch (final Exception e) {
try {
- return Integer.parseInt(number + "");
+ return Integer.parseInt(String.valueOf(number));
} catch (final NumberFormatException e1) {
return -1;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConvertDataSourceDefinitions.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConvertDataSourceDefinitions.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConvertDataSourceDefinitions.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConvertDataSourceDefinitions.java Fri Feb 21 03:15:25 2014
@@ -137,7 +137,7 @@ public class ConvertDataSourceDefinition
if (key == null) return;
if (value == null) return;
- properties.put(key, PropertyPlaceHolderHelper.value(value + ""));
+ properties.put(key, PropertyPlaceHolderHelper.value(String.valueOf(value)));
}
private List<JndiConsumer> collectConsumers(final AppModule appModule) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java Fri Feb 21 03:15:25 2014
@@ -132,7 +132,7 @@ public class EjbJarInfoBuilder {
}
}
- final String message = messages.format("conf.0008", jar.getJarLocation(), "" + beansInEjbJar, "" + beansDeployed);
+ final String message = messages.format("conf.0008", jar.getJarLocation(), String.valueOf(beansInEjbJar), String.valueOf(beansDeployed));
logger.warning(message);
throw new OpenEJBException(message);
}
@@ -808,7 +808,7 @@ public class EjbJarInfoBuilder {
bean.primKeyClass = e.getPrimKeyClass();
bean.primKeyField = e.getPrimkeyField();
bean.persistenceType = e.getPersistenceType().toString();
- bean.reentrant = e.getReentrant() + "";
+ bean.reentrant = String.valueOf(e.getReentrant());
bean.properties.putAll(d.getProperties());
final CmpVersion cmpVersion = e.getCmpVersion();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java Fri Feb 21 03:15:25 2014
@@ -109,7 +109,7 @@ public class WikiGenerator {
out.println();
out.println("Declarable in properties via");
out.println();
- out.println(" Foo = new://" + provider.getService() + "?type=" + type + "");
+ out.println(" Foo = new://" + provider.getService() + "?type=" + type);
out.println();
final SuperProperties properties = (SuperProperties) provider.getProperties();
@@ -135,7 +135,7 @@ public class WikiGenerator {
comment = scrubText(comment);
- defaults.put(name, value + "");
+ defaults.put(name, value);
if (comment.length() == 0) comment = "No description.";
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java Fri Feb 21 03:15:25 2014
@@ -140,7 +140,7 @@ public class ProviderGenerator extends R
)
.apply(
"builder", builder,
- "className", provider.getClassName() + "",
+ "className", provider.getClassName(),
"type", types.get(0),
"name", name
)
@@ -319,7 +319,7 @@ public class ProviderGenerator extends R
}
private static String fixConstructor(final ServiceProvider provider) {
- final String s = provider.getConstructor() + "";
+ final String s = provider.getConstructor();
final String[] split = s.split(" *, *");
for (int i = 0; i < split.length; i++) {
split[i] = Strings.lcfirst(split[i]);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/PropertiesLoginModule.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/PropertiesLoginModule.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/PropertiesLoginModule.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/PropertiesLoginModule.java Fri Feb 21 03:15:25 2014
@@ -66,8 +66,8 @@ public class PropertiesLoginModule imple
this.callbackHandler = callbackHandler;
debug = log.isDebugEnabled() || "true".equalsIgnoreCase((String) options.get("Debug"));
- final String usersFile = (String) options.get(USER_FILE) + "";
- final String groupsFile = (String) options.get(GROUP_FILE) + "";
+ final String usersFile = (String) options.get(USER_FILE);
+ final String groupsFile = (String) options.get(GROUP_FILE);
usersUrl = ConfUtils.getConfResource(usersFile);
groupsUrl = ConfUtils.getConfResource(groupsFile);
@@ -125,7 +125,7 @@ public class PropertiesLoginModule imple
for (final Enumeration enumeration = groups.keys(); enumeration.hasMoreElements();) {
final String name = (String) enumeration.nextElement();
- final String[] userList = ((String) groups.getProperty(name) + "").split(",");
+ final String[] userList = ((String) groups.getProperty(name)).split(",");
for (int i = 0; i < userList.length; i++) {
if (user.equals(userList[i])) {
principals.add(new GroupPrincipal(name));
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java Fri Feb 21 03:15:25 2014
@@ -34,7 +34,7 @@ public class SingletonEjbObjectHandler e
}
public static Object createRegistryId(final Object primKey, final Object deployId, final Container contnr) {
- return "" + deployId + contnr.getContainerID();
+ return String.valueOf(deployId) + contnr.getContainerID();
}
public Object getRegistryId() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbObjectHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbObjectHandler.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbObjectHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbObjectHandler.java Fri Feb 21 03:15:25 2014
@@ -35,7 +35,7 @@ public class StatelessEjbObjectHandler e
}
public static Object createRegistryId(final Object primKey, final Object deployId, final Container contnr) {
- return "" + deployId + contnr.getContainerID();
+ return String.valueOf(deployId) + contnr.getContainerID();
}
@Override
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/FileHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/FileHandler.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/FileHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/FileHandler.java Fri Feb 21 03:15:25 2014
@@ -309,7 +309,7 @@ public class FileHandler
}
// Get logging level for the handler
- setLevel(Level.parse(getProperty(className + ".level", "" + Level.ALL)));
+ setLevel(Level.parse(getProperty(className + ".level", String.valueOf(Level.ALL))));
// Get filter configuration
final String filterName = getProperty(className + ".filter", null);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/commonslogging/OpenEJBCommonsLog.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/commonslogging/OpenEJBCommonsLog.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/commonslogging/OpenEJBCommonsLog.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/commonslogging/OpenEJBCommonsLog.java Fri Feb 21 03:15:25 2014
@@ -66,62 +66,62 @@ public class OpenEJBCommonsLog implement
@Override
public void trace(final Object message) {
- logger.debug(message + "");
+ logger.debug(String.valueOf(message));
}
@Override
public void trace(final Object message, final Throwable t) {
- logger.debug(message + "", t);
+ logger.debug(String.valueOf(message), t);
}
@Override
public void debug(final Object message) {
- logger.debug(message + "");
+ logger.debug(String.valueOf(message));
}
@Override
public void debug(final Object message, final Throwable t) {
- logger.debug(message + "", t);
+ logger.debug(String.valueOf(message), t);
}
@Override
public void info(final Object message) {
- logger.info(message + "");
+ logger.info(String.valueOf(message));
}
@Override
public void info(final Object message, final Throwable t) {
- logger.info(message + "", t);
+ logger.info(String.valueOf(message), t);
}
@Override
public void warn(final Object message) {
- logger.warning(message + "");
+ logger.warning(String.valueOf(message));
}
@Override
public void warn(final Object message, final Throwable t) {
- logger.warning(message + "", t);
+ logger.warning(String.valueOf(message), t);
}
@Override
public void error(final Object message) {
- logger.error(message + "");
+ logger.error(String.valueOf(message));
}
@Override
public void error(final Object message, final Throwable t) {
- logger.error(message + "", t);
+ logger.error(String.valueOf(message), t);
}
@Override
public void fatal(final Object message) {
- logger.fatal(message + "");
+ logger.fatal(String.valueOf(message));
}
@Override
public void fatal(final Object message, final Throwable t) {
- logger.fatal(message + "", t);
+ logger.fatal(String.valueOf(message), t);
}
private void writeObject(final ObjectOutputStream out) throws IOException {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java Fri Feb 21 03:15:25 2014
@@ -60,7 +60,7 @@ public class ActiveMQResourceAdapter ext
if (startupTimeout.getUnit() == null) {
startupTimeout.setUnit(TimeUnit.MILLISECONDS);
}
- this.startupTimeout = "" + TimeUnit.MILLISECONDS.convert(startupTimeout.getTime(), startupTimeout.getUnit());
+ this.startupTimeout = String.valueOf(TimeUnit.MILLISECONDS.convert(startupTimeout.getTime(), startupTimeout.getUnit()));
}
@Override
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java Fri Feb 21 03:15:25 2014
@@ -169,7 +169,7 @@ public class DataSourceFactory {
}
final long milliseconds = TimeUnit.MILLISECONDS.convert(duration.getTime(), duration.getUnit());
- properties.put(oldKey, milliseconds + "");
+ properties.put(oldKey, String.valueOf(milliseconds));
}
public static DataSourceCreator creator(final Object creatorName, final boolean willBeProxied) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Index.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Index.java?rev=1570436&r1=1570435&r2=1570436&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Index.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Index.java Fri Feb 21 03:15:25 2014
@@ -87,17 +87,17 @@ public class Index<K,V> extends Abstract
}
public K getKey(final int index) {
- if (index < 0 || index >= entries.length) throw new IndexOutOfBoundsException("" + index);
+ if (index < 0 || index >= entries.length) throw new IndexOutOfBoundsException(String.valueOf(index));
return entries[index].getKey();
}
public V get(final int index) {
- if (index < 0 || index >= entries.length) throw new IndexOutOfBoundsException("" + index);
+ if (index < 0 || index >= entries.length) throw new IndexOutOfBoundsException(String.valueOf(index));
return entries[index].getValue();
}
public V set(final int index, final V value) {
- if (index < 0 || index >= entries.length) throw new IndexOutOfBoundsException("" + index);
+ if (index < 0 || index >= entries.length) throw new IndexOutOfBoundsException(String.valueOf(index));
final IndexEntry<K,V> entry = entries[index];
final V oldValue = entry.getValue();
entry.setValue(value);
@@ -148,7 +148,7 @@ public class Index<K,V> extends Abstract
}
public ListIterator<V> listIterator(final int index) {
- if (index < 0 || index >= entries.length) throw new IndexOutOfBoundsException("" + index);
+ if (index < 0 || index >= entries.length) throw new IndexOutOfBoundsException(String.valueOf(index));
return new IndexListIterator<V>(index);
}