Promote SchemaSourceRepresentation

[yangtools.git] / yang / yang-repo-spi / src / test / java / org / opendaylight / yangtools / yang / model / repo / spi / GuavaSchemaSourceCacheTest.java

diff --git a/yang/yang-repo-spi/src/test/java/org/opendaylight/yangtools/yang/model/repo/spi/GuavaSchemaSourceCacheTest.java b/yang/yang-repo-spi/src/test/java/org/opendaylight/yangtools/yang/model/repo/spi/GuavaSchemaSourceCacheTest.java
index 9e84d86e1c8003c5385c29d75a463a92008af10f..6c53af93bfd525b352a070c1abb5bb825b3794fb 100644 (file)
--- a/yang/yang-repo-spi/src/test/java/org/opendaylight/yangtools/yang/model/repo/spi/GuavaSchemaSourceCacheTest.java
+++ b/yang/yang-repo-spi/src/test/java/org/opendaylight/yangtools/yang/model/repo/spi/GuavaSchemaSourceCacheTest.java
@@ -16,7 +16,6 @@ import static org.mockito.Mockito.doReturn;
 
 import com.google.common.base.MoreObjects.ToStringHelper;
 import java.io.StringReader;
-import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.Test;
@@ -24,14 +23,14 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opendaylight.yangtools.concepts.Registration;
-import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
-import org.opendaylight.yangtools.yang.model.repo.api.YangSchemaSourceRepresentation;
-import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
+import org.opendaylight.yangtools.yang.model.api.source.SourceIdentifier;
+import org.opendaylight.yangtools.yang.model.api.source.YangSourceRepresentation;
+import org.opendaylight.yangtools.yang.model.spi.source.YangTextSource;
 
 @Deprecated
 @ExtendWith(MockitoExtension.class)
 class GuavaSchemaSourceCacheTest {
-    private static final Class<YangSchemaSourceRepresentation> REPRESENTATION = YangSchemaSourceRepresentation.class;
+    private static final Class<YangSourceRepresentation> REPRESENTATION = YangSourceRepresentation.class;
     private static final long LIFETIME = 1000L;
     private static final TimeUnit UNITS = TimeUnit.MILLISECONDS;
 
@@ -68,7 +67,7 @@ class GuavaSchemaSourceCacheTest {
             assertNotNull(checkedSource);
             final var yangSchemaSourceRepresentation = checkedSource.get();
             assertNotNull(yangSchemaSourceRepresentation);
-            assertEquals(sourceIdentifier, yangSchemaSourceRepresentation.getIdentifier());
+            assertEquals(sourceIdentifier, yangSchemaSourceRepresentation.sourceId());
         }
     }
 
@@ -105,7 +104,7 @@ class GuavaSchemaSourceCacheTest {
         }
     }
 
-    private static class TestingYangSource extends YangTextSchemaSource {
+    private static class TestingYangSource extends YangTextSource {
         private final String content;
 
         TestingYangSource(final String name, final String revision, final String content) {
@@ -119,8 +118,8 @@ class GuavaSchemaSourceCacheTest {
         }
 
         @Override
-        public Optional<String> getSymbolicName() {
-            return Optional.empty();
+        public String symbolicName() {
+            return null;
         }
 
         @Override