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

Polish Contribution

Browse Source 
Issue gh-2285
This commit is contained in:
Marcus Da Coregio
2023-06-23 11:19:03 -03:00
parent 7360723583
commit 2d43c31e67
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2022 the original author or authors.
* Copyright 2014-2023 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.
@@ -30,7 +30,6 @@ import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -205,7 +204,7 @@ public class SessionRepositoryFilter<S extends Session> extends OncePerRequestFi
private boolean requestedSessionInvalidated;
private boolean hasCommitedInInclude;
private boolean hasCommittedInInclude;
private SessionRepositoryRequestWrapper(HttpServletRequest request, HttpServletResponse response) {
super(request);
@@ -340,7 +339,7 @@ public class SessionRepositoryFilter<S extends Session> extends OncePerRequestFi
@Override
public RequestDispatcher getRequestDispatcher(String path) {
RequestDispatcher requestDispatcher = super.getRequestDispatcher(path);
return new SessionCommittingRequestDispatcher(requestDispatcher, this);
return new SessionCommittingRequestDispatcher(requestDispatcher);
}
private S getRequestedSession() {
@@ -399,11 +398,8 @@ public class SessionRepositoryFilter<S extends Session> extends OncePerRequestFi
private final RequestDispatcher delegate;
private final SessionRepositoryRequestWrapper wrapper;
SessionCommittingRequestDispatcher(RequestDispatcher delegate, SessionRepositoryRequestWrapper wrapper) {
SessionCommittingRequestDispatcher(RequestDispatcher delegate) {
this.delegate = delegate;
this.wrapper = wrapper;
}
@Override
@@ -413,9 +409,9 @@ public class SessionRepositoryFilter<S extends Session> extends OncePerRequestFi
@Override
public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException {
if (!this.wrapper.hasCommitedInInclude) {
if (!SessionRepositoryRequestWrapper.this.hasCommittedInInclude) {
SessionRepositoryRequestWrapper.this.commitSession();
this.wrapper.hasCommitedInInclude = true;
SessionRepositoryRequestWrapper.this.hasCommittedInInclude = true;
}
this.delegate.include(request, response);
}

10
spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2022 the original author or authors.
* Copyright 2014-2023 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.
@@ -1326,11 +1326,11 @@ class SessionRepositoryFilterTests {
this.sessionRepository.save(session);
SessionRepository<MapSession> sessionRepository = spy(this.sessionRepository);
setSessionCookie(session.getId());
given(sessionRepository.findById(session.getId())).willReturn(session);
this.filter = new SessionRepositoryFilter<>(sessionRepository);
doFilter(new DoInFilter() {
@Override
public void doFilter(HttpServletRequest wrappedRequest, HttpServletResponse wrappedResponse)
@@ -1339,8 +1339,8 @@ class SessionRepositoryFilterTests {
wrappedRequest.getRequestDispatcher("/").include(wrappedRequest, wrappedResponse);
assertThat(SessionRepositoryFilterTests.this.sessionRepository.findById(id)).isNotNull();
wrappedRequest.getRequestDispatcher("/").include(wrappedRequest, wrappedResponse);
verify(sessionRepository).findById(session.getId());
verify(sessionRepository).save(session);
verify(sessionRepository, times(1)).findById(session.getId());
verify(sessionRepository, times(1)).save(session);
verifyNoMoreInteractions(sessionRepository);
}
});