Skip to content

Commit 16ec770

Browse files
committed
API change: Replace Body with Result #51
1 parent f282b72 commit 16ec770

18 files changed

Lines changed: 586 additions & 493 deletions

File tree

coverage-report/src/test/java/org/jooby/BufferSizeFeature.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.Optional;
44

5-
import org.jooby.Body;
65
import org.jooby.test.ServerFeature;
76
import org.junit.Before;
87
import org.junit.Test;
@@ -23,7 +22,7 @@ public class BufferSizeFeature extends ServerFeature {
2322
String value = req.param("data").value();
2423
Optional<Long> len = req.param("len").toOptional(Long.class);
2524
Optional<Boolean> chunked = req.param("chunked").toOptional(Boolean.class);
26-
Body rsp = Body.ok(value);
25+
Result rsp = Results.ok(value);
2726
len.ifPresent(l -> rsp.header("Content-Length", l));
2827
chunked.ifPresent(c -> rsp.header("Transfer-Encoding", "Chunked"));
2928
return rsp;

coverage-report/src/test/java/org/jooby/RedirectFeature.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.jooby;
22

3-
import org.jooby.Body;
43
import org.jooby.mvc.GET;
54
import org.jooby.mvc.Path;
65
import org.jooby.test.ServerFeature;
@@ -13,26 +12,26 @@ public static class Resource {
1312

1413
@Path("/redirect")
1514
@GET
16-
public Body redirect() {
17-
return Body.redirect("/r/here");
15+
public Result redirect() {
16+
return Results.redirect("/r/here");
1817
}
1918

2019
@Path("/seeOther")
2120
@GET
22-
public Body seeOther() {
23-
return Body.seeOther("/r/here");
21+
public Result seeOther() {
22+
return Results.seeOther("/r/here");
2423
}
2524

2625
@Path("/tempRedirect")
2726
@GET
28-
public Body tempRedirect() {
29-
return Body.tempRedirect("/r/here");
27+
public Result tempRedirect() {
28+
return Results.tempRedirect("/r/here");
3029
}
3130

3231
@Path("/moved")
3332
@GET
34-
public Body moved() {
35-
return Body.moved("/r/here");
33+
public Result moved() {
34+
return Results.moved("/r/here");
3635
}
3736

3837
@Path("/here")

coverage-report/src/test/java/org/jooby/ResponseBodyFeature.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.jooby;
22

3-
import org.jooby.Body;
43
import org.jooby.mvc.GET;
54
import org.jooby.mvc.Path;
65
import org.jooby.test.ServerFeature;
@@ -12,26 +11,26 @@ public static class Resource {
1211

1312
@GET
1413
@Path("/200")
15-
public Body ok() {
16-
return Body.ok();
14+
public Result ok() {
15+
return Results.ok();
1716
}
1817

1918
@GET
2019
@Path("/200/body")
21-
public Body okWithBody() {
22-
return Body.ok("***");
20+
public Result okWithBody() {
21+
return Results.ok("***");
2322
}
2423

2524
@GET
2625
@Path("/204")
27-
public Body noContent() {
28-
return Body.noContent();
26+
public Result noContent() {
27+
return Results.noContent();
2928
}
3029

3130
@GET
3231
@Path("/headers")
33-
public Body headers() {
34-
return Body.ok().header("x", "y");
32+
public Result headers() {
33+
return Results.ok().header("x", "y");
3534
}
3635

3736
}

coverage-report/src/test/java/org/jooby/hbm/HbmCustomFeature.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import javax.persistence.EntityManager;
66
import javax.persistence.Query;
77

8-
import org.jooby.Body;
8+
import org.jooby.Results;
99
import org.jooby.hbm.data.Member;
1010
import org.jooby.test.ServerFeature;
1111
import org.junit.Test;
@@ -36,7 +36,7 @@ public class HbmCustomFeature extends ServerFeature {
3636
throw new IllegalArgumentException("Rollback on err");
3737
}
3838
// we do this way just to make sure the correct delegate got executed
39-
rsp.send(Body.body(member));
39+
rsp.send(Results.with(member));
4040
chain.next(req, rsp);
4141
});
4242
}

coverage-report/src/test/java/org/jooby/hbm/HbmFeature.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
import javax.persistence.EntityManager;
66
import javax.persistence.Query;
77

8-
import org.jooby.Body;
9-
import org.jooby.hbm.Hbm;
8+
import org.jooby.Results;
109
import org.jooby.hbm.data.Member;
1110
import org.jooby.test.ServerFeature;
1211
import org.junit.Test;
@@ -35,7 +34,7 @@ public class HbmFeature extends ServerFeature {
3534
throw new IllegalArgumentException("Rollback on err");
3635
}
3736
// we do this way just to make sure the correct delegate got executed
38-
rsp.send(Body.body(member));
37+
rsp.send(Results.with(member));
3938
chain.next(req, rsp);
4039
});
4140
}

coverage-report/src/test/java/org/jooby/hbm/HbmProdEnvFeature.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
import javax.persistence.EntityManager;
66
import javax.persistence.Query;
77

8-
import org.jooby.Body;
9-
import org.jooby.hbm.Hbm;
8+
import org.jooby.Results;
109
import org.jooby.hbm.data.Member;
1110
import org.jooby.test.ServerFeature;
1211
import org.junit.Test;
@@ -37,7 +36,7 @@ public class HbmProdEnvFeature extends ServerFeature {
3736
throw new IllegalArgumentException("Rollback on err");
3837
}
3938
// we do this way just to make sure the correct delegate got executed
40-
rsp.send(Body.body(member));
39+
rsp.send(Results.with(member));
4140
chain.next(req, rsp);
4241
});
4342
}

coverage-report/src/test/java/org/jooby/hbm/HbmScanFeature.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
import javax.persistence.EntityManager;
66
import javax.persistence.Query;
77

8-
import org.jooby.Body;
9-
import org.jooby.hbm.Hbm;
8+
import org.jooby.Results;
109
import org.jooby.hbm.data.Member;
1110
import org.jooby.test.ServerFeature;
1211
import org.junit.Test;
@@ -35,7 +34,7 @@ public class HbmScanFeature extends ServerFeature {
3534
throw new IllegalArgumentException("Rollback on err");
3635
}
3736
// we do this way just to make sure the correct delegate got executed
38-
rsp.send(Body.body(member));
37+
rsp.send(Results.with(member));
3938
chain.next(req, rsp);
4039
});
4140
}

