Skip to content

Feature/own http server #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JanHolger merged 6 commits into from
Dec 7, 2021
Merged

Feature/own http server #15

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9cd7a0c
Started to implement a custom http server as an alternative to jetty
JanHolger Dec 3, 2021
fb70dd7
Abstracted the http server logic to allow for using a custom http ser…
JanHolger Dec 5, 2021
313ac67
Fixed locale header
JanHolger Dec 5, 2021
bbe6c85
Made jetty optional and upgraded junit
JanHolger Dec 5, 2021
620c5da
Upgraded jetty from 9.44.x to 11.0.7 because the abstraction allowed …
JanHolger Dec 7, 2021
11d4a67
Added a check for websockets and switched back to jetty as the defaul…
JanHolger Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Added a check for websockets and switched back to jetty as the defaul… 
…t implementation for until the own implementation is fully stable.
  • Loading branch information
@JanHolger
JanHolger committed Dec 7, 2021
commit 11d4a67477062b71ec0c0eb05755bc12d3bfcf26
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>11.0.7</version>
<optional>true</optional>
<!-- <optional>true</optional> -->
</dependency>
<dependency>
<groupId>org.reflections</groupId>
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/org/javawebstack/httpserver/HTTPServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import org.javawebstack.abstractdata.AbstractMapper;
import org.javawebstack.abstractdata.NamingPolicy;
import org.javawebstack.httpserver.adapter.IHTTPSocketServer;
import org.javawebstack.httpserver.adapter.jetty.JettyHTTPSocketServer;
import org.javawebstack.httpserver.adapter.simple.SimpleHTTPSocketServer;
import org.javawebstack.httpserver.handler.*;
import org.javawebstack.httpserver.router.DefaultRouteAutoInjector;
Expand Down Expand Up @@ -45,7 +46,7 @@ public class HTTPServer implements RouteParamTransformerProvider {
private Function<Class<?>, Object> controllerInitiator = this::defaultControllerInitiator;

public HTTPServer() {
this(new SimpleHTTPSocketServer());
this(new JettyHTTPSocketServer());
}

public HTTPServer(IHTTPSocketServer server) {
Expand Down Expand Up @@ -196,6 +197,8 @@ public HTTPServer afterAny(String pattern, AfterRequestHandler... handlers) {
}

public HTTPServer webSocket(String pattern, WebSocketHandler handler) {
if(!server.isWebSocketSupported())
throw new UnsupportedOperationException(server.getClass().getName() + " does not support websockets!");
return route(HTTPMethod.WEBSOCKET, pattern, new InternalWebSocketRequestHandler(handler));
}

Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/javawebstack/httpserver/adapter/IHTTPSocketServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ public interface IHTTPSocketServer {
void stop();
void join();
void setHandler(IHTTPSocketHandler handler);
boolean isWebSocketSupported();

}
4 changes: 4 additions & 0 deletions src/main/java/org/javawebstack/httpserver/adapter/jetty/JettyHTTPSocketServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,8 @@ public void setHandler(IHTTPSocketHandler handler) {
this.handler = handler;
}

public boolean isWebSocketSupported() {
return false;
}

}
4 changes: 4 additions & 0 deletions src/main/java/org/javawebstack/httpserver/adapter/simple/SimpleHTTPSocketServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,8 @@ public void stop() {
} catch (IOException e) {}
}

public boolean isWebSocketSupported() {
return false;
}

}