Introduce restconf.server.{api,spi,mdsal}

[netconf.git] / restconf / restconf-nb / src / main / java / org / opendaylight / restconf / server / spi / Subscribers.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/Subscribers.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/Subscribers.java
similarity index 95%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/Subscribers.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/Subscribers.java
index db13ca7e4a75b8101aa5e6e72f36b547e932419a..2be633eff6c016e1eee2de7ae94dfef85daee632 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/Subscribers.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/Subscribers.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.restconf.nb.rfc8040.streams;
+package org.opendaylight.restconf.server.spi;
 
 import static java.util.Objects.requireNonNull;
 
@@ -76,14 +76,14 @@ abstract sealed class Subscribers<T> {
 
         @Override
         void endOfStream() {
-            subscriber.handler().endOfStream();
+            subscriber.sender().endOfStream();
         }
 
         @Override
         void publish(final EffectiveModelContext modelContext, final T input, final Instant now) {
             final var formatted = format(subscriber.formatter(), modelContext, input, now);
             if (formatted != null) {
-                subscriber.handler().sendDataMessage(formatted);
+                subscriber.sender().sendDataMessage(formatted);
             }
         }
     }
@@ -114,7 +114,7 @@ abstract sealed class Subscribers<T> {
 
         @Override
         void endOfStream() {
-            subscribers.forEach((formatter, subscriber) -> subscriber.handler().endOfStream());
+            subscribers.forEach((formatter, subscriber) -> subscriber.sender().endOfStream());
         }
 
         @Override
@@ -123,7 +123,7 @@ abstract sealed class Subscribers<T> {
                 final var formatted = format(entry.getKey(), modelContext, input, now);
                 if (formatted != null) {
                     for (var subscriber : entry.getValue()) {
-                        subscriber.handler().sendDataMessage(formatted);
+                        subscriber.sender().sendDataMessage(formatted);
                     }
                 }
             }
@@ -144,7 +144,7 @@ abstract sealed class Subscribers<T> {
      * @return An empty {@link Subscribers} file
      */
     @SuppressWarnings("unchecked")
-    static <T> @NonNull Subscribers<T> empty() {
+    static <T> org.opendaylight.restconf.server.spi.Subscribers<T> empty() {
         return (Subscribers<T>) Empty.INSTANCE;
     }