Polish

Signed-off-by: Dmytro Nosan <[email protected]>

Author: nosan

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration/Credential.java

@@ -40,7 +40,7 @@ class Credential extends MappedObject {
 
 	private final String secret;
 
-	private String serverUrl;
+	private final String serverUrl;
 
 	Credential(JsonNode node) {
 		super(node, MethodHandles.lookup());

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration/CredentialHelper.java

@@ -39,7 +39,7 @@ class CredentialHelper {
 
 	private static final String USR_LOCAL_BIN = "/usr/local/bin/";
 
-	Set<String> CREDENTIAL_NOT_FOUND_MESSAGES = Set.of("credentials not found in native keychain",
+	private static final Set<String> CREDENTIAL_NOT_FOUND_MESSAGES = Set.of("credentials not found in native keychain",
 			"no credentials server URL", "no credentials username");
 
 	private final String executable;
@@ -73,12 +73,12 @@ Credential get(String serverUrl) throws IOException {
 		}
 	}
 
-	private ProcessBuilder processBuilder(String string) {
+	private ProcessBuilder processBuilder(String action) {
 		ProcessBuilder processBuilder = new ProcessBuilder().redirectErrorStream(true);
 		if (Platform.isWindows()) {
 			processBuilder.command("cmd", "/c");
 		}
-		processBuilder.command(this.executable, string);
+		processBuilder.command(this.executable, action);
 		return processBuilder;
 	}
 
@@ -87,17 +87,23 @@ private Process start(ProcessBuilder processBuilder) throws IOException {
 			return processBuilder.start();
 		}
 		catch (IOException ex) {
-			if (!Platform.isMac()) {
-				throw ex;
+			if (Platform.isMac()) {
+				try {
+					List<String> command = new ArrayList<>(processBuilder.command());
+					command.set(0, USR_LOCAL_BIN + command.get(0));
+					return processBuilder.command(command).start();
+				}
+				catch (Exception suppressed) {
+					// Suppresses the exception and rethrows the original exception
+					ex.addSuppressed(suppressed);
+				}
 			}
-			List<String> command = new ArrayList<>(processBuilder.command());
-			command.set(0, USR_LOCAL_BIN + command.get(0));
-			return processBuilder.command(command).start();
+			throw ex;
 		}
 	}
 
-	private boolean isCredentialsNotFoundError(String message) {
-		return this.CREDENTIAL_NOT_FOUND_MESSAGES.contains(message.trim());
+	private static boolean isCredentialsNotFoundError(String message) {
+		return CREDENTIAL_NOT_FOUND_MESSAGES.contains(message.trim());
 	}
 
 }

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration/DockerRegistryAuthentication.java

@@ -19,6 +19,7 @@
 import java.util.function.BiConsumer;
 
 import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
+import org.springframework.util.Assert;
 
 /**
  * Docker registry authentication configuration.
@@ -105,6 +106,7 @@ static DockerRegistryAuthentication configuration(DockerRegistryAuthentication f
 	 */
 	static DockerRegistryAuthentication configuration(DockerRegistryAuthentication fallback,
 			BiConsumer<String, Exception> credentialHelperExceptionHandler) {
+		Assert.notNull(credentialHelperExceptionHandler, "'credentialHelperExceptionHandler' must not be null");
 		return new DockerRegistryConfigAuthentication(fallback, credentialHelperExceptionHandler);
 	}
 

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/CredentialHelperTests.java

@@ -38,10 +38,9 @@ class CredentialHelperTests {
 
 	@BeforeAll
 	static void setUp() throws Exception {
-		String executableName = "docker-credential-test" + ((Platform.isWindows()) ? ".bat" : ".sh");
-		String executable = new ClassPathResource(executableName, CredentialHelperTests.class).getFile()
-			.getAbsolutePath();
-		helper = new CredentialHelper(executable);
+		String executable = "docker-credential-test" + (Platform.isWindows() ? ".bat" : ".sh");
+		helper = new CredentialHelper(
+				new ClassPathResource(executable, CredentialHelperTests.class).getFile().getAbsolutePath());
 	}
 
 	@Test
@@ -89,10 +88,17 @@ void getWhenUnknownErrorThrowsException() {
 	}
 
 	@Test
-	void getWhenCommandDoesNotExistErrorThrowsException() {
-		String name = "docker-credential-%s".formatted(UUID.randomUUID().toString());
-		assertThatIOException().isThrownBy(() -> new CredentialHelper(name).get("invalid.example.com"))
-			.withMessageContaining(name);
+	void getWhenExecutableDoesNotExistErrorThrowsException() {
+		String executable = "docker-credential-%s".formatted(UUID.randomUUID().toString());
+		assertThatIOException().isThrownBy(() -> new CredentialHelper(executable).get("invalid.example.com"))
+			.withMessageContaining(executable)
+			.satisfies((ex) -> {
+				if (Platform.isMac()) {
+					assertThat(ex.getMessage()).doesNotContain("/usr/local/bin/");
+					assertThat(ex.getSuppressed()).allSatisfy((suppressed) -> assertThat(suppressed)
+						.hasMessageContaining("/usr/local/bin/" + executable));
+				}
+			});
 	}
 
 }

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/CredentialsTests.java renamed to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/CredentialTests.java

@@ -32,7 +32,7 @@
  *
  * @author Dmytro Nosan
  */
-class CredentialsTests {
+class CredentialTests {
 
 	@Test
 	@WithResource(name = "credentials.json", content = """