sdaves
diff --git a/‎NpgsqlRest/Defaults/DefaultCommentParser.cs‎
Lines changed: 42 additions & 138 deletions b/‎NpgsqlRest/Defaults/DefaultCommentParser.cs‎
Lines changed: 42 additions & 138 deletions
@@ -286,10 +286,7 @@ internal static class DefaultCommentParser
                         routineEndpoint.CustomParamsNeedParsing = true;
                     }
                     SetCustomParameter(routineEndpoint, customParamName, customParamValue);
-                    if (Options.LogAnnotationSetInfo)
-                    {
-                        Logger?.CommentSetCustomParemeter(description, customParamName, customParamValue);
-                    }
+                    Logger?.CommentSetCustomParemeter(description, customParamName, customParamValue);
                 }
 
                 // key: value
@@ -304,10 +301,7 @@ internal static class DefaultCommentParser
                     {
                         if (!string.Equals(routineEndpoint.ResponseContentType, headerValue))
                         {
-                            if (Options.LogAnnotationSetInfo)
-                            {
-                                Logger?.CommentSetContentType(description, headerValue);
-                            }
+                            Logger?.CommentSetContentType(description, headerValue);
                         }
                         routineEndpoint.ResponseContentType = headerValue;
                     }
@@ -333,10 +327,7 @@ internal static class DefaultCommentParser
                         }
                         if (!string.Equals(routineEndpoint.ResponseContentType, headerValue))
                         {
-                            if (Options.LogAnnotationSetInfo)
-                            {
-                                Logger?.CommentSetHeader(description, headerName, headerValue);
-                            }
+                            Logger?.CommentSetHeader(description, headerName, headerValue);
                         }
                     }
                 }
@@ -429,10 +420,7 @@ internal static class DefaultCommentParser
                     }
                     if (routineEndpoint.Method != originalMethod || !string.Equals(routineEndpoint.Path, originalUrl))
                     {
-                        if (Options.LogAnnotationSetInfo)
-                        {
-                            Logger?.CommentSetHttp(description, routineEndpoint.Method, routineEndpoint.Path);
-                        }
+                        Logger?.CommentSetHttp(description, routineEndpoint.Method, routineEndpoint.Path);
                         urlDescription = string.Concat(routineEndpoint.Method.ToString(), " ", routineEndpoint.Path);
                         description = string.Concat(routineDescription, " mapped to ", urlDescription);
                     }
@@ -456,10 +444,7 @@ internal static class DefaultCommentParser
                                 routineEndpoint.Path = string.Concat("/", routineEndpoint.Path);
                             }
 
-                            if (Options.LogAnnotationSetInfo)
-                            {
-                                Logger?.CommentSetHttp(description, routineEndpoint.Method, routineEndpoint.Path);
-                            }
+                            Logger?.CommentSetHttp(description, routineEndpoint.Method, routineEndpoint.Path);
                             urlDescription = string.Concat(routineEndpoint.Method.ToString(), " ", routineEndpoint.Path);
                             description = string.Concat(routineDescription, " mapped to ", urlDescription);
                         }
@@ -485,10 +470,7 @@ internal static class DefaultCommentParser
 
                     if (originalParamType != routineEndpoint.RequestParamType)
                     {
-                        if (Options.LogAnnotationSetInfo)
-                        {
-                            Logger?.CommentSetParameterType(description, routineEndpoint.RequestParamType);
-                        }
+                        Logger?.CommentSetParameterType(description, routineEndpoint.RequestParamType);
                     }
                 }
 
@@ -502,17 +484,11 @@ internal static class DefaultCommentParser
                     if (wordsLower.Length > 1)
                     {
                         routineEndpoint.AuthorizeRoles = [.. wordsLower[1..]];
-                        if (Options.LogAnnotationSetInfo)
-                        {
-                            Logger?.CommentSetAuthRoles(description, routineEndpoint.AuthorizeRoles);
-                        }
+                        Logger?.CommentSetAuthRoles(description, routineEndpoint.AuthorizeRoles);
                     }
                     else
                     {
-                        if (Options.LogAnnotationSetInfo)
-                        {
-                            Logger?.CommentSetAuth(description);
-                        }
+                        Logger?.CommentSetAuth(description);
                     }
                 }
 
@@ -523,10 +499,7 @@ internal static class DefaultCommentParser
                 else if (haveTag is true && StrEqualsToArray(wordsLower[0], AllowAnonymousKey))
                 {
                     routineEndpoint.RequiresAuthorization = false;
-                    if (Options.LogAnnotationSetInfo)
-                    {
-                        Logger?.CommentSetAnon(description);
-                    }
+                    Logger?.CommentSetAnon(description);
                 }
 
                 // command_timeout interval
