Skip to content

Commit a84d8d1

Browse files
simonwepsimonwep
committed
Some code clean-up
1 parent 99e3ebc commit a84d8d1

18 files changed

+83
-84
lines changed

‎src/examples/PortMiddleware.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package examples;
22

3-
import express.events.HttpRequest;
4-
import express.expressfilter.ExpressFilter;
3+
import express.http.HttpRequest;
4+
import express.filter.Filter;
55
import express.http.request.Request;
66
import express.http.response.Response;
77

8-
public class PortMiddleware implements HttpRequest, ExpressFilter {
8+
public class PortMiddleware implements HttpRequest, Filter {
99

1010

1111
/**

‎src/express/Express.java‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
import com.sun.net.httpserver.HttpServer;
55
import com.sun.net.httpserver.HttpsConfigurator;
66
import com.sun.net.httpserver.HttpsServer;
7-
import express.events.Action;
8-
import express.events.HttpRequest;
9-
import express.expressfilter.ExpressFilterImpl;
10-
import express.expressfilter.ExpressFilterTask;
11-
import express.expressfilter.ExpressFilterWorker;
12-
import express.expressfilter.FilterLayerHandler;
7+
import express.http.HttpRequest;
8+
import express.filter.FilterImpl;
9+
import express.filter.FilterTask;
10+
import express.filter.FilterWorker;
11+
import express.filter.FilterLayerHandler;
1312
import express.middleware.ExpressMiddleware;
1413

1514
import java.io.IOException;
@@ -30,7 +29,7 @@ public class Express extends ExpressMiddleware implements Router {
3029
private final ConcurrentHashMap<String, HttpRequest> PARAMETER_LISTENER;
3130
private final ConcurrentHashMap<Object, Object> LOCALS;
3231

33-
private final ArrayList<ExpressFilterWorker> WORKER;
32+
private final ArrayList<FilterWorker> WORKER;
3433
private final FilterLayerHandler HANDLER;
3534

3635
private Executor executor;
@@ -169,47 +168,47 @@ public void use(@NotNull String context, @NotNull String requestMethod, @NotNull
169168

170169
// Internal service to handle middleware
171170
private void addMiddleware(@NotNull String requestMethod, @NotNull String context, HttpRequest middleware) {
172-
if (middleware instanceof ExpressFilterTask) {
173-
WORKER.add(new ExpressFilterWorker((ExpressFilterTask) middleware));
171+
if (middleware instanceof FilterTask) {
172+
WORKER.add(new FilterWorker((FilterTask) middleware));
174173
}
175174

176-
HANDLER.add(0, new ExpressFilterImpl(requestMethod, context, middleware));
175+
HANDLER.add(0, new FilterImpl(requestMethod, context, middleware));
177176
}
178177

179178
public void all(@NotNull HttpRequest request) {
180-
HANDLER.add(1, new ExpressFilterImpl("*", "*", request));
179+
HANDLER.add(1, new FilterImpl("*", "*", request));
181180
}
182181

183182
public void all(@NotNull String context, @NotNull HttpRequest request) {
184-
HANDLER.add(1, new ExpressFilterImpl("*", context, request));
183+
HANDLER.add(1, new FilterImpl("*", context, request));
185184
}
186185

187186
public void all(@NotNull String context, @NotNull String requestMethod, @NotNull HttpRequest request) {
188-
HANDLER.add(1, new ExpressFilterImpl(requestMethod, context, request));
187+
HANDLER.add(1, new FilterImpl(requestMethod, context, request));
189188
}
190189

191190
public void get(@NotNull String context, @NotNull HttpRequest request) {
192-
HANDLER.add(1, new ExpressFilterImpl("GET", context, request));
191+
HANDLER.add(1, new FilterImpl("GET", context, request));
193192
}
194193

195194
public void post(@NotNull String context, @NotNull HttpRequest request) {
196-
HANDLER.add(1, new ExpressFilterImpl("POST", context, request));
195+
HANDLER.add(1, new FilterImpl("POST", context, request));
197196
}
198197

199198
public void put(@NotNull String context, @NotNull HttpRequest request) {
200-
HANDLER.add(1, new ExpressFilterImpl("PUT", context, request));
199+
HANDLER.add(1, new FilterImpl("PUT", context, request));
201200
}
202201

203202
public void delete(@NotNull String context, @NotNull HttpRequest request) {
204-
HANDLER.add(1, new ExpressFilterImpl("DELETE", context, request));
203+
HANDLER.add(1, new FilterImpl("DELETE", context, request));
205204
}
206205

207206
public void patch(@NotNull String context, @NotNull HttpRequest request) {
208-
HANDLER.add(1, new ExpressFilterImpl("PATCH", context, request));
207+
HANDLER.add(1, new FilterImpl("PATCH", context, request));
209208
}
210209

211210
public void on(@NotNull String context, @NotNull String requestMethod, @NotNull HttpRequest request) {
212-
HANDLER.add(1, new ExpressFilterImpl(requestMethod, context, request));
211+
HANDLER.add(1, new FilterImpl(requestMethod, context, request));
213212
}
214213

215214
/**
@@ -240,7 +239,7 @@ public void listen(int port) throws IOException {
240239
* @param onStart An listener which will be fired after the server is stardet.
241240
* @throws IOException - If an IO-Error occurs, eg. the port is already in use.
242241
*/
243-
public void listen(Action onStart) throws IOException {
242+
public void listen(ExpressListener onStart) throws IOException {
244243
listen(onStart, 80);
245244
}
246245

@@ -252,11 +251,11 @@ public void listen(Action onStart) throws IOException {
252251
* @param port The port.
253252
* @throws IOException - If an IO-Error occurs, eg. the port is already in use.
254253
*/
255-
public void listen(Action onStart, int port) throws IOException {
254+
public void listen(ExpressListener onStart, int port) throws IOException {
256255
new Thread(() -> {
257256
try {
258257
// Fire worker threads
259-
WORKER.forEach(ExpressFilterWorker::start);
258+
WORKER.forEach(FilterWorker::start);
260259

261260
InetSocketAddress socketAddress = new InetSocketAddress(this.hostname, port);
262261

@@ -303,7 +302,7 @@ public void stop() {
303302
httpServer.stop(0);
304303

305304
// Stop worker threads
306-
WORKER.forEach(ExpressFilterWorker::stop);
305+
WORKER.forEach(FilterWorker::stop);
307306
}
308307
}
309308
}

‎src/express/events/Action.java‎ renamed to ‎src/express/ExpressListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package express.events;
1+
package express;
22

33
/**
44
* @author Simon Reinisch
55
*/
6-
public interface Action {
6+
public interface ExpressListener {
77
void action();
88
}

‎src/express/ExpressRouter.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package express;
22

33
import com.sun.istack.internal.NotNull;
4-
import express.events.HttpRequest;
5-
import express.expressfilter.ExpressFilterImpl;
6-
import express.expressfilter.ExpressFilterTask;
7-
import express.expressfilter.ExpressFilterWorker;
8-
import express.expressfilter.FilterLayerHandler;
4+
import express.http.HttpRequest;
5+
import express.filter.FilterImpl;
6+
import express.filter.FilterTask;
7+
import express.filter.FilterWorker;
8+
import express.filter.FilterLayerHandler;
99

1010
import java.util.ArrayList;
1111

1212
public class ExpressRouter implements Router {
1313

14-
private final ArrayList<ExpressFilterWorker> WORKER;
14+
private final ArrayList<FilterWorker> WORKER;
1515
private final FilterLayerHandler HANDLER;
1616

1717
{
@@ -37,50 +37,50 @@ public void use(@NotNull String context, @NotNull String requestMethod, @NotNull
3737
}
3838

3939
private void addMiddleware(@NotNull String requestMethod, @NotNull String context, HttpRequest middleware) {
40-
if (middleware instanceof ExpressFilterTask) {
41-
WORKER.add(new ExpressFilterWorker((ExpressFilterTask) middleware));
40+
if (middleware instanceof FilterTask) {
41+
WORKER.add(new FilterWorker((FilterTask) middleware));
4242
}
4343

44-
HANDLER.add(0, new ExpressFilterImpl(requestMethod, context, middleware));
44+
HANDLER.add(0, new FilterImpl(requestMethod, context, middleware));
4545
}
4646

4747
public void all(@NotNull HttpRequest request) {
48-
HANDLER.add(1, new ExpressFilterImpl("*", "*", request));
48+
HANDLER.add(1, new FilterImpl("*", "*", request));
4949
}
5050

5151
public void all(@NotNull String context, @NotNull HttpRequest request) {
52-
HANDLER.add(1, new ExpressFilterImpl("*", context, request));
52+
HANDLER.add(1, new FilterImpl("*", context, request));
5353
}
5454

5555
public void all(@NotNull String context, @NotNull String requestMethod, @NotNull HttpRequest request) {
56-
HANDLER.add(1, new ExpressFilterImpl(requestMethod, context, request));
56+
HANDLER.add(1, new FilterImpl(requestMethod, context, request));
5757
}
5858

5959
public void get(@NotNull String context, @NotNull HttpRequest request) {
60-
HANDLER.add(1, new ExpressFilterImpl("GET", context, request));
60+
HANDLER.add(1, new FilterImpl("GET", context, request));
6161
}
6262

6363
public void post(@NotNull String context, @NotNull HttpRequest request) {
64-
HANDLER.add(1, new ExpressFilterImpl("POST", context, request));
64+
HANDLER.add(1, new FilterImpl("POST", context, request));
6565
}
6666

6767
public void put(@NotNull String context, @NotNull HttpRequest request) {
68-
HANDLER.add(1, new ExpressFilterImpl("PUT", context, request));
68+
HANDLER.add(1, new FilterImpl("PUT", context, request));
6969
}
7070

7171
public void delete(@NotNull String context, @NotNull HttpRequest request) {
72-
HANDLER.add(1, new ExpressFilterImpl("DELETE", context, request));
72+
HANDLER.add(1, new FilterImpl("DELETE", context, request));
7373
}
7474

7575
public void patch(@NotNull String context, @NotNull HttpRequest request) {
76-
HANDLER.add(1, new ExpressFilterImpl("PATCH", context, request));
76+
HANDLER.add(1, new FilterImpl("PATCH", context, request));
7777
}
7878

7979
public void on(@NotNull String context, @NotNull String requestMethod, @NotNull HttpRequest request) {
80-
HANDLER.add(1, new ExpressFilterImpl(requestMethod, context, request));
80+
HANDLER.add(1, new FilterImpl(requestMethod, context, request));
8181
}
8282

83-
ArrayList<ExpressFilterWorker> getWorker() {
83+
ArrayList<FilterWorker> getWorker() {
8484
return WORKER;
8585
}
8686

‎src/express/Router.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package express;
22

33
import com.sun.istack.internal.NotNull;
4-
import express.events.HttpRequest;
4+
import express.http.HttpRequest;
55

66
public interface Router {
77

‎src/express/expressfilter/FilterLayer.java‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/express/expressfilter/ExpressFilter.java‎ renamed to ‎src/express/filter/Filter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package express.expressfilter;
1+
package express.filter;
22

33
/**
44
* @author Simon Reinisch
55
* <p>
66
* ExpressFilter to save middleware data, the name is the indentifier.
77
*/
8-
public interface ExpressFilter {
8+
public interface Filter {
99

1010
/**
1111
* Identifier for the middleware

‎src/express/expressfilter/ExpressFilterChain.java‎ renamed to ‎src/express/filter/FilterChain.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package express.expressfilter;
1+
package express.filter;
22

3-
import express.events.HttpRequest;
3+
import express.http.HttpRequest;
44
import express.http.request.Request;
55
import express.http.response.Response;
66

@@ -14,7 +14,7 @@
1414
* <p>
1515
* Iterator for ExpressFilters
1616
*/
17-
public class ExpressFilterChain<T extends HttpRequest> {
17+
public class FilterChain<T extends HttpRequest> {
1818

1919
private List<T> expressFilters = Collections.synchronizedList(new ArrayList<>());
2020

‎src/express/expressfilter/ExpressFilterImpl.java‎ renamed to ‎src/express/filter/FilterImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package express.expressfilter;
1+
package express.filter;
22

3-
import express.events.HttpRequest;
3+
import express.http.HttpRequest;
44
import express.http.request.Request;
55
import express.http.response.Response;
66

@@ -13,15 +13,15 @@
1313
* <p>
1414
* Filter to handle request handling & parsing.
1515
*/
16-
public class ExpressFilterImpl implements HttpRequest {
16+
public class FilterImpl implements HttpRequest {
1717

1818
private final HttpRequest REQUEST;
1919
private final String REQ;
2020
private final String CONTEXT;
2121
private final boolean REQ_ALL;
2222
private final boolean CONTEXT_ALL;
2323

24-
public ExpressFilterImpl(String requestMethod, String context, HttpRequest httpRequest) {
24+
public FilterImpl(String requestMethod, String context, HttpRequest httpRequest) {
2525
this.REQ = requestMethod;
2626
this.REQUEST = httpRequest;
2727
this.CONTEXT = context;

‎src/express/filter/FilterLayer.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package express.filter;
2+
3+
public class FilterLayer {
4+
}

0 commit comments

Comments
 (0)