Promote SchemaSourceRepresentation

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

diff --git a/yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/StringYangTextSchemaSource.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/source/StringYangTextSource.java
similarity index 60%
rename from yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/StringYangTextSchemaSource.java
rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/source/StringYangTextSource.java
index 9ac1d59c538d00f75d148c714ce6af1a22cdd21d..a5fb641072106c579dd9432a98bcafaf7672a7cd 100644 (file)
--- a/yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/StringYangTextSchemaSource.java
+++ b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/source/StringYangTextSource.java
@@ -5,37 +5,37 @@
  * 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;
 
 import java.io.Reader;
 import java.io.StringReader;
-import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yangtools.yang.model.api.source.SourceIdentifier;
 
 /**
- * A {@link YangTextSchemaSource} with content readily available.
+ * A {@link YangTextSource} with content readily available.
  */
-public class StringYangTextSchemaSource extends YangTextSchemaSource {
+public class StringYangTextSource extends YangTextSource {
     private final @Nullable String symbolicName;
     private final @NonNull String content;
 
-    public StringYangTextSchemaSource(final SourceIdentifier identifier, final String content) {
-        this(identifier, content, null);
+    public StringYangTextSource(final SourceIdentifier sourceId, final String content) {
+        this(sourceId, content, null);
     }
 
-    public StringYangTextSchemaSource(final SourceIdentifier identifier, final String content,
+    public StringYangTextSource(final SourceIdentifier sourceId, final String content,
             final @Nullable String symbolicName) {
-        super(identifier);
+        super(sourceId);
         this.content = requireNonNull(content);
         this.symbolicName = symbolicName;
     }
 
     @Override
-    public final Optional<String> getSymbolicName() {
-        return Optional.ofNullable(symbolicName);
+    public final String symbolicName() {
+        return symbolicName;
     }
 
     @Override