raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

#19447 remove compatibility fallbacks for Java < 8

Browse source
This commit is contained in:
2beaucoup 2016-01-14 14:55:42 +01:00
parent aed67715af
commit f7a5151bbb
18 changed files with 46 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

18
akka-http-tests/src/test/java/akka/http/javadsl/server/values/FormFieldsTest.java
View file

@ -11,11 +11,9 @@ import akka.http.javadsl.server.RequestVal;
import akka.http.javadsl.testkit.JUnitRouteTest;
import akka.http.javadsl.testkit.TestRoute;
import akka.japi.Option;
import akka.japi.Pair;
import org.junit.Test;
import java.util.AbstractMap;
import java.util.Map;
public class FormFieldsTest extends JUnitRouteTest {
static FormField<String> stringParam = FormFields.stringValue("stringParam");
static FormField<Byte> byteParam = FormFields.byteValue("byteParam");
@ -33,21 +31,21 @@ public class FormFieldsTest extends JUnitRouteTest {
static RequestVal<String> nameWithDefault = FormFields.stringValue("nameWithDefault").withDefault("John Doe");
static RequestVal<Option<Integer>> optionalIntParam = FormFields.intValue("optionalIntParam").optional();
private Map.Entry<String, String> entry(String name, String value) {
return new AbstractMap.SimpleImmutableEntry<>(name, value);
private Pair<String, String> param(String name, String value) {
return Pair.create(name, value);
}
@SafeVarargs
final private HttpRequest urlEncodedRequest(Map.Entry<String, String>... entries) {
final private HttpRequest urlEncodedRequest(Pair<String, String>... params) {
StringBuilder sb = new StringBuilder();
boolean next = false;
for (Map.Entry<String, String> entry: entries) {
for (Pair<String, String> param: params) {
if (next) {
sb.append('&');
}
next = true;
sb.append(entry.getKey());
sb.append(param.first());
sb.append('=');
sb.append(entry.getValue());
sb.append(param.second());
}
return
@ -55,7 +53,7 @@ public class FormFieldsTest extends JUnitRouteTest {
.withEntity(MediaTypes.APPLICATION_X_WWW_FORM_URLENCODED.toContentType(HttpCharsets.UTF_8), sb.toString());
}
private HttpRequest singleParameterUrlEncodedRequest(String name, String value) {
return urlEncodedRequest(entry(name, value));
return urlEncodedRequest(param(name, value));
}
@Test