SAK-30828 Lombok @CommonsLog migrated to @slf4j

archive/archive-tool/tool/src/java/org/sakaiproject/archive/tool/DownloadServlet.java

@@ -14,8 +14,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import lombok.extern.apachecommons.CommonsLog;
-
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
@@ -30,7 +29,7 @@
  * @author Steve Swinsburg ([email protected])
  *
  */
-@CommonsLog
+@Slf4j
 public class DownloadServlet extends HttpServlet {
 
 	private static final long serialVersionUID = 1L;

content-review/impl/dao/src/test/java/org/sakaiproject/contentreview/dao/ContentReviewDaoImplTest.java

@@ -18,18 +18,17 @@
 import java.util.Date;
 import java.util.Optional;
 
+import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests;
 
-import lombok.extern.apachecommons.CommonsLog;
-
 /**
  * Testing for the Evaluation Data Access Layer
  */
-@CommonsLog
+@Slf4j
 @ContextConfiguration({ "/hibernate-test.xml", "/spring-hibernate.xml" })
 public class ContentReviewDaoImplTest extends AbstractTransactionalJUnit4SpringContextTests {
 

content-review/impl/service/src/main/java/org/sakaiproject/contentreview/service/ContentReviewFederatedServiceImpl.java

@@ -25,6 +25,7 @@
 import java.util.SortedSet;
 import java.util.stream.Collectors;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.sakaiproject.component.api.ServerConfigurationService;
 import org.sakaiproject.content.api.ContentResource;
@@ -39,12 +40,11 @@
 import org.sakaiproject.tool.api.ToolManager;
 
 import lombok.Setter;
-import lombok.extern.apachecommons.CommonsLog;
 
 /* This class is passed a list of providers in the bean as references, it will use the first
  * by default unless overridden by a site property.
  */
-@CommonsLog
+@Slf4j
 public class ContentReviewFederatedServiceImpl implements ContentReviewService {
 
 	@Setter

content-review/impl/service/src/main/java/org/sakaiproject/contentreview/service/ContentReviewQueueServiceImpl.java

@@ -20,6 +20,7 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import lombok.extern.slf4j.Slf4j;
 import org.sakaiproject.content.api.ContentResource;
 import org.sakaiproject.contentreview.dao.ContentReviewConstants;
 import org.sakaiproject.contentreview.dao.ContentReviewItem;
@@ -30,9 +31,8 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import lombok.Setter;
-import lombok.extern.apachecommons.CommonsLog;
 
-@CommonsLog
+@Slf4j
 public class ContentReviewQueueServiceImpl implements ContentReviewQueueService {
 
 	@Setter

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/TurnitinAccountConnection.java

@@ -21,14 +21,13 @@
 import java.net.SocketAddress;
 import java.util.Map;
 
+import lombok.extern.slf4j.Slf4j;
 import org.sakaiproject.component.api.ServerConfigurationService;
 import org.sakaiproject.contentreview.exception.SubmissionException;
 import org.sakaiproject.contentreview.exception.TransientSubmissionException;
 import org.sakaiproject.contentreview.turnitin.util.TurnitinAPIUtil;
 import org.w3c.dom.Document;
 
-import lombok.extern.apachecommons.CommonsLog;
-
 /**
  * This class contains the properties and utility methods so it can be used to
  * make API calls and connections to a specific Turnitin Account.
@@ -43,7 +42,7 @@
  * @author sgithens
  *
  */
-@CommonsLog
+@Slf4j
 public class TurnitinAccountConnection {
 
 	private String aid = null;

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/TurnitinContentValidator.java

@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hpsf.SummaryInformation;
 import org.apache.poi.hwpf.HWPFDocument;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
@@ -26,8 +27,6 @@
 import org.sakaiproject.entity.api.ResourceProperties;
 import org.sakaiproject.exception.ServerOverloadException;
 
-import lombok.extern.apachecommons.CommonsLog;
-
 /**
  * This class contains the implementation of 
  * {@link ContentReviewService.isAcceptableContent}. This includes other
@@ -37,7 +36,7 @@
  * @author sgithens
  *
  */
-@CommonsLog
+@Slf4j
 public class TurnitinContentValidator {
 
 	private int tii_Max_Fil_Size;

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/TurnitinReviewServiceImpl.java

@@ -35,6 +35,7 @@
 import java.util.Set;
 import java.util.SortedSet;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.validator.routines.EmailValidator;
@@ -84,9 +85,8 @@
 import org.w3c.dom.NodeList;
 
 import lombok.Setter;
-import lombok.extern.apachecommons.CommonsLog;
 
-@CommonsLog
+@Slf4j
 public class TurnitinReviewServiceImpl implements ContentReviewService {
 
 	public static final String TURNITIN_DATETIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
@@ -561,9 +561,9 @@ public void syncGrades(Map<String, Object> data) {
 			try {
 				document = turnitinConn.callTurnitinReturnDocument(params);
 			} catch (TransientSubmissionException e) {
-				log.error(e);
+				log.error(e.getMessage());
 			} catch (SubmissionException e) {
-				log.warn("SubmissionException error. " + e);
+				log.warn("SubmissionException error. " + e.getMessage());
 			}
 			Element root = document.getDocumentElement();
 			if (((CharacterData) (root.getElementsByTagName("rcode").item(0).getFirstChild())).getData().trim()

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/TurnitinSessionFuncs.java

@@ -18,14 +18,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import lombok.extern.slf4j.Slf4j;
 import org.sakaiproject.contentreview.exception.SubmissionException;
 import org.sakaiproject.contentreview.exception.TransientSubmissionException;
 import org.w3c.dom.CharacterData;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import lombok.extern.apachecommons.CommonsLog;
-
 /**
  * This contains a few functional utilities to help with logging in and out of
  * Turnitin using fids 17 and 18.
@@ -38,7 +37,7 @@
  * @author sgithens
  *
  */
-@CommonsLog
+@Slf4j
 public class TurnitinSessionFuncs {
 	/**
 	 * Logs in to turnitin.  Scrapes the response XML and returns the session id

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/util/TurnitinAPIUtil.java

@@ -48,6 +48,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,16 +60,14 @@
 import org.sakaiproject.util.Xml;
 import org.w3c.dom.Document;
 
-import lombok.extern.apachecommons.CommonsLog;
-
 /**
  * This is a utility class for wrapping the physical https calls to the
  * Turn It In Service.
  * 
  * @author sgithens
  *
  */
-@CommonsLog
+@Slf4j
 public class TurnitinAPIUtil {
 
 	private static final Logger apiTraceLog = LoggerFactory.getLogger("org.sakaiproject.turnitin.util.TurnitinAPIUtil.apicalltrace");

content-review/impl/vericite/src/main/java/org/sakaiproject/contentreview/vericite/ContentReviewServiceVeriCite.java

@@ -36,6 +36,7 @@
 import java.util.Optional;
 import java.util.SortedSet;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpResponse;
@@ -80,9 +81,8 @@
 import org.sakaiproject.user.api.UserNotDefinedException;
 
 import lombok.Setter;
-import lombok.extern.apachecommons.CommonsLog;
 
-@CommonsLog
+@Slf4j
 public class ContentReviewServiceVeriCite implements ContentReviewService {
 
 	@Setter

content/content-tool/tool/src/java/org/sakaiproject/content/entityproviders/ContentEntityProvider.java

@@ -8,8 +8,7 @@
 
 import lombok.Getter;
 import lombok.Setter;
-import lombok.extern.apachecommons.CommonsLog;
-
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.sakaiproject.authz.api.SecurityService;
 import org.sakaiproject.component.cover.ComponentManager;
@@ -49,7 +48,7 @@
 /**
  * Entity provider for the Content / Resources tool
  */
-@CommonsLog
+@Slf4j
 public class ContentEntityProvider extends AbstractEntityProvider implements EntityProvider, AutoRegisterEntityProvider, ActionsExecutable, Outputable, Describeable {
 
 	public final static String ENTITY_PREFIX = "content";

content/content-tool/tool/src/java/org/sakaiproject/content/entityproviders/DropboxEntityProvider.java

@@ -5,8 +5,7 @@
 
 import lombok.Getter;
 import lombok.Setter;
-import lombok.extern.apachecommons.CommonsLog;
-
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.sakaiproject.authz.api.SecurityService;
 import org.sakaiproject.content.api.ContentHostingService;
@@ -36,7 +35,7 @@
 /**
  * Entity provider for the Dropbox tool
  */
-@CommonsLog
+@Slf4j
 public class DropboxEntityProvider extends AbstractEntityProvider implements EntityProvider, AutoRegisterEntityProvider, ActionsExecutable, Outputable, Describeable {
 
 	public final static String ENTITY_PREFIX = "dropbox";

external-calendaring-service/impl/src/java/org/sakaiproject/calendaring/api/ExternalCalendaringServiceImpl.java

@@ -30,7 +30,7 @@
 import java.util.UUID;
 
 import lombok.Setter;
-import lombok.extern.apachecommons.CommonsLog;
+import lombok.extern.slf4j.Slf4j;
 import net.fortuna.ical4j.data.CalendarOutputter;
 import net.fortuna.ical4j.model.Calendar;
 import net.fortuna.ical4j.model.DateTime;
@@ -54,16 +54,13 @@
 import org.sakaiproject.time.api.TimeRange;
 import org.sakaiproject.user.api.User;
 
-
-
-
 /**
  * Implementation of {@link ExternalCalendaringService}
  * 
  * @author Steve Swinsburg ([email protected])
  *
  */
-@CommonsLog
+@Slf4j
 public class ExternalCalendaringServiceImpl implements ExternalCalendaringService {
 
 	/**

external-calendaring-service/impl/src/java/org/sakaiproject/calendaring/logic/SakaiProxyImpl.java

@@ -22,8 +22,7 @@
 import java.io.File;
 
 import lombok.Setter;
-import lombok.extern.apachecommons.CommonsLog;
-
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.sakaiproject.authz.api.SecurityService;
 import org.sakaiproject.component.api.ServerConfigurationService;
@@ -37,7 +36,7 @@
  * @author Steve Swinsburg ([email protected])
  *
  */
-@CommonsLog
+@Slf4j
 public class SakaiProxyImpl implements SakaiProxy {
 
 	/**

gradebook/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/entity/GradebookEntityProvider.java

@@ -7,8 +7,7 @@
 import java.util.Map;
 
 import lombok.Setter;
-import lombok.extern.apachecommons.CommonsLog;
-
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.sakaiproject.authz.api.SecurityService;
 import org.sakaiproject.entitybroker.EntityReference;
@@ -43,7 +42,7 @@
  * This is a provider for looking up and adding/editing Gradebook Items.
  * It is actually passing along to a gradebook UI via RSF and does not provide any rest access to grades data
  */
-@CommonsLog
+@Slf4j
 public class GradebookEntityProvider extends AbstractEntityProvider implements
 		AutoRegisterEntityProvider, CoreEntityProvider,
 		EntityViewParamsInferrer, Describeable, Sampleable, ActionsExecutable,

gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/GradebookNgBusinessService.java

@@ -16,6 +16,7 @@
 
 import javax.xml.bind.JAXBException;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.CompareToBuilder;
 import org.apache.commons.lang.math.NumberUtils;
@@ -66,7 +67,6 @@
 import org.sakaiproject.util.ResourceLoader;
 
 import lombok.Setter;
-import lombok.extern.apachecommons.CommonsLog;
 
 /**
  * Business service for GradebookNG
@@ -80,7 +80,7 @@
 // TODO add permission checks! Remove logic from entityprovider if there is a double up
 // TODO some of these methods pass in empty lists and its confusing. If we aren't doing paging, remove this.
 
-@CommonsLog
+@Slf4j
 public class GradebookNgBusinessService {
 
 	@Setter

gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/helpers/ImportGradesHelper.java

@@ -8,6 +8,7 @@
 import java.util.List;
 import java.util.Map;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -28,12 +29,11 @@
 import org.sakaiproject.util.BaseResourcePropertiesEdit;
 
 import au.com.bytecode.opencsv.CSVReader;
-import lombok.extern.apachecommons.CommonsLog;
 
 /**
  * Created by chmaurer on 1/21/15.
  */
-@CommonsLog
+@Slf4j
 public class ImportGradesHelper extends BaseImportHelper {
 
 	private static final String IMPORT_USER_ID = "Student ID";

gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/FormatHelper.java

@@ -7,11 +7,10 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 
-import lombok.extern.apachecommons.CommonsLog;
-
-@CommonsLog
+@Slf4j
 public class FormatHelper {
 
 	/**