Broadly remove deprecated core classes and methods

Issue: SPR-14430

Author: jhoeller

spring-aspects/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -16,8 +16,7 @@
 
 package org.springframework.cache.config;
 
-import org.springframework.cache.interceptor.DefaultKeyGenerator;
+import org.springframework.cache.interceptor.SimpleKeyGenerator;
 
-@SuppressWarnings("deprecation")
-public class SomeKeyGenerator extends DefaultKeyGenerator {
+public class SomeKeyGenerator extends SimpleKeyGenerator {
 }

spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java

@@ -93,42 +93,6 @@ public UnsatisfiedDependencyException(
 		initCause(ex);
 	}
 
-	/**
-	 * Create a new UnsatisfiedDependencyException.
-	 * @param resourceDescription description of the resource that the bean definition came from
-	 * @param beanName the name of the bean requested
-	 * @param ctorArgIndex the index of the constructor argument that couldn't be satisfied
-	 * @param ctorArgType the type of the constructor argument that couldn't be satisfied
-	 * @param msg the detail message
-	 * @deprecated in favor of {@link #UnsatisfiedDependencyException(String, String, InjectionPoint, String)}
-	 */
-	@Deprecated
-	public UnsatisfiedDependencyException(
-			String resourceDescription, String beanName, int ctorArgIndex, Class<?> ctorArgType, String msg) {
-
-		super(resourceDescription, beanName,
-				"Unsatisfied dependency expressed through constructor argument with index " +
-				ctorArgIndex + " of type [" + ClassUtils.getQualifiedName(ctorArgType) + "]" +
-				(msg != null ? ": " + msg : ""));
-	}
-
-	/**
-	 * Create a new UnsatisfiedDependencyException.
-	 * @param resourceDescription description of the resource that the bean definition came from
-	 * @param beanName the name of the bean requested
-	 * @param ctorArgIndex the index of the constructor argument that couldn't be satisfied
-	 * @param ctorArgType the type of the constructor argument that couldn't be satisfied
-	 * @param ex the bean creation exception that indicated the unsatisfied dependency
-	 * @deprecated in favor of {@link #UnsatisfiedDependencyException(String, String, InjectionPoint, BeansException)}
-	 */
-	@Deprecated
-	public UnsatisfiedDependencyException(
-			String resourceDescription, String beanName, int ctorArgIndex, Class<?> ctorArgType, BeansException ex) {
-
-		this(resourceDescription, beanName, ctorArgIndex, ctorArgType, (ex != null ? ex.getMessage() : ""));
-		initCause(ex);
-	}
-
 
 	/**
 	 * Return the injection point (field or method/constructor parameter), if known.

spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java

@@ -222,24 +222,6 @@ protected void processProperties(ConfigurableListableBeanFactory beanFactoryToPr
 		doProcessProperties(beanFactoryToProcess, valueResolver);
 	}
 
-	/**
-	 * Parse the given String value for placeholder resolution.
-	 * @param strVal the String value to parse
-	 * @param props the Properties to resolve placeholders against
-	 * @param visitedPlaceholders the placeholders that have already been visited
-	 * during the current resolution attempt (ignored in this version of the code)
-	 * @deprecated as of Spring 3.0, in favor of using {@link #resolvePlaceholder}
-	 * with {@link org.springframework.util.PropertyPlaceholderHelper}.
-	 * Only retained for compatibility with Spring 2.5 extensions.
-	 */
-	@Deprecated
-	protected String parseStringValue(String strVal, Properties props, Set<?> visitedPlaceholders) {
-		PropertyPlaceholderHelper helper = new PropertyPlaceholderHelper(
-				placeholderPrefix, placeholderSuffix, valueSeparator, ignoreUnresolvablePlaceholders);
-		PlaceholderResolver resolver = new PropertyPlaceholderConfigurerResolver(props);
-		return helper.replacePlaceholders(strVal, resolver);
-	}
-
 
 	private class PlaceholderResolvingStringValueResolver implements StringValueResolver {
 

spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java

@@ -166,17 +166,6 @@ public BeanDefinitionBuilder setFactoryMethod(String factoryMethod) {
 		return this;
 	}
 
-	/**
-	 * Add an indexed constructor arg value. The current index is tracked internally
-	 * and all additions are at the present point.
-	 * @deprecated since Spring 2.5, in favor of {@link #addConstructorArgValue}.
-	 * This variant just remains around for Spring Security 2.x compatibility.
-	 */
-	@Deprecated
-	public BeanDefinitionBuilder addConstructorArg(Object value) {
-		return addConstructorArgValue(value);
-	}
-
 	/**
 	 * Add an indexed constructor arg value. The current index is tracked internally
 	 * and all additions are at the present point.

spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java

@@ -270,15 +270,6 @@ public final XmlReaderContext getReaderContext() {
 		return this.readerContext;
 	}
 
-	/**
-	 * Get the {@link Environment} associated with this helper instance.
-	 * @deprecated in favor of {@link XmlReaderContext#getEnvironment()}
-	 */
-	@Deprecated
-	public final Environment getEnvironment() {
-		return this.readerContext.getEnvironment();
-	}
-
 	/**
 	 * Invoke the {@link org.springframework.beans.factory.parsing.SourceExtractor} to pull the
 	 * source metadata from the supplied {@link Element}.

spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java

@@ -172,14 +172,6 @@ public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
 
-	/**
-	 * @deprecated as of 4.3, in favor of {@link #setBeanFactory}
-	 */
-	@Deprecated
-	public void setApplicationContext(ApplicationContext applicationContext) {
-		this.beanFactory = applicationContext;
-	}
-
 
 	@Override
 	public void afterPropertiesSet() {

spring-context/src/main/java/org/springframework/cache/interceptor/DefaultKeyGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -128,21 +128,6 @@ protected final Cache lookupCache(String name) {
 		return this.cacheMap.get(name);
 	}
 
-	/**
-	 * Dynamically register an additional Cache with this manager.
-	 * @param cache the Cache to register
-	 * @deprecated as of Spring 4.3, in favor of {@link #getMissingCache(String)}
-	 */
-	@Deprecated
-	protected final void addCache(Cache cache) {
-		String name = cache.getName();
-		synchronized (this.cacheMap) {
-			if (this.cacheMap.put(name, decorateCache(cache)) == null) {
-				updateCacheNames(name);
-			}
-		}
-	}
-
 	/**
 	 * Update the exposed {@link #cacheNames} set with the given name.
 	 * <p>This will always be called within a full {@link #cacheMap} lock