Skip to content

Commit 4ced288

Browse files
committed
Generalize argument type
1 parent be7cf0b commit 4ced288

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

secrets/src/main/java/de/vinado/boot/secrets/FilenamePropertyIndexSupplier.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import lombok.RequiredArgsConstructor;
55
import org.apache.commons.logging.Log;
66
import org.springframework.boot.logging.DeferredLogFactory;
7-
import org.springframework.core.env.ConfigurableEnvironment;
7+
import org.springframework.core.env.PropertyResolver;
88

99
import java.io.File;
1010
import java.io.IOException;
@@ -42,16 +42,16 @@ public class FilenamePropertyIndexSupplier implements PropertyIndexSupplier {
4242
private static final String DEFAULT_BASE_DIR_PROPERTY = "/run/secrets";
4343

4444
private final Log log;
45-
private final ConfigurableEnvironment environment;
45+
private final PropertyResolver propertyResolver;
4646

47-
public FilenamePropertyIndexSupplier(DeferredLogFactory logFactory, ConfigurableEnvironment environment) {
47+
public FilenamePropertyIndexSupplier(DeferredLogFactory logFactory, PropertyResolver propertyResolver) {
4848
this.log = logFactory.getLog(getClass());
49-
this.environment = environment;
49+
this.propertyResolver = propertyResolver;
5050
}
5151

5252
@Override
5353
public Map<String, String> get() {
54-
String baseDir = environment.getProperty(BASE_DIR_PROPERTY, DEFAULT_BASE_DIR_PROPERTY);
54+
String baseDir = propertyResolver.getProperty(BASE_DIR_PROPERTY, DEFAULT_BASE_DIR_PROPERTY);
5555
Separator separator = getSeparator();
5656
return Optional.of(baseDir)
5757
.map(Paths::get)
@@ -64,7 +64,7 @@ public Map<String, String> get() {
6464
}
6565

6666
private Separator getSeparator() {
67-
char property = environment.getProperty(SEPARATOR_PROPERTY,
67+
char property = propertyResolver.getProperty(SEPARATOR_PROPERTY,
6868
Character.class,
6969
DEFAULT_SEPARATOR.getCharacter());
7070
return Separator.of(property);

0 commit comments

Comments
 (0)