root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Removed deprecated code

This commit is contained in:
Arjen Poutsma 2008-10-23 08:36:52 +00:00
parent f11d3436ed
commit 4973f9387a
14 changed files with 22 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.beans/src/main/java/org/springframework/beans/BeanUtils.java
View File

@ -465,6 +465,7 @@ public abstract class BeanUtils {
* @deprecated as of Spring 2.0, in favor of <code>ClassUtils.isAssignable</code>
* @see org.springframework.util.ClassUtils#isAssignable(Class, Class)
*/
@Deprecated
public static boolean isAssignable(Class targetType, Class valueType) {
return ClassUtils.isAssignable(targetType, valueType);
}
@ -479,6 +480,7 @@ public abstract class BeanUtils {
* @deprecated as of Spring 2.0, in favor of <code>ClassUtils.isAssignableValue</code>
* @see org.springframework.util.ClassUtils#isAssignableValue(Class, Object)
*/
@Deprecated
public static boolean isAssignable(Class type, Object value) {
return ClassUtils.isAssignableValue(type, value);
}

1
org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapper.java
View File

@ -58,6 +58,7 @@ public interface BeanWrapper extends ConfigurablePropertyAccessor {
* @deprecated as of Spring 2.5,
* in favor of recreating a BeanWrapper per target instance
*/
@Deprecated
void setWrappedInstance(Object obj);
/**

1
org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
View File

@ -352,6 +352,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
* @deprecated in favor of <code>convertIfNecessary</code>
* @see #convertIfNecessary(Object, Class)
*/
@Deprecated
public Object doTypeConversionIfNecessary(Object value, Class requiredType) throws TypeMismatchException {
return convertIfNecessary(value, requiredType, null);
}

1
org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ConfigurableBeanFactory.java
View File

@ -155,6 +155,7 @@ public interface ConfigurableBeanFactory extends HierarchicalBeanFactory, Single
* @deprecated as of Spring 2.0.7, in favor of {@link #addPropertyEditorRegistrar}
* and {@link #registerCustomEditor(Class, Class)}
*/
@Deprecated
void registerCustomEditor(Class requiredType, PropertyEditor propertyEditor);
/**

3
org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
View File

@ -187,6 +187,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
* @param original the original bean definition to copy from
* @deprecated since Spring 2.5, in favor of {@link #AbstractBeanDefinition(BeanDefinition)}
*/
@Deprecated
protected AbstractBeanDefinition(AbstractBeanDefinition original) {
this((BeanDefinition) original);
}
@ -241,6 +242,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
* definition (assumably the child).
* @deprecated since Spring 2.5, in favor of {@link #overrideFrom(BeanDefinition)}
*/
@Deprecated
public void overrideFrom(AbstractBeanDefinition other) {
overrideFrom((BeanDefinition) other);
}
@ -422,6 +424,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
* @see #SCOPE_SINGLETON
* @see #SCOPE_PROTOTYPE
*/
@Deprecated
public void setSingleton(boolean singleton) {
this.scope = (singleton ? SCOPE_SINGLETON : SCOPE_PROTOTYPE);
this.singleton = singleton;

5
org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java
View File

@ -172,6 +172,7 @@ public class BeanDefinitionBuilder {
* @deprecated since Spring 2.5, in favor of preparing this on the
* {@link #getRawBeanDefinition() raw BeanDefinition object}
*/
@Deprecated
public BeanDefinitionBuilder setFactoryBean(String factoryBean, String factoryMethod) {
this.beanDefinition.setFactoryBeanName(factoryBean);
this.beanDefinition.setFactoryMethodName(factoryMethod);
@ -183,6 +184,7 @@ public class BeanDefinitionBuilder {
* and all additions are at the present point.
* @deprecated since Spring 2.5, in favor of {@link #addConstructorArgValue}
*/
@Deprecated
public BeanDefinitionBuilder addConstructorArg(Object value) {
return addConstructorArgValue(value);
}
@ -253,6 +255,7 @@ public class BeanDefinitionBuilder {
* as alternative to {@link #setScope}.
* @deprecated since Spring 2.5, in favor of {@link #setScope}
*/
@Deprecated
public BeanDefinitionBuilder setSingleton(boolean singleton) {
this.beanDefinition.setSingleton(singleton);
return this;
@ -318,6 +321,7 @@ public class BeanDefinitionBuilder {
* @deprecated since Spring 2.5, in favor of preparing this on the
* {@link #getRawBeanDefinition() raw BeanDefinition object}
*/
@Deprecated
public BeanDefinitionBuilder setSource(Object source) {
this.beanDefinition.setSource(source);
return this;
@ -328,6 +332,7 @@ public class BeanDefinitionBuilder {
* @deprecated since Spring 2.5, in favor of preparing this on the
* {@link #getRawBeanDefinition() raw BeanDefinition object}
*/
@Deprecated
public BeanDefinitionBuilder setResourceDescription(String resourceDescription) {
this.beanDefinition.setResourceDescription(resourceDescription);
return this;

1
org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReader.java
View File

@ -44,6 +44,7 @@ public interface BeanDefinitionReader {
* encapsulating the methods that are relevant for bean definition handling.
* @deprecated in favor of the uniformly named {@link #getRegistry()}
*/
@Deprecated
BeanDefinitionRegistry getBeanFactory();
/**

1
org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java
View File

@ -59,6 +59,7 @@ public class BeanDefinitionReaderUtils {
* @deprecated in favor of <code>createBeanDefinition(String, String, ClassLoader)</code>
* @see #createBeanDefinition(String, String, ClassLoader)
*/
@Deprecated
public static AbstractBeanDefinition createBeanDefinition(
String className, String parentName, ConstructorArgumentValues cargs,
MutablePropertyValues pvs, ClassLoader classLoader) throws ClassNotFoundException {

2
org.springframework.beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java
View File

@ -102,6 +102,7 @@ public class RootBeanDefinition extends AbstractBeanDefinition {
* @param singleton the singleton status of the bean
* @deprecated since Spring 2.5, in favor of {@link #setScope}
*/
@Deprecated
public RootBeanDefinition(Class beanClass, boolean singleton) {
super();
setBeanClass(beanClass);
@ -156,6 +157,7 @@ public class RootBeanDefinition extends AbstractBeanDefinition {
* @param singleton the singleton status of the bean
* @deprecated since Spring 2.5, in favor of {@link #setScope}
*/
@Deprecated
public RootBeanDefinition(Class beanClass, MutablePropertyValues pvs, boolean singleton) {
super(null, pvs);
setBeanClass(beanClass);

2
org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerSupport.java
View File

@ -87,6 +87,7 @@ public abstract class NamespaceHandlerSupport implements NamespaceHandler {
* the local name of the supplied {@link Element}.
* @deprecated as of Spring 2.0.2; there should be no need to call this directly.
*/
@Deprecated
protected final BeanDefinitionParser findParserForElement(Element element) {
BeanDefinitionParser parser = (BeanDefinitionParser) this.parsers.get(element.getLocalName());
if (parser == null) {
@ -136,6 +137,7 @@ public abstract class NamespaceHandlerSupport implements NamespaceHandler {
* and {@link Attr Attrs}.
* @deprecated as of Spring 2.0.2; there should be no need to call this directly.
*/
@Deprecated
protected final BeanDefinitionDecorator findDecoratorForNode(Node node) {
BeanDefinitionDecorator decorator = null;
if (node instanceof Element) {

1
org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionParser.java
View File

@ -37,6 +37,7 @@ import org.springframework.core.io.Resource;
* @see BeanDefinitionDocumentReader
* @see XmlBeanDefinitionReader#setParserClass
*/
@Deprecated
public interface XmlBeanDefinitionParser {
/**

2
org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java
View File

@ -158,6 +158,7 @@ public class XmlBeanDefinitionReader extends AbstractBeanDefinitionReader {
* @deprecated as of Spring 2.0: superseded by "validationMode"
* @see #setValidationMode
*/
@Deprecated
public void setValidating(boolean validating) {
this.validationMode = (validating ? VALIDATION_AUTO : VALIDATION_NONE);
}
@ -276,6 +277,7 @@ public class XmlBeanDefinitionReader extends AbstractBeanDefinitionReader {
* @see #setDocumentReaderClass
* @see XmlBeanDefinitionParser
*/
@Deprecated
public void setParserClass(Class parserClass) {
if (this.parserClass == null || !XmlBeanDefinitionParser.class.isAssignableFrom(parserClass)) {
throw new IllegalArgumentException("'parserClass' must be an XmlBeanDefinitionParser");

48
org.springframework.beans/src/main/java/org/springframework/beans/support/PagedListSourceProvider.java
View File

@ -1,48 +0,0 @@
/*
* Copyright 2002-2008 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.beans.support;
import java.util.List;
import java.util.Locale;
/**
* Callback that provides the source for a reloadable List.
* Used by {@link RefreshablePagedListHolder}.
*
* @author Jean-Pierre Pawlak
* @author Juergen Hoeller
* @deprecated as of Spring 2.5, to be removed in Spring 3.0
* @see org.springframework.beans.support.RefreshablePagedListHolder#setSourceProvider
*/
public interface PagedListSourceProvider {
/**
* Load the List for the given Locale and filter settings.
* The filter object can be of any custom class, preferably a bean
* for easy data binding from a request. An instance will simply
* get passed through to this callback method.
* @param locale Locale that the List should be loaded for,
* or <code>null</code> if not locale-specific
* @param filter object representing filter settings,
* or <code>null</code> if no filter options are used
* @return the loaded List
* @see org.springframework.beans.support.RefreshablePagedListHolder#setLocale
* @see org.springframework.beans.support.RefreshablePagedListHolder#setFilter
*/
List loadList(Locale locale, Object filter);
}

180
org.springframework.beans/src/main/java/org/springframework/beans/support/RefreshablePagedListHolder.java
View File

@ -1,180 +0,0 @@
/*
* Copyright 2002-2008 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.beans.support;
import java.util.Locale;
import org.springframework.beans.BeanUtils;
/**
* RefreshablePagedListHolder is a PagedListHolder subclass with reloading capabilities.
* It automatically re-requests the List from the source provider, in case of Locale or
* filter changes.
*
* <p>Data binding works just like with PagedListHolder. The locale can be specified in
* Locale's toString syntax, e.g. "locale=en_US". The filter object can be of any
* custom class, preferably a bean for easy data binding from a request. An instance
* will simply get passed through to <code>PagedListSourceProvider.loadList</code>.
* A filter property can be specified via "filter.myFilterProperty", for example.
*
* <p>The scenario in the controller could be:
* <code>
* RefreshablePagedListHolder holder = request.getSession("mySessionAttr");<br>
* if (holder == null) {<br>
* holder = new RefreshablePagedListHolder();<br>
* holder.setSourceProvider(new MyAnonymousOrEmbeddedSourceProvider());<br>
* holder.setFilter(new MyAnonymousOrEmbeddedFilter());<br>
* request.getSession().setAttribute("mySessionAttr", holder);<br>
* }<br>
* holder.refresh(false);
* BindException ex = BindUtils.bind(request, listHolder, "myModelAttr");<br>
* return ModelAndView("myViewName", ex.getModel());<br>
* <br>
* ...<br>
* <br>
* private class MyAnonymousOrEmbeddedSourceProvider implements PagedListSourceProvider {<br>
* public List loadList(Locale locale, Object filter) {<br>
* MyAnonymousOrEmbeddedFilter filter = (MyAnonymousOrEmbeddedFilter) filter;<br<
* // an empty name mask should lead to all objects being loaded
* return myBusinessService.loadMyObjectsByNameMask(filter.getName());<br>
* }<br>
* <br>
* private class MyAnonymousOrEmbeddedFilter {<br>
* private String name = "";<br>
* public String getName() {<br>
* return name;<br<
* }<br>
* public void setName(String name) {<br>
* this.name = name;<br>
* }<br>
* }<br>
* </code>
*
* @author Jean-Pierre Pawlak
* @author Juergen Hoeller
* @since 24.05.2003
* @deprecated as of Spring 2.5, to be removed in Spring 3.0
* @see org.springframework.beans.support.PagedListSourceProvider
* @see org.springframework.beans.propertyeditors.LocaleEditor
*/
public class RefreshablePagedListHolder extends PagedListHolder {
private PagedListSourceProvider sourceProvider;
private Locale locale;
private Locale localeUsed;
private Object filter;
private Object filterUsed;
/**
* Create a new list holder.
* You'll need to set a source provider to be able to use the holder.
* @see #setSourceProvider
*/
public RefreshablePagedListHolder() {
super();
}
/**
* Create a new list holder with the given source provider.
*/
public RefreshablePagedListHolder(PagedListSourceProvider sourceProvider) {
super();
this.sourceProvider = sourceProvider;
}
/**
* Set the callback class for reloading the List when necessary.
* If the list is definitely not modifiable, i.e. not locale aware
* and no filtering, use PagedListHolder.
* @see org.springframework.beans.support.PagedListHolder
*/
public void setSourceProvider(PagedListSourceProvider sourceProvider) {
this.sourceProvider = sourceProvider;
}
/**
* Return the callback class for reloading the List when necessary.
*/
public PagedListSourceProvider getSourceProvider() {
return this.sourceProvider;
}
/**
* Set the Locale that the source provider should use for loading the list.
* This can either be populated programmatically (e.g. with the request locale),
* or via binding (using Locale's toString syntax, e.g. "locale=en_US").
* @param locale the current Locale, or <code>null</code>
*/
public void setLocale(Locale locale) {
this.locale = locale;
}
/**
* Return the Locale that the source provider should use for loading the list.
* @return the current Locale, or <code>null</code>
*/
public Locale getLocale() {
return this.locale;
}
/**
* Set the filter object that the source provider should use for loading the list.
* This will typically be a bean, for easy data binding.
* @param filter the filter object, or <code>null</code>
*/
public void setFilter(Object filter) {
this.filter = filter;
}
/**
* Return the filter that the source provider should use for loading the list.
* @return the current filter, or <code>null</code>
*/
public Object getFilter() {
return this.filter;
}
/**
* Reload the underlying list from the source provider if necessary
* (i.e. if the locale and/or the filter has changed), and resort it.
* @param force whether a reload should be performed in any case
*/
public void refresh(boolean force) {
if (this.sourceProvider != null && (force ||
(this.locale != null && !this.locale.equals(this.localeUsed)) ||
(this.filter != null && !this.filter.equals(this.filterUsed)))) {
setSource(this.sourceProvider.loadList(this.locale, this.filter));
if (this.filter != null && !this.filter.equals(this.filterUsed)) {
this.setPage(0);
}
this.localeUsed = this.locale;
if (this.filter != null) {
this.filterUsed = BeanUtils.instantiateClass(this.filter.getClass());
BeanUtils.copyProperties(this.filter, this.filterUsed);
}
}
resort();
}
}