Bump odlparent to 6.0.0

This bumps odlparent to 6.0.0 as part of Magnesium MRI.

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

diff --git a/benchmark/artifacts/pom.xml b/benchmark/artifacts/pom.xml
index fe463ced86268ff1122cc130fa6310a6a4d0636a..978ff114114448cb561d44a8aaeedce0d80a72ef 100644 (file)
--- a/benchmark/artifacts/pom.xml
+++ b/benchmark/artifacts/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>5.0.2</version>
+    <version>6.0.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index c328654c3aaad3367cac465f919e96c37877ae3a..9c9f3212dc51fcdc2fd4b36442fd602cb8a064da 100644 (file)
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>5.0.2</version>
+    <version>6.0.0</version>

     <relativePath/>
   </parent>
   <groupId>org.opendaylight.controller</groupId>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.controller</groupId>

diff --git a/docs/pom.xml b/docs/pom.xml
index c8dae9789df1ccd949d5fa6f3f2576edf4f35b26..a1c5fd23a774404444fc26034e6de3ffa94b1270 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/benchmark/features-mdsal-benchmark/pom.xml b/features/benchmark/features-mdsal-benchmark/pom.xml
index c03b343083a5772c9fb9aff31f86afe7f8b8405f..9b7d0899564faac2064d7bfad418c09403f63efa 100644 (file)
--- a/features/benchmark/features-mdsal-benchmark/pom.xml
+++ b/features/benchmark/features-mdsal-benchmark/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/benchmark/odl-benchmark-api/pom.xml b/features/benchmark/odl-benchmark-api/pom.xml
index a35af58fa9daa32a2b046c174659a60e298aae06..06941863ea730a4ac4fcc177f494247d0dc7141c 100644 (file)
--- a/features/benchmark/odl-benchmark-api/pom.xml
+++ b/features/benchmark/odl-benchmark-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/benchmark/odl-dsbenchmark/pom.xml b/features/benchmark/odl-dsbenchmark/pom.xml
index e07d90cefd3711f481d636f9bc50e4159fd87d8b..1b27d448b12e2c1a2abd4e9741f56f04ce00d88c 100644 (file)
--- a/features/benchmark/odl-dsbenchmark/pom.xml
+++ b/features/benchmark/odl-dsbenchmark/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/benchmark/odl-mdsal-benchmark/pom.xml b/features/benchmark/odl-mdsal-benchmark/pom.xml
index efb4241fe0c8a434099972611d5d493687ec6137..42d7357a3dd523e8066524de3e55fd1a29d15e8c 100644 (file)
--- a/features/benchmark/odl-mdsal-benchmark/pom.xml
+++ b/features/benchmark/odl-mdsal-benchmark/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/benchmark/odl-ntfbenchmark/pom.xml b/features/benchmark/odl-ntfbenchmark/pom.xml
index 8f8469ffbd453a1b85c04c37b73131a69eedbf72..39ddcd21752c7606360e59fbfc6e8ea86215654d 100644 (file)
--- a/features/benchmark/odl-ntfbenchmark/pom.xml
+++ b/features/benchmark/odl-ntfbenchmark/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/benchmark/pom.xml b/features/benchmark/pom.xml
index 9a3a6c125f46304a696796d84414aa9f0eb263b8..0680da69ff452b2968792983402200a80e9b86f7 100644 (file)
--- a/features/benchmark/pom.xml
+++ b/features/benchmark/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
     <groupId>org.opendaylight.controller</groupId>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.controller</groupId>

diff --git a/features/config-netty/features-config-netty/pom.xml b/features/config-netty/features-config-netty/pom.xml
index d7d46635363538e7e88151787f28be256c97376a..92122ac40bb0022f9b2f03a71822f2d19bf4391b 100644 (file)
--- a/features/config-netty/features-config-netty/pom.xml
+++ b/features/config-netty/features-config-netty/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/config-netty/odl-config-netty/pom.xml b/features/config-netty/odl-config-netty/pom.xml
index 241eb6c5c41d121b5876bec051b37c03e6931686..2c7bf017ca62d69eb5a1a4072a9aff0ed00f52b8 100644 (file)
--- a/features/config-netty/odl-config-netty/pom.xml
+++ b/features/config-netty/odl-config-netty/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/config-netty/odl-config-netty/src/main/feature/feature.xml b/features/config-netty/odl-config-netty/src/main/feature/feature.xml
index 052097b5d7d7aef9351fc68c959246b1d374b969..50a2289c132ad4ac7fa86f5fb76e68047c075260 100644 (file)
--- a/features/config-netty/odl-config-netty/src/main/feature/feature.xml
+++ b/features/config-netty/odl-config-netty/src/main/feature/feature.xml
@@ -8,6 +8,6 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-config-netty">
     <feature name="odl-config-netty">
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-config-netty">
     <feature name="odl-config-netty">

-        <feature version="[5,6)">odl-netty-4</feature>
+        <feature version="[6,7)">odl-netty-4</feature>

     </feature>
 </features>
     </feature>
 </features>

diff --git a/features/config-netty/pom.xml b/features/config-netty/pom.xml
index 2f144b7cae1bb1dd0cd97004bea460fe8710fc67..b00a9ecc70fbf16f9daaef9124bf4acfb43a5627 100644 (file)
--- a/features/config-netty/pom.xml
+++ b/features/config-netty/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/extras/features-extras/pom.xml b/features/extras/features-extras/pom.xml
index 34402162ca5221534b1d78e06d971bdead2ce7dd..a485301909e01b0da07c87238587a20bde2464d2 100644 (file)
--- a/features/extras/features-extras/pom.xml
+++ b/features/extras/features-extras/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/extras/odl-extras-all/pom.xml b/features/extras/odl-extras-all/pom.xml
index 6ce00e8a3b59dd6d878e95f4c4105a5b8067e462..e2f26501b7afdcd48bf1d1b1f1a971e12ab12e15 100644 (file)
--- a/features/extras/odl-extras-all/pom.xml
+++ b/features/extras/odl-extras-all/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/extras/odl-jolokia/pom.xml b/features/extras/odl-jolokia/pom.xml
index 9bf4e366c3efe47d3f65fb11389adbce85843c89..f12d0071e46466d5886f21e5459e6181103a2c8a 100644 (file)
--- a/features/extras/odl-jolokia/pom.xml
+++ b/features/extras/odl-jolokia/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/extras/pom.xml b/features/extras/pom.xml
index 7dc1eed14d3f336c82e091ebc2d2196b96848da7..6b880b5f55545827e72b01cf94fde1478569c789 100644 (file)
--- a/features/extras/pom.xml
+++ b/features/extras/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/features-mdsal/pom.xml b/features/mdsal/features-mdsal/pom.xml
index 3d2b80d342ee2b46126e1b01ebf915a1f9a9f034..457285c807bd5b9f8ec10bd871e867dfe35f4978 100644 (file)
--- a/features/mdsal/features-mdsal/pom.xml
+++ b/features/mdsal/features-mdsal/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-clustering-test-app/pom.xml b/features/mdsal/odl-clustering-test-app/pom.xml
index d8df4b37b232c9801a8d6925cfd053c1f0381306..79d8ca50f49b41ab106a9746fca47ec3700d4b51 100644 (file)
--- a/features/mdsal/odl-clustering-test-app/pom.xml
+++ b/features/mdsal/odl-clustering-test-app/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-controller-binding-api/pom.xml b/features/mdsal/odl-controller-binding-api/pom.xml
index ce8d6c9508379de0fb04003b7d2c411e2a8cefdc..9de5f56ea352e4243a3adb6e1741b6e186ac1382 100644 (file)
--- a/features/mdsal/odl-controller-binding-api/pom.xml
+++ b/features/mdsal/odl-controller-binding-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-controller-blueprint/pom.xml b/features/mdsal/odl-controller-blueprint/pom.xml
index 179e1759dea74ec4549f32dab5c55754fb1025ea..ec5cecca1ec0667dce2410b583fb308ad8f122e8 100644 (file)
--- a/features/mdsal/odl-controller-blueprint/pom.xml
+++ b/features/mdsal/odl-controller-blueprint/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-controller-dom-api/pom.xml b/features/mdsal/odl-controller-dom-api/pom.xml
index 0f256d0b1ff66913b08af35f13d731c91ad3029b..3560bda655dbb61bad38f9a9b37e88d97849e576 100644 (file)
--- a/features/mdsal/odl-controller-dom-api/pom.xml
+++ b/features/mdsal/odl-controller-dom-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-controller-mdsal-common/pom.xml b/features/mdsal/odl-controller-mdsal-common/pom.xml
index 306734c80246400b67be3bbea719af697618628e..5aa669d7919ac184b28e62fa8e22338ed757fcc2 100644 (file)
--- a/features/mdsal/odl-controller-mdsal-common/pom.xml
+++ b/features/mdsal/odl-controller-mdsal-common/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-controller-model-topology/pom.xml b/features/mdsal/odl-controller-model-topology/pom.xml
index 1b5e18282306caed22b9af510d680992f1009c40..3b0d22fe68d8bc4ad0baca17a4b17775ab2fb950 100644 (file)
--- a/features/mdsal/odl-controller-model-topology/pom.xml
+++ b/features/mdsal/odl-controller-model-topology/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml
index 8a29fe6c1eb3f865a82c612f02fe0a695d760b5f..3373a7e27989e0ee6e52e939d5f7784164a3743b 100644 (file)
--- a/features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/features/mdsal/odl-mdsal-broker-local/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-broker/pom.xml b/features/mdsal/odl-mdsal-broker/pom.xml
index 23a09a798af42cefb21fdf074e299965537ec6d0..c1721b05cd469fb6c6822482c8f7939a4b794559 100644 (file)
--- a/features/mdsal/odl-mdsal-broker/pom.xml
+++ b/features/mdsal/odl-mdsal-broker/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-clustering-commons/pom.xml b/features/mdsal/odl-mdsal-clustering-commons/pom.xml
index 9ac06c1a409917e85acc9851cad949c27781cfb5..0eeadc096d2da264bfe1c86f7c9d545a025835a8 100644 (file)
--- a/features/mdsal/odl-mdsal-clustering-commons/pom.xml
+++ b/features/mdsal/odl-mdsal-clustering-commons/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
index 71e9e5ad75c4228d6f3444e86d52acb9a9c005b9..907bd59aa061c70425ee89dda68dad731c42b38d 100644 (file)
--- a/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
@@ -8,12 +8,12 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-${project.version}">
     <feature name="odl-mdsal-clustering-commons" version="${project.version}">
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-${project.version}">
     <feature name="odl-mdsal-clustering-commons" version="${project.version}">

