Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 15 additions & 2 deletions server/src/main/java/org/web1/Application.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
import java.util.function.Consumer;

import org.web1.http.RequestContext;
import org.web1.http.handler.journal.DeleteJournal;
import org.web1.http.handler.journal.GetJournal;
import org.web1.http.handler.journal.utils.Journal;
import org.web1.http.routing.EndpointKey;
import org.web1.http.routing.RestController;
import org.web1.http.handler.tester.Tester;
Expand All @@ -13,9 +16,19 @@ public class Application {
public static void main(String[] args) {
final HashMap<EndpointKey, Consumer<RequestContext>> endpoints = new HashMap<>();

final Journal journal = new Journal();

endpoints.put(
new EndpointKey("GET", "/fcgi/test"),
new Tester(journal)
);
endpoints.put(
new EndpointKey("DELETE", "/fcgi/journal"),
new DeleteJournal(journal)
);
endpoints.put(
new EndpointKey("GET", "/fcgi/"),
new Tester()
new EndpointKey("GET", "/fcgi/journal"),
new GetJournal(journal)
);

new RestController(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package org.web1.http.handler.journal;

import org.web1.http.RequestContext;
import org.web1.http.handler.journal.utils.Journal;
import org.web1.http.response.ResponseStatus;
import org.web1.utils.json.JsonBuilder;

import java.util.function.Consumer;

public class DeleteJournal implements Consumer<RequestContext> {
private final Journal journal;

public DeleteJournal(Journal journal) {
this.journal = journal;
}

@Override
public void accept(
final RequestContext endpointData
) {
this.journal.clear();
endpointData.responseController().send(
new JsonBuilder().add("status", "\"Completed!\""),
ResponseStatus.OK
);
}
}
34 changes: 34 additions & 0 deletions server/src/main/java/org/web1/http/handler/journal/GetJournal.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package org.web1.http.handler.journal;

import org.web1.http.RequestContext;
import org.web1.http.handler.journal.utils.Journal;
import org.web1.http.handler.journal.utils.JournalItem;
import org.web1.http.response.ResponseStatus;
import org.web1.utils.json.JsonBuilder;

import java.util.Arrays;
import java.util.function.Consumer;
import java.util.stream.Collectors;

public class GetJournal implements Consumer<RequestContext> {
private final Journal journal;

public GetJournal(Journal journal) {
this.journal = journal;
}

@Override
public void accept(
final RequestContext endpointData
) {
endpointData.responseController().send(
new JsonBuilder().add(
"result",
"[" + journal.get().stream()
.map(JournalItem::toString)
.collect(Collectors.joining(",")) + "]"
),
ResponseStatus.OK
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package org.web1.http.handler.journal.utils;

import java.util.ArrayList;

public class Journal {
private final ArrayList<JournalItem> journal = new ArrayList<>();

public ArrayList<JournalItem> get() {
return journal;
}

public void append(JournalItem journalItem) {
journal.add(journalItem);
}

public void clear() {
journal.clear();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package org.web1.http.handler.journal.utils;

public record JournalItem(
long timestamp,
long elapsedTimeNs,
int x,
float y,
float r,
boolean isInsideArea
) {
@Override
public String toString() {
return String.format("""
{
"timestamp": %s,
"elapsedTimeNs": %s,
"x": %s,
"y": %s,
"r": %s,
"isInsideArea": %s
}
""", timestamp, elapsedTimeNs, x, y, r, isInsideArea);
}
}
21 changes: 21 additions & 0 deletions server/src/main/java/org/web1/http/handler/tester/Tester.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import org.validator.ValidatedRecordFactory;
import org.validator.validation.exceptions.ValidationException;
import org.web1.http.RequestContext;
import org.web1.http.handler.journal.utils.Journal;
import org.web1.http.handler.journal.utils.JournalItem;
import org.web1.http.handler.tester.checkers.Checker;
import org.web1.http.handler.tester.checkers.CheckerFunction;
import org.web1.utils.json.JsonBuilder;
Expand All @@ -15,6 +17,12 @@ public class Tester implements Consumer<RequestContext> {
private static final Stopwatch timer = new Stopwatch();
private static final CheckerFunction checker = new Checker();

private final Journal journal;

public Tester(Journal journal) {
this.journal = journal;
}

@Override
public void accept(
final RequestContext endpointData
Expand All @@ -35,6 +43,19 @@ public void accept(
Float.parseFloat(requestData.R())
);

final long elapsedTime = timer.stop();

this.journal.append(
new JournalItem(
System.currentTimeMillis(),
elapsedTime,
Integer.parseInt(requestData.X()),
Float.parseFloat(requestData.Y()),
Float.parseFloat(requestData.R()),
checkResult
)
);

endpointData.responseController().send(
new JsonBuilder()
.add("result", checkResult)
Expand Down