[struts] branch master updated (ea9ff33a8 -> d204f9b17)

[lu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git


    from ea9ff33a8 Merge pull request #665 from atlassian/WW-5266-max-filesize
     new 6ba4432fb WW-5196 use generics for RequestMap and ApplicationMap
     new f1c3c8f81 WW-5196 rework SessionMap to also be defined with String keys and Object values
     new f49d6981b Merge branch 'master' of https://github.com/apache/struts into issue/WW-5196
     new af4cdac3d fix SessionMapTest
     new 61017aff6 fix compile issue with SessionMap changes
     new 85a535fc8 fix more compile issues
     new a38df608f fix another compilation issue after changes to sessionMap
     new 6e6448673 remove unneeded toString call on String enumeration element
     new 65bc8aba4 small changes after review -) make StringObjectEntry constructor have default access (sonar java:S5993) -) change tabs to spaces for ApplicationMap.put -) add @Override annotations where applicable -) add test for StringObjectEntry -) fix compilation of other tests after changes to SessionMap
     new 63d728460 Merge branch 'master' of https://github.com/apache/struts into issue/WW-5196
     new a45914b4b fix compilation failures after merging master
     new 3520d346a fix nonce test
     new 126c0a9d0 add missing license headers
     new d204f9b17 Merge pull request #585 from sdutry/issue/WW-5196

The 6546 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/struts2/dispatcher/ApplicationMap.java  | 98 ++++++++--------------
 .../org/apache/struts2/dispatcher/RequestMap.java  | 57 +++++--------
 .../org/apache/struts2/dispatcher/SessionMap.java  | 70 ++++++----------
 .../struts2/dispatcher/StringObjectEntry.java      | 64 ++++++++++++++
 .../interceptor/CreateSessionInterceptor.java      |  2 +-
 .../struts2/interceptor/ScopeInterceptor.java      |  2 +-
 .../org/apache/struts2/views/jsp/TagUtils.java     |  2 +-
 .../apache/struts2/dispatcher/SessionMapTest.java  | 38 ++++++---
 .../struts2/dispatcher/StringObjectEntryTest.java  | 61 ++++++++++++++
 .../struts2/interceptor/CspInterceptorTest.java    |  2 +-
 .../freemarker/FreemarkerResultMockedTest.java     |  5 +-
 .../apache/struts2/views/jsp/AbstractTagTest.java  |  2 +-
 .../org/apache/struts2/views/jsp/URLTagTest.java   |  2 +-
 .../apache/struts2/validators/DWRValidator.java    |  2 +-
 14 files changed, 242 insertions(+), 165 deletions(-)
 create mode 100644 core/src/main/java/org/apache/struts2/dispatcher/StringObjectEntry.java
 create mode 100644 core/src/test/java/org/apache/struts2/dispatcher/StringObjectEntryTest.java