rife2/rife2
rife2/rife2
2
0
Fork 0
mirror of https://github.com/ethauvin/rife2.git synced 2025-05-01 02:58:12 -07:00
Code Activity

MockRequest parameter API improvement

Browse source
This commit is contained in:
Geert Bevin 2023-01-01 15:14:50 -05:00
parent fce9a59e05
commit c5fb112510
1 changed files with 56 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

94
lib/src/main/java/rife/test/MockRequest.java
View file

@ -122,8 +122,10 @@ public class MockRequest implements Request {
* <p><code>false</code> otherwise
* @see #getParameters
* @see #setParameters
* @see #setParameter(String, String[])
* @see #setParameter(String, String)
* @see #setParameter(String, String...)
* @see #setParameter(String, Object...)
* @see #parameter(String, String...)
* @see #parameter(String, Object...)
* @since 1.0
*/
public boolean hasParameter(String name) {
@ -137,8 +139,10 @@ public class MockRequest implements Request {
* and their value arrays as the values
* @see #hasParameter
* @see #setParameters
* @see #setParameter(String, String[])
* @see #setParameter(String, String)
* @see #setParameter(String, String...)
* @see #setParameter(String, Object...)
* @see #parameter(String, String...)
* @see #parameter(String, Object...)
* @since 1.0
*/
public Map<String, String[]> getParameters() {
@ -152,8 +156,10 @@ public class MockRequest implements Request {
* with the names as the keys and their value arrays as the values
* @see #hasParameter
* @see #getParameters
* @see #setParameter(String, String[])
* @see #setParameter(String, String)
* @see #setParameter(String, String...)
* @see #setParameter(String, Object...)
* @see #parameter(String, String...)
* @see #parameter(String, Object...)
* @since 1.0
*/
public void setParameters(Map<String, String[]> parameters) {
@ -175,8 +181,10 @@ public class MockRequest implements Request {
* @see #hasParameter
* @see #getParameters
* @see #setParameters
* @see #setParameter(String, String[])
* @see #setParameter(String, String)
* @see #setParameter(String, String...)
* @see #setParameter(String, Object...)
* @see #parameter(String, String...)
* @see #parameter(String, Object...)
* @since 1.0
*/
public MockRequest parameters(Map<String, String[]> parameters) {
@ -193,10 +201,11 @@ public class MockRequest implements Request {
* @see #hasParameter
* @see #getParameters
* @see #setParameters
* @see #setParameter(String, String)
* @see #parameter(String, String...)
* @see #parameter(String, Object...)
* @since 1.0
*/
public void setParameter(String name, String[] values) {
public void setParameter(String name, String... values) {
if (null == name) throw new IllegalArgumentException("name can't be null");
if (0 == name.length()) throw new IllegalArgumentException("name can't be empty");
if (null == values) throw new IllegalArgumentException("values can't be null");
@ -207,6 +216,34 @@ public class MockRequest implements Request {
}
}
/**
* Sets a parameter in this request.
*
* @param name the name of the parameter
* @param values the value array of the parameter
* @see #hasParameter
* @see #getParameters
* @see #setParameters
* @see #parameter(String, String...)
* @see #parameter(String, Object...)
* @since 1.0
*/
public void setParameter(String name, Object... values) {
if (null == name) throw new IllegalArgumentException("name can't be null");
if (0 == name.length()) throw new IllegalArgumentException("name can't be empty");
if (null == values) throw new IllegalArgumentException("values can't be null");
final var strings = new String[values.length];
for (int i = 0; i < values.length; ++i) {
strings[i] = String.valueOf(values[i]);
}
parameters_.put(name, strings);
if (files_ != null) {
files_.remove(name);
}
}
/**
* Sets a parameter in this request.
*
@ -216,11 +253,11 @@ public class MockRequest implements Request {
* @see #hasParameter
* @see #getParameters
* @see #setParameters
* @see #setParameter(String, String[])
* @see #setParameter(String, String)
* @see #setParameter(String, String...)
* @see #setParameter(String, Object...)
* @since 1.0
*/
public MockRequest parameter(String name, String[] values) {
public MockRequest parameter(String name, String... values) {
setParameter(name, values);
return this;
@ -229,37 +266,18 @@ public class MockRequest implements Request {
/**
* Sets a parameter in this request.
*
* @param name the name of the parameter
* @param value the value of the parameter
* @see #hasParameter
* @see #getParameters
* @see #setParameters
* @see #setParameter(String, String[])
* @since 1.0
*/
public void setParameter(String name, String value) {
if (null == name) throw new IllegalArgumentException("name can't be null");
if (0 == name.length()) throw new IllegalArgumentException("name can't be empty");
if (null == value) throw new IllegalArgumentException("value can't be null");
setParameter(name, new String[]{value});
}
/**
* Sets a parameter in this request.
*
* @param name the name of the parameter
* @param value the value of the parameter
* @param name the name of the parameter
* @param values the value array of the parameter
* @return this <code>MockRequest</code> instance
* @see #hasParameter
* @see #getParameters
* @see #setParameters
* @see #setParameter(String, String[])
* @see #setParameter(String, String)
* @see #setParameter(String, String...)
* @see #setParameter(String, Object...)
* @since 1.0
*/
public MockRequest parameter(String name, String value) {
setParameter(name, value);
public MockRequest parameter(String name, Object... values) {
setParameter(name, values);
return this;
}