Remove repettive code when deteriminng init container properties

Author: cppwfs

spring-cloud-deployer-kubernetes/src/main/java/org/springframework/cloud/deployer/spi/kubernetes/DeploymentPropertiesResolver.java

@@ -648,18 +648,12 @@ Collection<Container> getInitContainers(Map<String, String> kubernetesDeployerPr
 	}
 
 	private @Nullable Container initContainerFromProperties(Map<String, String> kubeProps, String propertyKey) {
-		String name = PropertyParserUtils.getDeploymentPropertyValue(kubeProps, propertyKey + ".name");
-		name = StringUtils.hasText(name) ? name : PropertyParserUtils.getDeploymentPropertyValue(kubeProps, propertyKey + ".containerName");
-		String image = PropertyParserUtils.getDeploymentPropertyValue(kubeProps, propertyKey + ".image");
-		image =  StringUtils.hasText(image) ? image : PropertyParserUtils.getDeploymentPropertyValue(kubeProps, propertyKey + ".imageName");
-
+		String name = getFirstProperty(kubeProps, propertyKey, ".name", ".containerName");
+		String image = getFirstProperty(kubeProps, propertyKey, ".image", ".imageName");
 		if (StringUtils.hasText(name) && StringUtils.hasText(image)) {
-			String commandStr = PropertyParserUtils.getDeploymentPropertyValue(kubeProps, propertyKey + ".command");
-			commandStr = StringUtils.hasText(commandStr) ? commandStr : PropertyParserUtils.getDeploymentPropertyValue(kubeProps, propertyKey + ".commands");
+			String commandStr = getFirstProperty(kubeProps, propertyKey, ".command", ".commands");
 			List<String> commands = StringUtils.hasText(commandStr) ? Arrays.asList(commandStr.split(",")) : Collections.emptyList();
-			String envString = PropertyParserUtils.getDeploymentPropertyValue(kubeProps, propertyKey + ".env");
-			envString = StringUtils.hasText(envString) ? envString : PropertyParserUtils.getDeploymentPropertyValue(kubeProps, propertyKey + ".environmentVariables");
-
+			String envString = getFirstProperty(kubeProps, propertyKey, ".env", ".environmentVariables");
 			List<VolumeMount> vms = this.getInitContainerVolumeMounts(kubeProps, propertyKey);
 			return new ContainerBuilder()
 					.withName(name)
@@ -672,6 +666,16 @@ Collection<Container> getInitContainers(Map<String, String> kubernetesDeployerPr
 		return null;
 	}
 
+	public static String getFirstProperty(Map<String, String> kubeProps, String baseKey, String... suffixes) {
+		for (String suffix : suffixes) {
+			String value = PropertyParserUtils.getDeploymentPropertyValue(kubeProps, baseKey + suffix);
+			if (StringUtils.hasText(value)) {
+				return value;
+			}
+		}
+		return null;
+	}
+
 	private Container containerFromProps(InitContainer initContainerProps) {
 		return new ContainerBuilder()
 				.withName(initContainerProps.getName())