M6l2 Auth #34
Merged
M6l2 Auth #34
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
BarracudaPff
commented
Nov 17, 2023
BarracudaPff
commented
- m6l2 Auth
add m1l3-oop module
# Conflicts: # README.md
# Conflicts: # gradle.properties # settings.gradle.kts
M1l5 coroutines
Update README.md
# Conflicts: # README.md
Add m1l7 kmp
# Conflicts: # .github/workflows/build.yml # .github/workflows/test.yml # .gitignore # README.md # build.gradle.kts # gradle.properties # gradle/wrapper/gradle-wrapper.properties # m1l3-oop/src/test/kotlin/01-cashTest.kt # m1l3-oop/src/test/kotlin/05-delegationTest.kt # m1l3-oop/src/test/kotlin/exercise1KtTest.kt # m1l5-coroutines/build.gradle.kts # m1l7-kmp/build.gradle.kts # m1l7-kmp/src/commonMain/kotlin/ApiService.kt # m1l7-kmp/src/commonMain/kotlin/CommonApiService.kt # m1l7-kmp/src/commonMain/kotlin/Logger.kt # m1l7-kmp/src/commonMain/kotlin/Service.kt # m1l7-kmp/src/commonTest/kotlin/ApiServiceTest.kt # m1l7-kmp/src/commonTest/kotlin/LoggerTest.kt # m1l7-kmp/src/commonTest/kotlin/ServiceTest.kt # m1l7-kmp/src/commonTest/kotlin/UserTest.kt # m1l7-kmp/src/jsMain/kotlin/CommonApiService.kt # m1l7-kmp/src/jsMain/kotlin/Logger.kt # m1l7-kmp/src/jsMain/kotlin/js/InteroperabilityJS.kt # m1l7-kmp/src/jsMain/kotlin/js/big-decimal.module_js-big-decimal.kt # m1l7-kmp/src/jsMain/kotlin/js/roundingModes.module_js-big-decimal.kt # m1l7-kmp/src/jsTest/kotlin/js/InteroperabilityJSTest.kt # m1l7-kmp/src/jvmMain/kotlin/UtilName.kt # m1l7-kmp/src/jvmMain/kotlin/jvm/InteroperabilityJava.kt # m1l7-kmp/src/nativeInterop/cinterop/libcurl.def # m1l7-kmp/src/nativeMain/kotlin/Main.kt # m2l3-testing/build.gradle.kts # ok-marketplace-api-log1/build.gradle.kts # ok-marketplace-api-v1-jackson/build.gradle.kts # ok-marketplace-api-v2-kmp/build.gradle.kts # ok-marketplace-api-v2-kmp/src/commonMain/kotlin/apiV2Mapper.kt # ok-marketplace-app-kafka/build.gradle.kts # ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/AppKafkaConfig.kt # ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/AppKafkaConsumer.kt # ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/kafkaUtils.kt # ok-marketplace-app-kafka/src/test/kotlin/KafkaControllerTest.kt # ok-marketplace-app-ktor/build.gradle.kts # ok-marketplace-app-ktor/src/commonMain/kotlin/Application.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/MkplAppSettings.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitPlugins.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/AdController.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/ControllerHelperV2.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/OfferController.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/WsController.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/rest.kt # ok-marketplace-app-ktor/src/commonMain/resources/static/ktor_logo.svg # ok-marketplace-app-ktor/src/commonTest/kotlin/ApplicationTest.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/ApplicationJvm.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/AdController.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/ControllerHelperV1.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/OfferController.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/WsController.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/rest.kt # ok-marketplace-app-rabbit/build.gradle.kts # ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/Application.kt # ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/RabbitProcessorBase.kt # ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/controller/RabbitController.kt # ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/processor/RabbitDirectProcessorV2.kt # ok-marketplace-app-rabbit/src/test/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/RabbitMqTest.kt # ok-marketplace-app-serverless/build.gradle.kts # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/IHandleStrategy.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/RoutingHandler.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/utils/conversions.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/IV1HandleStrategy.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/handlers.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/routing.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/IV1HandleStrategy.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/handlers.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/routing.kt # ok-marketplace-app-spring/build.gradle.kts # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/Application.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/CorConfig.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/SwaggerConfiguration.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ControllerHelperV1.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ws/WebSocketConfigV1.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ws/WsAdHandlerV1.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/AdControllerV2.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ControllerHelperV2.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/OfferControllerV2.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ws/WebSocketConfigV2.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ws/WsAdHandlerV2.kt # ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/AdControllerTest.kt # ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/WsControllerTest.kt # ok-marketplace-biz/build.gradle.kts # ok-marketplace-biz/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/biz/MkplAdProcessor.kt # ok-marketplace-biz/src/commonTest/kotlin/repo/BizRepoDeleteTest.kt # ok-marketplace-biz/src/commonTest/kotlin/repo/BizRepoUpdateTest.kt # ok-marketplace-biz/src/commonTest/kotlin/repo/RepoByIdTests.kt # ok-marketplace-biz/src/commonTest/kotlin/statemachine/SMAdStateTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdCreateStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdDeleteStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdOffersStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdReadStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdSearchStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdUpdateStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationCreateTest.kt # ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationDeleteTest.kt # ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationUpdateTest.kt # ok-marketplace-biz/src/commonTest/kotlin/validation/ValidationBadDescription.kt # ok-marketplace-biz/src/commonTest/kotlin/validation/ValidationBadId.kt # ok-marketplace-biz/src/commonTest/kotlin/validation/ValidationBadTitle.kt # ok-marketplace-common/build.gradle.kts # ok-marketplace-common/src/commonMain/kotlin/MkplContext.kt # ok-marketplace-common/src/commonMain/kotlin/helpers/MkplErrorsHelpers.kt # ok-marketplace-common/src/commonMain/kotlin/models/MkplAd.kt # ok-marketplace-common/src/commonMain/kotlin/models/MkplCommand.kt # ok-marketplace-common/src/commonMain/kotlin/repo/DbAdIdRequest.kt # ok-marketplace-lib-cor/build.gradle.kts # ok-marketplace-lib-cor/src/commonTest/kotlin/ru/otus/otuskotlin/marketplace/cor/CorBaseTest.kt # ok-marketplace-lib-logging-common/build.gradle.kts # ok-marketplace-lib-logging-kermit/build.gradle.kts # ok-marketplace-mappers-log1/build.gradle.kts # ok-marketplace-mappers-log1/src/commonMain/kotlin/MkplContext2Log.kt # ok-marketplace-mappers-v1/src/main/kotlin/MappersV1FromTransport.kt # ok-marketplace-mappers-v1/src/main/kotlin/MappersV1ToTransport.kt # ok-marketplace-mappers-v2/build.gradle.kts # ok-marketplace-mappers-v2/src/commonMain/kotlin/MappersV2FromTransport.kt # ok-marketplace-mappers-v2/src/commonMain/kotlin/MappersV2ToTransport.kt # ok-marketplace-repo-in-memory/build.gradle.kts # ok-marketplace-repo-in-memory/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemory.kt # ok-marketplace-repo-in-memory/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/model/AdEntity.kt # ok-marketplace-repo-in-memory/src/commonTest/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemoryCreateTest.kt # ok-marketplace-repo-in-memory/src/commonTest/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemoryUpdateTest.kt # ok-marketplace-repo-stubs/build.gradle.kts # ok-marketplace-repo-tests/build.gradle.kts # ok-marketplace-repo-tests/src/commonMain/kotlin/BaseInitAds.kt # ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdCreateTest.kt # ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdDeleteTest.kt # ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdUpdateTest.kt # ok-marketplace-stubs/build.gradle.kts # ok-marketplace-stubs/src/commonMain/kotlin/MkplAdStub.kt # settings.gradle.kts # specs/specs-ad-log.yaml # specs/specs-ad-v2.yaml
# Conflicts: # .github/workflows/build.yml # .github/workflows/test.yml # .gitignore # README.md # build.gradle.kts # gradle.properties # gradle/wrapper/gradle-wrapper.properties # m1l3-oop/src/test/kotlin/01-cashTest.kt # m1l3-oop/src/test/kotlin/05-delegationTest.kt # m1l3-oop/src/test/kotlin/exercise1KtTest.kt # m1l5-coroutines/build.gradle.kts # m1l7-kmp/build.gradle.kts # m1l7-kmp/src/commonMain/kotlin/ApiService.kt # m1l7-kmp/src/commonMain/kotlin/CommonApiService.kt # m1l7-kmp/src/commonMain/kotlin/Logger.kt # m1l7-kmp/src/commonMain/kotlin/Service.kt # m1l7-kmp/src/commonTest/kotlin/ApiServiceTest.kt # m1l7-kmp/src/commonTest/kotlin/LoggerTest.kt # m1l7-kmp/src/commonTest/kotlin/ServiceTest.kt # m1l7-kmp/src/commonTest/kotlin/UserTest.kt # m1l7-kmp/src/jsMain/kotlin/CommonApiService.kt # m1l7-kmp/src/jsMain/kotlin/Logger.kt # m1l7-kmp/src/jsMain/kotlin/js/InteroperabilityJS.kt # m1l7-kmp/src/jsMain/kotlin/js/big-decimal.module_js-big-decimal.kt # m1l7-kmp/src/jsMain/kotlin/js/roundingModes.module_js-big-decimal.kt # m1l7-kmp/src/jsTest/kotlin/js/InteroperabilityJSTest.kt # m1l7-kmp/src/jvmMain/kotlin/UtilName.kt # m1l7-kmp/src/jvmMain/kotlin/jvm/InteroperabilityJava.kt # m1l7-kmp/src/nativeInterop/cinterop/libcurl.def # m1l7-kmp/src/nativeMain/kotlin/Main.kt # m2l3-testing/build.gradle.kts # ok-marketplace-api-log1/build.gradle.kts # ok-marketplace-api-v1-jackson/build.gradle.kts # ok-marketplace-api-v2-kmp/build.gradle.kts # ok-marketplace-api-v2-kmp/src/commonMain/kotlin/apiV2Mapper.kt # ok-marketplace-app-kafka/build.gradle.kts # ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/AppKafkaConfig.kt # ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/AppKafkaConsumer.kt # ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/kafkaUtils.kt # ok-marketplace-app-kafka/src/test/kotlin/KafkaControllerTest.kt # ok-marketplace-app-ktor/build.gradle.kts # ok-marketplace-app-ktor/src/commonMain/kotlin/Application.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/MkplAppSettings.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitPlugins.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/AdController.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/ControllerHelperV2.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/OfferController.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/WsController.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/rest.kt # ok-marketplace-app-ktor/src/commonMain/resources/static/ktor_logo.svg # ok-marketplace-app-ktor/src/commonTest/kotlin/ApplicationTest.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/ApplicationJvm.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/AdController.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/ControllerHelperV1.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/OfferController.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/WsController.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/rest.kt # ok-marketplace-app-rabbit/build.gradle.kts # ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/Application.kt # ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/RabbitProcessorBase.kt # ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/controller/RabbitController.kt # ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/processor/RabbitDirectProcessorV2.kt # ok-marketplace-app-rabbit/src/test/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/RabbitMqTest.kt # ok-marketplace-app-serverless/build.gradle.kts # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/IHandleStrategy.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/RoutingHandler.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/utils/conversions.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/IV1HandleStrategy.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/handlers.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/routing.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/IV1HandleStrategy.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/handlers.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/routing.kt # ok-marketplace-app-spring/Dockerfile # ok-marketplace-app-spring/build.gradle.kts # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/Application.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/CorConfig.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/SwaggerConfiguration.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ControllerHelperV1.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ws/WebSocketConfigV1.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ws/WsAdHandlerV1.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/AdControllerV2.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ControllerHelperV2.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/OfferControllerV2.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ws/WebSocketConfigV2.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ws/WsAdHandlerV2.kt # ok-marketplace-app-spring/src/main/resources/application.yml # ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/ApplicationTests.kt # ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/AdControllerTest.kt # ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/WsControllerTest.kt # ok-marketplace-biz/build.gradle.kts # ok-marketplace-biz/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/biz/MkplAdProcessor.kt # ok-marketplace-biz/src/commonTest/kotlin/repo/RepoByIdTests.kt # ok-marketplace-biz/src/commonTest/kotlin/statemachine/SMAdStateTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdCreateStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdDeleteStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdOffersStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdReadStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdSearchStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdUpdateStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationCreateTest.kt # ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationDeleteTest.kt # ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationUpdateTest.kt # ok-marketplace-biz/src/commonTest/kotlin/validation/ValidationBadDescription.kt # ok-marketplace-common/build.gradle.kts # ok-marketplace-common/src/commonMain/kotlin/MkplContext.kt # ok-marketplace-common/src/commonMain/kotlin/helpers/MkplErrorsHelpers.kt # ok-marketplace-common/src/commonMain/kotlin/models/MkplAd.kt # ok-marketplace-common/src/commonMain/kotlin/models/MkplCommand.kt # ok-marketplace-common/src/commonMain/kotlin/repo/DbAdResponse.kt # ok-marketplace-lib-cor/build.gradle.kts # ok-marketplace-lib-cor/src/commonTest/kotlin/ru/otus/otuskotlin/marketplace/cor/CorBaseTest.kt # ok-marketplace-lib-logging-common/build.gradle.kts # ok-marketplace-lib-logging-kermit/build.gradle.kts # ok-marketplace-mappers-log1/build.gradle.kts # ok-marketplace-mappers-log1/src/commonMain/kotlin/MkplContext2Log.kt # ok-marketplace-mappers-v1/src/main/kotlin/MappersV1FromTransport.kt # ok-marketplace-mappers-v1/src/main/kotlin/MappersV1ToTransport.kt # ok-marketplace-mappers-v2/build.gradle.kts # ok-marketplace-mappers-v2/src/commonMain/kotlin/MappersV2FromTransport.kt # ok-marketplace-mappers-v2/src/commonMain/kotlin/MappersV2ToTransport.kt # ok-marketplace-repo-in-memory/build.gradle.kts # ok-marketplace-repo-in-memory/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemory.kt # ok-marketplace-repo-in-memory/src/commonTest/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemoryCreateTest.kt # ok-marketplace-repo-stubs/build.gradle.kts # ok-marketplace-repo-tests/build.gradle.kts # ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdDeleteTest.kt # ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdUpdateTest.kt # ok-marketplace-stubs/build.gradle.kts # ok-marketplace-stubs/src/commonMain/kotlin/MkplAdStub.kt # settings.gradle.kts # specs/specs-ad-log.yaml # specs/specs-ad-v2.yaml
# Conflicts: # .github/workflows/build.yml # .github/workflows/test.yml # .gitignore # README.md # build.gradle.kts # gradle.properties # gradle/wrapper/gradle-wrapper.properties # m1l3-oop/src/test/kotlin/01-cashTest.kt # m1l3-oop/src/test/kotlin/05-delegationTest.kt # m1l3-oop/src/test/kotlin/exercise1KtTest.kt # m1l5-coroutines/build.gradle.kts # m1l7-kmp/build.gradle.kts # m1l7-kmp/src/commonMain/kotlin/ApiService.kt # m1l7-kmp/src/commonMain/kotlin/CommonApiService.kt # m1l7-kmp/src/commonMain/kotlin/Logger.kt # m1l7-kmp/src/commonMain/kotlin/Service.kt # m1l7-kmp/src/commonTest/kotlin/ApiServiceTest.kt # m1l7-kmp/src/commonTest/kotlin/LoggerTest.kt # m1l7-kmp/src/commonTest/kotlin/ServiceTest.kt # m1l7-kmp/src/commonTest/kotlin/UserTest.kt # m1l7-kmp/src/jsMain/kotlin/CommonApiService.kt # m1l7-kmp/src/jsMain/kotlin/Logger.kt # m1l7-kmp/src/jsMain/kotlin/js/InteroperabilityJS.kt # m1l7-kmp/src/jsMain/kotlin/js/big-decimal.module_js-big-decimal.kt # m1l7-kmp/src/jsMain/kotlin/js/roundingModes.module_js-big-decimal.kt # m1l7-kmp/src/jsTest/kotlin/js/InteroperabilityJSTest.kt # m1l7-kmp/src/jvmMain/kotlin/UtilName.kt # m1l7-kmp/src/jvmMain/kotlin/jvm/InteroperabilityJava.kt # m1l7-kmp/src/nativeInterop/cinterop/libcurl.def # m1l7-kmp/src/nativeMain/kotlin/Main.kt # m2l3-testing/build.gradle.kts # ok-marketplace-api-log1/build.gradle.kts # ok-marketplace-api-v1-jackson/build.gradle.kts # ok-marketplace-api-v2-kmp/build.gradle.kts # ok-marketplace-api-v2-kmp/src/commonMain/kotlin/apiV2Mapper.kt # ok-marketplace-app-kafka/build.gradle.kts # ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/AppKafkaConfig.kt # ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/AppKafkaConsumer.kt # ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/kafkaUtils.kt # ok-marketplace-app-kafka/src/test/kotlin/KafkaControllerTest.kt # ok-marketplace-app-ktor/build.gradle.kts # ok-marketplace-app-ktor/src/commonMain/kotlin/Application.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/MkplAppSettings.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitPlugins.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/AdController.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/ControllerHelperV2.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/OfferController.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/WsController.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/rest.kt # ok-marketplace-app-ktor/src/commonMain/resources/application.yaml # ok-marketplace-app-ktor/src/commonMain/resources/static/ktor_logo.svg # ok-marketplace-app-ktor/src/commonTest/kotlin/ApplicationTest.kt # ok-marketplace-app-ktor/src/commonTest/kotlin/V2AdStubApiTest.kt # ok-marketplace-app-ktor/src/commonTest/kotlin/inmemory/V2AdInmemoryApiTest.kt # ok-marketplace-app-ktor/src/commonTest/resources/application.yaml # ok-marketplace-app-ktor/src/jvmMain/kotlin/ApplicationJvm.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/configs/PostgresConfig.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/AdController.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/ControllerHelperV1.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/OfferController.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/WsController.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/rest.kt # ok-marketplace-app-ktor/src/jvmMain/resources/application.yaml # ok-marketplace-app-rabbit/build.gradle.kts # ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/Application.kt # ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/RabbitProcessorBase.kt # ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/controller/RabbitController.kt # ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/processor/RabbitDirectProcessorV2.kt # ok-marketplace-app-rabbit/src/test/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/RabbitMqTest.kt # ok-marketplace-app-serverless/build.gradle.kts # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/IHandleStrategy.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/RoutingHandler.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/utils/conversions.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/IV1HandleStrategy.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/handlers.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/routing.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/IV1HandleStrategy.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/handlers.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/routing.kt # ok-marketplace-app-spring/Dockerfile # ok-marketplace-app-spring/build.gradle.kts # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/Application.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/CorConfig.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/SqlPropertiesEx.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/SwaggerConfiguration.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ControllerHelperV1.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ws/WebSocketConfigV1.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ws/WsAdHandlerV1.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/AdControllerV2.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ControllerHelperV2.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/OfferControllerV2.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ws/WebSocketConfigV2.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ws/WsAdHandlerV2.kt # ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/ApplicationTests.kt # ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/AdControllerTest.kt # ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/WsControllerTest.kt # ok-marketplace-biz/build.gradle.kts # ok-marketplace-biz/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/biz/MkplAdProcessor.kt # ok-marketplace-biz/src/commonTest/kotlin/repo/RepoByIdTests.kt # ok-marketplace-biz/src/commonTest/kotlin/statemachine/SMAdStateTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdCreateStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdDeleteStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdOffersStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdReadStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdSearchStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdUpdateStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationCreateTest.kt # ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationDeleteTest.kt # ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationUpdateTest.kt # ok-marketplace-biz/src/commonTest/kotlin/validation/ValidationBadDescription.kt # ok-marketplace-common/build.gradle.kts # ok-marketplace-common/src/commonMain/kotlin/MkplContext.kt # ok-marketplace-common/src/commonMain/kotlin/models/MkplAd.kt # ok-marketplace-common/src/commonMain/kotlin/models/MkplCommand.kt # ok-marketplace-lib-cor/build.gradle.kts # ok-marketplace-lib-cor/src/commonTest/kotlin/ru/otus/otuskotlin/marketplace/cor/CorBaseTest.kt # ok-marketplace-lib-logging-common/build.gradle.kts # ok-marketplace-lib-logging-kermit/build.gradle.kts # ok-marketplace-mappers-log1/build.gradle.kts # ok-marketplace-mappers-log1/src/commonMain/kotlin/MkplContext2Log.kt # ok-marketplace-mappers-v1/src/main/kotlin/MappersV1FromTransport.kt # ok-marketplace-mappers-v1/src/main/kotlin/MappersV1ToTransport.kt # ok-marketplace-mappers-v2/build.gradle.kts # ok-marketplace-mappers-v2/src/commonMain/kotlin/MappersV2FromTransport.kt # ok-marketplace-mappers-v2/src/commonMain/kotlin/MappersV2ToTransport.kt # ok-marketplace-repo-in-memory/build.gradle.kts # ok-marketplace-repo-in-memory/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemory.kt # ok-marketplace-repo-in-memory/src/commonTest/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemoryCreateTest.kt # ok-marketplace-repo-postgresql/src/main/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/AdTable.kt # ok-marketplace-repo-postgresql/src/main/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/RepoAdSQL.kt # ok-marketplace-repo-postgresql/src/main/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/SqlProperties.kt # ok-marketplace-repo-postgresql/src/test/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/RepoAdSQLTest.kt # ok-marketplace-repo-postgresql/src/test/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/SqlTestCompanion.kt # ok-marketplace-repo-stubs/build.gradle.kts # ok-marketplace-repo-tests/build.gradle.kts # ok-marketplace-repo-tests/src/commonMain/kotlin/runRepoTest.kt # ok-marketplace-stubs/build.gradle.kts # ok-marketplace-stubs/src/commonMain/kotlin/MkplAdStub.kt # settings.gradle.kts # specs/specs-ad-log.yaml # specs/specs-ad-v2.yaml
# Conflicts: # .github/workflows/build.yml # .github/workflows/test.yml # .gitignore # README.md # build.gradle.kts # gradle.properties # gradle/wrapper/gradle-wrapper.properties # m1l3-oop/src/test/kotlin/01-cashTest.kt # m1l3-oop/src/test/kotlin/05-delegationTest.kt # m1l3-oop/src/test/kotlin/exercise1KtTest.kt # m1l5-coroutines/build.gradle.kts # m1l7-kmp/build.gradle.kts # m1l7-kmp/src/commonMain/kotlin/ApiService.kt # m1l7-kmp/src/commonMain/kotlin/CommonApiService.kt # m1l7-kmp/src/commonMain/kotlin/Logger.kt # m1l7-kmp/src/commonMain/kotlin/Service.kt # m1l7-kmp/src/commonTest/kotlin/ApiServiceTest.kt # m1l7-kmp/src/commonTest/kotlin/LoggerTest.kt # m1l7-kmp/src/commonTest/kotlin/ServiceTest.kt # m1l7-kmp/src/commonTest/kotlin/UserTest.kt # m1l7-kmp/src/jsMain/kotlin/CommonApiService.kt # m1l7-kmp/src/jsMain/kotlin/Logger.kt # m1l7-kmp/src/jsMain/kotlin/js/InteroperabilityJS.kt # m1l7-kmp/src/jsMain/kotlin/js/big-decimal.module_js-big-decimal.kt # m1l7-kmp/src/jsMain/kotlin/js/roundingModes.module_js-big-decimal.kt # m1l7-kmp/src/jsTest/kotlin/js/InteroperabilityJSTest.kt # m1l7-kmp/src/jvmMain/kotlin/UtilName.kt # m1l7-kmp/src/jvmMain/kotlin/jvm/InteroperabilityJava.kt # m1l7-kmp/src/nativeInterop/cinterop/libcurl.def # m1l7-kmp/src/nativeMain/kotlin/Main.kt # m2l3-testing/build.gradle.kts # ok-marketplace-api-log1/build.gradle.kts # ok-marketplace-api-v1-jackson/build.gradle.kts # ok-marketplace-api-v2-kmp/build.gradle.kts # ok-marketplace-api-v2-kmp/src/commonMain/kotlin/apiV2Mapper.kt # ok-marketplace-app-kafka/build.gradle.kts # ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/AppKafkaConfig.kt # ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/AppKafkaConsumer.kt # ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/kafkaUtils.kt # ok-marketplace-app-kafka/src/test/kotlin/KafkaControllerTest.kt # ok-marketplace-app-ktor/build.gradle.kts # ok-marketplace-app-ktor/src/commonMain/kotlin/Application.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/MkplAppSettings.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitPlugins.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/AdController.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/ControllerHelperV2.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/OfferController.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/WsController.kt # ok-marketplace-app-ktor/src/commonMain/kotlin/v2/rest.kt # ok-marketplace-app-ktor/src/commonMain/resources/application.yaml # ok-marketplace-app-ktor/src/commonMain/resources/static/ktor_logo.svg # ok-marketplace-app-ktor/src/commonTest/kotlin/ApplicationTest.kt # ok-marketplace-app-ktor/src/commonTest/kotlin/V2AdStubApiTest.kt # ok-marketplace-app-ktor/src/commonTest/kotlin/inmemory/V2AdInmemoryApiTest.kt # ok-marketplace-app-ktor/src/commonTest/resources/application.yaml # ok-marketplace-app-ktor/src/jvmMain/kotlin/ApplicationJvm.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/plugins/getDatabaseConf.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/AdController.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/ControllerHelperV1.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/OfferController.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/WsController.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/rest.kt # ok-marketplace-app-ktor/src/jvmMain/resources/application.yaml # ok-marketplace-app-rabbit/build.gradle.kts # ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/Application.kt # ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/RabbitProcessorBase.kt # ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/controller/RabbitController.kt # ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/processor/RabbitDirectProcessorV2.kt # ok-marketplace-app-rabbit/src/test/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/RabbitMqTest.kt # ok-marketplace-app-serverless/build.gradle.kts # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/IHandleStrategy.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/RoutingHandler.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/utils/conversions.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/IV1HandleStrategy.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/handlers.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/routing.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/IV1HandleStrategy.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/handlers.kt # ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/routing.kt # ok-marketplace-app-spring/Dockerfile # ok-marketplace-app-spring/build.gradle.kts # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/Application.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/CorConfig.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/SqlPropertiesEx.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/SwaggerConfiguration.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ControllerHelperV1.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ws/WebSocketConfigV1.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ws/WsAdHandlerV1.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/AdControllerV2.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ControllerHelperV2.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/OfferControllerV2.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ws/WebSocketConfigV2.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ws/WsAdHandlerV2.kt # ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/ApplicationTests.kt # ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/AdControllerTest.kt # ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/WsControllerTest.kt # ok-marketplace-biz/build.gradle.kts # ok-marketplace-biz/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/biz/MkplAdProcessor.kt # ok-marketplace-biz/src/commonTest/kotlin/repo/RepoByIdTests.kt # ok-marketplace-biz/src/commonTest/kotlin/statemachine/SMAdStateTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdCreateStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdDeleteStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdOffersStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdReadStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdSearchStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/stub/AdUpdateStubTest.kt # ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationCreateTest.kt # ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationDeleteTest.kt # ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationUpdateTest.kt # ok-marketplace-biz/src/commonTest/kotlin/validation/ValidationBadDescription.kt # ok-marketplace-common/build.gradle.kts # ok-marketplace-common/src/commonMain/kotlin/MkplContext.kt # ok-marketplace-common/src/commonMain/kotlin/models/MkplAd.kt # ok-marketplace-common/src/commonMain/kotlin/models/MkplCommand.kt # ok-marketplace-lib-cor/build.gradle.kts # ok-marketplace-lib-cor/src/commonTest/kotlin/ru/otus/otuskotlin/marketplace/cor/CorBaseTest.kt # ok-marketplace-lib-logging-common/build.gradle.kts # ok-marketplace-lib-logging-kermit/build.gradle.kts # ok-marketplace-mappers-log1/build.gradle.kts # ok-marketplace-mappers-log1/src/commonMain/kotlin/MkplContext2Log.kt # ok-marketplace-mappers-v1/src/main/kotlin/MappersV1FromTransport.kt # ok-marketplace-mappers-v1/src/main/kotlin/MappersV1ToTransport.kt # ok-marketplace-mappers-v2/build.gradle.kts # ok-marketplace-mappers-v2/src/commonMain/kotlin/MappersV2FromTransport.kt # ok-marketplace-mappers-v2/src/commonMain/kotlin/MappersV2ToTransport.kt # ok-marketplace-repo-cassandra/build.gradle.kts # ok-marketplace-repo-cassandra/src/main/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/cassandra/AdCassandraDAO.kt # ok-marketplace-repo-cassandra/src/main/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/cassandra/RepoAdCassandra.kt # ok-marketplace-repo-cassandra/src/main/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/cassandra/model/AdCassandraDTO.kt # ok-marketplace-repo-in-memory/build.gradle.kts # ok-marketplace-repo-in-memory/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemory.kt # ok-marketplace-repo-in-memory/src/commonTest/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemoryCreateTest.kt # ok-marketplace-repo-postgresql/src/main/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/AdTable.kt # ok-marketplace-repo-postgresql/src/main/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/RepoAdSQL.kt # ok-marketplace-repo-postgresql/src/main/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/SqlProperties.kt # ok-marketplace-repo-postgresql/src/test/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/RepoAdSQLTest.kt # ok-marketplace-repo-postgresql/src/test/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/SqlTestCompanion.kt # ok-marketplace-repo-stubs/build.gradle.kts # ok-marketplace-repo-tests/build.gradle.kts # ok-marketplace-repo-tests/src/commonMain/kotlin/BaseInitAds.kt # ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdCreateTest.kt # ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdDeleteTest.kt # ok-marketplace-repo-tests/src/commonMain/kotlin/runRepoTest.kt # ok-marketplace-stubs/build.gradle.kts # ok-marketplace-stubs/src/commonMain/kotlin/MkplAdStub.kt # settings.gradle.kts # specs/specs-ad-log.yaml # specs/specs-ad-v2.yaml
# Conflicts: # gradle.properties # ok-marketplace-app-ktor/build.gradle.kts # ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt # ok-marketplace-app-ktor/src/jvmTest/kotlin/ru/otus/otuskotlin/marketplace/app/repo/V1AdPostgresApiTest.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/CorConfig.kt # ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/AdControllerTest.kt # ok-marketplace-common/src/commonMain/kotlin/helpers/MkplErrorsHelpers.kt # ok-marketplace-repo-in-memory/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemory.kt # ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdDeleteTest.kt # ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdUpdateTest.kt # settings.gradle.kts
# Conflicts: # gradle.properties # ok-marketplace-app-ktor/build.gradle.kts # ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt # ok-marketplace-app-ktor/src/jvmTest/kotlin/ru/otus/otuskotlin/marketplace/app/repo/V1AdPostgresApiTest.kt # ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/CorConfig.kt # ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/AdControllerTest.kt # ok-marketplace-common/src/commonMain/kotlin/helpers/MkplErrorsHelpers.kt # ok-marketplace-repo-in-memory/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemory.kt # ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdDeleteTest.kt # ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdUpdateTest.kt # settings.gradle.kts
# Conflicts: # README.md # gradle.properties # ok-marketplace-app-ktor/build.gradle.kts # ok-marketplace-app-ktor/src/jvmMain/kotlin/plugins/getDatabaseConf.kt # settings.gradle.kts
# Conflicts: # README.md # gradle.properties # ok-marketplace-app-ktor/build.gradle.kts # ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/plugins/getDatabaseConf.kt # ok-marketplace-app-ktor/src/jvmTest/kotlin/ru/otus/otuskotlin/marketplace/app/repo/V1AdGremlinApiTest.kt # ok-marketplace-mappers-v1/src/main/kotlin/MappersV1ToTransport.kt # ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdDeleteTest.kt # settings.gradle.kts
# Conflicts: # README.md # gradle.properties # ok-marketplace-app-ktor/build.gradle.kts # ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt # ok-marketplace-app-ktor/src/jvmMain/kotlin/plugins/getDatabaseConf.kt # ok-marketplace-app-ktor/src/jvmMain/resources/application.yaml # ok-marketplace-mappers-v1/src/main/kotlin/MappersV1ToTransport.kt # settings.gradle.kts
BarracudaPff
force-pushed
the
m6l2-auth
branch
from
95a5ed0 to
695bd62
Compare
# Conflicts: # ok-marketplace-app-ktor/src/jvmMain/resources/application.yaml # ok-marketplace-app-ktor/src/jvmTest/kotlin/ru/otus/otuskotlin/marketplace/app/repo/V1AdGremlinApiTest.kt # settings.gradle.kts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.