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

Polishing

This commit is contained in:
Juergen Hoeller 2014-11-06 14:29:43 +01:00
parent e02c23eea4
commit 6a96850aa7
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spring-context/src/main/java/org/springframework/context/ApplicationContext.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2014 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.
@ -90,18 +90,22 @@ public interface ApplicationContext extends EnvironmentCapable, ListableBeanFact
/** /**
* Expose AutowireCapableBeanFactory functionality for this context. * Expose AutowireCapableBeanFactory functionality for this context.
* <p>This is not typically used by application code, except for the purpose * <p>This is not typically used by application code, except for the purpose of
* of initializing bean instances that live outside the application context, * initializing bean instances that live outside of the application context,
* applying the Spring bean lifecycle (fully or partly) to them. * applying the Spring bean lifecycle (fully or partly) to them.
* <p>Alternatively, the internal BeanFactory exposed by the * <p>Alternatively, the internal BeanFactory exposed by the
* {@link ConfigurableApplicationContext} interface offers access to the * {@link ConfigurableApplicationContext} interface offers access to the
* AutowireCapableBeanFactory interface too. The present method mainly * {@link AutowireCapableBeanFactory} interface too. The present method mainly
* serves as convenient, specific facility on the ApplicationContext * serves as a convenient, specific facility on the ApplicationContext interface.
* interface itself. * <p><b>NOTE: As of 4.2, this method will consistently throw IllegalStateException
* after the application context has been closed.</b> In current Spring Framework
* versions, only refreshable application contexts behave that way; as of 4.2,
* all application context implementations will be required to comply.
* @return the AutowireCapableBeanFactory for this context * @return the AutowireCapableBeanFactory for this context
* @throws IllegalStateException if the context does not support * @throws IllegalStateException if the context does not support the
* the AutowireCapableBeanFactory interface or does not hold an autowire-capable * {@link AutowireCapableBeanFactory} interface, or does not hold an
* bean factory yet (usually if {@code refresh()} has never been called) * autowire-capable bean factory yet (e.g. if {@code refresh()} has
* never been called), or if the context has been closed already
* @see ConfigurableApplicationContext#refresh() * @see ConfigurableApplicationContext#refresh()
* @see ConfigurableApplicationContext#getBeanFactory() * @see ConfigurableApplicationContext#getBeanFactory()
*/ */

2
spring-context/src/main/java/org/springframework/context/annotation/ConditionEvaluator.java
View File

@ -91,7 +91,7 @@ class ConditionEvaluator {
} }
} }
Collections.sort(conditions, AnnotationAwareOrderComparator.INSTANCE); AnnotationAwareOrderComparator.sort(conditions);
for (Condition condition : conditions) { for (Condition condition : conditions) {
ConfigurationPhase requiredPhase = null; ConfigurationPhase requiredPhase = null;

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java
View File

@ -55,11 +55,11 @@ import org.springframework.web.util.WebUtils;
*/ */
public abstract class RequestMappingInfoHandlerMapping extends AbstractHandlerMethodMapping<RequestMappingInfo> { public abstract class RequestMappingInfoHandlerMapping extends AbstractHandlerMethodMapping<RequestMappingInfo> {
protected RequestMappingInfoHandlerMapping() { protected RequestMappingInfoHandlerMapping() {
setHandlerMethodMappingNamingStrategy(new RequestMappingInfoHandlerMethodMappingNamingStrategy()); setHandlerMethodMappingNamingStrategy(new RequestMappingInfoHandlerMethodMappingNamingStrategy());
} }
/** /**
* Get the URL path patterns associated with this {@link RequestMappingInfo}. * Get the URL path patterns associated with this {@link RequestMappingInfo}.
*/ */

7
src/asciidoc/index.adoc
View File

@ -47660,12 +47660,11 @@ element.
rejection-policy="CALLER_RUNS"/> rejection-policy="CALLER_RUNS"/>
---- ----
Finally, the `keep-alive` setting determines the time limit (in seconds) for which threads Finally, the `keep-alive` setting determines the time limit (in seconds) for which threads
may remain idle before being terminated. If there are more than the core number of threads may remain idle before being terminated. If there are more than the core number of threads
currently in the pool, after waiting this amount of time without processing a task, excess currently in the pool, after waiting this amount of time without processing a task, excess
threads will be terminated. A time value of zero will cause excess threads to terminate threads will get terminated. A time value of zero will cause excess threads to terminate
immediately after executing tasks. immediately after executing a task without remaining follow-up work in the task queue.
[source,xml,indent=0] [source,xml,indent=0]
[subs="verbatim,quotes"] [subs="verbatim,quotes"]
@ -47676,6 +47675,8 @@ immediately after executing tasks.
keep-alive="120"/> keep-alive="120"/>
---- ----
[[scheduling-task-namespace-scheduled-tasks]] [[scheduling-task-namespace-scheduled-tasks]]
==== The 'scheduled-tasks' element ==== The 'scheduled-tasks' element
The most powerful feature of Spring's task namespace is the support for configuring The most powerful feature of Spring's task namespace is the support for configuring