[commons-fileupload] 02/03: Complete refactoring in JakartaServletRequestContext

[ggregory]

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

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git

commit 196f2903d9a00c22edfbc76239492358309e708b
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Sep 15 16:36:15 2023 -0400

    Complete refactoring in JakartaServletRequestContext
---
 .../jakarta/servlet5/JakartaServletRequestContext.java       | 12 +++---------
 .../jakarta/servlet6/JakartaServletRequestContext.java       | 12 +++---------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git 
a/commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletRequestContext.java
 
b/commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletRequestContext.java
index 2a1de159..5b93c906 100644
--- 
a/commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletRequestContext.java
+++ 
b/commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletRequestContext.java
@@ -28,11 +28,6 @@ import jakarta.servlet.http.HttpServletRequest;
  */
 public class JakartaServletRequestContext extends 
AbstractRequestContext<HttpServletRequest> {
 
-    /**
-     * The request for which the context is being provided.
-     */
-    private final HttpServletRequest request;
-
     /**
      * Constructs a context for this request.
      *
@@ -40,7 +35,6 @@ public class JakartaServletRequestContext extends 
AbstractRequestContext<HttpSer
      */
     public JakartaServletRequestContext(final HttpServletRequest request) {
         super(request::getHeader, request::getContentLength, request);
-        this.request = request;
     }
 
     /**
@@ -50,7 +44,7 @@ public class JakartaServletRequestContext extends 
AbstractRequestContext<HttpSer
      */
     @Override
     public String getCharacterEncoding() {
-        return request.getCharacterEncoding();
+        return getRequest().getCharacterEncoding();
     }
 
     /**
@@ -60,7 +54,7 @@ public class JakartaServletRequestContext extends 
AbstractRequestContext<HttpSer
      */
     @Override
     public String getContentType() {
-        return request.getContentType();
+        return getRequest().getContentType();
     }
 
     /**
@@ -71,7 +65,7 @@ public class JakartaServletRequestContext extends 
AbstractRequestContext<HttpSer
      */
     @Override
     public InputStream getInputStream() throws IOException {
-        return request.getInputStream();
+        return getRequest().getInputStream();
     }
 
 }
diff --git 
a/commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletRequestContext.java
 
b/commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletRequestContext.java
index f764fd1e..2763700a 100644
--- 
a/commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletRequestContext.java
+++ 
b/commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletRequestContext.java
@@ -28,11 +28,6 @@ import jakarta.servlet.http.HttpServletRequest;
  */
 public class JakartaServletRequestContext extends 
AbstractRequestContext<HttpServletRequest> {
 
-    /**
-     * The request for which the context is being provided.
-     */
-    private final HttpServletRequest request;
-
     /**
      * Constructs a context for this request.
      *
@@ -40,7 +35,6 @@ public class JakartaServletRequestContext extends 
AbstractRequestContext<HttpSer
      */
     public JakartaServletRequestContext(final HttpServletRequest request) {
         super(request::getHeader, request::getContentLength, request);
-        this.request = request;
     }
 
     /**
@@ -50,7 +44,7 @@ public class JakartaServletRequestContext extends 
AbstractRequestContext<HttpSer
      */
     @Override
     public String getCharacterEncoding() {
-        return request.getCharacterEncoding();
+        return getRequest().getCharacterEncoding();
     }
 
     /**
@@ -60,7 +54,7 @@ public class JakartaServletRequestContext extends 
AbstractRequestContext<HttpSer
      */
     @Override
     public String getContentType() {
-        return request.getContentType();
+        return getRequest().getContentType();
     }
 
     /**
@@ -71,7 +65,7 @@ public class JakartaServletRequestContext extends 
AbstractRequestContext<HttpSer
      */
     @Override
     public InputStream getInputStream() throws IOException {
-        return request.getInputStream();
+        return getRequest().getInputStream();
     }
 
 }