From d8b1bc7ed8804b95f1e005cfdcbfe531c689348b Mon Sep 17 00:00:00 2001
From: Brian <asman.brian@gmail.com>
Date: Thu, 23 Mar 2017 14:18:18 -0400
Subject: [PATCH] annotate consul config properties as validated (#291)

---
 .../cloud/consul/config/ConsulConfigProperties.java             | 2 ++
 .../java/org/springframework/cloud/consul/ConsulProperties.java | 2 ++
 .../cloud/consul/discovery/HeartbeatProperties.java             | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigProperties.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigProperties.java
index a79e9401..ea82366f 100644
--- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigProperties.java
+++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigProperties.java
@@ -22,6 +22,7 @@ import javax.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.validation.annotation.Validated;
 
 import lombok.Data;
 
@@ -30,6 +31,7 @@ import lombok.Data;
  */
 @ConfigurationProperties("spring.cloud.consul.config")
 @Data
+@Validated
 public class ConsulConfigProperties {
 	private boolean enabled = true;
 
diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulProperties.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulProperties.java
index 214cb84a..6c5f686e 100644
--- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulProperties.java
+++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulProperties.java
@@ -21,12 +21,14 @@ import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.validation.annotation.Validated;
 
 /**
  * @author Spencer Gibb
  */
 @ConfigurationProperties("spring.cloud.consul")
 @Data
+@Validated
 public class ConsulProperties {
 	/** Consul agent hostname. Defaults to 'localhost'. */
 	@NotNull
diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/HeartbeatProperties.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/HeartbeatProperties.java
index 74d43b50..b659dca0 100644
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/HeartbeatProperties.java
+++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/HeartbeatProperties.java
@@ -27,10 +27,12 @@ import lombok.Data;
 import lombok.extern.apachecommons.CommonsLog;
 import org.joda.time.Period;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.validation.annotation.Validated;
 
 @ConfigurationProperties(prefix = "spring.cloud.consul.discovery.heartbeat")
 @Data
 @CommonsLog
+@Validated
 public class HeartbeatProperties {
 
 	// TODO: change enabled to default to true when I stop seeing messages like