Refactor getSysUserId into a Separate class

src/main/java/org/openelisglobal/common/rest/BaseRestController.java → src/main/java/org/openelisglobal/SysUserId/SysUserId.java

@@ -1,13 +1,11 @@
-package org.openelisglobal.common.rest;
+package org.openelisglobal.SysUserId;
 
 import javax.servlet.http.HttpServletRequest;
+
 import org.openelisglobal.common.action.IActionConstants;
 import org.openelisglobal.login.valueholder.UserSessionData;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BaseRestController implements IActionConstants {
 
+public class SysUserId implements IActionConstants{
     protected String getSysUserId(HttpServletRequest request) {
         UserSessionData usd = (UserSessionData) request.getSession().getAttribute(USER_SESSION_DATA);
         if (usd == null) {

src/main/java/org/openelisglobal/common/controller/BaseController.java

@@ -1,5 +1,6 @@
 package org.openelisglobal.common.controller;
 
+import org.openelisglobal.SysUserId.*;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.List;
@@ -23,12 +24,12 @@
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.Errors;
 import org.springframework.validation.FieldError;
-import org.springframework.validation.ObjectError;
+import org.springframework.validation.ObjectError; 
 import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.support.RequestContextUtils;
+import org.springframework.web.servlet.support.RequestContextUtils; 
 
 @Component
-public abstract class BaseController implements IActionConstants {
+public abstract class BaseController extends SysUserId  {
 
     // Request being autowired appears to be threadsafe because of how Spring
     // handles autowiring, despite all controllers being singletons
@@ -183,17 +184,6 @@ protected void setPageTitles(HttpServletRequest request, BaseForm form) {
         }
     }
 
-    protected String getSysUserId(HttpServletRequest request) {
-        UserSessionData usd = (UserSessionData) request.getSession().getAttribute(USER_SESSION_DATA);
-        if (usd == null) {
-            usd = (UserSessionData) request.getAttribute(USER_SESSION_DATA);
-            if (usd == null) {
-                return null;
-            }
-        }
-        return String.valueOf(usd.getSystemUserId());
-    }
-
     protected void setSuccessFlag(HttpServletRequest request, boolean success) {
         request.setAttribute(FWD_SUCCESS, success);
     }

src/main/java/org/openelisglobal/common/rest/DisplayListController.java

@@ -13,6 +13,7 @@
 import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
+import org.openelisglobal.SysUserId.SysUserId;
 import org.openelisglobal.common.action.IActionConstants;
 import org.openelisglobal.common.constants.Constants;
 import org.openelisglobal.common.rest.provider.bean.TestDisplayBean;
@@ -63,7 +64,7 @@
 
 @Controller
 @RequestMapping(value = "/rest/")
-public class DisplayListController extends BaseRestController {
+public class DisplayListController extends SysUserId {
     @Value("${org.itech.login.saml:false}")
     private Boolean useSAML;
 

src/main/java/org/openelisglobal/common/rest/provider/AllTestsForSampleTypeProviderRestController.java

@@ -19,8 +19,8 @@
 import java.util.List;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
+import org.openelisglobal.SysUserId.SysUserId;
 import org.openelisglobal.common.log.LogEvent;
-import org.openelisglobal.common.rest.BaseRestController;
 import org.openelisglobal.spring.util.SpringContext;
 import org.openelisglobal.test.valueholder.Test;
 import org.openelisglobal.typeofsample.service.TypeOfSampleService;
@@ -33,7 +33,7 @@
 
 @RestController
 @RequestMapping("/rest")
-public class AllTestsForSampleTypeProviderRestController extends BaseRestController {
+public class AllTestsForSampleTypeProviderRestController extends SysUserId {
 
     private TypeOfSampleService typeOfSampleService = SpringContext.getBean(TypeOfSampleService.class);
 

src/main/java/org/openelisglobal/common/rest/provider/PatientSearchRestController.java

@@ -6,12 +6,12 @@
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.validator.GenericValidator;
+import org.openelisglobal.SysUserId.SysUserId;
 import org.openelisglobal.common.provider.query.PatientSearchResults;
 import org.openelisglobal.common.provider.query.PatientSearchResultsForm;
 import org.openelisglobal.common.provider.query.workerObjects.PatientSearchLocalAndExternalWorker;
 import org.openelisglobal.common.provider.query.workerObjects.PatientSearchLocalWorker;
 import org.openelisglobal.common.provider.query.workerObjects.PatientSearchWorker;
-import org.openelisglobal.common.rest.BaseRestController;
 import org.openelisglobal.common.rest.util.PatientSearchResultsPaging;
 import org.openelisglobal.common.util.ConfigurationProperties;
 import org.openelisglobal.common.util.ConfigurationProperties.Property;
@@ -35,7 +35,7 @@
 
 @Controller
 @RequestMapping(value = "/rest/")
-public class PatientSearchRestController extends BaseRestController {
+public class PatientSearchRestController extends SysUserId {
 
     @Autowired
     SampleService sampleService;

src/main/java/org/openelisglobal/common/rest/provider/PendingAnalysisForTestProviderRestController.java

@@ -20,10 +20,10 @@
 import org.apache.commons.validator.GenericValidator;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
+import org.openelisglobal.SysUserId.SysUserId;
 import org.openelisglobal.analysis.service.AnalysisService;
 import org.openelisglobal.analysis.valueholder.Analysis;
 import org.openelisglobal.common.log.LogEvent;
-import org.openelisglobal.common.rest.BaseRestController;
 import org.openelisglobal.common.services.IStatusService;
 import org.openelisglobal.common.services.StatusService;
 import org.openelisglobal.common.servlet.validation.AjaxServlet;
@@ -37,7 +37,7 @@
 
 @RestController
 @RequestMapping("/rest")
-public class PendingAnalysisForTestProviderRestController extends BaseRestController {
+public class PendingAnalysisForTestProviderRestController extends SysUserId {
 
     private static final List<Integer> NOT_STARTED;
     private static final List<Integer> TECH_REJECT;

src/main/java/org/openelisglobal/common/rest/provider/SampleEntryTestsForTypeProviderRestController.java

@@ -11,9 +11,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.validator.GenericValidator;
+import org.openelisglobal.SysUserId.SysUserId;
 import org.openelisglobal.common.action.IActionConstants;
 import org.openelisglobal.common.constants.Constants;
-import org.openelisglobal.common.rest.BaseRestController;
 import org.openelisglobal.common.util.IdValuePair;
 import org.openelisglobal.common.util.StringUtil;
 import org.openelisglobal.login.valueholder.UserSessionData;
@@ -38,7 +38,7 @@
 
 @Controller
 @RequestMapping(value = "/rest/")
-public class SampleEntryTestsForTypeProviderRestController extends BaseRestController {
+public class SampleEntryTestsForTypeProviderRestController extends SysUserId {
 
     private static String USER_TEST_SECTION_ID;
 

src/main/java/org/openelisglobal/notifications/rest/NotificationRestController.java

@@ -10,6 +10,7 @@
 import nl.martijndwars.webpush.PushService;
 import org.apache.http.HttpResponse;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.openelisglobal.SysUserId.SysUserId;
 import org.openelisglobal.login.valueholder.UserSessionData;
 import org.openelisglobal.notifications.dao.NotificationDAO;
 import org.openelisglobal.notifications.dao.NotificationSubscriptionDAO;
@@ -31,7 +32,7 @@
 
 @RequestMapping("/rest")
 @RestController
-public class NotificationRestController {
+public class NotificationRestController extends SysUserId {
 
     private final NotificationDAO notificationDAO;
     private final SystemUserService systemUserService;
@@ -211,14 +212,4 @@ public ResponseEntity<?> unsubscribe(HttpServletRequest request) {
         return ResponseEntity.ok().body("Unsubscribed successfully");
     }
 
-    protected String getSysUserId(HttpServletRequest request) {
-        UserSessionData usd = (UserSessionData) request.getSession().getAttribute(USER_SESSION_DATA);
-        if (usd == null) {
-            usd = (UserSessionData) request.getAttribute(USER_SESSION_DATA);
-            if (usd == null) {
-                return null;
-            }
-        }
-        return String.valueOf(usd.getSystemUserId());
-    }
 }

src/main/java/org/openelisglobal/patient/controller/rest/PatientManagementRestController.java

@@ -7,9 +7,9 @@
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.StaleObjectStateException;
+import org.openelisglobal.SysUserId.SysUserId;
 import org.openelisglobal.common.exception.LIMSRuntimeException;
 import org.openelisglobal.common.log.LogEvent;
-import org.openelisglobal.common.rest.BaseRestController;
 import org.openelisglobal.dataexchange.fhir.exception.FhirPersistanceException;
 import org.openelisglobal.dataexchange.fhir.exception.FhirTransformationException;
 import org.openelisglobal.dataexchange.fhir.service.FhirTransformService;
@@ -37,7 +37,7 @@
 
 @Controller
 @RequestMapping(value = "/rest/")
-public class PatientManagementRestController extends BaseRestController {
+public class PatientManagementRestController extends SysUserId {
     @Autowired
     SearchResultsService searchService;
     @Autowired

src/main/java/org/openelisglobal/program/controller/ProgramController.java

@@ -6,7 +6,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.validator.GenericValidator;
 import org.hl7.fhir.r4.model.Questionnaire;
-import org.openelisglobal.common.rest.BaseRestController;
+import org.openelisglobal.SysUserId.SysUserId;
 import org.openelisglobal.common.services.DisplayListService;
 import org.openelisglobal.common.services.DisplayListService.ListType;
 import org.openelisglobal.dataexchange.fhir.FhirUtil;
@@ -28,7 +28,7 @@
 
 @RestController
 @RequestMapping(value = "/rest")
-public class ProgramController extends BaseRestController {
+public class ProgramController extends SysUserId {
 
     @Autowired
     private FhirPersistanceService fhirPersistanceService;

src/main/java/org/openelisglobal/program/controller/cytology/CytologyController.java

@@ -7,7 +7,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
-import org.openelisglobal.common.rest.BaseRestController;
+
+import org.openelisglobal.SysUserId.SysUserId;
 import org.openelisglobal.program.bean.CytologyDashBoardCount;
 import org.openelisglobal.program.service.cytology.CytologyDisplayService;
 import org.openelisglobal.program.service.cytology.CytologySampleService;
@@ -27,7 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-public class CytologyController extends BaseRestController {
+public class CytologyController extends SysUserId {
 
     @Autowired
     private CytologySampleService cytologySampleService;

src/main/java/org/openelisglobal/program/controller/immunohistochemistry/ImmunohistochemistryController.java

@@ -7,7 +7,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
-import org.openelisglobal.common.rest.BaseRestController;
+
+import org.openelisglobal.SysUserId.SysUserId;
 import org.openelisglobal.program.bean.ImmunohistochemistryDashBoardCount;
 import org.openelisglobal.program.service.ImmunohistochemistryDisplayService;
 import org.openelisglobal.program.service.ImmunohistochemistrySampleService;
@@ -27,7 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-public class ImmunohistochemistryController extends BaseRestController {
+public class ImmunohistochemistryController extends SysUserId {
 
     @Autowired
     private ImmunohistochemistrySampleService immunohistochemistrySampleService;

src/main/java/org/openelisglobal/program/controller/pathology/PathologyController.java

@@ -7,7 +7,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
-import org.openelisglobal.common.rest.BaseRestController;
+
+import org.openelisglobal.SysUserId.SysUserId;
 import org.openelisglobal.program.bean.PathologyDashBoardCount;
 import org.openelisglobal.program.service.PathologyDisplayService;
 import org.openelisglobal.program.service.PathologySampleService;
@@ -27,7 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-public class PathologyController extends BaseRestController {
+public class PathologyController extends SysUserId {
 
     @Autowired
     private PathologySampleService pathologySampleService;

src/main/java/org/openelisglobal/qaevent/controller/rest/NonConformingEventsCorrectionActionRestController.java

@@ -7,6 +7,7 @@
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.validator.GenericValidator;
+import org.openelisglobal.SysUserId.SysUserId;
 import org.openelisglobal.common.services.DisplayListService;
 import org.openelisglobal.login.valueholder.UserSessionData;
 import org.openelisglobal.patient.action.bean.PatientSearch;
@@ -26,7 +27,7 @@
 
 @RestController
 @RequestMapping(value = "/rest")
-public class NonConformingEventsCorrectionActionRestController {
+public class NonConformingEventsCorrectionActionRestController extends SysUserId {
 
     private NCEventService ncEventService = SpringContext.getBean(NCEventService.class);
 
@@ -91,14 +92,4 @@ public ResponseEntity<?> updateNCECorretiveActionForm(@RequestBody NonConforming
         }
     }
 
-    protected String getSysUserId(HttpServletRequest request) {
-        UserSessionData usd = (UserSessionData) request.getSession().getAttribute(USER_SESSION_DATA);
-        if (usd == null) {
-            usd = (UserSessionData) request.getAttribute(USER_SESSION_DATA);
-            if (usd == null) {
-                return null;
-            }
-        }
-        return String.valueOf(usd.getSystemUserId());
-    }
 }

src/main/java/org/openelisglobal/qaevent/controller/rest/ReportNonConformEventsRestController.java

@@ -3,6 +3,8 @@
 import java.util.*;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
+
+import org.openelisglobal.SysUserId.SysUserId;
 import org.openelisglobal.common.exception.LIMSInvalidConfigurationException;
 import org.openelisglobal.common.provider.query.PatientSearchResults;
 import org.openelisglobal.common.rest.bean.NceSampleInfo;
@@ -33,7 +35,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-public class ReportNonConformEventsRestController {
+public class ReportNonConformEventsRestController  extends SysUserId {
 
     private final SampleService sampleService;
     private final SampleItemService sampleItemService;
@@ -171,20 +173,10 @@ private NceSampleInfo addSample(Sample sample) {
             sampleItemsList.add(sampleItemInfo);
         }
 
-        sampleInfo.setSampleItems(sampleItemsList);
+        sampleInfo.setSampleItems(sampleItemsList); 
         return sampleInfo;
     }
 
-    protected String getSysUserId(HttpServletRequest request) {
-        UserSessionData usd = (UserSessionData) request.getSession().getAttribute(USER_SESSION_DATA);
-        if (usd == null) {
-            usd = (UserSessionData) request.getAttribute(USER_SESSION_DATA);
-            if (usd == null) {
-                return null;
-            }
-        }
-        return String.valueOf(usd.getSystemUserId());
-    }
 
     private Sample getSampleForLabNumber(String labNumber) throws LIMSInvalidConfigurationException {
         return sampleService.getSampleByAccessionNumber(labNumber);

src/main/java/org/openelisglobal/qaevent/controller/rest/ViewNonConformEventsRestController.java

@@ -5,6 +5,8 @@
 import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
+
+import org.openelisglobal.SysUserId.SysUserId;
 import org.openelisglobal.common.services.DisplayListService;
 import org.openelisglobal.common.util.DateUtil;
 import org.openelisglobal.login.valueholder.UserSessionData;
@@ -29,7 +31,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-public class ViewNonConformEventsRestController {
+public class ViewNonConformEventsRestController extends SysUserId{
 
     @Autowired
     private NCEventService ncEventService;
@@ -121,14 +123,5 @@ public ResponseEntity<?> postReportNonConformingEvent(@RequestBody NonConforming
         }
     }
 
-    protected String getSysUserId(HttpServletRequest request) {
-        UserSessionData usd = (UserSessionData) request.getSession().getAttribute(USER_SESSION_DATA);
-        if (usd == null) {
-            usd = (UserSessionData) request.getAttribute(USER_SESSION_DATA);
-            if (usd == null) {
-                return null;
-            }
-        }
-        return String.valueOf(usd.getSystemUserId());
-    }
+
 }