issue when starting sormas-rest

Author: Pa-Touche

sormas-backend/src/main/java/de/symeda/sormas/api/FacadeProvider.java

@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2018 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *******************************************************************************/
+package de.symeda.sormas.api;
+
+/**
+ * This class hides the one in sormas-api.
+ *
+ * @deprecated FacadeProvider should not be used by the business logic because the facades can be accessed locally
+ */
+@Deprecated
+public final class FacadeProvider {
+
+	private FacadeProvider() {
+		//NOOP
+	}
+
+	public static void doNotUseInBackend() {
+		throw new java.lang.IllegalStateException();
+	}
+}

sormas-backend/src/main/java/de/symeda/sormas/backend/audit/AuditLoggerInterceptor.java

@@ -24,6 +24,7 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
+import de.symeda.sormas.backend.util.BackendFacadeProvider;
 import org.apache.commons.collections4.SetUtils;
 import org.hl7.fhir.r4.model.AuditEvent;
 import org.reflections.Reflections;
@@ -194,18 +195,8 @@ private Object backendAuditing(InvocationContext context, Method calledMethod) t
 
 		Date end = Calendar.getInstance(TimeZone.getDefault()).getTime();
 
-		getAuditLogger().logBackendCall(calledMethod, parameters, result, start, end);
+		BackendFacadeProvider.getAuditLogger().logBackendCall(calledMethod, parameters, result, start, end);
 		return result;
 	}
 
-	private AuditLoggerEjb.AuditLoggerEjbLocal getAuditLogger() {
-		try {
-			InitialContext ctx = new InitialContext();
-			// Use java:module for LOCAL lookup within same EJB module
-			return (AuditLoggerEjb.AuditLoggerEjbLocal) ctx.lookup("java:module/AuditLoggerEjb");
-		} catch (NamingException e) {
-			throw new RuntimeException("Failed to lookup AuditLoggerEjb: " + e.getMessage(), e);
-		}
-	}
-
 }

sormas-backend/src/main/java/de/symeda/sormas/backend/user/CurrentUserService.java

@@ -30,7 +30,7 @@
 import de.symeda.sormas.backend.location.Location;
 import de.symeda.sormas.backend.util.ModelConstants;
 
-@Stateless
+@Stateless(name = "CurrentUserService")
 @LocalBean
 @AuditIgnore
 public class CurrentUserService {

sormas-backend/src/main/java/de/symeda/sormas/backend/util/BackendFacadeProvider.java

@@ -0,0 +1,55 @@
+package de.symeda.sormas.backend.util;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import de.symeda.sormas.backend.audit.AuditLoggerEjb;
+import de.symeda.sormas.backend.user.CurrentUserService;
+
+public class BackendFacadeProvider {
+
+	private final InitialContext ic;
+
+	private static volatile BackendFacadeProvider instance;
+
+	protected BackendFacadeProvider() {
+		if (instance != null) {
+			throw new IllegalStateException("BackendFacadeProvider instance already created");
+		}
+
+		try {
+			ic = new InitialContext();
+		} catch (NamingException e) {
+			throw new RuntimeException(e.getMessage(), e);
+		}
+	}
+
+	public static BackendFacadeProvider getInstance() {
+		if (instance == null) {
+			synchronized (BackendFacadeProvider.class) {
+				if (instance == null) {
+					instance = new BackendFacadeProvider();
+				}
+			}
+		}
+		return instance;
+	}
+
+	public static AuditLoggerEjb.AuditLoggerEjbLocal getAuditLogger() {
+		try {
+			// Use java:module for LOCAL lookup within same EJB module
+			return (AuditLoggerEjb.AuditLoggerEjbLocal) getInstance().ic.lookup("java:module/AuditLoggerEjb");
+		} catch (NamingException e) {
+			throw new RuntimeException("Failed to lookup AuditLoggerEjb: " + e.getMessage(), e);
+		}
+	}
+
+	public static CurrentUserService getCurrentUserService() {
+		try {
+			// Use java:module for LOCAL lookup within same EJB module
+			return (CurrentUserService) getInstance().ic.lookup("java:module/CurrentUserService");
+		} catch (NamingException e) {
+			throw new RuntimeException("Failed to lookup AuditLoggerEjb: " + e.getMessage(), e);
+		}
+	}
+}

sormas-backend/src/main/java/de/symeda/sormas/backend/util/RightsAllowedInterceptor.java

@@ -40,8 +40,6 @@ public class RightsAllowedInterceptor {
 
 	@Resource
 	private SessionContext sessionContext;
-	@EJB
-	private CurrentUserService currentUserService;
 
 	private final Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -92,7 +90,7 @@ public Object checkRightsAllowed(InvocationContext context) throws Exception {
 					 * 1. It's slow due to the same reason that lead us to implementing this
 					 * 2. It wouldn't work anyway, because roles need to be initialized by user any javax annotation (e.g. @DeclareRoles)
 					 */
-				} else if (currentUserService.hasUserRight(userRightValues.get(right))) {
+				} else if (BackendFacadeProvider.getCurrentUserService().hasUserRight(userRightValues.get(right))) {
 					hasAnyRight = true;
 					break;
 				}