From e9d0a5518cd0671d9ad0353a2c87246ef0d2061b Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Tue, 15 Mar 2022 14:27:57 +0100
Subject: [PATCH] Cleans up code

---
 .../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 55717145a..1c49d36f8 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);