NumberFormatException in until-successful's secondsBetweenRetries fea…

…turing properties (#558) fixes #454
mulesoft · Nov 3, 2021 · f0368eb · f0368eb
1 parent e5779b5
commit f0368eb
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 7 deletions.
diff --git a/...y/src/main/java/com/mulesoft/tools/migration/library/mule/steps/core/UntilSuccessful.java b/...y/src/main/java/com/mulesoft/tools/migration/library/mule/steps/core/UntilSuccessful.java
@@ -20,6 +20,7 @@
 import static com.mulesoft.tools.migration.step.util.XmlDslUtils.getContainerElement;
 import static com.mulesoft.tools.migration.step.util.XmlDslUtils.getFlowExceptionHandlingElement;
 import static com.mulesoft.tools.migration.step.util.XmlDslUtils.removeAttribute;
+import static java.lang.Integer.parseInt;
 
 /**
  * Migrate Until Successful
@@ -80,8 +81,14 @@ public void execute(Element element, MigrationReport report) throws RuntimeExcep
     }
 
     if (element.getAttribute("secondsBetweenRetries") != null) {
-      Integer retries = Integer.valueOf(element.getAttributeValue("secondsBetweenRetries")) * 1000;
-      element.setAttribute("millisBetweenRetries", retries.toString());
+      String retries = element.getAttributeValue("secondsBetweenRetries");
+      try {
+        retries = String.valueOf(parseInt(retries) * 1000);
+      } catch (NumberFormatException nfe) {
+        String propertyName = retries.startsWith("${") ? retries.substring(2, retries.length() - 1) : retries;
+        report.report("untilSuccessful.secondsBetweenRetries", element, element, propertyName);
+      }
+      element.setAttribute("millisBetweenRetries", retries);
       removeAttribute(element, "secondsBetweenRetries");
     }
 

diff --git a/mule-migration-tool-library/src/main/resources/report.yaml b/mule-migration-tool-library/src/main/resources/report.yaml
@@ -724,6 +724,11 @@ untilSuccessful:
     message: Threading Profile is no longer needed in Mule 4.
     docLinks:
       - https://docs.mulesoft.com/mule-runtime/4.3/intro-engine
+  secondsBetweenRetries:
+    type: WARN
+    message: "Update the property '{prop}' to specify the period between retries in milliseconds."
+    docLinks:
+      - https://docs.mulesoft.com/mule-runtime/4.3/migration-core-until-successful
 
 json:
   mapper:

diff --git a/...c/test/java/com/mulesoft/tools/migration/library/mule/steps/core/UntilSuccessfulTest.java b/...c/test/java/com/mulesoft/tools/migration/library/mule/steps/core/UntilSuccessfulTest.java
@@ -49,7 +49,9 @@ public static Object[] params() {
         "until-successful-04",
         //      TODO MMT-258
         //      "until-successful-05",
-        "until-successful-06"
+        "until-successful-06",
+        "until-successful-07",
+        "until-successful-08"
     };
   }
 

diff --git a/...migration-tool-library/src/test/resources/mule/apps/core/until-successful-07-original.xml b/...migration-tool-library/src/test/resources/mule/apps/core/until-successful-07-original.xml
@@ -4,7 +4,7 @@
       xsi:schemaLocation="http://www.mulesoft.org/schema/mule/core http://www.mulesoft.org/schema/mule/core/current/mule.xsd">
 
     <flow name="untilFlow">
-        <until-successful ackExpression="#['test']" secondsBetweenRetries="10" synchronous="lala">
+        <until-successful secondsBetweenRetries="10">
             <logger message="#[1]"/>
         </until-successful>
     </flow>

diff --git a/mule-migration-tool-library/src/test/resources/mule/apps/core/until-successful-07.xml b/mule-migration-tool-library/src/test/resources/mule/apps/core/until-successful-07.xml
@@ -7,6 +7,5 @@
         <until-successful millisBetweenRetries="10000">
             <logger message="#[1]"/>
         </until-successful>
-        <set-payload value="#['test']"/>
     </flow>
 </mule>
diff --git a/...migration-tool-library/src/test/resources/mule/apps/core/until-successful-08-original.xml b/...migration-tool-library/src/test/resources/mule/apps/core/until-successful-08-original.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mule xmlns="http://www.mulesoft.org/schema/mule/core"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.mulesoft.org/schema/mule/core http://www.mulesoft.org/schema/mule/core/current/mule.xsd">
+
+    <flow name="untilFlow">
+        <until-successful secondsBetweenRetries="${secsBetweenRetries}">
+            <logger message="#[1]"/>
+        </until-successful>
+    </flow>
+</mule>
diff --git a/mule-migration-tool-library/src/test/resources/mule/apps/core/until-successful-08.xml b/mule-migration-tool-library/src/test/resources/mule/apps/core/until-successful-08.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mule xmlns="http://www.mulesoft.org/schema/mule/core"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.mulesoft.org/schema/mule/core http://www.mulesoft.org/schema/mule/core/current/mule.xsd">
+
+    <flow name="untilFlow">
+        <until-successful millisBetweenRetries="${secsBetweenRetries}">
+            <logger message="#[1]"/>
+        </until-successful>
+    </flow>
+</mule>
diff --git a/.../test/java/com/mulesoft/tools/migration/integration/UntilSuccessfulMigrationTestCase.java b/.../test/java/com/mulesoft/tools/migration/integration/UntilSuccessfulMigrationTestCase.java
@@ -34,6 +34,6 @@ public UntilSuccessfulMigrationTestCase(String appToMigrate) {
 
   @Test
   public void test() throws Exception {
-    simpleCase(appToMigrate, "-M-DhttpPort=" + httpPort.getValue());
+    simpleCase(appToMigrate, "-M-DhttpPort=" + httpPort.getValue(), "-M-Dsecs=30");
   }
 }
diff --git a/...ration-tool-tests/src/test/resources/e2e/until-successful-01/src/main/app/mule-config.xml b/...ration-tool-tests/src/test/resources/e2e/until-successful-01/src/main/app/mule-config.xml
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.mulesoft.org/schema/mule/core http://www.mulesoft.org/schema/mule/core/current/mule.xsd">
     <flow name="untilFlow">
-        <until-successful>
+        <until-successful secondsBetweenRetries="${secs}">
             <threading-profile maxThreadsActive="45" maxThreadsIdle="5" threadTTL="52" threadWaitTimeout="52"/>
             <logger message="#[1]"/>
         </until-successful>