This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git
commit e9d0a5518cd0671d9ad0353a2c87246ef0d2061b Author: Lukasz Lenart <lukaszlen...@apache.org> AuthorDate: Tue Mar 15 14:27:57 2022 +0100 Cleans up code --- .../org/apache/struts2/rest/ContentTypeInterceptor.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java index 5571714..1c49d36 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java @@ -34,23 +34,22 @@ import java.io.InputStreamReader; */ public class ContentTypeInterceptor extends AbstractInterceptor { - private static final long serialVersionUID = 1L; - ContentTypeHandlerManager selector; - + private final ContentTypeHandlerManager selector; + @Inject - public void setContentTypeHandlerSelector(ContentTypeHandlerManager sel) { - this.selector = sel; + public ContentTypeInterceptor(ContentTypeHandlerManager selector) { + this.selector = selector; } - + public String intercept(ActionInvocation invocation) throws Exception { HttpServletRequest request = ServletActionContext.getRequest(); ContentTypeHandler handler = selector.getHandlerForRequest(request); - + Object target = invocation.getAction(); if (target instanceof ModelDriven) { - target = ((ModelDriven)target).getModel(); + target = ((ModelDriven<?>)target).getModel(); } - + if (request.getContentLength() > 0) { InputStream is = request.getInputStream(); InputStreamReader reader = new InputStreamReader(is);