@@ -540,10 +513,7 @@ internal static class DefaultCommentParser
                     }
                     else if (routineEndpoint.CommandTimeout != parsedInterval)
                     {
-                        if (Options.LogAnnotationSetInfo)
-                        {
-                            Logger?.CommentSetTimeout(description, parsedInterval);
-                        }
+                        Logger?.CommentSetTimeout(description, parsedInterval);
                     }
                     routineEndpoint.CommandTimeout = parsedInterval;
                 }
@@ -570,10 +540,7 @@ internal static class DefaultCommentParser
                     }
                     if (routineEndpoint.RequestHeadersMode != Options.RequestHeadersMode)
                     {
-                        if (Options.LogAnnotationSetInfo)
-                        {
-                            Logger?.CommentSetRequestHeadersMode(description, wordsLower[1]);
-                        }
+                        Logger?.CommentSetRequestHeadersMode(description, wordsLower[1]);
                     }
                 }
 
@@ -585,10 +552,7 @@ internal static class DefaultCommentParser
                     {
                         if (!string.Equals(routineEndpoint.RequestHeadersParameterName, wordsLower[1]))
                         {
-                            if (Options.LogAnnotationSetInfo)
-                            {
-                                Logger?.CommentSetRequestHeadersParamName(description, wordsLower[1]);
-                            }
+                            Logger?.CommentSetRequestHeadersParamName(description, wordsLower[1]);
                         }
                         routineEndpoint.RequestHeadersParameterName = wordsLower[1];
                     }
@@ -602,10 +566,7 @@ internal static class DefaultCommentParser
                     {
                         if (!string.Equals(routineEndpoint.BodyParameterName, wordsLower[1]))
                         {
-                            if (Options.LogAnnotationSetInfo)
-                            {
-                                Logger?.CommentSetBodyParamName(description, wordsLower[1]);
-                            }
+                            Logger?.CommentSetBodyParamName(description, wordsLower[1]);
                         }
                         routineEndpoint.BodyParameterName = wordsLower[1];
                     }
@@ -633,10 +594,7 @@ internal static class DefaultCommentParser
                     }
                     if (routineEndpoint.TextResponseNullHandling != Options.TextResponseNullHandling)
                     {
-                        if (Options.LogAnnotationSetInfo)
-                        {
-                            Logger?.CommentSetTextResponseNullHandling(description, wordsLower[1]);
-                        }
+                        Logger?.CommentSetTextResponseNullHandling(description, wordsLower[1]);
                     }
                 }
 
@@ -664,10 +622,7 @@ internal static class DefaultCommentParser
                     }
                     if (routineEndpoint.TextResponseNullHandling != Options.TextResponseNullHandling)
                     {
-                        if (Options.LogAnnotationSetInfo)
-                        {
-                            Logger?.CommentSetQueryStringNullHandling(description, routineEndpoint.QueryStringNullHandling);
-                        }
+                        Logger?.CommentSetQueryStringNullHandling(description, routineEndpoint.QueryStringNullHandling);
                     }
                 }
 
@@ -676,21 +631,15 @@ internal static class DefaultCommentParser
                 else if (haveTag is true && StrEqualsToArray(wordsLower[0], LoginKey))
                 {
                     routineEndpoint.Login = true;
-                    if (Options.LogAnnotationSetInfo)
-                    {
-                        Logger?.CommentSetLogin(description);
-                    }
+                    Logger?.CommentSetLogin(description);
                 }
 
                 // logout
                 // signout
                 else if (haveTag is true && StrEqualsToArray(wordsLower[0], LogoutKey))
                 {
                     routineEndpoint.Logout = true;
-                    if (Options.LogAnnotationSetInfo)
-                    {
-                        Logger?.CommentSetLogout(description);
-                    }
+                    Logger?.CommentSetLogout(description);
                 }
 
                 // buffer_rows number
@@ -701,10 +650,7 @@ internal static class DefaultCommentParser
                     {
                         if (routineEndpoint.BufferRows != parsedBuffer)
                         {
-                            if (Options.LogAnnotationSetInfo)
-                            {
-                                Logger?.CommentBufferRows(description, wordsLower[1]);
-                            }
+                            Logger?.CommentBufferRows(description, wordsLower[1]);
                         }
                         routineEndpoint.BufferRows = parsedBuffer;
                     }
