Skip to content

Fix validation for invalid json or yaml #14

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
JulianFun123 merged 2 commits into from
Nov 29, 2021
Merged

Fix validation for invalid json or yaml #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69eda02
Fixed body returning null when parsing fails
JanHolger Nov 29, 2021
cdb5691
Merge remote-tracking branch 'origin/dev' into fix/validationForInval…
JanHolger Nov 29, 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
15 changes: 6 additions & 9 deletions src/main/java/org/javawebstack/httpserver/Exchange.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package org.javawebstack.httpserver;

import org.javawebstack.abstractdata.AbstractElement;
import org.javawebstack.abstractdata.AbstractMapper;
import org.javawebstack.abstractdata.AbstractNull;
import org.javawebstack.abstractdata.AbstractObject;
import org.javawebstack.abstractdata.*;
import org.javawebstack.httpserver.helper.HttpMethod;
import org.javawebstack.httpserver.helper.MimeType;
import org.javawebstack.validator.ValidationContext;
Expand Down Expand Up @@ -69,21 +66,21 @@ public <T> T body(Class<T> clazz) {
MimeType type = MimeType.byMimeType(contentType);
if (type == null)
type = MimeType.JSON;
AbstractElement request = AbstractNull.INSTANCE;
AbstractElement request = null;
boolean arrayLike = clazz.isArray() || Collection.class.isAssignableFrom(clazz);
switch (type) {
case JSON:
request = AbstractElement.fromJson(body);
break;
case YAML:
request = AbstractElement.fromYaml(body, !(clazz.isArray() || Collection.class.isAssignableFrom(clazz)));
request = AbstractElement.fromYaml(body, !arrayLike);
break;
case X_WWW_FORM_URLENCODED:
request = AbstractElement.fromFormData(body);
break;
default:
request = new AbstractObject();
break;
}
if(request == null || request.isNull())
request = arrayLike ? new AbstractArray() : new AbstractObject();
ValidationResult result = Validator.getValidator(clazz).validate(new ValidationContext().attrib("exchange", this), request);
if (!result.isValid())
throw new ValidationException(result);
Expand Down