Skip to content

Commit 887dc9d

Browse files
rollback core changes
1 parent 1bf0e00 commit 887dc9d

2 files changed

Lines changed: 6 additions & 34 deletions

File tree

jooby/src/main/java/io/jooby/DefaultContext.java

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@
2020
import java.nio.charset.StandardCharsets;
2121
import java.nio.file.Path;
2222
import java.time.Instant;
23-
import java.util.*;
23+
import java.util.Date;
24+
import java.util.List;
25+
import java.util.Map;
26+
import java.util.Objects;
27+
import java.util.Optional;
2428
import java.util.stream.Collectors;
2529

26-
import jakarta.validation.ConstraintViolation;
27-
import jakarta.validation.ConstraintViolationException;
28-
import jakarta.validation.Validator;
2930
import org.slf4j.Logger;
3031

3132
import edu.umd.cs.findbugs.annotations.NonNull;
@@ -416,20 +417,7 @@ default boolean isSecure() {
416417
T result = ValueConverters.convert(body(), type, getRouter());
417418
return result;
418419
}
419-
T object = (T) decoder(contentType).decode(this, type);
420-
421-
MessageValidator messageValidator = getRouter().getMessageValidator();
422-
if (messageValidator != null) {
423-
if (messageValidator.predicate().test(type)) {
424-
Validator validator = messageValidator.validator();
425-
Set<ConstraintViolation<T>> violations = validator.validate(object);
426-
if (!violations.isEmpty()) {
427-
throw new ConstraintViolationException(violations);
428-
}
429-
}
430-
}
431-
return object;
432-
420+
return (T) decoder(contentType).decode(this, type);
433421
} catch (Exception x) {
434422
throw SneakyThrows.propagate(x);
435423
}

jooby/src/main/java/io/jooby/internal/RouterImpl.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import static java.util.Objects.requireNonNull;
99

1010
import java.io.FileNotFoundException;
11-
import java.lang.reflect.Type;
1211
import java.nio.charset.StandardCharsets;
1312
import java.nio.file.NoSuchFileException;
1413
import java.nio.file.Path;
@@ -36,7 +35,6 @@
3635
import java.util.stream.IntStream;
3736
import java.util.stream.Stream;
3837

39-
import jakarta.validation.Validator;
4038
import org.slf4j.Logger;
4139
import org.slf4j.LoggerFactory;
4240

@@ -149,8 +147,6 @@ public Stack executor(Executor executor) {
149147

150148
private Map<String, MessageDecoder> decoders = new HashMap<>();
151149

152-
private MessageValidator messageValidator = null;
153-
154150
private Map<String, Object> attributes = new ConcurrentHashMap<>();
155151

156152
private ServiceRegistry services = new ServiceRegistryImpl();
@@ -372,18 +368,6 @@ public Router decoder(@NonNull MediaType contentType, @NonNull MessageDecoder de
372368
return this;
373369
}
374370

375-
@NonNull
376-
@Override
377-
public Router messageValidator(@NonNull Validator validator, @NonNull Predicate<Type> predicate) {
378-
this.messageValidator = new MessageValidator(validator, predicate);
379-
return this;
380-
}
381-
382-
@Override
383-
public MessageValidator getMessageValidator() {
384-
return messageValidator;
385-
}
386-
387371
@NonNull @Override
388372
public Executor getWorker() {
389373
return worker;

0 commit comments

Comments
 (0)