@@ -749,42 +695,30 @@ internal static class DefaultCommentParser
                 else if (haveTag is true && StrEqualsToArray(wordsLower[0], ColumnNamesKey))
                 {
                     routineEndpoint.RawColumnNames = true;
-                    if (Options.LogAnnotationSetInfo)
-                    {
-                        Logger?.CommentRawSetColumnNames(description);
-                    }
+                    Logger?.CommentRawSetColumnNames(description);
                 }
 
                 // sensitive
                 // security_sensitive
                 else if (haveTag is true && StrEqualsToArray(wordsLower[0], SecuritySensitiveKey))
                 {
                     routineEndpoint.SecuritySensitive = true;
-                    if (Options.LogAnnotationSetInfo)
-                    {
-                        Logger?.CommentSecuritySensitive(description);
-                    }
+                    Logger?.CommentSecuritySensitive(description);
                 }
 
                 // user_context
                 else if (haveTag is true && StrEqualsToArray(wordsLower[0], UserContextKey))
                 {
                     routineEndpoint.UserContext = true;
-                    if (Options.LogAnnotationSetInfo)
-                    {
-                        Logger?.CommentUserContext(description);
-                    }
+                    Logger?.CommentUserContext(description);
                 }
 
                 // user_parameters
                 // user_params
                 else if (haveTag is true && StrEqualsToArray(wordsLower[0], UserParemetersKey))
                 {
                     routineEndpoint.UseUserParameters = true;
-                    if (Options.LogAnnotationSetInfo)
-                    {
-                        Logger?.CommentUserParameters(description);
-                    }
+                    Logger?.CommentUserParameters(description);
                 }
 
                 // cached
@@ -815,10 +749,7 @@ internal static class DefaultCommentParser
                         routineEndpoint.CachedParams = result;
                     }
 
-                    if (Options.LogAnnotationSetInfo)
-                    {
-                        Logger?.CommentCached(description, routineEndpoint.CachedParams ?? []);
-                    }
+                    Logger?.CommentCached(description, routineEndpoint.CachedParams ?? []);
                 }
 
                 // cache_expires [ value ]
@@ -829,10 +760,7 @@ internal static class DefaultCommentParser
                     if (value is not null)
                     {
                         routineEndpoint.CacheExpiresIn = value.Value;
-                        if (Options.LogAnnotationSetInfo)
-                        {
-                            Logger?.CommentCacheExpiresIn(description, value.Value);
-                        }
+                        Logger?.CommentCacheExpiresIn(description, value.Value);
                     }
                     else
                     {
@@ -852,10 +780,7 @@ internal static class DefaultCommentParser
                             Logger?.CommentInvalidConnectionName(description, name);
                         }
                         routineEndpoint.ConnectionName = name;
-                        if (Options.LogAnnotationSetInfo)
-                        {
-                            Logger?.CommentConnectionName(description, name);
-                        }
+                        Logger?.CommentConnectionName(description, name);
                     }
                     else
                     {
@@ -877,10 +802,7 @@ internal static class DefaultCommentParser
                         if (routineEndpoint.Upload is false)
                         {
                             routineEndpoint.Upload = true;
-                            if (Options.LogAnnotationSetInfo)
-                            {
-                                Logger?.CommentUpload(description);
-                            }
+                            Logger?.CommentUpload(description);
                         }
                         if (routineEndpoint.RequestParamType != RequestParamType.QueryString)
                         {
@@ -910,21 +832,18 @@ internal static class DefaultCommentParser
                                 .ToArray();
 
                             routineEndpoint.UploadHandlers = handlers;
-                            if (Options.LogAnnotationSetInfo)
+                            if (handlers.Length == 0)
                             {
-                                if (handlers.Length == 0)
-                                {
-                                    var first = Options.UploadOptions.UploadHandlers?.Keys.FirstOrDefault();
-                                    Logger?.CommentUploadFirstAvaialbleHandler(description, first);
-                                }
-                                if (handlers.Length == 1)
-                                {
-                                    Logger?.CommentUploadSingleHandler(description, handlers[0]);
-                                }
-                                else
-                                {
-                                    Logger?.CommentUploadHandlers(description, handlers);
-                                }
+                                var first = Options.UploadOptions.UploadHandlers?.Keys.FirstOrDefault();
+                                Logger?.CommentUploadFirstAvaialbleHandler(description, first);
+                            }
+                            if (handlers.Length == 1)
+                            {
+                                Logger?.CommentUploadSingleHandler(description, handlers[0]);
+                            }
+                            else
+                            {
+                                Logger?.CommentUploadHandlers(description, handlers);
                             }
                         }
 
@@ -941,10 +860,7 @@ internal static class DefaultCommentParser
                             else
                             {
                                 param.IsUploadMetadata = true;
-                                if (Options.LogAnnotationSetInfo)
-                                {
-                                    Logger?.CommentUploadMetadataParam(description, paramName);
-                                }
+                                Logger?.CommentUploadMetadataParam(description, paramName);
                             }
                         }
                     }
