Factor out restconf-server-spi

Move RESTCONF SPI-level contracts into a separate component.

JIRA: NETCONF-773
Change-Id: I5a24130606d55f9a89c8cf857d3d405afc402730
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 533673c3ba79e2fdbbf6a883733032e753794b98..1f6cdfd0643cf8a038048e080eb69a46b16e30f4 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -457,24 +457,29 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-server</artifactId>
+                <artifactId>restconf-nb</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-server-api</artifactId>
+                <artifactId>restconf-nb</artifactId>
+                <type>cfg</type>
+                <classifier>config</classifier>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>restconf-nb</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>restconf-server</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-nb</artifactId>
-                <type>cfg</type>
-                <classifier>config</classifier>
+                <artifactId>restconf-server-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>restconf-server-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

diff --git a/protocol/pom.xml b/protocol/pom.xml
index e984ed1a5b34d3e4ef771f74660a684840a57ffd..c887f3a4c3e6ee8661ddd32ca3bb36f35fb68ac3 100644 (file)
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -38,5 +38,6 @@
         <module>restconf-client</module>
         <module>restconf-server</module>
         <module>restconf-server-api</module>
+        <module>restconf-server-spi</module>
     </modules>
 </project>

diff --git a/protocol/restconf-server-spi/pom.xml b/protocol/restconf-server-spi/pom.xml
new file mode 100644 (file)
index 0000000..1335b13
--- /dev/null
+++ b/protocol/restconf-server-spi/pom.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2024 PANTHEON.tech, s.r.o. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>netconf-parent</artifactId>
+        <version>8.0.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
+    </parent>
+
+    <artifactId>restconf-server-spi</artifactId>
+    <name>${project.artifactId}</name>
+    <packaging>bundle</packaging>
+    <description>RESTCONF server SPI</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8040-ietf-restconf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8040-ietf-restconf-monitoring</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8072</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>netconf-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>restconf-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>restconf-server-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-codec-gson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-codec-xml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>rfc8040-model-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-util</artifactId>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/AbstractRestconfStreamRegistry.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/AbstractRestconfStreamRegistry.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/AbstractRestconfStreamRegistry.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/AbstractRestconfStreamRegistry.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/AllOperations.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/AllOperations.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/AllOperations.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/AllOperations.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/ApiPathCanonizer.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/ApiPathCanonizer.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/ApiPathCanonizer.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/ApiPathCanonizer.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/ApiPathNormalizer.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/ApiPathNormalizer.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/ApiPathNormalizer.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/ApiPathNormalizer.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/DataFormattableBody.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DataFormattableBody.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/DataFormattableBody.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DataFormattableBody.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/DatabindProvider.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DatabindProvider.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/DatabindProvider.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DatabindProvider.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/DefaultMapBodyOrder.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DefaultMapBodyOrder.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/DefaultMapBodyOrder.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DefaultMapBodyOrder.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/DefaultNormalizedNodeWriter.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DefaultNormalizedNodeWriter.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/DefaultNormalizedNodeWriter.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DefaultNormalizedNodeWriter.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/DefaultNormalizedNodeWriterFactory.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DefaultNormalizedNodeWriterFactory.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/DefaultNormalizedNodeWriterFactory.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DefaultNormalizedNodeWriterFactory.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/DefaultResourceContext.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DefaultResourceContext.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/DefaultResourceContext.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/DefaultResourceContext.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/EventFormatter.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/EventFormatter.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/EventFormatter.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/EventFormatter.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/EventFormatterFactory.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/EventFormatterFactory.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/EventFormatterFactory.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/EventFormatterFactory.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/FailedHttpGetResource.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/FailedHttpGetResource.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/FailedHttpGetResource.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/FailedHttpGetResource.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/HttpGetResource.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/HttpGetResource.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/HttpGetResource.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/HttpGetResource.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/Insert.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/Insert.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/Insert.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/Insert.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/IterationMapBodyOrder.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/IterationMapBodyOrder.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/IterationMapBodyOrder.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/IterationMapBodyOrder.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/MapBodyOrder.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/MapBodyOrder.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/MapBodyOrder.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/MapBodyOrder.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/MaxDepthNormalizedNodeWriterFactory.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/MaxDepthNormalizedNodeWriterFactory.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/MaxDepthNormalizedNodeWriterFactory.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/MaxDepthNormalizedNodeWriterFactory.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/NormalizedFormattableBody.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/NormalizedFormattableBody.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/NormalizedFormattableBody.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/NormalizedFormattableBody.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriter.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriter.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriter.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriter.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriterFactory.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriterFactory.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriterFactory.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriterFactory.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/OneOperation.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/OneOperation.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/OneOperation.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/OneOperation.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/OperationInput.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/OperationInput.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/OperationInput.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/OperationInput.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/OperationsBody.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/OperationsBody.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/OperationsBody.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/OperationsBody.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/OperationsResource.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/OperationsResource.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/OperationsResource.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/OperationsResource.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/RestconfStream.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/RestconfStream.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/RestconfStream.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/RestconfStream.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/RootFormattableBody.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/RootFormattableBody.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/RootFormattableBody.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/RootFormattableBody.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/RpcImplementation.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/RpcImplementation.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/RpcImplementation.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/RpcImplementation.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/Subscriber.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/Subscriber.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/Subscriber.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/Subscriber.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/Subscribers.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/Subscribers.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/Subscribers.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/Subscribers.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/TextParameters.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/TextParameters.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/TextParameters.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/TextParameters.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/YangLibraryVersionResource.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/YangLibraryVersionResource.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/YangLibraryVersionResource.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/YangLibraryVersionResource.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/YangPatchStatusBody.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/YangPatchStatusBody.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/YangPatchStatusBody.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/YangPatchStatusBody.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/package-info.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/package-info.java
similarity index 100%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/package-info.java
rename to protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/package-info.java

diff --git a/restconf/restconf-nb/pom.xml b/restconf/restconf-nb/pom.xml
index 32ea269bd12bae50981d9874c3a2ffcc5d58a4d4..350add6a61669c924432a8dec62019027565159f 100644 (file)
--- a/restconf/restconf-nb/pom.xml
+++ b/restconf/restconf-nb/pom.xml
@@ -100,6 +100,10 @@
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>restconf-server-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>restconf-server-spi</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.opendaylight.odlparent</groupId>
@@ -110,10 +114,6 @@
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>concepts</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>rfc8040-model-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>util</artifactId>