-        <feature version="[5,6)">odl-akka-system-2.5</feature>
-        <feature version="[5,6)">odl-akka-persistence-2.5</feature>
-        <feature version="[5,6)">odl-akka-clustering-2.5</feature>
-        <feature version="[5,6)">odl-apache-commons-lang3</feature>
-        <feature version="[5,6)">odl-dropwizard-metrics</feature>
-        <feature version="[5,6)">odl-servlet-api</feature>
+        <feature version="[6,7)">odl-akka-system-2.5</feature>
+        <feature version="[6,7)">odl-akka-persistence-2.5</feature>
+        <feature version="[6,7)">odl-akka-clustering-2.5</feature>
+        <feature version="[6,7)">odl-apache-commons-lang3</feature>
+        <feature version="[6,7)">odl-dropwizard-metrics</feature>
+        <feature version="[6,7)">odl-servlet-api</feature>

         <feature version="[3,4)">odl-yangtools-data</feature>
     </feature>
 </features>
         <feature version="[3,4)">odl-yangtools-data</feature>
     </feature>
 </features>

diff --git a/features/mdsal/odl-mdsal-clustering/pom.xml b/features/mdsal/odl-mdsal-clustering/pom.xml
index 101bd3e9203ebfb7bd6685ae7468bcd1638abf63..82b35c819ebcb8aeb51f2063cb98766bfb96da0f 100644 (file)
--- a/features/mdsal/odl-mdsal-clustering/pom.xml
+++ b/features/mdsal/odl-mdsal-clustering/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
index 9186b65716e6d956541a34cd1d52541b6c011e79..1501438ef0ccd8a735f39628f00292ca54557e3a 100644 (file)
--- a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
+++ b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
index 3fb7d3f439e1da0bfc6f3c511bf58a140f13520a..bf2fb94a4f97794437c79ceaf2fa5cfeb48e0e06 100644 (file)
--- a/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
@@ -8,7 +8,7 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-${project.version}">
     <feature name="odl-mdsal-distributed-datastore" version="${project.version}">
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-${project.version}">
     <feature name="odl-mdsal-distributed-datastore" version="${project.version}">

-        <feature version="[5,6)">odl-apache-commons-text</feature>
+        <feature version="[6,7)">odl-apache-commons-text</feature>

         <feature version="[3,4)">odl-yangtools-codec</feature>
         <feature version="[4,5)">odl-mdsal-eos-dom</feature>
         <feature version="[4,5)">odl-mdsal-dom-broker</feature>
         <feature version="[3,4)">odl-yangtools-codec</feature>
         <feature version="[4,5)">odl-mdsal-eos-dom</feature>
         <feature version="[4,5)">odl-mdsal-dom-broker</feature>

diff --git a/features/mdsal/odl-mdsal-model-inventory/pom.xml b/features/mdsal/odl-mdsal-model-inventory/pom.xml
index a51a80b42028951a337aed66141bbab8654ddc71..d14fa5a7691181963b541c8d3ff89080721097ce 100644 (file)
--- a/features/mdsal/odl-mdsal-model-inventory/pom.xml
+++ b/features/mdsal/odl-mdsal-model-inventory/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml b/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml
index dbefb7c771c8334a369397f1e0cd1b02ee841938..5ce755ff53bd57932130750aa14a1f0c70ed531b 100644 (file)
--- a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml
+++ b/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-message-bus-collector/pom.xml b/features/mdsal/odl-message-bus-collector/pom.xml
index 90747b37a7556644a15465086dc435c44119d16e..5564292b3d6ef564f23ad1178beaffc6effaf743 100644 (file)
--- a/features/mdsal/odl-message-bus-collector/pom.xml
+++ b/features/mdsal/odl-message-bus-collector/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-toaster/pom.xml b/features/mdsal/odl-toaster/pom.xml
index 18c3b889b441d40baad8c8248ae2037bcc336203..e526bddfa6ea9905ffe2926fd8d77a5d3ca548b7 100644 (file)
--- a/features/mdsal/odl-toaster/pom.xml
+++ b/features/mdsal/odl-toaster/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index d3e79730ef7ef9bcc259de1b69421b29499047f4..725b93650e9f90063b56b48ed23a7e4005506076 100644 (file)
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 9eb2c5905a752194bc04655414241337fceb7b09..83d35211dd04e1fd5453481077c6520a8561b6cd 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>5.0.2</version>
+    <version>6.0.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 23f0270e942fbdda822c643d2388710fe5c29a87..52f70c591b928c2661271aa6b26a4e8f8c9a7256 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>

-    <version>5.0.2</version>
+    <version>6.0.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
index 6349f7de3ae7530950110ea88b0b1f6c3ed50f09..c0895bf28a83e3686f64cf2ba3fb7c188c0ccf6d 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>5.0.2</version>
+    <version>6.0.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml
index 1981380d62e3040a9da55ebc0004eb95ec4cef0e..62768278f340cd64af20e18e99f30b0a4441d9e6 100644 (file)
--- a/opendaylight/archetypes/pom.xml
+++ b/opendaylight/archetypes/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>5.0.2</version>
+    <version>6.0.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml
index ae5dca2b696f51a4211b3f35ec994fb361712be0..81071f210d832f7babd581447776486ba8476a68 100644 (file)
--- a/opendaylight/blueprint/pom.xml
+++ b/opendaylight/blueprint/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>

-    <version>5.0.2</version>
+    <version>6.0.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintBundleTracker.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintBundleTracker.java
index bb13e13a185e061cd87093d07ffad95d06d4a508..8812650aa681474e881c9ea39f7476671b85a1e3 100644 (file)
--- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintBundleTracker.java
+++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintBundleTracker.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.controller.blueprint;
 
  */
 package org.opendaylight.controller.blueprint;
 

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;