@@ -994,10 +910,7 @@ internal static class DefaultCommentParser
                                 }
                                 else
                                 {
-                                    if (Options.LogAnnotationSetInfo)
-                                    {
-                                        Logger?.CommentParamIsHashOf(description, paramName1, paramName2);
-                                    }
+                                    Logger?.CommentParamIsHashOf(description, paramName1, paramName2);
                                 }
                             }
                             else
@@ -1015,10 +928,7 @@ internal static class DefaultCommentParser
                         if (routineEndpoint.Upload is false)
                         {
                             routineEndpoint.Upload = true;
-                            if (Options.LogAnnotationSetInfo)
-                            {
-                                Logger?.CommentUpload(description);
-                            }
+                            Logger?.CommentUpload(description);
                         }
                         if (routineEndpoint.RequestParamType != RequestParamType.QueryString)
                         {
@@ -1040,10 +950,7 @@ internal static class DefaultCommentParser
                         else
                         {
                             param.IsUploadMetadata = true;
-                            if (Options.LogAnnotationSetInfo)
-                            {
-                                Logger?.CommentUploadMetadataParam(description, paramName);
-                            }
+                            Logger?.CommentUploadMetadataParam(description, paramName);
                         }
                     }
                 }
@@ -1190,10 +1097,7 @@ internal static class DefaultCommentParser
             }
             if (disabled)
             {
-                if (Options.LogAnnotationSetInfo)
-                {
-                    Logger?.CommentDisabled(description);
-                }
+                Logger?.CommentDisabled(description);
                 return null;
             }
             if (Options.CommentsMode == CommentsMode.OnlyWithHttpTag && !hasHttpTag)
Original file line number	Diff line number	Diff line change
`@@ -286,10 +286,7 @@ internal static class DefaultCommentParser`
`286`	`286`	`routineEndpoint.CustomParamsNeedParsing = true;`
`287`	`287`	`}`
`288`	`288`	`SetCustomParameter(routineEndpoint, customParamName, customParamValue);`
`289`		`- if (Options.LogAnnotationSetInfo)`
`290`		`- {`
`291`		`- Logger?.CommentSetCustomParemeter(description, customParamName, customParamValue);`
`292`		`- }`
	`289`	`+ Logger?.CommentSetCustomParemeter(description, customParamName, customParamValue);`
`293`	`290`	`}`
`294`	`291`
`295`	`292`	`// key: value`
`@@ -304,10 +301,7 @@ internal static class DefaultCommentParser`
`304`	`301`	`{`
`305`	`302`	`if (!string.Equals(routineEndpoint.ResponseContentType, headerValue))`
`306`	`303`	`{`
`307`		`- if (Options.LogAnnotationSetInfo)`
`308`		`- {`
`309`		`- Logger?.CommentSetContentType(description, headerValue);`
`310`		`- }`
	`304`	`+ Logger?.CommentSetContentType(description, headerValue);`
`311`	`305`	`}`
`312`	`306`	`routineEndpoint.ResponseContentType = headerValue;`
`313`	`307`	`}`
`@@ -333,10 +327,7 @@ internal static class DefaultCommentParser`
`333`	`327`	`}`
`334`	`328`	`if (!string.Equals(routineEndpoint.ResponseContentType, headerValue))`
`335`	`329`	`{`
`336`		`- if (Options.LogAnnotationSetInfo)`
`337`		`- {`
`338`		`- Logger?.CommentSetHeader(description, headerName, headerValue);`
`339`		`- }`
	`330`	`+ Logger?.CommentSetHeader(description, headerName, headerValue);`
`340`	`331`	`}`
`341`	`332`	`}`
`342`	`333`	`}`
`@@ -429,10 +420,7 @@ internal static class DefaultCommentParser`
`429`	`420`	`}`
`430`	`421`	`if (routineEndpoint.Method != originalMethod \|\| !string.Equals(routineEndpoint.Path, originalUrl))`
`431`	`422`	`{`
`432`		`- if (Options.LogAnnotationSetInfo)`
`433`		`- {`
`434`		`- Logger?.CommentSetHttp(description, routineEndpoint.Method, routineEndpoint.Path);`
`435`		`- }`
	`423`	`+ Logger?.CommentSetHttp(description, routineEndpoint.Method, routineEndpoint.Path);`
