inline variable

Vincent Potucek · Vincent Potucek · commit 8137254b19b4 · 2025-05-31T12:16:09.000+02:00
diff --git a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
@@ -132,14 +132,7 @@ public boolean checkOutOfDate(Date lastModified) {
 
     @Override
     public String toString() {
-        String buffer = "{enabled=" +
-                enabled +
-                ", checksums=" +
-                checksumPolicy +
-                ", updates=" +
-                updatePolicy +
-                '}';
-        return buffer;
+        return "{enabled=" + enabled + ", checksums=" + checksumPolicy + ", updates=" + updatePolicy + '}';
     }
 
     public void merge(ArtifactRepositoryPolicy policy) {
diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
@@ -160,12 +160,10 @@ public void merge(ArtifactMetadata metadata) {
 
     public String extendedToString() {
 
-        String buffer = LS + "Repository Metadata" + LS + "--------------------------" +
-                LS + "GroupId: " + getGroupId() +
-                LS + "ArtifactId: " + getArtifactId() +
-                LS + "Metadata Type: " + getClass().getName();
-
-        return buffer;
+        return LS + "Repository Metadata" + LS + "--------------------------" + LS
+                + "GroupId: " + getGroupId() + LS
+                + "ArtifactId: " + getArtifactId() + LS
+                + "Metadata Type: " + getClass().getName();
     }
 
     public int getNature() {
diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
@@ -207,20 +207,18 @@ public boolean isResolveTransitively() {
     }
 
     public String toString() {
-        String sb = "REQUEST: " +
-                LS +
-                "artifact: " +
-                artifact +
-                LS +
-                artifactDependencies +
-                LS +
-                "localRepository: " +
-                localRepository +
-                LS +
-                "remoteRepositories: " +
-                remoteRepositories;
-
-        return sb;
+
+        return "REQUEST: " + LS
+                + "artifact: "
+                + artifact
+                + LS
+                + artifactDependencies
+                + LS
+                + "localRepository: "
+                + localRepository
+                + LS
+                + "remoteRepositories: "
+                + remoteRepositories;
     }
 
     public boolean isOffline() {
diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
@@ -134,21 +134,19 @@ public MetadataResolutionRequest setManagedVersionMap(Map managedVersionMap) {
     }
 
     public String toString() {
-        String sb = "REQUEST: " +
-                "\n" +
-                "artifact: " +
-                mad +
-                "\n" +
-                artifactDependencies +
-                "\n" +
-                "localRepository: " +
-                localRepository +
-                "\n" +
-                "remoteRepositories: " +
-                remoteRepositories +
-                "\n";
-
-        return sb;
+
+        return "REQUEST: " + "\n"
+                + "artifact: "
+                + mad
+                + "\n"
+                + artifactDependencies
+                + "\n"
+                + "localRepository: "
+                + localRepository
+                + "\n"
+                + "remoteRepositories: "
+                + remoteRepositories
+                + "\n";
     }
 
     public boolean isAsList() {
diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/AbstractArtifactMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/AbstractArtifactMetadata.java
@@ -48,11 +48,9 @@ public String getArtifactId() {
 
     public String extendedToString() {
 
-        String buffer = LS + "Artifact Metadata" + LS + "--------------------------" +
-                LS + "GroupId: " + getGroupId() +
-                LS + "ArtifactId: " + getArtifactId() +
-                LS + "Metadata Type: " + getClass().getName();
-
-        return buffer;
+        return LS + "Artifact Metadata" + LS + "--------------------------" + LS
+                + "GroupId: " + getGroupId() + LS
+                + "ArtifactId: " + getArtifactId() + LS
+                + "Metadata Type: " + getClass().getName();
     }
 }
diff --git a/compat/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
@@ -282,9 +282,8 @@ protected Artifact createArtifact(String artifactId, String version, String type
     }
 
     protected Artifact createArtifact(String groupId, String artifactId, String version, String type) throws Exception {
-        Artifact a = artifactFactory.createBuildArtifact(groupId, artifactId, version, type);
 
-        return a;
+        return artifactFactory.createBuildArtifact(groupId, artifactId, version, type);
     }
 
     protected void deleteLocalArtifact(Artifact artifact) throws Exception {
diff --git a/compat/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/compat/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
@@ -112,10 +112,8 @@ protected static File getFileForClasspathResource(String resource)
     protected ArtifactRepository getLocalRepository() throws Exception {
         ArtifactRepositoryLayout repoLayout = getContainer().lookup(ArtifactRepositoryLayout.class);
 
-        ArtifactRepository r = repositorySystem.createArtifactRepository(
+        return repositorySystem.createArtifactRepository(
                 "local", "file://" + getLocalRepositoryPath().getAbsolutePath(), repoLayout, null, null);
-
-        return r;
     }
 
     // ----------------------------------------------------------------------
diff --git a/compat/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
@@ -199,10 +199,10 @@ public void transferInitiated(TransferEvent event) {
         String direction = event.getRequestType() == TransferEvent.RequestType.PUT ? "to" : "from";
 
         TransferResource resource = event.getResource();
-        String message = darkOn + action + ' ' + direction + ' ' +
-                darkOff + resource.getRepositoryId() +
-                darkOn + ": " + resource.getRepositoryUrl() +
-                darkOff + resource.getResourceName();
+        String message = darkOn + action + ' ' + direction + ' ' + darkOff
+                + resource.getRepositoryId() + darkOn
+                + ": " + resource.getRepositoryUrl() + darkOff
+                + resource.getResourceName();
 
         out.println(message);
     }
diff --git a/compat/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
@@ -48,9 +48,9 @@ public void transferInitiated(TransferEvent event) {
         String direction = event.getRequestType() == TransferEvent.RequestType.PUT ? "to" : "from";
 
         TransferResource resource = event.getResource();
-        String message = action + ' ' + direction + ' ' + resource.getRepositoryId() +
-                ": " +
-                resource.getRepositoryUrl() + resource.getResourceName();
+        String message = action + ' ' + direction + ' ' + resource.getRepositoryId() + ": "
+                + resource.getRepositoryUrl()
+                + resource.getResourceName();
 
         out.info(message);
     }
diff --git a/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -984,9 +984,7 @@ private ModelData readParentLocally(
          * if ( version == null || !version.equals( parent.getVersion() ) ) { return null; }
          */
 
-        ModelData parentData = new ModelData(candidateSource, candidateModel, groupId, artifactId, version);
-
-        return parentData;
+        return new ModelData(candidateSource, candidateModel, groupId, artifactId, version);
     }
 
     private boolean rawChildVersionReferencesParent(String rawChildModelVersion) {
@@ -1094,10 +1092,8 @@ public int getValidationLevel() {
             // MNG-2199: What else to check here ?
         }
 
-        ModelData parentData = new ModelData(
+        return new ModelData(
                 modelSource, parentModel, parent.getGroupId(), parent.getArtifactId(), parent.getVersion());
-
-        return parentData;
     }
 
     private Model getSuperModel() {
diff --git a/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
@@ -166,10 +166,6 @@ public Version getVersion() {
     @Override
     public String toString() {
 
-        String buffer = "[" + getSeverity() + "] " +
-                getMessage() +
-                " @ " + ModelProblemUtils.formatLocation(this, null);
-
-        return buffer;
+        return "[" + getSeverity() + "] " + getMessage() + " @ " + ModelProblemUtils.formatLocation(this, null);
     }
 }
diff --git a/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
@@ -190,13 +190,7 @@ public void setVersion(String version) {
      */
     public String getId() {
 
-        String buffer = getGroupId() +
-                ':' +
-                getArtifactId() +
-                ':' +
-                getVersion();
-
-        return buffer;
+        return getGroupId() + ':' + getArtifactId() + ':' + getVersion();
     }
 
     @Override
diff --git a/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java
@@ -99,13 +99,11 @@ static String toId(Model model) {
      */
     static String toId(String groupId, String artifactId, String version) {
 
-        String buffer = ((groupId != null && groupId.length() > 0) ? groupId : "[unknown-group-id]") +
-                ':' +
-                ((artifactId != null && artifactId.length() > 0) ? artifactId : "[unknown-artifact-id]") +
-                ':' +
-                ((version != null && version.length() > 0) ? version : "[unknown-version]");
-
-        return buffer;
+        return ((groupId != null && groupId.length() > 0) ? groupId : "[unknown-group-id]")
+                + ':'
+                + ((artifactId != null && artifactId.length() > 0) ? artifactId : "[unknown-artifact-id]")
+                + ':'
+                + ((version != null && version.length() > 0) ? version : "[unknown-version]");
     }
 
     /**
diff --git a/compat/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java
@@ -47,9 +47,7 @@ void setUp() throws Exception {
     private Profile newProfile(String jdkVersion) {
         Activation a = Activation.newBuilder().jdk(jdkVersion).build();
 
-        Profile p = Profile.newBuilder().activation(a).build();
-
-        return p;
+        return Profile.newBuilder().activation(a).build();
     }
 
     private Properties newProperties(String javaVersion) {
diff --git a/compat/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivatorTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivatorTest.java
@@ -42,9 +42,7 @@ void setUp() throws Exception {
     private Profile newProfile(ActivationOS.Builder activationBuilder) {
         Activation a = Activation.newBuilder().os(activationBuilder.build()).build();
 
-        Profile p = Profile.newBuilder().activation(a).build();
-
-        return p;
+        return Profile.newBuilder().activation(a).build();
     }
 
     private Properties newProperties(String osName, String osVersion, String osArch) {
diff --git a/compat/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java
@@ -45,9 +45,7 @@ private Profile newProfile(String key, String value) {
 
         Activation a = Activation.newBuilder().property(ap).build();
 
-        Profile p = Profile.newBuilder().activation(a).build();
-
-        return p;
+        return Profile.newBuilder().activation(a).build();
     }
 
     private Properties newProperties(String key, String value) {
diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/transfer/Slf4jMavenTransferListener.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/transfer/Slf4jMavenTransferListener.java
@@ -51,9 +51,9 @@ public void transferInitiated(TransferEvent event) {
         String direction = event.getRequestType() == TransferEvent.RequestType.PUT ? "to" : "from";
 
         TransferResource resource = event.getResource();
-        String message = action + ' ' + direction + ' ' + resource.getRepositoryId() +
-                ": " +
-                resource.getRepositoryUrl() + resource.getResourceName();
+        String message = action + ' ' + direction + ' ' + resource.getRepositoryId() + ": "
+                + resource.getRepositoryUrl()
+                + resource.getResourceName();
 
         out.info(message);
     }
diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java
@@ -142,9 +142,7 @@ public List<String> computePhases(Lifecycle lifecycle) {
         addPhases(graph, null, null, lifecycle.v3phases());
         List<String> allPhases = graph.visitAll();
         Collections.reverse(allPhases);
-        List<String> computed =
-                allPhases.stream().filter(s -> !s.startsWith("$")).collect(Collectors.toList());
-        return computed;
+        return allPhases.stream().filter(s -> !s.startsWith("$")).collect(Collectors.toList());
     }
 
     private static void addPhase(
diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java
@@ -198,8 +198,7 @@ private ModelBuilderResult buildModel(RepositorySystemSession session, Path src)
         request.lifecycleBindingsInjector(lifecycleBindingsInjector::injectLifecycleBindings);
         ModelBuilder.ModelBuilderSession mbSession =
                 iSession.getData().get(SessionData.key(ModelBuilder.ModelBuilderSession.class));
-        ModelBuilderResult result = mbSession.build(request.build());
-        return result;
+        return mbSession.build(request.build());
     }
 
     static Model transformNonPom(Model model, MavenProject project) {
diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
@@ -147,10 +147,7 @@ public void setConfiguration(XmlNode configuration) {
 
     public String identify() {
 
-        String sb = executionId +
-                configuration.toString();
-
-        return sb;
+        return executionId + configuration.toString();
     }
 
     public String getLifecyclePhase() {
diff --git a/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java b/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java
@@ -421,9 +421,8 @@ private MojoExecution newMojoExecution(Session session) {
     }
 
     private DefaultSession newSession() throws Exception {
-        DefaultSession session = new DefaultSession(
+        return new DefaultSession(
                 newMavenSession(), mock(RepositorySystem.class), null, null, new DefaultLookup(container), null);
-        return session;
     }
 
     private MavenSession newMavenSession() throws Exception {
diff --git a/impl/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java b/impl/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java
@@ -127,11 +127,7 @@ private String path(Artifact artifact) {
 
     private String path(Metadata metadata) {
 
-        String path = metadata.getGroupId().replace('.', '/') + '/' +
-                metadata.getArtifactId() + '/' +
-                "maven-metadata.xml";
-
-        return path;
+        return metadata.getGroupId().replace('.', '/') + '/' + metadata.getArtifactId() + '/' + "maven-metadata.xml";
     }
 
     public void put(
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/SettingsUtilsV4.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/SettingsUtilsV4.java
@@ -305,23 +305,23 @@ private static org.apache.maven.api.model.Repository convertFromSettingsReposito
      */
     private static org.apache.maven.api.model.RepositoryPolicy convertRepositoryPolicy(
             RepositoryPolicy settingsPolicy) {
-        org.apache.maven.api.model.RepositoryPolicy policy = org.apache.maven.api.model.RepositoryPolicy.newBuilder()
+        return org.apache.maven.api.model.RepositoryPolicy.newBuilder()
                 .enabled(Boolean.toString(settingsPolicy.isEnabled()))
                 .updatePolicy(settingsPolicy.getUpdatePolicy())
                 .checksumPolicy(settingsPolicy.getChecksumPolicy())
                 .location("enabled", toLocation(settingsPolicy.getLocation("enabled")))
                 .location("updatePolicy", toLocation(settingsPolicy.getLocation("updatePolicy")))
                 .location("checksumPolicy", toLocation(settingsPolicy.getLocation("checksumPolicy")))
                 .build();
-        return policy;
     }
 
     /**
      * @param modelRepo
      * @return a repository
      */
     private static Repository convertToSettingsRepository(org.apache.maven.api.model.Repository modelRepo) {
-        Repository repo = Repository.newBuilder()
+
+        return Repository.newBuilder()
                 .id(modelRepo.getId())
                 .layout(modelRepo.getLayout())
                 .name(modelRepo.getName())
@@ -334,16 +334,14 @@ private static Repository convertToSettingsRepository(org.apache.maven.api.model
                 .location("name", toLocation(modelRepo.getLocation("name")))
                 .location("url", toLocation(modelRepo.getLocation("url")))
                 .build();
-
-        return repo;
     }
 
     /**
      * @param modelPolicy
      * @return a RepositoryPolicy
      */
     private static RepositoryPolicy convertRepositoryPolicy(org.apache.maven.api.model.RepositoryPolicy modelPolicy) {
-        RepositoryPolicy policy = RepositoryPolicy.newBuilder()
+        return RepositoryPolicy.newBuilder()
                 .enabled(modelPolicy.isEnabled())
                 .updatePolicy(modelPolicy.getUpdatePolicy())
                 .checksumPolicy(modelPolicy.getChecksumPolicy())
@@ -352,7 +350,6 @@ private static RepositoryPolicy convertRepositoryPolicy(org.apache.maven.api.mod
                 .location("updatePolicy", toLocation(modelPolicy.getLocation("updatePolicy")))
                 .location("checksumPolicy", toLocation(modelPolicy.getLocation("checksumPolicy")))
                 .build();
-        return policy;
     }
 
     private static org.apache.maven.api.settings.InputLocation toLocation(
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultInterpolator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultInterpolator.java
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/LocalSnapshotMetadata.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/LocalSnapshotMetadata.java
diff --git a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/ConditionProfileActivatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/ConditionProfileActivatorTest.java
diff --git a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/JdkVersionProfileActivatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/JdkVersionProfileActivatorTest.java
diff --git a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/OperatingSystemProfileActivatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/OperatingSystemProfileActivatorTest.java
diff --git a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/PropertyProfileActivatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/PropertyProfileActivatorTest.java
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/utils/DeployedResource.java b/its/core-it-suite/src/test/java/org/apache/maven/it/utils/DeployedResource.java

Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,9 @@ public String getArtifactId() {`
`48`	`48`
`49`	`49`	`public String extendedToString() {`
`50`	`50`
`51`		`- String buffer = LS + "Artifact Metadata" + LS + "--------------------------" +`
`52`		`- LS + "GroupId: " + getGroupId() +`
`53`		`- LS + "ArtifactId: " + getArtifactId() +`
`54`		`- LS + "Metadata Type: " + getClass().getName();`
`55`		`-`
`56`		`- return buffer;`
	`51`	`+ return LS + "Artifact Metadata" + LS + "--------------------------" + LS`
	`52`	`+ + "GroupId: " + getGroupId() + LS`
	`53`	`+ + "ArtifactId: " + getArtifactId() + LS`
	`54`	`+ + "Metadata Type: " + getClass().getName();`
`57`	`55`	`}`
`58`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -282,9 +282,8 @@ protected Artifact createArtifact(String artifactId, String version, String type`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`protected Artifact createArtifact(String groupId, String artifactId, String version, String type) throws Exception {`
`285`		`- Artifact a = artifactFactory.createBuildArtifact(groupId, artifactId, version, type);`
`286`	`285`
`287`		`- return a;`
	`286`	`+ return artifactFactory.createBuildArtifact(groupId, artifactId, version, type);`
`288`	`287`	`}`
`289`	`288`
`290`	`289`	`protected void deleteLocalArtifact(Artifact artifact) throws Exception {`
Original file line number	Diff line number	Diff line change
`@@ -984,9 +984,7 @@ private ModelData readParentLocally(`
`984`	`984`	`* if ( version == null \|\| !version.equals( parent.getVersion() ) ) { return null; }`
`985`	`985`	`*/`
`986`	`986`
`987`		`- ModelData parentData = new ModelData(candidateSource, candidateModel, groupId, artifactId, version);`
`988`		`-`
`989`		`- return parentData;`
	`987`	`+ return new ModelData(candidateSource, candidateModel, groupId, artifactId, version);`
`990`	`988`	`}`
`991`	`989`
`992`	`990`	`private boolean rawChildVersionReferencesParent(String rawChildModelVersion) {`
`@@ -1094,10 +1092,8 @@ public int getValidationLevel() {`
`1094`	`1092`	`// MNG-2199: What else to check here ?`
`1095`	`1093`	`}`
`1096`	`1094`
`1097`		`- ModelData parentData = new ModelData(`
	`1095`	`+ return new ModelData(`
`1098`	`1096`	`modelSource, parentModel, parent.getGroupId(), parent.getArtifactId(), parent.getVersion());`
`1099`		`-`
`1100`		`- return parentData;`
`1101`	`1097`	`}`
`1102`	`1098`
`1103`	`1099`	`private Model getSuperModel() {`