Skip to content

Commit 0db18ab

Browse files
JanHolgerJanHolger
committed
Refactored JsonResponseTransformer to AbstractData
1 parent a692acf commit 0db18ab

3 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎src/main/java/org/javawebstack/httpserver/Exchange.java‎

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

33
import com.google.gson.JsonElement;
4-
import org.javawebstack.graph.GraphElement;
5-
import org.javawebstack.graph.GraphNull;
4+
import org.javawebstack.abstractdata.AbstractElement;
5+
import org.javawebstack.abstractdata.AbstractNull;
66
import org.javawebstack.httpserver.helper.HttpMethod;
77
import org.javawebstack.httpserver.helper.MimeType;
88
import org.javawebstack.validator.ValidationException;
@@ -49,22 +49,22 @@ public <T> T body(Class<T> clazz){
4949
MimeType type = MimeType.byMimeType(getContentType());
5050
if(type == null)
5151
type = MimeType.JSON;
52-
GraphElement request = GraphNull.INSTANCE;
52+
AbstractElement request = AbstractNull.INSTANCE;
5353
switch (type){
5454
case JSON:
55-
request = GraphElement.fromJson(body);
55+
request = AbstractElement.fromJson(body);
5656
break;
5757
case YAML:
58-
request = GraphElement.fromYaml(body, !(clazz.isArray() || Collection.class.isAssignableFrom(clazz)));
58+
request = AbstractElement.fromYaml(body, !(clazz.isArray() || Collection.class.isAssignableFrom(clazz)));
5959
break;
6060
case X_WWW_FORM_URLENCODED:
61-
request = GraphElement.fromFormData(body);
61+
request = AbstractElement.fromFormData(body);
6262
break;
6363
}
6464
ValidationResult result = Validator.getValidator(clazz).validate(request);
6565
if(!result.isValid())
6666
throw new ValidationException(result);
67-
return server.getGraphMapper().fromGraph(request, clazz);
67+
return server.getAbstractMapper().fromAbstract(request, clazz);
6868
}
6969

7070
public HTTPServer getServer() {
@@ -193,12 +193,12 @@ public String bearerAuth(){
193193
return auth.substring(7);
194194
}
195195
public <T> T getBodyPath(String path, Class<T> clazz){
196-
return server.getGraphMapper().fromGraph(getBodyPathElement(path), clazz);
196+
return server.getAbstractMapper().fromAbstract(getBodyPathElement(path), clazz);
197197
}
198-
public GraphElement getBodyPathElement(String path){
199-
return getPathElement(body(GraphElement.class), path);
198+
public AbstractElement getBodyPathElement(String path){
199+
return getPathElement(body(AbstractElement.class), path);
200200
}
201-
protected static GraphElement getPathElement(GraphElement source, String path){
201+
protected static AbstractElement getPathElement(AbstractElement source, String path){
202202
if(source == null || path == null || path.length() == 0)
203203
return source;
204204
if(!path.contains(".")){

‎src/main/java/org/javawebstack/httpserver/HTTPServer.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.google.gson.GsonBuilder;
66
import org.eclipse.jetty.util.log.Log;
77
import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
8-
import org.javawebstack.graph.GraphMapper;
8+
import org.javawebstack.abstractdata.AbstractMapper;
99
import org.javawebstack.httpserver.helper.JettyNoLog;
1010
import org.javawebstack.httpserver.helper.HttpMethod;
1111
import org.javawebstack.httpserver.router.DefaultRouteAutoInjector;
@@ -48,7 +48,7 @@ public class HTTPServer implements RouteParamTransformerProvider {
4848
private final List<RequestInterceptor> beforeInterceptors = new ArrayList<>();
4949
private Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
5050
.setDateFormat("yyyy-MM-dd HH:mm:ss").disableHtmlEscaping().create();
51-
private GraphMapper graphMapper = new GraphMapper();
51+
private AbstractMapper abstractMapper = new AbstractMapper();
5252
private Injector injector = null;
5353
private org.eclipse.jetty.websocket.server.WebSocketHandler webSocketHandler;
5454
private List<RouteAutoInjector> routeAutoInjectors = new ArrayList<>();
@@ -65,13 +65,13 @@ public HTTPServer logger(Logger logger){
6565
return this;
6666
}
6767

68-
public HTTPServer graph(GraphMapper graphMapper){
69-
this.graphMapper = graphMapper;
68+
public HTTPServer abstractMapper(AbstractMapper mapper){
69+
this.abstractMapper = mapper;
7070
return this;
7171
}
7272

73-
public GraphMapper getGraphMapper() {
74-
return graphMapper;
73+
public AbstractMapper getAbstractMapper() {
74+
return abstractMapper;
7575
}
7676

7777
public Logger getLogger(){

‎src/main/java/org/javawebstack/httpserver/test/TestExchange.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.javawebstack.httpserver.test;
22

33
import com.google.gson.JsonElement;
4-
import org.javawebstack.graph.GraphElement;
4+
import org.javawebstack.abstractdata.AbstractElement;
55
import org.javawebstack.httpserver.Exchange;
66
import org.javawebstack.httpserver.HTTPServer;
77
import org.javawebstack.httpserver.helper.MimeType;
@@ -98,25 +98,25 @@ public TestExchange assertBody(String content, String message){
9898
Assertions.assertEquals(content, mockRes.getContentString(), message);
9999
return this;
100100
}
101-
private GraphElement mockResponseBody(MockHttpServletResponse response){
101+
private AbstractElement mockResponseBody(MockHttpServletResponse response){
102102
MimeType type = MimeType.byMimeType(response.getContentType());
103103
if(type == null)
104104
type = MimeType.JSON;
105105
switch (type){
106106
default:
107-
return GraphElement.fromJson(response.getContentString());
107+
return AbstractElement.fromJson(response.getContentString());
108108
case YAML:
109-
return GraphElement.fromYaml(response.getContentString(), true);
109+
return AbstractElement.fromYaml(response.getContentString(), true);
110110
case X_WWW_FORM_URLENCODED:
111-
return GraphElement.fromFormData(response.getContentString());
111+
return AbstractElement.fromFormData(response.getContentString());
112112
}
113113
}
114-
private boolean checkGraph(GraphElement element, Object value){
114+
private boolean checkGraph(AbstractElement element, Object value){
115115
if(value == null)
116116
return element == null;
117117
if(element == null)
118118
return false;
119-
GraphElement val = getServer().getGraphMapper().toGraph(value);
119+
AbstractElement val = getServer().getAbstractMapper().toAbstract(value);
120120
if(val.isNull())
121121
return element.isNull();
122122
if(val.isObject()){

0 commit comments

Comments
 (0)