commit e42888d3fbebd85d29ac0857c049add57f900042
author Arjan Tijms <arjan.tijms@gmail.com> Thu Apr 07 15:40:33 2022 +0200
committer Arjan Tijms <arjan.tijms@gmail.com> Thu Apr 07 15:40:33 2022 +0200
tree 3f3661cfdf4a87866beb0d10817645b73ac9a994
parent 7345224a01eea4d0732454cfd5fff2a3cb300ee9

Remove restriction from some methods according to Servlet 6 rules

Signed-off-by: Arjan Tijms <arjan.tijms@gmail.com>

appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationContext.java

diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationContext.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationContext.java
index 4eb84a1..14e20c4 100644
--- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationContext.java
+++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationContext.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation.
  * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
@@ -93,16 +94,6 @@
     }
 
 
-    // ----------------------------------------------------- Class Variables
-
-    // START PWC 1.2
-    /*
-    private static final SecurityPermission GET_UNWRAPPED_CONTEXT_PERMISSION =
-        new SecurityPermission("getUnwrappedContext");
-    */
-    // END PWC 1.2
-
-
     // ----------------------------------------------------- Instance Variables
 
     /**
@@ -243,7 +234,7 @@
      */
     @Override
     public Enumeration<String> getInitParameterNames() {
-        return (new Enumerator<String>(parameters.keySet()));
+        return new Enumerator<String>(parameters.keySet());
     }
 
     /**
@@ -267,7 +258,7 @@
      */
     @Override
     public int getMajorVersion() {
-        return (Constants.MAJOR_VERSION);
+        return Constants.MAJOR_VERSION;
     }
 
     /**
@@ -275,7 +266,7 @@
      */
     @Override
     public int getMinorVersion() {
-        return (Constants.MINOR_VERSION);
+        return Constants.MINOR_VERSION;
     }
 
     /**
@@ -284,10 +275,6 @@
      */
     @Override
     public int getEffectiveMajorVersion() {
-        if (isRestricted) {
-            throw new UnsupportedOperationException(
-                    rb.getString(LogFacade.UNSUPPORTED_OPERATION_EXCEPTION));
-        }
         return context.getEffectiveMajorVersion();
     }
 
@@ -297,10 +284,6 @@
      */
     @Override
     public int getEffectiveMinorVersion() {
-        if (isRestricted) {
-            throw new UnsupportedOperationException(
-                    rb.getString(LogFacade.UNSUPPORTED_OPERATION_EXCEPTION));
-        }
         return context.getEffectiveMinorVersion();
     }
 
@@ -803,10 +786,6 @@
      */
     @Override
     public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
-        if (isRestricted) {
-            throw new UnsupportedOperationException(
-                    rb.getString(LogFacade.UNSUPPORTED_OPERATION_EXCEPTION));
-        }
         return context.getDefaultSessionTrackingModes();
     }
 
@@ -819,10 +798,6 @@
      */
     @Override
     public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
-        if (isRestricted) {
-            throw new UnsupportedOperationException(
-                    rb.getString(LogFacade.UNSUPPORTED_OPERATION_EXCEPTION));
-        }
         return context.getEffectiveSessionTrackingModes();
     }
 
@@ -885,19 +860,11 @@
      */
     @Override
     public JspConfigDescriptor getJspConfigDescriptor() {
-        if (isRestricted) {
-            throw new UnsupportedOperationException(
-                    rb.getString(LogFacade.UNSUPPORTED_OPERATION_EXCEPTION));
-        }
         return context.getJspConfigDescriptor();
     }
 
     @Override
     public ClassLoader getClassLoader() {
-        if (isRestricted) {
-            throw new UnsupportedOperationException(
-                    rb.getString(LogFacade.UNSUPPORTED_OPERATION_EXCEPTION));
-        }
         return context.getClassLoader();
     }
 
@@ -912,19 +879,11 @@
 
     @Override
     public String getVirtualServerName() {
-        if (isRestricted) {
-            throw new UnsupportedOperationException(
-                    rb.getString(LogFacade.UNSUPPORTED_OPERATION_EXCEPTION));
-        }
         return context.getVirtualServerName();
     }
 
     @Override
     public int getSessionTimeout() {
-        if (isRestricted) {
-            throw new UnsupportedOperationException(
-                    rb.getString(LogFacade.UNSUPPORTED_OPERATION_EXCEPTION));
-        }
         return context.getSessionTimeout();
     }
 
@@ -939,10 +898,6 @@
 
     @Override
     public String getRequestCharacterEncoding() {
-        if (isRestricted) {
-            throw new UnsupportedOperationException(
-                    rb.getString(LogFacade.UNSUPPORTED_OPERATION_EXCEPTION));
-        }
         return context.getRequestCharacterEncoding();
     }
 
@@ -957,10 +912,6 @@
 
     @Override
     public String getResponseCharacterEncoding() {
-        if (isRestricted) {
-            throw new UnsupportedOperationException(
-                    rb.getString(LogFacade.UNSUPPORTED_OPERATION_EXCEPTION));
-        }
         return context.getResponseCharacterEncoding();
     }
 
@@ -973,26 +924,6 @@
         context.setResponseCharacterEncoding(encoding);
     }
 
-    // START PWC 1.2
-    /**
-     * Gets the underlying StandardContext to which this ApplicationContext is
-     * delegating.
-     *
-     * @return The underlying StandardContext
-     */
-    /*
-    public StandardContext getUnwrappedContext() {
-
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(GET_UNWRAPPED_CONTEXT_PERMISSION);
-        }
-
-        return this.context;
-    }
-    */
-    // END PWC 1.2
-
 
     // -------------------------------------------------------- Package Methods