You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2019/04/12 12:35:21 UTC
[maven] 04/04: [MNG-5577] Migrate to JSR 300 Annotations -
maven-embedder - log
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-5577
in repository https://gitbox.apache.org/repos/asf/maven.git
commit e3c5173354978cfee11c7555026d0793d88b4752
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Jan 21 01:51:18 2019 +0100
[MNG-5577] Migrate to JSR 300 Annotations - maven-embedder - log
use placeholders for logging
---
.../org/apache/maven/cli/CLIReportingUtils.java | 2 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 35 +++++++++++-----------
.../SettingsXmlConfigurationProcessor.java | 10 +++----
.../maven/cli/event/ExecutionEventLogger.java | 11 ++++---
.../impl/UnsupportedSlf4jBindingConfiguration.java | 2 +-
.../cli/transfer/Slf4jMavenTransferListener.java | 4 +--
6 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index e1a4c2f..fb78239 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -146,7 +146,7 @@ public final class CLIReportingUtils
for ( Throwable cause = e.getCause(); cause != null; cause = cause.getCause() )
{
- logger.error( "Caused by: " + cause.getMessage() );
+ logger.error( "Caused by: {}", cause.getMessage() );
}
}
}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 4ee6aa8..22b6065 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -569,7 +569,7 @@ public class MavenCli
if ( slf4jLogger.isDebugEnabled() )
{
- slf4jLogger.debug( "Message scheme: " + ( MessageUtils.isColorEnabled() ? "color" : "plain" ) );
+ slf4jLogger.debug( "Message scheme: {}", ( MessageUtils.isColorEnabled() ? "color" : "plain" ) );
if ( MessageUtils.isColorEnabled() )
{
MessageBuilder buff = MessageUtils.buffer();
@@ -767,7 +767,7 @@ public class MavenCli
}
catch ( Exception e )
{
- slf4jLogger.warn( "Failed to read extensions descriptor " + extensionsFile + ": " + e.getMessage() );
+ slf4jLogger.warn( "Failed to read extensions descriptor {}: {}", extensionsFile, e.getMessage() );
}
return Collections.emptyList();
}
@@ -795,11 +795,11 @@ public class MavenCli
extRealm.setParentRealm( coreRealm );
- slf4jLogger.debug( "Populating class realm " + extRealm.getId() );
+ slf4jLogger.debug( "Populating class realm {}", extRealm.getId() );
for ( File file : extClassPath )
{
- slf4jLogger.debug( " Included " + file );
+ slf4jLogger.debug( " Included {}", file );
extRealm.addURL( file.toURI().toURL() );
}
@@ -848,7 +848,7 @@ public class MavenCli
{
File file = resolveFile( new File( jar ), cliRequest.workingDirectory );
- slf4jLogger.debug( " Included " + file );
+ slf4jLogger.debug( " Included {}", file );
jars.add( file );
}
@@ -983,13 +983,13 @@ public class MavenCli
if ( !cliRequest.showErrors )
{
- slf4jLogger.error( "To see the full stack trace of the errors, re-run Maven with the "
- + buffer().strong( "-e" ) + " switch." );
+ slf4jLogger.error( "To see the full stack trace of the errors, re-run Maven with the {} switch.",
+ buffer().strong( "-e" ) );
}
if ( !slf4jLogger.isDebugEnabled() )
{
- slf4jLogger.error( "Re-run Maven using the " + buffer().strong( "-X" )
- + " switch to enable full debug logging." );
+ slf4jLogger.error( "Re-run Maven using the {} switch to enable full debug logging.",
+ buffer().strong( "-X" ) );
}
if ( !references.isEmpty() )
@@ -1000,7 +1000,7 @@ public class MavenCli
for ( Map.Entry<String, String> entry : references.entrySet() )
{
- slf4jLogger.error( buffer().strong( entry.getValue() ) + " " + entry.getKey() );
+ slf4jLogger.error( "{} {}", buffer().strong( entry.getValue() ), entry.getKey() );
}
}
@@ -1257,11 +1257,10 @@ public class MavenCli
eventSpyDispatcher.onEvent( toolchainsRequest );
- slf4jLogger.debug(
- "Reading global toolchains from " + getLocation( toolchainsRequest.getGlobalToolchainsSource(),
- globalToolchainsFile ) );
- slf4jLogger.debug( "Reading user toolchains from " + getLocation( toolchainsRequest.getUserToolchainsSource(),
- userToolchainsFile ) );
+ slf4jLogger.debug("Reading global toolchains from {}",
+ getLocation( toolchainsRequest.getGlobalToolchainsSource(), globalToolchainsFile ) );
+ slf4jLogger.debug( "Reading user toolchains from {}",
+ getLocation( toolchainsRequest.getUserToolchainsSource(), userToolchainsFile ) );
ToolchainsBuildingResult toolchainsResult = toolchainsBuilder.build( toolchainsRequest );
@@ -1277,7 +1276,7 @@ public class MavenCli
for ( Problem problem : toolchainsResult.getProblems() )
{
- slf4jLogger.warn( problem.getMessage() + " @ " + problem.getLocation() );
+ slf4jLogger.warn( "{} @ {}", problem.getMessage(), problem.getLocation() );
}
slf4jLogger.warn( "" );
@@ -1311,8 +1310,8 @@ public class MavenCli
{
if ( commandLine.hasOption( deprecatedOption ) )
{
- slf4jLogger.warn( "Command line option -" + deprecatedOption
- + " is deprecated and will be removed in future Maven versions." );
+ slf4jLogger.warn( "Command line option -{} is deprecated and will be removed in future Maven versions.",
+ deprecatedOption );
}
}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java b/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
index 507be75..765e80e 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
@@ -135,10 +135,10 @@ public class SettingsXmlConfigurationProcessor
request.getEventSpyDispatcher().onEvent( settingsRequest );
}
- LOGGER.debug( "Reading global settings from "
- + getLocation( settingsRequest.getGlobalSettingsSource(), settingsRequest.getGlobalSettingsFile() ) );
- LOGGER.debug( "Reading user settings from "
- + getLocation( settingsRequest.getUserSettingsSource(), settingsRequest.getUserSettingsFile() ) );
+ LOGGER.debug( "Reading global settings from {}",
+ getLocation( settingsRequest.getGlobalSettingsSource(), settingsRequest.getGlobalSettingsFile() ) );
+ LOGGER.debug( "Reading user settings from {}",
+ getLocation( settingsRequest.getUserSettingsSource(), settingsRequest.getUserSettingsFile() ) );
SettingsBuildingResult settingsResult = settingsBuilder.build( settingsRequest );
@@ -156,7 +156,7 @@ public class SettingsXmlConfigurationProcessor
for ( SettingsProblem problem : settingsResult.getProblems() )
{
- LOGGER.warn( problem.getMessage() + " @ " + problem.getLocation() );
+ LOGGER.warn( "{} @ {}", problem.getMessage(), problem.getLocation() );
}
LOGGER.warn( "" );
}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
index cb34d8e..1b50399 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
@@ -115,8 +115,7 @@ public class ExecutionEventLogger
for ( MavenProject project : projects )
{
int len = LINE_LENGTH - project.getName().length() - project.getPackaging().length() - 2;
- logger.info( project.getName() + chars( ' ', ( len > 0 ) ? len : 1 ) + '[' + project.getPackaging()
- + ']' );
+ logger.info( "{}{}[{}]", project.getName(), chars( ' ', ( len > 0 ) ? len : 1 ), project.getPackaging());
}
totalProjects = projects.size();
@@ -267,9 +266,9 @@ public class ExecutionEventLogger
String wallClock = session.getRequest().getDegreeOfConcurrency() > 1 ? " (Wall Clock)" : "";
- logger.info( "Total time: " + formatDuration( time ) + wallClock );
+ logger.info( "Total time: {}{}", formatDuration( time ), wallClock );
- logger.info( "Finished at: " + formatTimestamp( finish ) );
+ logger.info( "Finished at: {}", formatTimestamp( finish ) );
}
@Override
@@ -345,8 +344,8 @@ public class ExecutionEventLogger
{
if ( logger.isWarnEnabled() )
{
- logger.warn( "Goal " + event.getMojoExecution().getGoal()
- + " requires online mode for execution but Maven is currently offline, skipping" );
+ logger.warn( "Goal {} requires online mode for execution but Maven is currently offline, skipping",
+ event.getMojoExecution().getGoal() );
}
}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java
index d269770..4757cff 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java
@@ -51,7 +51,7 @@ public class UnsupportedSlf4jBindingConfiguration
@Override
public void activate()
{
- logger.warn( "The SLF4J binding actually used is not supported by Maven: " + slf4jBinding );
+ logger.warn( "The SLF4J binding actually used is not supported by Maven: {}", slf4jBinding );
logger.warn( "Maven supported bindings are:" );
String ls = System.getProperty( "line.separator" );
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
index 086e406..57e69ba 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
@@ -69,8 +69,8 @@ public class Slf4jMavenTransferListener
throws TransferCancelledException
{
TransferResource resource = event.getResource();
- out.warn( event.getException().getMessage() + " from " + resource.getRepositoryId() + " for "
- + resource.getRepositoryUrl() + resource.getResourceName() );
+ out.warn( "{} from {} for {}{}", event.getException().getMessage(), resource.getRepositoryId(),
+ resource.getRepositoryUrl(), resource.getResourceName() );
}
@Override