From 6abd71a52dde63850cd996f7b5866b8b0a1c8fca Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 4 Aug 2020 13:07:40 +0200
Subject: [PATCH] Migrate users of Class.newInstance()

This method has been deprecated for removal since Java 9, migrate
the three call sites.

Change-Id: I7527ae2958c22e4f83e436c3293cc06abc1e4f65
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../genius/mdsalutil/ericmatches/EricMatchInfoHelper.java     | 4 ++--
 .../genius/mdsalutil/matches/MatchInfoHelper.java             | 4 ++--
 .../genius/mdsalutil/nxmatches/NxMatchInfoHelper.java         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/ericmatches/EricMatchInfoHelper.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/ericmatches/EricMatchInfoHelper.java
index 7199f341b..3032cc638 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/ericmatches/EricMatchInfoHelper.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/ericmatches/EricMatchInfoHelper.java
@@ -39,8 +39,8 @@ public abstract class EricMatchInfoHelper<T extends DataObject, B extends Builde
     public void createInnerMatchBuilder(Map<Class<?>, Object> mapMatchBuilder) {
         populateBuilder((B) mapMatchBuilder.computeIfAbsent(builderClass, key -> {
             try {
-                return builderClass.newInstance();
-            } catch (InstantiationException | IllegalAccessException e) {
+                return builderClass.getDeclaredConstructor().newInstance();
+            } catch (ReflectiveOperationException e) {
                 throw new IllegalStateException("Unable to create an instance of " + builderClass, e);
             }
         }));
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchInfoHelper.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchInfoHelper.java
index 2edd7bd2e..db23577ad 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchInfoHelper.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchInfoHelper.java
@@ -28,8 +28,8 @@ public abstract class MatchInfoHelper<T extends DataObject, B extends Builder<T>
     public void createInnerMatchBuilder(Map<Class<?>, Object> mapMatchBuilder) {
         populateBuilder((B) mapMatchBuilder.computeIfAbsent(builderClass, key -> {
             try {
-                return builderClass.newInstance();
-            } catch (InstantiationException | IllegalAccessException e) {
+                return builderClass.getDeclaredConstructor().newInstance();
+            } catch (ReflectiveOperationException e) {
                 throw new IllegalStateException("Unable to create an instance of " + builderClass, e);
             }
         }));
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/nxmatches/NxMatchInfoHelper.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/nxmatches/NxMatchInfoHelper.java
index 4e26af4bc..6ab62448c 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/nxmatches/NxMatchInfoHelper.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/nxmatches/NxMatchInfoHelper.java
@@ -42,8 +42,8 @@ public abstract class NxMatchInfoHelper<T extends DataObject, B extends Builder<
     public void createInnerMatchBuilder(Map<Class<?>, Object> mapMatchBuilder) {
         populateBuilder((B) mapMatchBuilder.computeIfAbsent(builderClass, key -> {
             try {
-                return builderClass.newInstance();
-            } catch (InstantiationException | IllegalAccessException e) {
+                return builderClass.getDeclaredConstructor().newInstance();
+            } catch (ReflectiveOperationException e) {
                 throw new IllegalStateException("Unable to create an instance of " + builderClass, e);
             }
         }));
-- 
2.36.6