From 71b59c39ac46f58ec554136bd90d37131056e396 Mon Sep 17 00:00:00 2001 From: David Pilato Date: Fri, 17 Jan 2025 18:51:38 +0100 Subject: [PATCH] Replace a global static logger with a local logger So we have now better traces of which exact class is called. And now for production code as well. --- .../elasticsearch/crawler/fs/cli/BootstrapChecks.java | 5 +++-- .../pilato/elasticsearch/crawler/fs/cli/FsCrawlerCli.java | 2 +- .../elasticsearch/crawler/fs/cli/FsCrawlerJobsUtil.java | 2 +- .../fr/pilato/elasticsearch/crawler/fs/FsCrawlerImpl.java | 2 +- .../pilato/elasticsearch/crawler/fs/FsParserAbstract.java | 8 ++++---- .../fr/pilato/elasticsearch/crawler/fs/FsParserNoop.java | 2 +- .../FsCrawlerDocumentServiceElasticsearchImpl.java | 2 +- .../FsCrawlerManagementServiceElasticsearchImpl.java | 2 +- .../crawler/fs/crawler/fs/FileAbstractorFile.java | 3 +-- .../elasticsearch/crawler/fs/crawler/ftp/FTPUtils.java | 2 +- .../crawler/fs/crawler/ftp/FileAbstractorFTP.java | 2 +- .../crawler/fs/crawler/ssh/FileAbstractorSSH.java | 2 +- .../crawler/fs/crawler/ssh/FsCrawlerSshClient.java | 6 ++---- .../crawler/fs/client/ElasticsearchClient.java | 2 +- .../crawler/fs/client/ElasticsearchEngine.java | 2 +- .../elasticsearch/crawler/fs/framework/FsCrawlerUtil.java | 2 +- .../crawler/fs/framework/MetaFileHandler.java | 2 +- .../pilato/elasticsearch/crawler/fs/framework/OsUtil.java | 2 +- .../bulk/FsCrawlerAdvancedBulkProcessorListener.java | 2 +- .../crawler/fs/framework/bulk/FsCrawlerBulkProcessor.java | 2 +- .../crawler/fs/framework/bulk/FsCrawlerBulkRequest.java | 3 +-- .../crawler/fs/framework/bulk/FsCrawlerBulkResponse.java | 2 +- .../bulk/FsCrawlerRetryBulkProcessorListener.java | 2 +- .../bulk/FsCrawlerSimpleBulkProcessorListener.java | 2 +- .../crawler/fs/framework/bulk/TestBulkListener.java | 4 ++-- .../plugins/FsCrawlerExtensionFsProviderAbstract.java | 2 +- .../elasticsearch/crawler/plugins/FsCrawlerPlugin.java | 2 +- .../crawler/plugins/FsCrawlerPluginsManager.java | 2 +- .../crawler/plugins/fs/http/FsHttpPlugin.java | 2 +- .../crawler/plugins/fs/local/FsLocalPlugin.java | 2 +- .../elasticsearch/crawler/plugins/fs/s3/FsS3Plugin.java | 2 +- .../pilato/elasticsearch/crawler/fs/rest/DocumentApi.java | 3 +++ .../fr/pilato/elasticsearch/crawler/fs/rest/RestApi.java | 6 ------ .../pilato/elasticsearch/crawler/fs/rest/RestServer.java | 3 +-- .../pilato/elasticsearch/crawler/fs/rest/UploadApi.java | 4 +++- .../elasticsearch/crawler/fs/settings/Elasticsearch.java | 3 +-- .../fr/pilato/elasticsearch/crawler/fs/settings/Fs.java | 2 +- .../elasticsearch/crawler/fs/settings/ServerUrl.java | 3 --- .../crawler/fs/test/framework/FsCrawlerUtilForTests.java | 2 +- .../elasticsearch/crawler/fs/tika/TikaDocParser.java | 4 ++-- .../elasticsearch/crawler/fs/tika/TikaInstance.java | 2 +- .../elasticsearch/crawler/fs/tika/XmlDocParser.java | 2 +- 42 files changed, 52 insertions(+), 61 deletions(-) diff --git a/cli/src/main/java/fr/pilato/elasticsearch/crawler/fs/cli/BootstrapChecks.java b/cli/src/main/java/fr/pilato/elasticsearch/crawler/fs/cli/BootstrapChecks.java index 8c2cda202..28969953f 100644 --- a/cli/src/main/java/fr/pilato/elasticsearch/crawler/fs/cli/BootstrapChecks.java +++ b/cli/src/main/java/fr/pilato/elasticsearch/crawler/fs/cli/BootstrapChecks.java @@ -27,6 +27,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; +import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; /** @@ -35,7 +36,7 @@ */ public class BootstrapChecks { - private static final Logger logger = LogManager.getLogger(BootstrapChecks.class); + private static final Logger logger = LogManager.getLogger(); public static void check() { checkJvm(); @@ -64,7 +65,7 @@ static Percentage computePercentage(ByteSizeValue current, ByteSizeValue max) { } private static void checkUTF8() { - String encoding = System.getProperty("file.encoding"); + String encoding = Charset.defaultCharset().displayName(); if (!encoding.equals(StandardCharsets.UTF_8.name())) { logger.warn("[file.encoding] should be [{}] but is [{}]", StandardCharsets.UTF_8.name(), encoding); } diff --git a/cli/src/main/java/fr/pilato/elasticsearch/crawler/fs/cli/FsCrawlerCli.java b/cli/src/main/java/fr/pilato/elasticsearch/crawler/fs/cli/FsCrawlerCli.java index c5818ea38..0b77f6481 100644 --- a/cli/src/main/java/fr/pilato/elasticsearch/crawler/fs/cli/FsCrawlerCli.java +++ b/cli/src/main/java/fr/pilato/elasticsearch/crawler/fs/cli/FsCrawlerCli.java @@ -66,7 +66,7 @@ public class FsCrawlerCli { private static final long CLOSE_POLLING_WAIT_MS = 100; - private static final Logger logger = LogManager.getLogger(FsCrawlerCli.class); + private static final Logger logger = LogManager.getLogger(); private static FsCrawlerPluginsManager pluginsManager; @SuppressWarnings("CanBeFinal") diff --git a/cli/src/main/java/fr/pilato/elasticsearch/crawler/fs/cli/FsCrawlerJobsUtil.java b/cli/src/main/java/fr/pilato/elasticsearch/crawler/fs/cli/FsCrawlerJobsUtil.java index d576ec155..eb23ed22e 100644 --- a/cli/src/main/java/fr/pilato/elasticsearch/crawler/fs/cli/FsCrawlerJobsUtil.java +++ b/cli/src/main/java/fr/pilato/elasticsearch/crawler/fs/cli/FsCrawlerJobsUtil.java @@ -32,7 +32,7 @@ public class FsCrawlerJobsUtil { - private static final Logger logger = LogManager.getLogger(FsCrawlerJobsUtil.class); + private static final Logger logger = LogManager.getLogger(); public static List listExistingJobs(Path configDir) { List files = new ArrayList<>(); diff --git a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/FsCrawlerImpl.java b/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/FsCrawlerImpl.java index 3338aafcc..a05c92d2d 100644 --- a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/FsCrawlerImpl.java +++ b/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/FsCrawlerImpl.java @@ -43,7 +43,7 @@ public class FsCrawlerImpl implements AutoCloseable { @Deprecated public static final String INDEX_TYPE_FOLDER = "folder"; - private static final Logger logger = LogManager.getLogger(FsCrawlerImpl.class); + private static final Logger logger = LogManager.getLogger(); public static final int LOOP_INFINITE = -1; public static final long MAX_SLEEP_RETRY_TIME = TimeValue.timeValueSeconds(30).millis(); diff --git a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/FsParserAbstract.java b/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/FsParserAbstract.java index bf5b51de4..b992a0729 100644 --- a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/FsParserAbstract.java +++ b/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/FsParserAbstract.java @@ -58,7 +58,7 @@ import static fr.pilato.elasticsearch.crawler.fs.framework.JsonUtil.asMap; public abstract class FsParserAbstract extends FsParser { - private static final Logger logger = LogManager.getLogger(FsParserAbstract.class); + private static final Logger logger = LogManager.getLogger(); private static final String FSCRAWLER_IGNORE_FILENAME = ".fscrawlerignore"; @@ -224,7 +224,7 @@ private void updateFsJob(String jobName, LocalDateTime scanDate) throws Exceptio // We need to round that latest date to the lower second and // remove 2 seconds. // See #82: https://github.com/dadoonet/fscrawler/issues/82 - scanDate = scanDate.minus(2, ChronoUnit.SECONDS); + scanDate = scanDate.minusSeconds(2); FsJob fsJob = FsJob.builder() .setName(jobName) .setLastrun(scanDate) @@ -523,7 +523,7 @@ private String read(InputStream input) throws IOException { * @param id id of the folder * @param folder path object */ - private void indexDirectory(String id, Folder folder) throws IOException { + private void indexDirectory(String id, Folder folder) { if (!closed) { managementService.storeVisitedDirectory(fsSettings.getElasticsearch().getIndexFolder(), id, folder); } else { @@ -575,7 +575,7 @@ private void removeEsDirectoryRecursively(final String path) throws Exception { /** * Remove a document with the document service */ - private void esDelete(FsCrawlerDocumentService service, String index, String id) throws IOException { + private void esDelete(FsCrawlerDocumentService service, String index, String id) { logger.debug("Deleting {}/{}", index, id); if (!closed) { service.delete(index, id); diff --git a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/FsParserNoop.java b/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/FsParserNoop.java index c5765143d..df0da9af4 100644 --- a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/FsParserNoop.java +++ b/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/FsParserNoop.java @@ -24,7 +24,7 @@ import org.apache.logging.log4j.Logger; public class FsParserNoop extends FsParser { - private static final Logger logger = LogManager.getLogger(FsParserNoop.class); + private static final Logger logger = LogManager.getLogger(); private final FsSettings fsSettings; public FsParserNoop(FsSettings fsSettings) { diff --git a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/service/FsCrawlerDocumentServiceElasticsearchImpl.java b/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/service/FsCrawlerDocumentServiceElasticsearchImpl.java index 3da89393b..64e3c614e 100644 --- a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/service/FsCrawlerDocumentServiceElasticsearchImpl.java +++ b/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/service/FsCrawlerDocumentServiceElasticsearchImpl.java @@ -37,7 +37,7 @@ public class FsCrawlerDocumentServiceElasticsearchImpl implements FsCrawlerDocumentService { - private static final Logger logger = LogManager.getLogger(FsCrawlerDocumentServiceElasticsearchImpl.class); + private static final Logger logger = LogManager.getLogger(); private final IElasticsearchClient client; diff --git a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/service/FsCrawlerManagementServiceElasticsearchImpl.java b/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/service/FsCrawlerManagementServiceElasticsearchImpl.java index cbd08bd38..bfceab89c 100644 --- a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/service/FsCrawlerManagementServiceElasticsearchImpl.java +++ b/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/service/FsCrawlerManagementServiceElasticsearchImpl.java @@ -42,7 +42,7 @@ public class FsCrawlerManagementServiceElasticsearchImpl implements FsCrawlerManagementService { - private static final Logger logger = LogManager.getLogger(FsCrawlerManagementServiceElasticsearchImpl.class); + private static final Logger logger = LogManager.getLogger(); // TODO Optimize it. We can probably use a search for a big array of filenames instead of // searching fo 10000 files (which is somehow limited). diff --git a/crawler/crawler-fs/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/fs/FileAbstractorFile.java b/crawler/crawler-fs/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/fs/FileAbstractorFile.java index 3a92bc958..e580a64ee 100644 --- a/crawler/crawler-fs/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/fs/FileAbstractorFile.java +++ b/crawler/crawler-fs/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/fs/FileAbstractorFile.java @@ -30,7 +30,6 @@ import java.io.FileInputStream; import java.io.InputStream; import java.nio.file.Files; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -45,7 +44,7 @@ import static fr.pilato.elasticsearch.crawler.fs.framework.FsCrawlerUtil.getOwnerName; public class FileAbstractorFile extends FileAbstractor { - private final Logger logger = LogManager.getLogger(FileAbstractorFile.class); + private static final Logger logger = LogManager.getLogger(); public FileAbstractorFile(FsSettings fsSettings) { super(fsSettings); diff --git a/crawler/crawler-ftp/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/ftp/FTPUtils.java b/crawler/crawler-ftp/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/ftp/FTPUtils.java index a0bb5df72..bb556f1ef 100644 --- a/crawler/crawler-ftp/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/ftp/FTPUtils.java +++ b/crawler/crawler-ftp/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/ftp/FTPUtils.java @@ -26,7 +26,7 @@ import org.apache.logging.log4j.Logger; public class FTPUtils { - private static final Logger logger = LogManager.getLogger(FTPUtils.class); + private static final Logger logger = LogManager.getLogger(); /** * Determines FTPFile permissions. diff --git a/crawler/crawler-ftp/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/ftp/FileAbstractorFTP.java b/crawler/crawler-ftp/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/ftp/FileAbstractorFTP.java index 70248984c..100197952 100644 --- a/crawler/crawler-ftp/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/ftp/FileAbstractorFTP.java +++ b/crawler/crawler-ftp/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/ftp/FileAbstractorFTP.java @@ -49,7 +49,7 @@ import java.util.stream.Collectors; public class FileAbstractorFTP extends FileAbstractor { - private final Logger logger = LogManager.getLogger(FileAbstractorFTP.class); + private static final Logger logger = LogManager.getLogger(); private FTPClient ftp; diff --git a/crawler/crawler-ssh/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/ssh/FileAbstractorSSH.java b/crawler/crawler-ssh/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/ssh/FileAbstractorSSH.java index 48659b6cd..4c9257a7c 100644 --- a/crawler/crawler-ssh/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/ssh/FileAbstractorSSH.java +++ b/crawler/crawler-ssh/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/ssh/FileAbstractorSSH.java @@ -37,7 +37,7 @@ import java.util.stream.StreamSupport; public class FileAbstractorSSH extends FileAbstractor { - private final Logger logger = LogManager.getLogger(FileAbstractorSSH.class); + private static final Logger logger = LogManager.getLogger(); private final FsCrawlerSshClient fsCrawlerSshClient; diff --git a/crawler/crawler-ssh/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/ssh/FsCrawlerSshClient.java b/crawler/crawler-ssh/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/ssh/FsCrawlerSshClient.java index 4788bc548..d67e20cb8 100644 --- a/crawler/crawler-ssh/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/ssh/FsCrawlerSshClient.java +++ b/crawler/crawler-ssh/src/main/java/fr/pilato/elasticsearch/crawler/fs/crawler/ssh/FsCrawlerSshClient.java @@ -31,7 +31,7 @@ import java.security.KeyPair; public class FsCrawlerSshClient implements AutoCloseable { - private final Logger logger = LogManager.getLogger(FsCrawlerSshClient.class); + private static final Logger logger = LogManager.getLogger(); private final String host; private final int port; @@ -39,7 +39,6 @@ public class FsCrawlerSshClient implements AutoCloseable { private final String password; private final String pemPath; - private ClientSession session; private SshClient sshClient; private SftpClient sftpClient; @@ -53,8 +52,7 @@ public FsCrawlerSshClient(String username, String password, String pemPath, Stri public void open() throws Exception { sshClient = createSshClient(); - session = openSshSession(sshClient, username, password, pemPath, host, port); - sftpClient = createSftpClient(session); + sftpClient = createSftpClient(openSshSession(sshClient, username, password, pemPath, host, port)); } @Override diff --git a/elasticsearch-client/src/main/java/fr/pilato/elasticsearch/crawler/fs/client/ElasticsearchClient.java b/elasticsearch-client/src/main/java/fr/pilato/elasticsearch/crawler/fs/client/ElasticsearchClient.java index 1a9091126..983e326c3 100644 --- a/elasticsearch-client/src/main/java/fr/pilato/elasticsearch/crawler/fs/client/ElasticsearchClient.java +++ b/elasticsearch-client/src/main/java/fr/pilato/elasticsearch/crawler/fs/client/ElasticsearchClient.java @@ -75,7 +75,7 @@ */ public class ElasticsearchClient implements IElasticsearchClient { - private static final Logger logger = LogManager.getLogger(ElasticsearchClient.class); + private static final Logger logger = LogManager.getLogger(); @Deprecated private final Path config; private final FsSettings settings; diff --git a/elasticsearch-client/src/main/java/fr/pilato/elasticsearch/crawler/fs/client/ElasticsearchEngine.java b/elasticsearch-client/src/main/java/fr/pilato/elasticsearch/crawler/fs/client/ElasticsearchEngine.java index 86606dbc1..7a92b0894 100644 --- a/elasticsearch-client/src/main/java/fr/pilato/elasticsearch/crawler/fs/client/ElasticsearchEngine.java +++ b/elasticsearch-client/src/main/java/fr/pilato/elasticsearch/crawler/fs/client/ElasticsearchEngine.java @@ -29,7 +29,7 @@ import static fr.pilato.elasticsearch.crawler.fs.client.IElasticsearchClient.INDEX_TYPE_DOC; public class ElasticsearchEngine implements Engine { - private static final Logger logger = LogManager.getLogger(ElasticsearchEngine.class); + private static final Logger logger = LogManager.getLogger(); private final IElasticsearchClient elasticsearchClient; public ElasticsearchEngine(IElasticsearchClient elasticsearchClient) { diff --git a/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/FsCrawlerUtil.java b/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/FsCrawlerUtil.java index 9dc524491..2ff170e07 100644 --- a/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/FsCrawlerUtil.java +++ b/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/FsCrawlerUtil.java @@ -54,7 +54,7 @@ public class FsCrawlerUtil { public static final String INDEX_SETTINGS_FILE = "_settings"; public static final String INDEX_SETTINGS_FOLDER_FILE = "_settings_folder"; - private static final Logger logger = LogManager.getLogger(FsCrawlerUtil.class); + private static final Logger logger = LogManager.getLogger(); /** * Reads a mapping from config/_default/version/type.json file diff --git a/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/MetaFileHandler.java b/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/MetaFileHandler.java index 9dfe252d0..38f174b83 100644 --- a/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/MetaFileHandler.java +++ b/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/MetaFileHandler.java @@ -33,7 +33,7 @@ */ public class MetaFileHandler { - private static final Logger logger = LogManager.getLogger(MetaFileHandler.class); + private static final Logger logger = LogManager.getLogger(); public final static Path DEFAULT_ROOT = Paths.get(System.getProperty("user.home"), ".fscrawler"); private final Path root; diff --git a/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/OsUtil.java b/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/OsUtil.java index e3faec4b5..6c8f24a62 100644 --- a/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/OsUtil.java +++ b/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/OsUtil.java @@ -27,7 +27,7 @@ import java.lang.reflect.Method; public class OsUtil { - private static final Logger logger = LogManager.getLogger(OsUtil.class); + private static final Logger logger = LogManager.getLogger(); private static final OperatingSystemMXBean osMxBean = ManagementFactory.getOperatingSystemMXBean(); diff --git a/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerAdvancedBulkProcessorListener.java b/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerAdvancedBulkProcessorListener.java index eddf889df..36cf8bc43 100644 --- a/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerAdvancedBulkProcessorListener.java +++ b/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerAdvancedBulkProcessorListener.java @@ -35,7 +35,7 @@ public class FsCrawlerAdvancedBulkProcessorListener< REQ extends FsCrawlerBulkRequest, RES extends FsCrawlerBulkResponse > extends FsCrawlerSimpleBulkProcessorListener { - private static final Logger logger = LogManager.getLogger(FsCrawlerAdvancedBulkProcessorListener.class); + private static final Logger logger = LogManager.getLogger(); private final AtomicInteger successiveErrors = new AtomicInteger(0); diff --git a/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerBulkProcessor.java b/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerBulkProcessor.java index 7a7eb7679..b62abe895 100644 --- a/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerBulkProcessor.java +++ b/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerBulkProcessor.java @@ -41,7 +41,7 @@ public class FsCrawlerBulkProcessor< Res extends FsCrawlerBulkResponse > implements Closeable { - private static final Logger logger = LogManager.getLogger(FsCrawlerBulkProcessor.class); + private static final Logger logger = LogManager.getLogger(); private final int bulkActions; private final ByteSizeValue byteSize; diff --git a/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerBulkRequest.java b/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerBulkRequest.java index fea0d0a21..67211d0c3 100644 --- a/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerBulkRequest.java +++ b/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerBulkRequest.java @@ -29,8 +29,7 @@ import static fr.pilato.elasticsearch.crawler.fs.framework.JsonUtil.serialize; public abstract class FsCrawlerBulkRequest> { - - private final Logger logger = LogManager.getLogger(FsCrawlerBulkRequest.class); + private static final Logger logger = LogManager.getLogger(); private final List operations = new ArrayList<>(); private int totalByteSize = 0; diff --git a/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerBulkResponse.java b/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerBulkResponse.java index e65bb5b89..3b064e93f 100644 --- a/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerBulkResponse.java +++ b/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerBulkResponse.java @@ -28,7 +28,7 @@ @SuppressWarnings("CanBeFinal") public abstract class FsCrawlerBulkResponse> { - private static final Logger logger = LogManager.getLogger(FsCrawlerBulkResponse.class); + private static final Logger logger = LogManager.getLogger(); protected boolean errors; protected List> items = new ArrayList<>(); diff --git a/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerRetryBulkProcessorListener.java b/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerRetryBulkProcessorListener.java index 3671f3bcf..7ebd32057 100644 --- a/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerRetryBulkProcessorListener.java +++ b/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerRetryBulkProcessorListener.java @@ -34,7 +34,7 @@ public class FsCrawlerRetryBulkProcessorListener< RES extends FsCrawlerBulkResponse > extends FsCrawlerAdvancedBulkProcessorListener { - private static final Logger logger = LogManager.getLogger(FsCrawlerRetryBulkProcessorListener.class); + private static final Logger logger = LogManager.getLogger(); private final String[] errorMessages; diff --git a/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerSimpleBulkProcessorListener.java b/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerSimpleBulkProcessorListener.java index 39dc68cc0..d1b2953dc 100644 --- a/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerSimpleBulkProcessorListener.java +++ b/framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/FsCrawlerSimpleBulkProcessorListener.java @@ -27,7 +27,7 @@ public class FsCrawlerSimpleBulkProcessorListener< REQ extends FsCrawlerBulkRequest, RES extends FsCrawlerBulkResponse > implements FsCrawlerBulkProcessor.Listener { - private static final Logger logger = LogManager.getLogger(FsCrawlerSimpleBulkProcessorListener.class); + private static final Logger logger = LogManager.getLogger(); protected FsCrawlerBulkProcessor bulkProcessor; diff --git a/framework/src/test/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/TestBulkListener.java b/framework/src/test/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/TestBulkListener.java index 1ce8b614a..19c69f451 100644 --- a/framework/src/test/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/TestBulkListener.java +++ b/framework/src/test/java/fr/pilato/elasticsearch/crawler/fs/framework/bulk/TestBulkListener.java @@ -4,13 +4,13 @@ import org.apache.logging.log4j.Logger; class TestBulkListener extends FsCrawlerSimpleBulkProcessorListener { - Logger logger = LogManager.getLogger(TestBulkListener.class); + private static final Logger logger = LogManager.getLogger(); TestBulkRequest latestRequest; int nbSuccessfulExecutions = 0; @Override public void beforeBulk(long executionId, TestBulkRequest request) { - logger.trace("Execution [{}] starting", nbSuccessfulExecutions, request.numberOfActions()); + logger.trace("Execution [{}] starting with [{}] actions", executionId, request.numberOfActions()); super.beforeBulk(executionId, request); } diff --git a/plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/FsCrawlerExtensionFsProviderAbstract.java b/plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/FsCrawlerExtensionFsProviderAbstract.java index c1b1b718b..f2c27b9d0 100644 --- a/plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/FsCrawlerExtensionFsProviderAbstract.java +++ b/plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/FsCrawlerExtensionFsProviderAbstract.java @@ -27,7 +27,7 @@ import static fr.pilato.elasticsearch.crawler.fs.framework.JsonUtil.parseJsonAsDocumentContext; public abstract class FsCrawlerExtensionFsProviderAbstract implements FsCrawlerExtensionFsProvider { - private static final Logger logger = LogManager.getLogger(FsCrawlerExtensionFsProviderAbstract.class); + private static final Logger logger = LogManager.getLogger(); protected DocumentContext document; protected abstract void parseSettings() throws PathNotFoundException; diff --git a/plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/FsCrawlerPlugin.java b/plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/FsCrawlerPlugin.java index 5e1eb003d..42f747f86 100644 --- a/plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/FsCrawlerPlugin.java +++ b/plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/FsCrawlerPlugin.java @@ -27,7 +27,7 @@ */ public abstract class FsCrawlerPlugin extends Plugin { - private final Logger logger = LogManager.getLogger(FsCrawlerPlugin.class); + private final Logger logger = LogManager.getLogger(); protected abstract String getName(); diff --git a/plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/FsCrawlerPluginsManager.java b/plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/FsCrawlerPluginsManager.java index f66c414e7..f1e061048 100644 --- a/plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/FsCrawlerPluginsManager.java +++ b/plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/FsCrawlerPluginsManager.java @@ -27,7 +27,7 @@ public class FsCrawlerPluginsManager implements AutoCloseable { - private static final Logger logger = LogManager.getLogger(FsCrawlerPluginsManager.class); + private static final Logger logger = LogManager.getLogger(); private final PluginManager pluginManager; private final HashMap fsProviders; diff --git a/plugins/fs-http-plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/fs/http/FsHttpPlugin.java b/plugins/fs-http-plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/fs/http/FsHttpPlugin.java index 4456f5466..3138230e1 100644 --- a/plugins/fs-http-plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/fs/http/FsHttpPlugin.java +++ b/plugins/fs-http-plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/fs/http/FsHttpPlugin.java @@ -33,7 +33,7 @@ import java.net.URL; public class FsHttpPlugin extends FsCrawlerPlugin { - private static final Logger logger = LogManager.getLogger(FsHttpPlugin.class); + private static final Logger logger = LogManager.getLogger(); @Override protected String getName() { diff --git a/plugins/fs-local-plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/fs/local/FsLocalPlugin.java b/plugins/fs-local-plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/fs/local/FsLocalPlugin.java index 33a273c49..5aa8f4e1c 100644 --- a/plugins/fs-local-plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/fs/local/FsLocalPlugin.java +++ b/plugins/fs-local-plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/fs/local/FsLocalPlugin.java @@ -31,7 +31,7 @@ import java.nio.file.Path; public class FsLocalPlugin extends FsCrawlerPlugin { - private static final Logger logger = LogManager.getLogger(FsLocalPlugin.class); + private static final Logger logger = LogManager.getLogger(); @Override protected String getName() { diff --git a/plugins/fs-s3-plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/fs/s3/FsS3Plugin.java b/plugins/fs-s3-plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/fs/s3/FsS3Plugin.java index 3298be48c..ca3ccfbb2 100644 --- a/plugins/fs-s3-plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/fs/s3/FsS3Plugin.java +++ b/plugins/fs-s3-plugin/src/main/java/fr/pilato/elasticsearch/crawler/plugins/fs/s3/FsS3Plugin.java @@ -36,7 +36,7 @@ import java.security.NoSuchAlgorithmException; public class FsS3Plugin extends FsCrawlerPlugin { - private static final Logger logger = LogManager.getLogger(FsS3Plugin.class); + private static final Logger logger = LogManager.getLogger(); @Override protected String getName() { diff --git a/rest/src/main/java/fr/pilato/elasticsearch/crawler/fs/rest/DocumentApi.java b/rest/src/main/java/fr/pilato/elasticsearch/crawler/fs/rest/DocumentApi.java index 053fb1b0b..cb5c278ab 100644 --- a/rest/src/main/java/fr/pilato/elasticsearch/crawler/fs/rest/DocumentApi.java +++ b/rest/src/main/java/fr/pilato/elasticsearch/crawler/fs/rest/DocumentApi.java @@ -33,6 +33,8 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.MediaType; import org.apache.commons.io.FilenameUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import org.glassfish.jersey.media.multipart.FormDataParam; @@ -51,6 +53,7 @@ @Path("/_document") public class DocumentApi extends RestApi { + private static final Logger logger = LogManager.getLogger(); private final FsCrawlerDocumentService documentService; private final FsSettings settings; diff --git a/rest/src/main/java/fr/pilato/elasticsearch/crawler/fs/rest/RestApi.java b/rest/src/main/java/fr/pilato/elasticsearch/crawler/fs/rest/RestApi.java index ced2f7051..adc5e454d 100644 --- a/rest/src/main/java/fr/pilato/elasticsearch/crawler/fs/rest/RestApi.java +++ b/rest/src/main/java/fr/pilato/elasticsearch/crawler/fs/rest/RestApi.java @@ -19,11 +19,5 @@ package fr.pilato.elasticsearch.crawler.fs.rest; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - class RestApi { - - final Logger logger = LogManager.getLogger(); - } diff --git a/rest/src/main/java/fr/pilato/elasticsearch/crawler/fs/rest/RestServer.java b/rest/src/main/java/fr/pilato/elasticsearch/crawler/fs/rest/RestServer.java index 20ba67354..52d791354 100644 --- a/rest/src/main/java/fr/pilato/elasticsearch/crawler/fs/rest/RestServer.java +++ b/rest/src/main/java/fr/pilato/elasticsearch/crawler/fs/rest/RestServer.java @@ -34,9 +34,8 @@ import java.net.URI; public class RestServer { - - private static HttpServer httpServer = null; private static final Logger logger = LogManager.getLogger(); + private static HttpServer httpServer = null; /** * Starts Grizzly HTTP server exposing JAX-RS resources defined in this application. diff --git a/rest/src/main/java/fr/pilato/elasticsearch/crawler/fs/rest/UploadApi.java b/rest/src/main/java/fr/pilato/elasticsearch/crawler/fs/rest/UploadApi.java index e732886b8..1f5cd7652 100644 --- a/rest/src/main/java/fr/pilato/elasticsearch/crawler/fs/rest/UploadApi.java +++ b/rest/src/main/java/fr/pilato/elasticsearch/crawler/fs/rest/UploadApi.java @@ -27,6 +27,8 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import org.glassfish.jersey.media.multipart.FormDataParam; @@ -37,7 +39,7 @@ @Path("/_upload") @Deprecated public class UploadApi extends RestApi { - + private static final Logger logger = LogManager.getLogger(); private final DocumentApi documentApi; UploadApi(FsSettings settings, FsCrawlerDocumentService documentService) { diff --git a/settings/src/main/java/fr/pilato/elasticsearch/crawler/fs/settings/Elasticsearch.java b/settings/src/main/java/fr/pilato/elasticsearch/crawler/fs/settings/Elasticsearch.java index 8855e4387..b27f84a50 100644 --- a/settings/src/main/java/fr/pilato/elasticsearch/crawler/fs/settings/Elasticsearch.java +++ b/settings/src/main/java/fr/pilato/elasticsearch/crawler/fs/settings/Elasticsearch.java @@ -32,8 +32,7 @@ import java.util.Objects; public class Elasticsearch { - - protected static final Logger logger = LogManager.getLogger(Elasticsearch.class); + private static final Logger logger = LogManager.getLogger(); public static final ServerUrl NODE_DEFAULT = new ServerUrl("https://127.0.0.1:9200"); private List nodes = Collections.singletonList(NODE_DEFAULT); diff --git a/settings/src/main/java/fr/pilato/elasticsearch/crawler/fs/settings/Fs.java b/settings/src/main/java/fr/pilato/elasticsearch/crawler/fs/settings/Fs.java index 23dfa0b7c..fc7d9024d 100644 --- a/settings/src/main/java/fr/pilato/elasticsearch/crawler/fs/settings/Fs.java +++ b/settings/src/main/java/fr/pilato/elasticsearch/crawler/fs/settings/Fs.java @@ -33,7 +33,7 @@ @SuppressWarnings("SameParameterValue") public class Fs { - protected static final Logger logger = LogManager.getLogger(Fs.class); + private static final Logger logger = LogManager.getLogger(); private String url; private TimeValue updateRate = TimeValue.timeValueMinutes(15); diff --git a/settings/src/main/java/fr/pilato/elasticsearch/crawler/fs/settings/ServerUrl.java b/settings/src/main/java/fr/pilato/elasticsearch/crawler/fs/settings/ServerUrl.java index e8b2d58a2..0ded56f16 100644 --- a/settings/src/main/java/fr/pilato/elasticsearch/crawler/fs/settings/ServerUrl.java +++ b/settings/src/main/java/fr/pilato/elasticsearch/crawler/fs/settings/ServerUrl.java @@ -31,9 +31,6 @@ * This is used in the Elasticsearch.Node class. */ public class ServerUrl { - - protected static final Logger logger = LogManager.getLogger(ServerUrl.class); - private String url; private String cloudId; diff --git a/test-framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/test/framework/FsCrawlerUtilForTests.java b/test-framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/test/framework/FsCrawlerUtilForTests.java index 7d688339c..31936c1ad 100644 --- a/test-framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/test/framework/FsCrawlerUtilForTests.java +++ b/test-framework/src/main/java/fr/pilato/elasticsearch/crawler/fs/test/framework/FsCrawlerUtilForTests.java @@ -27,7 +27,7 @@ import java.nio.file.Path; class FsCrawlerUtilForTests { - private static final Logger logger = LogManager.getLogger(FsCrawlerUtilForTests.class); + private static final Logger logger = LogManager.getLogger(); private static final String CLASSPATH_RESOURCES_ROOT = "/fr/pilato/elasticsearch/crawler/fs/_default/"; private static final String[] MAPPING_RESOURCES = { diff --git a/tika/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaDocParser.java b/tika/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaDocParser.java index f5b8b35e8..2e36ab653 100644 --- a/tika/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaDocParser.java +++ b/tika/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaDocParser.java @@ -55,7 +55,7 @@ */ public class TikaDocParser { - private final static Logger logger = LogManager.getLogger(TikaDocParser.class); + private final static Logger logger = LogManager.getLogger(); public static void generate(FsSettings fsSettings, InputStream inputStream, String filename, String fullFilename, Doc doc, MessageDigest messageDigest, long filesize) throws IOException { @@ -246,7 +246,7 @@ private static List commaDelimitedListToStringArray(String str) { result.add(str.substring(pos, delPos)); pos = delPos + 1; } - if (str.length() > 0 && pos <= str.length()) { + if (!str.isEmpty() && pos <= str.length()) { // Add rest of String, but not in case of empty input. result.add(str.substring(pos)); } diff --git a/tika/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaInstance.java b/tika/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaInstance.java index 8612d30e6..f8d786a8c 100644 --- a/tika/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaInstance.java +++ b/tika/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaInstance.java @@ -62,7 +62,7 @@ */ public class TikaInstance { - private static final Logger logger = LogManager.getLogger(TikaInstance.class); + private static final Logger logger = LogManager.getLogger(); private static Parser parser; private static ParseContext context; diff --git a/tika/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/XmlDocParser.java b/tika/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/XmlDocParser.java index 03252bed0..2d52b53b5 100644 --- a/tika/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/XmlDocParser.java +++ b/tika/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/XmlDocParser.java @@ -37,7 +37,7 @@ @SuppressWarnings("unchecked") public class XmlDocParser { - private final static Logger logger = LogManager.getLogger(XmlDocParser.class); + private final static Logger logger = LogManager.getLogger(); private static final ObjectMapper xmlMapper; static {