renamed variables

Author: hhund

dsf-common/dsf-common-docker-secrets-reader/src/main/java/dev/dsf/common/docker/secrets/DockerSecretsPropertySourceFactory.java

@@ -23,6 +23,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.stream.Stream;
 
@@ -44,16 +45,15 @@ public DockerSecretsPropertySourceFactory(ConfigurableEnvironment environment)
 	{
 		Stream<String> passwordProperties = environment.getPropertySources().stream()
 				.filter(s -> s instanceof EnumerablePropertySource).map(s -> (EnumerablePropertySource<?>) s)
-				.flatMap(s -> List.of(s.getPropertyNames()).stream()).filter(key -> key != null)
-				.filter(key -> key.toLowerCase().endsWith(".password.file")
-						|| key.toLowerCase().endsWith("_password_file") || key.toLowerCase().endsWith(".secret.file")
-						|| key.toLowerCase().endsWith("_secret_file"));
+				.flatMap(s -> List.of(s.getPropertyNames()).stream()).filter(Objects::nonNull)
+				.filter(p -> p.toLowerCase().endsWith(".password.file") || p.toLowerCase().endsWith("_password_file")
+						|| p.toLowerCase().endsWith(".secret.file") || p.toLowerCase().endsWith("_secret_file"));
 
-		passwordProperties.forEach(key ->
+		passwordProperties.forEach(property ->
 		{
-			String fileName = environment.getProperty(key, String.class, null);
-			secretFilesByFinalPropertyName.put(key.toLowerCase().replace('_', '.').substring(0, key.length() - 5),
-					fileName);
+			String fileName = environment.getProperty(property, String.class, null);
+			secretFilesByFinalPropertyName
+					.put(property.toLowerCase().replace('_', '.').substring(0, property.length() - 5), fileName);
 		});
 
 		this.environment = environment;
@@ -71,29 +71,29 @@ private PropertiesPropertySource getPropertiesFromDockerSecrets()
 	{
 		Properties properties = new Properties();
 
-		secretFilesByFinalPropertyName.forEach((key, secretsFile) ->
+		secretFilesByFinalPropertyName.forEach((property, secretsFile) ->
 		{
-			String readSecretsFileValue = readSecretsFile(key, secretsFile);
+			String readSecretsFileValue = readSecretsFile(property, secretsFile);
 			if (readSecretsFileValue != null)
-				properties.put(key, readSecretsFileValue);
+				properties.put(property, readSecretsFileValue);
 		});
 
 		return new PropertiesPropertySource("docker-secrets", properties);
 	}
 
-	private String readSecretsFile(String key, String secretsFile)
+	private String readSecretsFile(String property, String secretsFile)
 	{
 		if (secretsFile == null)
 		{
-			logger.debug("Secrets file for property {} not defined", key);
+			logger.debug("Secrets file for property {} not defined", property);
 			return null;
 		}
 
 		Path secretsFilePath = Paths.get(secretsFile);
 
 		if (!Files.isReadable(secretsFilePath))
 		{
-			logger.warn("Secrets file at {} for property {} not readable", secretsFilePath.toString(), key);
+			logger.warn("Secrets file at {} for property {} not readable", secretsFilePath.toString(), property);
 			return null;
 		}
 
@@ -103,19 +103,19 @@ private String readSecretsFile(String key, String secretsFile)
 
 			if (secretLines.isEmpty())
 			{
-				logger.warn("Secrets file at {} for property {} is empty", secretsFilePath.toString(), key);
+				logger.warn("Secrets file at {} for property {} is empty", secretsFilePath.toString(), property);
 				return null;
 			}
 
 			if (secretLines.size() > 1)
 				logger.warn("Secrets file at {} for property {} contains multiple lines, using only the first line",
-						secretsFilePath.toString(), key);
+						secretsFilePath.toString(), property);
 
 			return secretLines.get(0);
 		}
 		catch (IOException e)
 		{
-			logger.warn("Error while reading secrets file {} for property {}: {}", secretsFilePath.toString(), key,
+			logger.warn("Error while reading secrets file {} for property {}: {}", secretsFilePath.toString(), property,
 					e.getMessage());
 			throw new RuntimeException(e);
 		}