You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/06/21 15:50:36 UTC
[17/20] git commit: Java 7 diamonds for native websocket
Java 7 diamonds for native websocket
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/04d87b9e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/04d87b9e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/04d87b9e
Branch: refs/heads/master
Commit: 04d87b9e538776a7bfb57b8daae5d873c1aecd56
Parents: 0576c4a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 15:41:32 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:39 2013 +0200
----------------------------------------------------------------------
.../org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java | 2 +-
.../org/apache/wicket/protocol/ws/api/HttpSessionCopy.java | 2 +-
.../org/apache/wicket/protocol/ws/api/ServletRequestCopy.java | 6 +++---
.../protocol/ws/api/SimpleWebSocketConnectionRegistry.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/04d87b9e/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java
index 8a80738..18ca772 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java
@@ -158,7 +158,7 @@ public class AbstractUpgradeFilter extends WicketFilter
*/
protected List<String> getTokensFromHeader(HttpServletRequest req, String headerName)
{
- List<String> result = new ArrayList<String>();
+ List<String> result = new ArrayList<>();
Enumeration<String> headers = req.getHeaders(headerName);
while (headers.hasMoreElements()) {
http://git-wip-us.apache.org/repos/asf/wicket/blob/04d87b9e/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java
index 2d5fed1..fc878c2 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java
@@ -42,7 +42,7 @@ public class HttpSessionCopy implements HttpSession
this.servletContext = originalSession.getServletContext();
this.creationTime = originalSession.getCreationTime();
- this.attributes = new ConcurrentHashMap<String, Object>();
+ this.attributes = new ConcurrentHashMap<>();
Enumeration<String> attributeNames = originalSession.getAttributeNames();
while (attributeNames.hasMoreElements())
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/04d87b9e/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/ServletRequestCopy.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/ServletRequestCopy.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/ServletRequestCopy.java
index 8d07d75..e1515e6 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/ServletRequestCopy.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/ServletRequestCopy.java
@@ -57,9 +57,9 @@ public class ServletRequestCopy implements HttpServletRequest
private final String requestUri;
private final HttpSessionCopy httpSession;
private final StringBuffer requestURL;
- private final Map<String, Object> attributes = new HashMap<String, Object>();
- private final Map<String, String> headers = new HashMap<String, String>();
- private final Map<String, String[]> parameters = new HashMap<String, String[]>();
+ private final Map<String, Object> attributes = new HashMap<>();
+ private final Map<String, String> headers = new HashMap<>();
+ private final Map<String, String[]> parameters = new HashMap<>();
private final String method;
private final String serverName;
private final int serverPort;
http://git-wip-us.apache.org/repos/asf/wicket/blob/04d87b9e/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/SimpleWebSocketConnectionRegistry.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/SimpleWebSocketConnectionRegistry.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/SimpleWebSocketConnectionRegistry.java
index 97c590f..8a180f9 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/SimpleWebSocketConnectionRegistry.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/SimpleWebSocketConnectionRegistry.java
@@ -70,7 +70,7 @@ public class SimpleWebSocketConnectionRegistry implements IWebSocketConnectionRe
{
Args.notNull(application, "application");
- Collection<IWebSocketConnection> connections = new ArrayList<IWebSocketConnection>();
+ Collection<IWebSocketConnection> connections = new ArrayList<>();
ConcurrentMap<String, ConcurrentMap<Integer, IWebSocketConnection>> connectionsBySession = application.getMetaData(KEY);
if (connectionsBySession != null)
{