Promote SchemaSourceRepresentation

[yangtools.git] / model / yang-model-spi / src / main / java / org / opendaylight / yangtools / yang / model / spi / source / YinTextFileSource.java

diff --git a/yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YinTextFileSchemaSource.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/source/YinTextFileSource.java
similarity index 70%
rename from yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YinTextFileSchemaSource.java
rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/source/YinTextFileSource.java
index 10b993e02f209c07893ca1584a72c111713d2cda..d1f1358bb8371e85c025c20fd1c4066111a9b181 100644 (file)
--- a/yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YinTextFileSchemaSource.java
+++ b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/source/YinTextFileSource.java
@@ -5,7 +5,7 @@
  * 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.repo.api;
+package org.opendaylight.yangtools.yang.model.spi.source;
 
 import static java.util.Objects.requireNonNull;
 
@@ -14,20 +14,18 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.concepts.Delegator;
+import org.opendaylight.yangtools.yang.model.api.source.SourceIdentifier;
 
 /**
- * A {@link YinTextSchemaSource} backed by a file.
- *
- * @author Robert Varga
+ * A {@link YinTextSource} backed by a file.
  */
-final class YinTextFileSchemaSource extends YinTextSchemaSource implements Delegator<Path> {
+final class YinTextFileSource extends YinTextSource implements Delegator<Path> {
     private final @NonNull Path path;
 
-    YinTextFileSchemaSource(final @NonNull SourceIdentifier identifier, final @NonNull Path path) {
-        super(identifier);
+    YinTextFileSource(final @NonNull SourceIdentifier sourceId, final @NonNull Path path) {
+        super(sourceId);
         this.path = requireNonNull(path);
     }
 
@@ -47,7 +45,7 @@ final class YinTextFileSchemaSource extends YinTextSchemaSource implements Deleg
     }
 
     @Override
-    public Optional<String> getSymbolicName() {
-        return Optional.of(path.toString());
+    public String symbolicName() {
+        return path.toString();
     }
 }