`436`	`424`	`urlDescription = string.Concat(routineEndpoint.Method.ToString(), " ", routineEndpoint.Path);`
`437`	`425`	`description = string.Concat(routineDescription, " mapped to ", urlDescription);`
`438`	`426`	`}`
`@@ -456,10 +444,7 @@ internal static class DefaultCommentParser`
`456`	`444`	`routineEndpoint.Path = string.Concat("/", routineEndpoint.Path);`
`457`	`445`	`}`
`458`	`446`
`459`		`- if (Options.LogAnnotationSetInfo)`
`460`		`- {`
`461`		`- Logger?.CommentSetHttp(description, routineEndpoint.Method, routineEndpoint.Path);`
`462`		`- }`
	`447`	`+ Logger?.CommentSetHttp(description, routineEndpoint.Method, routineEndpoint.Path);`
`463`	`448`	`urlDescription = string.Concat(routineEndpoint.Method.ToString(), " ", routineEndpoint.Path);`
`464`	`449`	`description = string.Concat(routineDescription, " mapped to ", urlDescription);`
`465`	`450`	`}`
`@@ -485,10 +470,7 @@ internal static class DefaultCommentParser`
`485`	`470`
`486`	`471`	`if (originalParamType != routineEndpoint.RequestParamType)`
`487`	`472`	`{`
`488`		`- if (Options.LogAnnotationSetInfo)`
`489`		`- {`
`490`		`- Logger?.CommentSetParameterType(description, routineEndpoint.RequestParamType);`
`491`		`- }`
	`473`	`+ Logger?.CommentSetParameterType(description, routineEndpoint.RequestParamType);`
`492`	`474`	`}`
`493`	`475`	`}`
`494`	`476`
`@@ -502,17 +484,11 @@ internal static class DefaultCommentParser`
`502`	`484`	`if (wordsLower.Length > 1)`
`503`	`485`	`{`
`504`	`486`	`routineEndpoint.AuthorizeRoles = [.. wordsLower[1..]];`
`505`		`- if (Options.LogAnnotationSetInfo)`
`506`		`- {`
`507`		`- Logger?.CommentSetAuthRoles(description, routineEndpoint.AuthorizeRoles);`
`508`		`- }`
	`487`	`+ Logger?.CommentSetAuthRoles(description, routineEndpoint.AuthorizeRoles);`
`509`	`488`	`}`
`510`	`489`	`else`
`511`	`490`	`{`
`512`		`- if (Options.LogAnnotationSetInfo)`
`513`		`- {`
`514`		`- Logger?.CommentSetAuth(description);`
`515`		`- }`
	`491`	`+ Logger?.CommentSetAuth(description);`
`516`	`492`	`}`
`517`	`493`	`}`
`518`	`494`
`@@ -523,10 +499,7 @@ internal static class DefaultCommentParser`
`523`	`499`	`else if (haveTag is true && StrEqualsToArray(wordsLower[0], AllowAnonymousKey))`
`524`	`500`	`{`
`525`	`501`	`routineEndpoint.RequiresAuthorization = false;`
`526`		`- if (Options.LogAnnotationSetInfo)`
`527`		`- {`
`528`		`- Logger?.CommentSetAnon(description);`
`529`		`- }`
	`502`	`+ Logger?.CommentSetAnon(description);`
`530`	`503`	`}`
`531`	`504`
`532`	`505`	`// command_timeout interval`
`@@ -540,10 +513,7 @@ internal static class DefaultCommentParser`
`540`	`513`	`}`
`541`	`514`	`else if (routineEndpoint.CommandTimeout != parsedInterval)`
`542`	`515`	`{`
`543`		`- if (Options.LogAnnotationSetInfo)`
`544`		`- {`
`545`		`- Logger?.CommentSetTimeout(description, parsedInterval);`
`546`		`- }`
	`516`	`+ Logger?.CommentSetTimeout(description, parsedInterval);`
`547`	`517`	`}`
`548`	`518`	`routineEndpoint.CommandTimeout = parsedInterval;`
`549`	`519`	`}`
`@@ -570,10 +540,7 @@ internal static class DefaultCommentParser`
`570`	`540`	`}`
`571`	`541`	`if (routineEndpoint.RequestHeadersMode != Options.RequestHeadersMode)`
`572`	`542`	`{`
`573`		`- if (Options.LogAnnotationSetInfo)`
`574`		`- {`
`575`		`- Logger?.CommentSetRequestHeadersMode(description, wordsLower[1]);`
`576`		`- }`
	`543`	`+ Logger?.CommentSetRequestHeadersMode(description, wordsLower[1]);`
