EVDOC01-142 Redirecció logs Microsoft

bbbbgarcia · mateullas · commit 4167d8fc76e9 · 2024-06-17T16:24:44.000+02:00
diff --git a/microsoft-integration/admin-tool/src/main/java/org/sakaiproject/microsoft/WebAppConfiguration.java b/microsoft-integration/admin-tool/src/main/java/org/sakaiproject/microsoft/WebAppConfiguration.java
@@ -15,22 +15,32 @@
  */
 package org.sakaiproject.microsoft;
 
+import java.io.File;
 import java.util.EnumSet;
 
 import javax.servlet.DispatcherType;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRegistration.Dynamic;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.sakaiproject.component.api.ServerConfigurationService;
 import org.sakaiproject.util.RequestFilter;
 import org.sakaiproject.util.SakaiContextLoaderListener;
 import org.sakaiproject.util.ToolListener;
 import org.springframework.web.WebApplicationInitializer;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
 
+import lombok.Setter;
+import lombok.extern.log4j.Log4j2;
+
+@Log4j2
 public class WebAppConfiguration implements WebApplicationInitializer {
 
+	@Setter private ServerConfigurationService serverConfigurationService;
+
 	@Override
 	public void onStartup(ServletContext servletContext) throws ServletException {
 		AnnotationConfigWebApplicationContext rootContext = new AnnotationConfigWebApplicationContext();
diff --git a/microsoft-integration/admin-tool/src/main/java/org/sakaiproject/microsoft/controller/AutoConfigController.java b/microsoft-integration/admin-tool/src/main/java/org/sakaiproject/microsoft/controller/AutoConfigController.java
@@ -54,7 +54,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 
 
 /**
@@ -63,7 +63,7 @@
  * This is the controller used by Spring MVC to handle requests
  * 
  */
-@Slf4j
+@Log4j2
 @Controller
 public class AutoConfigController {
 	
@@ -96,7 +96,7 @@ public String autoConfig(
 		
 		HttpSession session = request.getSession();
 		
-		AutoConfigSessionBean autoConfigSessionBean = autoConfigSessionBean = (AutoConfigSessionBean)session.getAttribute("AutoConfigSessionBean");
+		AutoConfigSessionBean autoConfigSessionBean = (AutoConfigSessionBean)session.getAttribute("AutoConfigSessionBean");
 		if(autoConfigSessionBean == null) {
 			autoConfigSessionBean = new AutoConfigSessionBean();
 			session.setAttribute("AutoConfigSessionBean", autoConfigSessionBean);
diff --git a/microsoft-integration/admin-tool/src/main/java/org/sakaiproject/microsoft/controller/ConfigController.java b/microsoft-integration/admin-tool/src/main/java/org/sakaiproject/microsoft/controller/ConfigController.java
@@ -24,7 +24,6 @@
 import org.sakaiproject.microsoft.api.model.MicrosoftConfigItem;
 import org.sakaiproject.microsoft.api.persistence.MicrosoftConfigRepository;
 import org.sakaiproject.microsoft.controller.auxiliar.ConfigRequest;
-import org.sakaiproject.util.ResourceLoader;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
@@ -33,20 +32,17 @@
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 
-import lombok.extern.slf4j.Slf4j;
-
 
 /**
  * ConfigController
  * 
  * This is the controller used by Spring MVC to handle config related requests
  * 
  */
-@Slf4j
 @Controller
 public class ConfigController {
 	
-	private static ResourceLoader rb = new ResourceLoader("Messages");
+	// private static ResourceLoader rb = new ResourceLoader("Messages");
 	
 	@Autowired
 	private MicrosoftConfigurationService microsoftConfigurationService;
diff --git a/microsoft-integration/admin-tool/src/main/java/org/sakaiproject/microsoft/controller/CredentialsController.java b/microsoft-integration/admin-tool/src/main/java/org/sakaiproject/microsoft/controller/CredentialsController.java
@@ -30,16 +30,13 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import lombok.extern.slf4j.Slf4j;
-
 
 /**
  * CredentialsController
  * 
  * This is the controller used by Spring MVC to handle credential related requests
  * 
  */
-@Slf4j
 @Controller
 public class CredentialsController {
 	
diff --git a/microsoft-integration/admin-tool/src/main/java/org/sakaiproject/microsoft/controller/GlobalController.java b/microsoft-integration/admin-tool/src/main/java/org/sakaiproject/microsoft/controller/GlobalController.java
@@ -38,16 +38,13 @@
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import org.springframework.web.servlet.support.RequestContextUtils;
 
-import lombok.extern.slf4j.Slf4j;
-
 
 /**
  * MainController
  * 
  * This is the controller used by Spring MVC to handle requests
  * 
  */
-@Slf4j
 @ControllerAdvice
 public class GlobalController {
 
diff --git a/microsoft-integration/admin-tool/src/main/java/org/sakaiproject/microsoft/controller/GroupSynchronizationController.java b/microsoft-integration/admin-tool/src/main/java/org/sakaiproject/microsoft/controller/GroupSynchronizationController.java
@@ -41,7 +41,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 
 
 /**
@@ -50,7 +50,7 @@
  * This is the controller used by Spring MVC to handle Group Synchronizations related requests
  * 
  */
-@Slf4j
+@Log4j2
 @Controller
 public class GroupSynchronizationController {
 	
diff --git a/microsoft-integration/admin-tool/src/main/java/org/sakaiproject/microsoft/controller/MainController.java b/microsoft-integration/admin-tool/src/main/java/org/sakaiproject/microsoft/controller/MainController.java
@@ -49,7 +49,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 
 
 /**
@@ -58,7 +58,7 @@
  * This is the controller used by Spring MVC to handle requests
  * 
  */
-@Slf4j
+@Log4j2
 @Controller
 public class MainController {
 	
diff --git a/microsoft-integration/admin-tool/src/main/java/org/sakaiproject/microsoft/controller/SiteSynchronizationController.java b/microsoft-integration/admin-tool/src/main/java/org/sakaiproject/microsoft/controller/SiteSynchronizationController.java
@@ -39,7 +39,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 
 
 /**
@@ -48,7 +48,7 @@
  * This is the controller used by Spring MVC to handle Group Synchronizations related requests
  * 
  */
-@Slf4j
+@Log4j2
 @Controller
 public class SiteSynchronizationController {
 	
diff --git a/microsoft-integration/api/src/java/org/sakaiproject/microsoft/api/converters/JpaConverterMap.java b/microsoft-integration/api/src/java/org/sakaiproject/microsoft/api/converters/JpaConverterMap.java
@@ -24,9 +24,9 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 
-@Slf4j
+@Log4j2
 @Converter(autoApply = true)
 public class JpaConverterMap implements AttributeConverter<Map, String> {
  
diff --git a/microsoft-integration/api/src/java/org/sakaiproject/microsoft/api/converters/JpaConverterMicrosoftAuthorizationAccount.java b/microsoft-integration/api/src/java/org/sakaiproject/microsoft/api/converters/JpaConverterMicrosoftAuthorizationAccount.java
@@ -23,9 +23,9 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 
-@Slf4j
+@Log4j2
 @Converter(autoApply = true)
 public class JpaConverterMicrosoftAuthorizationAccount implements AttributeConverter<MicrosoftAuthorizationAccount, String> {
 
diff --git a/microsoft-integration/api/src/java/org/sakaiproject/microsoft/api/model/MicrosoftAccessToken.java b/microsoft-integration/api/src/java/org/sakaiproject/microsoft/api/model/MicrosoftAccessToken.java
@@ -35,15 +35,15 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 
 @Entity
 @Table(name = "mc_access_token")
 @AllArgsConstructor
 @NoArgsConstructor
 @Data
 @Builder(toBuilder=true)
-@Slf4j
+@Log4j2
 public class MicrosoftAccessToken {
 	private static final String KEY_REFRESH_TOKEN = "RefreshToken";
 	private static final String KEY_SECRET = "secret";
diff --git a/microsoft-integration/authorization-tool/src/main/java/org/sakaiproject/microsoft/authorization/controller/MainController.java b/microsoft-integration/authorization-tool/src/main/java/org/sakaiproject/microsoft/authorization/controller/MainController.java
@@ -15,7 +15,7 @@
  */
 package org.sakaiproject.microsoft.authorization.controller;
 
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 
 import java.util.Locale;
 
@@ -39,7 +39,7 @@
 import org.springframework.web.servlet.support.RequestContextUtils;
 
 
-@Slf4j
+@Log4j2
 @Controller
 public class MainController {
 
diff --git a/microsoft-integration/collaborative-documents/src/main/java/org/sakaiproject/microsoft/collaborativedocuments/controller/MainController.java b/microsoft-integration/collaborative-documents/src/main/java/org/sakaiproject/microsoft/collaborativedocuments/controller/MainController.java
@@ -80,10 +80,10 @@
 import org.springframework.web.servlet.support.RequestContextUtils;
 
 import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 
 
-@Slf4j
+@Log4j2
 @Controller
 public class MainController {
 	
diff --git a/microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/MicrosoftAuthorizationServiceImpl.java b/microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/MicrosoftAuthorizationServiceImpl.java
@@ -48,9 +48,9 @@
 import com.microsoft.graph.requests.GraphServiceClient;
 
 import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 
-@Slf4j
+@Log4j2
 @Transactional
 public class MicrosoftAuthorizationServiceImpl implements MicrosoftAuthorizationService {
 
diff --git a/microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/MicrosoftCommonServiceImpl.java b/microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/MicrosoftCommonServiceImpl.java
@@ -39,7 +39,10 @@
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
 import org.sakaiproject.authz.api.FunctionManager;
+import org.sakaiproject.component.api.ServerConfigurationService;
 import org.sakaiproject.messaging.api.MicrosoftMessage;
 import org.sakaiproject.messaging.api.MicrosoftMessage.MicrosoftMessageBuilder;
 import org.sakaiproject.messaging.api.MicrosoftMessagingService;
@@ -130,9 +133,9 @@
 import com.microsoft.graph.requests.UserCollectionRequestBuilder;
 import com.nimbusds.oauth2.sdk.util.StringUtils;
 import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 
-@Slf4j
+@Log4j2
 @Transactional
 public class MicrosoftCommonServiceImpl implements MicrosoftCommonService {
 
@@ -150,6 +153,7 @@ public class MicrosoftCommonServiceImpl implements MicrosoftCommonService {
 	private static final String LINK_SCOPE_USERS = "users";
 
 
+	@Setter private ServerConfigurationService serverConfigurationService;
 	@Setter private CacheManager cacheManager;
 	@Setter private FunctionManager functionManager;
 	@Setter private MicrosoftAuthorizationService microsoftAuthorizationService;
@@ -163,6 +167,10 @@ public class MicrosoftCommonServiceImpl implements MicrosoftCommonService {
 	final private Object lock = new Object();
 
 	public void init() {
+		LoggerContext context = (LoggerContext) LogManager.getContext(false);
+		context.setConfigLocation(new File(serverConfigurationService.getSakaiHomePath() + "custom-microsoft-log4j2.xml").toURI());
+		context.reconfigure();
+
 		// register functions
 		functionManager.registerFunction(PERM_VIEW_ALL_CHANNELS, true);
 		functionManager.registerFunction(PERM_CREATE_FILES, true);
diff --git a/microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/MicrosoftConfigurationServiceImpl.java b/microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/MicrosoftConfigurationServiceImpl.java
@@ -28,9 +28,9 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 
-@Slf4j
+@Log4j2
 @Transactional
 public class MicrosoftConfigurationServiceImpl implements MicrosoftConfigurationService {
 	
diff --git a/microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/MicrosoftLoggingServiceImpl.java b/microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/MicrosoftLoggingServiceImpl.java
@@ -21,9 +21,9 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 
-@Slf4j
+@Log4j2
 @Transactional
 public class MicrosoftLoggingServiceImpl implements MicrosoftLoggingService {
 	
diff --git a/microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/MicrosoftSynchronizationServiceImpl.java b/microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/MicrosoftSynchronizationServiceImpl.java
@@ -61,10 +61,10 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 
 
-@Slf4j
+@Log4j2
 @Transactional
 public class MicrosoftSynchronizationServiceImpl implements MicrosoftSynchronizationService {
 
diff --git a/microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/SakaiProxyImpl.java b/microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/SakaiProxyImpl.java
@@ -61,9 +61,9 @@
 import com.nimbusds.oauth2.sdk.util.StringUtils;
 
 import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 
-@Slf4j
+@Log4j2
 @Transactional
 public class SakaiProxyImpl implements SakaiProxy {
 	
diff --git a/microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/jobs/RunSynchronizationsJob.java b/microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/jobs/RunSynchronizationsJob.java
@@ -30,9 +30,9 @@
 import org.sakaiproject.tool.api.SessionManager;
 
 import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 
-@Slf4j
+@Log4j2
 public class RunSynchronizationsJob implements Job {
 
 	@Setter
diff --git a/microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/provider/AdminAuthProvider.java b/microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/provider/AdminAuthProvider.java
@@ -25,9 +25,9 @@
 import com.microsoft.aad.msal4j.IAuthenticationResult;
 import com.microsoft.graph.authentication.IAuthenticationProvider;
 
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 
-@Slf4j
+@Log4j2
 public class AdminAuthProvider implements IAuthenticationProvider {
 
 	private String authority;
diff --git a/microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/provider/DelegatedAuthProvider.java b/microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/provider/DelegatedAuthProvider.java
@@ -39,9 +39,9 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 
-@Slf4j
+@Log4j2
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
diff --git a/microsoft-integration/impl/src/webapp/WEB-INF/components.xml b/microsoft-integration/impl/src/webapp/WEB-INF/components.xml
@@ -66,7 +66,8 @@
     <bean id="org.sakaiproject.microsoft.api.MicrosoftCommonService"
           class="org.sakaiproject.microsoft.impl.MicrosoftCommonServiceImpl"
           init-method="init">
-	<property name="microsoftAuthorizationService" ref="org.sakaiproject.microsoft.api.MicrosoftAuthorizationService" />
+        <property name="serverConfigurationService" ref="org.sakaiproject.component.api.ServerConfigurationService" />
+        <property name="microsoftAuthorizationService" ref="org.sakaiproject.microsoft.api.MicrosoftAuthorizationService" />
         <property name="microsoftMessagingService" ref="org.sakaiproject.messaging.api.MicrosoftMessagingService" />
         <property name="microsoftConfigRepository" ref="org.sakaiproject.microsoft.api.persistence.MicrosoftConfigRepository" />
         <property name="microsoftLoggingRepository" ref="org.sakaiproject.microsoft.api.persistence.MicrosoftLoggingRepository" />
diff --git a/microsoft-integration/media-gallery-tool/src/main/java/org/sakaiproject/microsoft/mediagallery/controller/MainController.java b/microsoft-integration/media-gallery-tool/src/main/java/org/sakaiproject/microsoft/mediagallery/controller/MainController.java

Original file line number	Diff line number	Diff line change
`@@ -30,16 +30,13 @@`
`30`	`30`	`import org.springframework.web.bind.annotation.PostMapping;`
`31`	`31`	`import org.springframework.web.servlet.mvc.support.RedirectAttributes;`
`32`	`32`
`33`		`-import lombok.extern.slf4j.Slf4j;`
`34`		`-`
`35`	`33`
`36`	`34`	`/**`
`37`	`35`	`* CredentialsController`
`38`	`36`	`*`
`39`	`37`	`* This is the controller used by Spring MVC to handle credential related requests`
`40`	`38`	`*`
`41`	`39`	`*/`
`42`		`-@Slf4j`
`43`	`40`	`@Controller`
`44`	`41`	`public class CredentialsController {`
`45`	`42`
Original file line number	Diff line number	Diff line change
`@@ -38,16 +38,13 @@`
`38`	`38`	`import org.springframework.web.servlet.mvc.support.RedirectAttributes;`
`39`	`39`	`import org.springframework.web.servlet.support.RequestContextUtils;`
`40`	`40`
`41`		`-import lombok.extern.slf4j.Slf4j;`
`42`		`-`
`43`	`41`
`44`	`42`	`/**`
`45`	`43`	`* MainController`
`46`	`44`	`*`
`47`	`45`	`* This is the controller used by Spring MVC to handle requests`
`48`	`46`	`*`
`49`	`47`	`*/`
`50`		`-@Slf4j`
`51`	`48`	`@ControllerAdvice`
`52`	`49`	`public class GlobalController {`
`53`	`50`