Update Catalog bean validation to cascade to nested properties

Author: royclarkson

spring-cloud-open-service-broker-autoconfigure/src/main/java/org/springframework/cloud/servicebroker/autoconfigure/web/Catalog.java

@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
 
 /**
@@ -37,6 +38,7 @@ public class Catalog {
 	 * A list of service offerings provided by the service broker.
 	 */
 	@NotEmpty
+	@Valid
 	private final List<ServiceDefinition> services = new ArrayList<>();
 
 	public List<ServiceDefinition> getServices() {

spring-cloud-open-service-broker-autoconfigure/src/main/java/org/springframework/cloud/servicebroker/autoconfigure/web/Plan.java

@@ -16,6 +16,7 @@
 
 package org.springframework.cloud.servicebroker.autoconfigure.web;
 
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
 
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
@@ -55,12 +56,14 @@ public class Plan {
 	 * The metadata for this plan.
 	 */
 	@NestedConfigurationProperty
+	@Valid
 	private PlanMetadata metadata;
 
 	/**
 	 * The schemas for this plan.
 	 */
 	@NestedConfigurationProperty
+	@Valid
 	private Schemas schemas;
 
 	/**

spring-cloud-open-service-broker-autoconfigure/src/main/java/org/springframework/cloud/servicebroker/autoconfigure/web/PlanMetadata.java

@@ -22,6 +22,8 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import jakarta.validation.Valid;
+
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.util.CollectionUtils;
 
@@ -46,6 +48,7 @@ public class PlanMetadata {
 	 * the user (such as a monthly + usage costs at once).
 	 */
 	@NestedConfigurationProperty
+	@Valid
 	private final List<Cost> costs = new ArrayList<>();
 
 	/**

spring-cloud-open-service-broker-autoconfigure/src/main/java/org/springframework/cloud/servicebroker/autoconfigure/web/Schemas.java

@@ -16,6 +16,8 @@
 
 package org.springframework.cloud.servicebroker.autoconfigure.web;
 
+import jakarta.validation.Valid;
+
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 /**
@@ -32,12 +34,14 @@ public class Schemas {
 	 * The schemas available on a service instance.
 	 */
 	@NestedConfigurationProperty
+	@Valid
 	private ServiceInstanceSchema serviceInstance;
 
 	/**
 	 * The schemas available on a service binding.
 	 */
 	@NestedConfigurationProperty
+	@Valid
 	private ServiceBindingSchema serviceBinding;
 
 	public ServiceInstanceSchema getServiceInstance() {

spring-cloud-open-service-broker-autoconfigure/src/main/java/org/springframework/cloud/servicebroker/autoconfigure/web/ServiceBindingSchema.java

@@ -16,6 +16,8 @@
 
 package org.springframework.cloud.servicebroker.autoconfigure.web;
 
+import jakarta.validation.Valid;
+
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 /**
@@ -32,6 +34,7 @@ public class ServiceBindingSchema {
 	 * The JSON schema for configuration parameters when creating a service binding.
 	 */
 	@NestedConfigurationProperty
+	@Valid
 	private MethodSchema create;
 
 	public MethodSchema getCreate() {

spring-cloud-open-service-broker-autoconfigure/src/main/java/org/springframework/cloud/servicebroker/autoconfigure/web/ServiceBrokerProperties.java

@@ -16,6 +16,8 @@
 
 package org.springframework.cloud.servicebroker.autoconfigure.web;
 
+import jakarta.validation.Valid;
+
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.validation.annotation.Validated;
@@ -32,6 +34,7 @@ public class ServiceBrokerProperties {
 	private String apiVersion;
 
 	@NestedConfigurationProperty
+	@Valid
 	private Catalog catalog;
 
 	public String getApiVersion() {

spring-cloud-open-service-broker-autoconfigure/src/main/java/org/springframework/cloud/servicebroker/autoconfigure/web/ServiceDefinition.java

@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
 
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
@@ -91,6 +92,7 @@ public class ServiceDefinition {
 	 * A map of metadata to further describe a service offering.
 	 */
 	@NestedConfigurationProperty
+	@Valid
 	private ServiceMetadata metadata;
 
 	/**
@@ -106,13 +108,15 @@ public class ServiceDefinition {
 	 * Data necessary to activate the Dashboard SSO feature for this service.
 	 */
 	@NestedConfigurationProperty
+	@Valid
 	private DashboardClient dashboardClient;
 
 	/**
 	 * A list of plans for this service.
 	 */
 	@NestedConfigurationProperty
 	@NotEmpty
+	@Valid
 	private final List<Plan> plans = new ArrayList<>();
 
 	public String getId() {

spring-cloud-open-service-broker-autoconfigure/src/main/java/org/springframework/cloud/servicebroker/autoconfigure/web/ServiceInstanceSchema.java

@@ -16,6 +16,8 @@
 
 package org.springframework.cloud.servicebroker.autoconfigure.web;
 
+import jakarta.validation.Valid;
+
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 /**
@@ -32,12 +34,14 @@ public class ServiceInstanceSchema {
 	 * The JSON schema for configuration parameters when creating a service instance.
 	 */
 	@NestedConfigurationProperty
+	@Valid
 	private MethodSchema create;
 
 	/**
 	 * The JSON schema for configuration parameters when updating a service instance.
 	 */
 	@NestedConfigurationProperty
+	@Valid
 	private MethodSchema update;
 
 	public MethodSchema getCreate() {