addressed review comments

dotnet · Nov 9, 2022 · 3d24c4a · 3d24c4a
1 parent 1a7cc02
commit 3d24c4a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 30 deletions.
diff --git a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Macros/BaseMacroConfig.cs b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Macros/BaseMacroConfig.cs
@@ -90,21 +90,13 @@ protected static bool ConvertJTokenToBool(string token, IGeneratedSymbolConfig c
             try
             {
                 var jToken = JToken.Parse(token);
-                if (jToken.Type is not JTokenType.Boolean and not JTokenType.String)
-                {
-                    throw new TemplateAuthoringException(string.Format(LocalizableStrings.MacroConfig_Exception_ValueShouldBeBoolean, config.VariableName, parameterName), config.VariableName);
-                }
-                if (bool.TryParse(jToken.ToString(), out bool result))
+                if (jToken.TryParseBool(out bool result))
                 {
                     return result;
                 }
                 throw new TemplateAuthoringException(string.Format(LocalizableStrings.MacroConfig_Exception_ValueShouldBeBoolean, config.VariableName, parameterName), config.VariableName);
             }
-            catch (TemplateAuthoringException)
-            {
-                throw;
-            }
-            catch (Exception ex)
+            catch (Exception ex) when (ex is not TemplateAuthoringException)
             {
                 throw new TemplateAuthoringException(string.Format(LocalizableStrings.MacroConfig_Exception_InvalidJSON, config.VariableName, parameterName), config.VariableName, ex);
             }
@@ -115,21 +107,13 @@ protected static int ConvertJTokenToInt(string token, IGeneratedSymbolConfig con
             try
             {
                 var jToken = JToken.Parse(token);
-                if (jToken.Type is not JTokenType.Integer and not JTokenType.String)
-                {
-                    throw new TemplateAuthoringException(string.Format(LocalizableStrings.MacroConfig_Exception_ValueShouldBeInteger, config.VariableName, parameterName), config.VariableName);
-                }
-                if (int.TryParse(jToken.ToString(), out int result))
+                if (jToken.TryParseInt(out int result))
                 {
                     return result;
                 }
                 throw new TemplateAuthoringException(string.Format(LocalizableStrings.MacroConfig_Exception_ValueShouldBeInteger, config.VariableName, parameterName), config.VariableName);
             }
-            catch (TemplateAuthoringException)
-            {
-                throw;
-            }
-            catch (Exception ex)
+            catch (Exception ex) when (ex is not TemplateAuthoringException)
             {
                 throw new TemplateAuthoringException(string.Format(LocalizableStrings.MacroConfig_Exception_InvalidJSON, config.VariableName, parameterName), config.VariableName, ex);
             }
@@ -146,11 +130,7 @@ protected static string ConvertJTokenToString(string token, IGeneratedSymbolConf
                 }
                 return jToken.ToString();
             }
-            catch (TemplateAuthoringException)
-            {
-                throw;
-            }
-            catch (Exception ex)
+            catch (Exception ex) when (ex is not TemplateAuthoringException)
             {
                 throw new TemplateAuthoringException(string.Format(LocalizableStrings.MacroConfig_Exception_InvalidJSON, config.VariableName, parameterName), config.VariableName, ex);
             }
@@ -167,11 +147,7 @@ protected static JArray ConvertJTokenToJArray(string token, IGeneratedSymbolConf
                 }
                 return (JArray)jToken;
             }
-            catch (TemplateAuthoringException)
-            {
-                throw;
-            }
-            catch (Exception ex)
+            catch (Exception ex) when (ex is not TemplateAuthoringException)
             {
                 throw new TemplateAuthoringException(string.Format(LocalizableStrings.MacroConfig_Exception_InvalidJSON, config.VariableName, parameterName), config.VariableName, ex);
             }

diff --git a/src/Shared/JExtensions.cs b/src/Shared/JExtensions.cs
@@ -87,6 +87,14 @@ internal static bool ToBool(this JToken? token, string? key = null, bool default
             return result;
         }
 
+        internal static bool TryParseInt(this JToken token, out int result)
+        {
+            result = default;
+            return (token.Type == JTokenType.Integer || token.Type == JTokenType.String)
+                   &&
+                   int.TryParse(token.ToString(), out result);
+        }
+
         internal static int ToInt32(this JToken? token, string? key = null, int defaultValue = 0)
         {
             int value;