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

Consistent use of WebFlux terminology over Web Reactive

Browse Source
This commit is contained in:
Juergen Hoeller
2017-05-05 14:21:01 +02:00
parent 429d6ac67d
commit ba501791c9
7 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-context/src/main/java/org/springframework/ui/ConcurrentModel.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2017 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.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.ui;
import java.util.Collection;
@@ -23,12 +24,13 @@ import org.springframework.core.Conventions;
import org.springframework.util.Assert;
/**
* Implementation of {@link Model} based on a {@link ConcurrentHashMap} for use
* in concurrent scenarios. Exposed to handler methods by Spring Web Reactive
* typically via a declaration of the {@link Model} interface. There is typically
* no need to create it within user code. If necessary a controller method can
* return a regular {@code java.util.Map}, or more likely a
* {@code java.util.ConcurrentMap}.
* Implementation of the {@link Model} interface based on a {@link ConcurrentHashMap}
* for use in concurrent scenarios.
*
* <p>Exposed to handler methods by Spring WebFlux, typically via a declaration of the
* {@link Model} interface. There is typically no need to create it within user code.
* If necessary a handler method can return a regular {@code java.util.Map},
* likely a {@code java.util.ConcurrentMap}, for a pre-determined model.
*
* @author Rossen Stoyanchev
* @since 5.0

14
spring-context/src/main/java/org/springframework/validation/support/BindingAwareConcurrentModel.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2017 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.
@@ -22,16 +22,16 @@ import org.springframework.ui.ConcurrentModel;
import org.springframework.validation.BindingResult;
/**
* Sub-class of {@link ConcurrentModel} that automatically removes
* Subclass of {@link ConcurrentModel} that automatically removes
* the {@link BindingResult} object when its corresponding
* target attribute is replaced through regular {@link Map} operations.
*
* <p>This is the class exposed to controller methods by Spring Web Reactive,
* <p>This is the class exposed to handler methods by Spring WebFlux,
* typically consumed through a declaration of the
* {@link org.springframework.ui.Model} interface. There is typically
* no need to create it within user code. If necessary a controller method can
* return a regular {@code java.util.Map}, or more likely a
* {@code java.util.ConcurrentMap}.
* {@link org.springframework.ui.Model} interface as a parameter type.
* There is typically no need to create it within user code.
* If necessary a handler method can return a regular {@code java.util.Map},
* likely a {@code java.util.ConcurrentMap}, for a pre-determined model.
*
* @author Rossen Stoyanchev
* @since 5.0