From 3c2a5141c9d393a45bdee873e6aa2c9c275b7b58 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Sat, 13 Jun 2020 21:33:27 +0200 Subject: [PATCH] [MRESOLVER-119] Turn log messages to SLF4J placeholders This closes #55 --- .../basic/BasicRepositoryConnector.java | 36 ++++++------------- .../connector/basic/ChecksumValidator.java | 6 ++-- .../aether/connector/basic/PartialFile.java | 7 ++-- .../manual/ManualRepositorySystemFactory.java | 8 ++--- .../impl/DefaultLocalRepositoryProvider.java | 7 ++-- .../DefaultRepositoryConnectorProvider.java | 7 ++-- .../DefaultRepositoryEventDispatcher.java | 16 ++------- .../impl/DefaultRepositoryLayoutProvider.java | 7 ++-- .../impl/DefaultTransporterProvider.java | 7 ++-- .../impl/DefaultUpdateCheckManager.java | 22 +++++------- .../internal/impl/TrackingFileManager.java | 7 ++-- .../internal/impl/WarnChecksumPolicy.java | 16 +++------ .../collect/DefaultDependencyCollector.java | 13 +++---- .../transport/wagon/WagonTransporter.java | 25 +++++-------- 14 files changed, 65 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 ee9a267b4..66605eee6 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 @@ * 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 @@ class PutTaskRunner private final File file; - private final FileTransformer fileTransformer; + private final FileTransformer fileTransformer; private final Collection checksums; @@ -511,9 +511,9 @@ class PutTaskRunner } /** - * IMPORTANT When using a fileTransformer, the content of the file is stored in memory to + * IMPORTANT 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 @@ protected void runTask() // 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 @@ protected void runTask() } /** - * + * * @param file source * @param bytes transformed data from file or {@code null} * @param location target @@ -577,7 +577,7 @@ private void uploadChecksums( File file, byte[] bytes, URI location ) { algos.add( checksum.getAlgorithm() ); } - + Map sumsByAlgo; if ( bytes != null ) { @@ -595,15 +595,7 @@ private void uploadChecksums( File file, byte[] bytes, URI location ) } 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 @@ private void uploadChecksum( URI location, Object checksum ) } 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 be0f9c037..5a77bf74e 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 @@ * 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 @@ public void commit() } 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 16ab98b02..c7a74f7ca 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 @@ * 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 @@ public PartialFile newInstance( File dstFile, RemoteAccessChecker checker ) 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 06b2a5914..77c37fb35 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 @@ * 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 static RepositorySystem newRepositorySystem() @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 77e968eae..baecf680b 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 @@ * 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 LocalRepositoryManager newLocalRepositoryManager( RepositorySystemSession } 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 6478d8af8..2e2215b6e 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 @@ * 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 RepositoryConnector newRepositoryConnector( RepositorySystemSession sessi } 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 33210e721..5732deac9 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 @@ * 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 @@ private void dispatch( RepositoryEvent event, RepositoryListener listener ) 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 dfd380153..7220b5429 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 @@ * 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 RepositoryLayout newRepositoryLayout( RepositorySystemSession session, Re } 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 c5a175d6c..550191d6c 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 @@ * 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 Transporter newTransporter( RepositorySystemSession session, RemoteReposi } 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 b787ebd9a..27f85daad 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 @@ * 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 void checkArtifact( RepositorySystemSession session, UpdateCheck dependencies = request.getDependencies(); List managedDependencies = request.getManagedDependencies(); - Map stats = LOGGER.isDebugEnabled() ? new LinkedHashMap() : null; + Map stats = new LinkedHashMap(); long time1 = System.nanoTime(); DefaultDependencyNode node; @@ -278,13 +278,10 @@ public CollectResult collectDependencies( RepositorySystemSession session, Colle } } - 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 92f306433..619d49fce 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 @@ * 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 @@ private void connectWagon( Wagon wagon ) } 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,8 @@ private void connectWagon( Wagon wagon ) } 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 +344,7 @@ private void disconnectWagon( Wagon wagon ) } catch ( Exception e ) { - LOGGER.debug( "Could not disconnect wagon {}", wagon, e ); + LOGGER.debug( "Could not disconnect Wagon {}", wagon, e ); } }