Remove redundant boxing

tobias-lippert · philwebb · commit 74a7fbea9d8d · 2024-01-23T10:18:49.000-08:00
See gh-39259
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/Snake.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/Snake.java
@@ -136,12 +136,12 @@ public void setDirection(Direction direction) {
 	public String getLocationsJson() {
 		synchronized (this.monitor) {
 			StringBuilder sb = new StringBuilder();
-			sb.append(String.format("{x: %d, y: %d}", Integer.valueOf(this.head.x), Integer.valueOf(this.head.y)));
+			sb.append(String.format("{x: %d, y: %d}", this.head.x, this.head.y));
 			for (Location location : this.tail) {
 				sb.append(',');
-				sb.append(String.format("{x: %d, y: %d}", Integer.valueOf(location.x), Integer.valueOf(location.y)));
+				sb.append(String.format("{x: %d, y: %d}", location.x, location.y));
 			}
-			return String.format("{'id':%d,'body':[%s]}", Integer.valueOf(this.id), sb);
+			return String.format("{'id':%d,'body':[%s]}", this.id, sb);
 		}
 	}
 
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/SnakeTimer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/SnakeTimer.java
@@ -50,7 +50,7 @@ public static void addSnake(Snake snake) {
 			if (snakes.isEmpty()) {
 				startTimer();
 			}
-			snakes.put(Integer.valueOf(snake.getId()), snake);
+			snakes.put(snake.getId(), snake);
 		}
 	}
 
