Use Map::computeIfAbsent where feasible

Author: quaff

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/sbom/SbomEndpointWebExtension.java

@@ -17,7 +17,6 @@
 package org.springframework.boot.actuate.sbom;
 
 import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -29,6 +28,7 @@
 import org.springframework.boot.actuate.sbom.SbomProperties.Sbom;
 import org.springframework.core.io.Resource;
 import org.springframework.util.MimeType;
+import org.springframework.util.function.ThrowingFunction;
 
 /**
  * {@link EndpointWebExtension @EndpointWebExtension} for the {@link SbomEndpoint}.
@@ -68,14 +68,9 @@ private MimeType getMediaType(String id, Resource resource) {
 		if (sbomProperties != null && sbomProperties.getMediaType() != null) {
 			return sbomProperties.getMediaType();
 		}
-		return this.detectedMediaTypeCache.computeIfAbsent(id, (ignored) -> {
-			try {
-				return detectSbomType(resource);
-			}
-			catch (IOException ex) {
-				throw new UncheckedIOException("Failed to detect type of resource '%s'".formatted(resource), ex);
-			}
-		}).getMediaType();
+		return this.detectedMediaTypeCache
+			.computeIfAbsent(id, (ThrowingFunction<String, SbomType>) (ignored) -> detectSbomType(resource))
+			.getMediaType();
 	}
 
 	private SbomType detectSbomType(Resource resource) throws IOException {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/type/classreading/ConcurrentReferenceCachingMetadataReaderFactory.java

@@ -26,6 +26,7 @@
 import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.core.type.classreading.SimpleMetadataReaderFactory;
 import org.springframework.util.ConcurrentReferenceHashMap;
+import org.springframework.util.function.ThrowingFunction;
 
 /**
  * Caching implementation of the {@link MetadataReaderFactory} interface backed by a
@@ -70,22 +71,14 @@ public ConcurrentReferenceCachingMetadataReaderFactory(ClassLoader classLoader)
 
 	@Override
 	public MetadataReader getMetadataReader(String className) throws IOException {
-		MetadataReader metadataReader = this.classNameCache.get(className);
-		if (metadataReader == null) {
-			metadataReader = super.getMetadataReader(className);
-			this.classNameCache.put(className, metadataReader);
-		}
-		return metadataReader;
+		return this.classNameCache.computeIfAbsent(className,
+				(ThrowingFunction<String, MetadataReader>) super::getMetadataReader);
 	}
 
 	@Override
 	public MetadataReader getMetadataReader(Resource resource) throws IOException {
-		MetadataReader metadataReader = this.resourceCache.get(resource);
-		if (metadataReader == null) {
-			metadataReader = createMetadataReader(resource);
-			this.resourceCache.put(resource, metadataReader);
-		}
-		return metadataReader;
+		return this.resourceCache.computeIfAbsent(resource,
+				(ThrowingFunction<Resource, MetadataReader>) this::createMetadataReader);
 	}
 
 	/**

spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/intTest/java/org/springframework/boot/context/embedded/EmbeddedServerContainerInvocationContextProvider.java

@@ -116,13 +116,8 @@ private void cleanupCaches() {
 	private AbstractApplicationLauncher getAbstractApplicationLauncher(Application application,
 			Class<? extends AbstractApplicationLauncher> launcherClass) {
 		String cacheKey = application.getContainer() + ":" + application.getPackaging() + ":" + launcherClass.getName();
-		if (this.launcherCache.containsKey(cacheKey)) {
-			return this.launcherCache.get(cacheKey);
-		}
-		AbstractApplicationLauncher launcher = ReflectionUtils.newInstance(launcherClass, application,
-				new File(buildOutput.getRootLocation(), "app-launcher-" + UUID.randomUUID()));
-		this.launcherCache.put(cacheKey, launcher);
-		return launcher;
+		return this.launcherCache.computeIfAbsent(cacheKey, (ignored) -> ReflectionUtils.newInstance(launcherClass,
+				application, new File(buildOutput.getRootLocation(), "app-launcher-" + UUID.randomUUID())));
 	}
 
 	private Application getApplication(EmbeddedServletContainerTest annotation, String container) {