Revert "Merge branch '3.4.x' into 3.5.x"

This reverts commit 4089156, reversing
changes made to 049c6d5.

See gh-48058

Author: wilkinsona

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyWebServer.java

@@ -117,7 +117,7 @@ public void start() throws WebServerException {
 			catch (Exception ex) {
 				PortInUseException.ifCausedBy(ex, ChannelBindException.class, (bindException) -> {
 					if (bindException.localPort() > 0 && !isPermissionDenied(bindException.getCause())) {
-						PortInUseException.throwIfPortBindingException(bindException, bindException::localPort);
+						throw new PortInUseException(bindException.localPort(), ex);
 					}
 				});
 				throw new WebServerException("Unable to start Netty", ex);

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactoryTests.java

@@ -17,9 +17,7 @@
 package org.springframework.boot.web.embedded.netty;
 
 import java.net.ConnectException;
-import java.net.InetAddress;
 import java.net.SocketAddress;
-import java.net.UnknownHostException;
 import java.time.Duration;
 import java.util.Arrays;
 
@@ -47,7 +45,6 @@
 import org.springframework.boot.web.server.PortInUseException;
 import org.springframework.boot.web.server.Shutdown;
 import org.springframework.boot.web.server.Ssl;
-import org.springframework.boot.web.server.WebServerException;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ReactorResourceFactory;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
@@ -73,7 +70,7 @@
 class NettyReactiveWebServerFactoryTests extends AbstractReactiveWebServerFactoryTests {
 
 	@Test
-	void portInUseExceptionIsThrownWhenPortIsAlreadyInUse() {
+	void exceptionIsThrownWhenPortIsAlreadyInUse() {
 		AbstractReactiveWebServerFactory factory = getFactory();
 		factory.setPort(0);
 		this.webServer = factory.getWebServer(new EchoHandler());
@@ -84,14 +81,6 @@ void portInUseExceptionIsThrownWhenPortIsAlreadyInUse() {
 			.withCauseInstanceOf(Throwable.class);
 	}
 
-	@Test
-	void webServerExceptionIsThrownWhenAddressCannotBeAssigned() throws UnknownHostException {
-		AbstractReactiveWebServerFactory factory = getFactory();
-		factory.setPort(8080);
-		factory.setAddress(InetAddress.getByName("1.2.3.4"));
-		assertThatExceptionOfType(WebServerException.class).isThrownBy(factory.getWebServer(new EchoHandler())::start);
-	}
-
 	@Test
 	void getPortWhenDisposableServerPortOperationIsUnsupportedReturnsMinusOne() {
 		NettyReactiveWebServerFactory factory = new NoPortNettyReactiveWebServerFactory(0);