INTEXT-45 SI 3.0.0.M1 - now 1.0.0.BUILD-SNAPSHOT

- Use core TCP eventing for WebSocketEvents; change Type literals to enumerations
- Use a WebSocketMessageMapper instead of rebuilding the message in the interceptor
- Use core TCP Abstract Serializer
- Use 3.0 API instead of reflection to get key for Deserializer state

Author: garyrussell

spring-integration-ip-extensions/.gitignore

@@ -0,0 +1,2 @@
+reports
+fuzz*

spring-integration-ip-extensions/build.gradle

@@ -33,7 +33,7 @@ ext {
 	log4jVersion = '1.2.12'
 	mockitoVersion = '1.9.0'
 	springVersion = '3.1.3.RELEASE'
-	springIntegrationVersion = '2.2.0.RELEASE'
+	springIntegrationVersion = '3.0.0.M1'
 }
 
 eclipse {

spring-integration-ip-extensions/gradle.properties

@@ -1 +1 @@
-version=0.1.0.BUILD-SNAPSHOT
+version=1.0.0.BUILD-SNAPSHOT

spring-integration-ip-extensions/src/main/java/org/springframework/integration/x/ip/serializer/AbstractByteArraySerializer.java

@@ -26,6 +26,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.integration.ip.tcp.serializer.ByteArrayCrLfSerializer;
 
 /**
  * Base class for (de)Serializers that start with an HTTP-like protocol then
@@ -55,6 +56,7 @@ protected ByteArrayCrLfSerializer getCrlfDeserializer() {
 		return crlfDeserializer;
 	}
 
+	@Override
 	public abstract DataFrame deserialize(InputStream inputStream) throws IOException;
 
 	protected BasicState getStreamState(InputStream inputStream) {
@@ -130,6 +132,7 @@ protected DataFrame createDataFrame(int type, String frameData) {
 		return new DataFrame(type, frameData);
 	}
 
+	@Override
 	public void removeState(Object key) {
 		this.streamState.remove(key);
 	}

spring-integration-ip-extensions/src/main/java/org/springframework/integration/x/ip/serializer/AbstractHttpSwitchingDeserializer.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.integration.x.ip.websocket;
 
-import org.springframework.integration.ip.tcp.connection.TcpConnection;
-import org.springframework.integration.x.ip.tcp.TcpConnectionEvent;
+import org.springframework.integration.ip.tcp.connection.TcpConnectionEvent;
+import org.springframework.integration.ip.tcp.connection.TcpConnectionSupport;
 
 /**
  * @author Gary Russell
@@ -27,15 +27,16 @@ public class WebSocketEvent extends TcpConnectionEvent {
 
 	private static final long serialVersionUID = -6788341703196233248L;
 
-	public static final String HANDSHAKE_COMPLETE = "HANDSHAKE_COMPLETE";
-
-	public static final String WEBSOCKET_CLOSED = "WEBSOCKET_CLOSED";
+	public enum WebSocketEventType implements EventType {
+		HANDSHAKE_COMPLETE,
+		WEBSOCKET_CLOSED
+	}
 
 	private final String path;
 
 	private final String queryString;
 
-	public WebSocketEvent(TcpConnection connection, String type, String path, String queryString) {
+	public WebSocketEvent(TcpConnectionSupport connection, WebSocketEventType type, String path, String queryString) {
 		super(connection, type, "unknown");
 		this.path = path;
 		this.queryString = queryString;

spring-integration-ip-extensions/src/main/java/org/springframework/integration/x/ip/serializer/ByteArrayCrLfSerializer.java

@@ -0,0 +1,44 @@
+/*
+ * 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.integration.x.ip.websocket;
+
+import java.util.Map;
+
+import org.springframework.integration.ip.tcp.connection.TcpConnection;
+import org.springframework.integration.ip.tcp.connection.TcpMessageMapper;
+import org.springframework.integration.x.ip.websocket.WebSocketTcpConnectionInterceptorFactory.WebSocketTcpConnectionInterceptor;
+
+/**
+ * @author Gary Russell
+ * @since 3.0
+ *
+ */
+public class WebSocketMessageMapper extends TcpMessageMapper {
+
+	private final WebSocketTcpConnectionInterceptorFactory connectionInterceptorFactory;
+
+	public WebSocketMessageMapper(WebSocketTcpConnectionInterceptorFactory connectionInterceptorFactory) {
+		this.connectionInterceptorFactory = connectionInterceptorFactory;
+	}
+
+	@Override
+	protected Map<String, ?> supplyCustomHeaders(TcpConnection connection) {
+		WebSocketTcpConnectionInterceptor interceptor = this.connectionInterceptorFactory.locateInterceptor(connection);
+		return interceptor == null ? null : interceptor.getAdditionalHeaders();
+	}
+
+
+}

spring-integration-ip-extensions/src/main/java/org/springframework/integration/x/ip/tcp/TcpConnectionEvent.java

@@ -74,6 +74,7 @@ protected BasicState createState() {
 		return new WebSocketState();
 	}
 
+	@Override
 	public void serialize(final Object frame, OutputStream outputStream)
 			throws IOException {
 		String data = "";
@@ -199,7 +200,7 @@ private DataFrame doDeserialize(InputStream inputStream, DataFrame protoFrame) t
 		int maskInx = 0;
 		int rsv = 0;
 		while (!done ) {
-			bite = inputStream.read();
+			bite = inputStream.read() & 0xff;
 //			logger.debug("Read:" + Integer.toHexString(bite));
 			if (bite < 0 && n == 0) {
 				throw new SoftEndOfStreamException("Stream closed between payloads");