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 index 8ab3ddca7b0f..6a5a46ca160f 100644 --- 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,15 +132,7 @@ public boolean checkOutOfDate(Date lastModified) { @Override public String toString() { - StringBuilder buffer = new StringBuilder(64); - buffer.append("{enabled="); - buffer.append(enabled); - buffer.append(", checksums="); - buffer.append(checksumPolicy); - buffer.append(", updates="); - buffer.append(updatePolicy); - buffer.append('}'); - return buffer.toString(); + 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/layout/FlatRepositoryLayout.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java index 509624b4fe33..916da096eebd 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java @@ -62,19 +62,11 @@ public String pathOf(Artifact artifact) { } public String pathOfLocalRepositoryMetadata(ArtifactMetadata metadata, ArtifactRepository repository) { - return pathOfRepositoryMetadata(metadata.getLocalFilename(repository)); - } - - private String pathOfRepositoryMetadata(String filename) { - StringBuilder path = new StringBuilder(128); - - path.append(filename); - - return path.toString(); + return metadata.getLocalFilename(repository); } public String pathOfRemoteRepositoryMetadata(ArtifactMetadata metadata) { - return pathOfRepositoryMetadata(metadata.getRemoteFilename()); + return metadata.getRemoteFilename(); } @Override 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 index 0d278f7cb46d..3b4e546fb230 100644 --- 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 @@ -159,14 +159,11 @@ public void merge(ArtifactMetadata metadata) { } public String extendedToString() { - StringBuilder buffer = new StringBuilder(256); - buffer.append(LS).append("Repository Metadata").append(LS).append("--------------------------"); - buffer.append(LS).append("GroupId: ").append(getGroupId()); - buffer.append(LS).append("ArtifactId: ").append(getArtifactId()); - buffer.append(LS).append("Metadata Type: ").append(getClass().getName()); - - return buffer.toString(); + 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 index 6bd018e7a526..da924096999a 100644 --- 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,21 +207,18 @@ public boolean isResolveTransitively() { } public String toString() { - StringBuilder sb = new StringBuilder() - .append("REQUEST: ") - .append(LS) - .append("artifact: ") - .append(artifact) - .append(LS) - .append(artifactDependencies) - .append(LS) - .append("localRepository: ") - .append(localRepository) - .append(LS) - .append("remoteRepositories: ") - .append(remoteRepositories); - - return sb.toString(); + + 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 index 4c438ca1e746..ad3f6b7c916f 100644 --- 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,22 +134,19 @@ public MetadataResolutionRequest setManagedVersionMap(Map managedVersionMap) { } public String toString() { - StringBuilder sb = new StringBuilder() - .append("REQUEST: ") - .append("\n") - .append("artifact: ") - .append(mad) - .append("\n") - .append(artifactDependencies) - .append("\n") - .append("localRepository: ") - .append(localRepository) - .append("\n") - .append("remoteRepositories: ") - .append(remoteRepositories) - .append("\n"); - - return sb.toString(); + + 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 index a02af146070b..4dc175dbb5d3 100644 --- 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 @@ -47,13 +47,10 @@ public String getArtifactId() { } public String extendedToString() { - StringBuilder buffer = new StringBuilder(256); - buffer.append(LS).append("Artifact Metadata").append(LS).append("--------------------------"); - buffer.append(LS).append("GroupId: ").append(getGroupId()); - buffer.append(LS).append("ArtifactId: ").append(getArtifactId()); - buffer.append(LS).append("Metadata Type: ").append(getClass().getName()); - - return buffer.toString(); + 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 index 14f394c0c1cd..3ec461b62cad 100644 --- 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 index 56f62cf65dc5..cbe0659838a4 100644 --- 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 index 25a4097637a2..9657ad347b8e 100644 --- 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,11 +199,10 @@ public void transferInitiated(TransferEvent event) { String direction = event.getRequestType() == TransferEvent.RequestType.PUT ? "to" : "from"; TransferResource resource = event.getResource(); - StringBuilder message = new StringBuilder(); - message.append(darkOn).append(action).append(' ').append(direction).append(' '); - message.append(darkOff).append(resource.getRepositoryId()); - message.append(darkOn).append(": ").append(resource.getRepositoryUrl()); - message.append(darkOff).append(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 index d0f4cc57e885..65236172df39 100644 --- 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,12 +48,11 @@ public void transferInitiated(TransferEvent event) { String direction = event.getRequestType() == TransferEvent.RequestType.PUT ? "to" : "from"; TransferResource resource = event.getResource(); - StringBuilder message = new StringBuilder(); - message.append(action).append(' ').append(direction).append(' ').append(resource.getRepositoryId()); - message.append(": "); - message.append(resource.getRepositoryUrl()).append(resource.getResourceName()); + String message = action + ' ' + direction + ' ' + resource.getRepositoryId() + ": " + + resource.getRepositoryUrl() + + resource.getResourceName(); - out.info(message.toString()); + out.info(message); } @Override 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 index 9a372628aa79..f4d9e4480259 100644 --- 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 index 7c42f2b23767..bba00870f51b 100644 --- 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 @@ -165,12 +165,7 @@ public Version getVersion() { @Override public String toString() { - StringBuilder buffer = new StringBuilder(128); - buffer.append('[').append(getSeverity()).append("] "); - buffer.append(getMessage()); - buffer.append(" @ ").append(ModelProblemUtils.formatLocation(this, null)); - - return buffer.toString(); + 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 index c0756d856490..9c8d567678d5 100644 --- 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 @@ -189,15 +189,8 @@ public void setVersion(String version) { * @return The effective identifier of the model, never {@code null}. */ public String getId() { - StringBuilder buffer = new StringBuilder(128); - buffer.append(getGroupId()) - .append(':') - .append(getArtifactId()) - .append(':') - .append(getVersion()); - - return buffer.toString(); + 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 index 8a694d122cfa..816ea11ec638 100644 --- 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 @@ -98,15 +98,12 @@ static String toId(Model model) { * @return The user-friendly artifact id, never {@code null}. */ static String toId(String groupId, String artifactId, String version) { - StringBuilder buffer = new StringBuilder(128); - - buffer.append((groupId != null && groupId.length() > 0) ? groupId : "[unknown-group-id]"); - buffer.append(':'); - buffer.append((artifactId != null && artifactId.length() > 0) ? artifactId : "[unknown-artifact-id]"); - buffer.append(':'); - buffer.append((version != null && version.length() > 0) ? version : "[unknown-version]"); - return buffer.toString(); + 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 index 853d5d065fc8..5738d39ccca9 100644 --- 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 index a7c49c319902..4351a7d112b4 100644 --- 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 index d411b3810253..a67242480a3d 100644 --- 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 index 7db7403e9125..6e1111f8eb2e 100644 --- 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,12 +51,11 @@ public void transferInitiated(TransferEvent event) { String direction = event.getRequestType() == TransferEvent.RequestType.PUT ? "to" : "from"; TransferResource resource = event.getResource(); - StringBuilder message = new StringBuilder(); - message.append(action).append(' ').append(direction).append(' ').append(resource.getRepositoryId()); - message.append(": "); - message.append(resource.getRepositoryUrl()).append(resource.getResourceName()); + String message = action + ' ' + direction + ' ' + resource.getRepositoryId() + ": " + + resource.getRepositoryUrl() + + resource.getResourceName(); - out.info(message.toString()); + out.info(message); } @Override 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 index 60a6c0b32a0b..e16290b7370c 100644 --- 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 computePhases(Lifecycle lifecycle) { addPhases(graph, null, null, lifecycle.v3phases()); List allPhases = graph.visitAll(); Collections.reverse(allPhases); - List 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 index 9d74419c989e..d5a9416443cb 100644 --- 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 index fd8835a699ee..53ba9b798e31 100644 --- 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 @@ -146,12 +146,8 @@ public void setConfiguration(XmlNode configuration) { } public String identify() { - StringBuilder sb = new StringBuilder(256); - sb.append(executionId); - sb.append(configuration.toString()); - - return sb.toString(); + return executionId + configuration.toString(); } public String getLifecyclePhase() { diff --git a/impl/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/impl/maven-core/src/main/java/org/apache/maven/project/MavenProject.java index 758b9936e8c0..83382507fe0e 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/project/MavenProject.java +++ b/impl/maven-core/src/main/java/org/apache/maven/project/MavenProject.java @@ -1403,9 +1403,7 @@ private void deepCopy(MavenProject project) { } private static String getProjectReferenceId(String groupId, String artifactId, String version) { - StringBuilder buffer = new StringBuilder(128); - buffer.append(groupId).append(':').append(artifactId).append(':').append(version); - return buffer.toString(); + return groupId + ':' + artifactId + ':' + version; } /** diff --git a/impl/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java b/impl/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java index f4383692526c..3e44a0341392 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java +++ b/impl/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java @@ -82,9 +82,7 @@ public int hashCode() { @Override public String toString() { - StringBuilder buffer = new StringBuilder(128); - buffer.append(groupId).append(':').append(artifactId).append(':').append(version); - return buffer.toString(); + return groupId + ':' + artifactId + ':' + version; } } } 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 index 4b25cf559bcc..34bb99f8b658 100644 --- 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 index e9ab683c3178..798c903aa44e 100644 --- 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 @@ -126,15 +126,8 @@ private String path(Artifact artifact) { } private String path(Metadata metadata) { - StringBuilder path = new StringBuilder(128); - - path.append(metadata.getGroupId().replace('.', '/')).append('/'); - - path.append(metadata.getArtifactId()).append('/'); - path.append("maven-metadata.xml"); - - return path.toString(); + 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 index 8a5d1e81a2bb..4b52c8dba2f7 100644 --- 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,7 +305,7 @@ 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()) @@ -313,7 +313,6 @@ private static org.apache.maven.api.model.RepositoryPolicy convertRepositoryPoli .location("updatePolicy", toLocation(settingsPolicy.getLocation("updatePolicy"))) .location("checksumPolicy", toLocation(settingsPolicy.getLocation("checksumPolicy"))) .build(); - return policy; } /** @@ -321,7 +320,8 @@ private static org.apache.maven.api.model.RepositoryPolicy convertRepositoryPoli * @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,8 +334,6 @@ private static Repository convertToSettingsRepository(org.apache.maven.api.model .location("name", toLocation(modelRepo.getLocation("name"))) .location("url", toLocation(modelRepo.getLocation("url"))) .build(); - - return repo; } /** @@ -343,7 +341,7 @@ private static Repository convertToSettingsRepository(org.apache.maven.api.model * @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 index 0d969222d45d..0d72bcca759f 100644 --- 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 @@ -263,10 +263,9 @@ private static String doSubstVars( // Using the start and stop delimiter indices, extract // the first, deepest nested variable placeholder. String variable = val.substring(startDelim + DELIM_START.length(), stopDelim); - String org = variable; String substValue = processSubstitution( - variable, org, cycleMap, configProps, callback, postprocessor, defaultsToEmptyString); + variable, variable, cycleMap, configProps, callback, postprocessor, defaultsToEmptyString); // Append the leading characters, the substituted value of // the variable, and the trailing characters to get the new 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 index 3d239e80ee78..6b43731e4820 100644 --- 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 @@ -50,14 +50,13 @@ final class LocalSnapshotMetadata extends MavenMetadata { private static Metadata createMetadata(Artifact artifact) { Snapshot snapshot = Snapshot.newBuilder().localCopy(true).build(); Versioning versioning = Versioning.newBuilder().snapshot(snapshot).build(); - Metadata metadata = Metadata.newBuilder() + return Metadata.newBuilder() .versioning(versioning) .groupId(artifact.getGroupId()) .artifactId(artifact.getArtifactId()) .version(artifact.getBaseVersion()) .modelVersion("1.1.0") .build(); - return metadata; } public void bind(Artifact artifact) { 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 index 5d371c2fc3cc..ac054bc823f4 100644 --- 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 @@ -66,8 +66,7 @@ void setUp() throws Exception { private Profile newProfile(String condition) { Activation a = Activation.newBuilder().condition(condition).build(); - Profile p = Profile.newBuilder().activation(a).build(); - return p; + return Profile.newBuilder().activation(a).build(); } private Map newJdkProperties(String javaVersion) { 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 index 9f72bee87af1..f63e8166aa2a 100644 --- 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 @@ -45,9 +45,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 Map newProperties(String javaVersion) { 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 index 4f228a5f1495..6188db752367 100644 --- 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 @@ -41,9 +41,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 Map newProperties(String osName, String osVersion, String osArch) { 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 index 0f193614b20f..601d2631dc79 100644 --- 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 @@ -44,9 +44,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 Map newProperties(String key, String value) { 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 index 70ed4451bc3a..b382deae4cd0 100644 --- 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 @@ -81,10 +81,8 @@ public void testitExplicitIdFields() throws Exception { */ @Test public void testitComplex() throws Exception { - File testDir = extractResources("/mng-2068/test-3"); - File projectDir = testDir; - Verifier verifier = newVerifier(projectDir.getAbsolutePath()); + Verifier verifier = newVerifier(extractResources("/mng-2068/test-3").getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng2068"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java index aaa04de8ca9b..13a4f2acf477 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java @@ -145,23 +145,21 @@ public void testitForceUpdate() throws Exception { } private static void writeMetadata(File testdir, String version, String timestamp) throws Exception { - StringBuilder content = new StringBuilder(1024); - content.append("\n"); - content.append("\n"); - content.append(" org.apache.maven.its.mng4745\n"); - content.append(" maven-it-plugin\n"); - content.append(" \n"); - content.append(" " + version + "\n"); - content.append(" " + version + "\n"); - content.append(" \n"); - content.append(" 1.0\n"); - content.append(" \n"); - content.append(" " + timestamp + "\n"); - content.append(" \n"); - content.append("\n"); + String content = "\n" + "\n" + + " org.apache.maven.its.mng4745\n" + + " maven-it-plugin\n" + + " \n" + + " " + + version + "\n" + " " + + version + "\n" + " \n" + + " 1.0\n" + + " \n" + + " " + + timestamp + "\n" + " \n" + + "\n"; File metadata = new File(testdir, "repo/org/apache/maven/its/mng4745/maven-it-plugin/maven-metadata.xml"); metadata.getParentFile().mkdirs(); - Files.writeString(metadata.getAbsoluteFile().toPath(), content.toString()); + Files.writeString(metadata.getAbsoluteFile().toPath(), content); } } 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 index abd243f63186..6ff1d30bb522 100644 --- 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 @@ -55,13 +55,10 @@ public DeployedResource() { @Override public String toString() { - final StringBuilder sb = new StringBuilder(); - sb.append("DeployedResource"); - sb.append("{httpMethod='").append(httpMethod).append('\''); - sb.append(", requestUri='").append(requestUri).append('\''); - sb.append(", contentLength='").append(contentLength).append('\''); - sb.append(", transferEncoding='").append(transferEncoding).append('\''); - sb.append('}'); - return sb.toString(); + return "DeployedResource" + "{httpMethod='" + + httpMethod + '\'' + ", requestUri='" + + requestUri + '\'' + ", contentLength='" + + contentLength + '\'' + ", transferEncoding='" + + transferEncoding + '\'' + '}'; } } diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallArtifactsMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallArtifactsMojo.java index 7588992df96a..c4c003cfae21 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallArtifactsMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallArtifactsMojo.java @@ -137,19 +137,11 @@ public String pathOf(Artifact artifact) { } public String pathOfLocalRepositoryMetadata(ArtifactMetadata metadata, ArtifactRepository repository) { - return pathOfRepositoryMetadata(metadata.getLocalFilename(repository)); - } - - private String pathOfRepositoryMetadata(String filename) { - StringBuilder path = new StringBuilder(); - - path.append(filename); - - return path.toString(); + return metadata.getLocalFilename(repository); } public String pathOfRemoteRepositoryMetadata(ArtifactMetadata metadata) { - return pathOfRepositoryMetadata(metadata.getRemoteFilename()); + return metadata.getRemoteFilename(); } } }