From 01c6fb09ba7e3f82b3681fc051c97b06b3220a9b Mon Sep 17 00:00:00 2001 From: bohlski Date: Mon, 17 Oct 2022 12:56:14 +0200 Subject: [PATCH] Fix logs not using built-in string formatting --- .../alarm/BasicAlarmService.java | 2 +- .../alarm/handling/handlers/AlarmLogger.java | 6 +-- .../alarm/handling/handlers/AlarmMailer.java | 4 +- .../alarm/handling/handlers/AlarmStorer.java | 2 +- .../alarm/store/AlarmDatabaseExtractor.java | 2 +- .../alarm/store/AlarmDatabaseIngestor.java | 2 +- .../collector/AuditTrailCollector.java | 5 +-- .../store/AuditDatabaseExtractor.java | 4 +- .../ConversationBasedGetFileClient.java | 15 +++---- .../ConversationBasedGetFileIDsClient.java | 20 +++++----- .../ConversationEventMonitor.java | 15 +++---- .../ConversationBasedDeleteFileClient.java | 6 +-- .../ConversationBasedPutFileClient.java | 3 +- .../ConversationBasedReplaceFileClient.java | 22 ++++++----- .../settings/XMLFileSettingsLoader.java | 2 +- .../common/utils/CalendarUtils.java | 2 +- .../bitrepository/common/utils/FileUtils.java | 2 +- .../protocol/activemq/ActiveMQMessageBus.java | 36 ++++++++--------- .../messagebus/MessageBusManager.java | 2 +- .../security/BasicSecurityManager.java | 8 ++-- .../protocol/bus/LocalActiveMQBroker.java | 4 +- .../protocol/bus/MessageReceiver.java | 6 +-- .../cache/database/IntegrityDAO.java | 2 +- .../IntegrityCollectorEventHandler.java | 39 ++++++++++++------- .../collector/SimpleChecksumEventHandler.java | 21 +++++----- .../web/RestIntegrityService.java | 2 +- .../workflow/SaltedChecksumWorkflow.java | 33 +++++++++------- .../workflow/step/GetChecksumForFileStep.java | 13 ++++--- .../step/HandleObsoleteChecksumsStep.java | 7 ++-- .../java/org/bitrepository/pillar/Pillar.java | 2 +- .../DeleteFileRequestHandler.java | 14 +++---- .../GetChecksumsRequestHandler.java | 2 +- .../GetFileIDsRequestHandler.java | 4 +- .../messagehandler/GetFileRequestHandler.java | 8 ++-- .../pillar/messagehandler/PillarMediator.java | 4 +- .../messagehandler/PillarMessageHandler.java | 2 +- .../ReplaceFileRequestHandler.java | 13 +++---- .../RecalculateChecksumJob.java | 2 +- .../pillar/store/ChecksumStorageModel.java | 16 ++++---- .../pillar/store/FileStorageModel.java | 26 ++++++------- .../checksumdatabase/ChecksumDBMigrator.java | 2 +- .../checksumdatabase/ChecksumExtractor.java | 4 +- .../store/filearchive/ReferenceArchive.java | 8 ++-- .../perf/PillarPerformanceTest.java | 14 +++---- .../service/AlarmDispatcher.java | 10 ++--- .../audit/AuditTrailContributorDAO.java | 8 ++-- .../service/database/DBConnector.java | 15 +++---- .../service/database/DatabaseCreator.java | 4 +- .../service/database/DatabaseUtils.java | 20 +++++----- .../service/database/SqlScriptRunner.java | 4 +- .../scheduler/TimerBasedScheduler.java | 8 ++-- .../service/workflow/JobTimerTask.java | 6 +-- .../service/workflow/WorkflowManager.java | 4 +- .../database/DerbyDatabaseDestroyer.java | 2 +- .../bitrepository/webservice/ServiceUrl.java | 30 +++++++------- 55 files changed, 271 insertions(+), 248 deletions(-) diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/BasicAlarmService.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/BasicAlarmService.java index 88b703fd4..48addcbb4 100644 --- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/BasicAlarmService.java +++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/BasicAlarmService.java @@ -63,7 +63,7 @@ public BasicAlarmService(MessageBus messageBus, Settings settings, AlarmStore st @Override public void addHandler(AlarmHandler handler) { - log.info("Adding handler '" + handler.getClass().getName() + "' for alarms."); + log.info("Adding handler '{}' for alarms.", handler.getClass().getName()); alarmMediator.addHandler(handler); } diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmLogger.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmLogger.java index 527b1a866..68c733da7 100644 --- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmLogger.java +++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmLogger.java @@ -43,16 +43,16 @@ public class AlarmLogger implements AlarmHandler { * Constructor. Nothing to initialize. */ public AlarmLogger() { - log.debug("Instantiating the AlarmHandler '" + this.getClass().getCanonicalName() + "'"); + log.debug("Instantiating the AlarmHandler '{}'", this.getClass().getCanonicalName()); } @Override public void handleAlarm(AlarmMessage msg) { - log.info("ALARM: " + msg.toString()); + log.info("ALARM: {}", msg.toString()); } @Override public void close() { - log.debug("Closing the AlarmHandler '" + this.getClass().getCanonicalName() + "'"); + log.debug("Closing the AlarmHandler '{}'", this.getClass().getCanonicalName()); } } diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmMailer.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmMailer.java index 429d60ccf..185b56eac 100644 --- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmMailer.java +++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmMailer.java @@ -89,7 +89,7 @@ public AlarmMailer(AlarmServiceSettings settings) { this.messageReceiver = config.getMailReceiver(); this.messageSender = config.getMailSender(); this.mailServer = config.getMailServer(); - log.debug("Instantiating the AlarmHandler '" + this.getClass().getCanonicalName() + "'"); + log.debug("Instantiating the AlarmHandler '{}'", this.getClass().getCanonicalName()); } @Override @@ -208,6 +208,6 @@ private void sendMessage(Message msg) { @Override public void close() { - log.debug("Closing the AlarmHandler '" + this.getClass().getCanonicalName() + "'"); + log.debug("Closing the AlarmHandler '{}'", this.getClass().getCanonicalName()); } } diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmStorer.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmStorer.java index 6bed5ebab..02c54658c 100644 --- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmStorer.java +++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmStorer.java @@ -60,7 +60,7 @@ public void handleAlarm(AlarmMessage message) { @Override public void close() { - log.debug("Closing the AlarmHandler '" + this.getClass().getCanonicalName() + "'"); + log.debug("Closing the AlarmHandler '{}'", this.getClass().getCanonicalName()); store.shutdown(); } } diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseExtractor.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseExtractor.java index 71a021bec..888749c48 100644 --- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseExtractor.java +++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseExtractor.java @@ -131,7 +131,7 @@ public List extractAlarms() { List res = new ArrayList<>(); ps.setFetchSize(100); try (ResultSet result = ps.executeQuery()) { - log.debug("Extracting sql '" + sql + "' with arguments '" + Arrays.asList(extractArgumentsFromModel()) + "'"); + log.debug("Extracting sql '{}' with arguments '{}'", sql, Arrays.asList(extractArgumentsFromModel())); while (result.next()) { res.add(extractAlarm(result)); } diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseIngestor.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseIngestor.java index a836c7ad9..315687845 100644 --- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseIngestor.java +++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseIngestor.java @@ -206,7 +206,7 @@ private synchronized long retrieveComponentGuid(String componentId) { Long guid = DatabaseUtils.selectLongValue(dbConnector, sqlRetrieve, componentId); if (guid == null) { - log.debug("Inserting component '" + componentId + "' into the component table."); + log.debug("Inserting component '{}' into the component table", componentId); String sqlInsert = "INSERT INTO " + COMPONENT_TABLE + " ( " + COMPONENT_ID + " ) VALUES ( ? )"; DatabaseUtils.executeStatement(dbConnector, sqlInsert, componentId); diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/AuditTrailCollector.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/AuditTrailCollector.java index 0d2b1ade2..c52f18426 100644 --- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/AuditTrailCollector.java +++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/AuditTrailCollector.java @@ -85,9 +85,8 @@ public AuditTrailCollector(Settings settings, AuditTrailClient client, AuditTrai alarmDispatcher); AuditTrailCollectionTimerTask collectorTask = new AuditTrailCollectionTimerTask( collector, collectionIntervalMillis, Math.toIntExact(getGracePeriod().toMillis())); - log.info("Will start collection of audit trail every " + - TimeUtils.durationToHuman(collectionInterval) + " " + - "after a grace period of " + TimeUtils.durationToHuman(getGracePeriod())); + log.info("Will start collection of audit trails every {} after a grace period of {}", + TimeUtils.durationToHuman(collectionInterval), TimeUtils.durationToHuman(getGracePeriod())); timer.scheduleAtFixedRate(collectorTask, getGracePeriod().toMillis(), collectionIntervalMillis / 10); collectorTasks.put(c.getID(), collectorTask); } diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditDatabaseExtractor.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditDatabaseExtractor.java index cc85d6238..03f61a42f 100644 --- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditDatabaseExtractor.java +++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditDatabaseExtractor.java @@ -149,8 +149,8 @@ public AuditEventIterator extractAuditEventsByIterator() { + joinWithContributorTable() + createRestriction() + " ORDER BY " + AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_OPERATION_DATE; try { - log.debug("Creating prepared statement with sql '" + sql + "' and arguments '" - + Arrays.asList(extractArgumentsFromModel()) + " for AuditEventIterator"); + log.debug("Creating prepared statement with sql '{}' and arguments '{}' for AuditEventIterator", + sql, Arrays.asList(extractArgumentsFromModel())); PreparedStatement ps = DatabaseUtils.createPreparedStatement(dbConnector.getConnection(), sql, extractArgumentsFromModel()); return new AuditEventIterator(ps); diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getfile/ConversationBasedGetFileClient.java b/bitrepository-client/src/main/java/org/bitrepository/access/getfile/ConversationBasedGetFileClient.java index 165938ce6..115eec0a2 100644 --- a/bitrepository-client/src/main/java/org/bitrepository/access/getfile/ConversationBasedGetFileClient.java +++ b/bitrepository-client/src/main/java/org/bitrepository/access/getfile/ConversationBasedGetFileClient.java @@ -82,9 +82,9 @@ public void getFileFromFastestPillar(String collectionID, String fileID, FilePar ArgumentValidator.checkNotNull(eventHandler, "eventHandler"); validateFileID(fileID); - log.info("Requesting the file '" + fileID + " from the fastest pillar"); - getFile(collectionID, messageBus, settings, fileID, filePart, SettingsUtils.getPillarIDsForCollection(collectionID), uploadUrl, - eventHandler, auditTrailInformation); + log.info("Requesting the file '{}' from the fastest pillar", fileID); + getFile(collectionID, messageBus, settings, fileID, filePart, + SettingsUtils.getPillarIDsForCollection(collectionID), uploadUrl, eventHandler, auditTrailInformation); } /** @@ -109,8 +109,9 @@ public void getFileFromSpecificPillar(String collectionID, String fileID, FilePa ArgumentValidator.checkNotNull(eventHandler, "eventHandler"); validateFileID(fileID); - log.info("Requesting the file '" + fileID + "' from pillar '" + pillarID + "'."); - getFile(collectionID, messageBus, settings, fileID, filePart, List.of(pillarID), uploadUrl, eventHandler, auditTrailInformation); + log.info("Requesting the file '{}' from pillar '{}'", fileID, pillarID); + getFile(collectionID, messageBus, settings, fileID, filePart, List.of(pillarID), uploadUrl, eventHandler, + auditTrailInformation); } /** @@ -128,8 +129,8 @@ public void getFileFromSpecificPillar(String collectionID, String fileID, FilePa */ private void getFile(String collectionID, MessageBus messageBus, Settings settings, String fileID, FilePart filePart, Collection contributors, URL uploadUrl, EventHandler eventHandler, String auditTrailInformation) { - GetFileConversationContext context = new GetFileConversationContext(collectionID, fileID, uploadUrl, filePart, contributors, - settings, messageBus, clientID, eventHandler, auditTrailInformation); + GetFileConversationContext context = new GetFileConversationContext(collectionID, fileID, uploadUrl, filePart, + contributors, settings, messageBus, clientID, eventHandler, auditTrailInformation); startConversation(context, new IdentifyingPillarsForGetFile(context)); } } diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/ConversationBasedGetFileIDsClient.java b/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/ConversationBasedGetFileIDsClient.java index 07b1e2d4b..b78ee8143 100644 --- a/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/ConversationBasedGetFileIDsClient.java +++ b/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/ConversationBasedGetFileIDsClient.java @@ -45,7 +45,7 @@ * The reference implementation of the client side of the GetFileIDs identification and operation. * The default GetFileIDsClient *

- * This class is just a thin wrapper which creates a conversion each time a operation is started. + * This class is just a thin wrapper which creates a conversion each time an operation is started. */ public class ConversationBasedGetFileIDsClient extends AbstractClient implements GetFileIDsClient { private final Logger log = LoggerFactory.getLogger(getClass()); @@ -57,25 +57,27 @@ public class ConversationBasedGetFileIDsClient extends AbstractClient implements * @param clientID The ID of the client * @see AbstractClient */ - public ConversationBasedGetFileIDsClient(MessageBus messageBus, ConversationMediator conversationMediator, Settings settings, - String clientID) { + public ConversationBasedGetFileIDsClient(MessageBus messageBus, ConversationMediator conversationMediator, + Settings settings, String clientID) { super(settings, conversationMediator, messageBus, clientID); } @Override - public void getFileIDs(String collectionID, ContributorQuery[] contributorQueries, String fileID, URL addressForResult, - EventHandler eventHandler) { + public void getFileIDs(String collectionID, ContributorQuery[] contributorQueries, String fileID, + URL addressForResult, EventHandler eventHandler) { ArgumentValidator.checkNotNullOrEmpty(collectionID, "collectionID"); validateFileID(fileID); if (contributorQueries == null) { - contributorQueries = ContributorQueryUtils.createFullContributorQuery(SettingsUtils.getPillarIDsForCollection(collectionID)); + contributorQueries = ContributorQueryUtils.createFullContributorQuery( + SettingsUtils.getPillarIDsForCollection(collectionID)); } - log.info("Requesting the fileIDs for file '" + fileID + "' with query " + Arrays.asList(contributorQueries) + ". " + + log.info("Requesting the fileIDs for file '{}' with query {}. {}", fileID, Arrays.asList(contributorQueries), (addressForResult != null ? "The result should be uploaded to '" + addressForResult + "'." : "")); - GetFileIDsConversationContext context = new GetFileIDsConversationContext(collectionID, contributorQueries, fileID, - addressForResult, settings, messageBus, clientID, ContributorQueryUtils.getContributors(contributorQueries), eventHandler); + GetFileIDsConversationContext context = new GetFileIDsConversationContext( + collectionID, contributorQueries, fileID, addressForResult, settings, messageBus, clientID, + ContributorQueryUtils.getContributors(contributorQueries), eventHandler); startConversation(context, new IdentifyPillarsForGetFileIDs(context)); } diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/ConversationEventMonitor.java b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/ConversationEventMonitor.java index ab1410b33..cd02425f8 100644 --- a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/ConversationEventMonitor.java +++ b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/ConversationEventMonitor.java @@ -60,7 +60,7 @@ public class ConversationEventMonitor { /** * The general logger. */ - private final ConversationLogger log; + private final ConversationLogger logger; /** * The event logger. Adds context information to the log entry. */ @@ -94,7 +94,7 @@ public class ConversationEventMonitor { */ public ConversationEventMonitor(String collectionID, String conversationID, OperationType operationType, String fileID, EventHandler eventHandler) { - log = new ConversationLogger(); + logger = new ConversationLogger(); this.collectionID = collectionID; this.conversationID = getShortConversationID(conversationID); this.operationType = operationType; @@ -260,7 +260,8 @@ public void operationFailed(OperationFailedEvent event) { * @param e Description of the context */ public void invalidMessage(Message message, Exception e) { - log.warn("Received invalid " + message.getClass().getSimpleName() + " from " + message.getFrom() + "\nMessage: " + message, e); + logger.warn("Received invalid " + message.getClass().getSimpleName() + " from " + message.getFrom() + + "\nMessage: " + message, e); notifyEventListeners((createContributorEvent(WARNING, e.getMessage(), message.getFrom()))); } @@ -270,7 +271,7 @@ public void invalidMessage(Message message, Exception e) { * @param message the message */ public void outOfSequenceMessage(Message message) { - log.warn("Can not handle messages of type " + message.getClass().getSimpleName()); + logger.warn("Can not handle messages of type " + message.getClass().getSimpleName()); } /** @@ -302,7 +303,7 @@ public void warning(String info, Exception e) { * @param info The debug info to log. */ public void debug(String info) { - log.debug(info); + logger.debug(info); } /** @@ -312,7 +313,7 @@ public void debug(String info) { * @param e the Exception to log */ public void debug(String info, Exception e) { - log.debug(info, e); + logger.debug(info, e); } /** @@ -457,7 +458,7 @@ private void notifyEventListeners(OperationEvent event) { try { eventHandler.handleEvent(event); } catch (Throwable thr) { - log.warn("The eventHandler (" + eventHandler + ") failed when called with event " + event, thr); + logger.warn("The eventHandler (" + eventHandler + ") failed when called with event " + event, thr); } } } diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/ConversationBasedDeleteFileClient.java b/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/ConversationBasedDeleteFileClient.java index 2274cd653..3f4db1196 100644 --- a/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/ConversationBasedDeleteFileClient.java +++ b/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/ConversationBasedDeleteFileClient.java @@ -69,9 +69,9 @@ public void deleteFile(String collectionID, String fileID, String pillarID, ArgumentValidator.checkNotNull(checksumForPillar, "ChecksumForPillar"); } - log.info("Requesting the deletion of the file '" + fileID + "' from the pillar '" + pillarID - + "' with checksum '" + checksumForPillar + "', while requested checksum '" + checksumRequested - + "'. And the audit trail information '" + auditTrailInformation + "'."); + log.info("Requesting the deletion of the file '{}' from the pillar '{}' with checksum '{}'," + + " and requested checksum type '{}'. Audit trail info: '{}'", + fileID, pillarID, checksumForPillar, checksumRequested, auditTrailInformation); DeleteFileConversationContext context = new DeleteFileConversationContext(collectionID, fileID, checksumForPillar, checksumRequested, settings, messageBus, clientID, diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/ConversationBasedPutFileClient.java b/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/ConversationBasedPutFileClient.java index cd1b6050f..df6d4ad2c 100644 --- a/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/ConversationBasedPutFileClient.java +++ b/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/ConversationBasedPutFileClient.java @@ -67,7 +67,8 @@ public void putFile(String collectionID, URL url, String fileID, long sizeOfFile MessageDataTypeValidator.validate(checksumForValidationAtPillar, "checksumForValidationAtPillar"); MessageDataTypeValidator.validate(checksumRequestsForValidation, "checksumRequestsForValidation"); - log.info("Starting putFile of " + fileID + " for client " + clientID + ". " + auditTrailInformation); + log.info("Starting putFile of file '{}' for client '{}'. Audit trail info: {}", + fileID, clientID, auditTrailInformation); if (settings.getRepositorySettings().getProtocolSettings().isRequireChecksumForNewFileRequests()) { ArgumentValidator.checkNotNull(checksumForValidationAtPillar, "ChecksumDataForFileTYPE checksumForValidationAtPillar"); } diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/ConversationBasedReplaceFileClient.java b/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/ConversationBasedReplaceFileClient.java index c70f02630..8d722159b 100644 --- a/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/ConversationBasedReplaceFileClient.java +++ b/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/ConversationBasedReplaceFileClient.java @@ -32,6 +32,7 @@ import org.bitrepository.client.eventhandler.EventHandler; import org.bitrepository.common.ArgumentValidator; import org.bitrepository.common.settings.Settings; +import org.bitrepository.common.utils.FileSizeUtils; import org.bitrepository.modify.replacefile.conversation.IdentifyPillarsForReplaceFile; import org.bitrepository.modify.replacefile.conversation.ReplaceFileConversationContext; import org.bitrepository.protocol.messagebus.MessageBus; @@ -67,27 +68,28 @@ public void replaceFile(String collectionID, String fileID, String pillarID, Che EventHandler eventHandler, String auditTrailInformation) { ArgumentValidator.checkNotNullOrEmpty(collectionID, "collectionID"); ArgumentValidator.checkNotNullOrEmpty(fileID, "fileID"); - validateFileID(fileID); - ArgumentValidator.checkNotNullOrEmpty(fileID, "String fileID"); ArgumentValidator.checkNotNullOrEmpty(pillarID, "String pillarID"); + validateFileID(fileID); if (settings.getRepositorySettings().getProtocolSettings().isRequireChecksumForDestructiveRequests()) { - ArgumentValidator.checkNotNull(checksumForDeleteAtPillar, "ChecksumDataForFileTYPE checksumForDeleteAtPillar"); + ArgumentValidator.checkNotNull(checksumForDeleteAtPillar, + "ChecksumDataForFileTYPE checksumForDeleteAtPillar"); MessageDataTypeValidator.validate(checksumForDeleteAtPillar, "checksumForDeleteAtPillar"); } if (settings.getRepositorySettings().getProtocolSettings().isRequireChecksumForNewFileRequests()) { ArgumentValidator.checkNotNull(checksumForNewFileValidationAtPillar, "ChecksumDataForFileTYPE checksumForNewFileValidationAtPillar"); - MessageDataTypeValidator.validate(checksumForNewFileValidationAtPillar, "checksumForNewFileValidationAtPillar"); + MessageDataTypeValidator.validate(checksumForNewFileValidationAtPillar, + "checksumForNewFileValidationAtPillar"); } MessageDataTypeValidator.validate(checksumRequestedForDeletedFile, "checksumRequestedForDeletedFile"); MessageDataTypeValidator.validate(checksumRequestsForNewFile, "checksumRequestsForNewFile"); - log.info("Requesting the replacement of the file '" + fileID + "' at the pillar '" + pillarID + "' from the " - + "URL '" + url + "' and with the size '" + sizeOfNewFile + "', where the old file has the checksum '" - + checksumForDeleteAtPillar + "' and is requested the checksum '" + checksumRequestedForDeletedFile - + "', and the new file has the checksum '" + checksumForNewFileValidationAtPillar + "' and requesting " - + "the checksum '" + checksumRequestsForNewFile + "'. With the auditTrail '" + auditTrailInformation - + "'"); + log.info("Requesting replacement of file '{}' at pillar '{}' from URL '{}' with size {}," + + " where old file has checksum '{}' and requested checksum spec '{}'." + + " New file has checksum '{}' and requested checksum spec '{}'. Audit trail info: '{}'", + fileID, pillarID, url, FileSizeUtils.toHumanShort(sizeOfNewFile), checksumForDeleteAtPillar, + checksumRequestedForDeletedFile, checksumForNewFileValidationAtPillar, checksumRequestsForNewFile, + auditTrailInformation); ReplaceFileConversationContext context = new ReplaceFileConversationContext(collectionID, fileID, sizeOfNewFile, url, checksumForDeleteAtPillar, checksumRequestedForDeletedFile, checksumForNewFileValidationAtPillar, checksumRequestsForNewFile, settings, messageBus, diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/settings/XMLFileSettingsLoader.java b/bitrepository-core/src/main/java/org/bitrepository/common/settings/XMLFileSettingsLoader.java index 74d366b23..3ef70d126 100644 --- a/bitrepository-core/src/main/java/org/bitrepository/common/settings/XMLFileSettingsLoader.java +++ b/bitrepository-core/src/main/java/org/bitrepository/common/settings/XMLFileSettingsLoader.java @@ -82,7 +82,7 @@ public T loadSettings(Class settingsClass) { throw new RuntimeException("Unable to load settings from " + fileLocation, e); } } - log.debug("Loading the settings file '" + fileLocation + "'."); + log.debug("Loading the settings file '{}'", fileLocation); try { jaxbHelper.validate(configStreamValidate); return jaxbHelper.loadXml(settingsClass, configStreamLoad); diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/utils/CalendarUtils.java b/bitrepository-core/src/main/java/org/bitrepository/common/utils/CalendarUtils.java index 216887426..1ecd0469a 100644 --- a/bitrepository-core/src/main/java/org/bitrepository/common/utils/CalendarUtils.java +++ b/bitrepository-core/src/main/java/org/bitrepository/common/utils/CalendarUtils.java @@ -75,7 +75,7 @@ private void setTimeZone(TimeZone timezone) { */ public static XMLGregorianCalendar getXmlGregorianCalendar(Date date) { if (date == null) { - log.debug("Cannot convert the date '" + date + "'. Returning epoch instead."); + log.debug("Date is null. Returning epoch instead."); date = new Date(0); } diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileUtils.java b/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileUtils.java index fd92a33d7..8f3bd811b 100644 --- a/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileUtils.java +++ b/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileUtils.java @@ -144,7 +144,7 @@ public static void deleteDirIfExists(File dir) { } } if (!dir.delete()) { - log.warn("Could not delete '" + dir.getAbsolutePath() + "'"); + log.warn("Could not delete '{}'", dir.getAbsolutePath()); } } diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/activemq/ActiveMQMessageBus.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/activemq/ActiveMQMessageBus.java index 12b543e06..303acf769 100644 --- a/bitrepository-core/src/main/java/org/bitrepository/protocol/activemq/ActiveMQMessageBus.java +++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/activemq/ActiveMQMessageBus.java @@ -168,7 +168,7 @@ public ActiveMQMessageBus( Settings settings, SecurityManager securityManager) { configuration = settings.getMessageBusConfiguration(); - log.info("Initializing ActiveMQMessageBus:'" + configuration + "'."); + log.info("Initializing ActiveMQMessageBus: '{}'", configuration); this.securityManager = securityManager; clientID = settings.getComponentID(); String schemaLocation = "BitRepositoryMessages.xsd"; @@ -189,7 +189,7 @@ public ActiveMQMessageBus( } catch (JMSException e) { throw new CoordinationLayerException("Unable to initialise connection to message bus", e); } - log.debug("ActiveMQConnection initialized for '" + configuration + "'."); + log.debug("ActiveMQConnection initialized for '{}'", configuration); MessageThreadPools messageThreadPoolConfig = null; if (settings.getReferenceSettings().getGeneralSettings() != null) { @@ -220,7 +220,7 @@ public synchronized void addListener(String destinationID, final MessageListener @Override public synchronized void addListener(String destinationID, final MessageListener listener, boolean durable) { - log.debug("Adding " + (durable ? "durable " : "") + "listener '{}' to destination: '{}' on message-bus '{}'.", + log.debug("Adding {} listener '{}' to destination: '{}' on message-bus '{}'.", (durable ? "durable " : ""), listener, destinationID, configuration.getName()); MessageConsumer consumer = getMessageConsumer(destinationID, listener, durable); try { @@ -233,8 +233,8 @@ public synchronized void addListener(String destinationID, final MessageListener @Override public synchronized void removeListener(String destinationID, MessageListener listener) { - log.debug("Removing listener '" + listener + "' from destination: '" + destinationID + "' " + - "on message-bus '" + configuration + "'."); + log.debug("Removing listener '{}' from destination: '{}' on message-bus '{}'", + listener, destinationID, configuration); MessageConsumer consumer = getMessageConsumer(destinationID, listener, false); try { // We need to set the listener to null to have the removeListener take effect at once. @@ -289,8 +289,8 @@ private synchronized void sendMessage(String destinationID, try { xmlContent = jaxbHelper.serializeToXml(content); jaxbHelper.validate(new ByteArrayInputStream(xmlContent.getBytes(StandardCharsets.UTF_8))); - log.trace("The following message is sent to the destination '" + destinationID + "'" + " on message-bus '" - + configuration.getName() + "': \n{}", xmlContent); + log.trace("The following message is sent to the destination '{}' on message-bus '{}': \n{}", + destinationID, configuration.getName(), xmlContent); TextMessage msg = producerSession.createTextMessage(xmlContent); String stringData = msg.getText(); @@ -324,10 +324,10 @@ private synchronized void sendMessage(String destinationID, */ private MessageConsumer getMessageConsumer(String destinationID, MessageListener listener, boolean durable) { String key = getConsumerHash(destinationID, listener); - log.debug("Retrieving message consumer on destination '" + destinationID + "' for listener '" + listener - + "'. Key: '" + key + "'."); + log.debug("Retrieving message consumer on destination '{}' for listener '{}'. Key: '{}'", + destinationID, listener, key); if (!consumers.containsKey(key)) { - log.debug("No consumer known. Creating new for key '" + key + "'."); + log.debug("No consumer known. Creating new for key '{}", key); Destination destination = getDestination(destinationID, consumerSession); MessageConsumer consumer; try { @@ -456,26 +456,26 @@ public void onMessage(final javax.jms.Message jmsMessage) { if (type.startsWith("Identify") && type.endsWith("Request")) { if (!componentFilter.isEmpty()) { if (recipientID != null && !componentFilter.contains(recipientID)) { - log.trace("Ignoring " + type + " message to other component " + recipientID); + log.trace("Ignoring {} message to other component '{}'", type, recipientID); return; } } String collectionID = jmsMessage.getStringProperty(COLLECTION_ID_KEY); if (!collectionFilter.isEmpty()) { if (collectionID != null && !collectionFilter.contains(collectionID)) { - log.trace("Ignoring message to unknown collection " + collectionID); + log.trace("Ignoring message to unknown collection '{}'", collectionID); return; } } } String signature = jmsMessage.getStringProperty(MESSAGE_SIGNATURE_KEY); text = ((TextMessage) jmsMessage).getText(); - log.trace("Received xml message: " + text); + log.trace("Received xml message: '{}'", text); jaxbHelper.validate(new ByteArrayInputStream(text.getBytes(StandardCharsets.UTF_8))); Message content = (Message) jaxbHelper.loadXml( Class.forName("org.bitrepository.bitrepositorymessages." + type), new ByteArrayInputStream(text.getBytes(StandardCharsets.UTF_8))); - log.trace("Checking signature " + signature); + log.trace("Checking signature '{}'", signature); SignerId signer = securityManager.authenticateMessage(text, signature); securityManager.authorizeCertificateUse((content).getFrom(), text, signature); if (content instanceof MessageRequest) { @@ -492,9 +492,9 @@ public void onMessage(final javax.jms.Message jmsMessage) { MessageContext messageContext = new MessageContext(certificateFingerprint); receivedMessageHandler.deliver(messageListener, content, messageContext); } catch (SAXException e) { - log.error("Error validating message " + jmsMessage, e); + log.error("Error validating message {}", jmsMessage, e); } catch (Exception e) { - log.error("Error handling message. Received type was '" + type + "'.\n{}", text, e); + log.error("Error handling message. Received type was '{}'.\n{}", type, text, e); } } } @@ -515,14 +515,14 @@ private void registerCustomMessageLoggers() { @Override public void setComponentFilter(List componentIDs) { - log.info("Settings component filter to: " + componentIDs); + log.info("Settings component filter to: {}", componentIDs); componentFilter.clear(); componentFilter.addAll(componentIDs); } @Override public void setCollectionFilter(List collectionIDs) { - log.info("Settings collection filter to: " + collectionIDs); + log.info("Settings collection filter to: {}", collectionIDs); collectionFilter.clear(); collectionFilter.addAll(collectionIDs); } diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageBusManager.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageBusManager.java index e8f136b63..f391200f6 100644 --- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageBusManager.java +++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageBusManager.java @@ -100,7 +100,7 @@ public static void clear() { try { bus.close(); } catch (JMSException e) { - log.warn("Failed to close message bus " + bus + " during clear()"); + log.warn("Failed to close message bus {} during clear()", bus); } } messageBusMap.clear(); diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicSecurityManager.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicSecurityManager.java index 4f25bcef8..735d61bdb 100644 --- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicSecurityManager.java +++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicSecurityManager.java @@ -356,7 +356,7 @@ private void loadPrivateKey(String privateKeyFile) throws IOException, KeyStoreE PrivateKey privKey = null; X509Certificate privCert = null; if (privateKeyFile == null || !(new File(privateKeyFile)).isFile()) { - log.info("Key file '" + privateKeyFile + "' with private key and certificate does not exist!"); + log.info("Key file '{}' with private key and certificate does not exist!", privateKeyFile); return; } BufferedReader bufferedReader = new BufferedReader( @@ -380,7 +380,7 @@ private void loadPrivateKey(String privateKeyFile) throws IOException, KeyStoreE JcaPEMKeyConverter converter = new JcaPEMKeyConverter(); privKey = converter.getPrivateKey(pki); } else { - log.debug("Got something, that we don't (yet) recognize. Class: " + pemObj.getClass().getSimpleName()); + log.debug("Got something, that we don't (yet) recognize. Class: {}", pemObj.getClass().getSimpleName()); } pemObj = pemParser.readObject(); } @@ -417,8 +417,8 @@ private void loadInfrastructureCertificates(PermissionSet permissions) throws Ke keyStore.setEntry(getNewAlias(), new KeyStore.TrustedCertificateEntry(certificate), SecurityModuleConstants.nullProtectionParameter); } catch (CertificateException ce) { - log.warn("Check of certificate validity failed, not adding certificate ({}) to keystore.", permission.getDescription(), - ce); + log.warn("Check of certificate validity failed, not adding certificate ({}) to keystore.", + permission.getDescription(), ce); } catch (IOException e) { log.debug("Failed closing ByteArrayInputStream", e); } diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/LocalActiveMQBroker.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/LocalActiveMQBroker.java index a23ab2b95..124499168 100644 --- a/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/LocalActiveMQBroker.java +++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/LocalActiveMQBroker.java @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; public class LocalActiveMQBroker { - private Logger log = LoggerFactory.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private BrokerService broker; @@ -43,7 +43,7 @@ public LocalActiveMQBroker(MessageBusConfiguration configuration) { } catch (Exception ex) { throw new RuntimeException(ex); } - log.info("Created embedded broker " + LoggerFactory.getLogger(getClass())); + log.info("Created embedded broker {}", broker); } public void start() { diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/MessageReceiver.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/MessageReceiver.java index eaa47c503..b2690167e 100644 --- a/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/MessageReceiver.java +++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/MessageReceiver.java @@ -114,11 +114,11 @@ public T waitForMessage(Class messageType, long timeout, TimeUnit unit) { } catch (InterruptedException e) { throw new RuntimeException(e); // Should never happen } - long waitTime = System.currentTimeMillis()-startWait; + long waitTime = System.currentTimeMillis() - startWait; if (message != null) { - log.debug("Read message after (" + waitTime + " ms): " + message); + log.debug("Read message after ({} ms): {}", waitTime, message); } else { - log.info("Wait for " + messageType.getSimpleName() + " message timed out (" + waitTime + " ms)."); + log.info("Wait for {} message timed out ({} ms).", messageType.getSimpleName(), waitTime); Assert.fail("Wait for " + messageType.getSimpleName() + " message timed out (" + waitTime + " ms)."); } return message; diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDAO.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDAO.java index ce92582b5..57b44437d 100644 --- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDAO.java +++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDAO.java @@ -123,7 +123,7 @@ public void updateFileIDs(FileIDsData data, String pillarID, String collectionID ArgumentValidator.checkNotNull(data, "FileIDsData data"); ArgumentValidator.checkNotNullOrEmpty(pillarID, "String pillarID"); ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID"); - log.trace("Updating the file ids '" + data + "' for pillar '" + pillarID + "'"); + log.trace("Updating the file ids '{}' for pillar '{}'", data, pillarID); FileUpdater fu = new FileUpdater(pillarID, dbConnector.getConnection(), collectionID); fu.updateFiles(data.getFileIDsDataItems()); diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/IntegrityCollectorEventHandler.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/IntegrityCollectorEventHandler.java index b043daebc..b1843757d 100644 --- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/IntegrityCollectorEventHandler.java +++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/IntegrityCollectorEventHandler.java @@ -23,6 +23,8 @@ import org.bitrepository.access.getchecksums.conversation.ChecksumsCompletePillarEvent; import org.bitrepository.access.getfileids.conversation.FileIDsCompletePillarEvent; +import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE; +import org.bitrepository.bitrepositoryelements.FileIDsData; import org.bitrepository.client.eventhandler.ContributorFailedEvent; import org.bitrepository.client.eventhandler.EventHandler; import org.bitrepository.client.eventhandler.OperationEvent; @@ -35,6 +37,7 @@ import org.slf4j.LoggerFactory; import java.time.Duration; +import java.util.List; import java.util.Objects; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; @@ -66,20 +69,20 @@ public IntegrityCollectorEventHandler(IntegrityModel model, Duration timeout, In @Override public void handleEvent(OperationEvent event) { if (event.getEventType() == OperationEventType.COMPONENT_COMPLETE) { - log.debug("Component complete: " + event); + log.debug("Component complete: {}", event); handleResult(event); } else if (event.getEventType() == OperationEventType.COMPLETE) { - log.debug("Complete: " + event); + log.debug("Complete: {}", event); finalEventQueue.add(event); } else if (event.getEventType() == OperationEventType.FAILED) { - log.warn("Failure: " + event); + log.warn("Failure: {}", event); finalEventQueue.add(event); } else if (event.getEventType() == OperationEventType.COMPONENT_FAILED) { ContributorFailedEvent cfe = (ContributorFailedEvent) event; - log.warn("Component failure for '" + cfe.getContributorID() + "'."); + log.warn("Component failure for '{}'", cfe.getContributorID()); integrityContributors.failContributor(cfe.getContributorID()); } else { - log.debug("Received event: " + event); + log.debug("Received event: {}", event); } } @@ -103,25 +106,31 @@ public OperationEvent getFinish() throws InterruptedException { private void handleResult(OperationEvent event) { if (event instanceof ChecksumsCompletePillarEvent) { ChecksumsCompletePillarEvent checksumEvent = (ChecksumsCompletePillarEvent) event; - log.trace("Receiving GetChecksums result: {}", checksumEvent.getChecksums().getChecksumDataItems().toString()); - store.addChecksums(checksumEvent.getChecksums().getChecksumDataItems(), checksumEvent.getContributorID(), - checksumEvent.getCollectionID()); + List checksumsData = checksumEvent.getChecksums() + .getChecksumDataItems(); + String contributorID = checksumEvent.getContributorID(); + log.trace("Receiving GetChecksums result: {}", checksumsData.toString()); + store.addChecksums(checksumsData, contributorID, checksumEvent.getCollectionID()); + if (checksumEvent.isPartialResult()) { - integrityContributors.succeedContributor(checksumEvent.getContributorID()); + integrityContributors.succeedContributor(contributorID); } else { - integrityContributors.finishContributor(checksumEvent.getContributorID()); + integrityContributors.finishContributor(contributorID); } } else if (event instanceof FileIDsCompletePillarEvent) { FileIDsCompletePillarEvent fileIDEvent = (FileIDsCompletePillarEvent) event; - log.trace("Receiving GetFileIDs result: {}", fileIDEvent.getFileIDs().getFileIDsData().toString()); - store.addFileIDs(fileIDEvent.getFileIDs().getFileIDsData(), fileIDEvent.getContributorID(), fileIDEvent.getCollectionID()); + FileIDsData fileIDsData = fileIDEvent.getFileIDs().getFileIDsData(); + String contributorID = fileIDEvent.getContributorID(); + log.trace("Receiving GetFileIDs result: {}", fileIDsData.toString()); + store.addFileIDs(fileIDsData, contributorID, fileIDEvent.getCollectionID()); + if (fileIDEvent.isPartialResult()) { - integrityContributors.succeedContributor(fileIDEvent.getContributorID()); + integrityContributors.succeedContributor(contributorID); } else { - integrityContributors.finishContributor(fileIDEvent.getContributorID()); + integrityContributors.finishContributor(contributorID); } } else { - log.warn("Unexpected component complete event: " + event.toString()); + log.warn("Unexpected component complete event: {}", event.toString()); } } } diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/SimpleChecksumEventHandler.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/SimpleChecksumEventHandler.java index 8baaa1041..971713854 100644 --- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/SimpleChecksumEventHandler.java +++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/SimpleChecksumEventHandler.java @@ -65,20 +65,20 @@ public SimpleChecksumEventHandler(Duration timeout, IntegrityContributors integr @Override public void handleEvent(OperationEvent event) { if (event.getEventType() == OperationEventType.COMPONENT_COMPLETE) { - log.debug("Component complete: " + event); + log.debug("Component complete: {}", event); handleResult(event); } else if (event.getEventType() == OperationEventType.COMPLETE) { - log.debug("Complete: " + event); + log.debug("Complete: {}", event); finalEventQueue.add(event); } else if (event.getEventType() == OperationEventType.FAILED) { - log.warn("Failure: " + event); + log.warn("Failure: {}", event); finalEventQueue.add(event); } else if (event.getEventType() == OperationEventType.COMPONENT_FAILED) { ContributorFailedEvent cfe = (ContributorFailedEvent) event; - log.warn("Component failure for '" + cfe.getContributorID() + "'."); + log.warn("Component failure for '{}'", cfe.getContributorID()); integrityContributors.failContributor(cfe.getContributorID()); } else { - log.debug("Received event: " + event); + log.debug("Received event: {}", event); } } @@ -102,12 +102,15 @@ public OperationEvent getFinish() throws InterruptedException { private void handleResult(OperationEvent event) { if (event instanceof ChecksumsCompletePillarEvent) { ChecksumsCompletePillarEvent checksumEvent = (ChecksumsCompletePillarEvent) event; - log.trace("Receiving GetChecksums result: {}", checksumEvent.getChecksums().getChecksumDataItems().toString()); - checksumResults.put(checksumEvent.getContributorID(), checksumEvent.getChecksums()); + String contributorID = checksumEvent.getContributorID(); + ResultingChecksums checksums = checksumEvent.getChecksums(); + log.trace("Receiving GetChecksums result: {}", checksums.getChecksumDataItems().toString()); + checksumResults.put(contributorID, checksums); + if (checksumEvent.isPartialResult()) { - integrityContributors.succeedContributor(checksumEvent.getContributorID()); + integrityContributors.succeedContributor(contributorID); } else { - integrityContributors.finishContributor(checksumEvent.getContributorID()); + integrityContributors.finishContributor(contributorID); } } else { log.warn("Unexpected component complete event: " + event.toString()); diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/RestIntegrityService.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/RestIntegrityService.java index 979de3b42..db411deec 100644 --- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/RestIntegrityService.java +++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/RestIntegrityService.java @@ -423,7 +423,7 @@ public File getLatestIntegrityReportPartFile(String collectionID, String reportP @Produces("text/html") public String startWorkflow(@FormParam("workflowID") String workflowID, @FormParam("collectionID") String collectionID) { - log.debug("Starting workflow '" + workflowID + "' on collection '" + collectionID + "'."); + log.debug("Starting workflow '{}' on collection '{}'", workflowID, collectionID); return workflowManager.startWorkflow(new JobID(workflowID, collectionID)); } diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/SaltedChecksumWorkflow.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/SaltedChecksumWorkflow.java index 002f631bb..ac4b2ba68 100644 --- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/SaltedChecksumWorkflow.java +++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/SaltedChecksumWorkflow.java @@ -81,7 +81,8 @@ public void initialise(WorkflowContext context, String collectionID) { @Override public void start() { if (context == null) { - throw new IllegalStateException("The workflow can not be started before the initialise method has been called."); + throw new IllegalStateException( + "The workflow can not be started before the initialise method has been called."); } super.start(); @@ -91,7 +92,8 @@ public void start() { Map checksums = requestSaltedChecksumForFileStep(); validateChecksums(checksums); } catch (IllegalStateException e) { - context.getAlerter().integrityFailed("Failed trying to check salted checksum: " + e.getMessage(), collectionID); + context.getAlerter().integrityFailed("Failed trying to check salted checksum: " + e.getMessage(), + collectionID); } finally { finish(); } @@ -156,9 +158,9 @@ private String getRandomFileId() { * @return The map between pillars and checksums. */ private Map requestSaltedChecksumForFileStep() { - log.info("Request the file '" + currentFileID + "' with the checksumSpecTYPE ' " + currentChecksumSpec + "'."); - GetChecksumForFileStep step = new GetChecksumForFileStep(context.getCollector(), context.getAlerter(), currentChecksumSpec, - currentFileID, context.getSettings(), collectionID, integrityContributors); + log.info("Request the file '{}' with the checksumSpecTYPE '{}'", currentFileID, currentChecksumSpec); + GetChecksumForFileStep step = new GetChecksumForFileStep(context.getCollector(), context.getAlerter(), + currentChecksumSpec, currentFileID, context.getSettings(), collectionID, integrityContributors); performStep(step); return step.getResults(); } @@ -170,7 +172,8 @@ private Map requestSaltedChecksumForFileStep() { */ private void validateChecksums(Map checksums) { if (checksums == null || checksums.isEmpty()) { - sendFailure("No checksums with checksumSpec '" + currentChecksumSpec + "' received for file '" + currentFileID + "'."); + sendFailure("No checksums with checksumSpec '" + currentChecksumSpec + "' received for file '" + + currentFileID + "'."); return; } List cs = new ArrayList<>(); @@ -180,17 +183,19 @@ private void validateChecksums(Map checksums) { } } if (cs.size() > 1) { - sendFailure("Inconsistent salted checksum found for file '" + currentFileID + "' with checksumSpecTYPE '" + - currentChecksumSpec.getChecksumType() + "' and salt '" + - Base16Utils.decodeBase16(currentChecksumSpec.getChecksumSalt()) + "'. The pillars had the checksums: " + checksums); + sendFailure("Inconsistent salted checksum found for file '" + currentFileID + + "' with checksumSpecTYPE '" + currentChecksumSpec.getChecksumType() + "' and salt '" + + Base16Utils.decodeBase16(currentChecksumSpec.getChecksumSalt()) + "'." + + " The pillars had the checksums: " + checksums); } else { String audit = "Validated salted checksum for file '" + currentFileID + "' with checksumSpecTYPE '" + currentChecksumSpec.getChecksumType() + "' and salt '" + - Base16Utils.decodeBase16(currentChecksumSpec.getChecksumSalt()) + "' for pillars: " + checksums.keySet(); + Base16Utils.decodeBase16(currentChecksumSpec.getChecksumSalt()) + "' for pillars: " + + checksums.keySet(); log.info(audit); context.getAuditManager() - .addAuditEvent(collectionID, currentFileID, "IntegrityServiceWorkflow: " + this.getClass().getName(), audit, - "Integrity salted checksum check", FileAction.INTEGRITY_CHECK, null, null); + .addAuditEvent(collectionID, currentFileID, "IntegrityServiceWorkflow: " + getClass().getName(), + audit, "Integrity salted checksum check", FileAction.INTEGRITY_CHECK, null, null); } } @@ -202,8 +207,8 @@ private void validateChecksums(Map checksums) { private void sendFailure(String failureMessage) { log.warn("Failure in checksum salted checksum: " + failureMessage); context.getAuditManager() - .addAuditEvent(collectionID, currentFileID, "IntegrityServiceWorkflow: " + this.getClass().getName(), failureMessage, - "Integrity salted checksum check", FileAction.INTEGRITY_CHECK, null, null); + .addAuditEvent(collectionID, currentFileID, "IntegrityServiceWorkflow: " + getClass().getName(), + failureMessage,"Integrity salted checksum check", FileAction.INTEGRITY_CHECK, null, null); context.getAlerter().integrityFailed(failureMessage, collectionID); } diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/GetChecksumForFileStep.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/GetChecksumForFileStep.java index 087aacede..75345d3a3 100644 --- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/GetChecksumForFileStep.java +++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/GetChecksumForFileStep.java @@ -80,16 +80,17 @@ public GetChecksumForFileStep(IntegrityInformationCollector collector, Integrity public synchronized void performStep() throws WorkflowAbortedException { try { Set pillarsToCollectFrom = integrityContributors.getActiveContributors(); - log.debug("Collecting checksums from '" + pillarsToCollectFrom + "' for collection '" + collectionID + "'."); + log.debug("Collecting checksums from '{}' for collection '{}'", pillarsToCollectFrom, collectionID); SimpleChecksumEventHandler eventHandler = new SimpleChecksumEventHandler(timeout, integrityContributors); collector.getChecksums(collectionID, pillarsToCollectFrom, checksumType, fileID, - "Getting salted " + checksumType.getChecksumType() + " checksum for spot integrity check", null, eventHandler); + "Getting salted " + checksumType.getChecksumType() + " checksum for spot integrity check", + null, eventHandler); OperationEvent event = eventHandler.getFinish(); if (event.getEventType() == OperationEventType.FAILED) { handleFailureEvent(event); } - log.debug("Collecting of checksums had the final event: " + event); + log.debug("Collecting of checksums had the final event: {}", event); checksumResults = eventHandler.getResults(); } catch (InterruptedException e) { log.warn("Interrupted while collecting checksums.", e); @@ -107,8 +108,8 @@ private void handleFailureEvent(OperationEvent event) { OperationFailedEvent ofe = (OperationFailedEvent) event; log.info("Failure occurred collecting checksums. Failure {}", ofe.toString()); alerter.integrityFailed("Failure while collecting checksums, the check will continue " + - "with the information available. The failed contributors were: " + integrityContributors.getFailedContributors(), - collectionID); + "with the information available. The failed contributors were: " + + integrityContributors.getFailedContributors(), collectionID); } } @@ -124,7 +125,7 @@ public Map getResults() { Map res = new HashMap<>(); for (Map.Entry entry : checksumResults.entrySet()) { if (!validateResults(entry.getValue())) { - log.warn("No or invalid checksum results from pillar '" + entry.getKey() + "': " + entry.getValue()); + log.warn("No or invalid checksum results from pillar '{}': {}", entry.getKey(), entry.getValue()); continue; } String checksum = Base16Utils.decodeBase16(entry.getValue().getChecksumDataItems().get(0).getChecksumValue()); diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleObsoleteChecksumsStep.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleObsoleteChecksumsStep.java index 1a7d8fca2..bd9aae5ba 100644 --- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleObsoleteChecksumsStep.java +++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleObsoleteChecksumsStep.java @@ -81,8 +81,8 @@ public synchronized void performStep() throws StepFailedException { long obsoleteChecksums = 0L; Duration maxAge = maxChecksumAgeProvider.getMaxChecksumAge(pillar); if (maxAge.isZero()) { - log.info("Skipping obsolete checksums check for pillar '" + pillar + "' as it has a " + - "MaxChecksumAge of 0 (i.e., checksums don't expire)."); + log.info("Skipping obsolete checksums check for pillar '{}' as it has a MaxChecksumAge of 0" + + " (i.e., checksums don't expire).", pillar); continue; } else { Date outdated = Date.from(Instant.now().minus(maxAge)); @@ -94,7 +94,8 @@ public synchronized void performStep() throws StepFailedException { reporter.reportObsoleteChecksum(file, pillar); obsoleteChecksums++; } catch (IOException e) { - throw new StepFailedException("Failed to report file: " + file + " as having an obsolete checksum", e); + throw new StepFailedException( + "Failed to report file: " + file + " as having an obsolete checksum", e); } } } diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/Pillar.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/Pillar.java index a77ef963d..af73321be 100644 --- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/Pillar.java +++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/Pillar.java @@ -74,7 +74,7 @@ public Pillar(MessageBus messageBus, Settings settings, StorageModel pillarModel PillarType pillarType = settings.getReferenceSettings().getPillarSettings().getPillarType(); - log.info("Starting the ReferencePillar of type '" + pillarType + "'."); + log.info("Starting the ReferencePillar of type '{}'", pillarType); messageBus.setCollectionFilter(context.getPillarCollections()); mediator = new PillarMediator(messageBus, context, pillarModel); mediator.start(); diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/DeleteFileRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/DeleteFileRequestHandler.java index a7b4711bd..45bc29608 100644 --- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/DeleteFileRequestHandler.java +++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/DeleteFileRequestHandler.java @@ -96,16 +96,16 @@ protected void validateRequest(DeleteFileRequest request, MessageContext message String requestedChecksum = Base16Utils.decodeBase16(checksumData.getChecksumValue()); if (!calculatedChecksum.equals(requestedChecksum)) { // Log the different checksums, but do not send the right checksum back! - log.warn("Failed to handle delete operation on file '" + request.getFileID() + "' since the request " - + "had the checksum '" + requestedChecksum + "' where our local file has the value '" - + calculatedChecksum + "'. Sending alarm and respond failure."); + log.warn("Failed to handle delete operation on file '{}' since the request had the checksum '{}'" + + " where our local file has the value '{}'. Sending alarm and respond failure.", + request.getFileID(), requestedChecksum, calculatedChecksum); throw new IllegalOperationException(ResponseCode.EXISTING_FILE_CHECKSUM_FAILURE, "Cannot delete file " + "due to inconsistency between checksums.", request.getFileID()); } } else { - log.debug("No checksum for validation of the existing file before delete the file '" + request.getFileID() - + "'"); + log.debug("No checksum for validation of the existing file before deleting the file '{}'", + request.getFileID()); } log.debug(MessageUtils.createMessageIdentifier(request) + "' validated and accepted."); @@ -130,8 +130,8 @@ protected void sendProgressResponse(DeleteFileRequest request, MessageContext re @Override protected void performOperation(DeleteFileRequest request, MessageContext requestContext) throws RequestHandlerException { - log.info(MessageUtils.createMessageIdentifier(request) + " Deleting file " + request.getFileID() - + " on collection " + request.getCollectionID()); + log.info("{} Deleting file '{}' in collection '{}'", MessageUtils.createMessageIdentifier(request), + request.getFileID(), request.getCollectionID()); ChecksumDataForFileTYPE resultingChecksum = calculatedRequestedChecksum(request); deleteTheFile(request); getAuditManager().addAuditEvent(request.getCollectionID(), request.getFileID(), request.getFrom(), diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetChecksumsRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetChecksumsRequestHandler.java index 48c7cd918..98b784a4a 100644 --- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetChecksumsRequestHandler.java +++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetChecksumsRequestHandler.java @@ -200,7 +200,7 @@ private File makeTemporaryChecksumFile(GetChecksumsRequest request, ExtractedChecksumResultSet checksumResultSet) throws IOException, JAXBException, SAXException { // Create the temporary file. File checksumResultFile = File.createTempFile(request.getCorrelationID(), new Date().getTime() + ".cs"); - log.debug("Writing the list of checksums to the file '" + checksumResultFile + "'"); + log.debug("Writing the list of checksums to the file '{}'", checksumResultFile); // Create data format GetChecksumsResults results = new GetChecksumsResults(); diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetFileIDsRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetFileIDsRequestHandler.java index e4f94a46d..6482471f3 100644 --- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetFileIDsRequestHandler.java +++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetFileIDsRequestHandler.java @@ -167,7 +167,7 @@ private File makeTemporaryResultFile(GetFileIDsRequest request, FileIDsData file throws IOException, JAXBException { // Create the temporary file. File checksumResultFile = File.createTempFile(request.getCorrelationID(), new Date().getTime() + ".id"); - log.info("Writing the requested fileIDs to the file '" + checksumResultFile + "'"); + log.info("Writing the requested fileIDs to the file '{}'", checksumResultFile); // Print all the file ids data safely (close the streams!) try (OutputStream is = new FileOutputStream(checksumResultFile)) { @@ -205,7 +205,7 @@ private File makeTemporaryResultFile(GetFileIDsRequest request, FileIDsData file private void uploadFile(File fileToUpload, String url) throws IOException { URL uploadUrl = new URL(url); - log.debug("Uploading file: " + fileToUpload.getName() + " to " + url); + log.debug("Uploading file '{}' to {}", fileToUpload.getName(), url); try (InputStream in = new BufferedInputStream(new FileInputStream(fileToUpload))) { context.getFileExchange().putFile(in, uploadUrl); } diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetFileRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetFileRequestHandler.java index 9edefaef3..66ce25962 100644 --- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetFileRequestHandler.java +++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetFileRequestHandler.java @@ -119,11 +119,11 @@ protected void uploadToClient(GetFileRequest message) throws RequestHandlerExcep is = extractFilePart(requestedFile, message.getFilePart()); } - log.info("Uploading file: " + requestedFile.getFileID() + " to " + message.getFileAddress()); + log.info("Uploading file: {} to {}", requestedFile.getFileID(), message.getFileAddress()); context.getFileExchange().putFile(is, new URL(message.getFileAddress())); } catch (IOException e) { - log.warn("The file '" + message.getFileID() + "' from collection '" + message.getCollectionID() + - "' could not be uploaded at '" + message.getFileAddress() + "'"); + log.warn("The file '{}' from collection '{}' could not be uploaded at '{}'", + message.getFileID(), message.getCollectionID(), message.getFileAddress()); throw new InvalidMessageException(ResponseCode.FILE_TRANSFER_FAILURE, "Could not deliver file to address '" + message.getFileAddress() + "'", e); } @@ -143,7 +143,7 @@ private InputStream extractFilePart(FileInfo fileInfo, FilePart filePart) throws byte[] partOfFile = new byte[size]; InputStream fis = null; try { - log.debug("Extracting " + size + " bytes with offset " + offset + " from " + fileInfo.getFileID()); + log.debug("Extracting {} bytes with offset {} from {}", size, offset, fileInfo.getFileID()); fis = fileInfo.getInputStream(); long skipped = fis.skip(offset); diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PillarMediator.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PillarMediator.java index c95951680..6e39e3f6a 100644 --- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PillarMediator.java +++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PillarMediator.java @@ -83,7 +83,7 @@ protected void handleRequest(MessageRequest request, MessageContext messageConte dispatchNegativeResponse(request, handler, responseInfo); getAlarmDispatcher().handleIllegalArgumentException(e); } catch (RequestHandlerException e) { - log.debug("Failed to handle request '" + request + "'", e); + log.debug("Failed to handle request '{}'", request, e); dispatchNegativeResponse(request, handler, e.getResponseInfo()); getAlarmDispatcher().handleRequestException(e, request.getCollectionID()); } catch (RuntimeException e) { @@ -135,7 +135,7 @@ protected PillarAlarmDispatcher getAlarmDispatcher() { @SuppressWarnings({"rawtypes", "unchecked"}) private void dispatchNegativeResponse(MessageRequest request, RequestHandler handler, ResponseInfo info) { - log.info("Cannot perform operation. Sending failed response. Cause: " + info.getResponseText()); + log.info("Cannot perform operation. Sending failed response. Cause: {}", info.getResponseText()); MessageResponse response = handler.generateFailedResponse(request); response.setResponseInfo(info); context.getResponseDispatcher().dispatchResponse(response, request); diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PillarMessageHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PillarMessageHandler.java index 1ba8e2d5b..6daaff27d 100644 --- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PillarMessageHandler.java +++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PillarMessageHandler.java @@ -109,7 +109,7 @@ protected void verifyFileIDExistence(FileIDs fileIDs, String collectionID) throw } if (!getPillarModel().hasFileID(fileIDs.getFileID(), collectionID)) { - log.warn("The following file is missing '" + fileIDs.getFileID() + "' at collection '" + collectionID + "'."); + log.warn("File '{}' is missing in collection '{}'", fileIDs.getFileID(), collectionID); throw new InvalidMessageException(ResponseCode.FILE_NOT_FOUND_FAILURE, "File not found."); } } diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/ReplaceFileRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/ReplaceFileRequestHandler.java index ebd415447..610961b6e 100644 --- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/ReplaceFileRequestHandler.java +++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/ReplaceFileRequestHandler.java @@ -115,8 +115,8 @@ protected void sendProgressResponse(ReplaceFileRequest request, MessageContext r @Override protected void performOperation(ReplaceFileRequest request, MessageContext requestContext) throws RequestHandlerException { - log.info(MessageUtils.createMessageIdentifier(request) + " Performing ReplaceFile for file " - + request.getFileID() + " on collection " + request.getCollectionID()); + log.info("{} Performing ReplaceFile for file '{}' on collection '{}'", + MessageUtils.createMessageIdentifier(request), request.getFileID(), request.getCollectionID()); try { ChecksumDataForFileTYPE requestedOldChecksum = calculateChecksumOnOldFile(request); replaceFile(request); @@ -175,9 +175,9 @@ private void validateExistingChecksum(ReplaceFileRequest request) throws Request String requestedChecksum = Base16Utils.decodeBase16(checksumData.getChecksumValue()); if (!calculatedChecksum.equals(requestedChecksum)) { // Log the different checksums, but do not send the right checksum back! - log.warn("Failed to handle replace operation on file '" + request.getFileID() + "' since the request " - + "had the checksum '" + requestedChecksum + "' where our local file has the value '" - + calculatedChecksum + "'. Sending alarm and respond failure."); + log.warn("Failed to handle replace operation on file '{}' since the request had checksum '{}'" + + " where our local file has the value '{}'. Sending alarm and respond failure", + request.getFileID(), requestedChecksum, calculatedChecksum); String errMsg = "Requested to replace the file '" + request.getFileID() + "' with checksum '" + requestedChecksum + "', but our file had a different checksum."; @@ -218,8 +218,7 @@ private ChecksumDataForFileTYPE calculateChecksumOnOldFile(ReplaceFileRequest me * @param message The request containing the location of the file and the checksum of it. */ private void replaceFile(ReplaceFileRequest message) throws RequestHandlerException { - log.info("Replacing the file '" + message.getFileID() + "' in the archive with the one in the " - + "temporary area."); + log.info("Replacing the file '{}' in the archive with the one in the temporary area", message.getFileID()); getPillarModel().replaceFile(message.getFileID(), message.getCollectionID(), message.getFileAddress(), message.getChecksumDataForNewFile()); } diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/schedulablejobs/RecalculateChecksumJob.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/schedulablejobs/RecalculateChecksumJob.java index 971521c9c..688eb2a0b 100644 --- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/schedulablejobs/RecalculateChecksumJob.java +++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/schedulablejobs/RecalculateChecksumJob.java @@ -51,7 +51,7 @@ public RecalculateChecksumJob(String collectionID, StorageModel model) { @Override public void start() { - log.info("Recalculating old checksums for collection '" + collectionID + "'."); + log.info("Recalculating old checksums for collection '{}'", collectionID); try { state = WorkflowState.RUNNING; model.verifyFileToCacheConsistencyOfAllData(collectionID); diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/ChecksumStorageModel.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/ChecksumStorageModel.java index 81829d17d..191e44f2e 100644 --- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/ChecksumStorageModel.java +++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/ChecksumStorageModel.java @@ -101,13 +101,13 @@ protected void verifyFileToCacheConsistencyIfRequired(String fileID, String coll @Override protected String getNonDefaultChecksum(String fileID, String collectionID, ChecksumSpecTYPE csType) throws RequestHandlerException { throw new InvalidMessageException(ResponseCode.REQUEST_NOT_SUPPORTED, - "The ChecksumPillar cannot handle a " + "non-default checksum specification '" + csType + "'.'"); + "The ChecksumPillar cannot handle a non-default checksum specification '" + csType + "'.'"); } @Override public FileInfo getFileInfoForActualFile(String fileID, String collectionID) throws RequestHandlerException { throw new InvalidMessageException(ResponseCode.REQUEST_NOT_SUPPORTED, - "This is a checksum pillar and it does " + "not have the actual file. Only it's checksum."); + "This is a checksum pillar and it does not have the actual file. Only it's checksum."); } @Override @@ -120,13 +120,13 @@ public ExtractedFileIDsResultSet getFileIDsResultSet(String fileID, XMLGregorian protected ExtractedChecksumResultSet getNonDefaultChecksumResultSet(Long maxResults, String collectionID, ChecksumSpecTYPE csSpec) throws RequestHandlerException { throw new InvalidMessageException(ResponseCode.REQUEST_NOT_SUPPORTED, - "This is a checksum pillar and it does " + "not have the actual file. Only it's checksum."); + "This is a checksum pillar and it does not have the actual file. Only it's checksum."); } @Override public void verifyFileExists(String fileID, String collectionID) throws RequestHandlerException { throw new InvalidMessageException(ResponseCode.REQUEST_NOT_SUPPORTED, - "This is a checksum pillar and it does " + "not have the actual file. Only it's checksum."); + "This is a checksum pillar and it does not have the actual file. Only it's checksum."); } /** @@ -187,7 +187,7 @@ private String extractChecksum(ChecksumDataForFileTYPE checksumData) throws Requ return Base16Utils.decodeBase16(checksumData.getChecksumValue()); } else { throw new InvalidMessageException(ResponseCode.NEW_FILE_CHECKSUM_FAILURE, - "The checksum should have been " + "provided with the message"); + "The checksum should have been provided with the message"); } } @@ -205,8 +205,8 @@ private String downloadFileAndCalculateChecksum(String fileID, String collection String calculatedChecksum = calculateChecksumForFileAtURL(fileAddress); if (!validChecksum(calculatedChecksum, expectedChecksum)) { String givenChecksum = Base16Utils.decodeBase16(expectedChecksum.getChecksumValue()); - log.error("Wrong checksum for file '" + fileID + "' at '" + collectionID + "'! Expected: [" + givenChecksum + - "], but calculated: [" + calculatedChecksum + "]"); + log.error("Wrong checksum for file '{}' at '{}'! Expected: [{}], but calculated: [{}]", + fileID, collectionID, givenChecksum, calculatedChecksum); throw new IllegalOperationException(ResponseCode.NEW_FILE_CHECKSUM_FAILURE, "Expected checksums '" + givenChecksum + "' but the checksum was '" + calculatedChecksum + "'.", fileID); } @@ -222,7 +222,7 @@ private String downloadFileAndCalculateChecksum(String fileID, String collection * @throws RequestHandlerException If data for the file could not be retrieved. */ private String calculateChecksumForFileAtURL(String fileAddress) throws RequestHandlerException { - log.debug("Retrieving the data from URL: '" + fileAddress + "'"); + log.debug("Retrieving the data from URL: '{}'", fileAddress); try { return ChecksumUtils.generateChecksum(fileExchange.getFile(new URL(fileAddress)), defaultChecksumSpec); diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/FileStorageModel.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/FileStorageModel.java index d7bccba29..c7d9ef5ca 100644 --- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/FileStorageModel.java +++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/FileStorageModel.java @@ -165,8 +165,8 @@ protected ExtractedChecksumResultSet getNonDefaultChecksumResultSet(Long maxResu @Override public void verifyFileExists(String fileID, String collectionID) throws RequestHandlerException { if (!hasFileID(fileID, collectionID)) { - log.warn("The file '" + fileID + "' has been requested, but we do not have that file in collection '" + - collectionID + "'!"); + log.warn("The file '{}' has been requested, but we do not have that file in collection '{}'!", + fileID, collectionID); throw new InvalidMessageException(ResponseCode.FILE_NOT_FOUND_FAILURE, "File not found."); } } @@ -202,7 +202,7 @@ public void replaceFile(String fileID, String collectionID, String fileAddress, * @param collectionID The id of the collection of the file. */ protected void recalculateChecksum(String fileID, String collectionID) { - log.info("Recalculating the checksum of file '" + fileID + "'."); + log.info("Recalculating the checksum of file '{}'", fileID); FileInfo fi = fileArchive.getFileInfo(fileID, collectionID); String checksum = ChecksumUtils.generateChecksum(fi, defaultChecksumSpec); cache.insertChecksumCalculation(fileID, collectionID, checksum, new Date()); @@ -286,8 +286,8 @@ public void verifyFileToCacheConsistencyOfAllData(String collectionID) { */ private void verifyCacheToArchiveConsistencyForFile(String fileID, String collectionID) { if (!fileArchive.hasFile(fileID, collectionID)) { - log.warn("The file '" + fileID + "' in the ChecksumCache is no longer in the archive. " + - "Dispatching an alarm, and removing it from the cache."); + log.warn("The file '{}' in the ChecksumCache is no longer in the archive." + + " Dispatching an alarm, and removing it from the cache.", fileID); Alarm alarm = new Alarm(); alarm.setAlarmCode(AlarmCode.COMPONENT_FAILURE); alarm.setAlarmText("The file '" + fileID + "' has been removed from the archive without it being removed " + @@ -308,7 +308,7 @@ private void verifyCacheToArchiveConsistencyForFile(String fileID, String collec */ private void verifyArchiveToCacheConsistencyForFile(String fileID, String collectionID) { if (!cache.hasFile(fileID, collectionID)) { - log.debug("No checksum cached for file '" + fileID + "'. Calculating the checksum."); + log.debug("No checksum cached for file '{}'. Calculating the checksum.", fileID); recalculateChecksum(fileID, collectionID); } } @@ -323,7 +323,7 @@ private void verifyArchiveToCacheConsistencyForFile(String fileID, String collec */ private void transferFileToTmp(String fileID, String collectionID, String fileAddress) throws RequestHandlerException { - log.debug("Retrieving the data to be stored from URL: '" + fileAddress + "'"); + log.debug("Retrieving the data to be stored from URL: '{}'", fileAddress); try { fileArchive.downloadFileForValidation(fileID, collectionID, fileExchange.getFile(new URL(fileAddress))); @@ -348,16 +348,16 @@ private void verifyFileInTmp(String fileID, String collectionID, ChecksumDataFor String calculatedChecksum = getChecksumForTempFile(fileID, collectionID, expectedChecksum.getChecksumSpec()); String expectedChecksumValue = Base16Utils.decodeBase16(expectedChecksum.getChecksumValue()); - log.debug("Validating newly downloaded file, '" + fileID + "', against expected checksum '" + - expectedChecksumValue + "'."); + log.debug("Validating newly downloaded file '{}' against expected checksum '{}'", + fileID, expectedChecksumValue); if (!calculatedChecksum.equals(expectedChecksumValue)) { - log.warn("Wrong checksum! Expected: [" + expectedChecksumValue + "], but calculated: [" + - calculatedChecksum + "]"); + log.warn("Wrong checksum! Expected: [{}], but calculated: [{}]", + expectedChecksumValue, calculatedChecksum); throw new IllegalOperationException(ResponseCode.NEW_FILE_CHECKSUM_FAILURE, - "The downloaded file does " + "not have the expected checksum", fileID); + "The downloaded file does not have the expected checksum", fileID); } } else { - log.debug("No checksums for validating the newly downloaded file '" + fileID + "'."); + log.debug("No checksums for validating the newly downloaded file '{}'", fileID); } } } diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumDBMigrator.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumDBMigrator.java index 8826ce4f3..d133b2862 100644 --- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumDBMigrator.java +++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumDBMigrator.java @@ -85,7 +85,7 @@ public void migrate() { * Just adds the column 'collectionid', which is set to the current (or first) collection id. */ private void migrateChecksumsTableFromVersion1To2() { - log.warn("Migrating the " + CHECKSUM_TABLE + " table from version 1 to 2 in the ChecksumDatabase."); + log.warn("Migrating the {} table from version 1 to 2 in the ChecksumDatabase.", CHECKSUM_TABLE); String alterSql = "ALTER TABLE " + CHECKSUM_TABLE + " ADD COLUMN " + CS_COLLECTION_ID + " VARCHAR(255)"; updateTable(CHECKSUM_TABLE, 2, alterSql); diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumExtractor.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumExtractor.java index c0d6a15f9..0cb9b3e76 100644 --- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumExtractor.java +++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumExtractor.java @@ -169,8 +169,8 @@ public ChecksumEntry extractSingleEntryWithRestrictions(XMLGregorianCalendar min PreparedStatement ps = DatabaseUtils.createPreparedStatement(conn, sql.toString(), args.toArray())) { try (ResultSet res = ps.executeQuery()) { if (!res.next()) { - log.debug("No checksum entry found for file '" + fileID + "' at collection '" + collectionID - + "', with calculation date interval: [" + minTimeStamp + " , " + maxTimeStamp + "]"); + log.debug("No checksum entry found for file '{}' in collection '{}', with calculation date" + + " interval: [{} , {}]", fileID, collectionID, minTimeStamp, maxTimeStamp); return null; } return extractChecksumEntry(res); diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/filearchive/ReferenceArchive.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/filearchive/ReferenceArchive.java index 0a3b0de65..53f95d53a 100644 --- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/filearchive/ReferenceArchive.java +++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/filearchive/ReferenceArchive.java @@ -130,13 +130,13 @@ public File downloadFileForValidation(String fileID, InputStream inputStream) th File downloadedFile; synchronized (lock) { downloadedFile = dir.getNewFileInTempDir(fileID); - log.debug("Downloading the file '" + fileID + "' for validation."); + log.debug("Downloading the file '{}' for validation", fileID); // Save InputStream to the file. try (BufferedOutputStream bufferedOutputstream = new BufferedOutputStream(new FileOutputStream(downloadedFile))) { byte[] buffer = new byte[MAX_BUFFER_SIZE]; - int bytesRead = 0; + int bytesRead; while ((bytesRead = inputStream.read(buffer)) != -1) { bufferedOutputstream.write(buffer, 0, bytesRead); } @@ -152,7 +152,7 @@ public File downloadFileForValidation(String fileID, InputStream inputStream) th */ public void moveToArchive(String fileID) { ArgumentValidator.checkNotNullOrEmpty(fileID, "String fileID"); - log.info("Moving the file '" + fileID + "' to archive."); + log.info("Moving the file '{}' to archive", fileID); synchronized (lock) { ArchiveDirectory dir = getDirWithTmpFile(fileID); @@ -218,7 +218,7 @@ public File getFileInTmpDir(String fileID) { public void ensureFileNotInTmpDir(String fileID) { for (ArchiveDirectory dir : directories) { if (dir.hasFileInTempDir(fileID)) { - log.info("Removing tmp file '" + fileID + "' from tmp dir '" + dir + "'."); + log.info("Removing tmp file '{}' from tmp dir '{}'", fileID, dir); dir.removeFileFromTmp(fileID); } } diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/perf/PillarPerformanceTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/perf/PillarPerformanceTest.java index b295da70f..4ad5af7cf 100644 --- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/perf/PillarPerformanceTest.java +++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/perf/PillarPerformanceTest.java @@ -68,7 +68,7 @@ protected void addReceiver(MessageReceiver receiver) { // Do Nothing, test receivers should be used in performance tests. } /** - * Avoid usind messagebuswrapper. + * Avoid using messagebuswrapper. */ @Override protected void setupMessageBus() { @@ -141,11 +141,11 @@ public OperationEventHandlerForMetrics(Metrics metrics, ParallelOperationLimiter @Override public void handleEvent(OperationEvent event) { if (event.getEventType().equals(OperationEvent.OperationEventType.COMPLETE)) { - log.debug("Received " + event.getOperationType() + " complete event for " + event.getFileID()); + log.debug("Received {} complete event for '{}'", event.getOperationType(), event.getFileID()); this.metrics.mark("#" + metrics.getCount()); operationLimiter.removeJob(event.getFileID()); } else if (event.getEventType().equals(OperationEvent.OperationEventType.FAILED)) { - log.debug("Received " + event.getOperationType() + " failed event for " + event.getFileID()); + log.debug("Received {} failed event for '{}'", event.getOperationType(), event.getFileID()); this.metrics.registerError(event.getInfo()); operationLimiter.removeJob(event.getFileID()); } @@ -165,13 +165,13 @@ public void onMessage(Message message, MessageContext messageContext) { if (message instanceof MessageResponse) { MessageResponse response = (MessageResponse)message; if (response.getResponseInfo().getResponseCode().equals(ResponseCode.OPERATION_COMPLETED)) { - log.debug("Received " + response.getClass().getSimpleName() + - " complete message(" + response.getCorrelationID() + ")"); + log.debug("Received {} complete message({})", response.getClass().getSimpleName(), + response.getCorrelationID()); this.metrics.mark("#" + metrics.getCount()); operationLimiter.removeJob(response.getCorrelationID()); } else if (response.getResponseInfo().getResponseCode().equals(ResponseCode.FAILURE)) { - log.debug("Received " + response.getClass().getSimpleName() + - " failure message(" + response.getCorrelationID() + ")"); + log.debug("Received {} failure message({})", response.getClass().getSimpleName(), + response.getCorrelationID()); this.metrics.registerError(response.getCorrelationID()); operationLimiter.removeJob(response.getCorrelationID()); } diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/AlarmDispatcher.java b/bitrepository-service/src/main/java/org/bitrepository/service/AlarmDispatcher.java index 97abea6da..e41685cf3 100644 --- a/bitrepository-service/src/main/java/org/bitrepository/service/AlarmDispatcher.java +++ b/bitrepository-service/src/main/java/org/bitrepository/service/AlarmDispatcher.java @@ -74,8 +74,8 @@ public AlarmDispatcher(Settings settings, MessageSender sender) { public void warning(Alarm alarm) { ArgumentValidator.checkNotNull(alarm, "alarm"); if (alarmLevel != AlarmLevel.WARNING) { - log.debug("Will send a '" + AlarmLevel.WARNING + "' alarm, when the alarm level is '" - + alarmLevel + "'{}", alarm); + log.debug("Will send a '{}' alarm, when the alarm level is '{}'. Alarm: {}", + AlarmLevel.WARNING, alarmLevel, alarm); } else { sendAlarm(alarm); } @@ -90,8 +90,8 @@ public void warning(Alarm alarm) { public void error(Alarm alarm) { ArgumentValidator.checkNotNull(alarm, "alarm"); if (alarmLevel == AlarmLevel.EMERGENCY) { - log.debug("Cannot send a '" + AlarmLevel.ERROR + "' alarm, when the alarm level is '" - + alarmLevel + "'{}", alarm); + log.debug("Cannot send a '{}' alarm, when the alarm level is '{}'. Alarm: {}", + AlarmLevel.ERROR, alarmLevel, alarm); } else { sendAlarm(alarm); } @@ -123,7 +123,7 @@ protected void sendAlarm(Alarm alarm) { message.setDestination(settings.getAlarmDestination()); message.setCollectionID(alarm.getCollectionID()); - log.warn("Sending alarm: " + alarm); + log.warn("Sending alarm: {}", alarm); dispatchMessage(message); } } \ No newline at end of file diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailContributorDAO.java b/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailContributorDAO.java index 872078e09..02182951e 100644 --- a/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailContributorDAO.java +++ b/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailContributorDAO.java @@ -115,8 +115,8 @@ protected void addAuditEvent(String collectionID, String fileID, Date auditTime, String auditTrail, FileAction operation, String operationID, String fingerprint) { ArgumentValidator.checkNotNull(collectionID, "String collectionID"); ArgumentValidator.checkNotNull(operation, "FileAction operation"); - log.debug("Inserting an audit event for file '" + fileID + "', from actor '" + actor - + "' performing operation '" + operation + "', with the audit trail information '" + auditTrail + "'"); + log.debug("Inserting an audit event for file '{}', from actor '{}' performing operation '{}'," + + " with audit trail info: '{}'", fileID, actor, operation, auditTrail); long fileGuid; if (fileID == null || fileID.isEmpty()) { @@ -277,7 +277,7 @@ private synchronized long retrieveFileGuid(String collectionID, String fileID) { Long guid = DatabaseUtils.selectLongValue(dbConnector, sqlRetrieve, fileID, collectionID); if (guid == null) { - log.debug("Inserting fileid '" + fileID + "' into the file table."); + log.debug("Inserting fileid '{}' into the file table", fileID); String sqlInsert = "INSERT INTO " + FILE_TABLE + " ( " + FILE_FILE_ID + " , " + FILE_COLLECTION_ID + " ) VALUES ( ? , ? )"; DatabaseUtils.executeStatement(dbConnector, sqlInsert, fileID, collectionID); @@ -300,7 +300,7 @@ private synchronized long retrieveActorGuid(String actorName) { Long guid = DatabaseUtils.selectLongValue(dbConnector, sqlRetrieve, actorName); if (guid == null) { - log.debug("Inserting actor '" + actorName + "' into the actor table."); + log.debug("Inserting actor '{}' into the actor table", actorName); String sqlInsert = "INSERT INTO " + ACTOR_TABLE + " ( " + ACTOR_NAME + " ) VALUES ( ? )"; DatabaseUtils.executeStatement(dbConnector, sqlInsert, actorName); diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/database/DBConnector.java b/bitrepository-service/src/main/java/org/bitrepository/service/database/DBConnector.java index 7ce64f31c..f95307fc3 100644 --- a/bitrepository-service/src/main/java/org/bitrepository/service/database/DBConnector.java +++ b/bitrepository-service/src/main/java/org/bitrepository/service/database/DBConnector.java @@ -66,7 +66,8 @@ public String getDatabaseDriverClass() { */ private void initialiseConnectionPool() { try { - log.info("Creating the connection to the database '" + DatabaseUtils.getDatabaseSpecificsDump(databaseSpecifics) + "'."); + log.info("Creating the connection to the database '{}'", + DatabaseUtils.getDatabaseSpecificsDump(databaseSpecifics)); connectionPool.setDriverClass(databaseSpecifics.getDriverClass()); connectionPool.setJdbcUrl(databaseSpecifics.getDatabaseURL()); if (databaseSpecifics.isSetUsername()) { @@ -76,8 +77,8 @@ private void initialiseConnectionPool() { connectionPool.setPassword(databaseSpecifics.getPassword()); } } catch (Exception e) { - throw new IllegalStateException( - "Could not connect to the database '" + DatabaseUtils.getDatabaseSpecificsDump(databaseSpecifics) + "'", e); + throw new IllegalStateException("Could not connect to the database '" + + DatabaseUtils.getDatabaseSpecificsDump(databaseSpecifics) + "'", e); } } @@ -101,9 +102,8 @@ public Connection getConnection() throws IllegalStateException { try { return connectionPool.getConnection(); } catch (SQLException e) { - throw new IllegalStateException( - "Could not establish connection to the database: '" + DatabaseUtils.getDatabaseSpecificsDump(databaseSpecifics) - + "'", e); + throw new IllegalStateException("Could not establish connection to the database: '" + + DatabaseUtils.getDatabaseSpecificsDump(databaseSpecifics) + "'", e); } } @@ -114,7 +114,8 @@ public void destroy() { try { DataSources.destroy(connectionPool); } catch (SQLException e) { - log.error("Could not clean up the database '" + DatabaseUtils.getDatabaseSpecificsDump(databaseSpecifics) + "'.", e); + log.error("Could not clean up the database '{}'", + DatabaseUtils.getDatabaseSpecificsDump(databaseSpecifics), e); } } } diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseCreator.java b/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseCreator.java index 4a8911bf1..2b8c0566a 100644 --- a/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseCreator.java +++ b/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseCreator.java @@ -45,8 +45,8 @@ public class DatabaseCreator extends DatabaseMaintainer { */ protected void createDatabase(DatabaseSpecifics databaseSpecifics, String scriptName) { DatabaseSpecifics databaseCreationSpecifics = updateDatabaseSpecificsForDBCreation(databaseSpecifics); - log.info("Creating database in " + DatabaseUtils.getDatabaseSpecificsDump(databaseCreationSpecifics) - + " from script " + scriptName); + log.info("Creating database in '{}' from script {}", + DatabaseUtils.getDatabaseSpecificsDump(databaseCreationSpecifics), scriptName); try { runScript(databaseCreationSpecifics, scriptName); } catch (Exception e) { diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseUtils.java b/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseUtils.java index 7e68b7161..5bc9e68ff 100644 --- a/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseUtils.java +++ b/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseUtils.java @@ -114,8 +114,8 @@ public static Long selectLongValue(DBConnector dbConnector, String query, Object PreparedStatement ps = createPreparedStatement(conn, query, args)) { try (ResultSet res = ps.executeQuery()) { if (!res.next()) { - log.trace("Got an empty result set for statement '" + query + "' with arguments '" - + Arrays.asList(args) + "' on database '" + conn + "'. Returning a null."); + log.trace("Got an empty result set for statement '{}' with arguments '{}' on database '{}'." + + " Returning a null.", query, Arrays.asList(args), conn); return null; } Long resultLong = res.getLong(1); @@ -153,8 +153,8 @@ public static Long selectFirstLongValue(DBConnector dbConnector, String query, O PreparedStatement ps = createPreparedStatement(conn, query, args)) { try (ResultSet res = ps.executeQuery()) { if (!res.next()) { - log.trace("Got an empty result set for statement '" + query + "' with arguments '" - + Arrays.asList(args) + "' on database '" + conn + "'. Returning a null."); + log.trace("Got an empty result set for statement '{}' with arguments '{}' on database '{}'." + + " Returning a null.", query, Arrays.asList(args), conn); return null; } Long resultLong = res.getLong(1); @@ -189,8 +189,8 @@ public static String selectFirstStringValue(DBConnector dbConnector, String quer PreparedStatement ps = createPreparedStatement(conn, query, args)) { try (ResultSet res = ps.executeQuery()) { if (!res.next()) { - log.trace("Got an empty result set for statement '" + query + "' with arguments '" - + Arrays.asList(args) + "' on database '" + conn + "'. Returning a null."); + log.trace("Got an empty result set for statement '{}' with arguments '{}' on database '{}'." + + " Returning a null.", query, Arrays.asList(args), conn); return null; } String resultString = res.getString(1); @@ -285,8 +285,8 @@ private static Date retrieveDateValue(DBConnector dbConnector, boolean mustHaveO PreparedStatement ps = createPreparedStatement(conn, query, args)) { try (ResultSet res = ps.executeQuery()) { if (!res.next()) { - log.trace("Got an empty result set for statement '" + query + "' on database '" - + conn + "'. Returning a null."); + log.trace("Got an empty result set for statement '{}' with arguments '{}' on database '{}'." + + " Returning a null.", query, Arrays.asList(args), conn); return null; } Timestamp resultDate = res.getTimestamp(1); @@ -323,7 +323,7 @@ public static String selectStringValue(DBConnector dbConnector, String query, Ob PreparedStatement ps = createPreparedStatement(conn, query, args)) { try (ResultSet res = ps.executeQuery()) { if (!res.next()) { - log.trace("No string was found for the query '" + query + "'. A null has been returned."); + log.trace("No string was found for the query '{}'. A null has been returned", query); return null; } return res.getString(1); @@ -400,7 +400,7 @@ public static void executeStatement(DBConnector dbConnector, String query, Objec */ public static PreparedStatement createPreparedStatement(Connection dbConnection, String query, Object... args) throws SQLException { - log.trace("Preparing the statement: '" + query + "' with arguments '" + Arrays.asList(args) + "'"); + log.trace("Preparing the statement: '{}' with arguments '{}'", query, Arrays.asList(args)); PreparedStatement s = dbConnection.prepareStatement(query); int i = 1; for (Object arg : args) { diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/database/SqlScriptRunner.java b/bitrepository-service/src/main/java/org/bitrepository/service/database/SqlScriptRunner.java index 607d8ec4b..bd38db7bb 100644 --- a/bitrepository-service/src/main/java/org/bitrepository/service/database/SqlScriptRunner.java +++ b/bitrepository-service/src/main/java/org/bitrepository/service/database/SqlScriptRunner.java @@ -126,7 +126,7 @@ private void runScript(Connection conn, Reader reader) throws IOException, SQLEx Statement statement = conn.createStatement(); - log.debug("Executing statement: " + command); + log.debug("Executing statement: {}", command); boolean hasResults = false; if (stopOnError) { @@ -136,7 +136,7 @@ private void runScript(Connection conn, Reader reader) throws IOException, SQLEx statement.execute(command.toString()); } catch (SQLException e) { e.fillInStackTrace(); - log.error("Error executing: " + command, e); + log.error("Error executing: {}", command, e); } } diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/scheduler/TimerBasedScheduler.java b/bitrepository-service/src/main/java/org/bitrepository/service/scheduler/TimerBasedScheduler.java index 3db8615b0..9a7befa14 100644 --- a/bitrepository-service/src/main/java/org/bitrepository/service/scheduler/TimerBasedScheduler.java +++ b/bitrepository-service/src/main/java/org/bitrepository/service/scheduler/TimerBasedScheduler.java @@ -62,8 +62,7 @@ public TimerBasedScheduler() { @Override public void schedule(SchedulableJob workflow, Long interval) { - log.info("Scheduling job : " + workflow.getJobID() + " to run every " - + TimeUtils.millisecondsToHuman(interval)); + log.info("Scheduling job '{}' to run every {}", workflow.getJobID(), TimeUtils.millisecondsToHuman(interval)); JobTimerTask task = new JobTimerTask(interval, workflow, Collections.unmodifiableList(jobListeners)); if (interval > 0) { @@ -75,10 +74,9 @@ public void schedule(SchedulableJob workflow, Long interval) { @Override public String startJob(SchedulableJob job) { - log.debug("Starting job: " + job); + log.debug("Starting job: {}", job); if (job.currentState() != WorkflowState.NOT_RUNNING) { - log.info("Cannot schedule job,'" + job.getJobID() + "', which is in state '" - + job.currentState() + "'"); + log.info("Cannot schedule job '{}', which is in state '{}'", job.getJobID(), job.currentState()); return "Already running"; } long timeBetweenRuns = -1; diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/JobTimerTask.java b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/JobTimerTask.java index 5536d5aac..928484459 100644 --- a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/JobTimerTask.java +++ b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/JobTimerTask.java @@ -83,7 +83,7 @@ public String getDescription() { public void runJob() { try { if (job.currentState().equals(WorkflowState.NOT_RUNNING)) { - log.info("Starting job: " + job.getJobID()); + log.info("Starting job: {}", job.getJobID()); job.setCurrentState(WorkflowState.WAITING); job.start(); if (interval > 0) { @@ -91,10 +91,10 @@ public void runJob() { } notifyListenersAboutFinishedJob(job); } else { - log.info("Ignoring start request for " + job.getJobID() + " the job is already running"); + log.info("Ignoring start request for job '{}'. The job is already running", job.getJobID()); } } catch (Throwable e) { - log.error("Fault barrier for '" + job.getJobID() + "' caught unexpected exception.", e); + log.error("Fault barrier for '{}' caught unexpected exception.", job.getJobID(), e); } } diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowManager.java b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowManager.java index ac0b688d6..22a39df4c 100644 --- a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowManager.java +++ b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowManager.java @@ -115,7 +115,7 @@ public long getRunInterval(JobID jobID) { private void loadWorkFlows(WorkflowSettings configuration) { for (WorkflowConfiguration workflowConf : configuration.getWorkflow()) { - log.info("Scheduling from configuration: " + workflowConf); + log.info("Scheduling from configuration: {}", workflowConf); List unscheduledCollections = new LinkedList<>(SettingsUtils.getAllCollectionsIDs()); try { if (workflowConf.getSchedules() != null) { @@ -146,7 +146,7 @@ private void loadWorkFlows(WorkflowSettings configuration) { addWorkflow(collectionID, workflow); } } catch (Exception e) { - log.error("Unable to load workflow " + workflowConf.getWorkflowClass(), e); + log.error("Unable to load workflow {}", workflowConf.getWorkflowClass(), e); } } } diff --git a/bitrepository-service/src/test/java/org/bitrepository/service/database/DerbyDatabaseDestroyer.java b/bitrepository-service/src/test/java/org/bitrepository/service/database/DerbyDatabaseDestroyer.java index f4cf2e9b5..ce34ba828 100644 --- a/bitrepository-service/src/test/java/org/bitrepository/service/database/DerbyDatabaseDestroyer.java +++ b/bitrepository-service/src/test/java/org/bitrepository/service/database/DerbyDatabaseDestroyer.java @@ -42,7 +42,7 @@ public class DerbyDatabaseDestroyer { * @param databaseSpecifics necessary information to decide which database. * */ public static void deleteDatabase(DatabaseSpecifics databaseSpecifics) { - log.info("Removing database: " + databaseSpecifics); + log.info("Removing database: {}", databaseSpecifics); String dbUrl = databaseSpecifics.getDatabaseURL(); String[] dbUrlParts = dbUrl.split(":"); if (new File(dbUrlParts[2]).isDirectory()) { diff --git a/bitrepository-webclient/src/main/java/org/bitrepository/webservice/ServiceUrl.java b/bitrepository-webclient/src/main/java/org/bitrepository/webservice/ServiceUrl.java index ee2c18a75..246d7ca5c 100644 --- a/bitrepository-webclient/src/main/java/org/bitrepository/webservice/ServiceUrl.java +++ b/bitrepository-webclient/src/main/java/org/bitrepository/webservice/ServiceUrl.java @@ -37,11 +37,11 @@ @Path("/urlservice") public class ServiceUrl { - private static final String CONFIGFILE = "services.properties"; - private static final String ALARMURL = "org.bitrepository.webclient.alarmserviceurl"; - private static final String AUDITTRAILURL = "org.bitrepository.webclient.audittrailserviceurl"; - private static final String INTEGRITYURL = "org.bitrepository.webclient.integrityserviceurl"; - private static final String MONITORINGURL = "org.bitrepository.webclient.monitoringserviceurl"; + private static final String CONFIG_FILE = "services.properties"; + private static final String ALARM_URL = "org.bitrepository.webclient.alarmserviceurl"; + private static final String AUDIT_TRAIL_URL = "org.bitrepository.webclient.audittrailserviceurl"; + private static final String INTEGRITY_URL = "org.bitrepository.webclient.integrityserviceurl"; + private static final String MONITORING_URL = "org.bitrepository.webclient.monitoringserviceurl"; private static String alarmUrl = ""; private static String auditTrailUrl = ""; @@ -52,11 +52,11 @@ public class ServiceUrl { private final Logger log = LoggerFactory.getLogger(getClass()); public ServiceUrl() { - if(configDir == null) { + if (configDir == null) { log.debug("ServiceUrl constructor called before init!!"); throw new RuntimeException("No configuration dir has been set!"); } - log.debug("Called ServiceUrl constructor, confdir: " + configDir); + log.debug("Called ServiceUrl constructor, conf dir: {}", configDir); loadProperties(); } @@ -64,19 +64,19 @@ private void loadProperties() { log.debug("Loading service properties.."); Properties properties = new Properties(); try { - String propertiesFile = configDir + "/" + CONFIGFILE; + String propertiesFile = configDir + "/" + CONFIG_FILE; BufferedReader reader = new BufferedReader( new InputStreamReader(new FileInputStream(propertiesFile), StandardCharsets.UTF_8)); properties.load(reader); - alarmUrl = properties.getProperty(ALARMURL); - auditTrailUrl = properties.getProperty(AUDITTRAILURL); - integrityUrl = properties.getProperty(INTEGRITYURL); - monitoringUrl = properties.getProperty(MONITORINGURL); + alarmUrl = properties.getProperty(ALARM_URL); + auditTrailUrl = properties.getProperty(AUDIT_TRAIL_URL); + integrityUrl = properties.getProperty(INTEGRITY_URL); + monitoringUrl = properties.getProperty(MONITORING_URL); log.debug("Properties has been loaded:"); - log.debug("alarm:" +alarmUrl); - log.debug("auditTrail:" +auditTrailUrl); - log.debug("integrity:" +integrityUrl); + log.debug("alarm: {}", alarmUrl); + log.debug("auditTrail: {}", auditTrailUrl); + log.debug("integrity: {}", integrityUrl); } catch (IOException e) { //will just fail setting keystore stuff and we won't be able to connect over ssl // not a big deal..