[jspwiki] 13/25: Use Context instead of WikiContext

[ju...@apache.org]

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

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 63f0617b8ddef5c25dbc70b275c98f163f49f589
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Tue Jul 12 22:54:29 2022 +0200

    Use Context instead of WikiContext
---
 .../java/org/apache/wiki/ui/WikiJSPFilter.java     | 22 ++++++++++++++++------
 .../java/org/apache/wiki/ui/WikiServletFilter.java | 14 +++++++++-----
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
index 6364a8822..20b303cb7 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
@@ -23,18 +23,28 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.ThreadContext;
 import org.apache.wiki.WatchDog;
-import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.core.Context;
 import org.apache.wiki.api.core.Engine;
 import org.apache.wiki.event.WikiEventManager;
 import org.apache.wiki.event.WikiPageEvent;
 import org.apache.wiki.url.URLConstructor;
 import org.apache.wiki.util.TextUtil;
 
-import javax.servlet.*;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.WriteListener;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 
 
@@ -95,7 +105,7 @@ public class WikiJSPFilter extends WikiServletFilter {
 
             try {
                 w.enterState( "Delivering response", 30 );
-                final WikiContext wikiContext = getWikiContext( request );
+                final Context wikiContext = getWikiContext( request );
                 final String r = filter( wikiContext, responseWrapper );
 
                 if( useEncoding ) {
@@ -132,7 +142,7 @@ public class WikiJSPFilter extends WikiServletFilter {
      * @param response The source string
      * @return The modified string with all the insertions in place.
      */
-    private String filter( final WikiContext wikiContext, final HttpServletResponse response ) {
+    private String filter( final Context wikiContext, final HttpServletResponse response ) {
         String string = response.toString();
 
         if( wikiContext != null ) {
@@ -168,7 +178,7 @@ public class WikiJSPFilter extends WikiServletFilter {
      *  @param type Type identifier for insertion
      *  @return The filtered string.
      */
-    private String insertResources( final WikiContext wikiContext, final String string, final String type ) {
+    private String insertResources( final Context wikiContext, final String string, final String type ) {
         if( wikiContext == null ) {
             return string;
         }
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiServletFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
index 1ade49a3f..2db7487dc 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
@@ -21,7 +21,6 @@ package org.apache.wiki.ui;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.ThreadContext;
-import org.apache.wiki.WikiContext;
 import org.apache.wiki.api.core.Context;
 import org.apache.wiki.api.core.Engine;
 import org.apache.wiki.api.core.Session;
@@ -30,7 +29,13 @@ import org.apache.wiki.auth.AuthenticationManager;
 import org.apache.wiki.auth.SessionMonitor;
 import org.apache.wiki.auth.WikiSecurityException;
 
-import javax.servlet.*;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 import java.io.IOException;
@@ -142,7 +147,6 @@ public class WikiServletFilter implements Filter {
             ThreadContext.pop();
             ThreadContext.remove( m_engine.getApplicationName() + ":" + httpRequest.getRequestURL() );
         }
-
     }
 
     /**
@@ -151,9 +155,9 @@ public class WikiServletFilter implements Filter {
      *  @param request The request to examine
      *  @return A valid WikiContext value (or null, if the context could not be located).
      */
-    protected WikiContext getWikiContext( final ServletRequest request ) {
+    protected Context getWikiContext( final ServletRequest request ) {
         final HttpServletRequest httpRequest = (HttpServletRequest) request;
-        return ( WikiContext )httpRequest.getAttribute( Context.ATTR_CONTEXT );
+        return ( Context )httpRequest.getAttribute( Context.ATTR_CONTEXT );
     }
 
     /**