Skip to content

Commit 267ce41

Browse files
committed
refactored code based on codefactor requirements
1 parent 0f19ccf commit 267ce41

File tree

1 file changed

+71
-66
lines changed

1 file changed

+71
-66
lines changed

src/AdoNetCore.AseClient/Internal/Handler/StreamingDataReaderTokenHandler.cs

Lines changed: 71 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -68,85 +68,90 @@ public void Handle(IToken token)
6868
});
6969
break;
7070
case DoneToken t:
71-
if (_hasFormatted)
72-
{
73-
ReturnCurrent();
74-
_hasFormatted = false;
75-
}
76-
else if ((t.Status & DoneToken.DoneStatus.TDS_DONE_COUNT) == DoneToken.DoneStatus.TDS_DONE_COUNT)
77-
{
78-
if (_current != null)
79-
{
80-
81-
}
82-
_runningTotalRecordsAffected += t.Count;
83-
_dataReader.SetRecordsAffected(_runningTotalRecordsAffected);
84-
}
85-
if ((t.Status & DoneToken.DoneStatus.TDS_DONE_MORE) == DoneToken.DoneStatus.TDS_DONE_FINAL)
86-
{
87-
ReturnCurrent();
88-
}
71+
HandleDoneToken(t);
8972
break;
9073
case DoneInProcToken _:
9174
case DoneProcToken _:
9275
ReturnCurrent();
9376
break;
9477
case EedToken t:
78+
HandleEedToken(t);
79+
break;
80+
}
81+
}
9582

96-
var isSevere = t.Severity > 10;
97-
98-
if (isSevere)
99-
{
100-
_foundSevereError = true;
101-
}
83+
private void HandleDoneToken(DoneToken token)
84+
{
85+
if (_hasFormatted)
86+
{
87+
ReturnCurrent();
88+
_hasFormatted = false;
89+
}
90+
else if ((token.Status & DoneToken.DoneStatus.TDS_DONE_COUNT) == DoneToken.DoneStatus.TDS_DONE_COUNT)
91+
{
92+
_runningTotalRecordsAffected += token.Count;
93+
_dataReader.SetRecordsAffected(_runningTotalRecordsAffected);
94+
}
95+
if ((token.Status & DoneToken.DoneStatus.TDS_DONE_MORE) == DoneToken.DoneStatus.TDS_DONE_FINAL)
96+
{
97+
ReturnCurrent();
98+
}
99+
}
102100

103-
var error = new AseError
104-
{
105-
IsError = isSevere,
106-
IsFromServer = true,
107-
Message = t.Message,
108-
MessageNumber = t.MessageNumber,
109-
ProcName = t.ProcedureName,
110-
State = t.State,
111-
TranState = (int)t.TransactionStatus,
112-
Status = (int)t.Status,
113-
Severity = t.Severity,
114-
ServerName = t.ServerName,
115-
SqlState = Encoding.ASCII.GetString(t.SqlState),
116-
IsFromClient = false,
117-
IsInformation = !isSevere,
118-
IsWarning = false,
119-
LineNum = t.LineNumber
120-
};
101+
private void HandleEedToken(EedToken token)
102+
{
103+
var isSevere = token.Severity > 10;
121104

122-
_allErrors.Add(error);
105+
if (isSevere)
106+
{
107+
_foundSevereError = true;
108+
}
123109

124-
// if we have not encountered any data yet, then send messages straight out.
125-
if (_current == null)
126-
{
127-
_eventNotifier?.NotifyInfoMessage(new AseErrorCollection(error), error.Message);
128-
}
129-
// else if we have encountered any data, then add the messages to the data reader so that they are returned with data/message order preserved.
130-
else
131-
{
132-
_current.Messages.Add(new MessageResult {Errors = new AseErrorCollection(error), Message = error.Message});
133-
}
110+
var error = new AseError
111+
{
112+
IsError = isSevere,
113+
IsFromServer = true,
114+
Message = token.Message,
115+
MessageNumber = token.MessageNumber,
116+
ProcName = token.ProcedureName,
117+
State = token.State,
118+
TranState = (int)token.TransactionStatus,
119+
Status = (int)token.Status,
120+
Severity = token.Severity,
121+
ServerName = token.ServerName,
122+
SqlState = Encoding.ASCII.GetString(token.SqlState),
123+
IsFromClient = false,
124+
IsInformation = !isSevere,
125+
IsWarning = false,
126+
LineNum = token.LineNumber
127+
};
128+
129+
_allErrors.Add(error);
130+
131+
// if we have not encountered any data yet, then send messages straight out.
132+
if (_current == null)
133+
{
134+
_eventNotifier?.NotifyInfoMessage(new AseErrorCollection(error), error.Message);
135+
}
136+
// else if we have encountered any data, then add the messages to the data reader so that they are returned with data/message order preserved.
137+
else
138+
{
139+
_current.Messages.Add(new MessageResult { Errors = new AseErrorCollection(error), Message = error.Message });
140+
}
134141

135-
var msgType = isSevere
136-
? "ERROR"
137-
: "INFO ";
142+
var msgType = isSevere
143+
? "ERROR"
144+
: "INFO ";
138145

139-
var formatted = $"{msgType} [{t.Severity}] [L:{t.LineNumber}]: {t.Message}";
146+
var formatted = $"{msgType} [{token.Severity}] [L:{token.LineNumber}]: {token.Message}";
140147

141-
if (formatted.EndsWith("\n"))
142-
{
143-
Logger.Instance?.Write(formatted);
144-
}
145-
else
146-
{
147-
Logger.Instance?.WriteLine(formatted);
148-
}
149-
break;
148+
if (formatted.EndsWith("\n"))
149+
{
150+
Logger.Instance?.Write(formatted);
151+
}
152+
else
153+
{
154+
Logger.Instance?.WriteLine(formatted);
150155
}
151156
}
152157

0 commit comments

Comments
 (0)