replace with log4j and fix imports

codelibs · Dec 31, 2024 · 8c23264 · 8c23264
1 parent b88289e
commit 8c23264
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/main/java/org/codelibs/fess/ds/gsuite/GSuiteClient.java b/src/main/java/org/codelibs/fess/ds/gsuite/GSuiteClient.java
@@ -33,6 +33,8 @@
 
 import org.apache.commons.io.output.DeferredFileOutputStream;
 import org.apache.commons.lang3.SystemUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.timer.TimeoutManager;
 import org.codelibs.core.timer.TimeoutTarget;
@@ -42,8 +44,6 @@
 import org.codelibs.fess.crawler.util.TemporaryFileInputStream;
 import org.codelibs.fess.entity.DataStoreParams;
 import org.codelibs.fess.exception.DataStoreException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.algorithms.Algorithm;
@@ -69,7 +69,7 @@
 
 public class GSuiteClient implements AutoCloseable {
 
-    private static final Logger logger = LoggerFactory.getLogger(GSuiteClient.class);
+    private static final Logger logger = LogManager.getLogger(GSuiteClient.class);
 
     protected static final String PRIVATE_KEY_PARAM = "private_key";
     protected static final String PRIVATE_KEY_ID_PARAM = "private_key_id";

diff --git a/src/main/java/org/codelibs/fess/ds/gsuite/GoogleDriveDataStore.java b/src/main/java/org/codelibs/fess/ds/gsuite/GoogleDriveDataStore.java
@@ -30,6 +30,8 @@
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.codelibs.core.exception.InterruptedRuntimeException;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.stream.StreamUtil;
@@ -38,21 +40,17 @@
 import org.codelibs.fess.crawler.exception.CrawlingAccessException;
 import org.codelibs.fess.crawler.exception.MaxLengthExceededException;
 import org.codelibs.fess.crawler.exception.MultipleCrawlingAccessException;
-import org.codelibs.fess.crawler.extractor.Extractor;
 import org.codelibs.fess.crawler.filter.UrlFilter;
 import org.codelibs.fess.ds.AbstractDataStore;
 import org.codelibs.fess.ds.callback.IndexUpdateCallback;
 import org.codelibs.fess.entity.DataStoreParams;
 import org.codelibs.fess.es.config.exentity.DataConfig;
 import org.codelibs.fess.exception.DataStoreCrawlingException;
-import org.codelibs.fess.exception.DataStoreException;
 import org.codelibs.fess.helper.CrawlerStatsHelper;
 import org.codelibs.fess.helper.CrawlerStatsHelper.StatsAction;
 import org.codelibs.fess.helper.CrawlerStatsHelper.StatsKeyObject;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.util.ComponentUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -62,7 +60,7 @@
 
 public class GoogleDriveDataStore extends AbstractDataStore {
 
-    private static final Logger logger = LoggerFactory.getLogger(GoogleDriveDataStore.class);
+    private static final Logger logger = LogManager.getLogger(GoogleDriveDataStore.class);
 
     protected static final long DEFAULT_MAX_SIZE = 10000000L; // 10m