[maven-release] branch MRELEASE-1097 updated: [MRELEASE-1097] use basic String.format() instead of MessageFormat

[hboutemy]

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch MRELEASE-1097
in repository https://gitbox.apache.org/repos/asf/maven-release.git


The following commit(s) were added to refs/heads/MRELEASE-1097 by this push:
     new 0c752889 [MRELEASE-1097] use basic String.format() instead of 
MessageFormat
0c752889 is described below

commit 0c752889a9686dcf884aa6e213c034041e5bb75b
Author: Hervé Boutemy <hbout...@apache.org>
AuthorDate: Sun May 29 19:59:23 2022 +0200

    [MRELEASE-1097] use basic String.format() instead of MessageFormat
---
 .../release/phase/AbstractMapVersionsPhase.java    | 47 +++++++++-------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractMapVersionsPhase.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractMapVersionsPhase.java
index 6a3df9c8..97617f35 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractMapVersionsPhase.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractMapVersionsPhase.java
@@ -19,7 +19,6 @@ package org.apache.maven.shared.release.phase;
  * under the License.
  */
 
-import java.text.MessageFormat;
 import java.util.List;
 import java.util.Map;
 
@@ -302,10 +301,10 @@ public abstract class AbstractMapVersionsPhase
                 {
                     if ( messageFormat == null )
                     {
-                        messageFormat = getMapversionPromptFormat( 
releaseDescriptor );
+                        messageFormat = "What is the " + getContextString( 
releaseDescriptor )
+                            + " version for \"%s\"? (" + buffer().project( 
"%s" ) + ")";
                     }
-                    String message = MessageFormat.format( messageFormat, 
project.getName(),
-                                                           buffer().project( 
project.getArtifactId() ) );
+                    String message = String.format( messageFormat, 
project.getName(), project.getArtifactId() );
                     nextVersion = prompter.prompt( message, suggestedVersion );
 
                     //@todo validate next version, maybe with 
DefaultArtifactVersion
@@ -331,6 +330,23 @@ public abstract class AbstractMapVersionsPhase
         return nextVersion;
     }
 
+    private String getContextString( ReleaseDescriptor releaseDescriptor )
+    {
+        if ( convertToBranch )
+        {
+            return "branch";
+        }
+        if ( !convertToSnapshot )
+        {
+            return "release";
+        }
+        if ( releaseDescriptor.isBranchCreation() )
+        {
+            return "new working copy";
+        }
+        return "new development";
+    }
+
     private String resolveSuggestedVersion( String baseVersion, String 
policyId )
             throws PolicyException, VersionParseException
     {
@@ -379,29 +395,6 @@ public abstract class AbstractMapVersionsPhase
         return projectVersion;
     }
 
-
-    private String getMapversionPromptFormat( ReleaseDescriptor 
releaseDescriptor )
-    {
-        String context;
-        if ( convertToBranch )
-        {
-            context = "branch";
-        }
-        else if ( !convertToSnapshot )
-        {
-            context = "release";
-        }
-        else if ( releaseDescriptor.isBranchCreation() )
-        {
-            context = "new working copy";
-        }
-        else
-        {
-            context = "new development";
-        }
-        return "What is the " + context + " version for \"{0}\"? ({1})";
-    }
-
     @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, 
ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )