Bump MRI upstreams

Adopt following versions:
- odlparent-8.1.2
- infrautils-1.9.8
- yangtools-6.0.6
- mdsal-7.0.7
- controller-3.0.8
- aaa-0.13.3

Change-Id: Ib48792875c6c54a1f328e466a5de47d7d2af8850
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 877c73486f0e1f44a2a46d6762f401d61900bf29..edcf8ed49957d3f4a48985c6959072788508417b 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>8.1.1</version>
+      <version>8.1.2</version>
       <relativePath/>
     </parent>
 

diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml
index 91372a2976286691ca04ec64d582d66f43dca1fa..35bf97028cdfced47696b81a622b2fc3155c647b 100644 (file)
--- a/features/netconf-connector/features-netconf-connector/pom.xml
+++ b/features/netconf-connector/features-netconf-connector/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>8.1.1</version>
+    <version>8.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 76ffd3e2566c92e6c1c8baf757bccf19d9390e00..41d47b83466473a59e102971f622bbb3b87c5444 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/features-netconf-testing/pom.xml b/features/netconf/features-netconf-testing/pom.xml
index e7c6bda003de525ebd25afb85f0fd242fdf7deb4..9ce8b7021815be4842fb180bae1156e31f241af5 100644 (file)
--- a/features/netconf/features-netconf-testing/pom.xml
+++ b/features/netconf/features-netconf-testing/pom.xml
@@ -12,7 +12,7 @@
   <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>feature-repo-parent</artifactId>
-      <version>8.1.1</version>
+      <version>8.1.2</version>
       <relativePath/>
   </parent>
 

diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml
index d92fd85ae6754867c4d7f8d8de1c720da75fa422..1df5a416a9d361aa6f7f5a67ba3a3a1e76b6e316 100644 (file)
--- a/features/netconf/features-netconf/pom.xml
+++ b/features/netconf/features-netconf/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>8.1.1</version>
+    <version>8.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 5a47ebe113b1b8daa55fcb13a5132c39e086df62..d5e1e35da261e3fa83fe316933daae8fc1cb08ae 100644 (file)
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>8.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/parent/pom.xml b/features/parent/pom.xml
index 96bdad0f05ed322da546920f12efe1675a8b4be5..9fe87dc5c5383c48fda1402dd7a974832687f2b4 100644 (file)
--- a/features/parent/pom.xml
+++ b/features/parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 98e225c0a7b62e00f4fbbdc82091286d67b7fb82..3497d43c306d36997c9740c4adfb402e58f8c1d7 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>8.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml
index b2b94869fbad17c368f43576e8dcc44f01c8cfb7..45f909f7c9f92052c11dd78eba00f696278236d1 100644 (file)
--- a/features/restconf/features-restconf/pom.xml
+++ b/features/restconf/features-restconf/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>8.1.1</version>
+    <version>8.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index 8d7f4b4705dbbca51952ca8f686ab6a01c8bde86..9d09b0a848bb6547b0c462c4df6143b00695aec6 100644 (file)
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml
index 43ab99fae886e47be8850ed4163347c21a491ede..bd6e87e386bf81f6981c3a423301c7a53b614331 100644 (file)
--- a/features/yanglib/features-yanglib/pom.xml
+++ b/features/yanglib/features-yanglib/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml
index 82784486a3fb8c244de71214bb7b2be082c85137..249231bca0822247737a7bfa7ca7a87b216379c4 100644 (file)
--- a/features/yanglib/pom.xml
+++ b/features/yanglib/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index f94dc652ba38ca9e2ff8271e3ca14065eb68cd7a..06b33a5c08d7d78653c6ae50600b90d8718191ca 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>8.1.1</version>
+    <version>8.1.2</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/models/pom.xml b/netconf/models/pom.xml
index 57a263bea1e9cf7b7a165dadb5dd457e53d7f5f0..4f47bb023cd38e51a08d335f34de1c6774903974 100644 (file)
--- a/netconf/models/pom.xml
+++ b/netconf/models/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>8.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/netconf/netconf-config/pom.xml b/netconf/netconf-config/pom.xml
index ddf61f199a65434b0653919ae4e23081f3a7e36e..4da19c7b16831545abdd08e975a5afd6332932c0 100644 (file)
--- a/netconf/netconf-config/pom.xml
+++ b/netconf/netconf-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>8.1.1</version>
+    <version>8.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/netconf/pom.xml b/netconf/pom.xml
index 1e516b3eab6c5f75edecd2c676d205d1e280f3e1..6da7e33476bbbad8fa20d8e2baaefe57e14e87c6 100644 (file)
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>8.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/netconf/shaded-exificient-jar/pom.xml b/netconf/shaded-exificient-jar/pom.xml
index 916b61cd09eff9a84f5949cf009a6ed7a73ea6c3..a2e8fa57340bfc3d2837f87e8c0a9d5a01b7019e 100644 (file)
--- a/netconf/shaded-exificient-jar/pom.xml
+++ b/netconf/shaded-exificient-jar/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/shaded-exificient/pom.xml b/netconf/shaded-exificient/pom.xml
index ff92c4c3412eac2792ee6c2adeec7f5c022389b9..3b7f791d6b088d02429f9abcb41177526b9ea19a 100644 (file)
--- a/netconf/shaded-exificient/pom.xml
+++ b/netconf/shaded-exificient/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/shaded-sshd-jar/pom.xml b/netconf/shaded-sshd-jar/pom.xml
index a8abfd4d991504f554b4096efa88ab6dc89539b6..40a456fa2751364fcaeaf13d780f48ea66086ba4 100644 (file)
--- a/netconf/shaded-sshd-jar/pom.xml
+++ b/netconf/shaded-sshd-jar/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/shaded-sshd/pom.xml b/netconf/shaded-sshd/pom.xml
index be985c767f3b0744671a1db138c7a178d19ad9b2..f740a1b06aa2e00b85f03ef61ca5a40dd4c58a93 100644 (file)
--- a/netconf/shaded-sshd/pom.xml
+++ b/netconf/shaded-sshd/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/RequestMessageUtils.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/RequestMessageUtils.java
index 6267d05827e9ac179a430c865b12b8ae7e327b96..0b83cce0b518bf8bb432f25ca765431507eeb53e 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/RequestMessageUtils.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/RequestMessageUtils.java
@@ -5,7 +5,6 @@
  * 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.netconf.test.tool.client.http.perf;
 
 import com.ning.http.client.AsyncHttpClient;
