From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 7 Apr 2020 09:52:49 +0000 (+0200)
Subject: Bump byte-buddy to 1.10.9
X-Git-Tag: v6.0.0~78
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=47ed66475387e149a10bbd93d351d8c2e91e8afc;p=mdsal.git

Bump byte-buddy to 1.10.9

https://github.com/raphw/byte-buddy/releases/tag/byte-buddy-1.10.8
https://github.com/raphw/byte-buddy/releases/tag/byte-buddy-1.10.9

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

diff --git a/binding/mdsal-binding-dom-codec/pom.xml b/binding/mdsal-binding-dom-codec/pom.xml
index 667b635bdf..c71e30616a 100644
--- a/binding/mdsal-binding-dom-codec/pom.xml
+++ b/binding/mdsal-binding-dom-codec/pom.xml
@@ -29,7 +29,7 @@
             <!-- We are going to shade this -->
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
-            <version>1.10.7</version>
+            <version>1.10.9</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationCodecContext.java
index 6553f70782..3388a9a2f0 100644
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationCodecContext.java
@@ -43,7 +43,16 @@ import org.opendaylight.yangtools.yang.model.api.NotificationDefinition;
 final class NotificationCodecContext<D extends DataObject & Notification>
         extends DataObjectCodecContext<D, NotificationDefinition> {
     private static final Generic EVENT_INSTANT_AWARE = TypeDefinition.Sort.describe(EventInstantAware.class);
-    private static final MethodDescription EVENT_INSTANT = EVENT_INSTANT_AWARE.getDeclaredMethods().getOnly();
+
+    private static final String EVENT_INSTANT_NAME;
+    private static final Generic EVENT_INSTANT_RETTYPE;
+
+    static {
+        final MethodDescription eventInstance = EVENT_INSTANT_AWARE.getDeclaredMethods().getOnly();
+        EVENT_INSTANT_NAME = eventInstance.getName();
+        EVENT_INSTANT_RETTYPE = eventInstance.getReturnType();
+    }
+
     private static final Generic BB_DOCC = TypeDefinition.Sort.describe(DataObjectCodecContext.class);
     private static final Generic BB_NNC = TypeDefinition.Sort.describe(NormalizedNodeContainer.class);
     private static final Generic BB_I = TypeDefinition.Sort.describe(Instant.class);
@@ -73,7 +82,8 @@ final class NotificationCodecContext<D extends DataObject & Notification>
                     .defineConstructor(Opcodes.ACC_PUBLIC | Opcodes.ACC_SYNTHETIC)
                         .withParameters(BB_DOCC, BB_NNC, BB_I)
                         .intercept(ConstructorImplementation.INSTANCE)
-                    .define(EVENT_INSTANT).intercept(EventInstantImplementation.INSTANCE)
+                    .defineMethod(EVENT_INSTANT_NAME, EVENT_INSTANT_RETTYPE, Opcodes.ACC_PUBLIC | Opcodes.ACC_SYNTHETIC)
+                        .intercept(EventInstantImplementation.INSTANCE)
                     .make());
             });