Promote SchemaSourceRepresentation

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

diff --git a/yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/DelegatedYinTextSchemaSource.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/source/DelegatedYinTextSource.java
similarity index 73%
rename from yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/DelegatedYinTextSchemaSource.java
rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/source/DelegatedYinTextSource.java
index 83e802dac758a9998bc3bce0a55594eaa85d625e..d008458088d331af4ef3ccc4e157c7c5c3d24499 100644 (file)
--- a/yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/DelegatedYinTextSchemaSource.java
+++ b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/source/DelegatedYinTextSource.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;
 
@@ -13,15 +13,15 @@ import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.io.ByteSource;
 import java.io.IOException;
 import java.io.InputStream;
-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;
 
-final class DelegatedYinTextSchemaSource extends YinTextSchemaSource implements Delegator<ByteSource> {
+final class DelegatedYinTextSource extends YinTextSource implements Delegator<ByteSource> {
     private final @NonNull ByteSource delegate;
 
-    DelegatedYinTextSchemaSource(final SourceIdentifier identifier, final ByteSource delegate) {
-        super(identifier);
+    DelegatedYinTextSource(final SourceIdentifier sourceId, final ByteSource delegate) {
+        super(sourceId);
         this.delegate = requireNonNull(delegate);
     }
 
@@ -36,8 +36,8 @@ final class DelegatedYinTextSchemaSource extends YinTextSchemaSource implements
     }
 
     @Override
-    public Optional<String> getSymbolicName() {
-        return Optional.of("[" + delegate.toString() + "]");
+    public String symbolicName() {
+        return "[" + delegate.toString() + "]";
     }
 
     @Override