Deprecate relaxed property concepts
Deprecate `RelaxedDataBinder`, `RelaxedPropertyResolver` and related classes in preparation for the updated configuration properties binder work. See gh-9000
This commit is contained in:
		
							parent
							
								
									39b33d30e1
								
							
						
					
					
						commit
						b10e2f3a05
					
				| 
						 | 
					@ -28,6 +28,7 @@ import java.util.Set;
 | 
				
			||||||
 * @author Phillip Webb
 | 
					 * @author Phillip Webb
 | 
				
			||||||
 * @since 1.2.0
 | 
					 * @since 1.2.0
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
class DefaultPropertyNamePatternsMatcher implements PropertyNamePatternsMatcher {
 | 
					class DefaultPropertyNamePatternsMatcher implements PropertyNamePatternsMatcher {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	private final char[] delimiters;
 | 
						private final char[] delimiters;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Copyright 2012-2015 the original author or authors.
 | 
					 * Copyright 2012-2017 the original author or authors.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
					 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
				
			||||||
 * you may not use this file except in compliance with the License.
 | 
					 * you may not use this file except in compliance with the License.
 | 
				
			||||||
| 
						 | 
					@ -26,6 +26,7 @@ import java.net.UnknownHostException;
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * @author Dave Syer
 | 
					 * @author Dave Syer
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
public class InetAddressEditor extends PropertyEditorSupport {
 | 
					public class InetAddressEditor extends PropertyEditorSupport {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	@Override
 | 
						@Override
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Copyright 2012-2015 the original author or authors.
 | 
					 * Copyright 2012-2017 the original author or authors.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
					 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
				
			||||||
 * you may not use this file except in compliance with the License.
 | 
					 * you may not use this file except in compliance with the License.
 | 
				
			||||||
| 
						 | 
					@ -24,6 +24,7 @@ import org.springframework.core.env.PropertySource;
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * @author Andy Wilkinson
 | 
					 * @author Andy Wilkinson
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
class OriginCapablePropertyValue extends PropertyValue {
 | 
					class OriginCapablePropertyValue extends PropertyValue {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	private static final String ATTRIBUTE_PROPERTY_ORIGIN = "propertyOrigin";
 | 
						private static final String ATTRIBUTE_PROPERTY_ORIGIN = "propertyOrigin";
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Copyright 2012-2014 the original author or authors.
 | 
					 * Copyright 2012-2017 the original author or authors.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
					 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
				
			||||||
 * you may not use this file except in compliance with the License.
 | 
					 * you may not use this file except in compliance with the License.
 | 
				
			||||||
| 
						 | 
					@ -27,6 +27,7 @@ import org.springframework.util.PatternMatchUtils;
 | 
				
			||||||
 * @author Phillip Webb
 | 
					 * @author Phillip Webb
 | 
				
			||||||
 * @since 1.2.0
 | 
					 * @since 1.2.0
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
class PatternPropertyNamePatternsMatcher implements PropertyNamePatternsMatcher {
 | 
					class PatternPropertyNamePatternsMatcher implements PropertyNamePatternsMatcher {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	private final String[] patterns;
 | 
						private final String[] patterns;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -51,6 +51,7 @@ import org.springframework.validation.Validator;
 | 
				
			||||||
 * @param <T> the target type
 | 
					 * @param <T> the target type
 | 
				
			||||||
 * @author Dave Syer
 | 
					 * @author Dave Syer
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
public class PropertiesConfigurationFactory<T>
 | 
					public class PropertiesConfigurationFactory<T>
 | 
				
			||||||
		implements FactoryBean<T>, MessageSourceAware, InitializingBean {
 | 
							implements FactoryBean<T>, MessageSourceAware, InitializingBean {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -22,6 +22,7 @@ package org.springframework.boot.bind;
 | 
				
			||||||
 * @author Phillip Webb
 | 
					 * @author Phillip Webb
 | 
				
			||||||
 * @since 1.2.0
 | 
					 * @since 1.2.0
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
interface PropertyNamePatternsMatcher {
 | 
					interface PropertyNamePatternsMatcher {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	PropertyNamePatternsMatcher ALL = new PropertyNamePatternsMatcher() {
 | 
						PropertyNamePatternsMatcher ALL = new PropertyNamePatternsMatcher() {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Copyright 2012-2015 the original author or authors.
 | 
					 * Copyright 2012-2017 the original author or authors.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
					 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
				
			||||||
 * you may not use this file except in compliance with the License.
 | 
					 * you may not use this file except in compliance with the License.
 | 
				
			||||||
| 
						 | 
					@ -25,6 +25,7 @@ import org.springframework.core.env.PropertySource;
 | 
				
			||||||
 * @author Andy Wilkinson
 | 
					 * @author Andy Wilkinson
 | 
				
			||||||
 * @since 1.3.0
 | 
					 * @since 1.3.0
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
public class PropertyOrigin {
 | 
					public class PropertyOrigin {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	private final PropertySource<?> source;
 | 
						private final PropertySource<?> source;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -31,6 +31,7 @@ import org.springframework.core.env.PropertySources;
 | 
				
			||||||
 * @see PropertySource
 | 
					 * @see PropertySource
 | 
				
			||||||
 * @see PropertySources
 | 
					 * @see PropertySources
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
public abstract class PropertySourceUtils {
 | 
					public abstract class PropertySourceUtils {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/**
 | 
						/**
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -34,6 +34,7 @@ import org.springframework.validation.BindException;
 | 
				
			||||||
 * @author Stephane Nicoll
 | 
					 * @author Stephane Nicoll
 | 
				
			||||||
 * @since 1.4.0
 | 
					 * @since 1.4.0
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
public class PropertySourcesBinder {
 | 
					public class PropertySourcesBinder {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	private PropertySources propertySources;
 | 
						private PropertySources propertySources;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -41,6 +41,7 @@ import org.springframework.validation.DataBinder;
 | 
				
			||||||
 * @author Dave Syer
 | 
					 * @author Dave Syer
 | 
				
			||||||
 * @author Phillip Webb
 | 
					 * @author Phillip Webb
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
public class PropertySourcesPropertyValues implements PropertyValues {
 | 
					public class PropertySourcesPropertyValues implements PropertyValues {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	private static final Pattern COLLECTION_PROPERTY = Pattern
 | 
						private static final Pattern COLLECTION_PROPERTY = Pattern
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Copyright 2012-2015 the original author or authors.
 | 
					 * Copyright 2012-2017 the original author or authors.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
					 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
				
			||||||
 * you may not use this file except in compliance with the License.
 | 
					 * you may not use this file except in compliance with the License.
 | 
				
			||||||
| 
						 | 
					@ -26,6 +26,7 @@ import org.springframework.beans.NotWritablePropertyException;
 | 
				
			||||||
 * @since 1.3.0
 | 
					 * @since 1.3.0
 | 
				
			||||||
 * @see RelaxedDataBinder
 | 
					 * @see RelaxedDataBinder
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
public class RelaxedBindingNotWritablePropertyException
 | 
					public class RelaxedBindingNotWritablePropertyException
 | 
				
			||||||
		extends NotWritablePropertyException {
 | 
							extends NotWritablePropertyException {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -36,6 +36,7 @@ import org.springframework.util.Assert;
 | 
				
			||||||
 * @author Stephane Nicoll
 | 
					 * @author Stephane Nicoll
 | 
				
			||||||
 * @since 1.1.0
 | 
					 * @since 1.1.0
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
class RelaxedConversionService implements ConversionService {
 | 
					class RelaxedConversionService implements ConversionService {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	private final ConversionService conversionService;
 | 
						private final ConversionService conversionService;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -56,6 +56,7 @@ import org.springframework.validation.DataBinder;
 | 
				
			||||||
 * @author Andy Wilkinson
 | 
					 * @author Andy Wilkinson
 | 
				
			||||||
 * @see RelaxedNames
 | 
					 * @see RelaxedNames
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
public class RelaxedDataBinder extends DataBinder {
 | 
					public class RelaxedDataBinder extends DataBinder {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	private static final Object BLANK = new Object();
 | 
						private static final Object BLANK = new Object();
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -32,6 +32,7 @@ import org.springframework.util.StringUtils;
 | 
				
			||||||
 * @see RelaxedDataBinder
 | 
					 * @see RelaxedDataBinder
 | 
				
			||||||
 * @see RelaxedPropertyResolver
 | 
					 * @see RelaxedPropertyResolver
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
public final class RelaxedNames implements Iterable<String> {
 | 
					public final class RelaxedNames implements Iterable<String> {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	private static final Pattern CAMEL_CASE_PATTERN = Pattern.compile("([^A-Z-])([A-Z])");
 | 
						private static final Pattern CAMEL_CASE_PATTERN = Pattern.compile("([^A-Z-])([A-Z])");
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Copyright 2012-2016 the original author or authors.
 | 
					 * Copyright 2012-2017 the original author or authors.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
					 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
				
			||||||
 * you may not use this file except in compliance with the License.
 | 
					 * you may not use this file except in compliance with the License.
 | 
				
			||||||
| 
						 | 
					@ -30,6 +30,7 @@ import org.springframework.util.Assert;
 | 
				
			||||||
 * @author Phillip Webb
 | 
					 * @author Phillip Webb
 | 
				
			||||||
 * @see RelaxedNames
 | 
					 * @see RelaxedNames
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
public class RelaxedPropertyResolver implements PropertyResolver {
 | 
					public class RelaxedPropertyResolver implements PropertyResolver {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	private final PropertyResolver resolver;
 | 
						private final PropertyResolver resolver;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Copyright 2012-2014 the original author or authors.
 | 
					 * Copyright 2012-2017 the original author or authors.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
					 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
				
			||||||
 * you may not use this file except in compliance with the License.
 | 
					 * you may not use this file except in compliance with the License.
 | 
				
			||||||
| 
						 | 
					@ -23,6 +23,7 @@ import org.springframework.core.convert.converter.Converter;
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * @author Phillip Webb
 | 
					 * @author Phillip Webb
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
class StringToCharArrayConverter implements Converter<String, char[]> {
 | 
					class StringToCharArrayConverter implements Converter<String, char[]> {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	@Override
 | 
						@Override
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -48,6 +48,7 @@ import org.springframework.validation.Validator;
 | 
				
			||||||
 * @author Luke Taylor
 | 
					 * @author Luke Taylor
 | 
				
			||||||
 * @author Dave Syer
 | 
					 * @author Dave Syer
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
public class YamlConfigurationFactory<T>
 | 
					public class YamlConfigurationFactory<T>
 | 
				
			||||||
		implements FactoryBean<T>, MessageSourceAware, InitializingBean {
 | 
							implements FactoryBean<T>, MessageSourceAware, InitializingBean {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -31,6 +31,7 @@ import org.yaml.snakeyaml.nodes.NodeId;
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * @author Luke Taylor
 | 
					 * @author Luke Taylor
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
public class YamlJavaBeanPropertyConstructor extends Constructor {
 | 
					public class YamlJavaBeanPropertyConstructor extends Constructor {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	private final Map<Class<?>, Map<String, Property>> properties = new HashMap<>();
 | 
						private final Map<Class<?>, Map<String, Property>> properties = new HashMap<>();
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Copyright 2012-2013 the original author or authors.
 | 
					 * Copyright 2012-2017 the original author or authors.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
					 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
				
			||||||
 * you may not use this file except in compliance with the License.
 | 
					 * you may not use this file except in compliance with the License.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -45,6 +45,7 @@ import org.springframework.util.StringUtils;
 | 
				
			||||||
 * @author Christian Dupuis
 | 
					 * @author Christian Dupuis
 | 
				
			||||||
 * @author Stephane Nicoll
 | 
					 * @author Stephane Nicoll
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					@Deprecated
 | 
				
			||||||
class EnableConfigurationPropertiesImportSelector implements ImportSelector {
 | 
					class EnableConfigurationPropertiesImportSelector implements ImportSelector {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	@Override
 | 
						@Override
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue