byte/wirestream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use HttpHandler functional interface instead of BiConsumer

Browse Source
This commit is contained in:
Daniel
2024-10-23 19:26:36 +03:00
parent 4e71cb59a4
commit 6256bc32d0
9 changed files with 152 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
.idea/uiDesigner.xml generated Normal file
View File

@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>

20
src/main/java/org/lumijiez/Main.java
View File

@@ -1,25 +1,13 @@
package org.lumijiez;
import org.lumijiez.core.HttpServer;
import java.net.Socket;
import org.lumijiez.core.http.HttpServer;
import org.lumijiez.logging.Logger;
public class Main {
public static void main(String[] args) {
TcpServerCallback callback = new TcpServerCallback() {
@Override
public String onClientMessage(String message, Socket clientSocket) {
return "";
}
Logger logger = new Logger(Logger.LogLevel.DEBUG);
@Override
public String onClientConnected(Socket clientSocket) {
System.out.println("Client connected: " + clientSocket.getInetAddress());
return "";
}
};
HttpServer httpServer = new HttpServer(8080, callback);
HttpServer httpServer = new HttpServer(8080);
httpServer.GET("/hello", (req, res) -> {
res.sendResponse(200, "Hello, World!");

2
src/main/java/org/lumijiez/core/HttpHandler.java → src/main/java/org/lumijiez/core/http/HttpHandler.java
View File

@@ -1,4 +1,4 @@
package org.lumijiez.core;
package org.lumijiez.core.http;
@FunctionalInterface
public interface HttpHandler {

2
src/main/java/org/lumijiez/core/HttpRequest.java → src/main/java/org/lumijiez/core/http/HttpRequest.java
View File

@@ -1,4 +1,4 @@
package org.lumijiez.core;
package org.lumijiez.core.http;
import java.io.BufferedReader;
import java.io.IOException;

2
src/main/java/org/lumijiez/core/HttpResponse.java → src/main/java/org/lumijiez/core/http/HttpResponse.java
View File

@@ -1,4 +1,4 @@
package org.lumijiez.core;
package org.lumijiez.core.http;
import java.io.PrintWriter;

12
src/main/java/org/lumijiez/core/HttpServer.java → src/main/java/org/lumijiez/core/http/HttpServer.java
View File

@@ -1,25 +1,27 @@
package org.lumijiez.core;
package org.lumijiez.core.http;
import org.lumijiez.core.routing.Router;
import org.lumijiez.core.tcp.TcpServer;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.net.Socket;
import java.util.function.BiConsumer;
public class HttpServer extends TcpServer {
private final Router router;
public HttpServer(int port, TcpServerCallback callback) {
public HttpServer(int port) {
super(port);
this.router = new Router();
}
public void GET(String path, BiConsumer<HttpRequest, HttpResponse> handler) {
public void GET(String path, HttpHandler handler) {
router.addRoute("GET", path, handler);
}
public void POST(String path, BiConsumer<HttpRequest, HttpResponse> handler) {
public void POST(String path, HttpHandler handler) {
router.addRoute("POST", path, handler);
}

12
src/main/java/org/lumijiez/core/Route.java → src/main/java/org/lumijiez/core/routing/Route.java
View File

@@ -1,13 +1,15 @@
package org.lumijiez.core;
package org.lumijiez.core.routing;
import java.util.function.BiConsumer;
import org.lumijiez.core.http.HttpHandler;
import org.lumijiez.core.http.HttpRequest;
import org.lumijiez.core.http.HttpResponse;
public class Route {
private final String path;
private final String method;
private final BiConsumer<HttpRequest, HttpResponse> handler;
private final HttpHandler handler;
public Route(String method, String path, BiConsumer<HttpRequest, HttpResponse> handler) {
public Route(String method, String path, HttpHandler handler) {
this.method = method;
this.path = path;
this.handler = handler;
@@ -22,6 +24,6 @@ public class Route {
}
public void handle(HttpRequest request, HttpResponse response) {
handler.accept(request, response);
handler.handle(request, response);
}
}

9
src/main/java/org/lumijiez/core/Router.java → src/main/java/org/lumijiez/core/routing/Router.java
View File

@@ -1,13 +1,16 @@
package org.lumijiez.core;
package org.lumijiez.core.routing;
import org.lumijiez.core.http.HttpHandler;
import org.lumijiez.core.http.HttpRequest;
import org.lumijiez.core.http.HttpResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.function.BiConsumer;
public class Router {
private final List<Route> routes = new ArrayList<>();
public void addRoute(String method, String path, BiConsumer<HttpRequest, HttpResponse> handler) {
public void addRoute(String method, String path, HttpHandler handler) {
routes.add(new Route(method, path, handler));
}

2
src/main/java/org/lumijiez/core/TcpServer.java → src/main/java/org/lumijiez/core/tcp/TcpServer.java
View File

@@ -1,4 +1,4 @@
package org.lumijiez.core;
package org.lumijiez.core.tcp;
import java.io.IOException;
import java.net.ServerSocket;
import java.net.Socket;