X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-repo-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fmodel%2Frepo%2Fapi%2FYinTextSchemaSource.java;h=eb89a17b64b700e2570eb193580b684414dd3c3f;hb=d4f2cc405ea8a5d68bb0932011885f08dc42902f;hp=cead5fe4f53ac7e17a146ea4150eddb0d479e424;hpb=c562c0ce956b098e91205ff0fb609f82f5b9ea57;p=yangtools.git 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 cead5fe4f5..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 @@ -15,9 +15,9 @@ import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.io.ByteSource; import com.google.common.io.Resources; -import java.io.File; import java.io.InputStream; -import java.util.Map.Entry; +import java.nio.file.Files; +import java.nio.file.Path; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.common.YangConstants; @@ -51,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())); } @@ -94,9 +94,9 @@ public abstract class YinTextSchemaSource extends ByteSource implements YinSchem return new DelegatedYinTextSchemaSource(identifier, delegate); } - public static @NonNull YinTextSchemaSource forFile(final File file) { - checkArgument(file.isFile(), "Supplied file %s is not a file", file); - return new YinTextFileSchemaSource(identifierFromFilename(file.getName()), file); + public static @NonNull YinTextSchemaSource forPath(final Path path) { + checkArgument(Files.isRegularFile(path), "Supplied path %s is not a regular file", path); + return new YinTextFileSchemaSource(identifierFromFilename(path.toFile().getName()), path); } public static @NonNull YinTextSchemaSource forResource(final Class clazz, final String resourceName) {