Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed deprecated helper classes and methods (that have been deprecated since 3.0 or before)

Browse Source
This commit is contained in:
Juergen Hoeller
2013-05-02 17:25:10 +02:00
parent 17610c2523
commit 0a8f5b2919
28 changed files with 19 additions and 1918 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2013 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.
@@ -890,20 +890,6 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
}
}
/**
* Subclasses can invoke this method to register a listener.
* Any beans in the context that are listeners are automatically added.
* <p>Note: This method only works within an active application context,
* i.e. when an ApplicationEventMulticaster is already available. Generally
* prefer the use of {@link #addApplicationListener} which is more flexible.
* @param listener the listener to register
* @deprecated as of Spring 3.0, in favor of {@link #addApplicationListener}
*/
@Deprecated
protected void addListener(ApplicationListener<?> listener) {
getApplicationEventMulticaster().addApplicationListener(listener);
}
/**
* Finish the initialization of this context's bean factory,
* initializing all remaining singleton beans.

38
spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
View File

@@ -22,7 +22,6 @@ import java.net.SocketException;
import java.rmi.ConnectException;
import java.rmi.ConnectIOException;
import java.rmi.NoSuchObjectException;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.rmi.StubNotFoundException;
import java.rmi.UnknownHostException;
@@ -54,43 +53,6 @@ public abstract class RmiClientInterceptorUtils {
private static final Log logger = LogFactory.getLog(RmiClientInterceptorUtils.class);
/**
* Apply the given method invocation to the given RMI stub.
* <p>Delegates to the corresponding method if the RMI stub does not directly
* implement the invoked method. This typically happens when a non-RMI service
* interface is used for an RMI service. The methods of such a service interface
* have to match the RMI stub methods, but they typically don't declare
* {@code java.rmi.RemoteException}: A RemoteException thrown by the RMI stub
* will be automatically converted to Spring's RemoteAccessException.
* @deprecated as of Spring 2.5, in favor of {@link #invokeRemoteMethod}
*/
@Deprecated
public static Object invoke(MethodInvocation invocation, Remote stub, String serviceName) throws Throwable {
try {
return invokeRemoteMethod(invocation, stub);
}
catch (InvocationTargetException ex) {
Throwable targetEx = ex.getTargetException();
if (targetEx instanceof RemoteException) {
RemoteException rex = (RemoteException) targetEx;
throw convertRmiAccessException(invocation.getMethod(), rex, serviceName);
}
else {
throw targetEx;
}
}
}
/**
* Perform a raw method invocation on the given RMI stub,
* letting reflection exceptions through as-is.
* @deprecated as of Spring 2.5, in favor of {@link #invokeRemoteMethod}
*/
@Deprecated
public static Object doInvoke(MethodInvocation invocation, Remote stub) throws InvocationTargetException {
return invokeRemoteMethod(invocation, stub);
}
/**
* Perform a raw method invocation on the given RMI stub,
* letting reflection exceptions through as-is.

35
spring-context/src/main/java/org/springframework/ui/ModelMap.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2013 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.
@@ -145,37 +145,4 @@ public class ModelMap extends LinkedHashMap<String, Object> {
return containsKey(attributeName);
}
/**
* @deprecated as of Spring 2.5, in favor of {@link #addAttribute(String, Object)}
*/
@Deprecated
public ModelMap addObject(String modelName, Object modelObject) {
return addAttribute(modelName, modelObject);
}
/**
* @deprecated as of Spring 2.5, in favor of {@link #addAttribute(Object)}
*/
@Deprecated
public ModelMap addObject(Object modelObject) {
return addAttribute(modelObject);
}
/**
* @deprecated as of Spring 2.5, in favor of {@link #addAllAttributes(Collection)}
*/
@Deprecated
public ModelMap addAllObjects(Collection objects) {
return addAllAttributes(objects);
}
/**
* @deprecated as of Spring 2.5, in favor of {@link #addAllAttributes(Map)}
*/
@Deprecated
public ModelMap addAllObjects(Map objects) {
return addAllAttributes(objects);
}
}

18
spring-context/src/main/java/org/springframework/validation/DataBinder.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2013 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.
@@ -322,22 +322,6 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
return getInternalBindingResult();
}
/**
* Return the Errors instance for this data binder.
* @return the Errors instance, to be treated as Errors or as BindException
* @deprecated in favor of {@link #getBindingResult()}.
* Use the {@link BindException#BindException(BindingResult)} constructor
* to create a BindException instance if still needed.
* @see #getBindingResult()
*/
@Deprecated
public BindException getErrors() {
if (this.bindException == null) {
this.bindException = new BindException(getBindingResult());
}
return this.bindException;
}
/**
* Set whether to ignore unknown fields, that is, whether to ignore bind