From 588a51ac8c7611b2ee24a7c4f053846c17847cb8 Mon Sep 17 00:00:00 2001 From: Sebastian Toepfer <61313468+sebastian-toepfer@users.noreply.github.com> Date: Sun, 19 Nov 2023 19:56:00 +0100 Subject: [PATCH] consolidate duplicated code --- .../assertion/abnf/element/Concatenation.java | 11 +--- .../abnf/element/ListValidation.java | 53 +++++++++++++++++++ .../assertion/abnf/element/SequenceGroup.java | 8 +-- 3 files changed, 56 insertions(+), 16 deletions(-) create mode 100644 vocabulary-format-assertion/src/main/java/io/github/sebastiantoepfer/jsonschema/vocabulary/format/assertion/abnf/element/ListValidation.java diff --git a/vocabulary-format-assertion/src/main/java/io/github/sebastiantoepfer/jsonschema/vocabulary/format/assertion/abnf/element/Concatenation.java b/vocabulary-format-assertion/src/main/java/io/github/sebastiantoepfer/jsonschema/vocabulary/format/assertion/abnf/element/Concatenation.java index 01512afd..6ec49f07 100644 --- a/vocabulary-format-assertion/src/main/java/io/github/sebastiantoepfer/jsonschema/vocabulary/format/assertion/abnf/element/Concatenation.java +++ b/vocabulary-format-assertion/src/main/java/io/github/sebastiantoepfer/jsonschema/vocabulary/format/assertion/abnf/element/Concatenation.java @@ -57,21 +57,14 @@ public > T printOn(final T media) { @Override public Dimension dimension() { - return concatenations.stream().map(Element::dimension).reduce(Dimension::plus).orElseThrow(); + return concatenations.stream().map(Element::dimension).reduce(Dimension.zero(), Dimension::plus); } @Override public boolean isValidFor(final ValidateableCodePoint codePoint) { final boolean result; if (dimension().isInRange(codePoint)) { - final Element first = concatenations.get(0); - if (first.dimension().isInRange(codePoint)) { - result = first.isValidFor(codePoint); - } else { - result = - of(concatenations.subList(1, concatenations.size())) - .isValidFor(codePoint.repositionBackBy(first.dimension())); - } + result = new ListValidation(concatenations, Concatenation::of).isValidFor(codePoint); } else { result = false; } diff --git a/vocabulary-format-assertion/src/main/java/io/github/sebastiantoepfer/jsonschema/vocabulary/format/assertion/abnf/element/ListValidation.java b/vocabulary-format-assertion/src/main/java/io/github/sebastiantoepfer/jsonschema/vocabulary/format/assertion/abnf/element/ListValidation.java new file mode 100644 index 00000000..8aa671ac --- /dev/null +++ b/vocabulary-format-assertion/src/main/java/io/github/sebastiantoepfer/jsonschema/vocabulary/format/assertion/abnf/element/ListValidation.java @@ -0,0 +1,53 @@ +/* + * The MIT License + * + * Copyright 2023 sebastian. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package io.github.sebastiantoepfer.jsonschema.vocabulary.format.assertion.abnf.element; + +import java.util.List; +import java.util.Objects; +import java.util.function.Function; + +class ListValidation { + + private final List elements; + private final Function, Element> newElement; + + public ListValidation(final List elements, final Function, Element> newElement) { + this.elements = List.copyOf(elements); + this.newElement = Objects.requireNonNull(newElement); + } + + public boolean isValidFor(final ValidateableCodePoint codePoint) { + final boolean result; + final Element first = elements.get(0); + if (first.dimension().isInRange(codePoint)) { + result = first.isValidFor(codePoint); + } else { + result = + newElement + .apply(elements.subList(1, elements.size())) + .isValidFor(codePoint.repositionBackBy(first.dimension())); + } + return result; + } +} diff --git a/vocabulary-format-assertion/src/main/java/io/github/sebastiantoepfer/jsonschema/vocabulary/format/assertion/abnf/element/SequenceGroup.java b/vocabulary-format-assertion/src/main/java/io/github/sebastiantoepfer/jsonschema/vocabulary/format/assertion/abnf/element/SequenceGroup.java index 4518b89a..b454c605 100644 --- a/vocabulary-format-assertion/src/main/java/io/github/sebastiantoepfer/jsonschema/vocabulary/format/assertion/abnf/element/SequenceGroup.java +++ b/vocabulary-format-assertion/src/main/java/io/github/sebastiantoepfer/jsonschema/vocabulary/format/assertion/abnf/element/SequenceGroup.java @@ -63,13 +63,7 @@ public > T printOn(final T media) { public boolean isValidFor(final ValidateableCodePoint codePoint) { final boolean result; if (dimension().isInRange(codePoint)) { - final Element first = elements.get(0); - if (first.dimension().isInRange(codePoint)) { - result = first.isValidFor(codePoint); - } else { - result = - of(elements.subList(1, elements.size())).isValidFor(codePoint.repositionBackBy(first.dimension())); - } + result = new ListValidation(elements, SequenceGroup::of).isValidFor(codePoint); } else { result = false; }