`577`	`544`	`}`
`578`	`545`	`}`
`579`	`546`
`@@ -585,10 +552,7 @@ internal static class DefaultCommentParser`
`585`	`552`	`{`
`586`	`553`	`if (!string.Equals(routineEndpoint.RequestHeadersParameterName, wordsLower[1]))`
`587`	`554`	`{`
`588`		`- if (Options.LogAnnotationSetInfo)`
`589`		`- {`
`590`		`- Logger?.CommentSetRequestHeadersParamName(description, wordsLower[1]);`
`591`		`- }`
	`555`	`+ Logger?.CommentSetRequestHeadersParamName(description, wordsLower[1]);`
`592`	`556`	`}`
`593`	`557`	`routineEndpoint.RequestHeadersParameterName = wordsLower[1];`
`594`	`558`	`}`
`@@ -602,10 +566,7 @@ internal static class DefaultCommentParser`
`602`	`566`	`{`
`603`	`567`	`if (!string.Equals(routineEndpoint.BodyParameterName, wordsLower[1]))`
`604`	`568`	`{`
`605`		`- if (Options.LogAnnotationSetInfo)`
`606`		`- {`
`607`		`- Logger?.CommentSetBodyParamName(description, wordsLower[1]);`
`608`		`- }`
	`569`	`+ Logger?.CommentSetBodyParamName(description, wordsLower[1]);`
`609`	`570`	`}`
`610`	`571`	`routineEndpoint.BodyParameterName = wordsLower[1];`
`611`	`572`	`}`
`@@ -633,10 +594,7 @@ internal static class DefaultCommentParser`
`633`	`594`	`}`
`634`	`595`	`if (routineEndpoint.TextResponseNullHandling != Options.TextResponseNullHandling)`
`635`	`596`	`{`
`636`		`- if (Options.LogAnnotationSetInfo)`
`637`		`- {`
`638`		`- Logger?.CommentSetTextResponseNullHandling(description, wordsLower[1]);`
`639`		`- }`
	`597`	`+ Logger?.CommentSetTextResponseNullHandling(description, wordsLower[1]);`
`640`	`598`	`}`
`641`	`599`	`}`
`642`	`600`
`@@ -664,10 +622,7 @@ internal static class DefaultCommentParser`
`664`	`622`	`}`
`665`	`623`	`if (routineEndpoint.TextResponseNullHandling != Options.TextResponseNullHandling)`
`666`	`624`	`{`
`667`		`- if (Options.LogAnnotationSetInfo)`
`668`		`- {`
`669`		`- Logger?.CommentSetQueryStringNullHandling(description, routineEndpoint.QueryStringNullHandling);`
`670`		`- }`
	`625`	`+ Logger?.CommentSetQueryStringNullHandling(description, routineEndpoint.QueryStringNullHandling);`
`671`	`626`	`}`
`672`	`627`	`}`
`673`	`628`
`@@ -676,21 +631,15 @@ internal static class DefaultCommentParser`
`676`	`631`	`else if (haveTag is true && StrEqualsToArray(wordsLower[0], LoginKey))`
`677`	`632`	`{`
`678`	`633`	`routineEndpoint.Login = true;`
`679`		`- if (Options.LogAnnotationSetInfo)`
`680`		`- {`
`681`		`- Logger?.CommentSetLogin(description);`
`682`		`- }`
	`634`	`+ Logger?.CommentSetLogin(description);`
`683`	`635`	`}`
`684`	`636`
`685`	`637`	`// logout`
`686`	`638`	`// signout`
`687`	`639`	`else if (haveTag is true && StrEqualsToArray(wordsLower[0], LogoutKey))`
`688`	`640`	`{`
`689`	`641`	`routineEndpoint.Logout = true;`
`690`		`- if (Options.LogAnnotationSetInfo)`
`691`		`- {`
`692`		`- Logger?.CommentSetLogout(description);`
`693`		`- }`
	`642`	`+ Logger?.CommentSetLogout(description);`
`694`	`643`	`}`
`695`	`644`
`696`	`645`	`// buffer_rows number`
`@@ -701,10 +650,7 @@ internal static class DefaultCommentParser`
`701`	`650`	`{`
`702`	`651`	`if (routineEndpoint.BufferRows != parsedBuffer)`
`703`	`652`	`{`
`704`		`- if (Options.LogAnnotationSetInfo)`
`705`		`- {`
`706`		`- Logger?.CommentBufferRows(description, wordsLower[1]);`
`707`		`- }`
	`653`	`+ Logger?.CommentBufferRows(description, wordsLower[1]);`
`708`	`654`	`}`
`709`	`655`	`routineEndpoint.BufferRows = parsedBuffer;`
`710`	`656`	`}`
`@@ -749,42 +695,30 @@ internal static class DefaultCommentParser`
`749`	`695`	`else if (haveTag is true && StrEqualsToArray(wordsLower[0], ColumnNamesKey))`
`750`	`696`	`{`
`751`	`697`	`routineEndpoint.RawColumnNames = true;`
`752`		`- if (Options.LogAnnotationSetInfo)`
`753`		`- {`
`754`		`- Logger?.CommentRawSetColumnNames(description);`
`755`		`- }`
	`698`	`+ Logger?.CommentRawSetColumnNames(description);`
