From 38832e7be4a41405297fe941d7e05aaac2645be5 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 9 Feb 2021 13:13:17 +0100 Subject: [PATCH] Remove BaseConstraints This utility is not used anywhere, remove it. JIRA: YANGTOOLS-1052 Change-Id: Idfd4ece09d329f5bc14e12f9b192fe765206e824 Signed-off-by: Robert Varga --- .../yang/model/util/BaseConstraints.java | 86 ------------- .../model/util/PatternConstraintImpl.java | 113 ------------------ .../model/util/PatternConstraintImplTest.java | 52 -------- 3 files changed, 251 deletions(-) delete mode 100644 yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java delete mode 100644 yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImpl.java delete mode 100644 yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImplTest.java diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java deleted file mode 100644 index e5f84310c4..0000000000 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (c) 2013 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.model.util; - -import java.util.Optional; -import org.opendaylight.yangtools.yang.model.api.type.ModifierKind; -import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint; - -/** - * Utility class which provides factory methods to construct Constraints. - * - *

- * Provides static factory methods which constructs instances of - *

- */ -public final class BaseConstraints { - private BaseConstraints() { - // Hidden on purpose - } - - /** - * Creates a {@link PatternConstraint}. - * - *

- * Creates an instance of Pattern constraint based on supplied parameters - * with additional behaviour: - *

- * - * @see PatternConstraint - * - * @param pattern - * Regular expression, MUST NOT BE null. - * @param description - * Description associated with constraint. - * @param reference - * Reference associated with constraint. - * @return Instance of {@link PatternConstraint} - */ - public static PatternConstraint newPatternConstraint(final String pattern, final Optional description, - final Optional reference) { - return new PatternConstraintImpl(pattern, description, reference); - } - - /** - * Creates a {@link PatternConstraint}. - * - *

- * Creates an instance of Pattern constraint based on supplied parameters - * with additional behaviour: - *

    - *
  • {@link PatternConstraint#getErrorAppTag()} returns - * invalid-regular-expression - *
- * - * @see PatternConstraint - * - * @param pattern - * Regular expression, MUST NOT BE null. - * @param description - * Description associated with constraint. - * @param reference - * Reference associated with constraint. - * @param errorAppTag - * error-app-tag associated with constraint. - * @param errorMessage - * error message associated with constraint. - * @param modifier - * Modifier of pattern constraint. - * @return Instance of {@link PatternConstraint} - */ - public static PatternConstraint newPatternConstraint(final String pattern, final Optional description, - final Optional reference, final String errorAppTag, final String errorMessage, - final Optional modifier) { - return new PatternConstraintImpl(pattern, description, reference, errorAppTag, errorMessage, modifier); - } -} diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImpl.java deleted file mode 100644 index 85af82b8c6..0000000000 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImpl.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (c) 2014 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.model.util; - -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; - -/** - * {@link Immutable} implementation of {@link PatternConstraint}. - * - *

- * Creates an instance of Range constraint based on supplied parameters with - * additional behaviour: - *

    - *
  • {@link PatternConstraint#getErrorAppTag()} returns - * invalid-regular-expression - *
- */ -final class PatternConstraintImpl implements PatternConstraint, Immutable { - private final String regex; - private final String description; - private final String reference; - - private final String errorAppTag; - private final String errorMessage; - private final ModifierKind modifier; - - PatternConstraintImpl(final String regex, final Optional description, final Optional reference) { - this(regex, description, reference, null, null, Optional.empty()); - } - - PatternConstraintImpl(final String regex, final Optional description, final Optional reference, - final String errorAppTag, final String errorMessage, final Optional modifier) { - this.regex = requireNonNull(regex, "regex must not be null."); - this.description = description.orElse(null); - this.reference = reference.orElse(null); - this.errorAppTag = errorAppTag != null ? errorAppTag : "invalid-regular-expression"; - this.errorMessage = errorMessage; - this.modifier = modifier.orElse(null); - } - - @Override - public Optional getDescription() { - return Optional.ofNullable(description); - } - - @Override - public Optional getErrorAppTag() { - return Optional.ofNullable(errorAppTag); - } - - @Override - public Optional getErrorMessage() { - return Optional.ofNullable(errorMessage); - } - - @Override - public Optional getReference() { - return Optional.ofNullable(reference); - } - - @Override - public String getJavaPatternString() { - return regex; - } - - @Override - public String getRegularExpressionString() { - throw new UnsupportedOperationException(); - } - - @Override - public Optional getModifier() { - return Optional.ofNullable(modifier); - } - - @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 instanceof PatternConstraintImpl)) { - 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(); - } -} diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImplTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImplTest.java deleted file mode 100644 index a98fc2ac4c..0000000000 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImplTest.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2014 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.model.util; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.Optional; -import org.junit.Test; - -public class PatternConstraintImplTest { - - @Test - public void testMethodsOfPatternConstraintImpl() { - final String regexExp = "\\D"; - final Optional description = Optional.of("test description"); - final Optional reference = Optional.of("RFC 6020"); - final PatternConstraintImpl patternConstraint = new PatternConstraintImpl(regexExp, description, reference); - final String regexExp2 = "\\s"; - final Optional description2 = Optional.of("test description2"); - final Optional reference2 = Optional.of("RFC 6020 http://tools.ietf.org/html/rfc6020#page-23"); - final PatternConstraintImpl patternConstraint2 = new PatternConstraintImpl(regexExp2, description2, reference2); - final PatternConstraintImpl patternConstraint3 = patternConstraint; - final PatternConstraintImpl patternConstraint4 = new PatternConstraintImpl(regexExp, description2, reference); - final PatternConstraintImpl patternConstraint5 = new PatternConstraintImpl(regexExp2, description2, reference2); - - assertNotNull("Object of PatternConstraintImpl shouldn't be null.", patternConstraint); - assertEquals("Description should be 'test description'.", Optional.of("test description"), - patternConstraint.getDescription()); - assertEquals(Optional.of("invalid-regular-expression"), patternConstraint.getErrorAppTag()); - assertFalse(patternConstraint.getErrorMessage().isPresent()); - assertEquals(Optional.of("RFC 6020"), patternConstraint.getReference()); - assertEquals("Regular expression should be equls '\\D'.", "\\D", patternConstraint.getJavaPatternString()); - assertNotEquals("Hash codes shouldn't be equals.", patternConstraint.hashCode(), patternConstraint2.hashCode()); - assertFalse("String representation shouldn't be empty.", patternConstraint.toString().isEmpty()); - - assertTrue("Objects should be equals.", patternConstraint.equals(patternConstraint3)); - assertFalse("Objects shouldn't be equals.", patternConstraint.equals(patternConstraint2)); - assertFalse("Objects shouldn't be equals.", patternConstraint4.equals(patternConstraint)); - assertFalse("Objects shouldn't be equals.", patternConstraint5.equals(patternConstraint)); - assertFalse("Objects shouldn't be equals.", patternConstraint.equals("test")); - assertFalse("Objects shouldn't be equals.", patternConstraint.equals(null)); - } -} -- 2.36.6