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

Merge branch 'multimap-ng' into jetty-9

This commit is contained in:
Joakim Erdfelt 2012-08-10 15:13:07 -07:00
parent 553cf0f404 b8de9a35a4
commit d922013313
13 changed files with 352 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointSslTest.java
View File

@ -21,6 +21,7 @@ import javax.net.ssl.SSLSocket;
import org.eclipse.jetty.io.ssl.SslConnection;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.toolchain.test.annotation.Stress;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.junit.Assert;
@ -191,6 +192,7 @@ public class SelectChannelEndPointSslTest extends SelectChannelEndPointTest
@Test
@Override
@Ignore("Not working")
public void testWriteBlocked() throws Exception
{
super.testWriteBlocked();
@ -255,6 +257,7 @@ public class SelectChannelEndPointSslTest extends SelectChannelEndPointTest
@Test
@Override
@Stress("Requires a relatively idle (network wise) environment")
public void testStress() throws Exception
{
super.testStress();

22
jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java
View File

@ -17,8 +17,6 @@ import java.io.IOException;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import javax.servlet.DispatcherType;
import javax.servlet.RequestDispatcher;
@ -30,7 +28,6 @@ import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.util.Attributes;
import org.eclipse.jetty.util.LazyList;
import org.eclipse.jetty.util.MultiMap;
import org.eclipse.jetty.util.UrlEncoded;
@ -128,7 +125,7 @@ public class Dispatcher implements RequestDispatcher
final DispatcherType old_type = baseRequest.getDispatcherType();
final Attributes old_attr=baseRequest.getAttributes();
MultiMap old_params=baseRequest.getParameters();
MultiMap<String> old_params=baseRequest.getParameters();
try
{
baseRequest.setDispatcherType(DispatcherType.INCLUDE);
@ -148,21 +145,12 @@ public class Dispatcher implements RequestDispatcher
old_params=baseRequest.getParameters();
}
MultiMap parameters=new MultiMap();
MultiMap<String> parameters=new MultiMap<>();
UrlEncoded.decodeTo(query,parameters,baseRequest.getCharacterEncoding());
if (old_params!=null && old_params.size()>0)
{
if(old_params != null) {
// Merge parameters.
Iterator iter = old_params.entrySet().iterator();
while (iter.hasNext())
{
Map.Entry entry = (Map.Entry)iter.next();
String name=(String)entry.getKey();
Object values=entry.getValue();
for (int i=0;i<LazyList.size(values);i++)
parameters.add(name, LazyList.get(values, i));
}
parameters.addAllValues(old_params);
}
baseRequest.setParameters(parameters);
}
@ -215,7 +203,7 @@ public class Dispatcher implements RequestDispatcher
final String old_query=baseRequest.getQueryString();
final Attributes old_attr=baseRequest.getAttributes();
final DispatcherType old_type=baseRequest.getDispatcherType();
MultiMap old_params=baseRequest.getParameters();
MultiMap<String> old_params=baseRequest.getParameters();
try
{

72
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
View File

@ -30,11 +30,9 @@ import java.util.Collections;
import java.util.Enumeration;
import java.util.EventListener;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import javax.servlet.AsyncContext;
import javax.servlet.AsyncListener;
@ -68,7 +66,6 @@ import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandler.Context;
import org.eclipse.jetty.util.Attributes;
import org.eclipse.jetty.util.AttributesMap;
import org.eclipse.jetty.util.LazyList;
import org.eclipse.jetty.util.MultiMap;
import org.eclipse.jetty.util.MultiPartInputStream;
import org.eclipse.jetty.util.StringUtil;
@ -126,7 +123,7 @@ public class Request implements HttpServletRequest
private boolean _asyncSupported = true;
private volatile Attributes _attributes;
private Authentication _authentication;
private MultiMap _baseParameters;
private MultiMap<String> _baseParameters;
private String _characterEncoding;
private ContextHandler.Context _context;
private boolean _newContext;
@ -138,7 +135,7 @@ public class Request implements HttpServletRequest
private int _inputState = __NONE;
private HttpMethod _httpMethod;
private String _method;
private MultiMap _parameters;
private MultiMap<String> _parameters;
private boolean _paramsExtracted;
private String _pathInfo;
private int _port;
@ -192,7 +189,7 @@ public class Request implements HttpServletRequest
public void extractParameters()
{
if (_baseParameters == null)
_baseParameters = new MultiMap();
_baseParameters = new MultiMap<>();
if (_paramsExtracted)
{
@ -283,15 +280,7 @@ public class Request implements HttpServletRequest
else if (_parameters != _baseParameters)
{
// Merge parameters (needed if parameters extracted after a forward).
Iterator<?> iter = _baseParameters.entrySet().iterator();
while (iter.hasNext())
{
Map.Entry<?, ?> entry = (Map.Entry<?, ?>)iter.next();
String name = (String)entry.getKey();
Object values = entry.getValue();
for (int i = 0; i < LazyList.size(values); i++)
_parameters.add(name,LazyList.get(values,i));
}
_parameters.addAllValues(_baseParameters);
}
}
finally
@ -335,10 +324,10 @@ public class Request implements HttpServletRequest
* @see javax.servlet.ServletRequest#getAttributeNames()
*/
@Override
public Enumeration getAttributeNames()
public Enumeration<String> getAttributeNames()
{
if (_attributes == null)
return Collections.enumeration(Collections.EMPTY_LIST);
return Collections.enumeration(Collections.<String>emptyList());
return AttributesMap.getAttributeNamesCopy(_attributes);
}
@ -499,7 +488,7 @@ public class Request implements HttpServletRequest
* @see javax.servlet.http.HttpServletRequest#getHeaderNames()
*/
@Override
public Enumeration getHeaderNames()
public Enumeration<String> getHeaderNames()
{
return _fields.getFieldNames();
}
@ -509,11 +498,11 @@ public class Request implements HttpServletRequest
* @see javax.servlet.http.HttpServletRequest#getHeaders(java.lang.String)
*/
@Override
public Enumeration getHeaders(String name)
public Enumeration<String> getHeaders(String name)
{
Enumeration<?> e = _fields.getValues(name);
Enumeration<String> e = _fields.getValues(name);
if (e == null)
return Collections.enumeration(Collections.EMPTY_LIST);
return Collections.enumeration(Collections.<String>emptyList());
return e;
}
@ -691,7 +680,7 @@ public class Request implements HttpServletRequest
* @see javax.servlet.ServletRequest#getParameterMap()
*/
@Override
public Map getParameterMap()
public Map<String, String[]> getParameterMap()
{
if (!_paramsExtracted)
extractParameters();
@ -715,7 +704,7 @@ public class Request implements HttpServletRequest
/**
* @return Returns the parameters.
*/
public MultiMap getParameters()
public MultiMap<String> getParameters()
{
return _parameters;
}
@ -729,7 +718,7 @@ public class Request implements HttpServletRequest
{
if (!_paramsExtracted)
extractParameters();
List<Object> vals = _parameters.getValues(name);
List<String> vals = _parameters.getValues(name);
if (vals == null)
return null;
return vals.toArray(new String[vals.size()]);
@ -1691,7 +1680,7 @@ public class Request implements HttpServletRequest
* @param parameters
* The parameters to set.
*/
public void setParameters(MultiMap parameters)
public void setParameters(MultiMap<String> parameters)
{
_parameters = (parameters == null)?_baseParameters:parameters;
if (_paramsExtracted && _parameters == null)
@ -2017,7 +2006,7 @@ public class Request implements HttpServletRequest
public void mergeQueryString(String query)
{
// extract parameters from dispatch query
MultiMap parameters = new MultiMap();
MultiMap<String> parameters = new MultiMap<>();
UrlEncoded.decodeTo(query,parameters,getCharacterEncoding());
boolean merge_old_query = false;
@ -2030,21 +2019,7 @@ public class Request implements HttpServletRequest
if (_parameters != null && _parameters.size() > 0)
{
// Merge parameters; new parameters of the same name take precedence.
Iterator<Entry<String, Object>> iter = _parameters.entrySet().iterator();
while (iter.hasNext())
{
Map.Entry<String, Object> entry = iter.next();
String name = entry.getKey();
// If the names match, we will need to remake the query string
if (parameters.containsKey(name))
merge_old_query = true;
// Add the old values to the new parameter map
Object values = entry.getValue();
for (int i = 0; i < LazyList.size(values); i++)
parameters.add(name,LazyList.get(values,i));
}
merge_old_query = parameters.addAllValues(_parameters);
}
if (_queryString != null && _queryString.length() > 0)
@ -2052,23 +2027,20 @@ public class Request implements HttpServletRequest
if (merge_old_query)
{
StringBuilder overridden_query_string = new StringBuilder();
MultiMap overridden_old_query = new MultiMap();
MultiMap<String> overridden_old_query = new MultiMap<>();
UrlEncoded.decodeTo(_queryString,overridden_old_query,getCharacterEncoding());
MultiMap overridden_new_query = new MultiMap();
MultiMap<String> overridden_new_query = new MultiMap<>();
UrlEncoded.decodeTo(query,overridden_new_query,getCharacterEncoding());
Iterator<Entry<String, Object>> iter = overridden_old_query.entrySet().iterator();
while (iter.hasNext())
for(String name: overridden_old_query.keySet())
{
Map.Entry<String, Object> entry = iter.next();
String name = entry.getKey();
if (!overridden_new_query.containsKey(name))
{
Object values = entry.getValue();
for (int i = 0; i < LazyList.size(values); i++)
List<String> values = overridden_old_query.get(name);
for(String v: values)
{
overridden_query_string.append("&").append(name).append("=").append(LazyList.get(values,i));
overridden_query_string.append("&").append(name).append("=").append(v);
}
}
}

4
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java
View File

@ -144,7 +144,9 @@ public class ShutdownHandler extends AbstractHandler
private boolean hasCorrectSecurityToken(HttpServletRequest request)
{
return _shutdownToken.equals(request.getParameter("token"));
String tok = request.getParameter("token");
LOG.debug("Token: {}", tok);
return _shutdownToken.equals(tok);
}
private void shutdownServer() throws Exception

8
jetty-server/src/test/java/org/eclipse/jetty/server/HttpURITest.java
View File

@ -217,7 +217,7 @@ public class HttpURITest
try
{
HttpURI huri=new HttpURI(uri);
MultiMap params = new MultiMap();
MultiMap<String> params = new MultiMap<>();
huri.decodeQueryTo(params);
System.err.println(params);
Assert.assertTrue(false);
@ -229,7 +229,7 @@ public class HttpURITest
try
{
HttpURI huri=new HttpURI(uri);
MultiMap params = new MultiMap();
MultiMap<String> params = new MultiMap<>();
huri.decodeQueryTo(params,"UTF-8");
System.err.println(params);
Assert.assertTrue(false);
@ -247,9 +247,9 @@ public class HttpURITest
{
HttpURI uri = new HttpURI("/path?value="+URLEncoder.encode(value,"UTF-8"));
MultiMap parameters = new MultiMap();
MultiMap<String> parameters = new MultiMap<>();
uri.decodeQueryTo(parameters,"UTF-8");
assertEquals(value,parameters.get("value"));
assertEquals(value,parameters.getString("value"));
}
}

2
jetty-server/src/test/resources/jetty-logging.properties
View File

@ -1,2 +1,2 @@
org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
#org.eclipse.jetty.LEVEL=WARN
# org.eclipse.jetty.LEVEL=WARN

4
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
View File

@ -99,7 +99,7 @@ public class ServletHandler extends ScopedHandler
private final Map<String,FilterHolder> _filterNameMap= new HashMap<>();
private List<FilterMapping> _filterPathMappings;
private MultiMap _filterNameMappings;
private MultiMap<FilterMapping> _filterNameMappings;
private final Map<String,ServletHolder> _servletNameMap=new HashMap<>();
private PathMap _servletPathMap;
@ -1109,7 +1109,7 @@ public class ServletHandler extends ScopedHandler
else
{
_filterPathMappings=new ArrayList<>();
_filterNameMappings=new MultiMap();
_filterNameMappings=new MultiMap<FilterMapping>();
for (FilterMapping filtermapping : _filterMappings)
{
FilterHolder filter_holder = _filterNameMap.get(filtermapping.getFilterName());

3
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
View File

@ -137,7 +137,6 @@ public class MultiPartFilter implements Filter
MultipartConfigElement config = new MultipartConfigElement(tempdir.getCanonicalPath(), _maxFileSize, _maxRequestSize, _fileOutputBuffer);
MultiPartInputStream mpis = new MultiPartInputStream(in, content_type, config, tempdir);
try
{
Collection<Part> parts = mpis.getParts();
@ -222,7 +221,7 @@ public class MultiPartFilter implements Filter
private static class Wrapper extends HttpServletRequestWrapper
{
String _encoding=StringUtil.__UTF8;
MultiMap _params;
MultiMap<Object> _params;
/* ------------------------------------------------------------------------------- */
/** Constructor.

3
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
View File

@ -75,7 +75,6 @@ public class GzipTester
public void assertIsResponseGzipCompressed(String requestedFilename, String serverFilename) throws Exception
{
System.err.printf("[GzipTester] requesting /context/%s%n",requestedFilename);
HttpTester.Request request = HttpTester.newRequest();
HttpTester.Response response;
@ -92,7 +91,7 @@ public class GzipTester
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
// Assert the response headers
// Assert.assertThat("Response.status",response.getStatus(),is(HttpServletResponse.SC_OK));
// Assert.assertThat("Response.status",response.getStatus(),is(HttpServletResponse.SC_OK));
Assert.assertThat("Response.header[Content-Length]",response.get("Content-Length"),notNullValue());
Assert.assertThat("Response.header[Content-Encoding]",response.get("Content-Encoding"),containsString(compressionType));

384
jetty-util/src/main/java/org/eclipse/jetty/util/MultiMap.java
View File

@ -13,34 +13,33 @@
package org.eclipse.jetty.util;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
/* ------------------------------------------------------------ */
/** A multi valued Map.
*
/**
* A multi valued Map.
*/
public class MultiMap implements Map<String,Object>
@SuppressWarnings("serial")
public class MultiMap<V> extends HashMap<String,List<V>>
{
Map<String,Object> _map;
public MultiMap()
{
_map=new HashMap<String, Object>();
super();
}
public MultiMap(Map<String,Object> map)
public MultiMap(Map<String,List<V>> map)
{
_map=new HashMap<String, Object>(map);
super(map);
}
public MultiMap(MultiMap map)
public MultiMap(MultiMap<V> map)
{
_map=new HashMap<String,Object>(map._map);
super(map);
}
@ -50,9 +49,13 @@ public class MultiMap implements Map<String,Object>
* @param name The entry key.
* @return Unmodifieable List of values.
*/
public List getValues(String name)
public List<V> getValues(String name)
{
return LazyList.getList(_map.get(name),true);
List<V> vals = super.get(name);
if((vals == null) || vals.isEmpty()) {
return null;
}
return vals;
}
/* ------------------------------------------------------------ */
@ -63,12 +66,16 @@ public class MultiMap implements Map<String,Object>
* @param i Index of element to get.
* @return Unmodifieable List of values.
*/
public Object getValue(String name,int i)
public V getValue(String name,int i)
{
Object l=_map.get(name);
if (i==0 && LazyList.size(l)==0)
List<V> vals = getValues(name);
if(vals == null) {
return null;
return LazyList.get(l,i);
}
if (i==0 && vals.isEmpty()) {
return null;
}
return vals.get(i);
}
@ -82,84 +89,83 @@ public class MultiMap implements Map<String,Object>
*/
public String getString(String name)
{
Object l=_map.get(name);
switch(LazyList.size(l))
List<V> vals =get(name);
if ((vals == null) || (vals.isEmpty()))
{
case 0:
return null;
case 1:
Object o=LazyList.get(l,0);
return o==null?null:o.toString();
default:
{
StringBuilder values=new StringBuilder(128);
for (int i=0; i<LazyList.size(l); i++)
{
Object e=LazyList.get(l,i);
if (e!=null)
{
if (values.length()>0)
values.append(',');
values.append(e.toString());
}
}
return values.toString();
}
return null;
}
if (vals.size() == 1)
{
// simple form.
return vals.get(0).toString();
}
// delimited form
StringBuilder values=new StringBuilder(128);
for (V e : vals)
{
if (e != null)
{
if (values.length() > 0)
values.append(',');
values.append(e.toString());
}
}
return values.toString();
}
/* ------------------------------------------------------------ */
@Override
public Object get(Object name)
{
Object l=_map.get(name);
switch(LazyList.size(l))
{
case 0:
return null;
case 1:
Object o=LazyList.get(l,0);
return o;
default:
return LazyList.getList(l,true);
}
}
/* ------------------------------------------------------------ */
/** Put and entry into the map.
/**
* Put multi valued entry.
* @param name The entry key.
* @param value The entry value.
* @param value The simple value
* @return The previous value or null.
*/
@Override
public Object put(String name, Object value)
public List<V> put(String name, V value)
{
return _map.put(name,LazyList.add(null,value));
if(value == null) {
return super.put(name, null);
}
List<V> vals = new ArrayList<>();
vals.add(value);
return put(name,vals);
}
/**
* Shorthand version of putAll
* @param input the input map
*/
public void putAllValues(Map<String, V> input)
{
for(Map.Entry<String,V> entry: input.entrySet())
{
put(entry.getKey(), entry.getValue());
}
}
/* ------------------------------------------------------------ */
/** Put multi valued entry.
* @param name The entry key.
* @param values The List of multiple values.
* @return The previous value or null.
*/
public Object putValues(String name, List<? extends Object> values)
public List<V> putValues(String name, List<V> values)
{
return _map.put(name,values);
return super.put(name,values);
}
/* ------------------------------------------------------------ */
/** Put multi valued entry.
* @param name The entry key.
* @param values The String array of multiple values.
* @param values The array of multiple values.
* @return The previous value or null.
*/
public Object putValues(String name, String... values)
@SafeVarargs
public final List<V> putValues(String name, V... values)
{
Object list=null;
for (int i=0;i<values.length;i++)
list=LazyList.add(list,values[i]);
return _map.put(name,list);
List<V> list = new ArrayList<>();
list.addAll(Arrays.asList(values));
return super.put(name,list);
}
@ -170,12 +176,14 @@ public class MultiMap implements Map<String,Object>
* @param name The entry key.
* @param value The entry value.
*/
public void add(String name, Object value)
public void add(String name, V value)
{
Object lo = _map.get(name);
Object ln = LazyList.add(lo,value);
if (lo!=ln)
_map.put(name,ln);
List<V> lo = get(name);
if(lo == null) {
lo = new ArrayList<>();
}
lo.add(value);
super.put(name,lo);
}
/* ------------------------------------------------------------ */
@ -185,12 +193,14 @@ public class MultiMap implements Map<String,Object>
* @param name The entry key.
* @param values The List of multiple values.
*/
public void addValues(String name, List<? extends Object> values)
public void addValues(String name, List<V> values)
{
Object lo = _map.get(name);
Object ln = LazyList.addCollection(lo,values);
if (lo!=ln)
_map.put(name,ln);
List<V> lo = get(name);
if(lo == null) {
lo = new ArrayList<>();
}
lo.addAll(values);
put(name,lo);
}
/* ------------------------------------------------------------ */
@ -200,12 +210,47 @@ public class MultiMap implements Map<String,Object>
* @param name The entry key.
* @param values The String array of multiple values.
*/
public void addValues(String name, String[] values)
public void addValues(String name, V[] values)
{
Object lo = _map.get(name);
Object ln = LazyList.addCollection(lo,Arrays.asList(values));
if (lo!=ln)
_map.put(name,ln);
List<V> lo = get(name);
if(lo == null) {
lo = new ArrayList<>();
}
lo.addAll(Arrays.asList(values));
put(name,lo);
}
/**
* Merge values.
*
* @param the
* map to overlay on top of this one, merging together values if needed.
* @return true if an existing key was merged with potentially new values, false if either no change was made, or there were only new keys.
*/
public boolean addAllValues(MultiMap<V> map)
{
boolean merged = false;
if ((map == null) || (map.isEmpty()))
{
// done
return merged;
}
for (Map.Entry<String, List<V>> entry : map.entrySet())
{
String name = entry.getKey();
List<V> values = entry.getValue();
if (this.containsKey(name))
{
merged = true;
}
this.addValues(name,values);
}
return merged;
}
/* ------------------------------------------------------------ */
@ -214,52 +259,79 @@ public class MultiMap implements Map<String,Object>
* @param value The entry value.
* @return true if it was removed.
*/
public boolean removeValue(String name,Object value)
public boolean removeValue(String name,V value)
{
Object lo = _map.get(name);
Object ln=lo;
int s=LazyList.size(lo);
if (s>0)
{
ln=LazyList.remove(lo,value);
if (ln==null)
_map.remove(name);
else
_map.put(name, ln);
List<V> lo = get(name);
if((lo == null)||(lo.isEmpty())) {
return false;
}
return LazyList.size(ln)!=s;
boolean ret = lo.remove(value);
if(lo.isEmpty()) {
remove(name);
} else {
put(name,lo);
}
return ret;
}
/* ------------------------------------------------------------ */
/** Put all contents of map.
* @param m Map
/**
* Test for a specific single value in the map.
* <p>
* NOTE: This is a SLOW operation, and is actively discouraged.
* @param value
* @return
*/
@Override
public void putAll(Map<? extends String, ? extends Object> m)
public boolean containsSimpleValue(V value)
{
boolean multi = (m instanceof MultiMap);
if (multi)
for (List<V> vals : values())
{
for (Map.Entry<? extends String, ? extends Object> entry : m.entrySet())
if ((vals.size() == 1) && vals.contains(value))
{
_map.put(entry.getKey(),LazyList.clone(entry.getValue()));
return true;
}
}
else
{
_map.putAll(m);
}
return false;
}
@Override
public String toString()
{
Iterator<Entry<String, List<V>>> iter = entrySet().iterator();
StringBuilder sb = new StringBuilder();
sb.append('{');
boolean delim = false;
while (iter.hasNext())
{
Entry<String, List<V>> e = iter.next();
if (delim)
{
sb.append(", ");
}
String key = e.getKey();
List<V> vals = e.getValue();
sb.append(key);
sb.append('=');
if (vals.size() == 1)
{
sb.append(vals.get(0));
}
else
{
sb.append(vals);
}
delim = true;
}
sb.append('}');
return sb.toString();
}
/* ------------------------------------------------------------ */
/**
* @return Map of String arrays
*/
public Map<String,String[]> toStringArrayMap()
{
HashMap<String,String[]> map = new HashMap<String,String[]>(_map.size()*3/2)
HashMap<String,String[]> map = new HashMap<String,String[]>(size()*3/2)
{
@Override
public String toString()
@ -280,83 +352,17 @@ public class MultiMap implements Map<String,Object>
}
};
for(Map.Entry<String,Object> entry: _map.entrySet())
for(Map.Entry<String,List<V>> entry: entrySet())
{
String[] a = LazyList.toStringArray(entry.getValue());
String[] a = null;
if (entry.getValue() != null)
{
a = new String[entry.getValue().size()];
a = entry.getValue().toArray(a);
}
map.put(entry.getKey(),a);
}
return map;
}
@Override
public String toString()
{
return _map.toString();
}
@Override
public void clear()
{
_map.clear();
}
@Override
public boolean containsKey(Object key)
{
return _map.containsKey(key);
}
@Override
public boolean containsValue(Object value)
{
return _map.containsValue(value);
}
@Override
public Set<Entry<String, Object>> entrySet()
{
return _map.entrySet();
}
@Override
public boolean equals(Object o)
{
return _map.equals(o);
}
@Override
public int hashCode()
{
return _map.hashCode();
}
@Override
public boolean isEmpty()
{
return _map.isEmpty();
}
@Override
public Set<String> keySet()
{
return _map.keySet();
}
@Override
public Object remove(Object key)
{
return _map.remove(key);
}
@Override
public int size()
{
return _map.size();
}
@Override
public Collection<Object> values()
{
return _map.values();
}
}

42
jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java
View File

@ -18,7 +18,8 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.eclipse.jetty.util.Utf8Appendable.NotUtf8Exception;
import org.eclipse.jetty.util.log.Log;
@ -43,7 +44,8 @@ import org.eclipse.jetty.util.log.Logger;
*
* @see java.net.URLEncoder
*/
public class UrlEncoded extends MultiMap implements Cloneable
@SuppressWarnings("serial")
public class UrlEncoded extends MultiMap<String> implements Cloneable
{
static final Logger LOG = Log.getLogger(UrlEncoded.class);
@ -117,21 +119,24 @@ public class UrlEncoded extends MultiMap implements Cloneable
* @param equalsForNullValue if True, then an '=' is always used, even
* for parameters without a value. e.g. "blah?a=&b=&c=".
*/
public static String encode(MultiMap map, String charset, boolean equalsForNullValue)
public static String encode(MultiMap<String> map, String charset, boolean equalsForNullValue)
{
if (charset==null)
charset=ENCODING;
StringBuilder result = new StringBuilder(128);
Iterator<Entry<String, Object>> iter = map.entrySet().iterator();
while(iter.hasNext())
boolean delim = false;
for(Map.Entry<String, List<String>> entry: map.entrySet())
{
Entry<String, Object> entry = iter.next();
String key = entry.getKey().toString();
Object list = entry.getValue();
int s=LazyList.size(list);
List<String> list = entry.getValue();
int s=list.size();
if (delim)
{
result.append('&');
}
if (s==0)
{
@ -145,7 +150,7 @@ public class UrlEncoded extends MultiMap implements Cloneable
{
if (i>0)
result.append('&');
Object val=LazyList.get(list,i);
String val=list.get(i);
result.append(encodeString(key,charset));
if (val!=null)
@ -163,8 +168,7 @@ public class UrlEncoded extends MultiMap implements Cloneable
result.append('=');
}
}
if (iter.hasNext())
result.append('&');
delim = true;
}
return result.toString();
}
@ -175,7 +179,7 @@ public class UrlEncoded extends MultiMap implements Cloneable
/** Decoded parameters to Map.
* @param content the string containing the encoded parameters
*/
public static void decodeTo(String content, MultiMap map, String charset)
public static void decodeTo(String content, MultiMap<String> map, String charset)
{
decodeTo(content,map,charset,-1);
}
@ -184,7 +188,7 @@ public class UrlEncoded extends MultiMap implements Cloneable
/** Decoded parameters to Map.
* @param content the string containing the encoded parameters
*/
public static void decodeTo(String content, MultiMap map, String charset, int maxKeys)
public static void decodeTo(String content, MultiMap<String> map, String charset, int maxKeys)
{
if (charset==null)
charset=ENCODING;
@ -265,7 +269,7 @@ public class UrlEncoded extends MultiMap implements Cloneable
* @param map the {@link MultiMap} to populate
* @param buffer the buffer to decode into
*/
public static void decodeUtf8To(byte[] raw,int offset, int length, MultiMap map)
public static void decodeUtf8To(byte[] raw,int offset, int length, MultiMap<String> map)
{
Utf8StringBuilder buffer = new Utf8StringBuilder();
synchronized(map)
@ -346,7 +350,7 @@ public class UrlEncoded extends MultiMap implements Cloneable
* @param map MultiMap to add parameters to
* @param maxLength maximum number of keys to read or -1 for no limit
*/
public static void decode88591To(InputStream in, MultiMap map, int maxLength, int maxKeys)
public static void decode88591To(InputStream in, MultiMap<String> map, int maxLength, int maxKeys)
throws IOException
{
synchronized(map)
@ -430,7 +434,7 @@ public class UrlEncoded extends MultiMap implements Cloneable
* @param map MultiMap to add parameters to
* @param maxLength maximum number of keys to read or -1 for no limit
*/
public static void decodeUtf8To(InputStream in, MultiMap map, int maxLength, int maxKeys)
public static void decodeUtf8To(InputStream in, MultiMap<String> map, int maxLength, int maxKeys)
throws IOException
{
synchronized(map)
@ -517,7 +521,7 @@ public class UrlEncoded extends MultiMap implements Cloneable
}
/* -------------------------------------------------------------- */
public static void decodeUtf16To(InputStream in, MultiMap map, int maxLength, int maxKeys) throws IOException
public static void decodeUtf16To(InputStream in, MultiMap<String> map, int maxLength, int maxKeys) throws IOException
{
InputStreamReader input = new InputStreamReader(in,StringUtil.__UTF16);
StringWriter buf = new StringWriter(8192);
@ -530,7 +534,7 @@ public class UrlEncoded extends MultiMap implements Cloneable
/** Decoded parameters to Map.
* @param in the stream containing the encoded parameters
*/
public static void decodeTo(InputStream in, MultiMap map, String charset, int maxLength, int maxKeys)
public static void decodeTo(InputStream in, MultiMap<String> map, String charset, int maxLength, int maxKeys)
throws IOException
{
//no charset present, use the configured default

126
jetty-util/src/test/java/org/eclipse/jetty/util/MultiMapTest.java
View File

@ -1,4 +1,3 @@
package org.eclipse.jetty.util;
//========================================================================
//Copyright (c) 2006-2012 Mort Bay Consulting Pty. Ltd.
//------------------------------------------------------------------------
@ -11,7 +10,9 @@ package org.eclipse.jetty.util;
//http://www.opensource.org/licenses/apache2.0.php
//You may elect to redistribute this code under either of these licenses.
//========================================================================
package org.eclipse.jetty.util;
import static org.hamcrest.Matchers.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -28,7 +29,7 @@ public class MultiMapTest
@Test
public void testPut()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
String key = "formats";
@ -41,16 +42,32 @@ public class MultiMapTest
* Tests {@link MultiMap#put(Object, Object)}
*/
@Test
public void testPut_Null()
public void testPut_Null_String()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
String key = "formats";
String val = null;
mm.put(key,null);
mm.put(key,val);
assertMapSize(mm,1);
assertValues(mm,key,new Object[]
{ null });
assertNullValues(mm,key);
}
/**
* Tests {@link MultiMap#put(Object, Object)}
*/
@Test
public void testPut_Null_List()
{
MultiMap<String> mm = new MultiMap<>();
String key = "formats";
List<String> vals = null;
mm.put(key,vals);
assertMapSize(mm,1);
assertNullValues(mm,key);
}
/**
@ -59,7 +76,7 @@ public class MultiMapTest
@Test
public void testPut_Replace()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
String key = "formats";
Object ret;
@ -83,7 +100,7 @@ public class MultiMapTest
@Test
public void testPutValues_List()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
String key = "formats";
@ -103,7 +120,7 @@ public class MultiMapTest
@Test
public void testPutValues_StringArray()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
String key = "formats";
@ -119,7 +136,7 @@ public class MultiMapTest
@Test
public void testPutValues_VarArgs()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
String key = "formats";
@ -134,7 +151,7 @@ public class MultiMapTest
@Test
public void testAdd()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
String key = "formats";
@ -157,7 +174,7 @@ public class MultiMapTest
@Test
public void testAddValues_List()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
String key = "formats";
@ -183,7 +200,7 @@ public class MultiMapTest
@Test
public void testAddValues_List_Empty()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
String key = "formats";
@ -206,7 +223,7 @@ public class MultiMapTest
@Test
public void testAddValues_StringArray()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
String key = "formats";
@ -229,7 +246,7 @@ public class MultiMapTest
@Test
public void testAddValues_StringArray_Empty()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
String key = "formats";
@ -252,7 +269,7 @@ public class MultiMapTest
@Test
public void testRemoveValue()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
String key = "formats";
@ -274,7 +291,7 @@ public class MultiMapTest
@Test
public void testRemoveValue_InvalidItem()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
String key = "formats";
@ -295,7 +312,7 @@ public class MultiMapTest
@Test
public void testRemoveValue_AllItems()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
String key = "formats";
@ -325,7 +342,7 @@ public class MultiMapTest
@Test
public void testRemoveValue_FromEmpty()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
String key = "formats";
@ -346,7 +363,7 @@ public class MultiMapTest
@Test
public void testPutAll_Map()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
assertMapSize(mm,0); // Shouldn't have anything yet.
@ -355,7 +372,7 @@ public class MultiMapTest
input.put("color","red");
input.put("amount","bushel");
mm.putAll(input);
mm.putAllValues(input);
assertMapSize(mm,3);
assertValues(mm,"food","apple");
@ -369,11 +386,11 @@ public class MultiMapTest
@Test
public void testPutAll_MultiMap_Simple()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
assertMapSize(mm,0); // Shouldn't have anything yet.
MultiMap input = new MultiMap();
MultiMap<String> input = new MultiMap<>();
input.put("food","apple");
input.put("color","red");
input.put("amount","bushel");
@ -392,11 +409,11 @@ public class MultiMapTest
@Test
public void testPutAll_MultiMapComplex()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
assertMapSize(mm,0); // Shouldn't have anything yet.
MultiMap input = new MultiMap();
MultiMap<String> input = new MultiMap<>();
input.putValues("food","apple","cherry","raspberry");
input.put("color","red");
input.putValues("amount","bushel","pint");
@ -415,7 +432,7 @@ public class MultiMapTest
@Test
public void testToStringArrayMap()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
mm.putValues("food","apple","cherry","raspberry");
mm.put("color","red");
mm.putValues("amount","bushel","pint");
@ -436,7 +453,7 @@ public class MultiMapTest
@Test
public void testToString()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
mm.put("color","red");
Assert.assertEquals("{color=red}", mm.toString());
@ -452,7 +469,7 @@ public class MultiMapTest
@Test
public void testClear()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
mm.putValues("food","apple","cherry","raspberry");
mm.put("color","red");
mm.putValues("amount","bushel","pint");
@ -470,7 +487,7 @@ public class MultiMapTest
@Test
public void testContainsKey()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
mm.putValues("food","apple","cherry","raspberry");
mm.put("color","red");
mm.putValues("amount","bushel","pint");
@ -479,18 +496,37 @@ public class MultiMapTest
Assert.assertFalse("Contains Key [nutrition]", mm.containsKey("nutrition"));
}
/**
* Tests {@link MultiMap#containsSimpleValue(Object)}
*/
@Test
public void testContainsSimpleValue()
{
MultiMap<String> mm = new MultiMap<>();
mm.putValues("food","apple","cherry","raspberry");
mm.put("color","red");
mm.putValues("amount","bushel","pint");
Assert.assertTrue("Contains Value [red]", mm.containsSimpleValue("red"));
Assert.assertFalse("Contains Value [nutrition]", mm.containsValue("nutrition"));
}
/**
* Tests {@link MultiMap#containsValue(Object)}
*/
@Test
public void testContainsValue()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
mm.putValues("food","apple","cherry","raspberry");
mm.put("color","red");
mm.putValues("amount","bushel","pint");
Assert.assertTrue("Contains Value [red]", mm.containsValue("red"));
List<String> acr = new ArrayList<>();
acr.add("apple");
acr.add("cherry");
acr.add("raspberry");
Assert.assertTrue("Contains Value [apple,cherry,raspberry]", mm.containsValue(acr));
Assert.assertFalse("Contains Value [nutrition]", mm.containsValue("nutrition"));
}
@ -500,7 +536,7 @@ public class MultiMapTest
@Test
public void testContainsValue_LazyList()
{
MultiMap mm = new MultiMap();
MultiMap<String> mm = new MultiMap<>();
mm.putValues("food","apple","cherry","raspberry");
mm.put("color","red");
mm.putValues("amount","bushel","pint");
@ -521,22 +557,34 @@ public class MultiMapTest
}
}
private void assertValues(MultiMap mm, String key, Object... expectedValues)
private void assertValues(MultiMap<String> mm, String key, Object... expectedValues)
{
List<String> values = mm.getValues(key);
String prefix = "MultiMap.getValues(" + key + ")";
Assert.assertNotNull(prefix,values);
Assert.assertEquals(prefix + ".size",expectedValues.length,values.size());
int len = values.size();
int len = expectedValues.length;
for (int i = 0; i < len; i++)
{
Assert.assertEquals(prefix + "[" + i + "]",expectedValues[i],values.get(i));
if(expectedValues[i] == null) {
Assert.assertThat(prefix + "[" + i + "]",values.get(i),nullValue());
} else {
Assert.assertEquals(prefix + "[" + i + "]",expectedValues[i],values.get(i));
}
}
}
private void assertNullValues(MultiMap<String> mm, String key)
{
List<String> values = mm.getValues(key);
private void assertEmptyValues(MultiMap mm, String key)
String prefix = "MultiMap.getValues(" + key + ")";
Assert.assertThat(prefix + ".size",values,nullValue());
}
private void assertEmptyValues(MultiMap<String> mm, String key)
{
List<String> values = mm.getValues(key);
@ -545,7 +593,7 @@ public class MultiMapTest
Assert.assertEquals(prefix + ".size",0,LazyList.size(values));
}
private void assertMapSize(MultiMap mm, int expectedSize)
private void assertMapSize(MultiMap<String> mm, int expectedSize)
{
Assert.assertEquals("MultiMap.size",expectedSize,mm.size());
}

9
jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
View File

@ -18,6 +18,7 @@ import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
import org.junit.Assert;
import org.junit.Test;
@ -177,7 +178,7 @@ public class URLEncodedTest
for (int i=0;i<charsets.length;i++)
{
ByteArrayInputStream in = new ByteArrayInputStream("name\n=value+%30&name1=&name2&n\u00e3me3=value+3".getBytes(charsets[i][0]));
MultiMap m = new MultiMap();
MultiMap<String> m = new MultiMap<>();
UrlEncoded.decodeTo(in, m, charsets[i][1], -1,-1);
assertEquals(i+" stream length",4,m.size());
assertEquals(i+" stream name\\n","value 0",m.getString("name\n"));
@ -190,7 +191,7 @@ public class URLEncodedTest
if (java.nio.charset.Charset.isSupported("Shift_JIS"))
{
ByteArrayInputStream in2 = new ByteArrayInputStream ("name=%83e%83X%83g".getBytes());
MultiMap m2 = new MultiMap();
MultiMap<String> m2 = new MultiMap<>();
UrlEncoded.decodeTo(in2, m2, "Shift_JIS", -1,-1);
assertEquals("stream length",1,m2.size());
assertEquals("stream name","\u30c6\u30b9\u30c8",m2.getString("name"));
@ -232,7 +233,7 @@ public class URLEncodedTest
String hex ="E0B89FE0B8ABE0B881E0B8A7E0B894E0B8B2E0B988E0B881E0B89FE0B8A7E0B8ABE0B8AAE0B894E0B8B2E0B988E0B8ABE0B89FE0B881E0B8A7E0B894E0B8AAE0B8B2E0B89FE0B881E0B8ABE0B8A3E0B894E0B989E0B89FE0B8ABE0B899E0B881E0B8A3E0B894E0B8B5";
String expected = new String(TypeUtil.fromHexString(hex),"utf-8");
assertEquals(expected,url_encoded.get("text"));
Assert.assertEquals(expected,url_encoded.getString("text"));
}
/* -------------------------------------------------------------- */
@ -241,7 +242,7 @@ public class URLEncodedTest
{
String query="name=X%c0%afZ";
MultiMap map = new MultiMap();
MultiMap<String> map = new MultiMap<>();
UrlEncoded.LOG.info("EXPECT 4 Not Valid UTF8 warnings...");
UrlEncoded.decodeUtf8To(query.getBytes(StringUtil.__ISO_8859_1),0,query.length(),map);
assertEquals("X"+Utf8Appendable.REPLACEMENT+Utf8Appendable.REPLACEMENT+"Z",map.getValue("name",0));