Fix deprecation warnings in RangeGenerators

Propagate @Deprecated annotation outward, removing most of the warnings.

Change-Id: I4c4da282bfe4fca1b43c00d2826e3161ac288a2e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit b1aacfe534ad030562fc02d6c10af5c6db00c279)

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BigDecimalRangeGenerator.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BigDecimalRangeGenerator.java
index 1c0d0afa351428aa2b39ba4d71c4e9ac7a7700b6..185cf49fe38d168be94a2f123fa74f89cbbe98d4 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BigDecimalRangeGenerator.java
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BigDecimalRangeGenerator.java
@@ -32,6 +32,7 @@ final class BigDecimalRangeGenerator extends AbstractBigRangeGenerator<BigDecima
     }
 
     @Override
+    @Deprecated
     protected BigDecimal convert(final Number value) {
         if (value instanceof BigInteger) {
             return new BigDecimal((BigInteger)value);

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BigIntegerRangeGenerator.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BigIntegerRangeGenerator.java
index fa8020cfb1c953e2927660f43bf7ac1723b0af37..9bb55a291bd781b27307d6074c71add6a5cea7e7 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BigIntegerRangeGenerator.java
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BigIntegerRangeGenerator.java
@@ -30,12 +30,13 @@ final class BigIntegerRangeGenerator extends AbstractBigRangeGenerator<BigIntege
         final long l = value.longValue();
         if (value.equals(BigInteger.valueOf(l))) {
             return "java.math.BigInteger.valueOf(" + l + "L)";
-        } else {
-            return "new java.math.BigInteger(\"" + value.toString() + "\")";
         }
+
+        return "new java.math.BigInteger(\"" + value.toString() + "\")";
     }
 
     @Override
+    @Deprecated
     protected BigInteger convert(final Number value) {
         return BigInteger.valueOf(value.longValue());
     }

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ByteRangeGenerator.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ByteRangeGenerator.java
index f3861669325e4282476d8c4262424c2f26762c44..83c26829f0ac9c24f27ce5843091b07b0a95cab0 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ByteRangeGenerator.java
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ByteRangeGenerator.java
@@ -13,6 +13,7 @@ final class ByteRangeGenerator extends AbstractSubIntegerRangeGenerator<Byte> {
     }
 
     @Override
+    @Deprecated
     protected Byte convert(final Number value) {
         return value.byteValue();
     }

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/IntegerRangeGenerator.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/IntegerRangeGenerator.java
index cb9fd7935f53c779194b3a405981f3234e0c356b..ab3ddaee11d88f9cb7b8ca8087555bf58046bbd5 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/IntegerRangeGenerator.java
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/IntegerRangeGenerator.java
@@ -18,6 +18,7 @@ final class IntegerRangeGenerator extends AbstractPrimitiveRangeGenerator<Intege
     }
 
     @Override
+    @Deprecated
     protected Integer convert(final Number value) {
         return value.intValue();
     }

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/LongRangeGenerator.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/LongRangeGenerator.java
index c41a3095315470e19bfbc305795ba8eb983cf052..a1c78c89bb11f1fa859ca9d3ac3eca8a1c39aae1 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/LongRangeGenerator.java
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/LongRangeGenerator.java
@@ -19,6 +19,7 @@ final class LongRangeGenerator extends AbstractPrimitiveRangeGenerator<Long> {
     }
 
     @Override
+    @Deprecated
     protected Long convert(final Number value) {
         return value.longValue();
     }

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ShortRangeGenerator.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ShortRangeGenerator.java
index 337c79a85c9040fa8817e01280eb69ecf00dda80..772e31034bf609212e7ab482e6243a0b73d7fadb 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ShortRangeGenerator.java
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ShortRangeGenerator.java
@@ -13,6 +13,7 @@ final class ShortRangeGenerator extends AbstractSubIntegerRangeGenerator<Short>
     }
 
     @Override
+    @Deprecated
     protected Short convert(final Number value) {
         return value.shortValue();
     }

diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BigDecimalRangeGeneratorTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BigDecimalRangeGeneratorTest.java
index 71cb778666d617da30428b53c5b407c363f3c0ef..c732c65b910e2e181c1aa31bc5204262a841b73e 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BigDecimalRangeGeneratorTest.java
+++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BigDecimalRangeGeneratorTest.java
@@ -13,12 +13,12 @@ import static org.junit.Assert.assertNotNull;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import org.junit.Test;
-import org.opendaylight.mdsal.binding.java.api.generator.BigDecimalRangeGenerator;
 
 public class BigDecimalRangeGeneratorTest {
 
     @Test
-    public void convertTest() throws Exception {
+    @Deprecated
+    public void convertTest() {
         BigDecimalRangeGenerator generator = new BigDecimalRangeGenerator();
         assertEquals(BigDecimal.valueOf(1L), generator.convert(1L));
         assertEquals(BigDecimal.valueOf(1), generator.convert(new BigInteger("1")));

diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/ByteRangeGeneratorTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/ByteRangeGeneratorTest.java
index 1fdc198af15da06737ed81f8938f632d8402b1d7..178f514cd151ab9db5c28ca65ff18a4fb13a6052 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/ByteRangeGeneratorTest.java
+++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/ByteRangeGeneratorTest.java
@@ -10,12 +10,12 @@ package org.opendaylight.mdsal.binding.java.api.generator;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.opendaylight.mdsal.binding.java.api.generator.ByteRangeGenerator;
 
 public class ByteRangeGeneratorTest {
 
     @Test
-    public void convertTest() throws Exception {
+    @Deprecated
+    public void convertTest() {
         assertTrue(new ByteRangeGenerator().convert(1L).equals(new Long(1L).byteValue()));
     }
 }
\ No newline at end of file

diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/IntegerRangeGeneratorTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/IntegerRangeGeneratorTest.java
index 535f645223a3b184695ec4bb000abf4d30970cc4..2a818286addd774d89cf03a6303b0a5768560e12 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/IntegerRangeGeneratorTest.java
+++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/IntegerRangeGeneratorTest.java
@@ -10,12 +10,12 @@ package org.opendaylight.mdsal.binding.java.api.generator;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.opendaylight.mdsal.binding.java.api.generator.IntegerRangeGenerator;
 
 public class IntegerRangeGeneratorTest {
 
     @Test
-    public void convertTest() throws Exception {
+    @Deprecated
+    public void convertTest() {
         assertTrue(new IntegerRangeGenerator().convert(1L).equals(new Long(1L).intValue()));
     }
 }
\ No newline at end of file

diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/LongRangeGeneratorTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/LongRangeGeneratorTest.java
index 620ea3a62d35aa1fd440aa8a4ae0c89f3602e742..79ec9791a938187fb9f11367dd646508109a7df5 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/LongRangeGeneratorTest.java
+++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/LongRangeGeneratorTest.java
@@ -10,12 +10,12 @@ package org.opendaylight.mdsal.binding.java.api.generator;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.opendaylight.mdsal.binding.java.api.generator.LongRangeGenerator;
 
 public class LongRangeGeneratorTest {
 
     @Test
-    public void convertTest() throws Exception {
+    @Deprecated
+    public void convertTest() {
         assertTrue(new LongRangeGenerator().convert(1).equals(new Integer(1).longValue()));
     }
 }
\ No newline at end of file

diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/ShortRangeGeneratorTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/ShortRangeGeneratorTest.java
index f5e89c5d509aad8e5dcf4e1e1cc5d9538edd6163..8d0fff15982eb072ad4a203472e1f87da6521676 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/ShortRangeGeneratorTest.java
+++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/ShortRangeGeneratorTest.java
@@ -10,12 +10,12 @@ package org.opendaylight.mdsal.binding.java.api.generator;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.opendaylight.mdsal.binding.java.api.generator.ShortRangeGenerator;
 
 public class ShortRangeGeneratorTest {
 
     @Test
-    public void convertTest() throws Exception {
+    @Deprecated
+    public void convertTest() {
         assertTrue(new ShortRangeGenerator().convert(1L).equals(new Long(1L).shortValue()));
     }
 }
\ No newline at end of file