Author: markt
Date: Fri Aug 16 15:33:17 2013
New Revision: 1514749
URL: http://svn.apache.org/r1514749
Log:
Remove use of Java 7 from test code
Modified:
tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TesterMessageCountClient.java
tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
Modified:
tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1514749&r1=1514748&r2=1514749&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Fri Aug 16 15:33:17 2013
@@ -533,7 +533,9 @@ public class TestWsWebSocketContainer ex
ByteBuffer.wrap(MESSAGE_BINARY_4K));
f.get();
}
- } catch (ExecutionException | InterruptedException e) {
+ } catch (ExecutionException e) {
+ exception = e;
+ } catch (InterruptedException e) {
exception = e;
}
timeout = System.currentTimeMillis() - lastSend;
Modified:
tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TesterMessageCountClient.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TesterMessageCountClient.java?rev=1514749&r1=1514748&r2=1514749&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TesterMessageCountClient.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TesterMessageCountClient.java
Fri Aug 16 15:33:17 2013
@@ -111,7 +111,7 @@ public class TesterMessageCountClient {
private final CountDownLatch latch;
- private final List<T> messages = new CopyOnWriteArrayList<>();
+ private final List<T> messages = new CopyOnWriteArrayList<T>();
public BasicHandler(CountDownLatch latch) {
this.latch = latch;
@@ -176,7 +176,7 @@ public class TesterMessageCountClient {
private final CountDownLatch latch;
- private final List<T> messages = new CopyOnWriteArrayList<>();
+ private final List<T> messages = new CopyOnWriteArrayList<T>();
public AsyncHandler(CountDownLatch latch) {
this.latch = latch;
Modified:
tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java?rev=1514749&r1=1514748&r2=1514749&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
Fri Aug 16 15:33:17 2013
@@ -185,7 +185,7 @@ public class TestEncodingDecoding extend
encoders={MsgStringEncoder.class, MsgByteEncoder.class})
public static class Client {
- private Queue<Object> received = new ConcurrentLinkedQueue<>();
+ private Queue<Object> received = new ConcurrentLinkedQueue<Object>();
@OnMessage
public void rx(MsgString in) {
@@ -205,8 +205,8 @@ public class TestEncodingDecoding extend
configurator=SingletonConfigurator.class)
public static class Server {
- private Queue<Object> received = new ConcurrentLinkedQueue<>();
- static HashMap<String, Boolean> lifeCyclesCalled = new HashMap<>(8);
+ private Queue<Object> received = new ConcurrentLinkedQueue<Object>();
+ static HashMap<String, Boolean> lifeCyclesCalled = new HashMap<String,
Boolean>(8);
@OnMessage
public MsgString rx(MsgString in) {
@@ -236,7 +236,7 @@ public class TestEncodingDecoding extend
public static class MsgByteMessageHandler implements
MessageHandler.Whole<MsgByte> {
- public static Queue<Object> received = new ConcurrentLinkedQueue<>();
+ public static Queue<Object> received = new
ConcurrentLinkedQueue<Object>();
private final Session session;
public MsgByteMessageHandler(Session session) {
@@ -251,7 +251,9 @@ public class TestEncodingDecoding extend
MsgByte msg = new MsgByte();
msg.setData("got it".getBytes());
session.getBasicRemote().sendObject(msg);
- } catch (IOException | EncodeException e) {
+ } catch (IOException e) {
+ throw new IllegalStateException(e);
+ } catch (EncodeException e) {
throw new IllegalStateException(e);
}
}
@@ -261,7 +263,7 @@ public class TestEncodingDecoding extend
public static class MsgStringMessageHandler
implements MessageHandler.Whole<MsgString>{
- public static Queue<Object> received = new ConcurrentLinkedQueue<>();
+ public static Queue<Object> received = new
ConcurrentLinkedQueue<Object>();
private final Session session;
public MsgStringMessageHandler(Session session) {
@@ -275,7 +277,9 @@ public class TestEncodingDecoding extend
MsgByte msg = new MsgByte();
msg.setData(MESSAGE_ONE.getBytes());
session.getBasicRemote().sendObject(msg);
- } catch (IOException | EncodeException e) {
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (EncodeException e) {
e.printStackTrace();
}
}
@@ -424,14 +428,14 @@ public class TestEncodingDecoding extend
}
@Override
public List<Class<? extends Encoder>> getEncoders() {
- List<Class<? extends Encoder>> encoders = new
ArrayList<>(2);
+ List<Class<? extends Encoder>> encoders = new
ArrayList<Class<? extends Encoder>>(2);
encoders.add(MsgStringEncoder.class);
encoders.add(MsgByteEncoder.class);
return encoders;
}
@Override
public List<Class<? extends Decoder>> getDecoders() {
- List<Class<? extends Decoder>> decoders = new
ArrayList<>(2);
+ List<Class<? extends Decoder>> decoders = new
ArrayList<Class<? extends Decoder>>(2);
decoders.add(MsgStringDecoder.class);
decoders.add(MsgByteDecoder.class);
return decoders;
Modified:
tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java?rev=1514749&r1=1514748&r2=1514749&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
Fri Aug 16 15:33:17 2013
@@ -105,7 +105,7 @@ public class TestPojoMethodMapping exten
configurator=SingletonConfigurator.class)
public static final class Server {
- private final List<String> errors = new ArrayList<>();
+ private final List<String> errors = new ArrayList<String>();
private volatile boolean closed;
@OnOpen
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