@@ -29,7 +28,8 @@ public final class RequestMessageUtils {
 
     private static long macStart = 0xAABBCCDD0000L;
 
-    private RequestMessageUtils(){
+    private RequestMessageUtils() {
+        // Hidden on purpose
     }
 
     public static String prepareMessage(final int idi, final int idj, final String editContentString,

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/package-info.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/package-info.java
index e65ec073874bbde3c0330dfe456ec5e989b49825..53ca976977743428f5f7e3ad3d12e126e9a1d075 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/package-info.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/package-info.java
@@ -6,13 +6,13 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 @XmlSchema(
-        elementFormDefault = XmlNsForm.QUALIFIED,
-        xmlns = {
-                @XmlNs(namespaceURI = MonitoringConstants.EXTENSION_NAMESPACE, prefix =
-                        MonitoringConstants.EXTENSION_NAMESPACE_PREFIX),
-                @XmlNs(namespaceURI = MonitoringConstants.NAMESPACE, prefix = "")
-        },
-        namespace = MonitoringConstants.NAMESPACE
+    elementFormDefault = XmlNsForm.QUALIFIED,
+    xmlns = {
+        @XmlNs(namespaceURI = MonitoringConstants.EXTENSION_NAMESPACE,
+               prefix = MonitoringConstants.EXTENSION_NAMESPACE_PREFIX),
+        @XmlNs(namespaceURI = MonitoringConstants.NAMESPACE, prefix = "")
+    },
+    namespace = MonitoringConstants.NAMESPACE
 )
 package org.opendaylight.netconf.test.tool.monitoring;
 

diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml
index e4b26048f1f7a77505e4ff270c2d0bd88b8330c8..4b9f8b1d07e40e04d02757b6fa27154d8a85ec74 100644 (file)
--- a/netconf/tools/pom.xml
+++ b/netconf/tools/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>8.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/parent/pom.xml b/parent/pom.xml
index d17cf8471f1970ef028090574f8b5d640b078b70..63da8bb5e214167ba62a88d1196c3d08853234c1 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>7.0.6</version>
+    <version>7.0.7</version>
     <relativePath/>
   </parent>
 
@@ -25,14 +25,14 @@
       <dependency>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa-artifacts</artifactId>
-        <version>0.13.2</version>
+        <version>0.13.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>3.0.7</version>
+        <version>3.0.8</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/pom.xml b/pom.xml
index 3b2fcff93b2af7312c29adca918e2b844a5bc79b..a06c268c1c4ac5053a6562df2137b3e8570e4e41 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/restconf/pom.xml b/restconf/pom.xml
index d4871d1fa8090e0d2addd06f6f71f34db3f626fd..c8ea155fb32ebe5945f5df8ab841992b5d8d5b03 100644 (file)
--- a/restconf/pom.xml
+++ b/restconf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/restconf/restconf-models/pom.xml b/restconf/restconf-models/pom.xml
index 14f2752f205d6c280a3fe4edc9f6f45ce11b6c83..ed6cbc7eb4308c3c1b68025b84aac6c1ef981f26 100644 (file)
--- a/restconf/restconf-models/pom.xml
+++ b/restconf/restconf-models/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>8.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfService.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfService.java
index d110de8fdf407856142657901a51134e4c97d7f4..f29fa26fe146b782a54ca3eaa4ff51f0e9bde8ff 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfService.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfService.java
@@ -69,8 +69,13 @@ public interface RestconfService {
     @Deprecated
     @GET
     @Path("/modules")
-    @Produces({ Draft02.MediaTypes.API + JSON, Draft02.MediaTypes.API + XML, MediaType.APPLICATION_JSON,
-            MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Produces({
+        Draft02.MediaTypes.API + JSON,
+        Draft02.MediaTypes.API + XML,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     NormalizedNodeContext getModules(@Context UriInfo uriInfo);
 
     /**
@@ -87,8 +92,13 @@ public interface RestconfService {
     @Deprecated
     @GET
     @Path("/modules/{identifier:.+}")
-    @Produces({ Draft02.MediaTypes.API + JSON, Draft02.MediaTypes.API + XML, MediaType.APPLICATION_JSON,
-            MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Produces({
+        Draft02.MediaTypes.API + JSON,
+        Draft02.MediaTypes.API + XML,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     NormalizedNodeContext getModules(@PathParam("identifier") String identifier, @Context UriInfo uriInfo);
 
     /**
@@ -105,8 +115,13 @@ public interface RestconfService {
     @Deprecated
     @GET
     @Path("/modules/module/{identifier:.+}")
-    @Produces({ Draft02.MediaTypes.API + JSON, Draft02.MediaTypes.API + XML, MediaType.APPLICATION_JSON,
-            MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Produces({
+        Draft02.MediaTypes.API + JSON,
+        Draft02.MediaTypes.API + XML,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     NormalizedNodeContext getModule(@PathParam("identifier") String identifier, @Context UriInfo uriInfo);
 
     /**
@@ -121,8 +136,13 @@ public interface RestconfService {
     @Deprecated
     @GET
     @Path("/operations")
-    @Produces({ Draft02.MediaTypes.API + JSON, Draft02.MediaTypes.API + XML, MediaType.APPLICATION_JSON,
-            MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Produces({
+        Draft02.MediaTypes.API + JSON,
+        Draft02.MediaTypes.API + XML,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     NormalizedNodeContext getOperations(@Context UriInfo uriInfo);
 
     /**
@@ -139,8 +159,13 @@ public interface RestconfService {
     @Deprecated
     @GET
     @Path("/operations/{identifier:.+}")
-    @Produces({ Draft02.MediaTypes.API + JSON, Draft02.MediaTypes.API + XML, MediaType.APPLICATION_JSON,
-            MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Produces({
+        Draft02.MediaTypes.API + JSON,
+        Draft02.MediaTypes.API + XML,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     NormalizedNodeContext getOperations(@PathParam("identifier") String identifier, @Context UriInfo uriInfo);
 
     /**
@@ -159,12 +184,24 @@ public interface RestconfService {
     @Deprecated
     @POST
     @Path("/operations/{identifier:.+}")
-    @Produces({ Draft02.MediaTypes.OPERATION + JSON, Draft02.MediaTypes.OPERATION + XML,
-            Draft02.MediaTypes.DATA + JSON, Draft02.MediaTypes.DATA + XML, MediaType.APPLICATION_JSON,
-            MediaType.APPLICATION_XML, MediaType.TEXT_XML })
-    @Consumes({ Draft02.MediaTypes.OPERATION + JSON, Draft02.MediaTypes.OPERATION + XML,
-            Draft02.MediaTypes.DATA + JSON, Draft02.MediaTypes.DATA + XML, MediaType.APPLICATION_JSON,
-            MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Produces({
+        Draft02.MediaTypes.OPERATION + JSON,
+        Draft02.MediaTypes.OPERATION + XML,
+        Draft02.MediaTypes.DATA + JSON,
+        Draft02.MediaTypes.DATA + XML,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
+    @Consumes({
+        Draft02.MediaTypes.OPERATION + JSON,
+        Draft02.MediaTypes.OPERATION + XML,
+        Draft02.MediaTypes.DATA + JSON,
+        Draft02.MediaTypes.DATA + XML,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     NormalizedNodeContext invokeRpc(@Encoded @PathParam("identifier") String identifier, NormalizedNodeContext payload,
             @Context UriInfo uriInfo);
 
@@ -182,8 +219,13 @@ public interface RestconfService {
     @Deprecated
     @GET
     @Path("/config/{identifier:.+}")
-    @Produces({ Draft02.MediaTypes.DATA + JSON, Draft02.MediaTypes.DATA + XML, MediaType.APPLICATION_JSON,
-            MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Produces({
+        Draft02.MediaTypes.DATA + JSON,
+        Draft02.MediaTypes.DATA + XML,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     NormalizedNodeContext readConfigurationData(@Encoded @PathParam("identifier") String identifier,
             @Context UriInfo uriInfo);
 
@@ -201,8 +243,13 @@ public interface RestconfService {
     @Deprecated
     @GET
     @Path("/operational/{identifier:.+}")
-    @Produces({ Draft02.MediaTypes.DATA + JSON, Draft02.MediaTypes.DATA + XML, MediaType.APPLICATION_JSON,
-            MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Produces({
+        Draft02.MediaTypes.DATA + JSON,
+        Draft02.MediaTypes.DATA + XML,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     NormalizedNodeContext readOperationalData(@Encoded @PathParam("identifier") String identifier,
             @Context UriInfo uriInfo);
 
@@ -220,8 +267,13 @@ public interface RestconfService {
     @Deprecated
     @PUT
     @Path("/config/{identifier:.+}")
-    @Consumes({ Draft02.MediaTypes.DATA + JSON, Draft02.MediaTypes.DATA + XML, MediaType.APPLICATION_JSON,
-            MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Consumes({
+        Draft02.MediaTypes.DATA + JSON,
+        Draft02.MediaTypes.DATA + XML,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     Response updateConfigurationData(@Encoded @PathParam("identifier") String identifier,
             NormalizedNodeContext payload, @Context UriInfo uriInfo);
 
@@ -241,8 +293,13 @@ public interface RestconfService {
     @Deprecated
     @POST
     @Path("/config/{identifier:.+}")
-    @Consumes({ Draft02.MediaTypes.DATA + JSON, Draft02.MediaTypes.DATA + XML, MediaType.APPLICATION_JSON,
-            MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Consumes({
+        Draft02.MediaTypes.DATA + JSON,
+        Draft02.MediaTypes.DATA + XML,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     Response createConfigurationData(@Encoded @PathParam("identifier") String identifier, NormalizedNodeContext payload,
             @Context UriInfo uriInfo);
 
@@ -260,8 +317,13 @@ public interface RestconfService {
     @Deprecated
     @POST
     @Path("/config")
-    @Consumes({ Draft02.MediaTypes.DATA + JSON, Draft02.MediaTypes.DATA + XML, MediaType.APPLICATION_JSON,
-            MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Consumes({
+        Draft02.MediaTypes.DATA + JSON,
+        Draft02.MediaTypes.DATA + XML,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     Response createConfigurationData(NormalizedNodeContext payload, @Context UriInfo uriInfo);
 
     /**
@@ -306,8 +368,13 @@ public interface RestconfService {
     @Deprecated
     @GET
     @Path("/streams")
-    @Produces({ Draft02.MediaTypes.API + JSON, Draft02.MediaTypes.API + XML, MediaType.APPLICATION_JSON,
-            MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Produces({
+        Draft02.MediaTypes.API + JSON,
+        Draft02.MediaTypes.API + XML,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     NormalizedNodeContext getAvailableStreams(@Context UriInfo uriInfo);
 
     /**
@@ -326,8 +393,14 @@ public interface RestconfService {
     @Deprecated
     @Patch
     @Path("/config/{identifier:.+}")
-    @Consumes({MediaTypes.PATCH + JSON, MediaTypes.PATCH + XML})
-    @Produces({MediaTypes.PATCH_STATUS + JSON, MediaTypes.PATCH_STATUS + XML})
+    @Consumes({
+        MediaTypes.PATCH + JSON,
+        MediaTypes.PATCH + XML
+    })
+    @Produces({
+        MediaTypes.PATCH_STATUS + JSON,
+        MediaTypes.PATCH_STATUS + XML
+    })
     PatchStatusContext patchConfigurationData(@Encoded @PathParam("identifier") String identifier, PatchContext
             context, @Context UriInfo uriInfo);
 
@@ -345,7 +418,13 @@ public interface RestconfService {
     @Deprecated
     @Patch
     @Path("/config")
-    @Consumes({MediaTypes.PATCH + JSON, MediaTypes.PATCH + XML})
-    @Produces({MediaTypes.PATCH_STATUS + JSON, MediaTypes.PATCH_STATUS + XML})
+    @Consumes({
+        MediaTypes.PATCH + JSON,
+        MediaTypes.PATCH + XML
+    })
+    @Produces({
+        MediaTypes.PATCH_STATUS + JSON,
+        MediaTypes.PATCH_STATUS + XML
+    })
     PatchStatusContext patchConfigurationData(PatchContext context, @Context UriInfo uriInfo);
 }

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonNormalizedNodeBodyReader.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonNormalizedNodeBodyReader.java
index 85078714834113e203c0f9afa81edecd44ec161a..3b125cdf4018dbb594c29cd51e8cd3265778f8f6 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonNormalizedNodeBodyReader.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonNormalizedNodeBodyReader.java
@@ -54,8 +54,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Provider
-@Consumes({ Draft02.MediaTypes.DATA + RestconfService.JSON, Draft02.MediaTypes.OPERATION + RestconfService.JSON,
-        MediaType.APPLICATION_JSON })
+@Consumes({
+    Draft02.MediaTypes.DATA + RestconfService.JSON,
+    Draft02.MediaTypes.OPERATION + RestconfService.JSON,
+    MediaType.APPLICATION_JSON
+})
 public class JsonNormalizedNodeBodyReader
         extends AbstractIdentifierAwareJaxRsProvider implements MessageBodyReader<NormalizedNodeContext> {
 

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java
index 9445b164d956ea4cedf120c1cc44fe83ebde8df6..b671833c2510a8b20ace4d48d789542ab6805931 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java
@@ -57,8 +57,12 @@ import org.xml.sax.SAXException;
  */
 @Deprecated
 @Provider
-@Produces({ Draft02.MediaTypes.API + RestconfService.JSON, Draft02.MediaTypes.DATA + RestconfService.JSON,
-        Draft02.MediaTypes.OPERATION + RestconfService.JSON, MediaType.APPLICATION_JSON })
+@Produces({
+    Draft02.MediaTypes.API + RestconfService.JSON,
+    Draft02.MediaTypes.DATA + RestconfService.JSON,
+    Draft02.MediaTypes.OPERATION + RestconfService.JSON,
+    MediaType.APPLICATION_JSON
+})
 public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter<NormalizedNodeContext> {
 
     private static final int DEFAULT_INDENT_SPACES_NUM = 2;

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java
index 48f4aa0806e8fe72f8e17dbfc498e5057ef390f9..862f4039ab7a6fea44e0fa1e3d6e4e7f64e9d6e0 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java
@@ -53,8 +53,13 @@ import org.xml.sax.SAXException;
  */
 @Deprecated
 @Provider
-@Produces({ Draft02.MediaTypes.API + RestconfService.XML, Draft02.MediaTypes.DATA + RestconfService.XML,
-        Draft02.MediaTypes.OPERATION + RestconfService.XML, MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+@Produces({
+    Draft02.MediaTypes.API + RestconfService.XML,
+    Draft02.MediaTypes.DATA + RestconfService.XML,
+    Draft02.MediaTypes.OPERATION + RestconfService.XML,
+    MediaType.APPLICATION_XML,
+    MediaType.TEXT_XML
+})
 public class NormalizedNodeXmlBodyWriter implements MessageBodyWriter<NormalizedNodeContext> {
 
     private static final XMLOutputFactory XML_FACTORY;

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlNormalizedNodeBodyReader.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlNormalizedNodeBodyReader.java
index 1b8435b38e60dc974b34797e28a88375930f407d..215c1b4d7820c53816642fe7544acf4f2267fb8d 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlNormalizedNodeBodyReader.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlNormalizedNodeBodyReader.java
@@ -64,8 +64,12 @@ import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
 @Provider
-@Consumes({ Draft02.MediaTypes.DATA + RestconfService.XML, Draft02.MediaTypes.OPERATION + RestconfService.XML,
-        MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+@Consumes({
+    Draft02.MediaTypes.DATA + RestconfService.XML,
+    Draft02.MediaTypes.OPERATION + RestconfService.XML,
+    MediaType.APPLICATION_XML,
+    MediaType.TEXT_XML
+})
 public class XmlNormalizedNodeBodyReader extends AbstractIdentifierAwareJaxRsProvider
         implements MessageBodyReader<NormalizedNodeContext> {
 

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/codecs/RestCodec.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/codecs/RestCodec.java
index 75e859410fbb84bba3ffd8fd090157fb6a50f591..2e08e4e06948333a4af5388ccdb5fc2c491a4612 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/codecs/RestCodec.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/codecs/RestCodec.java
@@ -248,8 +248,10 @@ public final class RestCodec {
             return identityValuesDTO;
         }
 
-        @SuppressFBWarnings(value = {"NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE",
-                "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"}, justification = "Unrecognised NullableDecl")
+        @SuppressFBWarnings(value = {
+            "NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE",
+            "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"
+        }, justification = "Unrecognised NullableDecl")
         @Override
         public YangInstanceIdentifier deserialize(final IdentityValuesDTO data) {
             final List<PathArgument> result = new ArrayList<>();

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfDataService.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfDataService.java
index f655a58f1b81d4379a5698cecde25411d5bbc10e..dbad05a6ca4d3ace39164b1695f106d302434dee 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfDataService.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfDataService.java
@@ -46,8 +46,14 @@ public interface RestconfDataService extends UpdateHandlers {
      */
     @GET
     @Path("/data/{identifier:.+}")
-    @Produces({ Rfc8040.MediaTypes.DATA + RestconfConstants.JSON, Rfc8040.MediaTypes.DATA + RestconfConstants.XML,
-            Rfc8040.MediaTypes.DATA, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Produces({
+        Rfc8040.MediaTypes.DATA + RestconfConstants.JSON,
+        Rfc8040.MediaTypes.DATA + RestconfConstants.XML,
+        Rfc8040.MediaTypes.DATA,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     Response readData(@Encoded @PathParam("identifier") String identifier, @Context UriInfo uriInfo);
 
     /**
@@ -59,8 +65,14 @@ public interface RestconfDataService extends UpdateHandlers {
      */
     @GET
     @Path("/data")
-    @Produces({ Rfc8040.MediaTypes.DATA + RestconfConstants.JSON, Rfc8040.MediaTypes.DATA + RestconfConstants.XML,
-            Rfc8040.MediaTypes.DATA, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Produces({
+        Rfc8040.MediaTypes.DATA + RestconfConstants.JSON,
+        Rfc8040.MediaTypes.DATA + RestconfConstants.XML,
+        Rfc8040.MediaTypes.DATA,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     Response readData(@Context UriInfo uriInfo);
 
     /**
@@ -74,8 +86,14 @@ public interface RestconfDataService extends UpdateHandlers {
      */
     @PUT
     @Path("/data/{identifier:.+}")
-    @Consumes({ Rfc8040.MediaTypes.DATA + RestconfConstants.JSON, Rfc8040.MediaTypes.DATA + RestconfConstants.XML,
-            Rfc8040.MediaTypes.DATA, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Consumes({
+        Rfc8040.MediaTypes.DATA + RestconfConstants.JSON,
+        Rfc8040.MediaTypes.DATA + RestconfConstants.XML,
+        Rfc8040.MediaTypes.DATA,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     Response putData(@Encoded @PathParam("identifier") String identifier, NormalizedNodeContext payload,
             @Context UriInfo uriInfo);
 
@@ -92,8 +110,14 @@ public interface RestconfDataService extends UpdateHandlers {
      */
     @POST
     @Path("/data/{identifier:.+}")
-    @Consumes({ Rfc8040.MediaTypes.DATA + RestconfConstants.JSON, Rfc8040.MediaTypes.DATA + RestconfConstants.XML,
-            Rfc8040.MediaTypes.DATA, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Consumes({
+        Rfc8040.MediaTypes.DATA + RestconfConstants.JSON,
+        Rfc8040.MediaTypes.DATA + RestconfConstants.XML,
+        Rfc8040.MediaTypes.DATA,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     Response postData(@Encoded @PathParam("identifier") String identifier, NormalizedNodeContext payload,
             @Context UriInfo uriInfo);
 
@@ -108,8 +132,14 @@ public interface RestconfDataService extends UpdateHandlers {
      */
     @POST
     @Path("/data")
-    @Consumes({ Rfc8040.MediaTypes.DATA + RestconfConstants.JSON, Rfc8040.MediaTypes.DATA + RestconfConstants.XML,
-            Rfc8040.MediaTypes.DATA, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Consumes({
+        Rfc8040.MediaTypes.DATA + RestconfConstants.JSON,
+        Rfc8040.MediaTypes.DATA + RestconfConstants.XML,
+        Rfc8040.MediaTypes.DATA,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     Response postData(NormalizedNodeContext payload, @Context UriInfo uriInfo);
 
     /**
@@ -137,10 +167,14 @@ public interface RestconfDataService extends UpdateHandlers {
      */
     @Patch
     @Path("/data/{identifier:.+}")
-    @Consumes({ Rfc8040.MediaTypes.YANG_PATCH + RestconfConstants.JSON,
-            Rfc8040.MediaTypes.YANG_PATCH + RestconfConstants.XML })
-    @Produces({ Rfc8040.MediaTypes.YANG_PATCH_STATUS + RestconfConstants.JSON,
-            Rfc8040.MediaTypes.YANG_PATCH_STATUS + RestconfConstants.XML })
+    @Consumes({
+        Rfc8040.MediaTypes.YANG_PATCH + RestconfConstants.JSON,
+        Rfc8040.MediaTypes.YANG_PATCH + RestconfConstants.XML
+    })
+    @Produces({
+        Rfc8040.MediaTypes.YANG_PATCH_STATUS + RestconfConstants.JSON,
+        Rfc8040.MediaTypes.YANG_PATCH_STATUS + RestconfConstants.XML
+    })
     PatchStatusContext patchData(@Encoded @PathParam("identifier") String identifier, PatchContext context,
                                  @Context UriInfo uriInfo);
 
@@ -155,10 +189,14 @@ public interface RestconfDataService extends UpdateHandlers {
      */
     @Patch
     @Path("/data")
-    @Consumes({ Rfc8040.MediaTypes.YANG_PATCH + RestconfConstants.JSON,
-            Rfc8040.MediaTypes.YANG_PATCH + RestconfConstants.XML })
-    @Produces({ Rfc8040.MediaTypes.YANG_PATCH_STATUS + RestconfConstants.JSON,
-            Rfc8040.MediaTypes.YANG_PATCH_STATUS + RestconfConstants.XML })
+    @Consumes({
+        Rfc8040.MediaTypes.YANG_PATCH + RestconfConstants.JSON,
+        Rfc8040.MediaTypes.YANG_PATCH + RestconfConstants.XML
+    })
+    @Produces({
+        Rfc8040.MediaTypes.YANG_PATCH_STATUS + RestconfConstants.JSON,
+        Rfc8040.MediaTypes.YANG_PATCH_STATUS + RestconfConstants.XML
+    })
     PatchStatusContext patchData(PatchContext context, @Context UriInfo uriInfo);
 
 
@@ -173,8 +211,14 @@ public interface RestconfDataService extends UpdateHandlers {
      */
     @Patch
     @Path("/data/{identifier:.+}")
-    @Consumes({ Rfc8040.MediaTypes.DATA + RestconfConstants.JSON, Rfc8040.MediaTypes.DATA + RestconfConstants.XML,
-            Rfc8040.MediaTypes.DATA, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Consumes({
+        Rfc8040.MediaTypes.DATA + RestconfConstants.JSON,
+        Rfc8040.MediaTypes.DATA + RestconfConstants.XML,
+        Rfc8040.MediaTypes.DATA,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     Response patchData(@Encoded @PathParam("identifier") String identifier, NormalizedNodeContext payload,
                        @Context UriInfo uriInfo);
 }

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfInvokeOperationsService.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfInvokeOperationsService.java
index dd9f2f515edbec025f59c19a42c19cdf6e3d74bb..924e90ecc31f5213ad291a1eb69d05c7e869c066 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfInvokeOperationsService.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfInvokeOperationsService.java
@@ -24,10 +24,8 @@ import org.opendaylight.restconf.nb.rfc8040.utils.RestconfConstants;
 /**
  * An operation resource represents a protocol operation defined with the YANG
  * "rpc" statement. It is invoked using a POST method on the operation resource.
- *
  */
 public interface RestconfInvokeOperationsService extends UpdateHandlers {
-
     /**
      * Invoke RPC operation.
      *
@@ -42,10 +40,20 @@ public interface RestconfInvokeOperationsService extends UpdateHandlers {
      */
     @POST
     @Path("/operations/{identifier:.+}")
-    @Produces({ Rfc8040.MediaTypes.DATA + RestconfConstants.JSON, Rfc8040.MediaTypes.DATA + RestconfConstants.XML,
-            MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML })
-    @Consumes({ Rfc8040.MediaTypes.DATA + RestconfConstants.JSON, Rfc8040.MediaTypes.DATA + RestconfConstants.XML,
-            MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Produces({
+        Rfc8040.MediaTypes.DATA + RestconfConstants.JSON,
+        Rfc8040.MediaTypes.DATA + RestconfConstants.XML,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
+    @Consumes({
+        Rfc8040.MediaTypes.DATA + RestconfConstants.JSON,
+        Rfc8040.MediaTypes.DATA + RestconfConstants.XML,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     NormalizedNodeContext invokeRpc(@Encoded @PathParam("identifier") String identifier,
             NormalizedNodeContext payload, @Context UriInfo uriInfo);
 }

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/simple/api/RestconfOperationsService.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/simple/api/RestconfOperationsService.java
index 3027def8e0720dbe4ae5b850f61082403633fef9..a1f8103c1f4b9bcee0e95d8417e75b5240cb88ca 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/simple/api/RestconfOperationsService.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/simple/api/RestconfOperationsService.java
@@ -19,12 +19,9 @@ import org.opendaylight.restconf.nb.rfc8040.Rfc8040;
 import org.opendaylight.restconf.nb.rfc8040.utils.RestconfConstants;
 
 /**
- * Container that provides access to the data-model specific operations
- * supported by the server.
- *
+ * Container that provides access to the data-model specific operations supported by the server.
  */
 public interface RestconfOperationsService extends UpdateHandlers {
-
     /**
      * List of rpc or action operations supported by the server.
      *
@@ -34,8 +31,13 @@ public interface RestconfOperationsService extends UpdateHandlers {
      */
     @GET
     @Path("/operations")
-    @Produces({ Rfc8040.MediaTypes.DATA + RestconfConstants.JSON, Rfc8040.MediaTypes.DATA, MediaType.APPLICATION_JSON,
-            MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Produces({
+        Rfc8040.MediaTypes.DATA + RestconfConstants.JSON,
+        Rfc8040.MediaTypes.DATA,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     NormalizedNodeContext getOperations(@Context UriInfo uriInfo);
 
     /**
@@ -49,7 +51,12 @@ public interface RestconfOperationsService extends UpdateHandlers {
      */
     @GET
     @Path("/operations/{identifier:.+}")
-    @Produces({ Rfc8040.MediaTypes.DATA + RestconfConstants.JSON, Rfc8040.MediaTypes.DATA, MediaType.APPLICATION_JSON,
-            MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Produces({
+        Rfc8040.MediaTypes.DATA + RestconfConstants.JSON,
+        Rfc8040.MediaTypes.DATA,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     NormalizedNodeContext getOperations(@PathParam("identifier") String identifier, @Context UriInfo uriInfo);
-}
\ No newline at end of file
+}

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/simple/api/RestconfService.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/simple/api/RestconfService.java
index 844669eb89e8ab0b867e2ca5c4ed25a2f8c9a635..de7e2aaa05452b23b1a2a8542ede4a46fe828673 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/simple/api/RestconfService.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/simple/api/RestconfService.java
@@ -17,10 +17,8 @@ import org.opendaylight.restconf.nb.rfc8040.utils.RestconfConstants;
 
 /**
  * Service for getting yang library version.
- *
  */
 public interface RestconfService extends UpdateHandlers {
-
     /**
      * Get yang library version.
      *
@@ -28,7 +26,12 @@ public interface RestconfService extends UpdateHandlers {
      */
     @GET
     @Path("/yang-library-version")
-    @Produces({ Rfc8040.MediaTypes.DATA + RestconfConstants.JSON, Rfc8040.MediaTypes.DATA, MediaType.APPLICATION_JSON,
-            MediaType.APPLICATION_XML, MediaType.TEXT_XML })
+    @Produces({
+        Rfc8040.MediaTypes.DATA + RestconfConstants.JSON,
+        Rfc8040.MediaTypes.DATA,
+        MediaType.APPLICATION_JSON,
+        MediaType.APPLICATION_XML,
+        MediaType.TEXT_XML
+    })
     NormalizedNodeContext getLibraryVersion();
 }

diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml
index 1ce161044a2c35c16becfa00df5a5885218bfe2f..dcbbbf8d876a25d7765f9fbb4ebf04318b2e48f6 100644 (file)
--- a/restconf/sal-rest-connector-config/pom.xml
+++ b/restconf/sal-rest-connector-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>8.1.2</version>
     <relativePath/>
   </parent>