From 23bfbdabd5296bb721b5e021fbeb93699d9c2f56 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 28 Feb 2022 22:59:22 +0100 Subject: [PATCH] Remove unneeded constant We do not need the Splitter anymore, remove it. Change-Id: I6715a730540457d244b5859a3ddafd0f527c640e Signed-off-by: Robert Varga --- .../rfc7950/repo/YangModelDependencyInfo.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java index 086a3a9f8c..c81bf3a884 100644 --- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java +++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java @@ -11,7 +11,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; import com.google.common.annotations.Beta; -import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; import java.io.IOException; @@ -64,8 +63,6 @@ public abstract class YangModelDependencyInfo { private static final String OPENCONFIG_VERSION = OpenConfigStatements.OPENCONFIG_VERSION.getStatementName() .getLocalName(); - @Deprecated - private static final Splitter COLON_SPLITTER = Splitter.on(":").omitEmptyStrings().trimResults(); private final String name; private final Revision revision; @@ -85,10 +82,10 @@ public abstract class YangModelDependencyInfo { final ImmutableSet includes, final Optional semVer) { this.name = name; - this.revision = Revision.ofNullable(formattedRevision).orElse(null); - this.moduleImports = imports; - this.submoduleIncludes = includes; - this.dependencies = ImmutableSet.builder() + revision = Revision.ofNullable(formattedRevision).orElse(null); + moduleImports = imports; + submoduleIncludes = includes; + dependencies = ImmutableSet.builder() .addAll(moduleImports).addAll(submoduleIncludes).build(); this.semVer = semVer.orElse(null); } @@ -391,7 +388,7 @@ public abstract class YangModelDependencyInfo { ModuleImportImpl(final @NonNull String moduleName, final @Nullable Revision revision, final @Nullable SemVer semVer) { - this.name = requireNonNull(moduleName, "Module name must not be null."); + name = requireNonNull(moduleName, "Module name must not be null."); this.revision = revision; this.semVer = semVer; } -- 2.36.6