/*
 * Copyright 2012-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.springframework.boot.context.properties;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

import org.springframework.boot.validation.MessageInterpolatorFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;

/**
 * {@link LocalValidatorFactoryBean} supports classes annotated with
 * {@link Validated @Validated}.
 *
 * @author Phillip Webb
 */
class ValidatedLocalValidatorFactoryBean extends LocalValidatorFactoryBean {

	private static final Log logger = LogFactory
			.getLog(ConfigurationPropertiesBindingPostProcessor.class);

	ValidatedLocalValidatorFactoryBean(ApplicationContext applicationContext) {
		setApplicationContext(applicationContext);
		setMessageInterpolator(new MessageInterpolatorFactory().getObject());
		afterPropertiesSet();
	}

	@Override
	public boolean supports(Class<?> type) {
		if (!super.supports(type)) {
			return false;
		}
		if (AnnotatedElementUtils.hasAnnotation(type, Validated.class)) {
			return true;
		}
		if (type.getPackage() != null
				&& type.getPackage().getName().startsWith("org.springframework.boot")) {
			return false;
		}
		if (getConstraintsForClass(type).isBeanConstrained()) {
			logger.warn("The @ConfigurationProperties bean " + type
					+ " contains validation constraints but had not been annotated "
					+ "with @Validated.");
		}
		return true;
	}

}

@@ -673,94 +673,8 @@
 s;%0A%0A
-import org.apache.commons.logging.Log;%0Aimport org.apache.commons.logging.LogFactory;%0A%0A
 impo
@@ -740,16 +740,16 @@
 actory;%0A
+
 import o
@@ -1221,118 +1221,8 @@
  %7B%0A%0A
-%09private static final Log logger = LogFactory%0A%09%09%09.getLog(ConfigurationPropertiesBindingPostProcessor.class);%0A%0A
 %09Val
@@ -1498,13 +1498,15 @@
 %7B%0A%09%09
-if (!
+return 
 supe
@@ -1525,39 +1525,16 @@
 ype)
-) %7B
 %0A%09%09%09
-return false;%0A%09%09%7D%0A%09%09if (
+%09&& 
 Anno
@@ -1591,394 +1591,8 @@
 ass)
-) %7B%0A%09%09%09return true;%0A%09%09%7D%0A%09%09if (type.getPackage() != null%0A%09%09%09%09&& type.getPackage().getName().startsWith(%22org.springframework.boot%22)) %7B%0A%09%09%09return false;%0A%09%09%7D%0A%09%09if (getConstraintsForClass(type).isBeanConstrained()) %7B%0A%09%09%09logger.warn(%22The @ConfigurationProperties bean %22 + type%0A%09%09%09%09%09+ %22 contains validation constraints but had not been annotated %22%0A%09%09%09%09%09+ %22with @Validated.%22);%0A%09%09%7D%0A%09%09return true
 ;%0A%09%7D

Make @Validated a hard requirement for JSR-303 validation