This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git
commit 89bcbecc70f046f3f7c86c4bf996d93f595b7ff1 Merge: 67ee1b2d6 243244997 Author: Kusal Kithul-Godage <g...@kusal.io> AuthorDate: Fri Oct 25 12:13:09 2024 +1100 Merge pull request #1085 from apache/kusal-depr-apis-7 WW-3714 Deprecate and repackage common APIs part 6 .../xwork2/interceptor/AliasInterceptor.java | 3 ++ .../xwork2/interceptor/ChainingInterceptor.java | 3 ++ .../interceptor/ConversionErrorInterceptor.java | 7 ++- .../interceptor/DefaultWorkflowInterceptor.java | 5 ++- .../interceptor/ExceptionMappingInterceptor.java | 5 ++- .../xwork2/interceptor/LoggingInterceptor.java | 3 ++ .../xwork2/interceptor/ModelDrivenInterceptor.java | 5 ++- .../interceptor/ParameterRemoverInterceptor.java | 3 ++ .../interceptor/PrefixMethodInvocationUtil.java | 51 ++++++++++++---------- .../xwork2/interceptor/PrepareInterceptor.java | 3 ++ .../interceptor/ScopedModelDrivenInterceptor.java | 25 ++++++----- .../interceptor/StaticParametersInterceptor.java | 3 ++ .../struts2}/interceptor/AliasInterceptor.java | 12 ++--- .../struts2}/interceptor/ChainingInterceptor.java | 12 ++--- .../interceptor/ConversionErrorInterceptor.java | 15 +++---- .../interceptor/DefaultWorkflowInterceptor.java | 15 +++---- .../interceptor/ExceptionMappingInterceptor.java | 9 ++-- .../struts2}/interceptor/LoggingInterceptor.java | 4 +- .../interceptor/ModelDrivenInterceptor.java | 9 ++-- .../interceptor/ParameterRemoverInterceptor.java | 8 ++-- .../struts2}/interceptor/PrepareInterceptor.java | 9 ++-- .../interceptor/ScopedModelDrivenInterceptor.java | 33 +++++++------- .../interceptor/StaticParametersInterceptor.java | 14 +++--- .../apache/struts2/result/StrutsResultSupport.java | 25 ++++++++--- 24 files changed, 163 insertions(+), 118 deletions(-)