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 2021/10/10 10:42:50 UTC
[maven] branch master updated: [MNG-7288] Remove redundant local
variables
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new d61fcf7 [MNG-7288] Remove redundant local variables
d61fcf7 is described below
commit d61fcf7da1a1d7b0ee93e741cf0f91c7e1827323
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Thu Oct 7 20:45:10 2021 +0200
[MNG-7288] Remove redundant local variables
Closes #569
---
.../src/main/java/org/apache/maven/project/ModelUtils.java | 4 +---
.../apache/maven/repository/legacy/LegacyRepositorySystem.java | 8 ++------
.../maven/repository/metadata/DefaultGraphConflictResolver.java | 3 +--
maven-core/src/main/java/org/apache/maven/RepositoryUtils.java | 4 +---
.../artifact/repository/metadata/io/DefaultMetadataReader.java | 4 +---
.../main/java/org/apache/maven/bridge/MavenRepositorySystem.java | 4 +---
.../org/apache/maven/lifecycle/internal/DependencyContext.java | 6 ++----
.../apache/maven/plugin/internal/DefaultMavenPluginManager.java | 4 +---
.../java/org/apache/maven/project/DefaultMavenProjectHelper.java | 4 +---
.../org/apache/maven/project/artifact/MavenMetadataSource.java | 6 ++----
.../apache/maven/cli/internal/BootstrapCoreExtensionManager.java | 3 +--
.../repository/internal/ArtifactDescriptorReaderDelegate.java | 4 +---
.../java/org/apache/maven/settings/io/DefaultSettingsReader.java | 4 +---
.../src/main/java/org/apache/maven/wrapper/DefaultDownloader.java | 6 ++----
14 files changed, 18 insertions(+), 46 deletions(-)
diff --git a/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java b/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
index a428da0..6b378b7 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
@@ -103,12 +103,10 @@ public final class ModelUtils
if ( ( childPlugin != null ) && !assembledPlugins.contains( childPlugin ) )
{
- Plugin assembledPlugin = childPlugin;
-
mergePluginDefinitions( childPlugin, parentPlugin, handleAsInheritance );
// fix for MNG-2221 (assembly cache was not being populated for later reference):
- assembledPlugins.add( assembledPlugin );
+ assembledPlugins.add( childPlugin );
}
// if we're processing this as an inheritance-based merge, and
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
index 0bd8219..8c95385 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
@@ -833,12 +833,8 @@ public class LegacyRepositorySystem
{
repositoryLayout = layouts.get( "default" );
}
-
- ArtifactRepository artifactRepository =
- artifactRepositoryFactory.createArtifactRepository( repositoryId, url, repositoryLayout, snapshots,
- releases );
-
- return artifactRepository;
+ return artifactRepositoryFactory.createArtifactRepository( repositoryId, url, repositoryLayout, snapshots,
+ releases );
}
private static String getMessage( Throwable error, String def )
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
index 9a27bf4..287ffec 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
@@ -132,12 +132,11 @@ public class DefaultGraphConflictResolver
res.addEdge( sourceV, newV, edge );
}
}
- MetadataGraph linkedRes = findLinkedSubgraph( res );
// System.err.println("Original graph("+graph.getVertices().size()+"):\n"+graph.toString());
// System.err.println("Cleaned("+requestedScope+") graph("+res.getVertices().size()+"):\n"+res.toString());
// System.err.println("Linked("+requestedScope+")
// subgraph("+linkedRes.getVertices().size()+"):\n"+linkedRes.toString());
- return linkedRes;
+ return findLinkedSubgraph( res );
}
catch ( MetadataResolutionException e )
{
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index a49b670..ceb6ba3 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -324,14 +324,12 @@ public class RepositoryUtils
exclusions.add( toExclusion( exclusion ) );
}
- Dependency result = new Dependency( artifact,
+ return new Dependency( artifact,
dependency.getScope(),
dependency.getOptional() != null
? dependency.isOptional()
: null,
exclusions );
-
- return result;
}
private static Exclusion toExclusion( org.apache.maven.model.Exclusion exclusion )
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
index ea5dd57..e4ca4f9 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
@@ -50,9 +50,7 @@ public class DefaultMetadataReader
{
Objects.requireNonNull( input, "input cannot be null" );
- Metadata metadata = read( ReaderFactory.newXmlReader( input ), options );
-
- return metadata;
+ return read( ReaderFactory.newXmlReader( input ), options );
}
public Metadata read( Reader input, Map<String, ?> options )
diff --git a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index f6b83c0..e6f1a39 100644
--- a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
+++ b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
@@ -323,9 +323,7 @@ public class MavenRepositorySystem
private ArtifactRepositoryLayout getLayout( String id )
{
- ArtifactRepositoryLayout layout = layouts.get( id );
-
- return layout;
+ return layouts.get( id );
}
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
index 281420b..5572f52 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
@@ -100,10 +100,8 @@ public class DependencyContext
public boolean isResolutionRequiredForAggregatedProjects( Collection<String> scopesToCollect,
Collection<String> scopesToResolve )
{
- boolean required =
- scopesToCollectForAggregatedProjects.addAll( scopesToCollect )
- || scopesToResolveForAggregatedProjects.addAll( scopesToResolve );
- return required;
+ return scopesToCollectForAggregatedProjects.addAll( scopesToCollect )
+ || scopesToResolveForAggregatedProjects.addAll( scopesToResolve );
}
public void synchronizeWithProjectState()
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
index ca1910b..8492451 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
@@ -271,9 +271,7 @@ public class DefaultMavenPluginManager
{
Reader reader = ReaderFactory.newXmlReader( is );
- PluginDescriptor pluginDescriptor = builder.build( reader, descriptorLocation );
-
- return pluginDescriptor;
+ return builder.build( reader, descriptorLocation );
}
catch ( IOException | PlexusConfigurationException e )
{
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
index 3541bca..e2c3b5c 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
@@ -54,11 +54,9 @@ public class DefaultMavenProjectHelper
public void attachArtifact( MavenProject project, String artifactType, String artifactClassifier,
File artifactFile )
{
- String type = artifactType;
-
ArtifactHandler handler = null;
- if ( type != null )
+ if ( artifactType != null )
{
handler = artifactHandlerManager.getArtifactHandler( artifactType );
}
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
index ba05f5b..508ebeb 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
@@ -355,9 +355,7 @@ public class MavenMetadataSource
dependency.getType(), dependency.getClassifier(), effectiveScope,
dependency.isOptional() );
- ArtifactFilter dependencyFilter = inheritedFilter;
-
- if ( dependencyFilter != null && !dependencyFilter.include( dependencyArtifact ) )
+ if ( inheritedFilter != null && !inheritedFilter.include( dependencyArtifact ) )
{
return null;
}
@@ -367,7 +365,7 @@ public class MavenMetadataSource
dependencyArtifact.setFile( new File( dependency.getSystemPath() ) );
}
- dependencyArtifact.setDependencyFilter( createDependencyFilter( dependency, dependencyFilter ) );
+ dependencyArtifact.setDependencyFilter( createDependencyFilter( dependency, inheritedFilter ) );
return dependencyArtifact;
}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java
index b1bbba7..e0107e0 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java
@@ -139,8 +139,7 @@ public class BootstrapCoreExtensionManager
pluginDependenciesResolver.resolveCoreExtension( plugin, dependencyFilter, repositories, repoSession );
PreorderNodeListGenerator nlg = new PreorderNodeListGenerator();
root.accept( nlg );
- List<Artifact> artifacts = nlg.getArtifacts( false );
- return artifacts;
+ return nlg.getArtifacts( false );
}
}
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
index 517441f..af1eebf 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
@@ -124,13 +124,11 @@ public class ArtifactDescriptorReaderDelegate
exclusions.add( convert( exclusion ) );
}
- Dependency result = new Dependency( artifact, dependency.getScope(),
+ return new Dependency( artifact, dependency.getScope(),
dependency.getOptional() != null
? dependency.isOptional()
: null,
exclusions );
-
- return result;
}
private Exclusion convert( org.apache.maven.model.Exclusion exclusion )
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java
index ac01feb..4ce48dd 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java
@@ -51,9 +51,7 @@ public class DefaultSettingsReader
{
Objects.requireNonNull( input, "input cannot be null" );
- Settings settings = read( ReaderFactory.newXmlReader( input ), options );
-
- return settings;
+ return read( ReaderFactory.newXmlReader( input ), options );
}
@Override
diff --git a/maven-wrapper/src/main/java/org/apache/maven/wrapper/DefaultDownloader.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/DefaultDownloader.java
index 6195723..f5dd89c 100644
--- a/maven-wrapper/src/main/java/org/apache/maven/wrapper/DefaultDownloader.java
+++ b/maven-wrapper/src/main/java/org/apache/maven/wrapper/DefaultDownloader.java
@@ -167,16 +167,14 @@ public class DefaultDownloader
private String calculateUserAgent()
{
- String appVersion = applicationVersion;
-
String javaVendor = System.getProperty( "java.vendor" );
String javaVersion = System.getProperty( "java.version" );
String javaVendorVersion = System.getProperty( "java.vm.version" );
String osName = System.getProperty( "os.name" );
String osVersion = System.getProperty( "os.version" );
String osArch = System.getProperty( "os.arch" );
- return String.format( "%s/%s (%s;%s;%s) (%s;%s;%s)", applicationName, appVersion, osName, osVersion, osArch,
- javaVendor, javaVersion, javaVendorVersion );
+ return String.format( "%s/%s (%s;%s;%s) (%s;%s;%s)", applicationName, applicationVersion, osName, osVersion,
+ osArch, javaVendor, javaVersion, javaVendorVersion );
}
private static class SystemPropertiesProxyAuthenticator