@@ -60,7 +60,7 @@ public static Collection<Snake> getSnakes() {
 
 	public static void removeSnake(Snake snake) {
 		synchronized (MONITOR) {
-			snakes.remove(Integer.valueOf(snake.getId()));
+			snakes.remove(snake.getId());
 			if (snakes.isEmpty()) {
 				stopTimer();
 			}
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/SnakeWebSocketHandler.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/src/main/java/smoketest/websocket/jetty/snake/SnakeWebSocketHandler.java
@@ -69,7 +69,7 @@ public void afterConnectionEstablished(WebSocketSession session) throws Exceptio
 		StringBuilder sb = new StringBuilder();
 		for (Iterator<Snake> iterator = SnakeTimer.getSnakes().iterator(); iterator.hasNext();) {
 			Snake snake = iterator.next();
-			sb.append(String.format("{id: %d, color: '%s'}", Integer.valueOf(snake.getId()), snake.getHexColor()));
+			sb.append(String.format("{id: %d, color: '%s'}", snake.getId(), snake.getHexColor()));
 			if (iterator.hasNext()) {
 				sb.append(',');
 			}
@@ -97,7 +97,7 @@ else if ("south".equals(payload)) {
 	@Override
 	public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
 		SnakeTimer.removeSnake(this.snake);
-		SnakeTimer.broadcast(String.format("{'type': 'leave', 'id': %d}", Integer.valueOf(this.id)));
+		SnakeTimer.broadcast(String.format("{'type': 'leave', 'id': %d}", this.id));
 	}
 
 }
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/Snake.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/Snake.java
@@ -136,12 +136,12 @@ public void setDirection(Direction direction) {
 	public String getLocationsJson() {
 		synchronized (this.monitor) {
 			StringBuilder sb = new StringBuilder();
-			sb.append(String.format("{x: %d, y: %d}", Integer.valueOf(this.head.x), Integer.valueOf(this.head.y)));
+			sb.append(String.format("{x: %d, y: %d}", this.head.x, this.head.y));
 			for (Location location : this.tail) {
 				sb.append(',');
-				sb.append(String.format("{x: %d, y: %d}", Integer.valueOf(location.x), Integer.valueOf(location.y)));
+				sb.append(String.format("{x: %d, y: %d}", location.x, location.y));
 			}
-			return String.format("{'id':%d,'body':[%s]}", Integer.valueOf(this.id), sb);
+			return String.format("{'id':%d,'body':[%s]}", this.id, sb);
 		}
 	}
 
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/SnakeTimer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/SnakeTimer.java
@@ -50,7 +50,7 @@ public static void addSnake(Snake snake) {
 			if (snakes.isEmpty()) {
 				startTimer();
 			}
-			snakes.put(Integer.valueOf(snake.getId()), snake);
+			snakes.put(snake.getId(), snake);
 		}
 	}
 
@@ -60,7 +60,7 @@ public static Collection<Snake> getSnakes() {
 
 	public static void removeSnake(Snake snake) {
 		synchronized (MONITOR) {
-			snakes.remove(Integer.valueOf(snake.getId()));
+			snakes.remove(snake.getId());
 			if (snakes.isEmpty()) {
 				stopTimer();
 			}
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/SnakeWebSocketHandler.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/src/main/java/smoketest/websocket/tomcat/snake/SnakeWebSocketHandler.java
@@ -69,7 +69,7 @@ public void afterConnectionEstablished(WebSocketSession session) throws Exceptio
 		StringBuilder sb = new StringBuilder();
 		for (Iterator<Snake> iterator = SnakeTimer.getSnakes().iterator(); iterator.hasNext();) {
 			Snake snake = iterator.next();
-			sb.append(String.format("{id: %d, color: '%s'}", Integer.valueOf(snake.getId()), snake.getHexColor()));
+			sb.append(String.format("{id: %d, color: '%s'}", snake.getId(), snake.getHexColor()));
 			if (iterator.hasNext()) {
 				sb.append(',');
 			}
@@ -97,7 +97,7 @@ else if ("south".equals(payload)) {
 	@Override
 	public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
 		SnakeTimer.removeSnake(this.snake);
-		SnakeTimer.broadcast(String.format("{'type': 'leave', 'id': %d}", Integer.valueOf(this.id)));
+		SnakeTimer.broadcast(String.format("{'type': 'leave', 'id': %d}", this.id));
 	}
 
 }
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/Snake.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/Snake.java
@@ -136,12 +136,12 @@ public void setDirection(Direction direction) {
 	public String getLocationsJson() {
 		synchronized (this.monitor) {
 			StringBuilder sb = new StringBuilder();
-			sb.append(String.format("{x: %d, y: %d}", Integer.valueOf(this.head.x), Integer.valueOf(this.head.y)));
+			sb.append(String.format("{x: %d, y: %d}", this.head.x, this.head.y));
 			for (Location location : this.tail) {
 				sb.append(',');
-				sb.append(String.format("{x: %d, y: %d}", Integer.valueOf(location.x), Integer.valueOf(location.y)));
+				sb.append(String.format("{x: %d, y: %d}", location.x, location.y));
 			}
-			return String.format("{'id':%d,'body':[%s]}", Integer.valueOf(this.id), sb);
+			return String.format("{'id':%d,'body':[%s]}", this.id, sb);
 		}
 	}
 
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/SnakeTimer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/SnakeTimer.java
@@ -50,7 +50,7 @@ public static void addSnake(Snake snake) {
 			if (snakes.isEmpty()) {
 				startTimer();
 			}
-			snakes.put(Integer.valueOf(snake.getId()), snake);
+			snakes.put(snake.getId(), snake);
 		}
 	}
 
@@ -60,7 +60,7 @@ public static Collection<Snake> getSnakes() {
 
 	public static void removeSnake(Snake snake) {
 		synchronized (MONITOR) {
-			snakes.remove(Integer.valueOf(snake.getId()));
+			snakes.remove(snake.getId());
 			if (snakes.isEmpty()) {
 				stopTimer();
 			}
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/SnakeWebSocketHandler.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/main/java/smoketest/websocket/undertow/snake/SnakeWebSocketHandler.java
@@ -69,7 +69,7 @@ public void afterConnectionEstablished(WebSocketSession session) throws Exceptio
 		StringBuilder sb = new StringBuilder();
 		for (Iterator<Snake> iterator = SnakeTimer.getSnakes().iterator(); iterator.hasNext();) {
 			Snake snake = iterator.next();
-			sb.append(String.format("{id: %d, color: '%s'}", Integer.valueOf(snake.getId()), snake.getHexColor()));
+			sb.append(String.format("{id: %d, color: '%s'}", snake.getId(), snake.getHexColor()));
 			if (iterator.hasNext()) {
 				sb.append(',');
 			}
@@ -97,7 +97,7 @@ else if ("south".equals(payload)) {
 	@Override
 	public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
 		SnakeTimer.removeSnake(this.snake);
-		SnakeTimer.broadcast(String.format("{'type': 'leave', 'id': %d}", Integer.valueOf(this.id)));
+		SnakeTimer.broadcast(String.format("{'type': 'leave', 'id': %d}", this.id));
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -136,12 +136,12 @@ public void setDirection(Direction direction) {`
`136`	`136`	`public String getLocationsJson() {`
`137`	`137`	`synchronized (this.monitor) {`
`138`	`138`	`StringBuilder sb = new StringBuilder();`
`139`		`- sb.append(String.format("{x: %d, y: %d}", Integer.valueOf(this.head.x), Integer.valueOf(this.head.y)));`
	`139`	`+ sb.append(String.format("{x: %d, y: %d}", this.head.x, this.head.y));`
`140`	`140`	`for (Location location : this.tail) {`
`141`	`141`	`sb.append(',');`
`142`		`- sb.append(String.format("{x: %d, y: %d}", Integer.valueOf(location.x), Integer.valueOf(location.y)));`
	`142`	`+ sb.append(String.format("{x: %d, y: %d}", location.x, location.y));`
`143`	`143`	`}`
`144`		`- return String.format("{'id':%d,'body':[%s]}", Integer.valueOf(this.id), sb);`
	`144`	`+ return String.format("{'id':%d,'body':[%s]}", this.id, sb);`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public static void addSnake(Snake snake) {`
`50`	`50`	`if (snakes.isEmpty()) {`
`51`	`51`	`startTimer();`
`52`	`52`	`}`
`53`		`- snakes.put(Integer.valueOf(snake.getId()), snake);`
	`53`	`+ snakes.put(snake.getId(), snake);`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`@@ -60,7 +60,7 @@ public static Collection<Snake> getSnakes() {`
`60`	`60`
`61`	`61`	`public static void removeSnake(Snake snake) {`
`62`	`62`	`synchronized (MONITOR) {`
`63`		`- snakes.remove(Integer.valueOf(snake.getId()));`
	`63`	`+ snakes.remove(snake.getId());`
`64`	`64`	`if (snakes.isEmpty()) {`
`65`	`65`	`stopTimer();`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public void afterConnectionEstablished(WebSocketSession session) throws Exceptio`
`69`	`69`	`StringBuilder sb = new StringBuilder();`
`70`	`70`	`for (Iterator<Snake> iterator = SnakeTimer.getSnakes().iterator(); iterator.hasNext();) {`
`71`	`71`	`Snake snake = iterator.next();`
`72`		`- sb.append(String.format("{id: %d, color: '%s'}", Integer.valueOf(snake.getId()), snake.getHexColor()));`
	`72`	`+ sb.append(String.format("{id: %d, color: '%s'}", snake.getId(), snake.getHexColor()));`
`73`	`73`	`if (iterator.hasNext()) {`
`74`	`74`	`sb.append(',');`
`75`	`75`	`}`
`@@ -97,7 +97,7 @@ else if ("south".equals(payload)) {`
`97`	`97`	`@Override`
`98`	`98`	`public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {`
`99`	`99`	`SnakeTimer.removeSnake(this.snake);`
`100`		`- SnakeTimer.broadcast(String.format("{'type': 'leave', 'id': %d}", Integer.valueOf(this.id)));`
	`100`	`+ SnakeTimer.broadcast(String.format("{'type': 'leave', 'id': %d}", this.id));`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`}`