44import lombok .RequiredArgsConstructor ;
55import org .apache .commons .logging .Log ;
66import org .springframework .boot .logging .DeferredLogFactory ;
7- import org .springframework .core .env .ConfigurableEnvironment ;
7+ import org .springframework .core .env .PropertyResolver ;
88
99import java .io .File ;
1010import 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