Skip to content

Commit 8685b93

Browse files
author
Viktor Buldakov
committed
use java8 stream API
1 parent ca6f4d2 commit 8685b93

File tree

1 file changed

+5
-16
lines changed

1 file changed

+5
-16
lines changed

core/src/main/java/org/everit/json/schema/ObjectSchema.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -417,25 +417,14 @@ private boolean definesSchemaProperty(String field) {
417417
}
418418

419419
private boolean definesPatternProperty(String field) {
420-
for (Entry<Pattern, Schema> entry : patternProperties.entrySet()) {
421-
if (entry.getKey().matcher(field).matches()) {
422-
return true;
423-
}
424-
}
425-
return false;
420+
return patternProperties.keySet().stream().filter(pattern -> pattern.matcher(field).matches())
421+
.findAny().isPresent();
426422
}
427423

428424
private boolean definesSchemaDependencyProperty(String field) {
429-
if (schemaDependencies.containsKey(field)) {
430-
return true;
431-
}
432-
433-
for (Schema schema : schemaDependencies.values()) {
434-
if (schema.definesProperty(field)) {
435-
return true;
436-
}
437-
}
438-
return false;
425+
return schemaDependencies.containsKey(field)
426+
|| schemaDependencies.values().stream().filter(schema -> schema.definesProperty(field))
427+
.findAny().isPresent();
439428
}
440429

441430
}

0 commit comments

Comments
 (0)