Skip to content

Commit 7202793

Browse files
committed
Polishing
(cherry picked from commit bc13cb2)
1 parent 045016e commit 7202793

7 files changed

+15
-16
lines changed

spring-web/src/main/java/org/springframework/web/context/request/async/CallableInterceptorChain.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2014 the original author or authors.
2+
* Copyright 2002-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package org.springframework.web.context.request.async;
1718

1819
import java.util.List;

spring-web/src/main/java/org/springframework/web/context/request/async/CallableProcessingInterceptor.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package org.springframework.web.context.request.async;
1718

1819
import java.util.concurrent.Callable;
@@ -51,16 +52,12 @@ public interface CallableProcessingInterceptor {
5152
/**
5253
* Invoked <em>before</em> the start of concurrent handling in the original
5354
* thread in which the {@code Callable} is submitted for concurrent handling.
54-
*
55-
* <p>
56-
* This is useful for capturing the state of the current thread just prior to
55+
* <p>This is useful for capturing the state of the current thread just prior to
5756
* invoking the {@link Callable}. Once the state is captured, it can then be
5857
* transferred to the new {@link Thread} in
5958
* {@link #preProcess(NativeWebRequest, Callable)}. Capturing the state of
6059
* Spring Security's SecurityContextHolder and migrating it to the new Thread
6160
* is a concrete example of where this is useful.
62-
* </p>
63-
*
6461
* @param request the current request
6562
* @param task the task for the current async request
6663
* @throws Exception in case of errors
@@ -71,7 +68,6 @@ public interface CallableProcessingInterceptor {
7168
* Invoked <em>after</em> the start of concurrent handling in the async
7269
* thread in which the {@code Callable} is executed and <em>before</em> the
7370
* actual invocation of the {@code Callable}.
74-
*
7571
* @param request the current request
7672
* @param task the task for the current async request
7773
* @throws Exception in case of errors
@@ -83,7 +79,6 @@ public interface CallableProcessingInterceptor {
8379
* async thread in which the {@code Callable} is executed. This method may
8480
* be invoked later than {@code afterTimeout} or {@code afterCompletion}
8581
* depending on when the {@code Callable} finishes processing.
86-
*
8782
* @param request the current request
8883
* @param task the task for the current async request
8984
* @param concurrentResult the result of concurrent processing, which could
@@ -97,7 +92,6 @@ public interface CallableProcessingInterceptor {
9792
* the {@code Callable} task completes. Implementations may return a value,
9893
* including an {@link Exception}, to use instead of the value the
9994
* {@link Callable} did not return in time.
100-
*
10195
* @param request the current request
10296
* @param task the task for the current async request
10397
* @return a concurrent result value; if the value is anything other than
@@ -110,7 +104,6 @@ public interface CallableProcessingInterceptor {
110104
/**
111105
* Invoked from a container thread when async processing completes for any
112106
* reason including timeout or network error.
113-
*
114107
* @param request the current request
115108
* @param task the task for the current async request
116109
* @throws Exception in case of errors

spring-web/src/main/java/org/springframework/web/context/request/async/CallableProcessingInterceptorAdapter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package org.springframework.web.context.request.async;
1718

1819
import java.util.concurrent.Callable;

spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultInterceptorChain.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2014 the original author or authors.
2+
* Copyright 2002-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package org.springframework.web.context.request.async;
1718

1819
import java.util.List;

spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultProcessingInterceptorAdapter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package org.springframework.web.context.request.async;
1718

1819
import org.springframework.web.context.request.NativeWebRequest;

spring-web/src/main/java/org/springframework/web/context/request/async/TimeoutCallableProcessingInterceptor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2014 the original author or authors.
2+
* Copyright 2002-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package org.springframework.web.context.request.async;
1718

1819
import java.util.concurrent.Callable;

spring-web/src/main/java/org/springframework/web/context/request/async/TimeoutDeferredResultProcessingInterceptor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2014 the original author or authors.
2+
* Copyright 2002-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package org.springframework.web.context.request.async;
1718

1819
import javax.servlet.http.HttpServletResponse;

0 commit comments

Comments
 (0)