From d4f2cc405ea8a5d68bb0932011885f08dc42902f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 1 Mar 2022 11:30:29 +0100 Subject: [PATCH] Fix eclipse warnings We have a warning about nullability mismatch, fix that through local variable type inference. Change-Id: Id0512b52b42ae04e2ffa311fb6ca3e0406c9776c Signed-off-by: Robert Varga --- .../yangtools/yang/model/repo/api/YangTextSchemaSource.java | 3 +-- .../yangtools/yang/model/repo/api/YinTextSchemaSource.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YangTextSchemaSource.java b/yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YangTextSchemaSource.java index 30015ec215..40a2ae5ccd 100644 --- a/yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YangTextSchemaSource.java +++ b/yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YangTextSchemaSource.java @@ -22,7 +22,6 @@ import java.io.InputStream; import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Map.Entry; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.Revision; @@ -42,7 +41,7 @@ public abstract class YangTextSchemaSource extends ByteSource implements YangSch RFC6020_YANG_FILE_EXTENSION); final String baseName = name.substring(0, name.length() - RFC6020_YANG_FILE_EXTENSION.length()); - final Entry parsed = parseFilename(baseName); + final var parsed = parseFilename(baseName); return RevisionSourceIdentifier.create(parsed.getKey(), Revision.ofNullable(parsed.getValue())); } diff --git a/yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YinTextSchemaSource.java b/yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YinTextSchemaSource.java index bddf3373e2..eb89a17b64 100644 --- a/yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YinTextSchemaSource.java +++ b/yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YinTextSchemaSource.java @@ -18,7 +18,6 @@ import com.google.common.io.Resources; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Map.Entry; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.common.YangConstants; @@ -52,7 +51,7 @@ public abstract class YinTextSchemaSource extends ByteSource implements YinSchem throw new IllegalArgumentException("Filename " + name + " does not have a .yin or .xml extension"); } - final Entry parsed = YangNames.parseFilename(baseName); + final var parsed = YangNames.parseFilename(baseName); return RevisionSourceIdentifier.create(parsed.getKey(), Revision.ofNullable(parsed.getValue())); } -- 2.36.6