Resolve Reviews

Author: arefbehboudi

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java

@@ -698,6 +698,7 @@ private void setDriverClass(ComboPooledDataSource dataSource, String driverClass
 	 */
 	private static class SimpleDataSourceProperties extends MappedDataSourceProperties<SimpleDriverDataSource> {
 
+		@SuppressWarnings("unchecked")
 		SimpleDataSourceProperties() {
 			add(DataSourceProperty.URL, SimpleDriverDataSource::getUrl, SimpleDriverDataSource::setUrl);
 			add(DataSourceProperty.DRIVER_CLASS_NAME, Class.class, (dataSource) -> dataSource.getDriver().getClass(),

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/JsonValueWriter.java

@@ -103,12 +103,9 @@ else if (ObjectUtils.isArray(value)) {
 		else if (value instanceof Map<?, ?> map) {
 			writeObject(map::forEach);
 		}
-		else if (value instanceof Number) {
+		else if (value instanceof Number || value instanceof Boolean) {
 			append(value.toString());
 		}
-		else if (value instanceof Boolean bool) {
-			append(bool ? "true" : "false");
-		}
 		else {
 			writeString(value);
 		}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java

@@ -51,43 +51,49 @@ public void initialize(ConfigurableApplicationContext applicationContext) {
 		applicationContext.addApplicationListener(new Listener(applicationContext));
 	}
 
-	private record Listener(ConfigurableApplicationContext applicationContext) implements ApplicationListener<RSocketServerInitializedEvent> {
+	private static class Listener implements ApplicationListener<RSocketServerInitializedEvent> {
 
-			private static final String PROPERTY_NAME = "local.rsocket.server.port";
+		private static final String PROPERTY_NAME = "local.rsocket.server.port";
 
-			private static final String PROPERTY_SOURCE_NAME = "server.ports";
+		private static final String PROPERTY_SOURCE_NAME = "server.ports";
+
+		private final ConfigurableApplicationContext applicationContext;
+
+		Listener(ConfigurableApplicationContext applicationContext) {
+			this.applicationContext = applicationContext;
+		}
 
 		@Override
-			public void onApplicationEvent(RSocketServerInitializedEvent event) {
-				if (event.getServer().address() != null) {
-					setPortProperty(this.applicationContext, event.getServer().address().getPort());
-				}
+		public void onApplicationEvent(RSocketServerInitializedEvent event) {
+			if (event.getServer().address() != null) {
+				setPortProperty(this.applicationContext, event.getServer().address().getPort());
 			}
+		}
 
-			private void setPortProperty(ApplicationContext context, int port) {
-				if (context instanceof ConfigurableApplicationContext configurableContext) {
-					setPortProperty(configurableContext.getEnvironment(), port);
-				}
-				if (context.getParent() != null) {
-					setPortProperty(context.getParent(), port);
-				}
+		private void setPortProperty(ApplicationContext context, int port) {
+			if (context instanceof ConfigurableApplicationContext configurableContext) {
+				setPortProperty(configurableContext.getEnvironment(), port);
 			}
-
-			private void setPortProperty(ConfigurableEnvironment environment, int port) {
-				MutablePropertySources sources = environment.getPropertySources();
-				PropertySource<?> source = sources.get(PROPERTY_SOURCE_NAME);
-				if (source == null) {
-					source = new MapPropertySource(PROPERTY_SOURCE_NAME, new HashMap<>());
-					sources.addFirst(source);
-				}
-				setPortProperty(port, source);
+			if (context.getParent() != null) {
+				setPortProperty(context.getParent(), port);
 			}
+		}
 
-			@SuppressWarnings("unchecked")
-			private void setPortProperty(int port, PropertySource<?> source) {
-				((Map<String, Object>) source.getSource()).put(PROPERTY_NAME, port);
+		private void setPortProperty(ConfigurableEnvironment environment, int port) {
+			MutablePropertySources sources = environment.getPropertySources();
+			PropertySource<?> source = sources.get(PROPERTY_SOURCE_NAME);
+			if (source == null) {
+				source = new MapPropertySource(PROPERTY_SOURCE_NAME, new HashMap<>());
+				sources.addFirst(source);
 			}
+			setPortProperty(port, source);
+		}
 
+		@SuppressWarnings("unchecked")
+		private void setPortProperty(int port, PropertySource<?> source) {
+			((Map<String, Object>) source.getSource()).put(PROPERTY_NAME, port);
 		}
 
+	}
+
 }