Protect against possible NullPointerException when building collections

Author: royclarkson

spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/deployer/BackingApplication.java

@@ -24,6 +24,9 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import org.springframework.util.CollectionUtils;
+
+@SuppressWarnings("PMD.GodClass")
 public class BackingApplication {
 
 	private static final String VALUE_HIDDEN = "<value hidden>";
@@ -36,26 +39,6 @@ public class BackingApplication {
 	private List<ParametersTransformerSpec> parametersTransformers;
 	private List<CredentialProviderSpec> credentialProviders;
 
-	public BackingApplication(BackingApplication backingApplicationToCopy) {
-		this.name = backingApplicationToCopy.name;
-		this.path = backingApplicationToCopy.path;
-		this.properties = backingApplicationToCopy.properties == null
-			? new HashMap<>()
-			: new HashMap<>(backingApplicationToCopy.properties);
-		this.environment = backingApplicationToCopy.environment == null
-			? new HashMap<>()
-			: new HashMap<>(backingApplicationToCopy.environment);
-		this.services = backingApplicationToCopy.services == null
-			? new ArrayList<>()
-			: backingApplicationToCopy.services.stream().map(ServicesSpec::new).collect(Collectors.toList());
-		this.parametersTransformers = backingApplicationToCopy.parametersTransformers == null
-			? new ArrayList<>()
-			: backingApplicationToCopy.parametersTransformers.stream().map(ParametersTransformerSpec::new).collect(Collectors.toList());
-		this.credentialProviders = backingApplicationToCopy.credentialProviders == null
-			? new ArrayList<>()
-			: backingApplicationToCopy.credentialProviders.stream().map(CredentialProviderSpec::new).collect(Collectors.toList());
-	}
-
 	private BackingApplication() {
 	}
 
@@ -193,16 +176,51 @@ private Map<String, Object> sanitizeEnvironment(Map<String, Object> environment)
 	public static class BackingApplicationBuilder {
 
 		private String name;
+
 		private String path;
+
 		private final Map<String, String> properties = new HashMap<>();
+
 		private final Map<String, Object> environment = new HashMap<>();
+
 		private final List<ServicesSpec> services = new ArrayList<>();
+
 		private final List<ParametersTransformerSpec> parameterTransformers = new ArrayList<>();
+
 		private final List<CredentialProviderSpec> credentialProviders = new ArrayList<>();
 
 		BackingApplicationBuilder() {
 		}
 
+		public BackingApplicationBuilder backingApplication(BackingApplication backingApplication) {
+			this.name(backingApplication.getName())
+				.path(backingApplication.getPath())
+				.properties(backingApplication.getProperties())
+				.environment(backingApplication.getEnvironment());
+				if (!CollectionUtils.isEmpty(backingApplication.getServices())) {
+					this.services(backingApplication.getServices().stream()
+						.map(spec -> ServicesSpec.builder()
+							.spec(spec)
+							.build())
+						.collect(Collectors.toList()));
+				}
+				if (!CollectionUtils.isEmpty(backingApplication.getParametersTransformers())) {
+					this.parameterTransformers(backingApplication.getParametersTransformers().stream()
+						.map(spec -> ParametersTransformerSpec.builder()
+							.spec(spec)
+							.build())
+						.collect(Collectors.toList()));
+				}
+				if (!CollectionUtils.isEmpty(backingApplication.getCredentialProviders())) {
+					this.credentialProviders(backingApplication.getCredentialProviders().stream()
+						.map(spec -> CredentialProviderSpec.builder()
+							.spec(spec)
+							.build())
+						.collect(Collectors.toList()));
+				}
+				return this;
+		}
+
 		public BackingApplicationBuilder name(String name) {
 			this.name = name;
 			return this;
@@ -214,37 +232,72 @@ public BackingApplicationBuilder path(String path) {
 		}
 
 		public BackingApplicationBuilder property(String key, String value) {
-			this.properties.put(key, value);
+			if (key != null && value != null) {
+				this.properties.put(key, value);
+			}
 			return this;
 		}
 
 		public BackingApplicationBuilder properties(Map<String, String> properties) {
-			this.properties.putAll(properties);
+			if (!CollectionUtils.isEmpty(properties)) {
+				this.properties.putAll(properties);
+			}
 			return this;
 		}
 
 		public BackingApplicationBuilder environment(String key, String value) {
-			this.environment.put(key, value);
+			if (key != null && value != null) {
+				this.environment.put(key, value);
+			}
 			return this;
 		}
 
-		public BackingApplicationBuilder environment(Map<String, String> environment) {
-			this.environment.putAll(environment);
+		public BackingApplicationBuilder environment(Map<String, Object> environment) {
+			if (!CollectionUtils.isEmpty(environment)) {
+				this.environment.putAll(environment);
+			}
+			return this;
+		}
+
+		public BackingApplicationBuilder services(List<ServicesSpec> services) {
+			if (!CollectionUtils.isEmpty(services)) {
+				this.services.addAll(services);
+			}
 			return this;
 		}
 
 		public BackingApplicationBuilder services(ServicesSpec... services) {
-			this.services.addAll(Arrays.asList(services));
+			if (services != null) {
+				this.services(Arrays.asList(services));
+			}
+			return this;
+		}
+
+		public BackingApplicationBuilder parameterTransformers(List<ParametersTransformerSpec> parameterTransformers) {
+			if (!CollectionUtils.isEmpty(parameterTransformers)) {
+				this.parameterTransformers.addAll(parameterTransformers);
+			}
 			return this;
 		}
 
 		public BackingApplicationBuilder parameterTransformers(ParametersTransformerSpec... parameterTransformers) {
-			this.parameterTransformers.addAll(Arrays.asList(parameterTransformers));
+			if (parameterTransformers != null) {
+				this.parameterTransformers(Arrays.asList(parameterTransformers));
+			}
+			return this;
+		}
+
+		public BackingApplicationBuilder credentialProviders(List<CredentialProviderSpec> credentialProviders) {
+			if (!CollectionUtils.isEmpty(credentialProviders)) {
+				this.credentialProviders.addAll(credentialProviders);
+			}
 			return this;
 		}
 
 		public BackingApplicationBuilder credentialProviders(CredentialProviderSpec... credentialProviders) {
-			this.credentialProviders.addAll(Arrays.asList(credentialProviders));
+			if (credentialProviders != null) {
+				this.credentialProviders(Arrays.asList(credentialProviders));
+			}
 			return this;
 		}
 

spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/deployer/BackingApplications.java

@@ -31,11 +31,6 @@ private BackingApplications() {
 		super.addAll(backingApplications);
 	}
 
-	public BackingApplications(BackingApplications backingApplicationsToCopy) {
-		backingApplicationsToCopy.forEach(backingApplicationToCopy ->
-			this.add(new BackingApplication(backingApplicationToCopy)));
-	}
-
 	public static BackingApplicationsBuilder builder() {
 		return new BackingApplicationsBuilder();
 	}
@@ -44,13 +39,17 @@ public static class BackingApplicationsBuilder {
 		private final List<BackingApplication> backingApplications = new ArrayList<>();
 
 		public BackingApplicationsBuilder backingApplication(BackingApplication backingApplication) {
-			this.backingApplications.add(backingApplication);
+			if (backingApplication != null) {
+				this.backingApplications.add(backingApplication);
+			}
 			return this;
 		}
 
 		public BackingApplicationsBuilder backingApplications(List<BackingApplication> backingApplications) {
 			if (!CollectionUtils.isEmpty(backingApplications)) {
-				this.backingApplications.addAll(backingApplications);
+				backingApplications.forEach(backingApplication -> this.backingApplication(BackingApplication.builder()
+					.backingApplication(backingApplication)
+					.build()));
 			}
 			return this;
 		}

spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/deployer/BackingService.java

@@ -23,6 +23,8 @@
 import java.util.Map;
 import java.util.Objects;
 
+import org.springframework.util.CollectionUtils;
+
 public class BackingService {
 
 	private String serviceInstanceName;
@@ -52,22 +54,6 @@ private BackingService() {
 		this.rebindOnUpdate = rebindOnUpdate;
 	}
 
-	BackingService(BackingService backingServiceToCopy) {
-		this.serviceInstanceName = backingServiceToCopy.serviceInstanceName;
-		this.name = backingServiceToCopy.name;
-		this.plan = backingServiceToCopy.plan;
-		this.parameters = backingServiceToCopy.parameters == null
-			? new HashMap<>()
-			: new HashMap<>(backingServiceToCopy.parameters);
-		this.properties = backingServiceToCopy.properties == null
-			? new HashMap<>()
-			: new HashMap<>(backingServiceToCopy.properties);
-		this.parametersTransformers = backingServiceToCopy.parametersTransformers == null
-			? new ArrayList<>()
-			: new ArrayList<>(backingServiceToCopy.parametersTransformers);
-		this.rebindOnUpdate = backingServiceToCopy.rebindOnUpdate;
-	}
-
 	public String getServiceInstanceName() {
 		return serviceInstanceName;
 	}
@@ -171,14 +157,24 @@ public static final class BackingServiceBuilder {
 		private String serviceInstanceName;
 		private String name;
 		private String plan;
-		private Map<String, Object> parameters = new HashMap<>();
-		private Map<String, String> properties = new HashMap<>();
+		private final Map<String, Object> parameters = new HashMap<>();
+		private final Map<String, String> properties = new HashMap<>();
 		private final List<ParametersTransformerSpec> parameterTransformers = new ArrayList<>();
 		private boolean rebindOnUpdate;
 
 		BackingServiceBuilder() {
 		}
 
+		public BackingServiceBuilder backingService(BackingService backingService) {
+			return this.serviceInstanceName(backingService.getServiceInstanceName())
+				.name(backingService.getName())
+				.plan(backingService.getPlan())
+				.parameters(backingService.getParameters())
+				.properties(backingService.getProperties())
+				.parameterTransformers(backingService.getParametersTransformers())
+				.rebindOnUpdate(backingService.isRebindOnUpdate());
+		}
+
 		public BackingServiceBuilder serviceInstanceName(String serviceInstanceName) {
 			this.serviceInstanceName = serviceInstanceName;
 			return this;
@@ -195,17 +191,30 @@ public BackingServiceBuilder plan(String plan) {
 		}
 
 		public BackingServiceBuilder parameters(Map<String, Object> parameters) {
-			this.parameters = parameters;
+			if (!CollectionUtils.isEmpty(parameters)) {
+				this.parameters.putAll(parameters);
+			}
 			return this;
 		}
 
 		public BackingServiceBuilder properties(Map<String, String> properties) {
-			this.properties = properties;
+			if (!CollectionUtils.isEmpty(properties)) {
+				this.properties.putAll(properties);
+			}
+			return this;
+		}
+
+		public BackingServiceBuilder parameterTransformers(List<ParametersTransformerSpec> parameterTransformers) {
+			if (!CollectionUtils.isEmpty(parameterTransformers)) {
+				this.parameterTransformers.addAll(parameterTransformers);
+			}
 			return this;
 		}
 
 		public BackingServiceBuilder parameterTransformers(ParametersTransformerSpec... parameterTransformers) {
-			this.parameterTransformers.addAll(Arrays.asList(parameterTransformers));
+			if (parameterTransformers != null) {
+				this.parameterTransformers(Arrays.asList(parameterTransformers));
+			}
 			return this;
 		}
 

spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/deployer/BackingServices.java

@@ -19,6 +19,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.util.CollectionUtils;
+
 public class BackingServices extends ArrayList<BackingService> {
 
 	private static final long serialVersionUID = 1L;
@@ -30,11 +32,6 @@ private BackingServices() {
 		super.addAll(backingServices);
 	}
 
-	public BackingServices(BackingServices backingServicesToCopy) {
-		backingServicesToCopy.forEach(backingServiceToCopy ->
-			this.add(new BackingService(backingServiceToCopy)));
-	}
-
 	public static BackingServicesBuilder builder() {
 		return new BackingServicesBuilder();
 	}
@@ -44,7 +41,18 @@ public static class BackingServicesBuilder {
 		private final List<BackingService> backingServices = new ArrayList<>();
 
 		public BackingServicesBuilder backingService(BackingService backingService) {
-			this.backingServices.add(backingService);
+			if (backingService != null) {
+				this.backingServices.add(backingService);
+			}
+			return this;
+		}
+
+		public BackingServicesBuilder backingServices(BackingServices backingServices) {
+			if (!CollectionUtils.isEmpty(backingServices)) {
+				backingServices.forEach(backingService -> this.backingService(BackingService.builder()
+					.backingService(backingService)
+					.build()));
+			}
 			return this;
 		}
 

spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/deployer/BrokeredService.java

@@ -18,6 +18,8 @@
 
 import java.util.Objects;
 
+import org.springframework.util.CollectionUtils;
+
 public class BrokeredService {
 
 	private String serviceName;
@@ -132,12 +134,20 @@ public BrokeredServiceBuilder planName(String planId) {
 		}
 
 		public BrokeredServiceBuilder apps(BackingApplications backingApplications) {
-			this.backingApplications = backingApplications;
+			if (!CollectionUtils.isEmpty(backingApplications)) {
+				this.backingApplications = BackingApplications.builder()
+					.backingApplications(backingApplications)
+					.build();
+			}
 			return this;
 		}
 
 		public BrokeredServiceBuilder services(BackingServices backingServices) {
-			this.backingServices = backingServices;
+			if (!CollectionUtils.isEmpty(backingServices)) {
+				this.backingServices = BackingServices.builder()
+					.backingServices(backingServices)
+					.build();
+			}
 			return this;
 		}
 

spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/deployer/BrokeredServices.java

@@ -19,6 +19,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.util.CollectionUtils;
+
 public class BrokeredServices extends ArrayList<BrokeredService> {
 	private static final long serialVersionUID = 6303127383252611352L;
 
@@ -37,7 +39,16 @@ public static class BrokeredServicesBuilder {
 		private final List<BrokeredService> brokeredServices = new ArrayList<>();
 
 		public BrokeredServicesBuilder service(BrokeredService brokeredService) {
-			this.brokeredServices.add(brokeredService);
+			if (brokeredService != null) {
+				this.brokeredServices.add(brokeredService);
+			}
+			return this;
+		}
+
+		public BrokeredServicesBuilder services(BrokeredServices brokeredServices) {
+			if (!CollectionUtils.isEmpty(brokeredServices)) {
+				this.brokeredServices.addAll(brokeredServices);
+			}
 			return this;
 		}