From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 20 Apr 2021 21:31:26 +0000 (+0200)
Subject: Require SchemaSourceRepresentation.getSymbolicName()
X-Git-Tag: v7.0.0~31
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=6b2fbf76623d6a623840fc6217a91fbdf8505fc6;p=yangtools.git

Require SchemaSourceRepresentation.getSymbolicName()

getSymbolicName() has been retrofitted into the API long time ago, but
due to its default nature a number of of implementations failed to
provide an override.

Make sure the method is required to be implemented, so that
implementators are well aware of it.

JIRA: YANGTOOLS-1275
Change-Id: Ib98189c606312db80480302959ef563342f5b3ea
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaSourceRepresentation.java b/yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaSourceRepresentation.java
index 431aac46f9..972c26f6cb 100644
--- a/yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaSourceRepresentation.java
+++ b/yang/yang-repo-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaSourceRepresentation.java
@@ -54,7 +54,5 @@ public interface SchemaSourceRepresentation extends Identifiable<SourceIdentifie
      *
      * @return Symbolic name, if available
      */
-    default Optional<String> getSymbolicName() {
-        return Optional.empty();
-    }
+    Optional<String> getSymbolicName();
 }
diff --git a/yang/yang-repo-fs/src/test/java/org/opendaylight/yangtools/yang/model/repo/fs/FilesystemSchemaSourceCacheIntegrationTest.java b/yang/yang-repo-fs/src/test/java/org/opendaylight/yangtools/yang/model/repo/fs/FilesystemSchemaSourceCacheIntegrationTest.java
index 0c88536b50..f1dbd0dca0 100644
--- a/yang/yang-repo-fs/src/test/java/org/opendaylight/yangtools/yang/model/repo/fs/FilesystemSchemaSourceCacheIntegrationTest.java
+++ b/yang/yang-repo-fs/src/test/java/org/opendaylight/yangtools/yang/model/repo/fs/FilesystemSchemaSourceCacheIntegrationTest.java
@@ -124,6 +124,11 @@ public class FilesystemSchemaSourceCacheIntegrationTest {
                 public InputStream openStream() throws IOException {
                     return new ByteArrayInputStream("running".getBytes(StandardCharsets.UTF_8));
                 }
+
+                @Override
+                public Optional<String> getSymbolicName() {
+                    return Optional.empty();
+                }
             }), PotentialSchemaSource.create(runningId, YangTextSchemaSource.class,
                 PotentialSchemaSource.Costs.REMOTE_IO.getValue()));
 
diff --git a/yang/yang-repo-fs/src/test/java/org/opendaylight/yangtools/yang/model/repo/fs/FilesystemSchemaSourceCacheTest.java b/yang/yang-repo-fs/src/test/java/org/opendaylight/yangtools/yang/model/repo/fs/FilesystemSchemaSourceCacheTest.java
index 54ccc2ad0b..91f27b6c8d 100644
--- a/yang/yang-repo-fs/src/test/java/org/opendaylight/yangtools/yang/model/repo/fs/FilesystemSchemaSourceCacheTest.java
+++ b/yang/yang-repo-fs/src/test/java/org/opendaylight/yangtools/yang/model/repo/fs/FilesystemSchemaSourceCacheTest.java
@@ -33,6 +33,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import org.junit.Before;
 import org.junit.Test;
@@ -224,7 +225,6 @@ public class FilesystemSchemaSourceCacheTest {
     }
 
     private class TestingYangSource extends YangTextSchemaSource {
-
         private final String content;
 
         TestingYangSource(final String name, final String revision, final String content) {
@@ -241,5 +241,10 @@ public class FilesystemSchemaSourceCacheTest {
         public InputStream openStream() throws IOException {
             return new ByteArrayInputStream(this.content.getBytes(StandardCharsets.UTF_8));
         }
+
+        @Override
+        public Optional<String> getSymbolicName() {
+            return Optional.empty();
+        }
     }
 }
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 f8fe850573..36324e84fe 100644
--- 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
@@ -20,6 +20,7 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import org.junit.Before;
@@ -125,10 +126,9 @@ public class GuavaSchemaSourceCacheTest {
     }
 
     private class TestingYangSource extends YangTextSchemaSource {
-
         private final String content;
 
-        protected TestingYangSource(final String name, final String revision, final String content) {
+        TestingYangSource(final String name, final String revision, final String content) {
             super(RevisionSourceIdentifier.create(name, Revision.ofNullable(revision)));
             this.content = content;
         }
@@ -142,6 +142,10 @@ public class GuavaSchemaSourceCacheTest {
         public InputStream openStream() throws IOException {
             return new ByteArrayInputStream(this.content.getBytes(StandardCharsets.UTF_8));
         }
-    }
 
+        @Override
+        public Optional<String> getSymbolicName() {
+            return Optional.empty();
+        }
+    }
 }