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:26 UTC
[07/20] git commit: Java 7 diamonds for wicket-request module
Java 7 diamonds for wicket-request module
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5aba89bc
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5aba89bc
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5aba89bc
Branch: refs/heads/master
Commit: 5aba89bc8c2c8eb8ecef93ea641061e484d38a41
Parents: 1d6d597
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 14:54:22 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
.../apache/wicket/request/HttpHeaderCollection.java | 6 +++---
.../apache/wicket/request/RequestHandlerStack.java | 4 ++--
.../main/java/org/apache/wicket/request/Url.java | 10 +++++-----
.../java/org/apache/wicket/request/UrlRenderer.java | 6 +++---
.../request/mapper/CompoundRequestMapper.java | 6 +++---
.../request/mapper/mount/MountParameters.java | 2 +-
.../request/mapper/parameter/PageParameters.java | 16 ++++++++--------
.../parameter/UrlRequestParametersAdapter.java | 4 ++--
8 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aba89bc/wicket-request/src/main/java/org/apache/wicket/request/HttpHeaderCollection.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/HttpHeaderCollection.java b/wicket-request/src/main/java/org/apache/wicket/request/HttpHeaderCollection.java
index 080c7fe..e3a922c 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/HttpHeaderCollection.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/HttpHeaderCollection.java
@@ -46,7 +46,7 @@ public class HttpHeaderCollection
public HttpHeaderCollection()
{
- headers = new HashMap<HeaderKey, List<Object>>();
+ headers = new HashMap<>();
}
/**
@@ -65,7 +65,7 @@ public class HttpHeaderCollection
if (values == null)
{
- values = new ArrayList<Object>();
+ values = new ArrayList<>();
headers.put(key, values);
}
values.add(object);
@@ -202,7 +202,7 @@ public class HttpHeaderCollection
return Collections.emptySet();
}
- final Set<String> names = new HashSet<String>(headers.size());
+ final Set<String> names = new HashSet<>(headers.size());
for (HeaderKey key : headers.keySet())
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aba89bc/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java b/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
index 4267888..2d79893 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
@@ -36,9 +36,9 @@ public abstract class RequestHandlerStack
private static final Logger log = LoggerFactory.getLogger(RequestHandlerStack.class);
// we need both Queue and List interfaces
- private final LinkedList<IRequestHandler> requestHandlers = new LinkedList<IRequestHandler>();
+ private final LinkedList<IRequestHandler> requestHandlers = new LinkedList<>();
- private final List<IRequestHandler> inactiveRequestHandlers = new ArrayList<IRequestHandler>();
+ private final List<IRequestHandler> inactiveRequestHandlers = new ArrayList<>();
private IRequestHandler scheduledAfterCurrent = null;
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aba89bc/wicket-request/src/main/java/org/apache/wicket/request/Url.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/Url.java b/wicket-request/src/main/java/org/apache/wicket/request/Url.java
index 7f85f1b..b9769e8 100755
--- a/wicket-request/src/main/java/org/apache/wicket/request/Url.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/Url.java
@@ -134,8 +134,8 @@ public class Url implements Serializable
protocol = url.protocol;
host = url.host;
port = url.port;
- segments = new ArrayList<String>(url.segments);
- parameters = new ArrayList<QueryParameter>(url.parameters);
+ segments = new ArrayList<>(url.segments);
+ parameters = new ArrayList<>(url.parameters);
charsetName = url.charsetName;
_charset = url._charset;
}
@@ -175,8 +175,8 @@ public class Url implements Serializable
Args.notNull(segments, "segments");
Args.notNull(parameters, "parameters");
- this.segments = new ArrayList<String>(segments);
- this.parameters = new ArrayList<QueryParameter>(parameters);
+ this.segments = new ArrayList<>(segments);
+ this.parameters = new ArrayList<>(parameters);
setCharset(charset);
}
@@ -798,7 +798,7 @@ public class Url implements Serializable
if (!isAtLeastOneSegmentReal(segments) && !isLastSegmentEmpty(segments))
{
- segments = new ArrayList<String>(segments);
+ segments = new ArrayList<>(segments);
segments.add("");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aba89bc/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java b/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
index f78d301..cfed30b 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
@@ -41,7 +41,7 @@ public class UrlRenderer
{
private static final Logger LOG = LoggerFactory.getLogger(UrlRenderer.class);
- private static final Map<String, Integer> PROTO_TO_PORT = new HashMap<String, Integer>();
+ private static final Map<String, Integer> PROTO_TO_PORT = new HashMap<>();
static
{
PROTO_TO_PORT.put("http", 80);
@@ -235,12 +235,12 @@ public class UrlRenderer
}
List<String> baseUrlSegments = getBaseUrl().getSegments();
- List<String> urlSegments = new ArrayList<String>(url.getSegments());
+ List<String> urlSegments = new ArrayList<>(url.getSegments());
removeCommonPrefixes(request, baseUrlSegments);
removeCommonPrefixes(request, urlSegments);
- List<String> newSegments = new ArrayList<String>();
+ List<String> newSegments = new ArrayList<>();
int common = 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aba89bc/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
index ae13ac2..1dc0e5b 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java
@@ -100,7 +100,7 @@ public class CompoundRequestMapper implements ICompoundRequestMapper
}
}
- private final List<IRequestMapper> mappers = new CopyOnWriteArrayList<IRequestMapper>();
+ private final List<IRequestMapper> mappers = new CopyOnWriteArrayList<>();
@Override
public CompoundRequestMapper add(final IRequestMapper mapper)
@@ -131,7 +131,7 @@ public class CompoundRequestMapper implements ICompoundRequestMapper
@Override
public IRequestHandler mapRequest(final Request request)
{
- List<MapperWithScore> list = new ArrayList<MapperWithScore>(mappers.size());
+ List<MapperWithScore> list = new ArrayList<>(mappers.size());
for (IRequestMapper mapper : mappers)
{
@@ -169,7 +169,7 @@ public class CompoundRequestMapper implements ICompoundRequestMapper
*/
private void logMappers(final List<MapperWithScore> mappersWithScores, final String url)
{
- final List<MapperWithScore> compatibleMappers = new ArrayList<MapperWithScore>();
+ final List<MapperWithScore> compatibleMappers = new ArrayList<>();
for (MapperWithScore mapperWithScore : mappersWithScores)
{
if (mapperWithScore.compatibilityScore > 0)
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aba89bc/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java
index 4d471aa..f5c0795 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java
@@ -30,7 +30,7 @@ import org.apache.wicket.util.string.StringValue;
*/
public class MountParameters
{
- private final Map<String, String> map = new HashMap<String, String>();
+ private final Map<String, String> map = new HashMap<>();
/**
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aba89bc/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
index 956ea75..dac0571 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
@@ -116,12 +116,12 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
{
if (copy.indexedParameters != null)
{
- indexedParameters = new ArrayList<String>(copy.indexedParameters);
+ indexedParameters = new ArrayList<>(copy.indexedParameters);
}
if (copy.namedParameters != null)
{
- namedParameters = new ArrayList<Entry>(copy.namedParameters);
+ namedParameters = new ArrayList<>(copy.namedParameters);
}
}
}
@@ -142,7 +142,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
{
if (indexedParameters == null)
{
- indexedParameters = new ArrayList<String>(index);
+ indexedParameters = new ArrayList<>(index);
}
for (int i = indexedParameters.size(); i <= index; ++i)
@@ -196,7 +196,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
{
return Collections.emptySet();
}
- Set<String> set = new TreeSet<String>();
+ Set<String> set = new TreeSet<>();
for (Entry entry : namedParameters)
{
set.add(entry.key);
@@ -235,7 +235,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
if (namedParameters != null)
{
- List<StringValue> result = new ArrayList<StringValue>();
+ List<StringValue> result = new ArrayList<>();
for (Entry entry : namedParameters)
{
if (entry.key.equals(name))
@@ -257,7 +257,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
@Override
public List<NamedPair> getAllNamed()
{
- List<NamedPair> res = new ArrayList<NamedPair>();
+ List<NamedPair> res = new ArrayList<>();
if (namedParameters != null)
{
for (Entry e : namedParameters)
@@ -350,10 +350,10 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP
if (namedParameters == null)
{
- namedParameters = new ArrayList<Entry>(1);
+ namedParameters = new ArrayList<>(1);
}
- List<String> values = new ArrayList<String>();
+ List<String> values = new ArrayList<>();
if (value instanceof String[])
{
values.addAll(Arrays.asList((String[])value));
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aba89bc/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java b/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java
index d40becc..632dac0 100755
--- a/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java
@@ -56,7 +56,7 @@ public class UrlRequestParametersAdapter implements IRequestParameters
@Override
public Set<String> getParameterNames()
{
- Set<String> result = new LinkedHashSet<String>();
+ Set<String> result = new LinkedHashSet<>();
for (QueryParameter parameter : url.getQueryParameters())
{
result.add(parameter.getName());
@@ -86,7 +86,7 @@ public class UrlRequestParametersAdapter implements IRequestParameters
{
if (values == null)
{
- values = new ArrayList<StringValue>();
+ values = new ArrayList<>();
}
values.add(StringValue.valueOf(parameter.getValue()));
}