You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2020/06/13 19:33:43 UTC
[maven-resolver] 01/01: [MRESOLVER-119] Turn log messages to SLF4J
placeholders
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MRESOLVER-119
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit 435bce17133b7af3d61fa0476c7e0e1eda18d8c0
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jun 13 21:33:27 2020 +0200
[MRESOLVER-119] Turn log messages to SLF4J placeholders
---
.../connector/basic/BasicRepositoryConnector.java | 36 ++++++----------------
.../aether/connector/basic/ChecksumValidator.java | 6 ++--
.../aether/connector/basic/PartialFile.java | 7 ++---
.../manual/ManualRepositorySystemFactory.java | 8 ++---
.../impl/DefaultLocalRepositoryProvider.java | 7 ++---
.../impl/DefaultRepositoryConnectorProvider.java | 7 ++---
.../impl/DefaultRepositoryEventDispatcher.java | 16 ++--------
.../impl/DefaultRepositoryLayoutProvider.java | 7 ++---
.../internal/impl/DefaultTransporterProvider.java | 7 ++---
.../internal/impl/DefaultUpdateCheckManager.java | 22 ++++++-------
.../aether/internal/impl/TrackingFileManager.java | 7 +++--
.../aether/internal/impl/WarnChecksumPolicy.java | 16 +++-------
.../impl/collect/DefaultDependencyCollector.java | 13 +++-----
.../aether/transport/wagon/WagonTransporter.java | 24 +++++----------
14 files changed, 64 insertions(+), 119 deletions(-)
diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
index ee9a267..66605ee 100644
--- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
+++ b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
@@ -8,9 +8,9 @@ package org.eclipse.aether.connector.basic;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -500,7 +500,7 @@ final class BasicRepositoryConnector
private final File file;
- private final FileTransformer fileTransformer;
+ private final FileTransformer fileTransformer;
private final Collection<RepositoryLayout.Checksum> checksums;
@@ -511,9 +511,9 @@ final class BasicRepositoryConnector
}
/**
- * <strong>IMPORTANT</strong> When using a fileTransformer, the content of the file is stored in memory to
+ * <strong>IMPORTANT</strong> When using a fileTransformer, the content of the file is stored in memory to
* ensure that file content and checksums stay in sync!
- *
+ *
* @param path
* @param file
* @param fileTransformer
@@ -538,7 +538,7 @@ final class BasicRepositoryConnector
// transform data once to byte array, ensure constant data for checksum
ByteArrayOutputStream baos = new ByteArrayOutputStream();
byte[] buffer = new byte[1024];
-
+
try ( InputStream transformData = fileTransformer.transformData( file ) )
{
for ( int read; ( read = transformData.read( buffer, 0, buffer.length ) ) != -1; )
@@ -559,7 +559,7 @@ final class BasicRepositoryConnector
}
/**
- *
+ *
* @param file source
* @param bytes transformed data from file or {@code null}
* @param location target
@@ -577,7 +577,7 @@ final class BasicRepositoryConnector
{
algos.add( checksum.getAlgorithm() );
}
-
+
Map<String, Object> sumsByAlgo;
if ( bytes != null )
{
@@ -595,15 +595,7 @@ final class BasicRepositoryConnector
}
catch ( IOException e )
{
- String msg = "Failed to upload checksums for " + file + ": " + e.getMessage();
- if ( LOGGER.isDebugEnabled() )
- {
- LOGGER.warn( msg, e );
- }
- else
- {
- LOGGER.warn( msg );
- }
+ LOGGER.warn( "Failed to upload checksums for {}", file, e );
}
}
@@ -619,15 +611,7 @@ final class BasicRepositoryConnector
}
catch ( Exception e )
{
- String msg = "Failed to upload checksum " + location + ": " + e.getMessage();
- if ( LOGGER.isDebugEnabled() )
- {
- LOGGER.warn( msg, e );
- }
- else
- {
- LOGGER.warn( msg );
- }
+ LOGGER.warn( "Failed to upload checksum to {}", location, e );
}
}
diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumValidator.java b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumValidator.java
index be0f9c0..5a77bf7 100644
--- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumValidator.java
+++ b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumValidator.java
@@ -8,9 +8,9 @@ package org.eclipse.aether.connector.basic;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -251,7 +251,7 @@ final class ChecksumValidator
}
catch ( IOException e )
{
- LOGGER.debug( "Failed to write checksum file {}: {}", checksumFile, e.getMessage(), e );
+ LOGGER.debug( "Failed to write checksum file {}", checksumFile, e );
}
}
checksumFiles.clear();
diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/PartialFile.java b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/PartialFile.java
index 16ab98b..c7a74f7 100644
--- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/PartialFile.java
+++ b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/PartialFile.java
@@ -8,9 +8,9 @@ package org.eclipse.aether.connector.basic;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -282,8 +282,7 @@ final class PartialFile
catch ( IOException e )
{
lockFile.close();
- LOGGER.debug( "Cannot create resumable file {}: {}", partFile.getAbsolutePath(), e.getMessage(),
- e );
+ LOGGER.debug( "Cannot create resumable file {}", partFile.getAbsolutePath(), e );
// fall through and try non-resumable/temporary file location
}
}
diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/manual/ManualRepositorySystemFactory.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/manual/ManualRepositorySystemFactory.java
index 06b2a59..77c37fb 100644
--- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/manual/ManualRepositorySystemFactory.java
+++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/manual/ManualRepositorySystemFactory.java
@@ -8,9 +8,9 @@ package org.apache.maven.resolver.examples.manual;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -55,8 +55,8 @@ public class ManualRepositorySystemFactory
@Override
public void serviceCreationFailed( Class<?> type, Class<?> impl, Throwable exception )
{
- LOGGER.error( "Service creation failed for {} implementation {}: {}",
- type, impl, exception.getMessage(), exception );
+ LOGGER.error( "Service creation failed for {} with implementation {}",
+ type, impl, exception );
}
} );
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java
index 77e968e..baecf68 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java
@@ -8,9 +8,9 @@ package org.eclipse.aether.internal.impl;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -124,10 +124,9 @@ public class DefaultLocalRepositoryProvider
}
if ( LOGGER.isDebugEnabled() && errors.size() > 1 )
{
- String msg = "Could not obtain local repository manager for " + repository;
for ( Exception e : errors )
{
- LOGGER.debug( msg, e );
+ LOGGER.debug( "Could not obtain local repository manager for {}", repository, e );
}
}
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java
index 6478d8a..2e2215b 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java
@@ -8,9 +8,9 @@ package org.eclipse.aether.internal.impl;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -145,10 +145,9 @@ public class DefaultRepositoryConnectorProvider
}
if ( LOGGER.isDebugEnabled() && errors.size() > 1 )
{
- String msg = "Could not obtain connector factory for " + repository;
for ( Exception e : errors )
{
- LOGGER.debug( msg, e );
+ LOGGER.debug( "Could not obtain connector factory for {}", repository, e );
}
}
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java
index 33210e7..5732dea 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java
@@ -8,9 +8,9 @@ package org.eclipse.aether.internal.impl;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -174,17 +174,7 @@ public class DefaultRepositoryEventDispatcher
private void logError( Throwable e, Object listener )
{
- String msg =
- "Failed to dispatch repository event to " + listener.getClass().getCanonicalName() + ": " + e.getMessage();
-
- if ( LOGGER.isDebugEnabled() )
- {
- LOGGER.warn( msg, e );
- }
- else
- {
- LOGGER.warn( msg );
- }
+ LOGGER.warn( "Failed to dispatch repository event to {}", listener.getClass().getCanonicalName(), e );
}
}
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java
index dfd3801..7220b54 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java
@@ -8,9 +8,9 @@ package org.eclipse.aether.internal.impl;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -111,10 +111,9 @@ public final class DefaultRepositoryLayoutProvider
}
if ( LOGGER.isDebugEnabled() && errors.size() > 1 )
{
- String msg = "Could not obtain layout factory for " + repository;
for ( Exception e : errors )
{
- LOGGER.debug( msg, e );
+ LOGGER.debug( "Could not obtain layout factory for {}", repository, e );
}
}
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java
index c5a175d..550191d 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java
@@ -8,9 +8,9 @@ package org.eclipse.aether.internal.impl;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -123,10 +123,9 @@ public final class DefaultTransporterProvider
}
if ( LOGGER.isDebugEnabled() && errors.size() > 1 )
{
- String msg = "Could not obtain transporter factory for " + repository;
for ( Exception e : errors )
{
- LOGGER.debug( msg, e );
+ LOGGER.debug( "Could not obtain transporter factory for {}", repository, e );
}
}
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java
index b787ebd..27f85da 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java
@@ -8,9 +8,9 @@ package org.eclipse.aether.internal.impl;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -107,7 +107,7 @@ public class DefaultUpdateCheckManager
if ( check.getLocalLastUpdated() != 0
&& !isUpdatedRequired( session, check.getLocalLastUpdated(), check.getPolicy() ) )
{
- LOGGER.debug( "Skipped remote request for {}, locally installed artifact up-to-date.", check.getItem() );
+ LOGGER.debug( "Skipped remote request for {}, locally installed artifact up-to-date", check.getItem() );
check.setRequired( false );
return;
@@ -161,11 +161,7 @@ public class DefaultUpdateCheckManager
}
else if ( isAlreadyUpdated( session, updateKey ) )
{
- if ( LOGGER.isDebugEnabled() )
- {
- LOGGER.debug( "Skipped remote request for " + check.getItem()
- + ", already updated during this session." );
- }
+ LOGGER.debug( "Skipped remote request for {}, already updated during this session", check.getItem() );
check.setRequired( false );
if ( error != null )
@@ -179,7 +175,7 @@ public class DefaultUpdateCheckManager
}
else if ( fileExists )
{
- LOGGER.debug( "Skipped remote request for {}, locally cached artifact up-to-date.", check.getItem() );
+ LOGGER.debug( "Skipped remote request for {}, locally cached artifact up-to-date", check.getItem() );
check.setRequired( false );
}
@@ -234,7 +230,7 @@ public class DefaultUpdateCheckManager
if ( check.getLocalLastUpdated() != 0
&& !isUpdatedRequired( session, check.getLocalLastUpdated(), check.getPolicy() ) )
{
- LOGGER.debug( "Skipped remote request for {} locally installed metadata up-to-date.", check.getItem() );
+ LOGGER.debug( "Skipped remote request for {} locally installed metadata up-to-date", check.getItem() );
check.setRequired( false );
return;
@@ -288,7 +284,7 @@ public class DefaultUpdateCheckManager
}
else if ( isAlreadyUpdated( session, updateKey ) )
{
- LOGGER.debug( "Skipped remote request for {}, already updated during this session.", check.getItem() );
+ LOGGER.debug( "Skipped remote request for {}, already updated during this session", check.getItem() );
check.setRequired( false );
if ( error != null )
@@ -302,7 +298,7 @@ public class DefaultUpdateCheckManager
}
else if ( fileExists )
{
- LOGGER.debug( "Skipped remote request for {}, locally cached metadata up-to-date.", check.getItem() );
+ LOGGER.debug( "Skipped remote request for {}, locally cached metadata up-to-date", check.getItem() );
check.setRequired( false );
}
@@ -349,7 +345,7 @@ public class DefaultUpdateCheckManager
}
catch ( NumberFormatException e )
{
- LOGGER.debug( "Cannot parse lastUpdated date: \'{}\'. Ignoring.", value, e );
+ LOGGER.debug( "Cannot parse last updated date {}, ignoring it", value, e );
return 1;
}
}
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/TrackingFileManager.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/TrackingFileManager.java
index 031f218..8e67e8c 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/TrackingFileManager.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/TrackingFileManager.java
@@ -8,9 +8,9 @@ package org.eclipse.aether.internal.impl;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -189,7 +189,8 @@ class TrackingFileManager
}
catch ( IOException e )
{
- LOGGER.warn( "Failed to canonicalize path {}: {}", file, e.getMessage() );
+ LOGGER.warn( "Failed to canonicalize path {}", file, e );
+ // TODO This is code smell and deprecated
return file.getAbsolutePath().intern();
}
}
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/WarnChecksumPolicy.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/WarnChecksumPolicy.java
index 32efcf0..fca0671 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/WarnChecksumPolicy.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/WarnChecksumPolicy.java
@@ -8,9 +8,9 @@ package org.eclipse.aether.internal.impl;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -36,16 +36,8 @@ final class WarnChecksumPolicy
public boolean onTransferChecksumFailure( ChecksumFailureException exception )
{
- String msg =
- "Could not validate integrity of download from " + resource.getRepositoryUrl() + resource.getResourceName();
- if ( logger.isDebugEnabled() )
- {
- logger.warn( msg, exception );
- }
- else
- {
- logger.warn( msg + ": " + exception.getMessage() );
- }
+ logger.warn( "Could not validate integrity of download from {}{}", resource.getRepositoryUrl(),
+ resource.getResourceName(), exception );
return true;
}
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java
index 34bcb39..117e93a 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java
@@ -157,7 +157,7 @@ public class DefaultDependencyCollector
List<Dependency> dependencies = request.getDependencies();
List<Dependency> managedDependencies = request.getManagedDependencies();
- Map<String, Object> stats = LOGGER.isDebugEnabled() ? new LinkedHashMap<String, Object>() : null;
+ Map<String, Object> stats = new LinkedHashMap<String, Object>();
long time1 = System.nanoTime();
DefaultDependencyNode node;
@@ -278,13 +278,10 @@ public class DefaultDependencyCollector
}
}
- if ( stats != null )
- {
- long time3 = System.nanoTime();
- stats.put( "DefaultDependencyCollector.collectTime", time2 - time1 );
- stats.put( "DefaultDependencyCollector.transformTime", time3 - time2 );
- LOGGER.debug( "Dependency collection stats: " + stats );
- }
+ long time3 = System.nanoTime();
+ stats.put( "DefaultDependencyCollector.collectTime", time2 - time1 );
+ stats.put( "DefaultDependencyCollector.transformTime", time3 - time2 );
+ LOGGER.debug( "Dependency collection stats {}", stats );
if ( errorPath != null )
{
diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java
index 92f3064..dd5b282 100644
--- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java
+++ b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java
@@ -8,9 +8,9 @@ package org.eclipse.aether.transport.wagon;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -124,8 +124,8 @@ final class WagonTransporter
}
catch ( Exception e )
{
- LOGGER.debug( "No transport {}", e.getMessage(), e );
- throw new NoTransporterException( repository, e.getMessage(), e );
+ LOGGER.debug( "No transport {}", e );
+ throw new NoTransporterException( repository, e );
}
repoAuthContext = AuthenticationContext.forRepository( session, repository );
@@ -300,7 +300,7 @@ final class WagonTransporter
}
catch ( Exception e )
{
- LOGGER.debug( "Could not set user agent for wagon {}: {}", wagon.getClass().getName(), e.getMessage() );
+ LOGGER.debug( "Could not set user agent for Wagon {}", wagon.getClass().getName(), e );
}
}
@@ -325,17 +325,7 @@ final class WagonTransporter
}
catch ( Exception e )
{
- String msg =
- "Could not apply configuration for " + repository.getId() + " to wagon "
- + wagon.getClass().getName() + ":" + e.getMessage();
- if ( LOGGER.isDebugEnabled() )
- {
- LOGGER.warn( msg, e );
- }
- else
- {
- LOGGER.warn( msg );
- }
+ LOGGER.warn( "Could not apply configuration for {} to Wagon {}", repository.getId(), wagon.getClass().getName(), e );
}
}
@@ -353,7 +343,7 @@ final class WagonTransporter
}
catch ( Exception e )
{
- LOGGER.debug( "Could not disconnect wagon {}", wagon, e );
+ LOGGER.debug( "Could not disconnect Wagon {}", wagon, e );
}
}