From: Maros Marsalek <mmarsale@cisco.com>
Date: Thu, 26 May 2016 12:24:00 +0000 (+0200)
Subject: Expect null in ReflexChildWriterCustomizer
X-Git-Tag: v1.17.01-RC0~282
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=92dd7844582fd9ea01c5254832aab1aab9bad4e9;p=hc2vpp.git

Expect null in ReflexChildWriterCustomizer

Change-Id: I41311f840bb5e5cdb8911353763fa3c9feb8735a
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---

diff --git a/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/write/ReflexiveChildWriterCustomizer.java b/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/write/ReflexiveChildWriterCustomizer.java
index ba67e560c..79cdf62c3 100644
--- a/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/write/ReflexiveChildWriterCustomizer.java
+++ b/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/write/ReflexiveChildWriterCustomizer.java
@@ -46,8 +46,8 @@ public class ReflexiveChildWriterCustomizer<C extends DataObject> extends NoopWr
 
         try {
             return method.isPresent()
-                ? Optional.of((C) method.get().invoke(parentData))
-                : Optional.<C>absent();
+                ? Optional.fromNullable((C) method.get().invoke(parentData))
+                : Optional.absent();
         } catch (IllegalAccessException | InvocationTargetException e) {
             throw new IllegalArgumentException("Unable to get " + currentType + " from " + parentData, e);
         }