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

!htp #17965 more consistent and 22-ified javadsl handleWith

Browse source
This commit is contained in:
Konrad Malawski 2015-07-13 16:46:07 +02:00
parent b137117399
commit 569c0bf079
27 changed files with 339 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-http-tests/src/test/java/akka/http/javadsl/server/CompleteTest.java
View file

@ -51,7 +51,7 @@ public class CompleteTest extends JUnitRouteTest {
Handler2<Integer, Integer> slowCalc = new Handler2<Integer, Integer>() {
@Override
public RouteResult handle(final RequestContext ctx, final Integer x, final Integer y) {
public RouteResult apply(final RequestContext ctx, final Integer x, final Integer y) {
return ctx.completeWith(Futures.future(new Callable<RouteResult>() {
@Override
public RouteResult call() throws Exception {
@ -62,7 +62,7 @@ public class CompleteTest extends JUnitRouteTest {
}
};
Route route = handleWith(x, y, slowCalc);
Route route = handleWith2(x, y, slowCalc);
runRoute(route, HttpRequest.GET("add?x=42&y=23"))
.assertStatusCode(200)
.assertEntity("42 + 23 = 65");

63
akka-http-tests/src/test/java/akka/http/javadsl/server/HandlerBindingTest.java
View file

@ -14,12 +14,12 @@ public class HandlerBindingTest extends JUnitRouteTest {
@Test
public void testHandlerWithoutExtractions() {
Route route = handleWith(
new Handler() {
@Override
public RouteResult handle(RequestContext ctx) {
return ctx.complete("Ok");
new Handler() {
@Override
public RouteResult apply(RequestContext ctx) {
return ctx.complete("Ok");
}
}
}
);
runRoute(route, HttpRequest.GET("/"))
.assertEntity("Ok");
@ -30,12 +30,12 @@ public class HandlerBindingTest extends JUnitRouteTest {
final Parameter<Integer> b = Parameters.intValue("b");
Route route = handleWith(
new Handler() {
@Override
public RouteResult handle(RequestContext ctx) {
return ctx.complete("Ok a:" + a.get(ctx) +" b:" + b.get(ctx));
}
}, a, b
new Handler() {
@Override
public RouteResult apply(RequestContext ctx) {
return ctx.complete("Ok a:" + a.get(ctx) + " b:" + b.get(ctx));
}
}, a, b
);
runRoute(route, HttpRequest.GET("?a=23&b=42"))
.assertEntity("Ok a:23 b:42");
@ -45,12 +45,12 @@ public class HandlerBindingTest extends JUnitRouteTest {
final Parameter<Integer> a = Parameters.intValue("a");
Route route = handleWith(
new Handler() {
@Override
public RouteResult handle(RequestContext ctx) {
return ctx.complete("Ok " + a.get(ctx));
}
}, a
new Handler() {
@Override
public RouteResult apply(RequestContext ctx) {
return ctx.complete("Ok " + a.get(ctx));
}
}, a
);
runRoute(route, HttpRequest.GET("/"))
.assertStatusCode(404)
@ -60,14 +60,13 @@ public class HandlerBindingTest extends JUnitRouteTest {
public void testHandler1() {
final Parameter<Integer> a = Parameters.intValue("a");
Route route = handleWith(
a,
new Handler1<Integer>() {
@Override
public RouteResult handle(RequestContext ctx, Integer a) {
return ctx.complete("Ok " + a);
Route route = handleWith1(a,
new Handler1<Integer>() {
@Override
public RouteResult apply(RequestContext ctx, Integer a) {
return ctx.complete("Ok " + a);
}
}
}
);
runRoute(route, HttpRequest.GET("?a=23"))
.assertStatusCode(200)
@ -75,12 +74,12 @@ public class HandlerBindingTest extends JUnitRouteTest {
}
@Test
public void testHandler2() {
Route route = handleWith(
Route route = handleWith2(
Parameters.intValue("a"),
Parameters.intValue("b"),
new Handler2<Integer, Integer>() {
@Override
public RouteResult handle(RequestContext ctx, Integer a, Integer b) {
public RouteResult apply(RequestContext ctx, Integer a, Integer b) {
return ctx.complete("Sum: " + (a + b));
}
}
@ -91,13 +90,13 @@ public class HandlerBindingTest extends JUnitRouteTest {
}
@Test
public void testHandler3() {
Route route = handleWith(
Route route = handleWith3(
Parameters.intValue("a"),
Parameters.intValue("b"),
Parameters.intValue("c"),
new Handler3<Integer, Integer, Integer>() {
@Override
public RouteResult handle(RequestContext ctx, Integer a, Integer b, Integer c) {
public RouteResult apply(RequestContext ctx, Integer a, Integer b, Integer c) {
return ctx.complete("Sum: " + (a + b + c));
}
}
@ -108,14 +107,14 @@ public class HandlerBindingTest extends JUnitRouteTest {
}
@Test
public void testHandler4() {
Route route = handleWith(
Route route = handleWith4(
Parameters.intValue("a"),
Parameters.intValue("b"),
Parameters.intValue("c"),
Parameters.intValue("d"),
new Handler4<Integer, Integer, Integer, Integer>() {
@Override
public RouteResult handle(RequestContext ctx, Integer a, Integer b, Integer c, Integer d) {
public RouteResult apply(RequestContext ctx, Integer a, Integer b, Integer c, Integer d) {
return ctx.complete("Sum: " + (a + b + c + d));
}
}
@ -131,7 +130,7 @@ public class HandlerBindingTest extends JUnitRouteTest {
return ctx.complete("Negated: " + (- a));
}
}
Route route = handleWith(new Test(), "negate", Parameters.intValue("a"));
Route route = handleReflectively(new Test(), "negate", Parameters.intValue("a"));
runRoute(route, HttpRequest.GET("?a=23"))
.assertStatusCode(200)
.assertEntity("Negated: -23");
@ -142,7 +141,7 @@ public class HandlerBindingTest extends JUnitRouteTest {
}
@Test
public void testStaticReflectiveHandler() {
Route route = handleWith(HandlerBindingTest.class, "squared", Parameters.intValue("a"));
Route route = handleReflectively(HandlerBindingTest.class, "squared", Parameters.intValue("a"));
runRoute(route, HttpRequest.GET("?a=23"))
.assertStatusCode(200)
.assertEntity("Squared: 529");

16
akka-http-tests/src/test/java/akka/http/javadsl/server/MarshallerTest.java
View file

@ -37,7 +37,7 @@ public class MarshallerTest extends JUnitRouteTest {
Handler1<Integer> nummerHandler = new Handler1<Integer>() {
@Override
public RouteResult handle(RequestContext ctx, Integer integer) {
public RouteResult apply(RequestContext ctx, Integer integer) {
return ctx.completeAs(numberAsNameMarshaller, integer);
}
};
@ -46,7 +46,7 @@ public class MarshallerTest extends JUnitRouteTest {
testRoute(
get(
path("nummer").route(
handleWith(n, nummerHandler)
handleWith1(n, nummerHandler)
)
)
);
@ -88,7 +88,7 @@ public class MarshallerTest extends JUnitRouteTest {
Handler1<Integer> nummerHandler = new Handler1<Integer>() {
@Override
public RouteResult handle(RequestContext ctx, Integer integer) {
public RouteResult apply(RequestContext ctx, Integer integer) {
return ctx.completeAs(numberAsJsonListMarshaller, integer);
}
};
@ -97,7 +97,7 @@ public class MarshallerTest extends JUnitRouteTest {
testRoute(
get(
path("nummer").route(
handleWith(n, nummerHandler)
handleWith1(n, nummerHandler)
)
)
);
@ -132,7 +132,7 @@ public class MarshallerTest extends JUnitRouteTest {
Handler1<Integer> nummerHandler = new Handler1<Integer>() {
@Override
public RouteResult handle(RequestContext ctx, Integer integer) {
public RouteResult apply(RequestContext ctx, Integer integer) {
return ctx.completeAs(numberAsJsonListMarshaller, integer);
}
};
@ -141,7 +141,7 @@ public class MarshallerTest extends JUnitRouteTest {
testRoute(
get(
path("nummer").route(
handleWith(n, nummerHandler)
handleWith1(n, nummerHandler)
)
)
);
@ -176,7 +176,7 @@ public class MarshallerTest extends JUnitRouteTest {
Handler1<Integer> nummerHandler = new Handler1<Integer>() {
@Override
public RouteResult handle(RequestContext ctx, Integer integer) {
public RouteResult apply(RequestContext ctx, Integer integer) {
return ctx.completeAs(numberAsJsonListMarshaller, integer);
}
};
@ -185,7 +185,7 @@ public class MarshallerTest extends JUnitRouteTest {
testRoute(
get(
path("nummer").route(
handleWith(n, nummerHandler)
handleWith1(n, nummerHandler)
)
)
);

4
akka-http-tests/src/test/java/akka/http/javadsl/server/directives/ExecutionDirectivesTest.java
View file

@ -19,7 +19,7 @@ public class ExecutionDirectivesTest extends JUnitRouteTest {
Handler2<Integer, Integer> divide =
new Handler2<Integer, Integer>() {
@Override
public RouteResult handle(RequestContext ctx, Integer a, Integer b) {
public RouteResult apply(RequestContext ctx, Integer a, Integer b) {
int result = a / b;
return ctx.complete("The result is: " + result);
}
@ -44,7 +44,7 @@ public class ExecutionDirectivesTest extends JUnitRouteTest {
testRoute(
handleExceptions(handleDivByZero,
path("divide").route(
handleWith(a, b, divide)
handleWith2(a, b, divide)
)
)
);

4
akka-http-tests/src/test/java/akka/http/javadsl/server/directives/PathDirectivesTest.java
View file

@ -239,9 +239,9 @@ public class PathDirectivesTest extends JUnitRouteTest {
TestRoute route =
testRoute(
path("multiply", x, "with", y).route(
handleWith(x, y, new Handler2<Integer, Integer>() {
handleWith2(x, y, new Handler2<Integer, Integer>() {
@Override
public RouteResult handle(RequestContext ctx, Integer x, Integer y) {
public RouteResult apply(RequestContext ctx, Integer x, Integer y) {
return ctx.complete(String.format("%d * %d = %d", x, y, x * y));
}
})

4
akka-http-tests/src/test/java/akka/http/javadsl/server/values/HttpBasicAuthenticationTest.java
View file

@ -29,7 +29,7 @@ public class HttpBasicAuthenticationTest extends JUnitRouteTest {
Handler1<String> helloWorldHandler =
new Handler1<String>() {
@Override
public RouteResult handle(RequestContext ctx, String user) {
public RouteResult apply(RequestContext ctx, String user) {
return ctx.complete("Hello "+user+"!");
}
};
@ -38,7 +38,7 @@ public class HttpBasicAuthenticationTest extends JUnitRouteTest {
testRoute(
path("secure").route(
authenticatedUser.route(
handleWith(authenticatedUser, helloWorldHandler)
handleWith1(authenticatedUser, helloWorldHandler)
)
)
);

12
akka-http-tests/src/test/java/akka/http/javadsl/server/values/ParametersTest.java
View file

@ -274,9 +274,9 @@ public class ParametersTest extends JUnitRouteTest {
@Test
public void testParametersAsMapExtraction() {
TestRoute route = testRoute(handleWith(paramMap, new Handler1<Map<String, String>>(){
TestRoute route = testRoute(handleWith1(paramMap, new Handler1<Map<String, String>>(){
@Override
public RouteResult handle(RequestContext ctx, Map<String, String> paramMap) {
public RouteResult apply(RequestContext ctx, Map<String, String> paramMap) {
ArrayList<String> keys = new ArrayList<String>(paramMap.keySet());
Collections.sort(keys);
StringBuilder res = new StringBuilder();
@ -305,9 +305,9 @@ public class ParametersTest extends JUnitRouteTest {
}
@Test
public void testParametersAsMultiMapExtraction() {
TestRoute route = testRoute(handleWith(paramMultiMap, new Handler1<Map<String, Collection<String>>>(){
TestRoute route = testRoute(handleWith1(paramMultiMap, new Handler1<Map<String, Collection<String>>>(){
@Override
public RouteResult handle(RequestContext ctx, Map<String, Collection<String>> paramMap) {
public RouteResult apply(RequestContext ctx, Map<String, Collection<String>> paramMap) {
ArrayList<String> keys = new ArrayList<String>(paramMap.keySet());
Collections.sort(keys);
StringBuilder res = new StringBuilder();
@ -342,9 +342,9 @@ public class ParametersTest extends JUnitRouteTest {
}
@Test
public void testParametersAsCollectionExtraction() {
TestRoute route = testRoute(handleWith(paramEntries, new Handler1<Collection<Map.Entry<String, String>>>(){
TestRoute route = testRoute(handleWith1(paramEntries, new Handler1<Collection<Map.Entry<String, String>>>(){
@Override
public RouteResult handle(RequestContext ctx, Collection<Map.Entry<String, String>> paramEntries) {
public RouteResult apply(RequestContext ctx, Collection<Map.Entry<String, String>> paramEntries) {
ArrayList<Map.Entry<String, String>> entries = new ArrayList<Map.Entry<String, String>>(paramEntries);
Collections.sort(entries, new Comparator<Map.Entry<String, String>>() {
@Override