Skip to content

S
spring-framework

爱吃血肠 / spring-framework

通知 1
Star 0
Fork 0
S
spring-framework

体验新版 GitCode，发现更多精彩内容 >>

提交 132bb8a6 编写于 作者: J Juergen Hoeller
浏览文件
操作

polishing

上级 126f8395
隐藏空白更改
内联 并排
Showing with 217 addition and 222 deletion
org.springframework.core/core.iml
浏览文件 @ 132bb8a6
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4"> <module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" /> <excludeFolder url="file://$MODULE_DIR$/target" />
</content> </content>
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="library" name="AspectJ" level="project" /> <orderEntry type="library" name="AspectJ" level="project" />
<orderEntry type="library" name="Commons Logging" level="project" /> <orderEntry type="library" name="Commons Logging" level="project" />
<orderEntry type="library" name="EasyMock" level="project" /> <orderEntry type="library" name="EasyMock" level="project" />
<orderEntry type="library" name="JUnit" level="project" /> <orderEntry type="library" name="JUnit" level="project" />
<orderEntry type="library" name="Log4j" level="project" /> <orderEntry type="library" name="Log4j" level="project" />
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../org.springframework.asm/target/artifacts/org.springframework.asm.jar!/" /> <root url="jar://$MODULE_DIR$/../org.springframework.asm/target/artifacts/org.springframework.asm.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$IVY_CACHE$/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-1.2.0.jar!/" /> <root url="jar://$IVY_CACHE$/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-1.2.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$IVY_CACHE$/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-sources-1.2.0.jar!/" /> <root url="jar://$IVY_CACHE$/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-sources-1.2.0.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$IVY_CACHE$/org.codehaus.woodstox/com.springsource.com.ctc.wstx/3.2.7/com.springsource.com.ctc.wstx-3.2.7.jar!/" /> <root url="jar://$IVY_CACHE$/org.codehaus.woodstox/com.springsource.com.ctc.wstx/3.2.7/com.springsource.com.ctc.wstx-3.2.7.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$IVY_CACHE$/org.jboss.vfs/com.springsource.org.jboss.virtual/2.1.0.GA/com.springsource.org.jboss.virtual-2.1.0.GA.jar!/" /> <root url="jar://$IVY_CACHE$/org.jboss.vfs/com.springsource.org.jboss.virtual/2.1.0.GA/com.springsource.org.jboss.virtual-2.1.0.GA.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
</component> </component>
<component name="copyright"> <component name="copyright">
<Base> <Base>
<setting name="state" value="1" /> <setting name="state" value="1" />
</Base> </Base>
<LanguageOptions name="HTML"> <LanguageOptions name="HTML">
<option name="templateOptions"> <option name="templateOptions">
<value> <value>
<option name="block" value="true" /> <option name="block" value="true" />
<option name="separateBefore" value="false" /> <option name="separateBefore" value="false" />
<option name="separateAfter" value="false" /> <option name="separateAfter" value="false" />
<option name="prefixLines" value="true" /> <option name="prefixLines" value="true" />
<option name="lenBefore" value="80" /> <option name="lenBefore" value="80" />
<option name="lenAfter" value="80" /> <option name="lenAfter" value="80" />
<option name="box" value="false" /> <option name="box" value="false" />
<option name="filler" value=" " /> <option name="filler" value=" " />
</value> </value>
</option> </option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" /> <option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="2" /> <option name="fileTypeOverride" value="2" />
<option name="relativeBefore" value="true" /> <option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" /> <option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" /> <option name="fileLocation" value="1" />
<option name="useAlternate" value="false" /> <option name="useAlternate" value="false" />
</LanguageOptions> </LanguageOptions>
<LanguageOptions name="JAVA"> <LanguageOptions name="JAVA">
<option name="templateOptions"> <option name="templateOptions">
<value> <value>
<option name="block" value="true" /> <option name="block" value="true" />
<option name="separateBefore" value="false" /> <option name="separateBefore" value="false" />
<option name="separateAfter" value="false" /> <option name="separateAfter" value="false" />
<option name="prefixLines" value="true" /> <option name="prefixLines" value="true" />
<option name="lenBefore" value="80" /> <option name="lenBefore" value="80" />
<option name="lenAfter" value="80" /> <option name="lenAfter" value="80" />
<option name="box" value="false" /> <option name="box" value="false" />
<option name="filler" value=" " /> <option name="filler" value=" " />
</value> </value>
</option> </option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" /> <option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="2" /> <option name="fileTypeOverride" value="2" />
<option name="relativeBefore" value="true" /> <option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" /> <option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" /> <option name="fileLocation" value="1" />
<option name="useAlternate" value="false" /> <option name="useAlternate" value="false" />
</LanguageOptions> </LanguageOptions>
<LanguageOptions name="JSP"> <LanguageOptions name="JSP">
<option name="templateOptions"> <option name="templateOptions">
<value> <value>
<option name="block" value="true" /> <option name="block" value="true" />
<option name="separateBefore" value="false" /> <option name="separateBefore" value="false" />
<option name="separateAfter" value="false" /> <option name="separateAfter" value="false" />
<option name="prefixLines" value="true" /> <option name="prefixLines" value="true" />
<option name="lenBefore" value="80" /> <option name="lenBefore" value="80" />
<option name="lenAfter" value="80" /> <option name="lenAfter" value="80" />
<option name="box" value="false" /> <option name="box" value="false" />
<option name="filler" value=" " /> <option name="filler" value=" " />
</value> </value>
</option> </option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" /> <option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="2" /> <option name="fileTypeOverride" value="2" />
<option name="relativeBefore" value="true" /> <option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" /> <option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" /> <option name="fileLocation" value="1" />
<option name="useAlternate" value="false" /> <option name="useAlternate" value="false" />
</LanguageOptions> </LanguageOptions>
<LanguageOptions name="JavaScript"> <LanguageOptions name="JavaScript">
<option name="templateOptions"> <option name="templateOptions">
<value> <value>
<option name="block" value="true" /> <option name="block" value="true" />
<option name="separateBefore" value="false" /> <option name="separateBefore" value="false" />
<option name="separateAfter" value="false" /> <option name="separateAfter" value="false" />
<option name="prefixLines" value="true" /> <option name="prefixLines" value="true" />
<option name="lenBefore" value="80" /> <option name="lenBefore" value="80" />
<option name="lenAfter" value="80" /> <option name="lenAfter" value="80" />
<option name="box" value="false" /> <option name="box" value="false" />
<option name="filler" value=" " /> <option name="filler" value=" " />
</value> </value>
</option> </option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" /> <option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="2" /> <option name="fileTypeOverride" value="2" />
<option name="relativeBefore" value="true" /> <option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" /> <option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" /> <option name="fileLocation" value="1" />
<option name="useAlternate" value="false" /> <option name="useAlternate" value="false" />
</LanguageOptions> </LanguageOptions>
<LanguageOptions name="Properties"> <LanguageOptions name="Properties">
<option name="templateOptions"> <option name="templateOptions">
<value> <value>
<option name="block" value="true" /> <option name="block" value="true" />
<option name="separateBefore" value="false" /> <option name="separateBefore" value="false" />
<option name="separateAfter" value="false" /> <option name="separateAfter" value="false" />
<option name="prefixLines" value="true" /> <option name="prefixLines" value="true" />
<option name="lenBefore" value="80" /> <option name="lenBefore" value="80" />
<option name="lenAfter" value="80" /> <option name="lenAfter" value="80" />
<option name="box" value="false" /> <option name="box" value="false" />
<option name="filler" value=" " /> <option name="filler" value=" " />
</value> </value>
</option> </option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" /> <option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="2" /> <option name="fileTypeOverride" value="2" />
<option name="relativeBefore" value="true" /> <option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" /> <option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" /> <option name="fileLocation" value="1" />
<option name="useAlternate" value="false" /> <option name="useAlternate" value="false" />
</LanguageOptions> </LanguageOptions>
<LanguageOptions name="XML"> <LanguageOptions name="XML">
<option name="templateOptions"> <option name="templateOptions">
<value> <value>
<option name="block" value="true" /> <option name="block" value="true" />
<option name="separateBefore" value="false" /> <option name="separateBefore" value="false" />
<option name="separateAfter" value="false" /> <option name="separateAfter" value="false" />
<option name="prefixLines" value="true" /> <option name="prefixLines" value="true" />
<option name="lenBefore" value="80" /> <option name="lenBefore" value="80" />
<option name="lenAfter" value="80" /> <option name="lenAfter" value="80" />
<option name="box" value="false" /> <option name="box" value="false" />
<option name="filler" value=" " /> <option name="filler" value=" " />
</value> </value>
</option> </option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" /> <option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="2" /> <option name="fileTypeOverride" value="2" />
<option name="relativeBefore" value="true" /> <option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" /> <option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" /> <option name="fileLocation" value="1" />
<option name="useAlternate" value="false" /> <option name="useAlternate" value="false" />
</LanguageOptions> </LanguageOptions>
<LanguageOptions name="__TEMPLATE__"> <LanguageOptions name="__TEMPLATE__">
<option name="templateOptions"> <option name="templateOptions">
<value> <value>
<option name="block" value="true" /> <option name="block" value="true" />
<option name="separateBefore" value="false" /> <option name="separateBefore" value="false" />
<option name="separateAfter" value="false" /> <option name="separateAfter" value="false" />
<option name="prefixLines" value="true" /> <option name="prefixLines" value="true" />
<option name="lenBefore" value="80" /> <option name="lenBefore" value="80" />
<option name="lenAfter" value="80" /> <option name="lenAfter" value="80" />
<option name="box" value="false" /> <option name="box" value="false" />
<option name="filler" value=" " /> <option name="filler" value=" " />
</value> </value>
</option> </option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" /> <option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="4" /> <option name="fileTypeOverride" value="4" />
<option name="relativeBefore" value="true" /> <option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" /> <option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" /> <option name="fileLocation" value="1" />
<option name="useAlternate" value="false" /> <option name="useAlternate" value="false" />
</LanguageOptions> </LanguageOptions>
</component> </component>
</module> </module>
org.springframework.core/src/main/java/org/springframework/core/convert/converter/ConverterRegistry.java
浏览文件 @ 132bb8a6
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.core.convert.converter; package org.springframework.core.convert.converter;
/** /**
...@@ -35,9 +36,6 @@ public interface ConverterRegistry { ...@@ -35,9 +36,6 @@ public interface ConverterRegistry {
/** /**
* Add a generic converter to this registry. * Add a generic converter to this registry.
* @param sourceType the source type to convert from
* @param targetType the target type to convert to
* @param converter the generic converter
*/ */
void addGenericConverter(GenericConverter converter); void addGenericConverter(GenericConverter converter);
......
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
浏览文件 @ 132bb8a6
/* /*
* Copyright 2002-2008 the original author or authors. * Copyright 2002-2009 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.
...@@ -19,20 +19,15 @@ package org.springframework.web.servlet.handler; ...@@ -19,20 +19,15 @@ package org.springframework.web.servlet.handler;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactoryUtils;
import org.springframework.core.OrderComparator;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.web.context.request.WebRequestInterceptor; import org.springframework.web.context.request.WebRequestInterceptor;
import org.springframework.web.context.support.WebApplicationObjectSupport; import org.springframework.web.context.support.WebApplicationObjectSupport;
import org.springframework.web.servlet.HandlerExecutionChain; import org.springframework.web.servlet.HandlerExecutionChain;
import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.HandlerMapping;
import org.springframework.web.servlet.ViewResolver;
/** /**
* Abstract base class for {@link org.springframework.web.servlet.HandlerMapping} * Abstract base class for {@link org.springframework.web.servlet.HandlerMapping}
...@@ -50,7 +45,7 @@ import org.springframework.web.servlet.ViewResolver; ...@@ -50,7 +45,7 @@ import org.springframework.web.servlet.ViewResolver;
* @see org.springframework.web.servlet.HandlerInterceptor * @see org.springframework.web.servlet.HandlerInterceptor
*/ */
public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
implements HandlerMapping, Ordered { implements HandlerMapping, Ordered {
private int order = Integer.MAX_VALUE; // default: same as non-Ordered private int order = Integer.MAX_VALUE; // default: same as non-Ordered
...@@ -60,6 +55,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport ...@@ -60,6 +55,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
private HandlerInterceptor[] adaptedInterceptors; private HandlerInterceptor[] adaptedInterceptors;
/** /**
* Specify the order value for this HandlerMapping bean. * Specify the order value for this HandlerMapping bean.
* <p>Default value is <code>Integer.MAX_VALUE</code>, meaning that it's non-ordered. * <p>Default value is <code>Integer.MAX_VALUE</code>, meaning that it's non-ordered.
...@@ -102,6 +98,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport ...@@ -102,6 +98,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
this.interceptors.addAll(Arrays.asList(interceptors)); this.interceptors.addAll(Arrays.asList(interceptors));
} }
/** /**
* Initializes the interceptors. * Initializes the interceptors.
* @see #extendInterceptors(java.util.List) * @see #extendInterceptors(java.util.List)
...@@ -123,7 +120,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport ...@@ -123,7 +120,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
* allowing to add further interceptors before as well as after the existing * allowing to add further interceptors before as well as after the existing
* interceptors * interceptors
*/ */
protected void extendInterceptors(List interceptors) { protected void extendInterceptors(List<Object> interceptors) {
} }
/** /**
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或