From 5f131b982326cf907b8d4c3205752e644dfbee17 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Wed, 30 Nov 2022 18:19:40 +0200
Subject: [PATCH] Remove thread sleeps when trying to load config files and
 removed principal from Exception Handling Controller

---
 .../ControllerErrorHandler.java               |  4 ++-
 .../configloaders/DefaultConfigLoader.java    | 32 -------------------
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java
index 381f86972..aed793614 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java
@@ -1,9 +1,11 @@
 package eu.eudat.controllers.controllerhandler;
 
 
+import eu.eudat.logic.security.claims.ClaimedAuthorities;
 import eu.eudat.models.data.helpers.responses.ResponseItem;
 import eu.eudat.models.data.security.Principal;
 import eu.eudat.types.ApiMessageCode;
+import eu.eudat.types.Authorities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
@@ -25,7 +27,7 @@ public class ControllerErrorHandler {
     @ExceptionHandler(Exception.class)
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ResponseBody
-    public ResponseItem<Exception> processValidationError(Principal principal, Exception ex) throws Exception {
+    public ResponseItem<Exception> processValidationError( Exception ex) throws Exception {
         logger.error(ex.getMessage(), ex);
         return new ResponseItem<Exception>().message(ex.getMessage()).status(ApiMessageCode.DEFAULT_ERROR_MESSAGE);
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/DefaultConfigLoader.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/DefaultConfigLoader.java
index 15c04e898..a1d65877c 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/DefaultConfigLoader.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/DefaultConfigLoader.java
@@ -169,14 +169,6 @@ public class DefaultConfigLoader implements ConfigLoader {
         if (externalUrls == null) {
             externalUrls = new ExternalUrls();
             this.setExternalUrls();
-        } else {
-            while (externalUrls.getMaxresults() == null) {
-                try {
-                    Thread.sleep(100L);
-                } catch (InterruptedException e) {
-                    logger.error(e.getMessage(), e);
-                }
-            }
         }
         return externalUrls;
     }
@@ -185,14 +177,6 @@ public class DefaultConfigLoader implements ConfigLoader {
         if (rdaProperties == null) {
             rdaProperties = new ArrayList<>();
             this.setRdaProperties();
-        } else {
-            while (rdaProperties.size() == 0) {
-                try {
-                    Thread.sleep(100L);
-                } catch (InterruptedException e) {
-                    logger.error(e.getMessage(), e);
-                }
-            }
         }
         return rdaProperties;
     }
@@ -211,14 +195,6 @@ public class DefaultConfigLoader implements ConfigLoader {
         if (configurableProviders == null) {
             configurableProviders = new ConfigurableProviders();
             this.setConfigurableProviders();
-        } else {
-            while (configurableProviders.getProviders().size() == 0) {
-                try {
-                    Thread.sleep(100L);
-                } catch (InterruptedException e) {
-                    logger.error(e.getMessage(), e);
-                }
-            }
         }
         return configurableProviders;
     }
@@ -227,14 +203,6 @@ public class DefaultConfigLoader implements ConfigLoader {
         if (keyToSourceMap == null) {
             keyToSourceMap = new HashMap<>();
             this.setKeyToSourceMap();
-        } else {
-            while (keyToSourceMap.size() == 0) {
-                try {
-                    Thread.sleep(100L);
-                } catch (InterruptedException e) {
-                    logger.error(e.getMessage(), e);
-                }
-            }
         }
         return keyToSourceMap;
     }