From 56ec76a91eee18515dd6e6cb731e19b1ff0fa203 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 28 Apr 2020 21:56:30 +0200
Subject: [PATCH] Remove some calls to deprecated code
---
.../caosdb/server/accessControl/UserSources.java | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/caosdb/server/accessControl/UserSources.java b/src/main/java/caosdb/server/accessControl/UserSources.java
index a3f35c11..d0f707eb 100644
--- a/src/main/java/caosdb/server/accessControl/UserSources.java
+++ b/src/main/java/caosdb/server/accessControl/UserSources.java
@@ -31,6 +31,7 @@ import caosdb.server.utils.ServerMessages;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
@@ -72,12 +73,14 @@ public class UserSources extends HashMap<String, UserSource> {
@SuppressWarnings("unchecked")
final Class<? extends UserSource> clazz =
(Class<? extends UserSource>) Class.forName(className);
- this.put(clazz.newInstance());
- } catch (final ClassNotFoundException e) {
- logger.error("LOAD_USER_SOURCE", e);
- } catch (final InstantiationException e) {
- logger.error("LOAD_USER_SOURCE", e);
- } catch (final IllegalAccessException e) {
+ this.put(clazz.getDeclaredConstructor().newInstance());
+ } catch (IllegalArgumentException
+ | InvocationTargetException
+ | NoSuchMethodException
+ | SecurityException
+ | ClassNotFoundException
+ | InstantiationException
+ | IllegalAccessException e) {
logger.error("LOAD_USER_SOURCE", e);
}
}
--
GitLab