Fixes #4266 - Cleanup various bits (#4267)

piranhacloud · Nov 24, 2024 · c55d9cd · c55d9cd
1 parent 9c7be5f
commit c55d9cd
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 83 deletions.
diff --git a/core/impl/src/main/java/cloud/piranha/core/impl/DefaultFilterChain.java b/core/impl/src/main/java/cloud/piranha/core/impl/DefaultFilterChain.java
@@ -44,7 +44,6 @@
  *
  * @author Manfred Riem ([email protected])
  */
-@SuppressWarnings({"deprecation"})
 public class DefaultFilterChain implements FilterChain {
 
     /**

diff --git a/core/impl/src/main/java/cloud/piranha/core/impl/DefaultHttpHeaderManager.java b/core/impl/src/main/java/cloud/piranha/core/impl/DefaultHttpHeaderManager.java
@@ -57,6 +57,7 @@ public class DefaultHttpHeaderManager implements HttpHeaderManager {
     /**
      * Constructor.
      */
+    @SuppressWarnings("deprecation")
     public DefaultHttpHeaderManager() {
         headers = new HashMap<>();
         locale = new Locale("en", "US", "ISO-8859-1");

diff --git a/core/impl/src/main/java/cloud/piranha/core/impl/DefaultHttpSession.java b/core/impl/src/main/java/cloud/piranha/core/impl/DefaultHttpSession.java
@@ -40,7 +40,6 @@
  *
  * @author Manfred Riem ([email protected])
  */
-@SuppressWarnings("deprecation")
 public class DefaultHttpSession implements HttpSession {
 
     /**

diff --git a/core/impl/src/main/java/cloud/piranha/core/impl/DefaultHttpSessionManager.java b/core/impl/src/main/java/cloud/piranha/core/impl/DefaultHttpSessionManager.java
@@ -288,7 +288,6 @@ public String encodeURL(HttpServletResponse response, String url) {
     }
 
     @Override
-    @SuppressWarnings({"deprecation", "removal"})
     public String getComment() {
         return comment;
     }
@@ -382,7 +381,6 @@ protected void reapSessions() {
     }
 
     @Override
-    @SuppressWarnings({"deprecation", "removal"})
     public void setComment(String comment) {
         if (webApplication.isInitialized()) {
             throw new IllegalStateException("You cannot call setComment once ServletContext is initialized");

diff --git a/core/impl/src/main/java/cloud/piranha/core/impl/DefaultWebApplicationRequest.java b/core/impl/src/main/java/cloud/piranha/core/impl/DefaultWebApplicationRequest.java
@@ -556,6 +556,7 @@ public int getLocalPort() {
         return localPort;
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public Locale getLocale() {
         Locale result = Locale.getDefault();
@@ -573,6 +574,7 @@ public Locale getLocale() {
         return result;
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public Enumeration<Locale> getLocales() {
         ArrayList<Locale> locales = new ArrayList<>();

diff --git a/core/impl/src/main/java/cloud/piranha/core/impl/DefaultWebApplicationResponse.java b/core/impl/src/main/java/cloud/piranha/core/impl/DefaultWebApplicationResponse.java
@@ -535,6 +535,7 @@ public void sendRedirect(String location) throws IOException {
         sendRedirect(location, SC_FOUND, true);
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public void sendRedirect(String location, int status, boolean resetBuffer) throws IOException {
         verifyNotCommitted("sendRedirect");

diff --git a/core/impl/src/test/java/cloud/piranha/core/impl/DefaultWebApplicationResponseTest.java b/core/impl/src/test/java/cloud/piranha/core/impl/DefaultWebApplicationResponseTest.java
@@ -892,6 +892,7 @@ void testSetCharacterEncoding5() {
     /**
      * Test setCharacterEncoding method.
      */
+    @SuppressWarnings("deprecation")
     @Test
     void testSetCharacterEncoding6() {
         DefaultWebApplication webApplication = new DefaultWebApplication();

diff --git a/core/impl/src/test/java/cloud/piranha/core/impl/HttpSessionTest.java b/core/impl/src/test/java/cloud/piranha/core/impl/HttpSessionTest.java
@@ -1076,7 +1076,6 @@ void testGetSession4() {
         assertNull(session);
     }
 
-    // --------------------- TODO finish alphabetizng -------------------------
     /**
      * Test createListener method to create a HttpSessionListener.
      *

diff --git a/extension/compat-glassfish7x/src/test/java/module-info.java b/extension/compat-glassfish7x/src/test/java/module-info.java
diff --git a/extension/compat-tomcat10x/src/test/java/module-info.java b/extension/compat-tomcat10x/src/test/java/module-info.java
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,6 @@ @@
      *
      * @author Manfred Riem ([email protected])
      */
-    @SuppressWarnings({"deprecation"})
     public class DefaultFilterChain implements FilterChain {
         /**
@@ Expand Down @@