Skip to content

Remove custom data #538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 20, 2019
Merged

Remove custom data #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e78754e
feat: Removed customData from response, added response json to respon…
mediumTaj Mar 18, 2019
d1bbee8
feat: Removed customData from operations
mediumTaj Mar 19, 2019
48d5b37
test: Remove customData from tests and exaamples
mediumTaj Mar 19, 2019
3612323
chore: Remove commented code
mediumTaj Mar 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core
Open in desktop
Submodule Core updated 6 files
+35 −1 BaseService.cs
+1 −2 CallbackDelegates.cs
+2 −0 IBMResponse.cs
+0 −4 RequestObject.cs
+0 −12 Utilities/Constants.cs
+19 −36 Utilities/Credentials.cs
176 changes: 88 additions & 88 deletions Examples/ExampleAssistantV1.cs
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions Examples/ExampleAssistantV2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,37 +214,37 @@ private IEnumerator Examples()
Log.Debug("ExampleAssistantV2.Examples()", "Assistant examples complete.");
}

private void OnDeleteSession(DetailedResponse<object> response, IBMError error, System.Collections.Generic.Dictionary<string, object> customData)
private void OnDeleteSession(DetailedResponse<object> response, IBMError error)
{
Log.Debug("ExampleAssistantV2.OnDeleteSession()", "Session deleted.");
deleteSessionTested = true;
}

private void OnMessage0(DetailedResponse<MessageResponse> response, IBMError error, System.Collections.Generic.Dictionary<string, object> customData)
private void OnMessage0(DetailedResponse<MessageResponse> response, IBMError error)
{
Log.Debug("ExampleAssistantV2.OnMessage0()", "response: {0}", response.Result.Output.Generic[0].Text);
messageTested0 = true;
}

private void OnMessage1(DetailedResponse<MessageResponse> response, IBMError error, System.Collections.Generic.Dictionary<string, object> customData)
private void OnMessage1(DetailedResponse<MessageResponse> response, IBMError error)
{
Log.Debug("ExampleAssistantV2.OnMessage1()", "response: {0}", response.Result.Output.Generic[0].Text);

messageTested1 = true;
}

private void OnMessage2(DetailedResponse<MessageResponse> response, IBMError error, System.Collections.Generic.Dictionary<string, object> customData)
private void OnMessage2(DetailedResponse<MessageResponse> response, IBMError error)
{
Log.Debug("ExampleAssistantV2.OnMessage2()", "response: {0}", response.Result.Output.Generic[0].Text);
messageTested2 = true;
}

private void OnMessage3(DetailedResponse<MessageResponse> response, IBMError error, System.Collections.Generic.Dictionary<string, object> customData)
private void OnMessage3(DetailedResponse<MessageResponse> response, IBMError error)
{
Log.Debug("ExampleAssistantV2.OnMessage3()", "response: {0}", response.Result.Output.Generic[0].Text);
messageTested3 = true;
}
private void OnMessage4(DetailedResponse<MessageResponse> response, IBMError error, System.Collections.Generic.Dictionary<string, object> customData)
private void OnMessage4(DetailedResponse<MessageResponse> response, IBMError error)
{
//object tempSkill = null;
//(response.Result.Context.Skills as Dictionary<string, object>).TryGetValue("main skill", out tempSkill);
Expand All @@ -267,7 +267,7 @@ private void OnMessage4(DetailedResponse<MessageResponse> response, IBMError err
messageTested4 = true;
}

private void OnCreateSession(DetailedResponse<SessionResponse> response, IBMError error, System.Collections.Generic.Dictionary<string, object> customData)
private void OnCreateSession(DetailedResponse<SessionResponse> response, IBMError error)
{
Log.Debug("ExampleAssistantV2.OnCreateSession()", "Session: {0}", response.Result.SessionId);
sessionId = response.Result.SessionId;
Expand Down
8 changes: 4 additions & 4 deletions Examples/ExamplePersonalityInsightsV3.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ private IEnumerator Examples()
}


private void OnProfile(DetailedResponse<Profile> response, IBMError error, Dictionary<string, object> customData)
private void OnProfile(DetailedResponse<Profile> response, IBMError error)
{
Log.Debug("ExamplePersonaltyInsightsV3.OnProfile()", "Response: {0}", customData["json"].ToString());
Log.Debug("ExamplePersonaltyInsightsV3.OnProfile()", "Response: {0}", response.Response);
profileTested = true;
}

private void OnProfileAsCsv(DetailedResponse<MemoryStream> response, IBMError error, Dictionary<string, object> customData)
private void OnProfileAsCsv(DetailedResponse<MemoryStream> response, IBMError error)
{
//Log.Debug("ExamplePersonaltyInsightsV3.OnProfile()", "Response: {0}", customData["json"].ToString());
//Log.Debug("ExamplePersonaltyInsightsV3.OnProfile()", "Response: {0}", response.Response);
profileAsCsvTested = true;
}
}
Expand Down
4 changes: 2 additions & 2 deletions Examples/ExampleStreaming.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ private IEnumerator RecordingHandler()
yield break;
}

private void OnRecognize(SpeechRecognitionEvent result, Dictionary<string, object> customData)
private void OnRecognize(SpeechRecognitionEvent result)
{
if (result != null && result.results.Length > 0)
{
Expand Down Expand Up @@ -239,7 +239,7 @@ private void OnRecognize(SpeechRecognitionEvent result, Dictionary<string, objec
}
}

private void OnRecognizeSpeaker(SpeakerRecognitionEvent result, Dictionary<string, object> customData)
private void OnRecognizeSpeaker(SpeakerRecognitionEvent result)
{
if (result != null)
{
Expand Down
8 changes: 4 additions & 4 deletions Examples/ExampleToneAnalyzerV3.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,29 +118,29 @@ private IEnumerator Examples()
Log.Debug("ExampleToneAnalyzerV3.Examples()", "Examples complete!");
}

private void OnTone(DetailedResponse<ToneAnalysis> response, IBMError error, Dictionary<string, object> customData)
private void OnTone(DetailedResponse<ToneAnalysis> response, IBMError error)
{
if (error != null)
{
Log.Debug("ExampleToneAnalyzerV3.OnTone()", "Error: {0}: {1}", error.StatusCode, error.ErrorMessage);
}
else
{
Log.Debug("ExampleToneAnalyzerV3.OnTone()", "{0}", customData["json"].ToString());
Log.Debug("ExampleToneAnalyzerV3.OnTone()", "{0}", response.Response);
}

toneTested = true;
}

private void OnToneChat(DetailedResponse<UtteranceAnalyses> response, IBMError error, Dictionary<string, object> customData)
private void OnToneChat(DetailedResponse<UtteranceAnalyses> response, IBMError error)
{
if (error != null)
{
Log.Debug("ExampleToneAnalyzerV3.OnToneChat()", "Error: {0}: {1}", error.StatusCode, error.ErrorMessage);
}
else
{
Log.Debug("ExampleToneAnalyzerV3.OnToneChat()", "{0}", customData["json"].ToString());
Log.Debug("ExampleToneAnalyzerV3.OnToneChat()", "{0}", response.Response);
}

toneChatTested = true;
Expand Down
Loading