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
index 0206f06e94..82372c4d24 100644
--- 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 class Snake {
 	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
index 8a50a492ce..f7a8871e37 100644
--- 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 final class SnakeTimer {
 			if (snakes.isEmpty()) {
 				startTimer();
 			}
-			snakes.put(Integer.valueOf(snake.getId()), snake);
+			snakes.put(snake.getId(), snake);
 		}
 	}
 
@@ -60,7 +60,7 @@ public final class SnakeTimer {
 
 	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
index dc5ba84e84..515e71b133 100644
--- 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 class SnakeWebSocketHandler extends TextWebSocketHandler {
 		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 @@ public class SnakeWebSocketHandler extends TextWebSocketHandler {
 	@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
index e69ff6918d..dbedf53168 100644
--- 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 class Snake {
 	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
index 0d95ec921d..c50bb9fc29 100644
--- 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 final class SnakeTimer {
 			if (snakes.isEmpty()) {
 				startTimer();
 			}
-			snakes.put(Integer.valueOf(snake.getId()), snake);
+			snakes.put(snake.getId(), snake);
 		}
 	}
 
@@ -60,7 +60,7 @@ public final class SnakeTimer {
 
 	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
index e69a489bc3..a5dd6a1aab 100644
--- 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 class SnakeWebSocketHandler extends TextWebSocketHandler {
 		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 @@ public class SnakeWebSocketHandler extends TextWebSocketHandler {
 	@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
index a9718ead23..55eb35d38d 100644
--- 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 class Snake {
 	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
index bb6314e0da..520c485329 100644
--- 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 final class SnakeTimer {
 			if (snakes.isEmpty()) {
 				startTimer();
 			}
-			snakes.put(Integer.valueOf(snake.getId()), snake);
+			snakes.put(snake.getId(), snake);
 		}
 	}
 
@@ -60,7 +60,7 @@ public final class SnakeTimer {
 
 	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
index da2a326584..6d2553da59 100644
--- 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 class SnakeWebSocketHandler extends TextWebSocketHandler {
 		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 @@ public class SnakeWebSocketHandler extends TextWebSocketHandler {
 	@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));
 	}
 
 }