Skip to content

Commit 0ce0987

Browse files
committed
Renaming to http-router and added SerializedResponseTransformer
1 parent 3176ee9 commit 0ce0987

59 files changed

Lines changed: 286 additions & 233 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
JWS HTTP Routing Library
44
</p>
55

6-
![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/JavaWebStack/http-server/Maven%20Deploy/master)
7-
![GitHub](https://img.shields.io/github/license/JavaWebStack/http-server)
6+
![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/JavaWebStack/http-router/Maven%20Deploy/master)
7+
![GitHub](https://img.shields.io/github/license/JavaWebStack/http-router)
88
![Maven metadata URL](https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Frepo1.maven.org%2Fmaven2%2Forg%2Fjavawebstack%2FHTTP-Server%2Fmaven-metadata.xml)
9-
![GitHub contributors](https://img.shields.io/github/contributors/JavaWebStack/http-server)
10-
![Lines of code](https://img.shields.io/tokei/lines/github/JavaWebStack/http-server)
9+
![GitHub contributors](https://img.shields.io/github/contributors/JavaWebStack/http-router)
10+
![Lines of code](https://img.shields.io/tokei/lines/github/JavaWebStack/http-router)
1111
![Discord](https://img.shields.io/discord/815612319378833408?color=%237289DA&label=discord)
1212
![Twitter Follow](https://img.shields.io/twitter/follow/JavaWebStack?style=social)
1313

@@ -24,7 +24,7 @@ work-in-progress project though so it's not yet complete.
2424
```xml
2525
<dependency>
2626
<groupId>org.javawebstack</groupId>
27-
<artifactId>http-server</artifactId>
27+
<artifactId>http-router</artifactId>
2828
<version>1.0.3</version>
2929
</dependency>
3030
```

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
</properties>
1212

1313
<groupId>org.javawebstack</groupId>
14-
<artifactId>http-server</artifactId>
14+
<artifactId>http-router</artifactId>
1515
<version>${buildVersion}</version>
1616

17-
<name>http-server</name>
17+
<name>http-router</name>
1818
<description>This library provides an http routing and request mapping stack</description>
19-
<url>https://github.com/JavaWebStack/http-server</url>
19+
<url>https://github.com/JavaWebStack/http-router</url>
2020

2121
<licenses>
2222
<license>
@@ -41,9 +41,9 @@
4141
</developers>
4242

4343
<scm>
44-
<connection>scm:git:git://github.com/JavaWebStack/http-server.git</connection>
45-
<developerConnection>scm:git:ssh://github.com:JavaWebStack/http-server.git</developerConnection>
46-
<url>https://github.com/JavaWebStack/http-server/tree/master</url>
44+
<connection>scm:git:git://github.com/JavaWebStack/http-router.git</connection>
45+
<developerConnection>scm:git:ssh://github.com:JavaWebStack/http-router.git</developerConnection>
46+
<url>https://github.com/JavaWebStack/http-router/tree/master</url>
4747
</scm>
4848

4949
<dependencies>

src/main/java/org/javawebstack/httpserver/Exchange.java renamed to src/main/java/org/javawebstack/http/router/Exchange.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package org.javawebstack.httpserver;
1+
package org.javawebstack.http.router;
22

33
import org.javawebstack.abstractdata.*;
4-
import org.javawebstack.httpserver.adapter.IHTTPSocket;
5-
import org.javawebstack.httpserver.util.MimeType;
4+
import org.javawebstack.abstractdata.mapper.Mapper;
5+
import org.javawebstack.http.router.adapter.IHTTPSocket;
6+
import org.javawebstack.http.router.util.MimeType;
67
import org.javawebstack.validator.ValidationContext;
78
import org.javawebstack.validator.ValidationException;
89
import org.javawebstack.validator.ValidationResult;
@@ -11,7 +12,6 @@
1112
import java.io.ByteArrayOutputStream;
1213
import java.io.IOException;
1314
import java.io.InputStream;
14-
import java.net.Socket;
1515
import java.nio.charset.StandardCharsets;
1616
import java.util.*;
1717
import java.util.stream.Collectors;
@@ -25,16 +25,16 @@ public static Exchange current() {
2525
return exchanges.get();
2626
}
2727

28-
private final HTTPServer server;
28+
private final HTTPRouter router;
2929
private final HTTPMethod method;
3030
private byte[] body = null;
3131
private final Map<String, Object> pathVariables = new HashMap<>();
3232
private final AbstractObject queryParameters;
3333
private final IHTTPSocket socket;
3434
private final Map<String, Object> attributes = new HashMap<>();
3535

36-
public Exchange(HTTPServer server, IHTTPSocket socket) {
37-
this.server = server;
36+
public Exchange(HTTPRouter router, IHTTPSocket socket) {
37+
this.router = router;
3838
this.socket = socket;
3939
this.method = getRequestMethodFromSocket(socket);
4040
this.queryParameters = AbstractElement.fromFormData(socket.getRequestQuery()).object();
@@ -74,11 +74,11 @@ public <T> T body(Class<T> clazz) {
7474
ValidationResult result = Validator.getValidator(clazz).validate(new ValidationContext().attrib("exchange", this), request);
7575
if (!result.isValid())
7676
throw new ValidationException(result);
77-
return server.getAbstractMapper().fromAbstract(request, clazz);
77+
return router.getMapper().map(request, clazz);
7878
}
7979

80-
public HTTPServer getServer() {
81-
return server;
80+
public HTTPRouter getRouter() {
81+
return router;
8282
}
8383

8484
public HTTPMethod getMethod() {
@@ -236,7 +236,7 @@ public <T> T query(String name, Class<T> type) {
236236
}
237237

238238
public <T> T query(String name, Class<T> type, T defaultValue) {
239-
T t = new AbstractMapper().fromAbstract(queryParameters.get(name, AbstractNull.INSTANCE), type);
239+
T t = new Mapper().map(queryParameters.get(name, AbstractNull.VALUE), type);
240240
if (t == null)
241241
return defaultValue;
242242
return t;
@@ -264,7 +264,7 @@ public String bearerAuth() {
264264
}
265265

266266
public <T> T getBodyPath(String path, Class<T> clazz) {
267-
return server.getAbstractMapper().fromAbstract(getBodyPathElement(path), clazz);
267+
return router.getMapper().map(getBodyPathElement(path), clazz);
268268
}
269269

270270
public AbstractElement getBodyPathElement(String path) {
@@ -290,7 +290,7 @@ protected static AbstractElement getPathElement(AbstractElement source, String p
290290
private HTTPMethod getRequestMethodFromSocket(IHTTPSocket socket) {
291291
if ("websocket".equalsIgnoreCase(socket.getRequestHeader("upgrade")))
292292
return HTTPMethod.WEBSOCKET;
293-
if (server.isFormMethods() && (socket.getRequestMethod() == HTTPMethod.GET || socket.getRequestMethod() == HTTPMethod.POST) && getMimeType() == MimeType.X_WWW_FORM_URLENCODED) {
293+
if (router.isFormMethods() && (socket.getRequestMethod() == HTTPMethod.GET || socket.getRequestMethod() == HTTPMethod.POST) && getMimeType() == MimeType.X_WWW_FORM_URLENCODED) {
294294
AbstractElement e = getBodyPathElement("_method");
295295
if (e != null) {
296296
try {

src/main/java/org/javawebstack/httpserver/HTTPMethod.java renamed to src/main/java/org/javawebstack/http/router/HTTPMethod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javawebstack.httpserver;
1+
package org.javawebstack.http.router;
22

33
public enum HTTPMethod {
44

0 commit comments

Comments
 (0)