From 25cb32728dab56c53874c2e2525516388b74e2f1 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Fri, 2 Dec 2016 16:00:28 -0500 Subject: [PATCH] we dont need tasks --- alexa.dev.excuses.sln | 3 +++ .../Controllers/AlexaController.cs | 8 +++---- alexa.dev.excuses/ExcuseResponse.cs | 24 +++++++++---------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/alexa.dev.excuses.sln b/alexa.dev.excuses.sln index f6f2439..5802429 100644 --- a/alexa.dev.excuses.sln +++ b/alexa.dev.excuses.sln @@ -6,6 +6,9 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "alexa.dev.excuses", "alexa.dev.excuses\alexa.dev.excuses.csproj", "{89184AC2-6CD1-44E3-83EC-CA5F2F8048ED}" EndProject Global + GlobalSection(Performance) = preSolution + HasPerformanceSessions = true + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU diff --git a/alexa.dev.excuses/Controllers/AlexaController.cs b/alexa.dev.excuses/Controllers/AlexaController.cs index 10f27c0..32b76ce 100644 --- a/alexa.dev.excuses/Controllers/AlexaController.cs +++ b/alexa.dev.excuses/Controllers/AlexaController.cs @@ -18,15 +18,15 @@ namespace alexa.dev.excuses.Controllers } [Route("")] [HttpPost] - public Task Post() + public HttpResponseMessage Post() { - return new ExcuseResponse().GetResponseAsync(this.Request); + return new ExcuseResponse().GetResponse(this.Request); } [Route("excuse")] [HttpGet] - public Task GetExcuse() + public string GetExcuse() { - return ExcuseResponse.GetExcuses(); + return ExcuseResponse.GetExcuse(); } } } diff --git a/alexa.dev.excuses/ExcuseResponse.cs b/alexa.dev.excuses/ExcuseResponse.cs index 5af9d5d..408288e 100644 --- a/alexa.dev.excuses/ExcuseResponse.cs +++ b/alexa.dev.excuses/ExcuseResponse.cs @@ -10,39 +10,37 @@ using AlexaSkillsKit.UI; namespace alexa.dev.excuses { - public class ExcuseResponse : SpeechletAsync + public class ExcuseResponse : Speechlet { - public override Task OnIntentAsync(IntentRequest intentRequest, Session session) + public override SpeechletResponse OnIntent(IntentRequest intentRequest, Session session) { return CompileResponse(); } - public override Task OnLaunchAsync(LaunchRequest launchRequest, Session session) + public override SpeechletResponse OnLaunch(LaunchRequest launchRequest, Session session) { return CompileResponse(); } - public override Task OnSessionEndedAsync(SessionEndedRequest sessionEndedRequest, Session session) + public override void OnSessionEnded(SessionEndedRequest sessionEndedRequest, Session session) { - return Task.FromResult(0); } - public override Task OnSessionStartedAsync(SessionStartedRequest sessionStartedRequest, Session session) + public override void OnSessionStarted(SessionStartedRequest sessionStartedRequest, Session session) { - return Task.FromResult(0); } - public Task CompileResponse() + public static SpeechletResponse CompileResponse() { - return GetExcuses().ContinueWith(a => - new SpeechletResponse() + var excuse = GetExcuse(); + return new SpeechletResponse() { - OutputSpeech = new PlainTextOutputSpeech() { Text = a.GetAwaiter().GetResult() }, + OutputSpeech = new PlainTextOutputSpeech() { Text = excuse }, ShouldEndSession = true - }); + }; } - public static async Task GetExcuses() + public static string GetExcuse() { // Setup the configuration to support document loading var item = new Random().Next(0, Excuses.ExcuseList.Count);