Skip to content

Commit ef8f667

Browse files
Jay Bryanteleftherias
authored andcommitted
Wording changes
Replacing some terms
1 parent 4599e75 commit ef8f667

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

spring-session-docs/src/docs/asciidoc/guides/boot-findbyusername.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Consider the following scenario:
2828

2929
* User goes to library and authenticates to the application.
3030
* User goes home and realizes they forgot to log out.
31-
* User can log in and terminate the session from the library using clues like the location, created time, last accessed time, and so on.
31+
* User can log in and end the session from the library using clues like the location, created time, last accessed time, and so on.
3232

3333
Would it not be nice if we could let the user invalidate the session at the library from any device with which they authenticate?
3434
This sample demonstrates how this is possible.
@@ -145,5 +145,5 @@ You can emulate the flow we discussed in the <<About the Sample>> section by doi
145145
* Enter the following to log in:
146146
** *Username* _user_
147147
** *Password* _password_
148-
* Terminate your original session.
148+
* End your original session.
149149
* Refresh the original window and see that you are logged out.

spring-session-docs/src/docs/asciidoc/guides/boot-websocket.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ What does `AbstractSessionWebSocketMessageBrokerConfigurer` do behind the scenes
5959

6060
* `WebSocketConnectHandlerDecoratorFactory` is added as a `WebSocketHandlerDecoratorFactory` to `WebSocketTransportRegistration`.
6161
This ensures a custom `SessionConnectEvent` is fired that contains the `WebSocketSession`.
62-
The `WebSocketSession` is necessary to terminate any WebSocket connections that are still open when a Spring Session is terminated.
62+
The `WebSocketSession` is necessary to end any WebSocket connections that are still open when a Spring Session is ended.
6363
* `SessionRepositoryMessageInterceptor` is added as a `HandshakeInterceptor` to every `StompWebSocketEndpointRegistration`.
6464
This ensures that the `Session` is added to the WebSocket properties to enable updating the last accessed time.
6565
* `SessionRepositoryMessageInterceptor` is added as a `ChannelInterceptor` to our inbound `ChannelRegistration`.
6666
This ensures that every time an inbound message is received, that the last accessed time of our Spring Session is updated.
6767
* `WebSocketRegistryListener` is created as a Spring bean.
6868
This ensures that we have a mapping of all of the `Session` IDs to the corresponding WebSocket connections.
69-
By maintaining this mapping, we can close all the WebSocket connections when a Spring Session (HttpSession) is terminated.
69+
By maintaining this mapping, we can close all the WebSocket connections when a Spring Session (HttpSession) is ended.
7070

7171

7272
// end::config[]
@@ -131,7 +131,7 @@ You can see that the message is no longer sent.
131131
====
132132
Spring Session expires in 60 seconds, but the notification from Redis is not guaranteed to happen within 60 seconds.
133133
To ensure the socket is closed in a reasonable amount of time, Spring Session runs a background task every minute at 00 seconds that forcibly cleans up any expired sessions.
134-
This means you need to wait at most two minutes before the WebSocket connection is terminated.
134+
This means you need to wait at most two minutes before the WebSocket connection is closed.
135135
====
136136

137137
You can now try accessing http://localhost:8080/

spring-session-docs/src/docs/asciidoc/index.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,8 +1177,8 @@ include::{session-jdbc-main-resources-dir}org/springframework/session/jdbc/schem
11771177

11781178
==== Transaction Management
11791179

1180-
All JDBC operations in `JdbcIndexedSessionRepository` are executed in a transactional manner.
1181-
Transactions are executed with propagation set to `REQUIRES_NEW` in order to avoid unexpected behavior due to interference with existing transactions (for example, running a `save` operation in a thread that already participates in a read-only transaction).
1180+
All JDBC operations in `JdbcIndexedSessionRepository` are performed in a transactional manner.
1181+
Transactions are performed with propagation set to `REQUIRES_NEW` in order to avoid unexpected behavior due to interference with existing transactions (for example, running a `save` operation in a thread that already participates in a read-only transaction).
11821182

11831183
[[api-hazelcastindexedsessionrepository]]
11841184
=== Using `HazelcastIndexedSessionRepository`

0 commit comments

Comments
 (0)