Skip to content

Commit

Permalink
Remove unnecessary try / catch
Browse files Browse the repository at this point in the history
  • Loading branch information
garypretty committed May 15, 2020
1 parent 5095a85 commit 6723796
Showing 1 changed file with 8 additions and 17 deletions.
25 changes: 8 additions & 17 deletions libraries/Bot.Builder.Community.Adapters.Google/GoogleAdapter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -86,31 +86,22 @@ public async Task ProcessAsync(HttpRequest httpRequest, HttpResponse httpRespons
{
var dialogFlowRequest = JsonConvert.DeserializeObject<DialogFlowRequest>(body);
var requestMapper = new DialogFlowRequestMapper(_requestMapperOptions, _logger);
//dialogFlowRequest.OriginalDetectIntentRequest.Payload.EnsureUniqueUserIdInUserStorage();
activity = requestMapper.RequestToActivity(dialogFlowRequest);
var context = await CreateContextAndRunPipelineAsync(bot, cancellationToken, activity);
var response = requestMapper.ActivityToResponse(ProcessOutgoingActivities(context.SentActivities), dialogFlowRequest);
responseJson = JsonConvert.SerializeObject(response, JsonSerializerSettings);
}
else
{
try
{
var conversationRequest = JsonConvert.DeserializeObject<ConversationRequest>(body);
var requestMapper = new ConversationRequestMapper(_requestMapperOptions, _logger);
//conversationRequest.EnsureUniqueUserIdInUserStorage();
activity = requestMapper.RequestToActivity(conversationRequest);
var context = await CreateContextAndRunPipelineAsync(bot, cancellationToken, activity);
var response = requestMapper.ActivityToResponse(ProcessOutgoingActivities(context.SentActivities), conversationRequest);
responseJson = JsonConvert.SerializeObject(response, JsonSerializerSettings);
}
catch (Exception e)
{
Console.WriteLine(e);
throw;
}
var conversationRequest = JsonConvert.DeserializeObject<ConversationRequest>(body);
var requestMapper = new ConversationRequestMapper(_requestMapperOptions, _logger);
activity = requestMapper.RequestToActivity(conversationRequest);
var context = await CreateContextAndRunPipelineAsync(bot, cancellationToken, activity);
var response = requestMapper.ActivityToResponse(ProcessOutgoingActivities(context.SentActivities),
conversationRequest);
responseJson = JsonConvert.SerializeObject(response, JsonSerializerSettings);
}

httpResponse.ContentType = "application/json;charset=utf-8";
httpResponse.StatusCode = (int)HttpStatusCode.OK;

Expand Down

0 comments on commit 6723796

Please sign in to comment.