@@ -130,6 +131,8 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus
         quiesceParticipantTracker.open();
     }
 
         quiesceParticipantTracker.open();
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private QuiesceParticipant onQuiesceParticipantAdded(final ServiceReference<QuiesceParticipant> reference) {
         quiesceParticipant = reference.getBundle().getBundleContext().getService(reference);
 
     private QuiesceParticipant onQuiesceParticipantAdded(final ServiceReference<QuiesceParticipant> reference) {
         quiesceParticipant = reference.getBundle().getBundleContext().getService(reference);
 


@@ -140,6 +143,8 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus
         return quiesceParticipant;
     }
 
         return quiesceParticipant;
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private BlueprintExtenderService onBlueprintExtenderServiceAdded(
             final ServiceReference<BlueprintExtenderService> reference) {
         blueprintExtenderService = reference.getBundle().getBundleContext().getService(reference);
     private BlueprintExtenderService onBlueprintExtenderServiceAdded(
             final ServiceReference<BlueprintExtenderService> reference) {
         blueprintExtenderService = reference.getBundle().getBundleContext().getService(reference);

diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java
index 93c46b4c30e7509c916642d106890e6dc5bd1c97..22559737860125f6a25af7427b8a4e6d6a6174d2 100644 (file)
--- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java
+++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java
@@ -135,7 +135,7 @@ public abstract class BindingContext {
         }
 
         @SuppressWarnings({ "rawtypes", "unchecked" })
         }
 
         @SuppressWarnings({ "rawtypes", "unchecked" })

-        private static ListBindingContext newInstance(final Class<? extends DataObject> bindingClass,
+        static ListBindingContext newInstance(final Class<? extends DataObject> bindingClass,

                 final String listKeyValue) throws InstantiationException, IllegalAccessException,
                 IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
             // We assume the yang list key type is string.
                 final String listKeyValue) throws InstantiationException, IllegalAccessException,
                 IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
             // We assume the yang list key type is string.

diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/SpecificReferenceListMetadata.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/SpecificReferenceListMetadata.java
index e781ddd16a9172f4c04f5fd425f4c8acf415643b..0412f00a7afb94132183271f6afdadeb640a4c7a 100644 (file)
--- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/SpecificReferenceListMetadata.java
+++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/SpecificReferenceListMetadata.java
@@ -9,6 +9,7 @@ package org.opendaylight.controller.blueprint.ext;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Resources;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Resources;

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.io.IOException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;


@@ -60,7 +61,7 @@ class SpecificReferenceListMetadata extends AbstractDependentComponentFactoryMet
 
     @Override
     protected void startTracking() {
 
     @Override
     protected void startTracking() {

-        BundleTrackerCustomizer<Bundle> bundleListener = new BundleTrackerCustomizer<Bundle>() {
+        BundleTrackerCustomizer<Bundle> bundleListener = new BundleTrackerCustomizer<>() {

             @Override
             public Bundle addingBundle(final Bundle bundle, final BundleEvent event) {
                 bundleAdded(bundle);
             @Override
             public Bundle addingBundle(final Bundle bundle, final BundleEvent event) {
                 bundleAdded(bundle);


@@ -87,7 +88,7 @@ class SpecificReferenceListMetadata extends AbstractDependentComponentFactoryMet
             return;
         }
 
             return;
         }
 

-        ServiceTrackerCustomizer<Object, Object> serviceListener = new ServiceTrackerCustomizer<Object, Object>() {
+        ServiceTrackerCustomizer<Object, Object> serviceListener = new ServiceTrackerCustomizer<>() {

             @Override
             public Object addingService(final ServiceReference<Object> reference) {
                 return serviceAdded(reference);
             @Override
             public Object addingService(final ServiceReference<Object> reference) {
                 return serviceAdded(reference);


@@ -109,6 +110,8 @@ class SpecificReferenceListMetadata extends AbstractDependentComponentFactoryMet
         serviceTracker.open();
     }
 
         serviceTracker.open();
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private void bundleAdded(final Bundle bundle) {
         URL resource = bundle.getEntry(serviceResourcePath);
         if (resource == null) {
     private void bundleAdded(final Bundle bundle) {
         URL resource = bundle.getEntry(serviceResourcePath);
         if (resource == null) {


@@ -139,6 +142,8 @@ class SpecificReferenceListMetadata extends AbstractDependentComponentFactoryMet
         }
     }
 
         }
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private Object serviceAdded(final ServiceReference<Object> reference) {
         Object service = container().getBundleContext().getService(reference);
         String serviceType = (String) reference.getProperty(OpendaylightNamespaceHandler.TYPE_ATTR);
     private Object serviceAdded(final ServiceReference<Object> reference) {
         Object service = container().getBundleContext().getService(reference);
         String serviceType = (String) reference.getProperty(OpendaylightNamespaceHandler.TYPE_ATTR);

diff --git a/opendaylight/commons/jolokia/pom.xml b/opendaylight/commons/jolokia/pom.xml
index d527b51dd7429b4135445b7996da2c1189d654f4..6f8102eb8c8e3725cc3496ff165847fb9aef7902 100644 (file)
--- a/opendaylight/commons/jolokia/pom.xml
+++ b/opendaylight/commons/jolokia/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>

-    <version>5.0.2</version>
+    <version>6.0.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/config/config-artifacts/pom.xml b/opendaylight/config/config-artifacts/pom.xml
index d372237953321ca8414df3945df469cb3a03de63..944df44fe0284d5e19efcd441558d870f7d02168 100644 (file)
--- a/opendaylight/config/config-artifacts/pom.xml
+++ b/opendaylight/config/config-artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/AutoCloseableEventExecutor.java b/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/AutoCloseableEventExecutor.java
index 7162eb6c2536e620c5bbe9d023eabf262756800a..b12fc67609af8d10095475d2d6ac449f735294b5 100644 (file)
--- a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/AutoCloseableEventExecutor.java
+++ b/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/AutoCloseableEventExecutor.java
@@ -9,6 +9,7 @@ package org.opendaylight.controller.config.yang.netty.eventexecutor;
 
 import com.google.common.reflect.AbstractInvocationHandler;
 import com.google.common.reflect.Reflection;
 
 import com.google.common.reflect.AbstractInvocationHandler;
 import com.google.common.reflect.Reflection;

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import io.netty.util.concurrent.EventExecutor;
 import io.netty.util.concurrent.GlobalEventExecutor;
 import io.netty.util.concurrent.ImmediateEventExecutor;
 import io.netty.util.concurrent.EventExecutor;
 import io.netty.util.concurrent.GlobalEventExecutor;
 import io.netty.util.concurrent.ImmediateEventExecutor;


@@ -34,12 +35,12 @@ public interface AutoCloseableEventExecutor extends EventExecutor, AutoCloseable
         }
 
         @Override
         }
 
         @Override

-        public void close() throws Exception {
+        @SuppressFBWarnings(value = "UC_USELESS_VOID_METHOD", justification = "False positive")
+        public void close() {

             eventExecutor.shutdownGracefully(0, DEFAULT_SHUTDOWN_SECONDS, TimeUnit.SECONDS);
         }
 
             eventExecutor.shutdownGracefully(0, DEFAULT_SHUTDOWN_SECONDS, TimeUnit.SECONDS);
         }
 

-
-        private static AutoCloseableEventExecutor createCloseableProxy(final EventExecutor eventExecutor) {
+        static AutoCloseableEventExecutor createCloseableProxy(final EventExecutor eventExecutor) {

             final CloseableEventExecutorMixin closeableEventExecutor = new CloseableEventExecutorMixin(eventExecutor);
             return Reflection.newProxy(AutoCloseableEventExecutor.class, new AbstractInvocationHandler() {
                 @Override
             final CloseableEventExecutorMixin closeableEventExecutor = new CloseableEventExecutorMixin(eventExecutor);
             return Reflection.newProxy(AutoCloseableEventExecutor.class, new AbstractInvocationHandler() {
                 @Override

diff --git a/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NioEventLoopGroupCloseable.java b/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NioEventLoopGroupCloseable.java
index 51bf1f0e5272b99ae9aee636c903d8880da06bc9..1b80ec3b26bca7f6c0e290657fe1c509dfb5ba67 100644 (file)
--- a/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NioEventLoopGroupCloseable.java
+++ b/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NioEventLoopGroupCloseable.java
@@ -10,7 +10,7 @@ package org.opendaylight.controller.config.yang.netty.threadgroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import java.util.concurrent.TimeUnit;
 
 import io.netty.channel.nio.NioEventLoopGroup;
 import java.util.concurrent.TimeUnit;
 

-public class NioEventLoopGroupCloseable extends NioEventLoopGroup implements AutoCloseable {
+public final class NioEventLoopGroupCloseable extends NioEventLoopGroup implements AutoCloseable {

     private NioEventLoopGroupCloseable(final int threadCount) {
         super(threadCount);
     }
     private NioEventLoopGroupCloseable(final int threadCount) {
         super(threadCount);
     }


@@ -24,10 +24,10 @@ public class NioEventLoopGroupCloseable extends NioEventLoopGroup implements Aut
     }
 
     public static NioEventLoopGroupCloseable newInstance(final Integer threadCount) {
     }
 
     public static NioEventLoopGroupCloseable newInstance(final Integer threadCount) {

-        if(threadCount == null || threadCount <= 0) {
+        if (threadCount == null || threadCount <= 0) {

             return new NioEventLoopGroupCloseable();
         }
 
         return new NioEventLoopGroupCloseable(threadCount);
     }
             return new NioEventLoopGroupCloseable();
         }
 
         return new NioEventLoopGroupCloseable(threadCount);
     }

-}
\ No newline at end of file
+}

diff --git a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/FlexibleThreadPoolWrapper.java b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/FlexibleThreadPoolWrapper.java
index a2fb009929cb29d8e32db4be8373addf7bcc4ad4..9949e36d3714f55b6936e66d3d596ef9a5b9b96c 100644 (file)
--- a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/FlexibleThreadPoolWrapper.java
+++ b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/FlexibleThreadPoolWrapper.java
@@ -105,6 +105,7 @@ public class FlexibleThreadPoolWrapper implements ThreadPool, Closeable {
      */
     private static class FlexibleRejectionHandler implements RejectedExecutionHandler {
         @Override
      */
     private static class FlexibleRejectionHandler implements RejectedExecutionHandler {
         @Override

+        @SuppressWarnings("checkstyle:parameterName")

         public void rejectedExecution(final Runnable r, final ThreadPoolExecutor executor) {
             try {
                 executor.getQueue().put(r);
         public void rejectedExecution(final Runnable r, final ThreadPoolExecutor executor) {
             try {
                 executor.getQueue().put(r);


@@ -118,7 +119,7 @@ public class FlexibleThreadPoolWrapper implements ThreadPool, Closeable {
             extends com.google.common.util.concurrent.ForwardingBlockingQueue<Runnable> {
         private final BlockingQueue<Runnable> delegate;
 
             extends com.google.common.util.concurrent.ForwardingBlockingQueue<Runnable> {
         private final BlockingQueue<Runnable> delegate;
 

-        public ForwardingBlockingQueue(final BlockingQueue<Runnable> delegate) {
+        ForwardingBlockingQueue(final BlockingQueue<Runnable> delegate) {

             this.delegate = delegate;
         }
 
             this.delegate = delegate;
         }
 


@@ -128,7 +129,8 @@ public class FlexibleThreadPoolWrapper implements ThreadPool, Closeable {
         }
 
         @Override
         }
 
         @Override

-        public boolean offer(final Runnable r) {
+        @SuppressWarnings("checkstyle:parameterName")
+        public boolean offer(final Runnable o) {

             // ThreadPoolExecutor will spawn a new thread after core size is reached only
             // if the queue.offer returns false.
             return false;
             // ThreadPoolExecutor will spawn a new thread after core size is reached only
             // if the queue.offer returns false.
             return false;

diff --git a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/NamingThreadPoolFactory.java b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/NamingThreadPoolFactory.java
index a85c8244e60a0a09fdcc0676f949c8ba16a1ad80..0efa4824aeb1a029f8d1ff301a09320f95f661d4 100644 (file)
--- a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/NamingThreadPoolFactory.java
+++ b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/NamingThreadPoolFactory.java
@@ -28,6 +28,7 @@ public class NamingThreadPoolFactory implements ThreadFactory, Closeable {
     }
 
     @Override
     }
 
     @Override

+    @SuppressWarnings("checkstyle:parameterName")

     public Thread newThread(final Runnable r) {
         return new Thread(group, r, String.format("%s-%d", group.getName(), threadName.incrementAndGet()));
     }
     public Thread newThread(final Runnable r) {
         return new Thread(group, r, String.format("%s-%d", group.getName(), threadName.incrementAndGet()));
     }

diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml
index a64620b918f9a626cfc887f3f700b9327888588e..6f8dc8563115c6a679b9e9ae82ed09a665e4c538 100644 (file)
--- a/opendaylight/md-sal/mdsal-artifacts/pom.xml
+++ b/opendaylight/md-sal/mdsal-artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml
index a25855afacce4691bf31457884e34ae0291d0cdb..066054d9d6f4920c75148929525ca2e7c85cd62d 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-base/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-base/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>

-    <version>5.0.2</version>
+    <version>6.0.0</version>

     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml
index 46bc170ea7d26d53b73adaa703ee2fd180c6459d..468743dbcecb0007a5f520cb541b70556f385bae 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-parent/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>

-    <version>5.0.2</version>
+    <version>6.0.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingBroker.java b/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingBroker.java
index ef05ade7d857646a14a2631391cb72cd17080260..ab633a22b77c60943528b2f8e7cdeff43c17bdce 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingBroker.java
+++ b/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingBroker.java
@@ -225,6 +225,8 @@ public class TracingBroker implements TracingDOMDataBroker {
         writeWatches.add(watch);
     }
 
         writeWatches.add(watch);
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private boolean isRegistrationWatched(YangInstanceIdentifier iid, LogicalDatastoreType store) {
         if (registrationWatches.isEmpty()) {
             return true;
     private boolean isRegistrationWatched(YangInstanceIdentifier iid, LogicalDatastoreType store) {
         if (registrationWatches.isEmpty()) {
             return true;


@@ -275,7 +277,7 @@ public class TracingBroker implements TracingDOMDataBroker {
         }
     }
 
         }
     }
 

-    private void reconstructIidPathString(YangInstanceIdentifier yiid, StringBuilder sb) {
+    private static void reconstructIidPathString(YangInstanceIdentifier yiid, StringBuilder sb) {

         sb.append("<RECONSTRUCTED FROM: \"").append(yiid.toString()).append("\">");
         for (YangInstanceIdentifier.PathArgument pathArg : yiid.getPathArguments()) {
             if (pathArg instanceof YangInstanceIdentifier.AugmentationIdentifier) {
         sb.append("<RECONSTRUCTED FROM: \"").append(yiid.toString()).append("\">");
         for (YangInstanceIdentifier.PathArgument pathArg : yiid.getPathArguments()) {
             if (pathArg instanceof YangInstanceIdentifier.AugmentationIdentifier) {

diff --git a/opendaylight/md-sal/mdsal-trace/features/features-mdsal-trace/pom.xml b/opendaylight/md-sal/mdsal-trace/features/features-mdsal-trace/pom.xml
index 54a154662b36c28b15a24b9fc7e4c4ec60bf665e..d1c713e23cefe5a7502d122911d5e740c7d9472e 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/features/features-mdsal-trace/pom.xml
+++ b/opendaylight/md-sal/mdsal-trace/features/features-mdsal-trace/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/md-sal/mdsal-trace/features/odl-mdsal-trace/pom.xml b/opendaylight/md-sal/mdsal-trace/features/odl-mdsal-trace/pom.xml
index bfe7e41b7bbf0c1d5dfcf32ef25cd43a8bbe91b8..e3da98a1b54d07834101ebc11751902cd7f46390 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/features/odl-mdsal-trace/pom.xml
+++ b/opendaylight/md-sal/mdsal-trace/features/odl-mdsal-trace/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/md-sal/mdsal-trace/features/pom.xml b/opendaylight/md-sal/mdsal-trace/features/pom.xml
index 3c667a37becffa84710eb30b7f26805945f3a505..0b21da572e6a927ee28487dcb874a2b0c380a752 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/features/pom.xml
+++ b/opendaylight/md-sal/mdsal-trace/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>5.0.2</version>
+    <version>6.0.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/mdsal-trace/pom.xml b/opendaylight/md-sal/mdsal-trace/pom.xml
index 0cbb4d1fc6584aae35d176b243096e46ecd2765e..d930a8eafadceac1230f31cbdff34584c17d07df 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/pom.xml
+++ b/opendaylight/md-sal/mdsal-trace/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>5.0.2</version>
+    <version>6.0.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 656eba58cad661060b6180f0ac79fd9b0ad05a52..14242d0ca027b9a5a488031a9acbefdacef076d1 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>5.0.2</version>
+    <version>6.0.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-binding-api/pom.xml b/opendaylight/md-sal/sal-binding-api/pom.xml
index ed343452130f1ebe388ddc53a75bc9b97b18d340..b892219118e873d08bef26d8e64365e1c801624e 100644 (file)
--- a/opendaylight/md-sal/sal-binding-api/pom.xml
+++ b/opendaylight/md-sal/sal-binding-api/pom.xml
@@ -13,6 +13,11 @@
   <version>1.11.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <version>1.11.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 

+  <properties>
+    <!-- FIXME: Workaround for https://issues.apache.org/jira/browse/ARIES-1923 -->
+    <maven.compiler.release>10</maven.compiler.release>
+  </properties>
+

   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HeliumNotificationProviderServiceWithInterestListeners.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HeliumNotificationProviderServiceWithInterestListeners.java
index ec32ff9526827f2bf551da9df2625de47cc7d20b..c33a96d8889df316da176ac196ed26191bdf2654 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HeliumNotificationProviderServiceWithInterestListeners.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HeliumNotificationProviderServiceWithInterestListeners.java
@@ -8,6 +8,7 @@
 package org.opendaylight.controller.md.sal.binding.compat;
 
 import com.google.common.collect.Sets;
 package org.opendaylight.controller.md.sal.binding.compat;
 
 import com.google.common.collect.Sets;

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Set;


@@ -59,6 +60,8 @@ public class HeliumNotificationProviderServiceWithInterestListeners extends Heli
         return codec.getNotificationClasses(added);
     }
 
         return codec.getNotificationClasses(added);
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     @SuppressWarnings("checkstyle:IllegalCatch")
     private void notifyAllListeners(final Set<SchemaPath> added) {
         final Iterator<? extends ListenerRegistration<? extends NotificationInterestListener>> listeners =
     @SuppressWarnings("checkstyle:IllegalCatch")
     private void notifyAllListeners(final Set<SchemaPath> added) {
         final Iterator<? extends ListenerRegistration<? extends NotificationInterestListener>> listeners =

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/ListenerMapGeneration.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/ListenerMapGeneration.java
index ef1639cfaf6c15872c457d3e9702594eee0cffae..4581fc0dd8f96296b9115c4284111628609156b2 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/ListenerMapGeneration.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/ListenerMapGeneration.java
@@ -13,6 +13,7 @@ import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;


@@ -91,9 +92,10 @@ final class ListenerMapGeneration {
         return typeToListeners.keySet();
     }
 
         return typeToListeners.keySet();
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private static Iterable<Class<?>> getNotificationTypes(final Class<?> cls) {
     private static Iterable<Class<?>> getNotificationTypes(final Class<?> cls) {

-        final Class<?>[] ifaces = cls.getInterfaces();
-        return Arrays.stream(ifaces)
+        return Arrays.stream(cls.getInterfaces())

                 .filter(input -> !Notification.class.equals(input) && Notification.class.isAssignableFrom(input))
                 .collect(Collectors.toList());
     }
                 .filter(input -> !Notification.class.equals(input) && Notification.class.isAssignableFrom(input))
                 .collect(Collectors.toList());
     }

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java
index 2551f7a4e74bf20d7fe3cb13ad0b565470313001..23ec35f730ea8d06ae52d3070e1ce51ab849f58d 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java
@@ -13,6 +13,7 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.MoreExecutors;

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;


@@ -86,6 +87,8 @@ final class BindingDOMTransactionChainAdapter implements BindingTransactionChain
         };
     }
 
         };
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private FluentFuture<? extends CommitInfo> listenForFailure(
             final WriteTransaction tx, final FluentFuture<? extends CommitInfo> future) {
         future.addCallback(new FutureCallback<CommitInfo>() {
     private FluentFuture<? extends CommitInfo> listenForFailure(
             final WriteTransaction tx, final FluentFuture<? extends CommitInfo> future) {
         future.addCallback(new FutureCallback<CommitInfo>() {


@@ -103,6 +106,8 @@ final class BindingDOMTransactionChainAdapter implements BindingTransactionChain
         return future;
     }
 
         return future;
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private void failTransactionChain(final WriteTransaction tx, final Throwable ex) {
         /*
          *  We asume correct state change for underlaying transaction
     private void failTransactionChain(final WriteTransaction tx, final Throwable ex) {
         /*
          *  We asume correct state change for underlaying transaction

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ContextReferenceExtractor.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ContextReferenceExtractor.java
index 8ac865617daebfdb417ad9266c5c0fc306529850..c52d30e34be04a1357a434c0bcc498863e11a2e1 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ContextReferenceExtractor.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ContextReferenceExtractor.java
@@ -10,6 +10,7 @@ package org.opendaylight.controller.md.sal.binding.impl;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.lang.reflect.Method;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import java.lang.reflect.Method;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;


@@ -57,6 +58,8 @@ abstract class ContextReferenceExtractor {
      */
     abstract @Nullable InstanceIdentifier<?> extract(DataObject obj);
 
      */
     abstract @Nullable InstanceIdentifier<?> extract(DataObject obj);
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private static @NonNull ContextReferenceExtractor create(final Class<?> key) {
         final Method contextGetter = getContextGetter(key);
         if (contextGetter == null) {
     private static @NonNull ContextReferenceExtractor create(final Class<?> key) {
         final Method contextGetter = getContextGetter(key);
         if (contextGetter == null) {

diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
index 95e82a9e60bb6f0cb5a17f0980259afd4b2831ec..b1cdac6f2effb9ffd059d999b7ee45c01f79724e 100644 (file)
--- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>

-    <version>5.0.2</version>
+    <version>6.0.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java b/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java
index e65461e04ba1b6f5ae27ac1c2efd3ebd7a86741a..515bd9d9b7662530598ff8c519349121809aa86a 100644 (file)
--- a/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java
+++ b/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java
@@ -653,6 +653,8 @@ public class ClusterAdminRpcService implements ClusterAdminService {
         return ask(shardManager, message, SHARD_MGR_TIMEOUT);
     }
 
         return ask(shardManager, message, SHARD_MGR_TIMEOUT);
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     @SuppressWarnings("checkstyle:IllegalCatch")
     private static void saveSnapshotsToFile(final DatastoreSnapshotList snapshots, final String fileName,
             final SettableFuture<RpcResult<BackupDatastoreOutput>> returnFuture) {
     @SuppressWarnings("checkstyle:IllegalCatch")
     private static void saveSnapshotsToFile(final DatastoreSnapshotList snapshots, final String fileName,
             final SettableFuture<RpcResult<BackupDatastoreOutput>> returnFuture) {

diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml
index ef7bf461fa34c8321744d5f143f4065e6cdef75b..2e22a87b6500a6090d9bb045455e8cfb05311321 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-config/pom.xml
+++ b/opendaylight/md-sal/sal-clustering-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>5.0.2</version>
+    <version>6.0.0</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java
index fa44c8db8400bb160455aed249099758fab1634a..4dbd7db03e64992e3ae566fe9c6d7fb52fddb346 100644 (file)
--- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java
+++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java
@@ -542,6 +542,8 @@ public abstract class DataNormalizationOperation<T extends PathArgument> impleme
      * otherwise returns a DataNormalizationOperation for child as
      * call for {@link #fromDataSchemaNode(DataSchemaNode)}.
      */
      * otherwise returns a DataNormalizationOperation for child as
      * call for {@link #fromDataSchemaNode(DataSchemaNode)}.
      */

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private static DataNormalizationOperation<?> fromAugmentation(final DataNodeContainer parent,
             final AugmentationTarget parentAug, final DataSchemaNode child) {
         AugmentationSchemaNode augmentation = null;
     private static DataNormalizationOperation<?> fromAugmentation(final DataNodeContainer parent,
             final AugmentationTarget parentAug, final DataSchemaNode child) {
         AugmentationSchemaNode augmentation = null;

diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
index 045083f7d9713a9e6e9e0545758cd486e475a77e..a53d59139e44b007cfba7bc80006f566860d2527 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
@@ -12,6 +12,11 @@
   <version>1.11.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <version>1.11.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 

+  <properties>
+    <!-- FIXME: Workaround for https://issues.apache.org/jira/browse/ARIES-1923 -->
+    <maven.compiler.release>10</maven.compiler.release>
+  </properties>
+

   <dependencies>
     <!-- Java -->
     <dependency>
   <dependencies>
     <!-- Java -->
     <dependency>

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBroker.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBroker.java
index 4ab1c15782229abb7cb9cb73f1f802a00b2e6a55..91fd64d366f5fd5c9658e1236eff5991d036af40 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBroker.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBroker.java
@@ -12,6 +12,7 @@ import static com.google.common.base.Preconditions.checkState;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableClassToInstanceMap;
 import com.google.common.collect.ImmutableClassToInstanceMap.Builder;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableClassToInstanceMap;
 import com.google.common.collect.ImmutableClassToInstanceMap.Builder;

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.util.EnumMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.EnumMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;


@@ -123,6 +124,8 @@ public abstract class AbstractDOMBroker extends AbstractDOMTransactionFactory<DO
         return new DOMBrokerTransactionChain(chainId, backingChains, this, listener);
     }
 
         return new DOMBrokerTransactionChain(chainId, backingChains, this, listener);
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private DOMStore getDOMStore(final LogicalDatastoreType type) {
         DOMStore store = getTxFactories().get(type);
         checkState(store != null, "Requested logical data store is not available.");
     private DOMStore getDOMStore(final LogicalDatastoreType type) {
         DOMStore store = getTxFactories().get(type);
         checkState(store != null, "Requested logical data store is not available.");

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java
index cdcae3ddff461b8b74a271046093535db0b7b9cf..dce32b6a7417b38d9941577b9c27bdb8a9aa3220 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java
@@ -127,10 +127,11 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker {
             }
         };
 
             }
         };
 

-        ListenableFuture<Boolean> canCommitFuture = cohortIterator.next().canCommit();
-        Futures.addCallback(canCommitFuture, futureCallback, MoreExecutors.directExecutor());
+        Futures.addCallback(cohortIterator.next().canCommit(), futureCallback, MoreExecutors.directExecutor());

     }
 
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private void doPreCommit(final long startTime, final AsyncNotifyingSettableFuture clientSubmitFuture,
             final DOMDataTreeWriteTransaction transaction,
             final Collection<DOMStoreThreePhaseCommitCohort> cohorts) {
     private void doPreCommit(final long startTime, final AsyncNotifyingSettableFuture clientSubmitFuture,
             final DOMDataTreeWriteTransaction transaction,
             final Collection<DOMStoreThreePhaseCommitCohort> cohorts) {


@@ -160,6 +161,8 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker {
         Futures.addCallback(preCommitFuture, futureCallback, MoreExecutors.directExecutor());
     }
 
         Futures.addCallback(preCommitFuture, futureCallback, MoreExecutors.directExecutor());
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private void doCommit(final long startTime, final AsyncNotifyingSettableFuture clientSubmitFuture,
             final DOMDataTreeWriteTransaction transaction,
             final Collection<DOMStoreThreePhaseCommitCohort> cohorts) {
     private void doCommit(final long startTime, final AsyncNotifyingSettableFuture clientSubmitFuture,
             final DOMDataTreeWriteTransaction transaction,
             final Collection<DOMStoreThreePhaseCommitCohort> cohorts) {


@@ -191,10 +194,11 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker {
         Futures.addCallback(commitFuture, futureCallback, MoreExecutors.directExecutor());
     }
 
         Futures.addCallback(commitFuture, futureCallback, MoreExecutors.directExecutor());
     }
 

-    @SuppressFBWarnings(value = "BC_UNCONFIRMED_CAST_OF_RETURN_VALUE",
+    @SuppressFBWarnings(value = { "BC_UNCONFIRMED_CAST_OF_RETURN_VALUE", "UPM_UNCALLED_PRIVATE_METHOD" },

             justification = "Pertains to the assignment of the 'clientException' var. FindBugs flags this as an "
                 + "uncomfirmed cast but the generic type in TransactionCommitFailedExceptionMapper is "
             justification = "Pertains to the assignment of the 'clientException' var. FindBugs flags this as an "
                 + "uncomfirmed cast but the generic type in TransactionCommitFailedExceptionMapper is "

-                + "TransactionCommitFailedException and thus should be deemed as confirmed.")
+                + "TransactionCommitFailedException and thus should be deemed as confirmed."
+                + "Also https://github.com/spotbugs/spotbugs/issues/811")

     private static void handleException(final AsyncNotifyingSettableFuture clientSubmitFuture,
             final DOMDataTreeWriteTransaction transaction,
             final Collection<DOMStoreThreePhaseCommitCohort> cohorts,
     private static void handleException(final AsyncNotifyingSettableFuture clientSubmitFuture,
             final DOMDataTreeWriteTransaction transaction,
             final Collection<DOMStoreThreePhaseCommitCohort> cohorts,

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerTransactionChain.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerTransactionChain.java
index 537aa46a82a3a6611dbc1f165e39d5093c12c898..3364d23143db46478fc05fb92b3f9f90a59e6da8 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerTransactionChain.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerTransactionChain.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
  */
  * 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.controller.cluster.databroker;
 
 import static com.google.common.base.Preconditions.checkState;
 package org.opendaylight.controller.cluster.databroker;
 
 import static com.google.common.base.Preconditions.checkState;


@@ -14,6 +13,7 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.MoreExecutors;

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;


@@ -127,12 +127,16 @@ final class DOMBrokerTransactionChain extends AbstractDOMTransactionFactory<DOMS
         listener.onTransactionChainSuccessful(this);
     }
 
         listener.onTransactionChainSuccessful(this);
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private void transactionCompleted() {
         if (COUNTER_UPDATER.decrementAndGet(this) == 0 && state == State.CLOSING) {
             finishClose();
         }
     }
 
     private void transactionCompleted() {
         if (COUNTER_UPDATER.decrementAndGet(this) == 0 && state == State.CLOSING) {
             finishClose();
         }
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private void transactionFailed(final DOMDataTreeWriteTransaction tx, final Throwable cause) {
         state = State.FAILED;
         LOG.debug("Transaction chain {} failed.", this, cause);
     private void transactionFailed(final DOMDataTreeWriteTransaction tx, final Throwable cause) {
         state = State.FAILED;
         LOG.debug("Transaction chain {} failed.", this, cause);

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java
index 9a238e9d50f5a64d0f3187f2bcf25322f73f8978..bca00ebc4a6bdbb88cd928ffe609bdb6ae1acd5f 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java
@@ -242,7 +242,8 @@ class CompositeDataTreeCohort {
 
     // FB issues violation for passing null to CompletableFuture#complete but it is valid and necessary when the
     // generic type is Void.
 
     // FB issues violation for passing null to CompletableFuture#complete but it is valid and necessary when the
     // generic type is Void.

-    @SuppressFBWarnings("NP_NONNULL_PARAM_VIOLATION")
+    @SuppressFBWarnings(value = { "NP_NONNULL_PARAM_VIOLATION", "UPM_UNCALLED_PRIVATE_METHOD" },
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private void processResponses(final Throwable failure, final Iterable<Object> results,
             final State currentState, final State afterState, final CompletableFuture<Void> resultFuture) {
         if (failure != null) {
     private void processResponses(final Throwable failure, final Iterable<Object> results,
             final State currentState, final State afterState, final CompletableFuture<Void> resultFuture) {
         if (failure != null) {

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxy.java
index 6ead7c630bdb22e99a13c698c42aea88c3122fa0..0268b8e36c41a43fb986d96663a7f12d28ff13a4 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxy.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxy.java
@@ -14,6 +14,7 @@ import akka.actor.ActorSelection;
 import akka.actor.PoisonPill;
 import akka.dispatch.OnComplete;
 import com.google.common.annotations.VisibleForTesting;
 import akka.actor.PoisonPill;
 import akka.dispatch.OnComplete;
 import com.google.common.annotations.VisibleForTesting;

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import org.checkerframework.checker.lock.qual.GuardedBy;
 import org.opendaylight.controller.cluster.datastore.exceptions.LocalShardNotFoundException;
 import org.opendaylight.controller.cluster.datastore.messages.CloseDataTreeNotificationListenerRegistration;
 import org.checkerframework.checker.lock.qual.GuardedBy;
 import org.opendaylight.controller.cluster.datastore.exceptions.LocalShardNotFoundException;
 import org.opendaylight.controller.cluster.datastore.messages.CloseDataTreeNotificationListenerRegistration;


@@ -86,6 +87,8 @@ final class DataTreeChangeListenerProxy<T extends DOMDataTreeChangeListener> ext
         }, actorUtils.getClientDispatcher());
     }
 
         }, actorUtils.getClientDispatcher());
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private void setListenerRegistrationActor(final ActorSelection actor) {
         if (actor == null) {
             LOG.debug("{}: Ignoring null actor on {}", logContext(), this);
     private void setListenerRegistrationActor(final ActorSelection actor) {
         if (actor == null) {
             LOG.debug("{}: Ignoring null actor on {}", logContext(), this);


@@ -103,6 +106,8 @@ final class DataTreeChangeListenerProxy<T extends DOMDataTreeChangeListener> ext
         actor.tell(CloseDataTreeNotificationListenerRegistration.getInstance(), null);
     }
 
         actor.tell(CloseDataTreeNotificationListenerRegistration.getInstance(), null);
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private void doRegistration(final ActorRef shard) {
 
         Future<Object> future = actorUtils.executeOperationAsync(shard,
     private void doRegistration(final ActorRef shard) {
 
         Future<Object> future = actorUtils.executeOperationAsync(shard,

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActor.java
index c8372e409e1ab6e3de0254d73fcbc0e343e2c771..9c0d1ca569122629237190ca9d9621eefd455d67 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActor.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActor.java
@@ -14,6 +14,7 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;


@@ -75,7 +76,7 @@ final class DataTreeCohortActor extends AbstractUntypedActor {
             return txId;
         }
 
             return txId;
         }
 

-        protected CommitProtocolCommand(TransactionIdentifier txId) {
+        protected CommitProtocolCommand(final TransactionIdentifier txId) {

             this.txId = Objects.requireNonNull(txId);
         }
 
             this.txId = Objects.requireNonNull(txId);
         }
 


@@ -91,8 +92,8 @@ final class DataTreeCohortActor extends AbstractUntypedActor {
         private final ActorRef cohort;
         private final SchemaContext schema;
 
         private final ActorRef cohort;
         private final SchemaContext schema;
 

-        CanCommit(TransactionIdentifier txId, Collection<DOMDataTreeCandidate> candidates, SchemaContext schema,
-                ActorRef cohort) {
+        CanCommit(final TransactionIdentifier txId, final Collection<DOMDataTreeCandidate> candidates,
+                final SchemaContext schema, final ActorRef cohort) {

             super(txId);
             this.cohort = Objects.requireNonNull(cohort);
             this.candidates = Objects.requireNonNull(candidates);
             super(txId);
             this.cohort = Objects.requireNonNull(cohort);
             this.candidates = Objects.requireNonNull(candidates);


@@ -122,7 +123,7 @@ final class DataTreeCohortActor extends AbstractUntypedActor {
         private final ActorRef cohortRef;
         private final TransactionIdentifier txId;
 
         private final ActorRef cohortRef;
         private final TransactionIdentifier txId;
 

-        protected CommitReply(ActorRef cohortRef, TransactionIdentifier txId) {
+        protected CommitReply(final ActorRef cohortRef, final TransactionIdentifier txId) {

             this.cohortRef = Objects.requireNonNull(cohortRef);
             this.txId = Objects.requireNonNull(txId);
         }
             this.cohortRef = Objects.requireNonNull(cohortRef);
             this.txId = Objects.requireNonNull(txId);
         }


@@ -143,28 +144,28 @@ final class DataTreeCohortActor extends AbstractUntypedActor {
 
     static final class Success extends CommitReply {
 
 
     static final class Success extends CommitReply {
 

-        Success(ActorRef cohortRef, TransactionIdentifier txId) {
+        Success(final ActorRef cohortRef, final TransactionIdentifier txId) {

             super(cohortRef, txId);
         }
     }
 
     static final class PreCommit extends CommitProtocolCommand<Success> {
 
             super(cohortRef, txId);
         }
     }
 
     static final class PreCommit extends CommitProtocolCommand<Success> {
 

-        PreCommit(TransactionIdentifier txId) {
+        PreCommit(final TransactionIdentifier txId) {

             super(txId);
         }
     }
 
     static final class Abort extends CommitProtocolCommand<Success> {
 
             super(txId);
         }
     }
 
     static final class Abort extends CommitProtocolCommand<Success> {
 

-        Abort(TransactionIdentifier txId) {
+        Abort(final TransactionIdentifier txId) {

             super(txId);
         }
     }
 
     static final class Commit extends CommitProtocolCommand<Success> {
 
             super(txId);
         }
     }
 
     static final class Commit extends CommitProtocolCommand<Success> {
 

-        Commit(TransactionIdentifier txId) {
+        Commit(final TransactionIdentifier txId) {

             super(txId);
         }
     }
             super(txId);
         }
     }


@@ -172,11 +173,11 @@ final class DataTreeCohortActor extends AbstractUntypedActor {
     private abstract class CohortBehaviour<M extends CommitProtocolCommand<?>, S extends ThreePhaseCommitStep> {
         private final Class<M> handledMessageType;
 
     private abstract class CohortBehaviour<M extends CommitProtocolCommand<?>, S extends ThreePhaseCommitStep> {
         private final Class<M> handledMessageType;
 

-        CohortBehaviour(Class<M> handledMessageType) {
+        CohortBehaviour(final Class<M> handledMessageType) {

             this.handledMessageType = Objects.requireNonNull(handledMessageType);
         }
 
             this.handledMessageType = Objects.requireNonNull(handledMessageType);
         }
 

-        void handle(CommitProtocolCommand<?> command) {
+        void handle(final CommitProtocolCommand<?> command) {

             if (handledMessageType.isInstance(command)) {
                 onMessage(command);
             } else if (command instanceof Abort) {
             if (handledMessageType.isInstance(command)) {
                 onMessage(command);
             } else if (command instanceof Abort) {


@@ -188,7 +189,7 @@ final class DataTreeCohortActor extends AbstractUntypedActor {
             }
         }
 
             }
         }
 

-        private void onMessage(CommitProtocolCommand<?> message) {
+        private void onMessage(final CommitProtocolCommand<?> message) {

             final ActorRef sender = getSender();
             TransactionIdentifier txId = message.getTxId();
             ListenableFuture<S> future = process(handledMessageType.cast(message));
             final ActorRef sender = getSender();
             TransactionIdentifier txId = message.getTxId();
             ListenableFuture<S> future = process(handledMessageType.cast(message));


@@ -196,38 +197,42 @@ final class DataTreeCohortActor extends AbstractUntypedActor {
                     : DataTreeCohortActor.this::executeInSelf;
             Futures.addCallback(future, new FutureCallback<S>() {
                 @Override
                     : DataTreeCohortActor.this::executeInSelf;
             Futures.addCallback(future, new FutureCallback<S>() {
                 @Override

-                public void onSuccess(S nextStep) {
+                public void onSuccess(final S nextStep) {

                     success(txId, sender, nextStep);
                 }
 
                 @Override
                     success(txId, sender, nextStep);
                 }
 
                 @Override

-                public void onFailure(Throwable failure) {
+                public void onFailure(final Throwable failure) {

                     failed(txId, sender, failure);
                 }
             }, callbackExecutor);
         }
 
                     failed(txId, sender, failure);
                 }
             }, callbackExecutor);
         }
 

-        private void failed(TransactionIdentifier txId, ActorRef sender, Throwable failure) {
+        @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+                justification = "https://github.com/spotbugs/spotbugs/issues/811")
+        private void failed(final TransactionIdentifier txId, final ActorRef sender, final Throwable failure) {

             currentStateMap.remove(txId);
             sender.tell(new Status.Failure(failure), getSelf());
         }
 
             currentStateMap.remove(txId);
             sender.tell(new Status.Failure(failure), getSelf());
         }
 

-        private void success(TransactionIdentifier txId, ActorRef sender, S nextStep) {
+        @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+                justification = "https://github.com/spotbugs/spotbugs/issues/811")
+        private void success(final TransactionIdentifier txId, final ActorRef sender, final S nextStep) {

             currentStateMap.computeIfPresent(txId, (key, behaviour) -> nextBehaviour(txId, nextStep));
             sender.tell(new Success(getSelf(), txId), getSelf());
         }
 
             currentStateMap.computeIfPresent(txId, (key, behaviour) -> nextBehaviour(txId, nextStep));
             sender.tell(new Success(getSelf(), txId), getSelf());
         }
 

-        private void onAbort(TransactionIdentifier txId) {
+        private void onAbort(final TransactionIdentifier txId) {

             currentStateMap.remove(txId);
             final ActorRef sender = getSender();
             Futures.addCallback(abort(), new FutureCallback<Object>() {
                 @Override
             currentStateMap.remove(txId);
             final ActorRef sender = getSender();
             Futures.addCallback(abort(), new FutureCallback<Object>() {
                 @Override

-                public void onSuccess(Object noop) {
+                public void onSuccess(final Object noop) {

                     sender.tell(new Success(getSelf(), txId), getSelf());
                 }
 
                 @Override
                     sender.tell(new Success(getSelf(), txId), getSelf());
                 }
 
                 @Override

-                public void onFailure(Throwable failure) {
+                public void onFailure(final Throwable failure) {

                     LOG.warn("Abort of transaction {} failed for cohort {}", txId, cohort, failure);
                     sender.tell(new Status.Failure(failure), getSelf());
                 }
                     LOG.warn("Abort of transaction {} failed for cohort {}", txId, cohort, failure);
                     sender.tell(new Status.Failure(failure), getSelf());
                 }


@@ -252,12 +257,12 @@ final class DataTreeCohortActor extends AbstractUntypedActor {
         }
 
         @Override
         }
 
         @Override

-        ListenableFuture<PostCanCommitStep> process(CanCommit message) {
+        ListenableFuture<PostCanCommitStep> process(final CanCommit message) {

             return cohort.canCommit(message.getTxId(), message.getSchema(), message.getCandidates());
         }
 
         @Override
             return cohort.canCommit(message.getTxId(), message.getSchema(), message.getCandidates());
         }
 
         @Override

-        CohortBehaviour<?, ?> nextBehaviour(TransactionIdentifier txId, PostCanCommitStep nextStep) {
+        CohortBehaviour<?, ?> nextBehaviour(final TransactionIdentifier txId, final PostCanCommitStep nextStep) {

             return new PostCanCommit(txId, nextStep);
         }
 
             return new PostCanCommit(txId, nextStep);
         }
 


@@ -272,7 +277,7 @@ final class DataTreeCohortActor extends AbstractUntypedActor {
         private final S step;
         private final TransactionIdentifier txId;
 
         private final S step;
         private final TransactionIdentifier txId;
 

-        CohortStateWithStep(Class<M> handledMessageType, TransactionIdentifier txId, S step) {
+        CohortStateWithStep(final Class<M> handledMessageType, final TransactionIdentifier txId, final S step) {

             super(handledMessageType);
             this.txId = Objects.requireNonNull(txId);
             this.step = Objects.requireNonNull(step);
             super(handledMessageType);
             this.txId = Objects.requireNonNull(txId);
             this.step = Objects.requireNonNull(step);


@@ -295,18 +300,18 @@ final class DataTreeCohortActor extends AbstractUntypedActor {
 
     private class PostCanCommit extends CohortStateWithStep<PreCommit, PostCanCommitStep, PostPreCommitStep> {
 
 
     private class PostCanCommit extends CohortStateWithStep<PreCommit, PostCanCommitStep, PostPreCommitStep> {
 

-        PostCanCommit(TransactionIdentifier txId, PostCanCommitStep nextStep) {
+        PostCanCommit(final TransactionIdentifier txId, final PostCanCommitStep nextStep) {

             super(PreCommit.class, txId, nextStep);
         }
 
         @SuppressWarnings("unchecked")
         @Override
             super(PreCommit.class, txId, nextStep);
         }
 
         @SuppressWarnings("unchecked")
         @Override

-        ListenableFuture<PostPreCommitStep> process(PreCommit message) {
+        ListenableFuture<PostPreCommitStep> process(final PreCommit message) {

             return (ListenableFuture<PostPreCommitStep>) getStep().preCommit();
         }
 
         @Override
             return (ListenableFuture<PostPreCommitStep>) getStep().preCommit();
         }
 
         @Override

-        CohortBehaviour<?, ?> nextBehaviour(TransactionIdentifier txId, PostPreCommitStep nextStep) {
+        CohortBehaviour<?, ?> nextBehaviour(final TransactionIdentifier txId, final PostPreCommitStep nextStep) {

             return new PostPreCommit(txId, nextStep);
         }
 
             return new PostPreCommit(txId, nextStep);
         }
 


@@ -314,18 +319,18 @@ final class DataTreeCohortActor extends AbstractUntypedActor {
 
     private class PostPreCommit extends CohortStateWithStep<Commit, PostPreCommitStep, NoopThreePhaseCommitStep> {
 
 
     private class PostPreCommit extends CohortStateWithStep<Commit, PostPreCommitStep, NoopThreePhaseCommitStep> {
 

-        PostPreCommit(TransactionIdentifier txId, PostPreCommitStep step) {
+        PostPreCommit(final TransactionIdentifier txId, final PostPreCommitStep step) {

             super(Commit.class, txId, step);
         }
 
         @SuppressWarnings("unchecked")
         @Override
             super(Commit.class, txId, step);
         }
 
         @SuppressWarnings("unchecked")
         @Override

-        ListenableFuture<NoopThreePhaseCommitStep> process(Commit message) {
+        ListenableFuture<NoopThreePhaseCommitStep> process(final Commit message) {

             return (ListenableFuture<NoopThreePhaseCommitStep>) getStep().commit();
         }
 
         @Override
             return (ListenableFuture<NoopThreePhaseCommitStep>) getStep().commit();
         }
 
         @Override

-        CohortBehaviour<?, ?> nextBehaviour(TransactionIdentifier txId, NoopThreePhaseCommitStep nextStep) {
+        CohortBehaviour<?, ?> nextBehaviour(final TransactionIdentifier txId, final NoopThreePhaseCommitStep nextStep) {

             return null;
         }
     }
             return null;
         }
     }

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortRegistrationProxy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortRegistrationProxy.java
index 0b6f143583c716ce02b33fb1a1a88d4e9a32c3e6..e5f4ceaa7e105770545d9be6f3951f3e34e39c44 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortRegistrationProxy.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortRegistrationProxy.java
@@ -13,6 +13,7 @@ import akka.actor.ActorRef;
 import akka.dispatch.OnComplete;
 import akka.pattern.Patterns;
 import akka.util.Timeout;
 import akka.dispatch.OnComplete;
 import akka.pattern.Patterns;
 import akka.util.Timeout;

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.util.concurrent.TimeUnit;
 import org.checkerframework.checker.lock.qual.GuardedBy;
 import org.opendaylight.controller.cluster.datastore.exceptions.LocalShardNotFoundException;
 import java.util.concurrent.TimeUnit;
 import org.checkerframework.checker.lock.qual.GuardedBy;
 import org.opendaylight.controller.cluster.datastore.exceptions.LocalShardNotFoundException;


@@ -65,6 +66,8 @@ public class DataTreeCohortRegistrationProxy<C extends DOMDataTreeCommitCohort>
         }, actorUtils.getClientDispatcher());
     }
 
         }, actorUtils.getClientDispatcher());
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private synchronized void performRegistration(final ActorRef shard) {
         if (isClosed()) {
             return;
     private synchronized void performRegistration(final ActorRef shard) {
         if (isClosed()) {
             return;

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java
index 7be72393a2caff1918cd1f8e75bc392feab5290a..4276f3be52960e0ff9c68cd50adc5d9e591c4db6 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java
@@ -14,6 +14,7 @@ import akka.actor.ActorSelection;
 import akka.dispatch.OnComplete;
 import akka.pattern.AskTimeoutException;
 import akka.util.Timeout;
 import akka.dispatch.OnComplete;
 import akka.pattern.AskTimeoutException;
 import akka.util.Timeout;

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.util.concurrent.TimeUnit;
 import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
 import org.opendaylight.controller.cluster.datastore.exceptions.NoShardLeaderException;
 import java.util.concurrent.TimeUnit;
 import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
 import org.opendaylight.controller.cluster.datastore.exceptions.NoShardLeaderException;


@@ -151,6 +152,8 @@ final class RemoteTransactionContextSupport {
         }, getActorUtils().getClientDispatcher());
     }
 
         }, getActorUtils().getClientDispatcher());
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private void onFindPrimaryShardComplete(final Throwable failure, final PrimaryShardInfo newPrimaryShardInfo) {
         if (failure == null) {
             this.primaryShardInfo = newPrimaryShardInfo;
     private void onFindPrimaryShardComplete(final Throwable failure, final PrimaryShardInfo newPrimaryShardInfo) {
         if (failure == null) {
             this.primaryShardInfo = newPrimaryShardInfo;

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxy.java
index 2d57c2a8af340d43d56c70573f614063078a7b00..5f82584f856cc69b987c473178232d3aea6b3a66 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxy.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxy.java
@@ -17,6 +17,7 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;


@@ -142,6 +143,8 @@ public class ThreePhaseCommitCohortProxy extends AbstractThreePhaseCommitCohort<
         return returnFuture;
     }
 
         return returnFuture;
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private void finishCanCommit(final SettableFuture<Boolean> returnFuture) {
         LOG.debug("Tx {} finishCanCommit", transactionId);
 
     private void finishCanCommit(final SettableFuture<Boolean> returnFuture) {
         LOG.debug("Tx {} finishCanCommit", transactionId);
 

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java
index c2e4aab5a428423865a02acc50afa10287bd0753..ca9ef6338d2b769a7e9d6d57f2a7143ca4699ecb 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java
@@ -24,6 +24,7 @@ import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;

+import java.util.concurrent.TimeoutException;

 import org.opendaylight.controller.cluster.access.concepts.MemberName;
 import org.opendaylight.controller.cluster.datastore.config.Configuration;
 import org.opendaylight.controller.cluster.datastore.config.ModuleShardConfiguration;
 import org.opendaylight.controller.cluster.access.concepts.MemberName;
 import org.opendaylight.controller.cluster.datastore.config.Configuration;
 import org.opendaylight.controller.cluster.datastore.config.ModuleShardConfiguration;


@@ -218,21 +219,28 @@ public class DistributedEntityOwnershipService implements DOMEntityOwnershipServ
     @SuppressWarnings("checkstyle:IllegalCatch")
     @SuppressFBWarnings(value = "REC_CATCH_EXCEPTION", justification = "Akka's Await.result() API contract")
     DataTree getLocalEntityOwnershipShardDataTree() {
     @SuppressWarnings("checkstyle:IllegalCatch")
     @SuppressFBWarnings(value = "REC_CATCH_EXCEPTION", justification = "Akka's Await.result() API contract")
     DataTree getLocalEntityOwnershipShardDataTree() {

-        if (localEntityOwnershipShardDataTree == null) {
-            try {
-                if (localEntityOwnershipShard == null) {
-                    localEntityOwnershipShard = Await.result(context.findLocalShardAsync(
-                            ENTITY_OWNERSHIP_SHARD_NAME), Duration.Inf());
-                }
+        final DataTree local = localEntityOwnershipShardDataTree;
+        if (local != null) {
+            return local;
+        }

 
 

-                localEntityOwnershipShardDataTree = (DataTree) Await.result(Patterns.ask(localEntityOwnershipShard,
-                        GetShardDataTree.INSTANCE, MESSAGE_TIMEOUT), Duration.Inf());
-            } catch (Exception e) {
+        if (localEntityOwnershipShard == null) {
+            try {
+                localEntityOwnershipShard = Await.result(context.findLocalShardAsync(
+                    ENTITY_OWNERSHIP_SHARD_NAME), Duration.Inf());
+            } catch (TimeoutException | InterruptedException e) {

                 LOG.error("Failed to find local {} shard", ENTITY_OWNERSHIP_SHARD_NAME, e);
                 LOG.error("Failed to find local {} shard", ENTITY_OWNERSHIP_SHARD_NAME, e);

+                return null;

             }
         }
 
             }
         }
 

-        return localEntityOwnershipShardDataTree;
+        try {
+            return localEntityOwnershipShardDataTree = (DataTree) Await.result(Patterns.ask(localEntityOwnershipShard,
+                GetShardDataTree.INSTANCE, MESSAGE_TIMEOUT), Duration.Inf());
+        } catch (TimeoutException | InterruptedException e) {
+            LOG.error("Failed to find local {} shard", ENTITY_OWNERSHIP_SHARD_NAME, e);
+            return null;
+        }

     }
 
     void unregisterListener(final String entityType, final DOMEntityOwnershipListener listener) {
     }
 
     void unregisterListener(final String entityType, final DOMEntityOwnershipListener listener) {

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java
index 77a0e88393d4760cf251de4d1f4df7bcb904f97e..fee555470f7fefd74dcc136c7595f1f0023d776c 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java
@@ -35,6 +35,7 @@ import akka.persistence.SnapshotOffer;
 import akka.persistence.SnapshotSelectionCriteria;
 import akka.util.Timeout;
 import com.google.common.annotations.VisibleForTesting;
 import akka.persistence.SnapshotSelectionCriteria;
 import akka.util.Timeout;
 import com.google.common.annotations.VisibleForTesting;

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;


@@ -425,6 +426,8 @@ class ShardManager extends AbstractUntypedPersistentActorWithMetering {
         }
     }
 
         }
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private void removePrefixShardReplica(final RemovePrefixShardReplica contextMessage, final String shardName,
                                           final String primaryPath, final ActorRef sender) {
         if (isShardReplicaOperationInProgress(shardName, sender)) {
     private void removePrefixShardReplica(final RemovePrefixShardReplica contextMessage, final String shardName,
                                           final String primaryPath, final ActorRef sender) {
         if (isShardReplicaOperationInProgress(shardName, sender)) {


@@ -466,6 +469,8 @@ class ShardManager extends AbstractUntypedPersistentActorWithMetering {
         }, new Dispatchers(context().system().dispatchers()).getDispatcher(Dispatchers.DispatcherType.Client));
     }
 
         }, new Dispatchers(context().system().dispatchers()).getDispatcher(Dispatchers.DispatcherType.Client));
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private void removeShardReplica(final RemoveShardReplica contextMessage, final String shardName,
             final String primaryPath, final ActorRef sender) {
         if (isShardReplicaOperationInProgress(shardName, sender)) {
     private void removeShardReplica(final RemoveShardReplica contextMessage, final String shardName,
             final String primaryPath, final ActorRef sender) {
         if (isShardReplicaOperationInProgress(shardName, sender)) {


@@ -1288,10 +1293,10 @@ class ShardManager extends AbstractUntypedPersistentActorWithMetering {
     }
 
     @VisibleForTesting
     }
 
     @VisibleForTesting

-    ShardInformation createShardInfoFor(String shardName, ShardIdentifier shardId,
-                                        Map<String, String> peerAddresses,
-                                        DatastoreContext datastoreContext,
-                                        Map<String, DatastoreSnapshot.ShardSnapshot> shardSnapshots) {
+    ShardInformation createShardInfoFor(final String shardName, final ShardIdentifier shardId,
+                                        final Map<String, String> peerAddresses,
+                                        final DatastoreContext datastoreContext,
+                                        final Map<String, DatastoreSnapshot.ShardSnapshot> shardSnapshots) {

         return new ShardInformation(shardName, shardId, peerAddresses,
                 datastoreContext, Shard.builder().restoreFromSnapshot(shardSnapshots.get(shardName)),
                 peerAddressResolver);
         return new ShardInformation(shardName, shardId, peerAddresses,
                 datastoreContext, Shard.builder().restoreFromSnapshot(shardSnapshots.get(shardName)),
                 peerAddressResolver);


@@ -1428,12 +1433,16 @@ class ShardManager extends AbstractUntypedPersistentActorWithMetering {
         });
     }
 
         });
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private void sendLocalReplicaAlreadyExistsReply(final String shardName, final ActorRef sender) {
         LOG.debug("{}: Local shard {} already exists", persistenceId(), shardName);
         sender.tell(new Status.Failure(new AlreadyExistsException(
             String.format("Local shard %s already exists", shardName))), getSelf());
     }
 
     private void sendLocalReplicaAlreadyExistsReply(final String shardName, final ActorRef sender) {
         LOG.debug("{}: Local shard {} already exists", persistenceId(), shardName);
         sender.tell(new Status.Failure(new AlreadyExistsException(
             String.format("Local shard %s already exists", shardName))), getSelf());
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private void addPrefixShard(final String shardName, final YangInstanceIdentifier shardPrefix,
                                 final RemotePrimaryShardFound response, final ActorRef sender) {
         if (isShardReplicaOperationInProgress(shardName, sender)) {
     private void addPrefixShard(final String shardName, final YangInstanceIdentifier shardPrefix,
                                 final RemotePrimaryShardFound response, final ActorRef sender) {
         if (isShardReplicaOperationInProgress(shardName, sender)) {


@@ -1468,6 +1477,8 @@ class ShardManager extends AbstractUntypedPersistentActorWithMetering {
         execAddShard(shardName, shardInfo, response, removeShardOnFailure, sender);
     }
 
         execAddShard(shardName, shardInfo, response, removeShardOnFailure, sender);
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private void addShard(final String shardName, final RemotePrimaryShardFound response, final ActorRef sender) {
         if (isShardReplicaOperationInProgress(shardName, sender)) {
             return;
     private void addShard(final String shardName, final RemotePrimaryShardFound response, final ActorRef sender) {
         if (isShardReplicaOperationInProgress(shardName, sender)) {
             return;

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/ActorUtils.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/ActorUtils.java
index 3007e4b1872474c8c5eb095b09aa776bcfd651be..b1deffefb7c0cd20030d995dff698b623943c389 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/ActorUtils.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/ActorUtils.java
@@ -23,6 +23,7 @@ import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.codahale.metrics.Timer;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;


@@ -241,6 +242,8 @@ public class ActorUtils {
         }, FIND_PRIMARY_FAILURE_TRANSFORMER, getClientDispatcher());
     }
 
         }, FIND_PRIMARY_FAILURE_TRANSFORMER, getClientDispatcher());
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private PrimaryShardInfo onPrimaryShardFound(final String shardName, final String primaryActorPath,
             final short primaryVersion, final ReadOnlyDataTree localShardDataTree) {
         ActorSelection actorSelection = actorSystem.actorSelection(primaryActorPath);
     private PrimaryShardInfo onPrimaryShardFound(final String shardName, final String primaryActorPath,
             final short primaryVersion, final ReadOnlyDataTree localShardDataTree) {
         ActorSelection actorSelection = actorSystem.actorSelection(primaryActorPath);

diff --git a/opendaylight/md-sal/sal-dom-api/pom.xml b/opendaylight/md-sal/sal-dom-api/pom.xml
index 68aca9879bbd48365ca21c7fb7223fd1eb3fa0ce..ec20cc7411f1eb21bc56aba036fbe2c6b38a7009 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/pom.xml
+++ b/opendaylight/md-sal/sal-dom-api/pom.xml
@@ -13,6 +13,11 @@
   <version>1.11.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <version>1.11.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 

+  <properties>
+    <!-- FIXME: Workaround for https://issues.apache.org/jira/browse/ARIES-1923 -->
+    <maven.compiler.release>10</maven.compiler.release>
+  </properties>
+

   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java
index 6e11c5f5bf5d469509584c56c83711509ccb3c1f..d7f9bdc300cd1ab0d1da1d49ba386803aa8e76d4 100755 (executable)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java
@@ -15,6 +15,7 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;


@@ -132,12 +133,16 @@ final class DOMDataBrokerTransactionChainImpl extends
         listener.onTransactionChainSuccessful(this);
     }
 
         listener.onTransactionChainSuccessful(this);
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private void transactionCompleted() {
         if (COUNTER_UPDATER.decrementAndGet(this) == 0 && state == State.CLOSING) {
             finishClose();
         }
     }
 
     private void transactionCompleted() {
         if (COUNTER_UPDATER.decrementAndGet(this) == 0 && state == State.CLOSING) {
             finishClose();
         }
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private void transactionFailed(final DOMDataWriteTransaction tx, final Throwable cause) {
         state = State.FAILED;
         LOG.debug("Transaction chain {} failed.", this, cause);
     private void transactionFailed(final DOMDataWriteTransaction tx, final Throwable cause) {
         state = State.FAILED;
         LOG.debug("Transaction chain {} failed.", this, cause);

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransaction.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransaction.java
index e2bf680014038563acb4eebe7d6e8391d6ab3f2f..b0a62c5dfd6d3faeaa3a899118a76a80e861bb14 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransaction.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransaction.java
@@ -20,6 +20,7 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.util.EnumMap;
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.EnumMap;
 import java.util.LinkedList;
 import java.util.Map;


@@ -186,8 +187,10 @@ class ShardedDOMDataBrokerDelegatingReadWriteTransaction implements DOMDataReadW
                 : DataTreeConfiguration.DEFAULT_OPERATIONAL;
     }
 
                 : DataTreeConfiguration.DEFAULT_OPERATIONAL;
     }
 

+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")

     private static void applyModificationHistoryToSnapshot(final DataTreeModification dataTreeModification,
     private static void applyModificationHistoryToSnapshot(final DataTreeModification dataTreeModification,

-                                                    final Queue<Modification> modificationHistory) {
+                                                           final Queue<Modification> modificationHistory) {

         while (!modificationHistory.isEmpty()) {
             final Modification modification = modificationHistory.poll();
             switch (modification.getOperation()) {
         while (!modificationHistory.isEmpty()) {
             final Modification modification = modificationHistory.poll();
             switch (modification.getOperation()) {

diff --git a/opendaylight/model/pom.xml b/opendaylight/model/pom.xml
index 04660d894b802929b4ed86cfc04af52bd3c9f88d..4779f34baa24f7781a747d68fff44ed5f27bfa92 100644 (file)
--- a/opendaylight/model/pom.xml
+++ b/opendaylight/model/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>

-        <version>5.0.2</version>
+        <version>6.0.0</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index e88024aed2828e69ccbfd1a8dde99bb5fae1fe26..4c8f065d41fdfc4a0baac2d06010dde7e6f725e4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>5.0.2</version>
+    <version>6.0.0</version>

     <relativePath/>
   </parent>
   <groupId>org.opendaylight.controller</groupId>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.controller</groupId>