From ae93e120f8093ee4fb2b334e265f514fe00154b3 Mon Sep 17 00:00:00 2001
From: Torben Burchgart <burchgart@predic8.de>
Date: Fri, 21 Jul 2023 10:55:10 +0200
Subject: [PATCH] Removed barely utilized interceptor.id

---
 .../core/interceptor/AbstractInterceptor.java         | 11 -----------
 .../membrane/core/interceptor/Interceptor.java        |  3 ---
 .../authentication/session/LoginInterceptor.java      |  3 +--
 .../predic8/membrane/core/rules/ProxyRuleTest.java    |  6 +-----
 core/src/test/resources/ref.proxies.xml               |  1 -
 5 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/AbstractInterceptor.java b/core/src/main/java/com/predic8/membrane/core/interceptor/AbstractInterceptor.java
index e72815b59..2f22c9a92 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/AbstractInterceptor.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/AbstractInterceptor.java
@@ -34,8 +34,6 @@ public class AbstractInterceptor implements Interceptor {
 
 	private EnumSet<Flow> flow = Flow.Set.REQUEST_RESPONSE;
 
-	protected String id;
-
 	protected Router router;
 
 	public AbstractInterceptor() {
@@ -62,15 +60,6 @@ public void setDisplayName(String name) {
 		this.name = name;
 	}
 
-	public String getId() {
-		return id;
-	}
-
-	@MCAttribute
-	public void setId(String id) {
-		this.id = id;
-	}
-
 	public void setFlow(EnumSet<Flow> flow) {
 		this.flow = flow;
 	}
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/Interceptor.java b/core/src/main/java/com/predic8/membrane/core/interceptor/Interceptor.java
index cf4d74e55..766282e7e 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/Interceptor.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/Interceptor.java
@@ -53,9 +53,6 @@ public static class Set {
 	String getDisplayName();
 	void setDisplayName(String name);
 
-	String getId();
-	void setId(String id);
-
 	Router getRouter();
 
 	void setFlow(EnumSet<Flow> flow);
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/authentication/session/LoginInterceptor.java b/core/src/main/java/com/predic8/membrane/core/interceptor/authentication/session/LoginInterceptor.java
index 0808a818b..5b13f8935 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/authentication/session/LoginInterceptor.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/authentication/session/LoginInterceptor.java
@@ -160,8 +160,7 @@ else if (s == null || !s.isAuthorized()) {
 	}
 
 	private void applyBackendAuthorization(Exchange exc, Session s) {
-        if (getId() != null)
-            exc.setProperty(getId() + "-session", s);
+        exc.setProperty("session", s);
         Header h = exc.getRequest().getHeader();
 		for (Map.Entry<String, String> e : s.getUserAttributes().entrySet())
 			if (e.getKey().startsWith("header")) {
diff --git a/core/src/test/java/com/predic8/membrane/core/rules/ProxyRuleTest.java b/core/src/test/java/com/predic8/membrane/core/rules/ProxyRuleTest.java
index f75250f3d..f9999f4b6 100644
--- a/core/src/test/java/com/predic8/membrane/core/rules/ProxyRuleTest.java
+++ b/core/src/test/java/com/predic8/membrane/core/rules/ProxyRuleTest.java
@@ -58,9 +58,7 @@ public void testRule() throws Exception {
 
 		List<Interceptor> inters = rule.getInterceptors();
 		assertFalse(inters.isEmpty());
-		assertTrue(inters.size()  == 2);
-		inters.get(0).getId().equals("roundRobinBalancer");
-		inters.get(1).getId().equals("accessControlInterceptor");
+		assertTrue(inters.size() == 2);
 
 		assertEquals(true, rule.isBlockResponse());
 		assertFalse(rule.isBlockRequest());
@@ -69,11 +67,9 @@ public void testRule() throws Exception {
 	private static List<Interceptor> getInterceptors() {
 		List<Interceptor> interceptors = new ArrayList<>();
 		Interceptor balancer = new LoadBalancingInterceptor();
-		balancer.setId("roundRobinBalancer");
 		interceptors.add(balancer);
 
 		Interceptor acl = new AccessControlInterceptor();
-		acl.setId("accessControlInterceptor");
 		interceptors.add(acl);
 		return interceptors;
 	}
diff --git a/core/src/test/resources/ref.proxies.xml b/core/src/test/resources/ref.proxies.xml
index 6b498501f..4d3251176 100644
--- a/core/src/test/resources/ref.proxies.xml
+++ b/core/src/test/resources/ref.proxies.xml
@@ -28,7 +28,6 @@
 
 	<spring:bean id="accessControlInterceptor"
 		class="com.predic8.membrane.core.interceptor.acl.AccessControlInterceptor">
-		<spring:property name="id" value="accessControlInterceptor" />
 		<spring:property name="displayName" value="Access Control List Interceptor" />
 		<spring:property name="file" value="acl/acl.xml" />
 	</spring:bean>