Add getLastHandler to WebSocketHandlerDecorator

rstoyanchev · rstoyanchev · commit 5feac077381b · 2013-06-19T09:46:21.000-04:00
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketHandlerDecorator.java b/spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketHandlerDecorator.java
@@ -42,6 +42,14 @@ public WebSocketHandler getDelegate() {
 		return this.delegate;
 	}
 
+	public WebSocketHandler getLastHandler() {
+		WebSocketHandler result = delegate;
+		while (result instanceof WebSocketHandlerDecorator) {
+			result = ((WebSocketHandlerDecorator) result).getDelegate();
+		}
+		return result;
+	}
+
 	@Override
 	public void afterConnectionEstablished(WebSocketSession session) throws Exception {
 		this.delegate.afterConnectionEstablished(session);
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/support/WebSocketHandlerDecoratorTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/support/WebSocketHandlerDecoratorTests.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.web.socket.support;
+
+import org.junit.Test;
+import org.springframework.web.socket.adapter.WebSocketHandlerAdapter;
+
+import static org.junit.Assert.*;
+
+
+/**
+ * Test fixture for {@link WebSocketHandlerDecorator}.
+ *
+ * @author Rossen Stoyanchev
+ */
+public class WebSocketHandlerDecoratorTests {
+
+
+	@Test
+	public void getLastHandler() {
+		WebSocketHandlerAdapter h1 = new WebSocketHandlerAdapter();
+		WebSocketHandlerDecorator h2 = new WebSocketHandlerDecorator(h1);
+		WebSocketHandlerDecorator h3 = new WebSocketHandlerDecorator(h2);
+
+		assertSame(h1, h3.getLastHandler());
+	}
+
+}
