Merge pull request #4688 from mnhock/Replace_with_valueOf()

* pr/4688:
  Prefer valueOf() to create Number values

Author: philwebb

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Metric.java

@@ -92,7 +92,7 @@ public String toString() {
 	 */
 	public Metric<Long> increment(int amount) {
 		return new Metric<Long>(this.getName(),
-				new Long(this.getValue().longValue() + amount));
+				Long.valueOf(this.getValue().longValue() + amount));
 	}
 
 	/**

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/InMemoryMetricRepository.java

@@ -57,7 +57,7 @@ public Metric<?> modify(Metric<?> current) {
 							metric.increment(amount).getValue(), timestamp);
 				}
 				else {
-					return new Metric<Long>(metricName, new Long(amount), timestamp);
+					return new Metric<Long>(metricName, Long.valueOf(amount), timestamp);
 				}
 			}
 		});

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReaderTests.java

@@ -64,12 +64,12 @@ public void numberGauge() {
 
 			@Override
 			public Number getValue() {
-				return new Integer(5);
+				return Integer.valueOf(5);
 			}
 
 		});
 		Metric<Integer> metric = (Metric<Integer>) this.metricReader.findOne("test");
-		assertThat(metric.getValue(), equalTo(new Integer(5)));
+		assertThat(metric.getValue(), equalTo(Integer.valueOf(5)));
 		this.metricRegistry.remove("test");
 		assertThat(this.metricReader.findOne("test"), is(nullValue()));
 	}

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/util/InMemoryRepositoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 the original author or authors.
+ * Copyright 2012-2015 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.
@@ -127,7 +127,7 @@ public Integer modify(Integer current) {
 		for (Future<Boolean> future : all) {
 			assertTrue(future.get(1, TimeUnit.SECONDS));
 		}
-		assertEquals(new Integer(0), repository.findOne("foo"));
+		assertEquals(Integer.valueOf(0), repository.findOne("foo"));
 	}
 
 }

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * Copyright 2013-2015 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.
@@ -100,7 +100,7 @@ public void testDataSourceInitialized() throws Exception {
 		assertTrue(dataSource instanceof org.apache.tomcat.jdbc.pool.DataSource);
 		assertNotNull(dataSource);
 		JdbcOperations template = new JdbcTemplate(dataSource);
-		assertEquals(new Integer(1),
+		assertEquals(Integer.valueOf(1),
 				template.queryForObject("SELECT COUNT(*) from BAR", Integer.class));
 	}
 
@@ -119,7 +119,7 @@ public void testDataSourceInitializedWithExplicitScript() throws Exception {
 		assertTrue(dataSource instanceof org.apache.tomcat.jdbc.pool.DataSource);
 		assertNotNull(dataSource);
 		JdbcOperations template = new JdbcTemplate(dataSource);
-		assertEquals(new Integer(1),
+		assertEquals(Integer.valueOf(1),
 				template.queryForObject("SELECT COUNT(*) from FOO", Integer.class));
 	}
 
@@ -142,9 +142,9 @@ public void testDataSourceInitializedWithMultipleScripts() throws Exception {
 		assertTrue(dataSource instanceof org.apache.tomcat.jdbc.pool.DataSource);
 		assertNotNull(dataSource);
 		JdbcOperations template = new JdbcTemplate(dataSource);
-		assertEquals(new Integer(1),
+		assertEquals(Integer.valueOf(1),
 				template.queryForObject("SELECT COUNT(*) from FOO", Integer.class));
-		assertEquals(new Integer(0),
+		assertEquals(Integer.valueOf(0),
 				template.queryForObject("SELECT COUNT(*) from SPAM", Integer.class));
 	}
 
@@ -165,7 +165,7 @@ public void testDataSourceInitializedWithExplicitSqlScriptEncoding()
 		assertTrue(dataSource instanceof org.apache.tomcat.jdbc.pool.DataSource);
 		assertNotNull(dataSource);
 		JdbcOperations template = new JdbcTemplate(dataSource);
-		assertEquals(new Integer(2),
+		assertEquals(Integer.valueOf(2),
 				template.queryForObject("SELECT COUNT(*) from BAR", Integer.class));
 		assertEquals("bar",
 				template.queryForObject("SELECT name from BAR WHERE id=1", String.class));

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java

@@ -67,7 +67,7 @@ public void testDataScriptWithMissingDdl() throws Exception {
 				"spring.datasource.schema:classpath:/ddl.sql");
 		setupTestConfiguration();
 		this.context.refresh();
-		assertEquals(new Integer(1),
+		assertEquals(Integer.valueOf(1),
 				new JdbcTemplate(this.context.getBean(DataSource.class))
 						.queryForObject("SELECT COUNT(*) from CITY", Integer.class));
 	}
@@ -80,7 +80,7 @@ public void testDataScript() throws Exception {
 				"spring.datasource.data:classpath:/city.sql");
 		setupTestConfiguration();
 		this.context.refresh();
-		assertEquals(new Integer(1),
+		assertEquals(Integer.valueOf(1),
 				new JdbcTemplate(this.context.getBean(DataSource.class))
 						.queryForObject("SELECT COUNT(*) from CITY", Integer.class));
 	}