From 8a89b3da2959c3208ab74207e339cca5f1c48b0b Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 15 Feb 2017 17:01:02 +0000
Subject: [PATCH] Fix calls to Class.newInstance() deprecated in Java 9
---
.../webapp/src/main/java/net/i2p/imagegen/IdenticonServlet.java | 2 +-
.../webapp/src/main/java/net/i2p/imagegen/QRServlet.java | 2 +-
.../src/src/i2p/susi/webmail/encoding/EncodingFactory.java | 2 +-
core/java/src/net/i2p/kademlia/KBucketSet.java | 2 +-
router/java/src/org/cybergarage/upnp/UPnP.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/apps/imagegen/imagegen/webapp/src/main/java/net/i2p/imagegen/IdenticonServlet.java b/apps/imagegen/imagegen/webapp/src/main/java/net/i2p/imagegen/IdenticonServlet.java
index 5628fb74b6..7cf6d0e3f0 100644
--- a/apps/imagegen/imagegen/webapp/src/main/java/net/i2p/imagegen/IdenticonServlet.java
+++ b/apps/imagegen/imagegen/webapp/src/main/java/net/i2p/imagegen/IdenticonServlet.java
@@ -88,7 +88,7 @@ public class IdenticonServlet extends HttpServlet {
if (cacheProvider != null) {
try {
Class<?> cacheClass = Class.forName(cacheProvider);
- this.cache = (IdenticonCache) cacheClass.newInstance();
+ this.cache = (IdenticonCache) cacheClass.getDeclaredConstructor().newInstance();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/apps/imagegen/imagegen/webapp/src/main/java/net/i2p/imagegen/QRServlet.java b/apps/imagegen/imagegen/webapp/src/main/java/net/i2p/imagegen/QRServlet.java
index e11f8d6272..272ac5a13d 100644
--- a/apps/imagegen/imagegen/webapp/src/main/java/net/i2p/imagegen/QRServlet.java
+++ b/apps/imagegen/imagegen/webapp/src/main/java/net/i2p/imagegen/QRServlet.java
@@ -89,7 +89,7 @@ public class QRServlet extends HttpServlet {
if (cacheProvider != null) {
try {
Class<?> cacheClass = Class.forName(cacheProvider);
- this.cache = (IdenticonCache) cacheClass.newInstance();
+ this.cache = (IdenticonCache) cacheClass.getDeclaredConstructor().newInstance();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/apps/susimail/src/src/i2p/susi/webmail/encoding/EncodingFactory.java b/apps/susimail/src/src/i2p/susi/webmail/encoding/EncodingFactory.java
index c2ede6cc69..c7b1ee0af9 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/encoding/EncodingFactory.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/encoding/EncodingFactory.java
@@ -51,7 +51,7 @@ public class EncodingFactory {
for( int i = 0; i < classNames.length; i++ ) {
try {
Class<?> c = Class.forName( classNames[i] );
- Encoding e = (Encoding)c.newInstance();
+ Encoding e = (Encoding) (c.getDeclaredConstructor().newInstance());
encodings.put( e.getName(), e );
Debug.debug( Debug.DEBUG, "Registered " + e.getClass().getName() );
}
diff --git a/core/java/src/net/i2p/kademlia/KBucketSet.java b/core/java/src/net/i2p/kademlia/KBucketSet.java
index f8ce16f195..d0d8ef3568 100644
--- a/core/java/src/net/i2p/kademlia/KBucketSet.java
+++ b/core/java/src/net/i2p/kademlia/KBucketSet.java
@@ -637,7 +637,7 @@ public class KBucketSet<T extends SimpleDataStructure> {
throw new IllegalArgumentException("bad length " + dlen + " > " + len);
T rv;
try {
- rv = (T) _us.getClass().newInstance();
+ rv = (T) _us.getClass().getDeclaredConstructor().newInstance();
} catch (Exception e) {
_log.error("fail", e);
throw new RuntimeException(e);
diff --git a/router/java/src/org/cybergarage/upnp/UPnP.java b/router/java/src/org/cybergarage/upnp/UPnP.java
index db5042a2d0..d4a8d4caa3 100644
--- a/router/java/src/org/cybergarage/upnp/UPnP.java
+++ b/router/java/src/org/cybergarage/upnp/UPnP.java
@@ -269,7 +269,7 @@ public class UPnP
if(parserClass[i]==null)
continue;
try {
- parser = (Parser) Class.forName(parserClass[i]).newInstance();
+ parser = (Parser) Class.forName(parserClass[i]).getDeclaredConstructor().newInstance();
return parser;
} catch (Throwable e) {
Debug.warning("Unable to load "+parserClass[i]+" as XMLParser due to "+e);
--
GitLab