jooby-hbm/src/main/java/org/jooby/hbm/Hbm.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
import org.hibernate.Session;
3737
import org.hibernate.engine.spi.SessionImplementor;
3838
import org.hibernate.jpa.AvailableSettings;
39-
import org.jooby.Body;
4039
import org.jooby.Env;
4140
import org.jooby.Response;
41+
import org.jooby.Result;
4242
import org.jooby.Route;
4343
import org.jooby.internal.hbm.HbmProvider;
4444
import org.jooby.internal.hbm.HbmUnitDescriptor;
@@ -184,9 +184,9 @@ public void send(final Object body) throws Exception {
184184
}
185185

186186
@Override
187-
public void send(final Body body) throws Exception {
187+
public void send(final Result result) throws Exception {
188188
transactionalSend(() -> {
189-
super.send(body);
189+
super.send(result);
190190
return null;
191191
});
192192
}

jooby-servlet/src/test/java/org/jooby/servlet/WebXmlTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ public class WebXmlTest {
3535
" <!-- MultiPart setup -->\n" +
3636
" <multipart-config>\n" +
3737
" <file-size-threshold>0</file-size-threshold>\n" +
38-
" <!-- 200k -->\n" +
39-
" <max-request-size>204800</max-request-size>\n" +
38+
" <max-request-size>${war.maxRequestSize}</max-request-size>\n" +
4039
" </multipart-config>\n" +
4140
" </servlet>\n" +
4241
"\n" +

0 commit comments

Comments
 (0)