import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
@Beta
+// FIXME: 6.0.0: change the over definition of the argument:
+// - argument = XSD pattern string
+// - the statement *implements* PatternConstraint
public interface PatternEffectiveStatement extends EffectiveStatement<PatternConstraint, PatternStatement> {
@Override
default StatementDefinition statementDefinition() {
import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
+// FIXME: 6.0.0: change the over definition of the argument:
+// - argument = XSD pattern string
public interface PatternStatement extends ConstrainedDocumentedDeclaredStatement<PatternConstraint> {
@Override
default StatementDefinition statementDefinition() {
--- /dev/null
+/*
+ * Copyright (c) 2020 PANTHEON.tech, s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.pattern;
+
+import static java.util.Objects.requireNonNull;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
+import java.util.Objects;
+import java.util.Optional;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yangtools.concepts.Immutable;
+import org.opendaylight.yangtools.yang.model.api.type.ModifierKind;
+import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
+
+abstract class AbstractPatternConstraint implements PatternConstraint, Immutable {
+ private final String regEx;
+ private final String rawRegEx;
+ private final String errorAppTag;
+
+ AbstractPatternConstraint(final String regex, final String rawRegex, final String errorAppTag) {
+ this.regEx = requireNonNull(regex, "regex must not be null");
+ this.rawRegEx = requireNonNull(rawRegex, "raw regex must not be null");
+ // FIXME: 6.0.0: explain this assignment
+ this.errorAppTag = errorAppTag != null ? errorAppTag : "invalid-regular-expression";
+ }
+
+ @Override
+ public final String getJavaPatternString() {
+ return regEx;
+ }
+
+ @Override
+ public final String getRegularExpressionString() {
+ return rawRegEx;
+ }
+
+ @Override
+ public final Optional<String> getDescription() {
+ return Optional.ofNullable(description());
+ }
+
+ @Override
+ public final Optional<String> getErrorAppTag() {
+ return Optional.of(errorAppTag);
+ }
+
+ @Override
+ public final Optional<String> getErrorMessage() {
+ return Optional.ofNullable(errorMessage());
+ }
+
+ @Override
+ public final Optional<ModifierKind> getModifier() {
+ return Optional.ofNullable(modifier());
+ }
+
+ @Override
+ public final Optional<String> getReference() {
+ return Optional.ofNullable(reference());
+ }
+
+ @Override
+ public final int hashCode() {
+ return Objects.hash(description(), errorAppTag, errorMessage(), reference(), regEx, modifier());
+ }
+
+ @Override
+ public final boolean equals(final Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (!(obj instanceof AbstractPatternConstraint)) {
+ return false;
+ }
+ final AbstractPatternConstraint other = (AbstractPatternConstraint) obj;
+ return Objects.equals(description(), other.description()) && Objects.equals(errorAppTag, other.errorAppTag)
+ && Objects.equals(errorMessage(), other.errorMessage())
+ && Objects.equals(reference(), other.reference()) && Objects.equals(regEx, other.regEx)
+ && Objects.equals(modifier(), other.modifier());
+ }
+
+ @Override
+ public final String toString() {
+ return addToStringAttributes(MoreObjects.toStringHelper(this).omitNullValues()).toString();
+ }
+
+ abstract @Nullable String description();
+
+ abstract @Nullable String reference();
+
+ abstract @Nullable String errorMessage();
+
+ abstract @Nullable ModifierKind modifier();
+
+ ToStringHelper addToStringAttributes(final ToStringHelper helper) {
+ return helper.add("regex", regEx).add("errorAppTag", errorAppTag);
+ }
+}
return null;
}
- return new PatternConstraintImpl(pattern, value);
+ return new EmptyPatternConstraint(pattern, value);
}
@Override
return new SimplePatternEffectiveStatement(declared, substatements);
}
- return new RegularPatternEffectiveStatement(declared, new PatternConstraintImpl(declared.argument(),
+ return new RegularPatternEffectiveStatement(declared, new RegularPatternConstraint(declared.argument(),
description, reference, errorAppTag, errorMessage, modifier), substatements);
}
--- /dev/null
+/*
+ * Copyright (c) 2020 PANTHEON.tech, s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.pattern;
+
+import org.opendaylight.yangtools.yang.model.api.type.ModifierKind;
+
+final class EmptyPatternConstraint extends AbstractPatternConstraint {
+ EmptyPatternConstraint(final String regex, final String rawRegex) {
+ super(regex, rawRegex, null);
+ }
+
+ @Override
+ String description() {
+ return null;
+ }
+
+ @Override
+ String reference() {
+ return null;
+ }
+
+ @Override
+ String errorMessage() {
+ return null;
+ }
+
+ @Override
+ ModifierKind modifier() {
+ return null;
+ }
+}
+++ /dev/null
-/*
- * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.pattern;
-
-import static java.util.Objects.requireNonNull;
-
-import com.google.common.base.MoreObjects;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.concepts.Immutable;
-import org.opendaylight.yangtools.yang.model.api.type.ModifierKind;
-import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
-
-final class PatternConstraintImpl implements PatternConstraint, Immutable {
- private final String regEx;
- private final String rawRegEx;
- private final String description;
- private final String reference;
- private final String errorAppTag;
- private final String errorMessage;
- private final ModifierKind modifier;
-
- private PatternConstraintImpl(final String regex, final String rawRegex, final String description,
- final String reference, final String errorAppTag, final String errorMessage, final ModifierKind modifier) {
- this.regEx = requireNonNull(regex, "regex must not be null");
- this.rawRegEx = requireNonNull(rawRegex, "raw regex must not be null");
- this.description = description;
- this.reference = reference;
- this.errorAppTag = errorAppTag != null ? errorAppTag : "invalid-regular-expression";
- this.errorMessage = errorMessage;
- this.modifier = modifier;
- }
-
- PatternConstraintImpl(final String regex, final String rawRegex) {
- this(regex, rawRegex, null, null, null, null, null);
- }
-
- PatternConstraintImpl(final PatternConstraint original, final String description, final String reference,
- final String errorAppTag, final String errorMessage, final ModifierKind modifier) {
- this(original.getJavaPatternString(), original.getRegularExpressionString(), description, reference,
- errorAppTag, errorMessage, modifier);
- }
-
- @Override
- public String getJavaPatternString() {
- return regEx;
- }
-
- @Override
- public String getRegularExpressionString() {
- return rawRegEx;
- }
-
- @Override
- public Optional<String> getDescription() {
- return Optional.ofNullable(description);
- }
-
- @Override
- public Optional<String> getErrorAppTag() {
- return Optional.ofNullable(errorAppTag);
- }
-
- @Override
- public Optional<String> getErrorMessage() {
- return Optional.ofNullable(errorMessage);
- }
-
- @Override
- public Optional<ModifierKind> getModifier() {
- return Optional.ofNullable(modifier);
- }
-
- @Override
- public Optional<String> getReference() {
- return Optional.ofNullable(reference);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(description, errorAppTag, errorMessage, reference, regEx, modifier);
- }
-
- @Override
- public boolean equals(final Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final PatternConstraintImpl other = (PatternConstraintImpl) obj;
- return Objects.equals(description, other.description) && Objects.equals(errorAppTag, other.errorAppTag)
- && Objects.equals(errorMessage, other.errorMessage) && Objects.equals(reference, other.reference)
- && Objects.equals(regEx, other.regEx) && Objects.equals(modifier, other.modifier);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("regex", regEx).add("description", description)
- .add("reference", reference).add("errorAppTag", errorAppTag).add("errorMessage", errorMessage)
- .add("modifier", modifier).toString();
- }
-}
--- /dev/null
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.pattern;
+
+import com.google.common.base.MoreObjects.ToStringHelper;
+import org.opendaylight.yangtools.yang.model.api.type.ModifierKind;
+import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
+
+final class RegularPatternConstraint extends AbstractPatternConstraint {
+ private final String description;
+ private final String reference;
+ private final String errorMessage;
+ private final ModifierKind modifier;
+
+ RegularPatternConstraint(final PatternConstraint original, final String description, final String reference,
+ final String errorAppTag, final String errorMessage, final ModifierKind modifier) {
+ super(original.getJavaPatternString(), original.getRegularExpressionString(), errorAppTag);
+ this.description = description;
+ this.reference = reference;
+ this.errorMessage = errorMessage;
+ this.modifier = modifier;
+ }
+
+ @Override
+ String description() {
+ return description;
+ }
+
+ @Override
+ String reference() {
+ return reference;
+ }
+
+ @Override
+ String errorMessage() {
+ return errorMessage;
+ }
+
+ @Override
+ ModifierKind modifier() {
+ return modifier;
+ }
+
+ @Override
+ ToStringHelper addToStringAttributes(final ToStringHelper helper) {
+ return super.addToStringAttributes(helper).add("description", description).add("reference", reference)
+ .add("errorMessage", errorMessage).add("modifier", modifier);
+ }
+}
Code Review / yangtools.git / commitdiff