Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Phillip Webb
2024-07-22 19:59:27 +01:00
parent 000600c68a
commit 88480664d7
9 changed files with 61 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/StartCommand.java
View File

@@ -34,23 +34,28 @@ public enum StartCommand {
/**
* Start using {@code docker compose up}.
*/
UP {
@Override
void applyTo(DockerCompose dockerCompose, LogLevel logLevel, List<String> arguments) {
dockerCompose.up(logLevel, arguments);
}
},
UP(DockerCompose::up),
/**
* Start using {@code docker compose start}.
*/
START {
@Override
void applyTo(DockerCompose dockerCompose, LogLevel logLevel, List<String> arguments) {
dockerCompose.start(logLevel, arguments);
}
};
START(DockerCompose::start);
abstract void applyTo(DockerCompose dockerCompose, LogLevel logLevel, List<String> arguments);
private final Command command;
StartCommand(Command command) {
this.command = command;
}
void applyTo(DockerCompose dockerCompose, LogLevel logLevel, List<String> arguments) {
this.command.applyTo(dockerCompose, logLevel, arguments);
}
@FunctionalInterface
private interface Command {
void applyTo(DockerCompose dockerCompose, LogLevel logLevel, List<String> arguments);
}
}

31
spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/StopCommand.java
View File

@@ -34,23 +34,28 @@ public enum StopCommand {
/**
* Stop using {@code docker compose down}.
*/
DOWN {
@Override
void applyTo(DockerCompose dockerCompose, Duration timeout, List<String> arguments) {
dockerCompose.down(timeout, arguments);
}
},
DOWN(DockerCompose::down),
/**
* Stop using {@code docker compose stop}.
*/
STOP {
@Override
void applyTo(DockerCompose dockerCompose, Duration timeout, List<String> arguments) {
dockerCompose.stop(timeout, arguments);
}
};
STOP(DockerCompose::stop);
abstract void applyTo(DockerCompose dockerCompose, Duration timeout, List<String> arguments);
private final Command command;
StopCommand(Command command) {
this.command = command;
}
void applyTo(DockerCompose dockerCompose, Duration timeout, List<String> arguments) {
this.command.applyTo(dockerCompose, timeout, arguments);
}
@FunctionalInterface
private interface Command {
void applyTo(DockerCompose dockerCompose, Duration timeout, List<String> arguments);
}
}

4
spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresEnvironment.java
View File

@@ -45,7 +45,7 @@ class PostgresEnvironment {
}
private String extractPassword(Map<String, String> env) {
if (hasTrustHostAuthMethod(env)) {
if (isUsingTrustHostAuthMethod(env)) {
return null;
}
String password = env.getOrDefault("POSTGRES_PASSWORD", env.get("POSTGRESQL_PASSWORD"));
@@ -53,7 +53,7 @@ class PostgresEnvironment {
return password;
}
private Boolean hasTrustHostAuthMethod(Map<String, String> env) {
private boolean isUsingTrustHostAuthMethod(Map<String, String> env) {
String hostAuthMethod = env.get("POSTGRES_HOST_AUTH_METHOD");
return "trust".equals(hostAuthMethod);
}