`756`	`699`	`}`
`757`	`700`
`758`	`701`	`// sensitive`
`759`	`702`	`// security_sensitive`
`760`	`703`	`else if (haveTag is true && StrEqualsToArray(wordsLower[0], SecuritySensitiveKey))`
`761`	`704`	`{`
`762`	`705`	`routineEndpoint.SecuritySensitive = true;`
`763`		`- if (Options.LogAnnotationSetInfo)`
`764`		`- {`
`765`		`- Logger?.CommentSecuritySensitive(description);`
`766`		`- }`
	`706`	`+ Logger?.CommentSecuritySensitive(description);`
`767`	`707`	`}`
`768`	`708`
`769`	`709`	`// user_context`
`770`	`710`	`else if (haveTag is true && StrEqualsToArray(wordsLower[0], UserContextKey))`
`771`	`711`	`{`
`772`	`712`	`routineEndpoint.UserContext = true;`
`773`		`- if (Options.LogAnnotationSetInfo)`
`774`		`- {`
`775`		`- Logger?.CommentUserContext(description);`
`776`		`- }`
	`713`	`+ Logger?.CommentUserContext(description);`
`777`	`714`	`}`
`778`	`715`
`779`	`716`	`// user_parameters`
`780`	`717`	`// user_params`
`781`	`718`	`else if (haveTag is true && StrEqualsToArray(wordsLower[0], UserParemetersKey))`
`782`	`719`	`{`
`783`	`720`	`routineEndpoint.UseUserParameters = true;`
`784`		`- if (Options.LogAnnotationSetInfo)`
`785`		`- {`
`786`		`- Logger?.CommentUserParameters(description);`
`787`		`- }`
	`721`	`+ Logger?.CommentUserParameters(description);`
`788`	`722`	`}`
`789`	`723`
`790`	`724`	`// cached`
`@@ -815,10 +749,7 @@ internal static class DefaultCommentParser`
`815`	`749`	`routineEndpoint.CachedParams = result;`
`816`	`750`	`}`
`817`	`751`
`818`		`- if (Options.LogAnnotationSetInfo)`
`819`		`- {`
`820`		`- Logger?.CommentCached(description, routineEndpoint.CachedParams ?? []);`
`821`		`- }`
	`752`	`+ Logger?.CommentCached(description, routineEndpoint.CachedParams ?? []);`
`822`	`753`	`}`
`823`	`754`
`824`	`755`	`// cache_expires [ value ]`
`@@ -829,10 +760,7 @@ internal static class DefaultCommentParser`
`829`	`760`	`if (value is not null)`
`830`	`761`	`{`
`831`	`762`	`routineEndpoint.CacheExpiresIn = value.Value;`
`832`		`- if (Options.LogAnnotationSetInfo)`
`833`		`- {`
`834`		`- Logger?.CommentCacheExpiresIn(description, value.Value);`
`835`		`- }`
	`763`	`+ Logger?.CommentCacheExpiresIn(description, value.Value);`
`836`	`764`	`}`
`837`	`765`	`else`
`838`	`766`	`{`
`@@ -852,10 +780,7 @@ internal static class DefaultCommentParser`
`852`	`780`	`Logger?.CommentInvalidConnectionName(description, name);`
`853`	`781`	`}`
`854`	`782`	`routineEndpoint.ConnectionName = name;`
`855`		`- if (Options.LogAnnotationSetInfo)`
`856`		`- {`
`857`		`- Logger?.CommentConnectionName(description, name);`
`858`		`- }`
	`783`	`+ Logger?.CommentConnectionName(description, name);`
`859`	`784`	`}`
`860`	`785`	`else`
`861`	`786`	`{`
`@@ -877,10 +802,7 @@ internal static class DefaultCommentParser`
`877`	`802`	`if (routineEndpoint.Upload is false)`
`878`	`803`	`{`
`879`	`804`	`routineEndpoint.Upload = true;`
`880`		`- if (Options.LogAnnotationSetInfo)`
`881`		`- {`
`882`		`- Logger?.CommentUpload(description);`
`883`		`- }`
	`805`	`+ Logger?.CommentUpload(description);`
