Refactor remove proxy aware (#2884)

* Remove `ProxyAware` interface and clean up related logic

- Eliminated `ProxyAware` interface, simplifying codebase and reducing unused complexity.
- Updated `AbstractInterceptor`, `Interceptor`, and related implementations to directly manage proxy references via `getProxy()` and `init()`.
- Refactored interceptors to remove unused `Proxy` fields and redundant `setProxy()` methods.
- Adjusted roadmap to reflect removal of `ProxyAware` and associated refactoring tasks.

* Remove unused fields, imports, and listeners in core classes

- Simplified `AbstractFlowInterceptor`, `OAuth2AuthorizationServerInterceptor`, `WebServiceExplorerInterceptor`, and `RuleManager` by removing unused fields, imports, and redundant logic.
- Cleaned up code to improve maintainability and readability across core interceptor and proxy-related classes.

* Update proxy handling in interceptors and add tests for AbstractFlowInterceptor

- Improved proxy initialization in `AbstractInterceptor` and `AbstractFlowInterceptor` to ensure consistent propagation.
- Updated `init()` logic to handle `proxy` references appropriately across interceptors.
- Added `AbstractFlowInterceptorTest` to validate proxy propagation and router integration.
- Minor corrections in `ROADMAP.md` and cleanup of unused fields.

* Update `AbstractFlowInterceptorTest` to validate propagation of proxy and router

- Renamed test method for clarity and updated logic to use `setFlow` with `List.of`.
- Verified proper initialization of nested interceptors with proxy and router.

Author: predic8

core/src/main/java/com/predic8/membrane/core/config/ProxyAware.java

@@ -33,6 +33,12 @@ public class AbstractInterceptor implements Interceptor {
 
 	protected Router router;
 
+	/**
+	 * The proxy where this interceptor is attached to, no matter how deep in
+	 * nested interceptors it is.
+	 */
+	protected Proxy proxy;
+
 	public AbstractInterceptor() {
 		super();
 	}
@@ -105,14 +111,19 @@ public final void init(Router router) {
 	}
 
 	@Override
-	public void init(Router router, Proxy ignored) {
+	public void init(Router router, Proxy proxy) {
+		this.proxy = proxy;
 		init(router);
 	}
 
 	public Router getRouter() { //wird von ReadRulesConfigurationTest aufgerufen.
 		return router;
 	}
 
+	public Proxy getProxy() {
+		return proxy;
+	}
+
 	public FlowController getFlowController() {
 		return router.getFlowController();
 	}

core/src/main/java/com/predic8/membrane/core/interceptor/AbstractInterceptor.java

@@ -75,6 +75,12 @@ public boolean isAbort() {
 
 	Router getRouter();
 
+	/**
+	 * The proxy where this interceptor is attached to, no matter how deep in
+	 * nested interceptors it is.
+	 */
+	Proxy getProxy();
+
 	void setAppliedFlow(EnumSet<Flow> flow);
 	EnumSet<Flow> getAppliedFlow();
 

core/src/main/java/com/predic8/membrane/core/interceptor/Interceptor.java

@@ -14,12 +14,10 @@
 package com.predic8.membrane.core.interceptor.authentication.session;
 
 import com.predic8.membrane.annot.*;
-import com.predic8.membrane.core.config.ProxyAware;
 import com.predic8.membrane.core.exchange.*;
 import com.predic8.membrane.core.http.*;
 import com.predic8.membrane.core.interceptor.*;
 import com.predic8.membrane.core.interceptor.authentication.session.SessionManager.*;
-import com.predic8.membrane.core.proxies.Proxy;
 import com.predic8.membrane.core.util.*;
 import org.slf4j.*;
 
@@ -94,7 +92,7 @@
  * @topic 3. Security and Validation
  */
 @MCElement(name="login")
-public class LoginInterceptor extends AbstractInterceptor implements ProxyAware {
+public class LoginInterceptor extends AbstractInterceptor {
 
 	private static final Logger log = LoggerFactory.getLogger(LoginInterceptor.class.getName());
 
@@ -106,7 +104,6 @@ public class LoginInterceptor extends AbstractInterceptor implements ProxyAware
 	private SessionManager sessionManager;
 	private AccountBlocker accountBlocker;
 	private LoginDialog loginDialog;
-	private Proxy proxy;
 
 	@Override
 	public void init() {
@@ -298,9 +295,4 @@ public void setMessage(String message) {
 	public String getDisplayName() {
 		return "login";
 	}
-
-	@Override
-	public void setProxy(Proxy proxy) {
-		this.proxy = proxy;
-	}
 }

core/src/main/java/com/predic8/membrane/core/interceptor/authentication/session/LoginInterceptor.java

@@ -14,19 +14,13 @@
 
 package com.predic8.membrane.core.interceptor.flow;
 
-import com.predic8.membrane.core.config.ProxyAware;
-import com.predic8.membrane.core.exchange.Exchange;
-import com.predic8.membrane.core.interceptor.AbstractInterceptor;
-import com.predic8.membrane.core.interceptor.Interceptor;
-import com.predic8.membrane.core.proxies.Proxy;
-import com.predic8.membrane.core.router.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.predic8.membrane.core.exchange.*;
+import com.predic8.membrane.core.interceptor.*;
+import org.slf4j.*;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
-import static com.predic8.membrane.core.exceptions.ProblemDetails.internal;
+import static com.predic8.membrane.core.exceptions.ProblemDetails.*;
 
 public abstract class AbstractFlowInterceptor extends AbstractInterceptor {
 
@@ -46,7 +40,7 @@ public void setFlow(List<Interceptor> flow) {
     public void init() {
         super.init();
         for (Interceptor i : interceptors)
-            i.init(router);
+            i.init(router,proxy);
     }
 
     protected static void createProblemDetails(String flow, Interceptor interceptor, Exchange exc, Exception e) {
@@ -58,14 +52,4 @@ protected static void createProblemDetails(String flow, Interceptor interceptor,
                 .exception(e)
                 .buildAndSetResponse(exc);
     }
-
-    @Override
-    public void init(Router router, Proxy proxy) {
-        for (Interceptor i : interceptors) {
-            if(i instanceof ProxyAware pa) {
-                pa.setProxy(proxy);
-            }
-        }
-        init(router);
-    }
 }

core/src/main/java/com/predic8/membrane/core/interceptor/flow/AbstractFlowInterceptor.java

@@ -15,10 +15,8 @@
 package com.predic8.membrane.core.interceptor.groovy;
 
 import com.predic8.membrane.annot.*;
-import com.predic8.membrane.core.config.ProxyAware;
 import com.predic8.membrane.core.lang.*;
 import com.predic8.membrane.core.lang.groovy.*;
-import com.predic8.membrane.core.proxies.Proxy;
 import com.predic8.membrane.core.util.ConfigurationException;
 import org.codehaus.groovy.control.*;
 import org.codehaus.groovy.control.messages.*;
@@ -38,16 +36,14 @@
  * @topic 2. Enterprise Integration Patterns
  */
 @MCElement(name = "groovy", mixed = true)
-public class GroovyInterceptor extends AbstractScriptInterceptor implements ProxyAware {
+public class GroovyInterceptor extends AbstractScriptInterceptor {
 
     private static final Logger log = LoggerFactory.getLogger(GroovyInterceptor.class);
 
     public GroovyInterceptor() {
         name = "groovy";
     }
 
-    private Proxy proxy;
-
     @Override
     public EnumSet<Flow> getAppliedFlow() {
         return REQUEST_RESPONSE_ABORT_FLOW;
@@ -64,7 +60,7 @@ protected void initInternal() {
     }
 
     private void logGroovyError(MultipleCompilationErrorsException e) {
-        log.error("Error in Groovy script in API '{}' with source: {}", proxy.getName(), src);
+        log.error("Error in Groovy script: {}", src);
         for(Message error : e.getErrorCollector().getErrors()) {
             ByteArrayOutputStream bais = new ByteArrayOutputStream();
             PrintWriter pw = new PrintWriter(bais);
@@ -83,10 +79,4 @@ public String getShortDescription() {
     public String getLongDescription() {
         return "%s:<br/><pre style=\"overflow-x:auto\">%s</pre>".formatted(removeFinalChar(getShortDescription()), escapeHtml4(src.stripIndent()));
     }
-
-    @Override
-    public void setProxy(Proxy proxy) {
-        this.proxy = proxy;
-    }
-
 }

core/src/main/java/com/predic8/membrane/core/interceptor/groovy/GroovyInterceptor.java

@@ -14,7 +14,6 @@
 package com.predic8.membrane.core.interceptor.oauth2;
 
 import com.predic8.membrane.annot.*;
-import com.predic8.membrane.core.config.ProxyAware;
 import com.predic8.membrane.core.exchange.*;
 import com.predic8.membrane.core.interceptor.*;
 import com.predic8.membrane.core.interceptor.authentication.session.*;
@@ -44,7 +43,7 @@
  */
 @SuppressWarnings("LoggingSimilarMessage")
 @MCElement(name = "oauth2authserver")
-public class OAuth2AuthorizationServerInterceptor extends AbstractInterceptor implements ProxyAware {
+public class OAuth2AuthorizationServerInterceptor extends AbstractInterceptor {
     private static final Logger log = LoggerFactory.getLogger(OAuth2AuthorizationServerInterceptor.class.getName());
     public static final Set<@NotNull String> SUPPORTED_AUTHORIZATION_GRANTS = Set.of("code", "token", "id_token token");
 
@@ -77,8 +76,6 @@ public class OAuth2AuthorizationServerInterceptor extends AbstractInterceptor im
     private WellknownFile wellknownFile = new WellknownFile();
     private ConsentPageFile consentPageFile = new ConsentPageFile();
 
-    private Proxy proxy;
-
     @Override
     public void init() {
         super.init();
@@ -440,9 +437,4 @@ public String computeBasePath() {
     public String getBasePath() {
         return basePath;
     }
-
-    @Override
-    public void setProxy(Proxy proxy) {
-        this.proxy = proxy;
-    }
 }

core/src/main/java/com/predic8/membrane/core/interceptor/oauth2/OAuth2AuthorizationServerInterceptor.java

@@ -15,13 +15,11 @@
 
 import com.googlecode.jatl.*;
 import com.predic8.membrane.annot.*;
-import com.predic8.membrane.core.config.*;
 import com.predic8.membrane.core.exchange.*;
 import com.predic8.membrane.core.http.*;
 import com.predic8.membrane.core.interceptor.*;
 import com.predic8.membrane.core.interceptor.administration.*;
 import com.predic8.membrane.core.interceptor.rest.*;
-import com.predic8.membrane.core.proxies.Proxy;
 import com.predic8.membrane.core.util.wsdl.parser.*;
 import org.slf4j.*;
 
@@ -39,7 +37,7 @@
  * @description Serves an HTML “web service explorer”.
  */
 @MCElement(name="webServiceExplorer")
-public class WebServiceExplorerInterceptor extends RESTInterceptor implements ProxyAware {
+public class WebServiceExplorerInterceptor extends RESTInterceptor {
 
 	private static final Logger log = LoggerFactory.getLogger(WebServiceExplorerInterceptor.class);
 
@@ -48,11 +46,6 @@ public class WebServiceExplorerInterceptor extends RESTInterceptor implements Pr
 	private String wsdl;
 	private String portName;
 
-	/**
-	 * Field is accessed by reflection
-	 */
-	private Proxy proxy;
-
 	public WebServiceExplorerInterceptor() {
 		name = "web service explorer";
 	}
@@ -247,9 +240,4 @@ public StandardPage(Writer writer, String title) {
 	public String getShortDescription() {
 		return "Displays a graphical UI describing the web service when accessed using GET requests.";
 	}
-
-	@Override
-	public void setProxy(Proxy proxy) {
-		this.proxy = proxy;
-	}
 }

core/src/main/java/com/predic8/membrane/core/interceptor/soap/WebServiceExplorerInterceptor.java

@@ -14,7 +14,6 @@
 package com.predic8.membrane.core.proxies;
 
 import com.predic8.membrane.annot.*;
-import com.predic8.membrane.core.config.ProxyAware;
 import com.predic8.membrane.core.interceptor.*;
 import com.predic8.membrane.core.router.*;
 import com.predic8.membrane.core.stats.*;
@@ -90,10 +89,7 @@ public final void init(Router router) {
         this.router = router;
         try {
             init(); // Extension point for subclasses
-            for (Interceptor i : interceptors) {
-                if(i instanceof ProxyAware pa) {
-                    pa.setProxy(this);
-                }
+            for (var i : interceptors) {
                 i.init(router, this);
             }
             active = true;