Make ObjectUtils.addObjectToArray() generic

Author: cbeams

org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java

@@ -305,7 +305,7 @@ public BeanDefinitionBuilder addDependsOn(String beanName) {
 			this.beanDefinition.setDependsOn(new String[] {beanName});
 		}
 		else {
-			String[] added = (String[]) ObjectUtils.addObjectToArray(this.beanDefinition.getDependsOn(), beanName);
+			String[] added = ObjectUtils.addObjectToArray(this.beanDefinition.getDependsOn(), beanName);
 			this.beanDefinition.setDependsOn(added);
 		}
 		return this;

org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java

@@ -334,12 +334,12 @@ protected void prepareScriptBeans(
 				ScriptFactory scriptFactory = this.scriptBeanFactory.getBean(scriptFactoryBeanName, ScriptFactory.class);
 				ScriptSource scriptSource =
 						getScriptSource(scriptFactoryBeanName, scriptFactory.getScriptSourceLocator());
-				Class[] interfaces = scriptFactory.getScriptInterfaces();
+				Class<?>[] interfaces = scriptFactory.getScriptInterfaces();
 
-				Class[] scriptedInterfaces = interfaces;
+				Class<?>[] scriptedInterfaces = interfaces;
 				if (scriptFactory.requiresConfigInterface() && !bd.getPropertyValues().isEmpty()) {
-					Class configInterface = createConfigInterface(bd, interfaces);
-					scriptedInterfaces = (Class[]) ObjectUtils.addObjectToArray(interfaces, configInterface);
+					Class<?> configInterface = createConfigInterface(bd, interfaces);
+					scriptedInterfaces = ObjectUtils.addObjectToArray(interfaces, configInterface);
 				}
 
 				BeanDefinition objectBd = createScriptedObjectBeanDefinition(

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

@@ -122,22 +122,23 @@ public static boolean containsElement(Object[] array, Object element) {
 	}
 
 	/**
-	 * Append the given Object to the given array, returning a new array
-	 * consisting of the input array contents plus the given Object.
+	 * Append the given object to the given array, returning a new array
+	 * consisting of the input array contents plus the given object.
 	 * @param array the array to append to (can be <code>null</code>)
-	 * @param obj the Object to append
+	 * @param obj the object to append
 	 * @return the new array (of the same component type; never <code>null</code>)
 	 */
-	public static Object[] addObjectToArray(Object[] array, Object obj) {
-		Class compType = Object.class;
+	public static <A,O extends A> A[] addObjectToArray(A[] array, O obj) {
+		Class<?> compType = Object.class;
 		if (array != null) {
 			compType = array.getClass().getComponentType();
 		}
 		else if (obj != null) {
 			compType = obj.getClass();
 		}
 		int newArrLength = (array != null ? array.length + 1 : 1);
-		Object[] newArr = (Object[]) Array.newInstance(compType, newArrLength);
+		@SuppressWarnings("unchecked")
+		A[] newArr = (A[]) Array.newInstance(compType, newArrLength);
 		if (array != null) {
 			System.arraycopy(array, 0, newArr, 0, array.length);
 		}

org.springframework.core/src/test/java/org/springframework/util/ObjectUtilsTests.java

@@ -119,7 +119,7 @@ public void testAddObjectToArraySunnyDay() {
 	public void testAddObjectToArrayWhenEmpty() {
 		String[] array = new String[0];
 		String newElement = "foo";
-		Object[] newArray = ObjectUtils.addObjectToArray(array, newElement);
+		String[] newArray = ObjectUtils.addObjectToArray(array, newElement);
 		assertEquals(1, newArray.length);
 		assertEquals(newElement, newArray[0]);
 	}
@@ -128,7 +128,7 @@ public void testAddObjectToSingleNonNullElementArray() {
 		String existingElement = "foo";
 		String[] array = new String[] {existingElement};
 		String newElement = "bar";
-		Object[] newArray = ObjectUtils.addObjectToArray(array, newElement);
+		String[] newArray = ObjectUtils.addObjectToArray(array, newElement);
 		assertEquals(2, newArray.length);
 		assertEquals(existingElement, newArray[0]);
 		assertEquals(newElement, newArray[1]);
@@ -137,15 +137,15 @@ public void testAddObjectToSingleNonNullElementArray() {
 	public void testAddObjectToSingleNullElementArray() {
 		String[] array = new String[] {null};
 		String newElement = "bar";
-		Object[] newArray = ObjectUtils.addObjectToArray(array, newElement);
+		String[] newArray = ObjectUtils.addObjectToArray(array, newElement);
 		assertEquals(2, newArray.length);
 		assertEquals(null, newArray[0]);
 		assertEquals(newElement, newArray[1]);
 	}
 
 	public void testAddObjectToNullArray() throws Exception {
 		String newElement = "foo";
-		Object[] newArray = ObjectUtils.addObjectToArray(null, newElement);
+		String[] newArray = ObjectUtils.addObjectToArray(null, newElement);
 		assertEquals(1, newArray.length);
 		assertEquals(newElement, newArray[0]);
 	}