Граф коммитов

94 Коммитов

Автор SHA1 Сообщение Дата
Martin Battaglino 104b7e820a
[Linter] Upgrade Checkstyle plugin to 3.1.2 supporting Checkstyle version up to 8.41 (#1226)
* Upgrade checkstyle plugin to latest version 3.1.2

* Update rules to support Checkstyle 8.41

* Fix linter issue
2021-06-09 09:58:39 -05:00
Lee Parrish ff7caa4dd1
Add additional unit test coverage (#1185)
* Activity Unit Tests

* additional unit tests

* Remove surefire entry from dialogs pom.xml

* Update surefire entry in pom.xml

* Additional tests and fixes.

* Additional unit tests and fixes.

* Additional tests
2021-04-26 10:04:33 -05:00
tracyboehrer f642f0f0fb
Added snapshot support to parent POM (#1157) 2021-04-13 09:42:37 -05:00
Lee Parrish 938790b4a7
Update main branch and readme.md version (#1153) 2021-04-12 14:48:53 -05:00
Lee Parrish b8e0b3a578
Update version to 4.13.0 (#1148)
* Update version to 4.13.0-SNAPSHOT

* Update sample dependencies and log4j version
2021-04-12 10:40:25 -05:00
Lee Parrish 3ca313aea3
Code coverage with Jacoco (#1068)
* JaCoCo test coverage

* JaCoCo build target setup

* Updates to support Jacoco code coverage

Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
2021-03-22 10:15:30 -05:00
tracyboehrer 9c13651965
Updated dependencies and resolved most version conflicts (#1018) 2021-02-24 09:44:40 -06:00
tracyboehrer 94e5eef926
Luis-v3, switched to JUnit 4 to get Maven unit tests running, code formatting (#1017) 2021-02-23 16:08:10 -06:00
tracyboehrer de1867d1a2
Minor QnA test issues and formatting (#1016)
* Some tests weren't passing, just on some machines.

* Standardized Okhttp3 version across modules

* Okhttp3 dependencies in parent pom

* Code reformatting (no logic changes)

* Corrected a few CompletableFuture exceptional return results.
2021-02-23 13:45:41 -06:00
Martin Battaglino 7b2d3a47c1
[SDK] Add bot-ai-qna library (#907)
* Add Utils folder

* Copy schemas

* Add icon from C#

* Add Models folder

* Add Dialogs folder

* Add root files

* Add README document

* Add mock Test folder

* Apply requested feedback, fix checkstyle and build issues

* Delete QnAMakerComponentRegistration class

* Delete schema folder

* Fix ref to AdaptiveExpressions in QnAMakerDialog

* Fix ref adaptiveExpressions in QnAMakerRecognizer

* Apply internal feedback

* Add dialogs library, fix references

* Fix PMD and checkstyles errors

* Add description in javadocs for IOException

* Apply internal feedback

* Add QnA unit tests

* Add files into the TestData folder

* Add QnAMakerTraceInfoTests

* Add MyTurnContext class

* Change tests location

* Add MyTurnContext class

* Add returns in set and get Locale methods

* Fix consistency multi-line methods

* Add default inputHint

Co-authored-by: Martin Battaglino <martinbatta32@gmail.com>

* Add QnAMakerCardEqualityComparer

* Change tests location

* Add QnAMakerCardEqualityComparer class

Co-authored-by: Martin Battaglino <martinbatta32@gmail.com>

* Move location of QnAMakerTraceInfoTests

* Remove TestData

* Add testData

* Add QnAMakerTest class

* Add files into the TestData folder

* Change location of tests

* Add Mockito dependency

* Add more test to QnAMakerTests class

* Migrate more tests

* Remove TestData

* Add testData

* Add QnAMakerTraceInfoTests

* Add MyTurnContext class

* Change tests location

* Add MyTurnContext class

* Add returns in set and get Locale methods

* Fix consistency multi-line methods

* Add default inputHint

Co-authored-by: Martin Battaglino <martinbatta32@gmail.com>

* Add QnAMakerCardEqualityComparer

* Change tests location

* Add QnAMakerCardEqualityComparer class

Co-authored-by: Martin Battaglino <martinbatta32@gmail.com>

* Add private methods in QnAMakerTests

* Fix issues

* Add MockWebServer to tests

* replace ref to interceptHttp

* Add try/catch/finally

* Replace thenApply with thenAccept

* Add mocked OkHttpClient

* Fix errors

* Fix delta

* Remove merge files

* Fix QnAMakerTest

* Clean-up pom, remove QnAMakerDialogTest, update QnAMakerTests

Co-authored-by: Martin Battaglino <martinbatta32@gmail.com>

Co-authored-by: Franco Alvarez <51216149+fran893@users.noreply.github.com>

* Add QnAMakerRecognizer, QnAMakerRecognizerTests and fix issues

* Add QnAMakerRecognizer, tests and fix some issues

* Apply internal feedback

* Fix QnA Unit Tests

* Fix QnAMakerRecognizerTests unit tests

* Fix mock issues and internal issues

* Fix QnAMakerRecognizerTests unit tests

* Rollback unused changes

* Add body in http execution

* Fix tests execution adding the correct Test import

* Apply internal feedback

* Fix QnA unit tests

* Fix generate answer utils

* Fix errors

* Fix mock issues and internal issues

* Fix issues with the url

* Add remaining join

* Fix qnaMakerTestUnsuccessfulResponse test

* Refactor of QnAMakerTests

* Import correct json and fix string format

* Fix qnaMakerTraceActivity test

* Fix tests with request object

* Fix qnaMakerLowScoreVariation

* Fix qnaMakerTestThresholdInQueryOption test

* Fix telemetryOverride test

* Enable qnaMakerTestOptionsHydration failing test

* Fix qnaMakerTestOptionsHydration test

* Fix telemetry tests

* Fix disparity in GenerateAnswerUtils

* Fix remaining unit tests

* Change jupiter to junit

* Remove mockito-junit-jupiter dependency

* Fix checkstyle errors

* Apply internal feedback

Co-authored-by: Franco Alvarez <franco.alvarez@southworks.com>
Co-authored-by: Federico Bernal <64086728+FedericoBernal@users.noreply.github.com>

* Rollback id to Id

* Improve readFileContent method and remove comments

Co-authored-by: Franco Alvarez <franco.alvarez@southworks.com>
Co-authored-by: Federico Bernal <64086728+FedericoBernal@users.noreply.github.com>

* Apply requested feedback

* Remove I from ITelemetryQnAMaker IQnAMakerClient

* Remove kind property

* Drop unused constructor in QnAMakerDialog

* Remove resources/icon.png

* Replace getType with isType

* Replace == comparison

* Fix unchecked assignment warning in fillQnAEvent

* Add StringLiteralEquality

* Remove sourceFilePath and sourceLineNumber

* Use activity.getType in tests

* Remove unnecesary whitespace

Co-authored-by: Martin Battaglino <martinbatta32@gmail.com>

Co-authored-by: Franco Alvarez <51216149+fran893@users.noreply.github.com>
Co-authored-by: Franco Alvarez <franco.alvarez@southworks.com>
Co-authored-by: Federico Bernal <64086728+FedericoBernal@users.noreply.github.com>
2021-02-23 12:24:25 -06:00
tracyboehrer 896181fa34
Version bump (#1000) 2021-02-17 14:00:03 -06:00
tracyboehrer 6eeeb16804
Sample 06.using-cards (#933)
* Sample 06.using-cards

* Corrected package name in 06.using-cards

Co-authored-by: Lee Parrish <30470292+LeeParrishMSFT@users.noreply.github.com>
2021-02-02 10:34:45 -06:00
tracyboehrer 1d4f529150
Updated MSAL to 1.8.1 (#931)
* Updated to MSAL 1.8.1

* Moved MSAL dependency to bot-connector
2021-02-01 13:54:13 -06:00
Lee Parrish 5e1ca81cef
Lparrish/dialog (#922)
* dialogs.choices

* bot-dialogs: periodic push (mostly functional ObjectPath)

* Dialog Updates

* Interim commit and push to protect work in progress

* Pushing to protect work in progress

* Safety Checkin

* Setting up unit tests for Dialogs

* Updates to get VS Code test runner working

* Completed DialogManager and DialogStateManager

* Updates to match namespaces and file structure.

* First unit test for DialogStateManager now working.

* Addin DialogStateManager unit tests and fixes.

* Waterfall dialogs and Prompts

* Fixes and unit tests

* Choice Prompt unit tests

* Additional unit tests and fixes

* Unit tests and fixes.

* ComponentDialog tests and fixes

* DialogContainerTests and fixes to Dialog

* Additional tests and fixes

* Final unit tests

* Correct failing unit test.

* Fixes for merge issues.

* Update to new exception handling pattern.

* Remove uneeded unit test inports.

* Added copyright notices.

* Update DialogContext

* Added recognizer libraries

Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
2021-01-29 08:16:18 -06:00
dependabot[bot] 0890c421b4
Bump jackson-databind from 2.9.10.5 to 2.9.10.7 (#911)
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10.5 to 2.9.10.7.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-21 09:13:59 -06:00
BruceHaley ea18ab6529
Update pom.xml for ConversationalAI feed deploys (#849)
* Update pom.xml for ConversationalAI feed deploys

* Fix distributionManagement entries

* Insert ${repo.id}

* Fix defaults for repo.id and repo.url

* Try adding releases and snapshots items
2020-12-04 10:17:47 -06:00
BruceHaley 4f24d95458
Update devops profile in pom.xml (#848) 2020-12-03 14:23:43 -06:00
tracyboehrer 3a2d872142
Updated to latest msal4j (#847) 2020-12-02 12:48:37 -06:00
tracyboehrer 0f8f6d4a3e Version bump to 4.6.0-prewiew8 2020-10-26 15:31:35 -05:00
dependabot[bot] e06a3ddbc1
Bump junit from 4.12 to 4.13.1
Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-13 15:22:53 +00:00
tracyboehrer 27b8baa0a3 Bump master to 4.6.0-preview7 2020-08-12 11:54:41 -05:00
tracyboehrer e7df38aad6 Changed Maven to execute tests matching *Test*.java 2020-08-07 08:37:32 -05:00
tracyboehrer 8d00bdd671 Master version bump to Preview6 (second try) 2020-08-06 10:17:23 -05:00
tracyboehrer 9124ef16da
Merge pull request #664 from microsoft/dependabot/maven/org.apache.logging.log4j-log4j-core-2.13.2
Bump log4j-core from 2.11.0 to 2.13.2
2020-07-06 08:27:38 -05:00
dependabot[bot] 69ca78d11d
Bump jackson-databind from 2.9.10.4 to 2.9.10.5
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10.4 to 2.9.10.5.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-06 13:25:29 +00:00
dependabot[bot] 19f9c08cfc
Bump log4j-core from 2.11.0 to 2.13.2
Bumps log4j-core from 2.11.0 to 2.13.2.

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-01 19:12:10 +00:00
tracyboehrer 9ee4f4d4cc Set version of parent to 4.6.0-preview4 2020-05-12 12:16:19 -05:00
dependabot[bot] 27056975f7
Bump jackson-databind from 2.9.10.3 to 2.9.10.4
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10.3 to 2.9.10.4.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-04-23 19:30:06 +00:00
tracyboehrer 098bf2523d Split samples from main module. Samples code formatting. 2020-04-13 07:49:53 -05:00
tracyboehrer 7c129f1ec5 Added skeleton projects for Teams samples 50-53 2020-04-06 16:40:12 -05:00
tracyboehrer e5119d48a6 Added Teams botbuilder changes and sample #57 2020-04-06 15:38:18 -05:00
dependabot[bot] dba6518640
Bump jackson-databind from 2.9.10.1 to 2.9.10.3
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10.1 to 2.9.10.3.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-03-04 23:39:06 +00:00
dependabot[bot] b9ec23d143
Bump jackson-databind from 2.9.9 to 2.9.10.1
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.9 to 2.9.10.1.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2019-11-13 12:22:22 +00:00
Tracy Boehrer 08c76cfde9 Re-added bot-integration-spring. Using this module in samples. Cleaned up samples. 2019-10-17 11:14:44 -05:00
Tracy Boehrer ec0bfc168b Added 47.inspection 2019-10-15 14:17:05 -05:00
Tracy Boehrer 774098665a Added 16.proactive-messages 2019-10-14 17:09:47 -05:00
Tracy Boehrer 2b7e0f854c Added 08.suggested-actions 2019-10-14 15:17:30 -05:00
Tracy Boehrer 740333d5b4 Added 03.welcome-user to parent POM 2019-10-14 12:35:00 -05:00
Tracy Boehrer 659a45348f Added sample 45.state-management 2019-10-14 09:52:57 -05:00
Tracy Boehrer 9c670b66d3 Renamed spring-echo to match Samples naming (02.echo-bot). 2019-10-11 15:59:54 -05:00
Tracy Boehrer 70eb7abebd Eliminated bot-integration-spring for now. 2019-10-09 15:16:22 -05:00
Tracy Boehrer df834d6e12 Pulled com.microsoft.rest and com.microsoft.azure into bot-connecter to resolve Java 8 Time issues and provide for future flexibility. 2019-10-07 16:11:09 -05:00
Tracy Boehrer 0ae99068bd Defined devops profile to generate sources and javadoc artifacts during DevOps build. 2019-10-03 13:56:01 -07:00
Tracy Boehrer a231a0d4e2 Switch to MSAL from Adal 2019-10-01 15:37:05 -07:00
Tracy Boehrer 412a3ce1a3 Added AppCredentials base class. 2019-10-01 10:11:15 -07:00
Tracy Boehrer b1460d2c72 Initial crack at samples based on bot-builder. 2019-09-30 14:48:52 -07:00
Tracy Boehrer d19f66ad6b Merge branch 'master' into tb-botbuilder 2019-09-27 14:22:37 -05:00
Tracy Boehrer efc8f45157 Corrected parent POM to deploy correctly. 2019-09-27 14:15:56 -05:00
Tracy Boehrer 338492b949 Merge branch 'master' into tb-botbuilder
# Conflicts:
#	libraries/bot-integration-core/pom.xml
#	libraries/bot-schema/pom.xml
#	pom.xml
2019-09-24 15:04:57 -05:00
Tracy Boehrer b61d6ff2db Cleaned up POM's for deploy. 2019-09-24 14:11:43 -05:00