Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More duplicate @OnWebSocketBinary testing

This commit is contained in:
Joakim Erdfelt 2012-06-28 09:57:22 -07:00
parent 53425e061a
commit 7e93c2a409
4 changed files with 99 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/EventMethods.java
View File

@ -3,7 +3,6 @@ package org.eclipse.jetty.websocket.annotations;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.websocket.api.InvalidWebSocketException;
import org.eclipse.jetty.websocket.frames.BaseFrame;
@ -34,24 +33,13 @@ public class EventMethods
public void addOnFrame(EventMethod eventMethod)
{
Class<?> paramTypes[] = eventMethod.getParamTypes();
@SuppressWarnings("unchecked")
Class<? extends BaseFrame> frameType = (Class<? extends BaseFrame>)((paramTypes.length == 1)?paramTypes[0]:paramTypes[1]);
if (onFrames.containsKey(frameType))
Class<?> lastType = paramTypes[paramTypes.length - 1];
if (!BaseFrame.class.isAssignableFrom(lastType))
{
// Attempt to add duplicate frame type (a no-no)
StringBuilder err = new StringBuilder();
err.append("Duplicate Frame Type declaration on ");
err.append(eventMethod.getMethod());
err.append(StringUtil.__LINE_SEPARATOR);
EventMethod dup = onFrames.get(frameType);
err.append("Type ").append(frameType.getSimpleName()).append(" previously declared at ");
err.append(dup.getMethod());
throw new InvalidWebSocketException(err.toString());
throw new InvalidWebSocketException("Unrecognized @OnWebSocketFrame frame type " + lastType);
}
@SuppressWarnings("unchecked")
Class<? extends BaseFrame> frameType = (Class<? extends BaseFrame>)lastType;
onFrames.put(frameType,eventMethod);
}

63
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/EventMethodsCache.java
View File

@ -89,15 +89,51 @@ public class EventMethodsCache
cache = new ConcurrentHashMap<>();
}
private void assertUnset(EventMethod event, Class<? extends Annotation> annoClass, Class<?> pojo, Method method)
private void assertFrameUnset(EventMethods events, Method method)
{
if (event == EventMethod.NOOP)
Class<?> paramTypes[] = method.getParameterTypes();
Class<?> lastType = paramTypes[paramTypes.length - 1];
if (!BaseFrame.class.isAssignableFrom(lastType))
{
return;
throw new InvalidWebSocketException("Unrecognized @OnWebSocketFrame frame type " + lastType);
}
@SuppressWarnings("unchecked")
Class<? extends BaseFrame> frameType = (Class<? extends BaseFrame>)lastType;
EventMethod dup = events.getOnFrame(frameType);
if (dup != null)
{
// Attempt to add duplicate frame type (a no-no)
StringBuilder err = new StringBuilder();
err.append("Duplicate Frame Type declaration on ");
err.append(method);
err.append(StringUtil.__LINE_SEPARATOR);
err.append("Type ").append(frameType.getSimpleName()).append(" previously declared at ");
err.append(dup.getMethod());
throw new InvalidWebSocketException(err.toString());
}
}
private void assertValidParams(Class<?> pojo, Method method, Class<? extends Annotation> annoClass, ParamList validParams)
private void assertUnset(EventMethod event, Class<? extends Annotation> annoClass, Method method)
{
if (event != null)
{
// Attempt to add duplicate frame type (a no-no)
StringBuilder err = new StringBuilder();
err.append("Duplicate @").append(annoClass.getSimpleName()).append(" declaration on ");
err.append(method);
err.append(StringUtil.__LINE_SEPARATOR);
err.append("@").append(annoClass.getSimpleName()).append(" previously declared at ");
err.append(event.getMethod());
throw new InvalidWebSocketException(err.toString());
}
}
private void assertValidParams(Method method, Class<? extends Annotation> annoClass, ParamList validParams)
{
boolean valid = false;
@ -223,39 +259,40 @@ public class EventMethodsCache
{
if (method.getAnnotation(OnWebSocketConnect.class) != null)
{
assertUnset(events.onConnect,OnWebSocketConnect.class,pojo,method);
assertValidParams(pojo,method,OnWebSocketConnect.class,validConnectParams);
assertValidParams(method,OnWebSocketConnect.class,validConnectParams);
assertUnset(events.onConnect,OnWebSocketConnect.class,method);
events.onConnect = new EventMethod(pojo,method);
continue;
}
if (method.getAnnotation(OnWebSocketBinary.class) != null)
{
assertUnset(events.onBinary,OnWebSocketBinary.class,pojo,method);
assertValidParams(pojo,method,OnWebSocketBinary.class,validBinaryParams);
assertValidParams(method,OnWebSocketBinary.class,validBinaryParams);
assertUnset(events.onBinary,OnWebSocketBinary.class,method);
events.onBinary = new EventMethod(pojo,method);
continue;
}
if (method.getAnnotation(OnWebSocketClose.class) != null)
{
assertUnset(events.onClose,OnWebSocketClose.class,pojo,method);
assertValidParams(pojo,method,OnWebSocketClose.class,validCloseParams);
assertValidParams(method,OnWebSocketClose.class,validCloseParams);
assertUnset(events.onClose,OnWebSocketClose.class,method);
events.onClose = new EventMethod(pojo,method);
continue;
}
if (method.getAnnotation(OnWebSocketText.class) != null)
{
assertUnset(events.onText,OnWebSocketText.class,pojo,method);
assertValidParams(pojo,method,OnWebSocketText.class,validTextParams);
assertValidParams(method,OnWebSocketText.class,validTextParams);
assertUnset(events.onText,OnWebSocketText.class,method);
events.onText = new EventMethod(pojo,method);
continue;
}
if (method.getAnnotation(OnWebSocketFrame.class) != null)
{
assertValidParams(pojo,method,OnWebSocketFrame.class,validFrameParams);
assertValidParams(method,OnWebSocketFrame.class,validFrameParams);
assertFrameUnset(events,method);
events.addOnFrame(new EventMethod(pojo,method));
continue;
}

25
jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/BadDuplicateBinarySocket.java Normal file
View File

@ -0,0 +1,25 @@
package org.eclipse.jetty.websocket.annotations;
import java.nio.ByteBuffer;
@WebSocket
public class BadDuplicateBinarySocket
{
/**
* First method
*/
@OnWebSocketBinary
public void binMe(byte[] payload, int offset, int len)
{
/* ignore */
}
/**
* Second method
*/
@OnWebSocketBinary
public void binMe(ByteBuffer payload)
{
/* ignore */
}
}

19
jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/EventMethodsCacheTest.java
View File

@ -20,6 +20,25 @@ public class EventMethodsCacheTest
Assert.assertThat(message + "Event method should have been NOOP",actual,nullValue());
}
/**
* Test Case for bad declaration (duplicate OnWebSocketBinary declarations)
*/
@Test
public void testDiscoverBadDuplicateBinarySocket()
{
EventMethodsCache cache = new EventMethodsCache();
try
{
// Should toss exception
cache.getMethods(BadDuplicateBinarySocket.class);
}
catch (InvalidWebSocketException e)
{
// Validate that we have clear error message to the developer
Assert.assertThat(e.getMessage(),containsString("Duplicate @OnWebSocketBinary declaration"));
}
}
/**
* Test Case for bad declaration (duplicate frame type methods)
*/