Adopt odlparent-10.0.0/yangtools-8.0.0-SNAPSHOT

[mdsal.git] / binding / mdsal-binding-java-api-generator / src / main / java / org / opendaylight / mdsal / binding / java / api / generator / AbstractRangeGenerator.java

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractRangeGenerator.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractRangeGenerator.java
index 600219c32128ef23595f5012ee31c7307cdc1021..27c580f9af18f29306e8c8c1a6d111bb7f925863 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractRangeGenerator.java
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractRangeGenerator.java
@@ -35,12 +35,15 @@ abstract class AbstractRangeGenerator<T extends Number & Comparable<T>> {
         addGenerator(b, new ShortRangeGenerator());
         addGenerator(b, new IntegerRangeGenerator());
         addGenerator(b, new LongRangeGenerator());
-        addGenerator(b, new BigDecimalRangeGenerator());
-        addGenerator(b, new BigIntegerRangeGenerator());
+        addGenerator(b, new Decimal64RangeGenerator());
+        addGenerator(b, new Uint8RangeGenerator());
+        addGenerator(b, new Uint16RangeGenerator());
+        addGenerator(b, new Uint32RangeGenerator());
+        addGenerator(b, new Uint64RangeGenerator());
         GENERATORS = b.build();
     }
 
-    private final Class<T> type;
+    private final @NonNull Class<T> type;
 
     protected AbstractRangeGenerator(final Class<T> typeClass) {
         this.type = requireNonNull(typeClass);
@@ -120,7 +123,7 @@ abstract class AbstractRangeGenerator<T extends Number & Comparable<T>> {
     protected abstract @NonNull String generateRangeCheckerImplementation(@NonNull String checkerName,
             @NonNull RangeConstraint<?> constraints, Function<Class<?>, String> classImporter);
 
-    private static String rangeCheckerName(final String member) {
+    private static @NonNull String rangeCheckerName(final String member) {
         return "check" + member + "Range";
     }
 
@@ -130,6 +133,10 @@ abstract class AbstractRangeGenerator<T extends Number & Comparable<T>> {
     }
 
     String generateRangeCheckerCall(final @NonNull String member, final @NonNull String valueReference) {
-        return rangeCheckerName(member) + '(' + valueReference + ");\n";
+        return rangeCheckerName(member) + '(' + valueReference + primitiveRef() + ");\n";
+    }
+
+    String primitiveRef() {
+        return "";
     }
 }