Java 5 code style

Author: jhoeller

org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ public AspectJPointcutAdvisor(AbstractAspectJAdvice advice) {
 	}
 
 	public void setOrder(int order) {
-		this.order = new Integer(order);
+		this.order = order;
 	}
 
 
@@ -70,7 +70,7 @@ public Pointcut getPointcut() {
 
 	public int getOrder() {
 		if (this.order != null) {
-			return this.order.intValue();
+			return this.order;
 		}
 		else {
 			return this.advice.getOrder();

org.springframework.aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java

@@ -159,11 +159,11 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 		try {
 			if (!this.equalsDefined && AopUtils.isEqualsMethod(method)) {
 				// The target does not implement the equals(Object) method itself.
-				return (equals(args[0]) ? Boolean.TRUE : Boolean.FALSE);
+				return equals(args[0]);
 			}
 			if (!this.hashCodeDefined && AopUtils.isHashCodeMethod(method)) {
 				// The target does not implement the hashCode() method itself.
-				return new Integer(hashCode());
+				return hashCode();
 			}
 			if (!this.advised.opaque && method.getDeclaringClass().isInterface() &&
 					method.getDeclaringClass().isAssignableFrom(Advised.class)) {

org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java

@@ -345,11 +345,11 @@ private class ServiceLocatorInvocationHandler implements InvocationHandler {
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			if (ReflectionUtils.isEqualsMethod(method)) {
 				// Only consider equal when proxies are identical.
-				return (proxy == args[0] ? Boolean.TRUE : Boolean.FALSE);
+				return (proxy == args[0]);
 			}
 			else if (ReflectionUtils.isHashCodeMethod(method)) {
 				// Use hashCode of service locator proxy.
-				return new Integer(System.identityHashCode(proxy));
+				return System.identityHashCode(proxy);
 			}
 			else if (ReflectionUtils.isToStringMethod(method)) {
 				return "Service locator: " + serviceLocatorInterface.getName();

org.springframework.context/src/main/java/org/springframework/jmx/export/MBeanExporter.java

@@ -227,7 +227,7 @@ public void setAutodetect(boolean autodetect) {
 	 * @see #AUTODETECT_NONE
 	 */
 	public void setAutodetectMode(int autodetectMode) {
-		if (!constants.getValues(CONSTANT_PREFIX_AUTODETECT).contains(new Integer(autodetectMode))) {
+		if (!constants.getValues(CONSTANT_PREFIX_AUTODETECT).contains(autodetectMode)) {
 			throw new IllegalArgumentException("Only values of autodetect constants allowed");
 		}
 		this.autodetectMode = autodetectMode;

org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java

@@ -98,7 +98,7 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 	 * accessors or mutators for attributes.
 	 * @see #FIELD_VISIBILITY
 	 */
-	protected static final Integer ATTRIBUTE_OPERATION_VISIBILITY = new Integer(4);
+	protected static final int ATTRIBUTE_OPERATION_VISIBILITY = 4;
 
 	/**
 	 * Constant identifier for the class field in a JMX {@link Descriptor}.

org.springframework.context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java

@@ -175,10 +175,10 @@ public BshObjectInvocationHandler(XThis xt) {
 
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			if (ReflectionUtils.isEqualsMethod(method)) {
-				return (isProxyForSameBshObject(args[0]) ? Boolean.TRUE : Boolean.FALSE);
+				return (isProxyForSameBshObject(args[0]));
 			}
 			else if (ReflectionUtils.isHashCodeMethod(method)) {
-				return new Integer(this.xt.hashCode());
+				return this.xt.hashCode();
 			}
 			else if (ReflectionUtils.isToStringMethod(method)) {
 				return "BeanShell object [" + this.xt + "]";

org.springframework.context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java

@@ -162,7 +162,7 @@ public RubyObjectInvocationHandler(IRubyObject rubyObject, Ruby ruby) {
 
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			if (ReflectionUtils.isEqualsMethod(method)) {
-				return (isProxyForSameRubyObject(args[0]) ? Boolean.TRUE : Boolean.FALSE);
+				return (isProxyForSameRubyObject(args[0]));
 			}
 			else if (ReflectionUtils.isHashCodeMethod(method)) {
 				return this.rubyObject.hashCode();

org.springframework.core/src/main/java/org/springframework/core/style/ToStringCreator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -106,33 +106,33 @@ public ToStringCreator append(String fieldName, int value) {
 	}
 
 	/**
-	 * Append a float field value.
+	 * Append a long field value.
 	 * @param fieldName the name of the field, usually the member variable name
 	 * @param value the field value
 	 * @return this, to support call-chaining
 	 */
-	public ToStringCreator append(String fieldName, float value) {
-		return append(fieldName, new Float(value));
+	public ToStringCreator append(String fieldName, long value) {
+		return append(fieldName, new Long(value));
 	}
 
 	/**
-	 * Append a double field value.
+	 * Append a float field value.
 	 * @param fieldName the name of the field, usually the member variable name
 	 * @param value the field value
 	 * @return this, to support call-chaining
 	 */
-	public ToStringCreator append(String fieldName, double value) {
-		return append(fieldName, new Double(value));
+	public ToStringCreator append(String fieldName, float value) {
+		return append(fieldName, new Float(value));
 	}
 
 	/**
-	 * Append a long field value.
+	 * Append a double field value.
 	 * @param fieldName the name of the field, usually the member variable name
 	 * @param value the field value
 	 * @return this, to support call-chaining
 	 */
-	public ToStringCreator append(String fieldName, long value) {
-		return append(fieldName, new Long(value));
+	public ToStringCreator append(String fieldName, double value) {
+		return append(fieldName, new Double(value));
 	}
 
 	/**
@@ -142,7 +142,7 @@ public ToStringCreator append(String fieldName, long value) {
 	 * @return this, to support call-chaining
 	 */
 	public ToStringCreator append(String fieldName, boolean value) {
-		return append(fieldName, value ? Boolean.TRUE : Boolean.FALSE);
+		return append(fieldName, Boolean.valueOf(value));
 	}
 
 	/**

org.springframework.core/src/main/java/org/springframework/util/NumberUtils.java

@@ -63,24 +63,24 @@ else if (targetClass.equals(Byte.class)) {
 			if (value < Byte.MIN_VALUE || value > Byte.MAX_VALUE) {
 				raiseOverflowException(number, targetClass);
 			}
-			return new Byte(number.byteValue());
+			return number.byteValue();
 		}
 		else if (targetClass.equals(Short.class)) {
 			long value = number.longValue();
 			if (value < Short.MIN_VALUE || value > Short.MAX_VALUE) {
 				raiseOverflowException(number, targetClass);
 			}
-			return new Short(number.shortValue());
+			return number.shortValue();
 		}
 		else if (targetClass.equals(Integer.class)) {
 			long value = number.longValue();
 			if (value < Integer.MIN_VALUE || value > Integer.MAX_VALUE) {
 				raiseOverflowException(number, targetClass);
 			}
-			return new Integer(number.intValue());
+			return number.intValue();
 		}
 		else if (targetClass.equals(Long.class)) {
-			return new Long(number.longValue());
+			return number.longValue();
 		}
 		else if (targetClass.equals(BigInteger.class)) {
 			if (number instanceof BigDecimal) {
@@ -93,10 +93,10 @@ else if (targetClass.equals(BigInteger.class)) {
 			}
 		}
 		else if (targetClass.equals(Float.class)) {
-			return new Float(number.floatValue());
+			return number.floatValue();
 		}
 		else if (targetClass.equals(Double.class)) {
-			return new Double(number.doubleValue());
+			return number.doubleValue();
 		}
 		else if (targetClass.equals(BigDecimal.class)) {
 			// always use BigDecimal(String) here to avoid unpredictability of BigDecimal(double)

org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java

@@ -1272,7 +1272,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 			}
 			else if (method.getName().equals("equals")) {
 				// Only consider equal when proxies are identical.
-				return (proxy == args[0] ? Boolean.TRUE : Boolean.FALSE);
+				return (proxy == args[0]);
 			}
 			else if (method.getName().equals("hashCode")) {
 				// Use hashCode of PersistenceManager proxy.