Binding Generator implementation & decomposition

- fixes possible NPE using Java 1.8 Optional

Change-Id: Ib8f91d85668baf738ba4d9e5c2c613d3c19aaa2c
Signed-off-by: Martin Ciglan <mciglan@cisco.com>
(cherry picked from commit 0a64a9c19ee3b7755164f4bd73ee855203345524)

diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/DocumentedType.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/DocumentedType.java
index d518ce7d2ccf53b3f571bded488d622df9df5203..8776b19b60deddead80851a8f956c8342e0f2499 100644 (file)
--- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/DocumentedType.java
+++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/DocumentedType.java
@@ -9,8 +9,8 @@
 package org.opendaylight.mdsal.binding.javav2.model.api;
 
 import com.google.common.annotations.Beta;
-import com.google.common.base.Optional;
 import java.util.List;
+import java.util.Optional;
 import org.opendaylight.yangtools.yang.common.QName;
 
 /**

diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/EnumerationBuilderImpl.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/EnumerationBuilderImpl.java
index a034125ff4484c94b1af4ae837fa4e9326856b1d..a75fb64d5002c787d0b0951b8c6e20ad6b2bbbe6 100644 (file)
--- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/EnumerationBuilderImpl.java
+++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/EnumerationBuilderImpl.java
@@ -9,10 +9,10 @@
 package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder;
 
 import com.google.common.annotations.Beta;
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -241,7 +241,7 @@ public class EnumerationBuilderImpl extends AbstractBaseType implements EnumBuil
 
         @Override
         public Optional<String> getDescription() {
-            return Optional.of(this.description);
+            return Optional.ofNullable(this.description);
         }
 
         @Override
@@ -279,7 +279,7 @@ public class EnumerationBuilderImpl extends AbstractBaseType implements EnumBuil
 
         @Override
         public Optional<String> getReference() {
-            return Optional.of(this.reference);
+            return Optional.ofNullable(this.reference);
         }
 
         @Override

diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java
index 1d50cc029acf9c5872ada4a8fff1f06ace9ad50e..019bc522696215dcafafc23fa1a19c2703fc185f 100644 (file)
--- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java
+++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java
@@ -9,10 +9,10 @@
 package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder;
 
 import com.google.common.annotations.Beta;
-import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
+import java.util.Optional;
 import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty;
 import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject;
 import org.opendaylight.mdsal.binding.javav2.model.api.ParameterizedType;
@@ -276,15 +276,12 @@ public final class GeneratedTOBuilderImpl extends AbstractGeneratedTypeBuilder<G
 
         @Override
         public Optional<String> getDescription() {
-            if (description == null) {
-                return Optional.absent();
-            }
-            return Optional.of(description);
+            return Optional.ofNullable(this.description);
         }
 
         @Override
         public Optional<String> getReference() {
-            return Optional.of(reference);
+            return Optional.ofNullable(this.reference);
         }
 
         @Override

diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java
index 4c02cadeb4d94fb05e8c9c33657f62b8c1847580..ae12dab54502b0bb443d677f95e4bb7e5c4d2150 100644 (file)
--- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java
+++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java
@@ -9,8 +9,8 @@
 package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder;
 
 import com.google.common.annotations.Beta;
-import com.google.common.base.Optional;
 import java.util.List;
+import java.util.Optional;
 import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType;
 import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTypeBuilder;
 import org.opendaylight.yangtools.yang.common.QName;
@@ -103,12 +103,12 @@ public final class GeneratedTypeBuilderImpl extends AbstractGeneratedTypeBuilder
 
         @Override
         public Optional<String> getDescription() {
-            return Optional.of(description);
+            return Optional.ofNullable(this.description);
         }
 
         @Override
         public Optional<String> getReference() {
-            return Optional.of(reference);
+            return Optional.ofNullable(this.reference);
         }
 
         @Override