`884`	`806`	`}`
`885`	`807`	`if (routineEndpoint.RequestParamType != RequestParamType.QueryString)`
`886`	`808`	`{`
`@@ -910,21 +832,18 @@ internal static class DefaultCommentParser`
`910`	`832`	`.ToArray();`
`911`	`833`
`912`	`834`	`routineEndpoint.UploadHandlers = handlers;`
`913`		`- if (Options.LogAnnotationSetInfo)`
	`835`	`+ if (handlers.Length == 0)`
`914`	`836`	`{`
`915`		`- if (handlers.Length == 0)`
`916`		`- {`
`917`		`- var first = Options.UploadOptions.UploadHandlers?.Keys.FirstOrDefault();`
`918`		`- Logger?.CommentUploadFirstAvaialbleHandler(description, first);`
`919`		`- }`
`920`		`- if (handlers.Length == 1)`
`921`		`- {`
`922`		`- Logger?.CommentUploadSingleHandler(description, handlers[0]);`
`923`		`- }`
`924`		`- else`
`925`		`- {`
`926`		`- Logger?.CommentUploadHandlers(description, handlers);`
`927`		`- }`
	`837`	`+ var first = Options.UploadOptions.UploadHandlers?.Keys.FirstOrDefault();`
	`838`	`+ Logger?.CommentUploadFirstAvaialbleHandler(description, first);`
	`839`	`+ }`
	`840`	`+ if (handlers.Length == 1)`
	`841`	`+ {`
	`842`	`+ Logger?.CommentUploadSingleHandler(description, handlers[0]);`
	`843`	`+ }`
	`844`	`+ else`
	`845`	`+ {`
	`846`	`+ Logger?.CommentUploadHandlers(description, handlers);`
`928`	`847`	`}`
`929`	`848`	`}`
`930`	`849`
`@@ -941,10 +860,7 @@ internal static class DefaultCommentParser`
`941`	`860`	`else`
`942`	`861`	`{`
`943`	`862`	`param.IsUploadMetadata = true;`
`944`		`- if (Options.LogAnnotationSetInfo)`
`945`		`- {`
`946`		`- Logger?.CommentUploadMetadataParam(description, paramName);`
`947`		`- }`
	`863`	`+ Logger?.CommentUploadMetadataParam(description, paramName);`
`948`	`864`	`}`
`949`	`865`	`}`
`950`	`866`	`}`
`@@ -994,10 +910,7 @@ internal static class DefaultCommentParser`
`994`	`910`	`}`
`995`	`911`	`else`
`996`	`912`	`{`
`997`		`- if (Options.LogAnnotationSetInfo)`
`998`		`- {`
`999`		`- Logger?.CommentParamIsHashOf(description, paramName1, paramName2);`
`1000`		`- }`
	`913`	`+ Logger?.CommentParamIsHashOf(description, paramName1, paramName2);`
`1001`	`914`	`}`
`1002`	`915`	`}`
`1003`	`916`	`else`
`@@ -1015,10 +928,7 @@ internal static class DefaultCommentParser`
`1015`	`928`	`if (routineEndpoint.Upload is false)`
`1016`	`929`	`{`
`1017`	`930`	`routineEndpoint.Upload = true;`
`1018`		`- if (Options.LogAnnotationSetInfo)`
`1019`		`- {`
`1020`		`- Logger?.CommentUpload(description);`
`1021`		`- }`
	`931`	`+ Logger?.CommentUpload(description);`
`1022`	`932`	`}`
`1023`	`933`	`if (routineEndpoint.RequestParamType != RequestParamType.QueryString)`
`1024`	`934`	`{`
`@@ -1040,10 +950,7 @@ internal static class DefaultCommentParser`
`1040`	`950`	`else`
`1041`	`951`	`{`
`1042`	`952`	`param.IsUploadMetadata = true;`
`1043`		`- if (Options.LogAnnotationSetInfo)`
`1044`		`- {`
`1045`		`- Logger?.CommentUploadMetadataParam(description, paramName);`
`1046`		`- }`
	`953`	`+ Logger?.CommentUploadMetadataParam(description, paramName);`
`1047`	`954`	`}`
`1048`	`955`	`}`
`1049`	`956`	`}`
`@@ -1190,10 +1097,7 @@ internal static class DefaultCommentParser`
`1190`	`1097`	`}`
`1191`	`1098`	`if (disabled)`
`1192`	`1099`	`{`
`1193`		`- if (Options.LogAnnotationSetInfo)`
`1194`		`- {`
`1195`		`- Logger?.CommentDisabled(description);`
`1196`		`- }`
	`1100`	`+ Logger?.CommentDisabled(description);`
`1197`	`1101`	`return null;`
`1198`	`1102`	`}`
`1199`	`1103`	`if (Options.CommentsMode == CommentsMode.OnlyWithHttpTag && !hasHttpTag)`