From 7128deb4259284aea98cbf36a6917c181bd8ecc1 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Wed, 26 Feb 2025 23:15:04 +0100 Subject: [PATCH 1/5] Refactoring: move classes from pl.touk.nussknacker.engine.sttp to pl.touk.nussknacker.http.backend (#7598) They were breaking sttp imports when import list contained 'import pl.touk.nussknacker.engine._' --- .../processCounts/influxdb/SimpleInfluxClient.scala | 2 +- docs/MigrationGuide.md | 2 ++ .../engine/management/rest/HttpFlinkClient.scala | 6 +++--- .../engine/management/rest/FlinkHttpClientTest.scala | 2 +- .../nussknacker/ui/security/oauth2/OAuth2ClientApi.scala | 2 +- .../sttp => http/backend}/HttpClientErrorHandler.scala | 2 +- .../{engine/sttp => http/backend}/SttpJson.scala | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) rename utils/http-utils/src/main/scala/pl/touk/nussknacker/{engine/sttp => http/backend}/HttpClientErrorHandler.scala (97%) rename utils/http-utils/src/main/scala/pl/touk/nussknacker/{engine/sttp => http/backend}/SttpJson.scala (97%) diff --git a/designer/processReports/src/main/scala/pl/touk/nussknacker/processCounts/influxdb/SimpleInfluxClient.scala b/designer/processReports/src/main/scala/pl/touk/nussknacker/processCounts/influxdb/SimpleInfluxClient.scala index 06fcb48c064..736ac479a74 100644 --- a/designer/processReports/src/main/scala/pl/touk/nussknacker/processCounts/influxdb/SimpleInfluxClient.scala +++ b/designer/processReports/src/main/scala/pl/touk/nussknacker/processCounts/influxdb/SimpleInfluxClient.scala @@ -2,7 +2,7 @@ package pl.touk.nussknacker.processCounts.influxdb import io.circe.Decoder import pl.touk.nussknacker.engine.api.CirceUtil._ -import pl.touk.nussknacker.engine.sttp.SttpJson +import pl.touk.nussknacker.http.backend.SttpJson import sttp.client3._ import sttp.client3.circe._ import sttp.monad.syntax.MonadErrorOps diff --git a/docs/MigrationGuide.md b/docs/MigrationGuide.md index f5bd2d22d30..81c11c64180 100644 --- a/docs/MigrationGuide.md +++ b/docs/MigrationGuide.md @@ -83,6 +83,8 @@ To see the biggest differences please consult the [changelog](Changelog.md). * Other changes: * `StatusDetails` was renamed to `DeploymentStatusDetails` * Fields: `externalDeploymentId`, `externalDeploymentId`, `attributes`, `attributes` were removed from `StatusDetails` +* [#7598](https://github.com/TouK/nussknacker/pull/7598) Classes from `pl.touk.nussknacker.engine.sttp` package + were moved to `pl.touk.nussknacker.http.backend` ### Other changes diff --git a/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/rest/HttpFlinkClient.scala b/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/rest/HttpFlinkClient.scala index ebb82d7cb50..f527eafbe30 100644 --- a/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/rest/HttpFlinkClient.scala +++ b/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/rest/HttpFlinkClient.scala @@ -5,9 +5,9 @@ import org.apache.flink.api.common.JobID import org.apache.flink.configuration.Configuration import pl.touk.nussknacker.engine.api.deployment.{DataFreshnessPolicy, SavepointResult, WithDataFreshnessStatus} import pl.touk.nussknacker.engine.management.rest.flinkRestModel._ -import pl.touk.nussknacker.engine.sttp.SttpJson -import pl.touk.nussknacker.engine.sttp.SttpJson.asOptionalJson import pl.touk.nussknacker.engine.util.exception.DeeplyCheckingExceptionExtractor +import pl.touk.nussknacker.http.backend.SttpJson +import pl.touk.nussknacker.http.backend.SttpJson.asOptionalJson import sttp.client3._ import sttp.client3.circe._ import sttp.model.Uri @@ -26,7 +26,7 @@ class HttpFlinkClient(restUrl: URI, scenarioStateRequestTimeout: FiniteDuration, private val flinkUrl = Uri(restUrl) - import pl.touk.nussknacker.engine.sttp.HttpClientErrorHandler._ + import pl.touk.nussknacker.http.backend.HttpClientErrorHandler._ def uploadJarFileIfNotExists(jarFile: File): Future[JarFile] = { checkThatJarWithNameExists(jarFile.getName).flatMap { diff --git a/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/rest/FlinkHttpClientTest.scala b/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/rest/FlinkHttpClientTest.scala index 28b0a298582..21e3f6fc285 100644 --- a/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/rest/FlinkHttpClientTest.scala +++ b/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/rest/FlinkHttpClientTest.scala @@ -7,7 +7,7 @@ import org.scalatest.matchers.should.Matchers import org.scalatest.time.Span.convertSpanToDuration import pl.touk.nussknacker.engine.management.rest.flinkRestModel.{JarFile, JarsResponse, UploadJarResponse} import pl.touk.nussknacker.engine.management.utils.JobIdGenerator.generateJobId -import pl.touk.nussknacker.engine.sttp.HttpClientError +import pl.touk.nussknacker.http.backend.HttpClientError import pl.touk.nussknacker.test.PatientScalaFutures import sttp.client3.testing.SttpBackendStub import sttp.client3.{HttpError, Response, SttpBackend} diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ClientApi.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ClientApi.scala index beac8509890..8496fa456c8 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ClientApi.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ClientApi.scala @@ -3,7 +3,7 @@ package pl.touk.nussknacker.ui.security.oauth2 import cats.data.NonEmptyList import com.typesafe.scalalogging.LazyLogging import io.circe.{Decoder, Error} -import pl.touk.nussknacker.engine.sttp.SttpJson +import pl.touk.nussknacker.http.backend.SttpJson import pl.touk.nussknacker.ui.security.oauth2.OAuth2ErrorHandler.{ OAuth2AccessTokenRejection, OAuth2CompoundException, diff --git a/utils/http-utils/src/main/scala/pl/touk/nussknacker/engine/sttp/HttpClientErrorHandler.scala b/utils/http-utils/src/main/scala/pl/touk/nussknacker/http/backend/HttpClientErrorHandler.scala similarity index 97% rename from utils/http-utils/src/main/scala/pl/touk/nussknacker/engine/sttp/HttpClientErrorHandler.scala rename to utils/http-utils/src/main/scala/pl/touk/nussknacker/http/backend/HttpClientErrorHandler.scala index 2758bb73a19..0cdca13edb2 100644 --- a/utils/http-utils/src/main/scala/pl/touk/nussknacker/engine/sttp/HttpClientErrorHandler.scala +++ b/utils/http-utils/src/main/scala/pl/touk/nussknacker/http/backend/HttpClientErrorHandler.scala @@ -1,4 +1,4 @@ -package pl.touk.nussknacker.engine.sttp +package pl.touk.nussknacker.http.backend import com.typesafe.scalalogging.LazyLogging import sttp.client3.{HttpError, Response} diff --git a/utils/http-utils/src/main/scala/pl/touk/nussknacker/engine/sttp/SttpJson.scala b/utils/http-utils/src/main/scala/pl/touk/nussknacker/http/backend/SttpJson.scala similarity index 97% rename from utils/http-utils/src/main/scala/pl/touk/nussknacker/engine/sttp/SttpJson.scala rename to utils/http-utils/src/main/scala/pl/touk/nussknacker/http/backend/SttpJson.scala index eb038290f47..ea19671a61e 100644 --- a/utils/http-utils/src/main/scala/pl/touk/nussknacker/engine/sttp/SttpJson.scala +++ b/utils/http-utils/src/main/scala/pl/touk/nussknacker/http/backend/SttpJson.scala @@ -1,4 +1,4 @@ -package pl.touk.nussknacker.engine.sttp +package pl.touk.nussknacker.http.backend import io.circe.{Decoder, Error} import sttp.client3.circe.deserializeJson From 1d01667837c027bc35381b6812425beba9cc9f63 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Wed, 26 Feb 2025 21:21:15 +0100 Subject: [PATCH 2/5] Remove scalafix (#7598) --- .scalafix.conf | 15 --------------- project/plugins.sbt | 1 - 2 files changed, 16 deletions(-) delete mode 100644 .scalafix.conf diff --git a/.scalafix.conf b/.scalafix.conf deleted file mode 100644 index c4812f4cedb..00000000000 --- a/.scalafix.conf +++ /dev/null @@ -1,15 +0,0 @@ -OrganizeImports { - blankLines = Auto - coalesceToWildcardImportThreshold = 5 - expandRelative = false - groupExplicitlyImportedImplicitsSeparately = false - groupedImports = Merge - groups = [ - "*" - "re:(javax?|scala)\\." - ] - importSelectorsOrder = Ascii - importsOrder = Ascii - preset = INTELLIJ_2020_3 - removeUnused = true -} diff --git a/project/plugins.sbt b/project/plugins.sbt index cf6b537e134..d2e81c3fd55 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -14,7 +14,6 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.1") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") // 3.12 is missing some logging when run on JDK 11 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.11.3") From bb5bd7e9c0d02106895bf583c42241296906786f Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Wed, 26 Feb 2025 21:23:27 +0100 Subject: [PATCH 3/5] Update scalafmt, enable import grouping (#7598) --- .scalafmt.conf | 28 ++++++++++++++-------- project/FormatStagedScalaFilesPlugin.scala | 7 +++++- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 9d6d75d3b5f..c3a9b792a32 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,15 +1,24 @@ runner.dialect = scala213source3 -version = "3.7.14" -maxColumn = 120 -align.preset = more -rewrite.rules = [AsciiSortImports] -spaces.inImportCurlyBraces = false +version = "3.9.1" +maxColumn = 120 +align.preset = more -danglingParentheses.defnSite = true -danglingParentheses.ctrlSite = false -danglingParentheses.callSite = true -align.closeParenSite = true +rewrite.rules = [Imports] +rewrite.imports { + sort = scalastyle, + groups = [ + ["(?!java.?\\.).*", "(?!scala\\.).*"], + ["java.?\\..*", "scala\\..*"], + ["[A-Z].*"] + ] +} +rewrite.trailingCommas.style = keep + +danglingParentheses.defnSite = true +danglingParentheses.ctrlSite = false +danglingParentheses.callSite = true +align.closeParenSite = true newlines.implicitParamListModifierPrefer = before newlines.topLevelStatementBlankLines = [ { @@ -18,7 +27,6 @@ newlines.topLevelStatementBlankLines = [ } ] -trailingCommas = keep docstrings.style = keep // we want to keep the html style of some scaladoc comments unchanged fileOverride { diff --git a/project/FormatStagedScalaFilesPlugin.scala b/project/FormatStagedScalaFilesPlugin.scala index e6dce90e1f2..88e6d535835 100644 --- a/project/FormatStagedScalaFilesPlugin.scala +++ b/project/FormatStagedScalaFilesPlugin.scala @@ -49,13 +49,18 @@ object FormatStagedScalaFilesPlugin extends sbt.AutoPlugin { .toList } + private def quoteSbtArgument(filePath: String) = { + // use quoting for StringEscapable parser + "\"" + filePath.replace("\\", "\\\\").replace("\"", "\\\"") + "\"" + } + private def callFormatFiles(files: List[String]) = { for { _ <- Step.task { streams.map(_.log.info("Formatting backend files ...")) } _ <- Step.task { - (Compile / ScalafmtPlugin.autoImport.scalafmtOnly).toTask(s" ${files.mkString(" ")}") + (Compile / ScalafmtPlugin.autoImport.scalafmtOnly).toTask(s" ${files.map(quoteSbtArgument).mkString(" ")}") } } yield () From 9d6fc55d8702a89a3c38b90e6737afcbcd271174 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Thu, 27 Feb 2025 11:38:09 +0100 Subject: [PATCH 4/5] Format Scala code (#7598) --- .../aggregate/AggregatorBenchamark.scala | 4 +- .../benchmarks/e2e/BaseE2EBenchmark.scala | 2 +- .../interpreter/InterpreterSetup.scala | 4 +- .../ManyParamsInterpreterBenchmark.scala | 2 +- .../OneParamInterpreterBenchmark.scala | 2 +- .../SerializationBenchmarkSetup.scala | 4 +- .../spel/ScalaAccessorBenchmark.scala | 4 +- .../benchmarks/spel/SpelBenchmarkSetup.scala | 2 +- .../spel/SpelSecurityBenchmarkSetup.scala | 2 +- .../ExpressionSuggesterBenchmarkSetup.scala | 2 +- .../nussknacker/engine/api/CirceUtil.scala | 2 +- .../nussknacker/engine/api/MetaData.scala | 4 +- .../engine/api/TypeSpecificData.scala | 5 +- .../engine/api/modelinfo/ModelInfo.scala | 2 +- .../engine/api/parameter/ParameterName.scala | 2 +- .../graph/expression/TabularTypedData.scala | 6 +- .../engine/api/TypeSpecificDataTestData.scala | 2 +- .../expression/TabularTypedDataSpec.scala | 2 +- .../api/component/ComponentGroupName.scala | 2 +- .../component/DesignerWideComponentId.scala | 2 +- .../api/context/ContextTransformation.scala | 2 +- .../api/context/ProcessCompilationError.scala | 2 +- .../api/context/ValidationContext.scala | 8 +- .../transformation/DynamicComponent.scala | 2 +- .../api/definition/ParameterDeclaration.scala | 2 +- .../api/definition/ParameterEditor.scala | 2 +- .../api/generics/ExpressionParseError.scala | 2 +- .../api/process/ContextInitializer.scala | 4 +- .../engine/api/process/Source.scala | 4 +- .../api/typed/AssignabilityDeterminer.scala | 2 +- .../api/typed/TypeConversionHandler.scala | 2 +- .../engine/api/typed/TypeEncoders.scala | 4 +- .../supertype/CommonSupertypeFinder.scala | 4 +- .../NumberTypesPromotionStrategy.scala | 3 +- .../transformation/JavaDynamicComponent.scala | 8 +- .../engine/util/config/FicusReaders.scala | 2 +- .../component/NussknackerVersionTest.scala | 1 + .../api/typed/TypedFromInstanceTest.scala | 2 +- .../api/typed/TypingResultDecoderSpec.scala | 2 +- .../typed/TypingResultErrorMessagesSpec.scala | 2 +- .../engine/api/typed/TypingResultSpec.scala | 2 +- .../functional/OpenAPIServiceSpec.scala | 4 +- .../OpenApiScenarioIntegrationTest.scala | 4 +- .../openapi/functional/StubService.scala | 2 +- .../openapi/OpenAPIServicesConfig.scala | 1 + .../SwaggerOpenApiDefinitionDiscovery.scala | 6 +- .../openapi/enrichers/SwaggerEnricher.scala | 2 +- .../openapi/extractor/HandleResponse.scala | 5 +- .../extractor/ParametersExtractor.scala | 2 +- .../openapi/extractor/ServiceRequest.scala | 2 +- .../pl/touk/nussknacker/openapi/package.scala | 2 +- .../parser/ParseToSwaggerService.scala | 7 +- .../parser/ParseToSwaggerServices.scala | 2 +- .../openapi/parser/SecuritiesParser.scala | 2 +- .../nussknacker/openapi/BaseOpenAPITest.scala | 2 +- .../openapi/OpenAPIServicesConfigTest.scala | 1 + .../nussknacker/openapi/SecurityTest.scala | 4 +- .../extractor/ServiceRequestTest.scala | 6 +- .../sql/db/schema/ColumnDefinition.scala | 2 +- .../sql/service/DatabaseEnricherInvoker.scala | 2 +- .../sql/service/DatabaseLookupEnricher.scala | 6 +- .../service/DatabaseLookupEnricherTest.scala | 4 +- .../DatabaseLookupEnricherWithCacheTest.scala | 2 +- .../DatabaseQueryEnricherPostgresqlTest.scala | 2 +- ...tabaseQueryEnricherQueryWithEnricher.scala | 2 +- .../DatabaseQueryEnricherValidationTest.scala | 4 +- .../DatabaseQueryEnricherWithCacheTest.scala | 4 +- .../sql/utils/ignite/WithIgniteDB.scala | 2 +- .../defaultmodel/DefaultConfigCreator.scala | 2 +- ...sionTableParameterNamesMigrationSpec.scala | 4 +- .../PeriodicToSampleGeneratorSpec.scala | 2 +- ...ntGeneratorAndPeriodicToScheduleSpec.scala | 2 +- .../DeploymentManagerDependencies.scala | 2 +- .../engine/DeploymentManagerProvider.scala | 2 +- .../api/deployment/DeploymentStatus.scala | 2 +- .../services/ProcessConfigEnricher.scala | 14 +- .../SimpleProcessStateDefinitionManager.scala | 8 +- .../deployment/simple/SimpleStateStatus.scala | 2 +- .../testing/DeploymentManagerStub.scala | 14 +- .../ListenerScenarioWithDetails.scala | 2 +- .../processCounts/CountsReporter.scala | 2 +- .../influxdb/InfluxGenerator.scala | 10 +- .../influxdb/SimpleInfluxClient.scala | 2 +- .../restmodel/BaseEndpointDefinitions.scala | 2 +- .../component/ComponentApiEndpoints.scala | 4 +- .../restmodel/component/package.scala | 6 +- .../restmodel/definition/package.scala | 2 +- .../ScenarioWithDetailsForMigrations.scala | 2 +- .../validation/PrettyValidationErrors.scala | 2 +- .../validation/ValidationResults.scala | 4 +- .../restmodel/NodeDataCodecSpec.scala | 6 +- .../PrettyValidationErrorsTest.scala | 2 +- .../migration/V1_013__GroupNodesChange.scala | 2 +- .../V1_016__TypeSpecificMetaDataChange.scala | 2 +- ...inkExceptionHandlerExpressionsChange.scala | 2 +- ...41__RemoveTypeSpecificDataDefinition.scala | 2 +- ...RenameSubprocessToFragmentDefinition.scala | 2 +- ...__CreateScenarioActivitiesDefinition.scala | 3 +- ...mmentsToScenarioActivitiesDefinition.scala | 8 +- ...dMissingScenarioActivitiesDefinition.scala | 2 +- .../V1_060__CreateStickyNotesDefinition.scala | 6 +- .../ui/LocalNussknackerWithSingleModel.scala | 2 +- .../ui/api/ActionInfoHttpService.scala | 2 +- .../ui/api/AppApiHttpService.scala | 4 +- .../nussknacker/ui/api/BaseHttpService.scala | 2 +- .../ui/api/DictApiHttpService.scala | 2 +- .../ui/api/ManagementResources.scala | 9 +- .../ui/api/MigrationApiHttpService.scala | 2 +- .../ui/api/NodesApiHttpService.scala | 28 ++-- .../ui/api/ProcessesExportResources.scala | 4 +- .../ui/api/ProcessesResources.scala | 4 +- .../ui/api/RemoteEnvironmentResources.scala | 4 +- .../api/ScenarioActivityApiHttpService.scala | 8 +- .../ui/api/SettingsResources.scala | 2 +- .../ui/api/StickyNotesApiHttpService.scala | 8 +- .../touk/nussknacker/ui/api/TapirCodecs.scala | 2 +- .../ui/api/TestingApiHttpService.scala | 4 +- .../api/description/ActionInfoEndpoints.scala | 4 +- .../ui/api/description/AppApiEndpoints.scala | 6 +- .../description/DeploymentApiEndpoints.scala | 4 +- .../description/MigrationApiEndpoints.scala | 2 +- .../api/description/NodesApiEndpoints.scala | 24 ++-- .../NotificationApiEndpoints.scala | 2 +- .../ScenarioLabelsApiEndpoints.scala | 2 +- .../ScenarioParametersApiEndpoints.scala | 2 +- .../description/StatisticsApiEndpoints.scala | 4 +- .../description/StickyNotesApiEndpoints.scala | 3 +- .../api/description/TestingApiEndpoints.scala | 2 +- .../ui/api/description/UserApiEndpoints.scala | 4 +- .../description/scenarioActivity/Dtos.scala | 6 +- .../scenarioActivity/Endpoints.scala | 7 +- .../scenarioActivity/Examples.scala | 2 +- .../scenarioActivity/InputOutput.scala | 2 +- .../ui/api/description/stickynotes/Dtos.scala | 2 +- .../ui/config/AttachmentsConfig.scala | 4 +- .../ComponentsActionConfigExtractor.scala | 4 +- .../ui/config/DesignerConfig.scala | 5 +- ...tegoriesScenarioToolbarsConfigParser.scala | 3 +- .../db/entity/AttachmentEntityFactory.scala | 3 +- .../ui/db/entity/BaseEntityFactory.scala | 2 +- .../PeriodicProcessDeploymentsTable.scala | 2 +- .../ui/db/entity/PeriodicProcessesTable.scala | 5 +- .../ui/db/entity/ProcessEntityFactory.scala | 5 +- .../entity/ProcessVersionEntityFactory.scala | 123 +++++++++--------- .../ScenarioActivityEntityFactory.scala | 7 +- .../db/entity/StickyNotesEntityFactory.scala | 12 +- .../db/timeseries/questdb/FlushDataTask.scala | 2 +- .../QuestDbFEStatisticsRepository.scala | 11 +- .../AlignedComponentsDefinitionProvider.scala | 2 +- .../ui/definition/DefinitionsService.scala | 4 +- .../component/ComponentService.scala | 8 +- .../component/ComponentsUsageHelper.scala | 4 +- .../component/ComponentsValidator.scala | 1 + ...rioPropertyConfigValidatorDeterminer.scala | 2 +- ...arioPropertyValidatorDeterminerChain.scala | 2 +- .../UiScenarioPropertyEditorDeterminer.scala | 2 +- .../ui/factory/NussknackerAppFactory.scala | 8 +- .../ui/initialization/Initialization.scala | 4 +- .../ui/metrics/RepositoryGauges.scala | 2 +- .../ui/migrations/MigrationService.scala | 6 +- .../notifications/NotificationService.scala | 2 +- .../ui/process/NewProcessPreparer.scala | 2 +- .../ui/process/ProcessService.scala | 4 +- .../ui/process/ScenarioMetadata.scala | 2 +- .../ui/process/ScenarioToolbarService.scala | 2 +- .../deployment/ActionInfoService.scala | 2 +- .../ui/process/deployment/ActionService.scala | 6 +- .../deployment/LoggedUserConversions.scala | 2 +- .../ScenarioTestExecutorService.scala | 2 +- ...oymentManagerReliableStatusesWrapper.scala | 2 +- ...EngineSideDeploymentStatusesProvider.scala | 4 +- .../InconsistentStateDetector.scala | 2 +- .../ScenarioStatusProvider.scala | 4 +- .../process/fragment/FragmentRepository.scala | 4 +- .../process/fragment/FragmentResolver.scala | 2 +- .../marshall/CanonicalProcessConverter.scala | 2 +- .../process/migrate/RemoteEnvironment.scala | 10 +- .../process/migrate/TestModelMigrations.scala | 2 +- .../process/newactivity/ActivityService.scala | 4 +- .../newdeployment/DeploymentRepository.scala | 2 +- .../newdeployment/DeploymentService.scala | 4 +- .../PeriodicDeploymentManagerDecorator.scala | 2 +- .../periodic/PeriodicProcessService.scala | 6 +- ...eriodicProcessStateDefinitionManager.scala | 8 +- .../periodic/PeriodicStateStatus.scala | 2 +- .../process/periodic/ScheduleProperty.scala | 4 +- .../ui/process/periodic/Utils.scala | 2 +- .../cron/CronSchedulePropertyExtractor.scala | 2 +- ...riodicProcessDeploymentsTableFactory.scala | 2 +- .../LegacyPeriodicProcessesRepository.scala | 4 +- .../SchedulePropertyExtractorUtils.scala | 7 +- .../processingtype/ProcessingTypeData.scala | 4 +- .../ScenarioParametersService.scala | 2 +- .../LocalProcessingTypeDataLoader.scala | 6 +- .../loader/ProcessingTypeDataLoader.scala | 4 +- ...sConfigBasedProcessingTypeDataLoader.scala | 2 +- .../DBFetchingProcessRepository.scala | 2 +- .../process/repository/DBIOActionRunner.scala | 2 +- .../repository/DeploymentComment.scala | 2 +- .../PeriodicProcessesRepository.scala | 4 +- .../repository/ProcessDBQueryRepository.scala | 2 +- .../repository/ProcessRepository.scala | 2 +- .../repository/ScenarioActionRepository.scala | 10 +- ...rioActionRepositoryAuditLogDecorator.scala | 2 +- .../repository/ScenarioLabelsRepository.scala | 2 +- .../ScenarioWithDetailsEntity.scala | 6 +- .../DbScenarioActivityRepository.scala | 4 +- ...oActivityRepositoryAuditLogDecorator.scala | 2 +- .../stickynotes/DbStickyNotesRepository.scala | 2 +- .../FetchScenarioActivityService.scala | 2 +- .../ui/process/test/ScenarioTestService.scala | 4 +- .../ScenarioGraphVersionRepository.scala | 4 +- .../server/AkkaHttpBasedRouteProvider.scala | 30 ++--- ...HttpBasedTapirStreamEndpointProvider.scala | 2 +- ...ttpServerInterpreterForTapirPurposes.scala | 2 +- .../ui/server/NussknackerHttpServer.scala | 6 +- .../ui/statistics/Encryption.scala | 2 +- ...sageStatisticsReportsSettingsService.scala | 2 +- .../ui/util/AkkaHttpResponse.scala | 2 +- .../nussknacker/ui/util/CorsSupport.scala | 2 +- .../nussknacker/ui/util/MultipartUtils.scala | 2 +- .../ui/util/OptionsMethodSupport.scala | 2 +- .../nussknacker/ui/util/PdfExporter.scala | 18 +-- .../pl/touk/nussknacker/ui/util/Project.scala | 1 + .../ui/util/ScenarioGraphComparator.scala | 2 +- .../ui/util/SecurityHeadersSupport.scala | 2 +- .../ui/validation/NodeValidator.scala | 6 +- .../ScenarioPropertiesValidator.scala | 2 +- .../ui/validation/UIProcessValidator.scala | 6 +- ...032__StandaloneToRequestResponseSpec.scala | 2 +- .../V1_041__RemoveTypeSpecificDataSpec.scala | 2 +- .../nussknacker/test/base/db/DbTesting.scala | 2 +- .../test/base/it/NuResourcesTest.scala | 20 +-- .../test/config/ConfigWithScalaVersion.scala | 2 +- .../test/mock/MockDeploymentManager.scala | 6 +- .../mock/MockFetchingProcessRepository.scala | 2 +- .../MockFetchingProcessRepositorySpec.scala | 2 +- .../test/mock/StubFragmentRepository.scala | 2 +- .../utils/DesignerTestConfigValidator.scala | 1 + .../test/utils/OpenAPIExamplesValidator.scala | 2 +- .../test/utils/domain/ProcessTestData.scala | 13 +- .../utils/domain/ReflectionBasedUtils.scala | 2 +- .../test/utils/domain/ScenarioHelper.scala | 4 +- .../utils/domain/ScenarioToJsonHelper.scala | 2 +- .../test/utils/domain/TestFactory.scala | 8 +- .../test/utils/domain/TestProcessUtil.scala | 6 +- .../test/utils/generators/NodeDataGen.scala | 2 +- .../utils/scalas/CatsTestExtensions.scala | 2 +- .../ui/api/ActionInfoResourcesSpec.scala | 4 +- .../api/AppApiHttpServiceBusinessSpec.scala | 4 +- .../api/AppApiHttpServiceSecuritySpec.scala | 2 +- ...DeploymentApiHttpServiceBusinessSpec.scala | 4 +- .../ComponentApiHttpServiceBusinessSpec.scala | 6 +- .../ComponentApiHttpServiceSecuritySpec.scala | 16 +-- .../ui/api/DefinitionResourcesSpec.scala | 12 +- ...DeploymentApiHttpServiceBusinessSpec.scala | 4 +- ...tApiHttpServiceDeploymentCommentSpec.scala | 4 +- .../ui/api/DictApiHttpServiceSpec.scala | 2 +- .../ui/api/ExpressionSuggesterSpec.scala | 6 +- ...ManagementApiHttpServiceBusinessSpec.scala | 10 +- ...ManagementResourcesBatchBusinessSpec.scala | 4 +- .../ManagementResourcesConcurrentSpec.scala | 2 +- .../ui/api/ManagementResourcesSpec.scala | 8 +- .../MigrationApiHttpServiceBusinessSpec.scala | 8 +- .../MigrationApiHttpServiceSecuritySpec.scala | 6 +- .../ui/api/NodesApiEndpointsSpec.scala | 2 +- .../api/NodesApiHttpServiceBusinessSpec.scala | 2 +- .../api/NodesApiHttpServiceSecuritySpec.scala | 10 +- ...tificationApiHttpServiceBusinessSpec.scala | 2 +- ...tificationApiHttpServiceSecuritySpec.scala | 4 +- ...DesignerApiAvailableToExposeYamlSpec.scala | 4 +- .../ui/api/NussknackerHttpServerSpec.scala | 4 +- .../ui/api/ProcessesChangeListenerSpec.scala | 4 +- .../ProcessesExportImportResourcesSpec.scala | 6 +- .../ui/api/ProcessesResourcesSpec.scala | 27 ++-- .../api/RemoteEnvironmentResourcesSpec.scala | 2 +- ...ioActivityApiHttpServiceBusinessSpec.scala | 10 +- ...ioActivityApiHttpServiceSecuritySpec.scala | 2 +- ...arioLabelsApiHttpServiceBusinessSpec.scala | 10 +- ...arioLabelsApiHttpServiceSecuritySpec.scala | 2 +- ...ParametersApiHttpServiceBusinessSpec.scala | 2 +- ...ParametersApiHttpServiceSecuritySpec.scala | 2 +- .../ui/api/SettingsResourcesSpec.scala | 2 +- ...StatisticsApiHttpServiceBusinessSpec.scala | 16 +-- ...StatisticsApiHttpServiceSecuritySpec.scala | 2 +- ...tickyNotesApiHttpServiceBusinessSpec.scala | 10 +- .../ui/api/TestingApiHttpServiceSpec.scala | 2 +- ...ceCategoryUsedMoreThanOnceConfigSpec.scala | 4 +- .../api/UserApiHttpServiceSecuritySpec.scala | 2 +- .../ui/api/ValidationResourcesSpec.scala | 8 +- .../ui/config/ConfigurationTest.scala | 4 +- .../ProcessingTypeDataLoaderSpec.scala | 2 +- ...riesScenarioToolbarsConfigParserSpec.scala | 3 +- .../definition/DefinitionsServiceSpec.scala | 4 +- .../ui/definition/EdgeTypesPreparerTest.scala | 2 +- .../ComponentGroupsPreparerSpec.scala | 8 +- .../component/ComponentModels.scala | 2 +- .../component/ComponentsUsageHelperTest.scala | 10 +- .../DefaultComponentServiceSpec.scala | 80 +++++++----- .../component/DynamicComponentProvider.scala | 2 +- ...ropertyValidatorsDeterminerChainTest.scala | 2 +- ...ScenarioPropertyEditorDeterminerTest.scala | 2 +- .../InitializationOnDbItSpec.scala | 8 +- .../ui/integration/BaseFlowTest.scala | 16 +-- .../ui/integration/DictsFlowTest.scala | 6 +- .../NotificationServiceTest.scala | 16 +-- .../ConfigScenarioToolbarServiceSpec.scala | 3 +- .../ui/process/DBProcessServiceSpec.scala | 2 +- .../ProcessStateDefinitionServiceSpec.scala | 4 +- .../deployment/DeploymentServiceSpec.scala | 13 +- .../TestDeploymentServiceFactory.scala | 6 +- .../fragment/FragmentRepositorySpec.scala | 2 +- .../CanonicalProcessConverterSpec.scala | 2 +- .../StandardRemoteEnvironmentSpec.scala | 6 +- .../ui/process/migrate/TestMigrations.scala | 2 +- .../migrate/TestModelMigrationsSpec.scala | 2 +- .../newdeployment/DeploymentServiceTest.scala | 3 +- ...eriodicProcessServiceIntegrationTest.scala | 4 +- .../PeriodicProcessesFetchingTest.scala | 6 +- .../CronSchedulePropertyExtractorTest.scala | 2 +- .../flink/CronSchedulePropertyTest.scala | 2 +- .../periodic/flink/FlinkClientStub.scala | 2 +- .../flink/PeriodicDeploymentManagerTest.scala | 11 +- .../flink/PeriodicProcessDeploymentGen.scala | 8 +- .../flink/PeriodicProcessServiceTest.scala | 8 +- ...dicProcessStateDefinitionManagerTest.scala | 2 +- .../flink/RescheduleFinishedActorTest.scala | 2 +- .../ui/process/periodic/flink/UtilsSpec.scala | 2 +- .../db/InMemPeriodicProcessesRepository.scala | 4 +- .../DBFetchingProcessRepositorySpec.scala | 4 +- ...StatisticsReportsSettingsServiceTest.scala | 2 +- .../ui/util/ScenarioGraphComparatorSpec.scala | 2 +- .../validation/UIProcessValidatorSpec.scala | 33 ++--- .../common/components/DecisionTableSpec.scala | 2 +- ...DevelopmentDeploymentManagerProvider.scala | 5 +- ...lopmentProcessStateDefinitionManager.scala | 2 +- .../MockableDeploymentManagerProvider.scala | 2 +- .../engine/flink/api/NkGlobalParameters.scala | 2 +- .../api/exception/ExceptionHandler.scala | 2 +- .../api/process/FlinkCustomNodeContext.scala | 2 +- .../FlinkCustomStreamTransformation.scala | 4 +- .../FlinkLazyParameterFunctionHelper.scala | 2 +- .../engine/flink/api/process/FlinkSink.scala | 2 +- .../TypeInformationDetection.scala | 4 +- .../FlinkTypeInfoRegistrarTest.scala | 2 +- .../ConcreteCaseClassTypeInfo.scala | 2 +- .../FixedValueTypeInformationHelper.scala | 2 +- .../nussknacker/engine/flink/util/keyed.scala | 2 +- .../engine/flink/util/richflink.scala | 2 +- .../util/sink/SingleValueSinkFactory.scala | 2 +- .../source/ReturningClassInstanceSource.scala | 2 +- .../flink/SpelTemplateLazyParameterTest.scala | 2 +- .../aggregate/TableAggregationTest.scala | 6 +- .../flink/table/join/TableJoinTest.scala | 2 +- .../transformer/ForEachTransformerSpec.scala | 2 +- .../transformer/UnionTransformerSpec.scala | 3 +- .../UnionWithMemoTransformerSpec.scala | 7 +- .../aggregate/AggregatesSpec.scala | 2 +- .../FullOuterJoinTransformerSpec.scala | 3 +- .../ModelUtilExceptionHandlingSpec.scala | 2 +- .../SingleSideJoinTransformerSpec.scala | 3 +- .../aggregate/TransformersTest.scala | 6 +- .../FlinkBaseUnboundedComponentProvider.scala | 2 +- .../EventGeneratorSourceFactory.scala | 4 +- .../UnionWithMemoTransformer.scala | 2 +- .../transformer/aggregate/Aggregator.scala | 4 +- .../aggregate/AggregatorFunction.scala | 4 +- .../aggregate/CardinalityAggregator.scala | 2 +- ...WhenNoDataTumblingAggregatorFunction.scala | 2 +- .../EmitWhenEventLeftAggregatorFunction.scala | 2 +- .../aggregate/EnrichingWithKeyFunction.scala | 2 +- .../OnEventTriggerWindowOperator.scala | 4 +- .../transformer/aggregate/aggregates.scala | 4 +- .../transformer/aggregate/transformers.scala | 2 +- .../join/FullOuterJoinTransformer.scala | 8 +- .../SingleSideJoinAggregatorFunction.scala | 2 +- .../join/SingleSideJoinTransformer.scala | 4 +- .../util/transformer/ForEachTransformer.scala | 2 +- .../util/transformer/UnionTransformer.scala | 2 +- .../FlinkKafkaComponentProvider.scala | 2 +- .../table/FlinkTableComponentProvider.scala | 2 +- .../table/aggregate/TableAggregation.scala | 2 +- .../aggregate/TableAggregationFactory.scala | 4 +- .../flink/table/join/TableJoinComponent.scala | 4 +- .../engine/flink/table/sink/TableSink.scala | 2 +- .../flink/table/sink/TableSinkFactory.scala | 6 +- .../table/sink/TableTypeOutputValidator.scala | 4 +- .../FlinkMiniClusterTableOperations.scala | 2 +- .../flink/table/source/TableSource.scala | 2 +- .../table/source/TableSourceFactory.scala | 2 +- .../process/ExecutionConfigPreparer.scala | 2 +- .../process/FlinkScenarioNameValidator.scala | 4 +- .../compiler/FlinkProcessCompilerData.scala | 4 +- .../FlinkProcessCompilerDataFactory.scala | 4 +- ...ubbedFlinkProcessCompilerDataFactory.scala | 6 +- ...bbedFragmentSourceDefinitionPreparer.scala | 2 +- .../TestFlinkProcessCompilerDataFactory.scala | 2 +- ...ationFlinkProcessCompilerDataFactory.scala | 2 +- .../exception/FlinkExceptionHandler.scala | 2 +- .../AsyncInterpretationDeterminer.scala | 2 +- .../registrar/CollectingSinkFunction.scala | 2 +- .../registrar/FlinkProcessRegistrar.scala | 17 ++- .../process/registrar/SplitFunction.scala | 2 +- .../StreamExecutionEnvPreparer.scala | 2 +- ...aluateFunctionConverterWithLifecycle.scala | 2 +- .../process/runner/FlinkScenarioJob.scala | 4 +- .../runner/FlinkScenarioUnitTestJob.scala | 2 +- .../FlinkScenarioStateVerificationJob.scala | 2 +- .../FlinkScenarioTestingJob.scala | 4 +- ...gResultAwareTypeInformationDetection.scala | 2 +- .../TypedJavaMapBasedTypeInformation.scala | 3 +- .../TypedObjectBasedTypeInformation.scala | 2 +- .../engine/process/util/Serializers.scala | 2 +- .../engine/process/util/SpelHack.scala | 2 +- .../process/api/EvictableStateTest.scala | 2 +- ...dFlinkProcessCompilerDataFactoryTest.scala | 2 +- .../exception/FlinkExceptionHandlerSpec.scala | 2 +- .../process/functional/FlinkSinkSpec.scala | 2 +- .../process/functional/FragmentSpec.scala | 8 +- .../process/functional/MetricsSpec.scala | 2 +- .../process/functional/ProcessSpec.scala | 1 + ...InterpretationFunctionFlinkGraphSpec.scala | 2 +- .../process/runner/FlinkScenarioJobSpec.scala | 2 +- .../runner/SimpleProcessConfigCreator.scala | 2 +- ...ultAwareTypeInformationDetectionSpec.scala | 8 +- .../process/util/MetaDataExtractorTest.scala | 3 +- .../exception/FlinkEspExceptionConsumer.scala | 2 +- .../exception/KafkaExceptionConsumer.scala | 2 +- .../generic/DelayedFlinkKafkaConsumer.scala | 4 +- .../FlinkKafkaDelayedSourceImplFactory.scala | 4 +- .../engine/kafka/generic/sinks.scala | 2 +- .../FlinkSerializationSchemaConversions.scala | 2 +- .../sharedproducer/KafkaSharedProducer.scala | 2 +- .../kafka/sink/flink/FlinkKafkaSink.scala | 4 +- .../kafka/source/flink/FlinkKafkaSource.scala | 6 +- .../flink/FlinkKafkaSourceImplFactory.scala | 2 +- .../ConsumerRecordToJsonFormatterSpec.scala | 2 +- ...kaExceptionConsumerSerializationSpec.scala | 2 +- .../KafkaExceptionConsumerSpec.scala | 2 +- ...SourceFactoryDefinitionExtractorSpec.scala | 7 +- .../flink/KafkaSourceFactoryMixin.scala | 4 +- ...fkaSourceFactoryProcessConfigCreator.scala | 8 +- .../KafkaSourceFactoryProcessMixin.scala | 2 +- .../source/flink/KafkaSourceFactorySpec.scala | 6 +- .../sample/DevProcessConfigCreator.scala | 2 +- .../component/SampleComponentProvider.scala | 2 +- .../sample/dict/BooleanDictionary.scala | 2 +- .../sample/dict/IntegerDictionary.scala | 2 +- .../sample/dict/LongDictionary.scala | 2 +- .../global/ConfigTypedGlobalVariable.scala | 2 +- .../global/DocumentationFunctions.scala | 2 +- .../sample/global/ExampleFunctions.scala | 2 +- .../sample/helper/DateProcessHelper.scala | 4 +- .../sample/service/CampaignService.scala | 6 +- .../service/ClientFakeHttpService.scala | 2 +- .../sample/service/ConfiguratorService.scala | 6 +- .../service/CustomValidatedService.scala | 4 +- .../sample/service/DatesTypesService.scala | 5 +- .../DynamicMultipleParamsService.scala | 6 +- .../sample/service/DynamicService.scala | 2 +- .../sample/service/MeetingService.scala | 9 +- .../service/MultipleParamsService.scala | 2 +- .../sample/service/OptionalTypesService.scala | 5 +- .../sample/service/SampleServices.scala | 6 +- .../ServiceWithDictParameterEditor.scala | 2 +- .../sample/service/SimpleTypesService.scala | 4 +- .../service/UnionReturnObjectService.scala | 2 +- .../sample/sink/LiteDeadEndSink.scala | 3 +- .../sample/source/BoundedSource.scala | 2 +- .../source/DynamicParametersSource.scala | 2 +- ...nericSourceWithCustomVariablesSample.scala | 4 +- .../sample/source/LiteCsvSource.scala | 2 +- .../management/sample/source/SqlSource.scala | 2 +- .../transformer/DynamicParametersMixin.scala | 8 +- .../DynamicParametersTransformer.scala | 2 +- .../EnrichWithAdditionalDataTransformer.scala | 10 +- .../HidingVariablesTransformer.scala | 4 +- .../JoinTransformerWithEditors.scala | 2 +- .../LastVariableFilterTransformer.scala | 4 +- .../transformer/StatefulTransformer.scala | 2 +- .../engine/process/CronEditorTest.scala | 2 +- .../process/SampleComponentProviderTest.scala | 2 +- .../engine/management/DockerTest.scala | 4 +- .../BaseFlinkDeploymentManagerSpec.scala | 4 +- ...DeploymentManagerScenarioTestingSpec.scala | 2 +- ...FlinkDeploymentManagerSlotsCountSpec.scala | 2 +- .../JavaConfigDeploymentManagerSpec.scala | 8 +- .../streaming/StreamingDockerTest.scala | 4 +- .../management/FlinkDeploymentManager.scala | 4 +- .../FlinkScheduledExecutionPerformer.scala | 2 +- .../FlinkStatusDetailsDeterminer.scala | 4 +- .../RemoteFlinkScenarioJobRunner.scala | 2 +- .../management/rest/CachedFlinkClient.scala | 2 +- .../management/rest/HttpFlinkClient.scala | 2 +- .../FlinkDeploymentManagerSpec.scala | 8 +- .../FlinkScenarioStatusDtoSpec.scala | 2 +- .../management/FlinkSlotsCheckerTest.scala | 11 +- .../management/rest/FlinkHttpClientTest.scala | 4 +- .../caseclass/CaseClassTypeInfo.scala | 4 +- .../CaseClassSerializationTest.scala | 2 +- ...inkUniversalSchemaBasedSerdeProvider.scala | 4 +- ...maIdBasedAvroGenericRecordSerializer.scala | 2 +- .../sink/flink/FlinkKafkaUniversalSink.scala | 4 +- .../FlinkKafkaUniversalSinkImplFactory.scala | 4 +- .../KafkaAvroNamespacedSpec.scala | 2 +- .../KafkaAvroPayloadIntegrationSpec.scala | 5 +- .../KafkaAvroTestProcessConfigCreator.scala | 2 +- .../KafkaJsonPayloadIntegrationSpec.scala | 2 +- .../encode/ToAvroSchemaBasedEncoderSpec.scala | 4 +- .../ConsumerRecordSerializerSpec.scala | 2 +- .../helpers/KafkaAvroSpecMixin.scala | 6 +- ...BasedAvroGenericRecordSerializerSpec.scala | 2 +- .../ConfluentKafkaAvroSeDeSpecMixin.scala | 4 +- .../UniversalKafkaDeserializerTest.scala | 2 +- ...EditorWithAvroPayloadIntegrationTest.scala | 4 +- .../UniversalKafkaSinkValidationSpec.scala | 5 +- ...ersalKafkaSourceIntegrationMixinSpec.scala | 4 +- .../KafkaAvroPayloadSourceFactorySpec.scala | 2 +- .../flink/TopicSelectionStrategySpec.scala | 8 +- .../flink/test/ClassDiscoveryBaseTest.scala | 7 +- .../test/RecordingExceptionConsumer.scala | 4 +- ...atestMiniClusterJobStatusCheckingOps.scala | 6 +- .../test/docker/WithFlinkContainers.scala | 2 +- .../process/functional/TestReporter.scala | 5 +- .../engine/process/helpers/SampleNodes.scala | 8 +- .../FlinkNamespacedKafkaTest.scala | 2 +- .../defaultmodel/FlinkWithKafkaSuite.scala | 16 +-- .../defaultmodel/KafkaAvroItSpec.scala | 1 + .../KafkaAvroSchemaJsonPayloadItSpec.scala | 3 +- .../BaseKafkaJsonSchemalessItSpec.scala | 2 +- ...inkMiniClusterScenarioTestRunnerSpec.scala | 6 +- .../kafka/KafkaScenarioTestingSpec.scala | 4 +- .../SchemedKafkaScenarioTestingSpec.scala | 4 +- .../lite/api/customComponentTypes.scala | 2 +- .../engine/lite/api/interpreterTypes.scala | 2 +- .../engine/lite/api/utils/sinks.scala | 7 +- .../api/utils/sources/BaseLiteSource.scala | 4 +- .../engine/lite/api/utils/transformers.scala | 2 +- .../lite/components/ForEachTransformer.scala | 2 +- .../LiteBaseComponentProvider.scala | 2 +- .../engine/lite/components/Union.scala | 2 +- .../engine/lite/components/UnionTest.scala | 2 +- .../AzureSchemaRegistryKafkaAvroTest.scala | 6 +- ...fkaUniversalAvroSchemaFunctionalTest.scala | 15 ++- ...LiteKafkaUniversalJsonFunctionalTest.scala | 11 +- .../UniversalCrossSourceLiteTest.scala | 5 +- .../UniversalSourceAvroSchemaLiteTest.scala | 5 +- .../UniversalSourceJsonSchemaLiteTest.scala | 3 +- .../lite/components/utils/AvroGen.scala | 5 +- .../components/utils/AvroSchemaCreator.scala | 2 +- .../lite/components/utils/AvroTestData.scala | 10 +- .../lite/components/utils/JsonTestData.scala | 2 +- .../utils/LiteralSpELWithAvroImplicits.scala | 2 +- .../LiteKafkaComponentProvider.scala | 2 +- .../LiteKafkaSourceImplFactory.scala | 6 +- .../LiteKafkaUniversalSinkImplFactory.scala | 2 +- .../LiteRequestResponseFunctionalTest.scala | 6 +- ...equestResponseTestWithParametersTest.scala | 2 +- .../JsonRequestResponseSinkFactory.scala | 6 +- .../JsonSchemaRequestResponseSource.scala | 8 +- ...onSchemaRequestResponseSourceFactory.scala | 4 +- .../LiteDeploymentManagerProvider.scala | 2 +- .../embedded/EmbeddedDeploymentManager.scala | 4 +- .../EmbeddedDeploymentManagerProvider.scala | 2 +- ...mbeddedProcessStateDefinitionManager.scala | 2 +- ...ddedRequestResponseScenarioValidator.scala | 4 +- .../RequestResponseDeploymentStrategy.scala | 8 +- .../ScenarioDispatcherRoute.scala | 2 +- .../StreamingDeploymentStrategy.scala | 2 +- ...reamingEmbeddedDeploymentManagerTest.scala | 2 +- ...esponseEmbeddedDeploymentManagerTest.scala | 6 +- ...reamingEmbeddedDeploymentManagerTest.scala | 4 +- .../kafka/BaseNuKafkaRuntimeDockerTest.scala | 3 +- .../kafka/NuKafkaRuntimeDockerAvroTest.scala | 2 +- .../NuKafkaRuntimeDockerProbesTest.scala | 4 +- .../sample/NuKafkaRuntimeTestSamples.scala | 2 +- .../NuReqRespRuntimeBinTest.scala | 4 +- .../NuReqRespRuntimeDockerTest.scala | 2 +- .../lite/utils/NuRuntimeDockerTestUtils.scala | 2 +- .../k8s/manager/K8sDeploymentManager.scala | 20 +-- .../manager/K8sDeploymentManagerConfig.scala | 10 +- .../K8sDeploymentManagerProvider.scala | 2 +- .../manager/K8sDeploymentStatusMapper.scala | 4 +- .../manager/K8sPodsResourceQuotaChecker.scala | 2 +- .../nussknacker/k8s/manager/K8sUtils.scala | 2 +- .../RequestResponseScenarioValidator.scala | 2 +- .../deployment/DeploymentPreparer.scala | 2 +- .../k8s/manager/ingress/IngressPreparer.scala | 2 +- .../k8s/manager/service/ServicePreparer.scala | 2 +- .../BaseK8sDeploymentManagerTest.scala | 8 +- .../K8sDeploymentManagerKafkaTest.scala | 12 +- .../K8sDeploymentManagerOnMocksTest.scala | 2 +- .../K8sDeploymentManagerReqRespTest.scala | 12 +- .../K8sDeploymentManagerUnitTest.scala | 2 +- .../K8sDeploymentStatusMapperSpec.scala | 4 +- .../k8s/manager/K8sExtraClasses.scala | 4 +- .../K8sPodsResourceQuotaCheckerTest.scala | 4 +- .../k8s/manager/K8sTestUtils.scala | 4 +- .../k8s/manager/KafkaK8sSupport.scala | 2 +- .../k8s/manager/TestComponentProvider.scala | 2 +- .../deployment/DeploymentPreparerTest.scala | 3 +- .../manager/ingress/IngressPreparerTest.scala | 2 +- .../kafka/KafkaSingleScenarioTaskRun.scala | 2 +- ...afkaTransactionalScenarioInterpreter.scala | 17 +-- .../engine/lite/kafka/LoopUntilClosed.scala | 6 +- .../KafkaErrorTopicInitializerTest.scala | 2 +- ...TransactionalScenarioInterpreterTest.scala | 7 +- .../api/RequestResponseSourceFactory.scala | 2 +- .../JsonRequestResponseSourceFactory.scala | 2 +- .../RequestResponseHttpHandler.scala | 2 +- .../RequestResponseInterpreter.scala | 4 +- ...tResponseRunnableScenarioInterpreter.scala | 2 +- .../requestresponse/ScenarioRoute.scala | 4 +- .../metrics/InvocationMetrics.scala | 2 +- .../RequestResponseInterpreterSpec.scala | 4 +- .../requestresponse/ScenarioRouteSpec.scala | 2 +- .../engine/lite/app/NuRuntimeApp.scala | 2 +- .../RunnableScenarioInterpreterFactory.scala | 4 +- .../lite/ScenarioInterpreterFactory.scala | 10 +- .../nussknacker/engine/lite/TestRunner.scala | 6 +- .../engine/lite/capabilities.scala | 4 +- .../dropwizard/JmxMetricsReporter.scala | 2 +- .../influxdb/InfluxDbHttpReporter.scala | 2 +- .../lite/InterpreterTestRunnerTest.scala | 2 +- .../nussknacker/engine/lite/MetricsTest.scala | 2 +- .../LiteEngineInfluxDbReporterTest.scala | 2 +- .../touk/nussknacker/engine/lite/sample.scala | 6 +- .../ProcessConfigCreatorMapping.scala | 2 +- .../engine/api/deployment/ProcessAction.scala | 2 +- .../api/deployment/ScenarioActivity.scala | 2 +- .../dict/embedded/EmbeddedDictRegistry.scala | 2 +- .../engine/api/graph/ScenarioGraph.scala | 8 +- .../api/process/ClassExtractionSettings.scala | 4 +- .../process/EmptyProcessConfigCreator.scala | 2 +- .../engine/api/process/ExpressionConfig.scala | 2 +- .../api/process/ProcessConfigCreator.scala | 2 +- .../engine/deployment/DeploymentId.scala | 2 +- .../deployment/ExternalDeploymentId.scala | 2 +- .../modelconfig/ModelConfigLoader.scala | 2 +- .../engine/testmode/TestProcess.scala | 2 +- project/FormatStagedScalaFilesPlugin.scala | 4 +- project/GenerateDesignerOpenApiPlugin.scala | 2 +- .../NuToolsGitPathsConfiguratorPlugin.scala | 2 +- .../engine/build/GraphBuilder.scala | 8 +- .../engine/build/ScenarioBuilder.scala | 2 +- .../canonicalgraph/ProcessNodesRewriter.scala | 2 +- .../engine/canonize/ProcessCanonizer.scala | 3 +- .../nussknacker/engine/graph/EdgeType.scala | 2 +- .../touk/nussknacker/engine/graph/node.scala | 4 +- .../engine/marshall/ProcessMarshaller.scala | 2 +- .../canonicalgraph/CanonicalProcessTest.scala | 2 +- .../marshall/ProcessMarshallerSpec.scala | 8 +- .../touk/nussknacker/engine/Interpreter.scala | 2 +- .../touk/nussknacker/engine/ModelData.scala | 2 +- .../engine/compile/CompilationResult.scala | 11 +- .../compile/ComponentExecutorFactory.scala | 2 +- .../engine/compile/ExpressionCompiler.scala | 4 +- .../engine/compile/FragmentResolver.scala | 4 +- .../NodeValidationExceptionHandler.scala | 2 +- .../engine/compile/PartSubGraphCompiler.scala | 6 +- .../engine/compile/ProcessCompiler.scala | 8 +- .../engine/compile/ProcessCompilerData.scala | 4 +- .../engine/compile/Validations.scala | 2 +- .../nodecompilation/BuiltInNodeCompiler.scala | 2 +- .../DynamicNodeValidator.scala | 4 +- .../EvaluableLazyParameter.scala | 2 +- .../EvaluableLazyParameterCreator.scala | 2 +- .../FragmentParameterValidator.scala | 12 +- .../nodecompilation/NodeCompiler.scala | 10 +- .../nodecompilation/NodeDataValidator.scala | 8 +- .../nodecompilation/RecordValidator.scala | 4 +- .../ValueEditorValidator.scala | 2 +- .../engine/compiledgraph/service.scala | 2 +- .../action/CommonModelDataInfoProvider.scala | 4 +- .../action/ModelDataActionInfoProvider.scala | 2 +- .../clazz/ClassDefinitionExtractor.scala | 14 +- .../definition/clazz/MethodDefinition.scala | 2 +- .../ComponentDefinitionExtractor.scala | 2 +- ...omponentDefinitionWithImplementation.scala | 2 +- ...cComponentStaticDefinitionDeterminer.scala | 2 +- ...BuiltInComponentsDefinitionsPreparer.scala | 4 +- .../DefaultComponentConfigDeterminer.scala | 2 +- .../defaultconfig/DefaultsComponentIcon.scala | 2 +- .../AbstractMethodDefinitionExtractor.scala | 2 +- .../CustomStreamTransformerExtractor.scala | 2 +- .../component/parameter/ParameterData.scala | 5 +- .../parameter/ParameterExtractor.scala | 2 +- ...bleValuesBasedDefaultValueDeterminer.scala | 2 +- .../ParameterDefaultValueDeterminer.scala | 2 +- .../TypeRelatedParameterValueDeterminer.scala | 4 +- .../ParameterTypeEditorDeterminer.scala | 3 +- .../AnnotationValidatorExtractor.scala | 3 +- .../MandatoryValidatorExtractor.scala | 3 +- ...lidationExpressionParameterValidator.scala | 2 +- .../validator/ValidatorExtractor.scala | 2 +- .../validator/ValidatorsExtractor.scala | 4 +- .../FragmentComponentDefinition.scala | 8 +- ...FragmentComponentDefinitionExtractor.scala | 4 +- .../fragment/FragmentGraphDefinition.scala | 2 +- ...ragmentParametersDefinitionExtractor.scala | 4 +- .../ExpressionConfigDefinition.scala | 2 +- ...DefinitionFromConfigCreatorExtractor.scala | 2 +- .../test/ModelDataTestInfoProvider.scala | 4 +- .../definition/test/TestInfoProvider.scala | 2 +- .../engine/dict/ProcessDictSubstitutor.scala | 2 +- .../engine/dict/SimpleDictRegistry.scala | 2 +- .../expression/ExpressionEvaluator.scala | 2 +- .../engine/expression/NullExpression.scala | 2 +- .../extension/CastOrConversionExt.scala | 4 +- .../engine/extension/Conversion.scala | 2 +- .../engine/extension/ExtensionMethods.scala | 2 +- .../DictKeyWithLabelExpressionParser.scala | 4 +- .../resultcollector/ResultCollector.scala | 2 +- .../engine/spel/SpelExpression.scala | 12 +- .../engine/spel/SpelExpressionSuggester.scala | 9 +- .../engine/spel/SpelExpressionValidator.scala | 2 +- .../touk/nussknacker/engine/spel/Typer.scala | 14 +- .../DefaultSpelConversionsProvider.scala | 2 +- .../internal/OptimizedEvaluationContext.scala | 6 +- .../spel/internal/propertyAccessors.scala | 2 +- .../spel/typer/MapLikePropertyTyper.scala | 4 +- .../spel/typer/MethodReferenceTyper.scala | 4 +- .../spel/typer/TypeReferenceTyper.scala | 2 +- .../testing/ModelDefinitionBuilder.scala | 4 +- .../testmode/ResultsCollectingListener.scala | 2 +- .../engine/testmode/TestDataPreparer.scala | 2 +- .../TestServiceInvocationCollector.scala | 2 +- .../variables/GlobalVariablesPreparer.scala | 2 +- .../engine/variables/MetaVariables.scala | 3 +- .../nussknacker/engine/InterpreterSpec.scala | 10 +- .../compile/CustomNodeValidationSpec.scala | 10 +- .../engine/compile/FragmentResolverSpec.scala | 10 +- .../GenericTransformationValidationSpec.scala | 12 +- .../engine/compile/IdValidatorTest.scala | 2 +- .../compile/NodeDataValidatorSpec.scala | 8 +- .../engine/compile/ProcessValidatorSpec.scala | 8 +- .../FragmentParameterValidatorTest.scala | 2 +- .../nodecompilation/LazyParameterSpec.scala | 2 +- .../engine/compile/validationHelpers.scala | 2 +- .../clazz/ClassDefinitionDiscoverySpec.scala | 6 +- .../ComponentFromProvidersExtractorTest.scala | 2 +- ...aluesBasedDefaultValueDeterminerTest.scala | 2 +- .../editor/EditorExtractorTest.scala | 6 +- ...tionExpressionParameterValidatorTest.scala | 2 +- .../validator/ValidatorsExtractorTest.scala | 11 +- .../test/ModelDataTestInfoProviderSpec.scala | 2 +- .../spel/MethodReferenceTyperSpec.scala | 2 +- .../SpelConversionServiceOverrideSpec.scala | 2 +- .../engine/spel/SpelExpressionGenSpec.scala | 2 +- .../engine/spel/SpelExpressionSpec.scala | 22 ++-- .../nussknacker/engine/spel/TyperSpec.scala | 4 +- .../SpelTemplatePartsService.scala | 4 +- .../GlobalVariablesPreparerTest.scala | 4 +- .../oauth2/GenericOidcServiceSpec.scala | 2 +- .../ui/security/CertificatesAndKeys.scala | 2 +- .../ui/security/api/AuthManager.scala | 4 +- .../api/AuthenticationConfiguration.scala | 13 +- .../ui/security/api/LoggedUser.scala | 5 +- .../BasicAuthenticationConfiguration.scala | 5 +- .../BasicAuthenticationResources.scala | 2 +- .../basicauth/BasicHttpAuthenticator.scala | 2 +- .../DummyAuthenticationConfiguration.scala | 3 +- .../dummy/DummyAuthenticationResources.scala | 2 +- .../oauth2/AuthenticationStrategy.scala | 1 + .../security/oauth2/BaseOAuth2Service.scala | 2 +- .../oauth2/CachingOAuth2Service.scala | 2 +- .../OAuth2AuthenticationResources.scala | 10 +- .../security/oauth2/OAuth2Authenticator.scala | 2 +- .../ui/security/oauth2/OAuth2ClientApi.scala | 2 +- .../security/oauth2/OAuth2Configuration.scala | 7 +- .../oauth2/OAuth2ServiceFactory.scala | 2 +- .../ui/security/oidc/GenericOidcService.scala | 2 +- .../OidcAuthenticationConfiguration.scala | 2 +- .../ui/security/oidc/OidcDiscovery.scala | 4 +- .../oidc/OidcProfileAuthentication.scala | 4 +- .../ui/security/oidc/OidcService.scala | 2 +- .../ssl/HttpsConnectionContextFactory.scala | 4 +- .../ui/security/ssl/SslConfigParser.scala | 4 +- .../api/AuthenticationConfigurationSpec.scala | 2 +- .../ui/security/api/LoggedUserTest.scala | 2 +- .../ui/security/api/RulesSetSpec.scala | 7 +- .../ui/security/api/SecurityApiSpec.scala | 6 +- .../security/http/RecordingSttpBackend.scala | 2 +- .../oauth2/CachingOAuth2ServiceSpec.scala | 2 +- .../oauth2/ExampleOAuth2ServiceFactory.scala | 2 +- .../ExampleOAuth2ServiceFactorySpec.scala | 2 +- .../oauth2/JwtOAuth2ServiceSpec.scala | 2 +- .../OAuth2AuthenticationResourcesSpec.scala | 2 +- .../security/oauth2/OAuth2ClientApiSpec.scala | 6 +- .../oauth2/OAuth2ServiceProviderSpec.scala | 4 +- .../oidc/OidcProfileAuthenticationTest.scala | 2 +- .../ui/security/oidc/OidcServiceSpec.scala | 2 +- .../engine/util/test/TestScenarioRunner.scala | 2 +- .../parameters/SchemaBasedParameter.scala | 2 +- .../parameters/TypingResultValidator.scala | 4 +- .../EagerServiceWithStaticParameters.scala | 8 +- .../EnricherContextTransformation.scala | 4 +- .../util/service/TimeMeasuringService.scala | 2 +- .../engine/util/sinkvalue/SinkValue.scala | 2 +- .../engine/util/functions/collection.scala | 2 +- .../engine/util/functions/conversion.scala | 2 +- .../engine/util/functions/numeric.scala | 2 +- .../engine/util/functions/BaseSpelSpec.scala | 2 +- .../util/functions/ConversionUtilsSpec.scala | 1 + .../functions/DateFormatUtilsSpelSpec.scala | 2 +- .../util/functions/NumericUtilsSpec.scala | 2 +- .../util/test/FlinkTestScenarioRunner.scala | 6 +- .../nussknacker/http/backend/SttpJson.scala | 2 +- .../JsonDefaultExpressionDeterminer.scala | 2 +- .../json/JsonSchemaBasedParameter.scala | 2 +- ...sedJsonSchemaTypeDefinitionExtractor.scala | 2 +- .../encode/JsonSchemaOutputValidator.scala | 6 +- .../JsonSchemaOutputValidatorPrinter.scala | 3 +- .../encode/ToJsonSchemaBasedEncoder.scala | 2 +- .../engine/json/swagger/SwaggerTyped.scala | 2 +- .../decode/FromJsonSchemaBasedDecoder.scala | 2 +- .../engine/util/json/JsonSchemaUtils.scala | 2 +- ...sonSchemaTypeDefinitionExtractorTest.scala | 2 +- .../JsonSchemaOutputValidatorTest.scala | 2 +- .../encode/ToJsonSchemaBasedEncoderTest.scala | 6 +- .../FromJsonSchemaBasedDecoderTest.scala | 2 +- ...erRecordDeserializationSchemaFactory.scala | 2 +- ...ConsumerRecordToJsonFormatterFactory.scala | 4 +- .../SerializableConsumerRecord.scala | 2 +- .../engine/kafka/sink/KafkaSinkFactory.scala | 4 +- .../source/KafkaContextInitializer.scala | 4 +- .../kafka/source/KafkaSourceFactory.scala | 6 +- .../delayed/DelayedKafkaSourceFactory.scala | 2 +- .../CachedTopicsExistenceValidator.scala | 2 +- .../kafka/source/InputMetaToJsonSpec.scala | 2 +- .../engine/kafka/ConsumerRecordHelper.scala | 2 +- .../EmbeddedKafkaServerWithDependencies.scala | 2 +- .../engine/kafka/KafkaClient.scala | 4 +- .../nussknacker/engine/kafka/KafkaSpec.scala | 2 +- .../engine/kafka/RichKafkaConsumer.scala | 4 +- .../engine/kafka/KafkaRecordUtils.scala | 3 +- .../nussknacker/engine/kafka/KafkaUtils.scala | 8 +- .../KafkaErrorTopicInitializer.scala | 2 +- ...JsonExceptionSerializationSchemaSpec.scala | 2 +- .../test/LiteKafkaTestScenarioRunner.scala | 16 +-- .../util/test/LiteTestScenarioRunner.scala | 2 +- .../test/SynchronousLiteInterpreter.scala | 2 +- .../AzureKafkaAvroElementSerde.scala | 2 +- .../test/LiteTestScenarioRunnerSpec.scala | 4 +- ...equestResponseTestScenarioRunnerSpec.scala | 2 +- .../engine/lite/util/test/TestService.scala | 2 +- .../AvroDefaultExpressionDeterminer.scala | 4 +- .../engine/schemedkafka/AvroUtils.scala | 2 +- .../KafkaUniversalComponentTransformer.scala | 10 +- .../encode/AvroSchemaOutputValidator.scala | 4 +- .../AvroSchemaOutputValidatorPrinter.scala | 3 +- ...oJsonSchemaBasedEncoderCustomisation.scala | 1 + .../encode/ToAvroSchemaBasedEncoder.scala | 10 +- .../schema/AvroSchemaBasedParameter.scala | 2 +- .../AzureSchemaRegistryClientFactory.scala | 4 +- .../azure/SchemaNameTopicMatchStrategy.scala | 4 +- .../internal/AzureHttpPipelineFactory.scala | 2 +- .../AzureTokenCredentialFactory.scala | 1 + .../azure/internal/EnhancedSchemasImpl.scala | 2 +- .../schemaid/SchemaIdFromAzureHeader.scala | 2 +- .../AzureAvroSerializerFactory.scala | 2 +- .../CachedConfluentSchemaRegistryClient.scala | 2 +- .../ConfluentSchemaRegistryClient.scala | 4 +- .../client/MockSchemaRegistryClient.scala | 2 +- ...sPotentiallyShiftingConfluentPayload.scala | 3 +- .../JsonPayloadToAvroConverter.scala | 6 +- .../AbstractSchemaBasedRecordFormatter.scala | 7 +- .../AvroToJsonFormatterFactory.scala | 4 +- .../UniversalKafkaDeserializer.scala | 2 +- .../UniversalSchemaBasedSerdeProvider.scala | 12 +- ...UniversalSchemaRegistryClientFactory.scala | 4 +- .../UniversalToJsonFormatterFactory.scala | 4 +- ...emaBasedDeserializationSchemaFactory.scala | 2 +- ...KeyValueDeserializationSchemaFactory.scala | 2 +- ...edKeyValueSerializationSchemaFactory.scala | 2 +- ...chemaBasedSerializationSchemaFactory.scala | 2 +- .../sink/UniversalKafkaSinkFactory.scala | 12 +- .../sink/UniversalKafkaSinkImplFactory.scala | 4 +- .../source/UniversalKafkaSourceFactory.scala | 12 +- .../AvroSchemaTypeDefinitionExtractor.scala | 4 +- .../KafkaWithSchemaRegistryOperations.scala | 2 +- .../helpers/SimpleKafkaAvroDeserializer.scala | 2 +- .../AzureTestsFromFileIntegrationTest.scala | 4 +- .../sink/flink/AvroSinkValueTest.scala | 2 +- .../test/BasePatientScalaFutures.scala | 2 +- .../test/NuScalaTestAssertions.scala | 2 +- .../touk/nussknacker/test/ProcessUtils.scala | 2 +- .../nussknacker/test/TestHttpClient.scala | 5 +- .../nussknacker/test/UniquePortProvider.scala | 4 +- .../nussknacker/test/WithSttpTestUtils.scala | 2 +- ...evelConfigurableScalaLoggingConsumer.scala | 2 +- ...asedNuInstallationExampleEnvironment.scala | 2 +- .../engine/util/LoggingListener.scala | 2 +- .../util/exception/ExceptionRateMeter.scala | 2 +- .../util/loader/ScalaServiceLoader.scala | 2 +- .../metrics/common/EndCountingListener.scala | 4 +- .../metrics/common/NodeCountingListener.scala | 4 +- .../metrics/common/OneSourceMetrics.scala | 2 +- .../util/loader/ScalaServiceLoaderSpec.scala | 2 +- .../engine/util/TimestampUtils.scala | 3 +- .../nussknacker/engine/util/cache/Cache.scala | 2 +- .../util/config/CustomFicusInstances.scala | 2 +- .../engine/util/json/ToJsonEncoder.scala | 6 +- .../config/CustomFicusInstancesSpec.scala | 5 +- 904 files changed, 1904 insertions(+), 1808 deletions(-) diff --git a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/aggregate/AggregatorBenchamark.scala b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/aggregate/AggregatorBenchamark.scala index 83c649d51d5..0ee2b827d9b 100644 --- a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/aggregate/AggregatorBenchamark.scala +++ b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/aggregate/AggregatorBenchamark.scala @@ -1,12 +1,12 @@ package pl.touk.nussknacker.engine.benchmarks.aggregate -import java.util.concurrent.TimeUnit - import org.openjdk.jmh.annotations.{Benchmark, BenchmarkMode, Mode, OutputTimeUnit, Scope, State} import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult} import pl.touk.nussknacker.engine.flink.util.transformer.aggregate.Aggregator import pl.touk.nussknacker.engine.flink.util.transformer.aggregate.aggregates.{MathAggregator, SumAggregator} +import java.util.concurrent.TimeUnit + class AggregatorSetup(aggregator: Aggregator, outputType: TypingResult) { private val acc = aggregator.createAccumulator().asInstanceOf[aggregator.Aggregate] diff --git a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/e2e/BaseE2EBenchmark.scala b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/e2e/BaseE2EBenchmark.scala index 1b5f9c1003f..8a36ca8975e 100644 --- a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/e2e/BaseE2EBenchmark.scala +++ b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/e2e/BaseE2EBenchmark.scala @@ -2,11 +2,11 @@ package pl.touk.nussknacker.engine.benchmarks.e2e import com.typesafe.scalalogging.LazyLogging import pl.touk.nussknacker.engine.version.BuildInfo +import pl.touk.nussknacker.test.MiscUtils._ import pl.touk.nussknacker.test.installationexample.{ DockerBasedInstallationExampleClient, DockerBasedInstallationExampleNuEnvironment } -import pl.touk.nussknacker.test.MiscUtils._ // Before running benchmarks in this module, a fresh docker image should be built from sources and placed in the local // registry. If you run tests based on this trait in Intellij Idea and the images is not built, you can do it manually: diff --git a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/interpreter/InterpreterSetup.scala b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/interpreter/InterpreterSetup.scala index 174ad283a2d..4379f4729cb 100644 --- a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/interpreter/InterpreterSetup.scala +++ b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/interpreter/InterpreterSetup.scala @@ -3,6 +3,7 @@ package pl.touk.nussknacker.engine.benchmarks.interpreter import cats.Monad import cats.data.Validated.{Invalid, Valid} import cats.data.ValidatedNel +import pl.touk.nussknacker.engine.{api, CustomProcessValidatorLoader, InterpretationResult} import pl.touk.nussknacker.engine.Interpreter.InterpreterShape import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.component.{ComponentDefinition, DesignerWideComponentId, UnboundedStreamComponent} @@ -12,15 +13,14 @@ import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.compile.ProcessCompilerData import pl.touk.nussknacker.engine.compiledgraph.part.ProcessPart -import pl.touk.nussknacker.engine.definition.component.Components.ComponentDefinitionExtractionMode import pl.touk.nussknacker.engine.definition.component.{ComponentDefinitionWithImplementation, Components} +import pl.touk.nussknacker.engine.definition.component.Components.ComponentDefinitionExtractionMode import pl.touk.nussknacker.engine.definition.model.{ModelDefinition, ModelDefinitionWithClasses} import pl.touk.nussknacker.engine.dict.SimpleDictRegistry import pl.touk.nussknacker.engine.modelconfig.ComponentsUiConfig import pl.touk.nussknacker.engine.resultcollector.ProductionServiceInvocationCollector import pl.touk.nussknacker.engine.testing.ModelDefinitionBuilder import pl.touk.nussknacker.engine.util.Implicits._ -import pl.touk.nussknacker.engine.{CustomProcessValidatorLoader, InterpretationResult, api} import scala.language.higherKinds import scala.reflect.ClassTag diff --git a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/interpreter/ManyParamsInterpreterBenchmark.scala b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/interpreter/ManyParamsInterpreterBenchmark.scala index 23b8cc2b01a..f9e930e85bd 100644 --- a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/interpreter/ManyParamsInterpreterBenchmark.scala +++ b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/interpreter/ManyParamsInterpreterBenchmark.scala @@ -2,9 +2,9 @@ package pl.touk.nussknacker.engine.benchmarks.interpreter import cats.effect.IO import org.openjdk.jmh.annotations._ +import pl.touk.nussknacker.engine.api.{Context, MethodToInvoke, ParamName, Service} import pl.touk.nussknacker.engine.api.component.ComponentDefinition import pl.touk.nussknacker.engine.api.process.ServiceExecutionContext -import pl.touk.nussknacker.engine.api.{Context, MethodToInvoke, ParamName, Service} import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.graph.expression.Expression diff --git a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/interpreter/OneParamInterpreterBenchmark.scala b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/interpreter/OneParamInterpreterBenchmark.scala index 442ba12d8f2..0e47bea7fdb 100644 --- a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/interpreter/OneParamInterpreterBenchmark.scala +++ b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/interpreter/OneParamInterpreterBenchmark.scala @@ -12,8 +12,8 @@ import pl.touk.nussknacker.engine.spel.SpelExtension._ import pl.touk.nussknacker.engine.util.SynchronousExecutionContextAndIORuntime import java.util.concurrent.TimeUnit -import scala.concurrent.duration._ import scala.concurrent.{Await, ExecutionContext, Future} +import scala.concurrent.duration._ /* We don't provide exact results, as they vary significantly between machines diff --git a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/serialization/SerializationBenchmarkSetup.scala b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/serialization/SerializationBenchmarkSetup.scala index 93d22fe6b03..7083d188438 100644 --- a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/serialization/SerializationBenchmarkSetup.scala +++ b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/serialization/SerializationBenchmarkSetup.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.engine.benchmarks.serialization import com.github.ghik.silencer.silent - -import java.io.{ByteArrayInputStream, ByteArrayOutputStream} import com.typesafe.scalalogging.LazyLogging import org.apache.flink.api.common.ExecutionConfig import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.core.memory.{DataInputViewStreamWrapper, DataOutputViewStreamWrapper} +import java.io.{ByteArrayInputStream, ByteArrayOutputStream} + class SerializationBenchmarkSetup[T]( typeInfo: TypeInformation[T], val record: T, diff --git a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/spel/ScalaAccessorBenchmark.scala b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/spel/ScalaAccessorBenchmark.scala index 677062167e1..5821a11e0ad 100644 --- a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/spel/ScalaAccessorBenchmark.scala +++ b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/spel/ScalaAccessorBenchmark.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.engine.benchmarks.spel -import java.util.concurrent.TimeUnit - import org.openjdk.jmh.annotations._ +import java.util.concurrent.TimeUnit + @State(Scope.Thread) class ScalaAccessorBenchmark { diff --git a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/spel/SpelBenchmarkSetup.scala b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/spel/SpelBenchmarkSetup.scala index f5f3db8b79b..97b29e3a31a 100644 --- a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/spel/SpelBenchmarkSetup.scala +++ b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/spel/SpelBenchmarkSetup.scala @@ -2,9 +2,9 @@ package pl.touk.nussknacker.engine.benchmarks.spel import cats.data.Validated.{Invalid, Valid} import org.openjdk.jmh.annotations._ +import pl.touk.nussknacker.engine.api.{Context, NodeId} import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.typed.typing.{Typed, Unknown} -import pl.touk.nussknacker.engine.api.{Context, NodeId} import pl.touk.nussknacker.engine.compile.ExpressionCompiler import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionTestUtils import pl.touk.nussknacker.engine.dict.SimpleDictRegistry diff --git a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/spel/SpelSecurityBenchmarkSetup.scala b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/spel/SpelSecurityBenchmarkSetup.scala index 44f88b0d2fd..985ba796899 100644 --- a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/spel/SpelSecurityBenchmarkSetup.scala +++ b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/spel/SpelSecurityBenchmarkSetup.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.engine.benchmarks.spel import cats.data.Validated.{Invalid, Valid} +import pl.touk.nussknacker.engine.api.{Context, NodeId} import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.typed.typing.{Typed, Unknown} -import pl.touk.nussknacker.engine.api.{Context, NodeId} import pl.touk.nussknacker.engine.compile.ExpressionCompiler import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionTestUtils import pl.touk.nussknacker.engine.dict.SimpleDictRegistry diff --git a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/suggester/ExpressionSuggesterBenchmarkSetup.scala b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/suggester/ExpressionSuggesterBenchmarkSetup.scala index 26622527c20..eb0325c7adb 100644 --- a/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/suggester/ExpressionSuggesterBenchmarkSetup.scala +++ b/benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/suggester/ExpressionSuggesterBenchmarkSetup.scala @@ -12,8 +12,8 @@ import pl.touk.nussknacker.engine.util.CaretPosition2d import pl.touk.nussknacker.ui.suggester.ExpressionSuggester import java.time.{Duration, LocalDateTime} -import scala.concurrent.duration.{Duration => ScalaDuration} import scala.concurrent.{Await, ExecutionContext} +import scala.concurrent.duration.{Duration => ScalaDuration} /* This is helper class for testing SpEL expressions, see SampleSpelBenchmark for usage */ class ExpressionSuggesterBenchmarkSetup() { diff --git a/common-api/src/main/scala/pl/touk/nussknacker/engine/api/CirceUtil.scala b/common-api/src/main/scala/pl/touk/nussknacker/engine/api/CirceUtil.scala index a9d42a8ce84..e0075287f66 100644 --- a/common-api/src/main/scala/pl/touk/nussknacker/engine/api/CirceUtil.scala +++ b/common-api/src/main/scala/pl/touk/nussknacker/engine/api/CirceUtil.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.api import com.github.ghik.silencer.silent import io.circe -import io.circe.generic.extras.Configuration import io.circe._ +import io.circe.generic.extras.Configuration import java.net.{URI, URL} import java.nio.charset.StandardCharsets diff --git a/common-api/src/main/scala/pl/touk/nussknacker/engine/api/MetaData.scala b/common-api/src/main/scala/pl/touk/nussknacker/engine/api/MetaData.scala index cd575bca625..163dbc46fca 100644 --- a/common-api/src/main/scala/pl/touk/nussknacker/engine/api/MetaData.scala +++ b/common-api/src/main/scala/pl/touk/nussknacker/engine/api/MetaData.scala @@ -1,11 +1,11 @@ package pl.touk.nussknacker.engine.api +import io.circe.{Decoder, Encoder, HCursor} import io.circe.generic.JsonCodec import io.circe.generic.extras.ConfiguredJsonCodec import io.circe.generic.extras.semiauto.{deriveConfiguredDecoder, deriveConfiguredEncoder} -import io.circe.{Decoder, Encoder, HCursor} -import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.engine.api.CirceUtil._ +import pl.touk.nussknacker.engine.api.process.ProcessName @JsonCodec case class LayoutData(x: Long, y: Long) diff --git a/common-api/src/main/scala/pl/touk/nussknacker/engine/api/TypeSpecificData.scala b/common-api/src/main/scala/pl/touk/nussknacker/engine/api/TypeSpecificData.scala index 562951755a3..801788b983d 100644 --- a/common-api/src/main/scala/pl/touk/nussknacker/engine/api/TypeSpecificData.scala +++ b/common-api/src/main/scala/pl/touk/nussknacker/engine/api/TypeSpecificData.scala @@ -1,16 +1,15 @@ package pl.touk.nussknacker.engine.api +import io.circe.generic.extras.ConfiguredJsonCodec +import pl.touk.nussknacker.engine.api.CirceUtil._ import pl.touk.nussknacker.engine.api.TypeSpecificDataConversionUtils.{ convertPropertyOrNone, mapEmptyStringToNone, toStringWithEmptyDefault } -import io.circe.generic.extras.ConfiguredJsonCodec import java.util.concurrent.TimeUnit import scala.concurrent.duration.Duration -import pl.touk.nussknacker.engine.api.CirceUtil._ - import scala.util.Try @ConfiguredJsonCodec sealed trait TypeSpecificData { diff --git a/common-api/src/main/scala/pl/touk/nussknacker/engine/api/modelinfo/ModelInfo.scala b/common-api/src/main/scala/pl/touk/nussknacker/engine/api/modelinfo/ModelInfo.scala index 74869adf5ae..4364c700a35 100644 --- a/common-api/src/main/scala/pl/touk/nussknacker/engine/api/modelinfo/ModelInfo.scala +++ b/common-api/src/main/scala/pl/touk/nussknacker/engine/api/modelinfo/ModelInfo.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.engine.api.modelinfo import io.circe +import io.circe.{Decoder, Encoder, Printer} import io.circe.parser._ import io.circe.syntax.EncoderOps -import io.circe.{Decoder, Encoder, Printer} case class ModelInfo private (parameters: Map[String, String]) { diff --git a/common-api/src/main/scala/pl/touk/nussknacker/engine/api/parameter/ParameterName.scala b/common-api/src/main/scala/pl/touk/nussknacker/engine/api/parameter/ParameterName.scala index 532d9453763..53d34ced0e1 100644 --- a/common-api/src/main/scala/pl/touk/nussknacker/engine/api/parameter/ParameterName.scala +++ b/common-api/src/main/scala/pl/touk/nussknacker/engine/api/parameter/ParameterName.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.api.parameter -import io.circe.generic.extras.semiauto.{deriveUnwrappedDecoder, deriveUnwrappedEncoder} import io.circe.{Decoder, Encoder, KeyDecoder, KeyEncoder} +import io.circe.generic.extras.semiauto.{deriveUnwrappedDecoder, deriveUnwrappedEncoder} final case class ParameterName(value: String) { def withBranchId(branchId: String): ParameterName = ParameterName(s"$value for branch $branchId") diff --git a/common-api/src/main/scala/pl/touk/nussknacker/engine/graph/expression/TabularTypedData.scala b/common-api/src/main/scala/pl/touk/nussknacker/engine/graph/expression/TabularTypedData.scala index 51ee531b76d..86fc8a30bda 100644 --- a/common-api/src/main/scala/pl/touk/nussknacker/engine/graph/expression/TabularTypedData.scala +++ b/common-api/src/main/scala/pl/touk/nussknacker/engine/graph/expression/TabularTypedData.scala @@ -1,17 +1,17 @@ package pl.touk.nussknacker.engine.graph.expression import cats.data.NonEmptyList -import io.circe.Decoder.Result import io.circe._ +import io.circe.Decoder.Result +import pl.touk.nussknacker.engine.graph.expression.TabularTypedData.{Column, Row} import pl.touk.nussknacker.engine.graph.expression.TabularTypedData.Cell.RawValue -import pl.touk.nussknacker.engine.graph.expression.TabularTypedData.CreationError.InvalidCellValues.CellCoordinates import pl.touk.nussknacker.engine.graph.expression.TabularTypedData.CreationError.{ CellsCountInRowDifferentThanColumnsCount, ColumnNameUniquenessViolation, InvalidCellValues } +import pl.touk.nussknacker.engine.graph.expression.TabularTypedData.CreationError.InvalidCellValues.CellCoordinates import pl.touk.nussknacker.engine.graph.expression.TabularTypedData.Error.{JsonParsingError, ValidationError} -import pl.touk.nussknacker.engine.graph.expression.TabularTypedData.{Column, Row} import scala.util.Try diff --git a/common-api/src/test/scala/pl/touk/nussknacker/engine/api/TypeSpecificDataTestData.scala b/common-api/src/test/scala/pl/touk/nussknacker/engine/api/TypeSpecificDataTestData.scala index 58dc122e79c..c289615609d 100644 --- a/common-api/src/test/scala/pl/touk/nussknacker/engine/api/TypeSpecificDataTestData.scala +++ b/common-api/src/test/scala/pl/touk/nussknacker/engine/api/TypeSpecificDataTestData.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.api -import org.scalatest.prop.TableFor3 import org.scalatest.prop.TableDrivenPropertyChecks.Table +import org.scalatest.prop.TableFor3 object TypeSpecificDataTestData { diff --git a/common-api/src/test/scala/pl/touk/nussknacker/engine/graph/expression/TabularTypedDataSpec.scala b/common-api/src/test/scala/pl/touk/nussknacker/engine/graph/expression/TabularTypedDataSpec.scala index ae512177e33..f70bcc190c9 100644 --- a/common-api/src/test/scala/pl/touk/nussknacker/engine/graph/expression/TabularTypedDataSpec.scala +++ b/common-api/src/test/scala/pl/touk/nussknacker/engine/graph/expression/TabularTypedDataSpec.scala @@ -5,12 +5,12 @@ import org.scalatest.freespec.AnyFreeSpec import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.graph.expression.TabularTypedData.Cell.RawValue import pl.touk.nussknacker.engine.graph.expression.TabularTypedData.Column -import pl.touk.nussknacker.engine.graph.expression.TabularTypedData.CreationError.InvalidCellValues.CellCoordinates import pl.touk.nussknacker.engine.graph.expression.TabularTypedData.CreationError.{ CellsCountInRowDifferentThanColumnsCount, ColumnNameUniquenessViolation, InvalidCellValues } +import pl.touk.nussknacker.engine.graph.expression.TabularTypedData.CreationError.InvalidCellValues.CellCoordinates class TabularTypedDataSpec extends AnyFreeSpec with Matchers { diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/component/ComponentGroupName.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/component/ComponentGroupName.scala index 2866337eac8..28dbad973a2 100644 --- a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/component/ComponentGroupName.scala +++ b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/component/ComponentGroupName.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.api.component -import io.circe.generic.extras.semiauto.{deriveUnwrappedDecoder, deriveUnwrappedEncoder} import io.circe.{Decoder, Encoder} +import io.circe.generic.extras.semiauto.{deriveUnwrappedDecoder, deriveUnwrappedEncoder} final case class ComponentGroupName(value: String) { def toLowerCase: String = value.toLowerCase diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/component/DesignerWideComponentId.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/component/DesignerWideComponentId.scala index 99b0ddcbec4..31d187a52e6 100644 --- a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/component/DesignerWideComponentId.scala +++ b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/component/DesignerWideComponentId.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.api.component -import io.circe.generic.extras.semiauto.{deriveUnwrappedDecoder, deriveUnwrappedEncoder} import io.circe.{Decoder, Encoder, KeyDecoder, KeyEncoder} +import io.circe.generic.extras.semiauto.{deriveUnwrappedDecoder, deriveUnwrappedEncoder} // TODO This class is used as a work around for the problem that the components are duplicated across processing types. // We plan to get rid of this. After that, we could replace usages of this class by usage of ComponentId diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/context/ContextTransformation.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/context/ContextTransformation.scala index 2be800198ab..ad2b8de2e92 100644 --- a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/context/ContextTransformation.scala +++ b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/context/ContextTransformation.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.api.context -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, ValidatedNel} +import cats.data.Validated.{Invalid, Valid} import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/context/ProcessCompilationError.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/context/ProcessCompilationError.scala index 9beaa392c3a..b2568250e09 100644 --- a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/context/ProcessCompilationError.scala +++ b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/context/ProcessCompilationError.scala @@ -5,8 +5,8 @@ import cats.data.ValidatedNel import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.InASingleNode import pl.touk.nussknacker.engine.api.definition.ParameterEditor -import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.generics.ExpressionParseError.ErrorDetails +import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.engine.api.typed.typing.TypingResult import pl.touk.nussknacker.engine.graph.expression.Expression.Language diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/context/ValidationContext.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/context/ValidationContext.scala index f5a8096a29d..6255462317d 100644 --- a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/context/ValidationContext.scala +++ b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/context/ValidationContext.scala @@ -1,14 +1,14 @@ package pl.touk.nussknacker.engine.api.context -import cats.data.Validated.{Invalid, Valid} import cats.data._ +import cats.data.Validated.{Invalid, Valid} import cats.implicits._ -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.OverwrittenVariable -import pl.touk.nussknacker.engine.api.context.ValidationContext.empty -import pl.touk.nussknacker.engine.api.typed.typing.TypingResult import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.VariableConstants.KeyVariableName +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.OverwrittenVariable +import pl.touk.nussknacker.engine.api.context.ValidationContext.empty import pl.touk.nussknacker.engine.api.parameter.ParameterName +import pl.touk.nussknacker.engine.api.typed.typing.TypingResult import pl.touk.nussknacker.engine.api.validation.Validations.validateVariableName object ValidationContext { diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/context/transformation/DynamicComponent.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/context/transformation/DynamicComponent.scala index 6d3eea2088d..4d74ab8cade 100644 --- a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/context/transformation/DynamicComponent.scala +++ b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/context/transformation/DynamicComponent.scala @@ -4,8 +4,8 @@ import cats.data.ValidatedNel import com.typesafe.scalalogging.LazyLogging import pl.touk.nussknacker.engine.api.{NodeId, Params} import pl.touk.nussknacker.engine.api.component.Component -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.{CannotCreateObjectError, WrongParameters} import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext} +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.{CannotCreateObjectError, WrongParameters} import pl.touk.nussknacker.engine.api.definition.{NodeDependency, Parameter} import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.typed.typing.{TypingResult, Unknown} diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/definition/ParameterDeclaration.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/definition/ParameterDeclaration.scala index 808cdea1367..cbeea26bdef 100644 --- a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/definition/ParameterDeclaration.scala +++ b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/definition/ParameterDeclaration.scala @@ -1,11 +1,11 @@ package pl.touk.nussknacker.engine.api.definition +import pl.touk.nussknacker.engine.api.{LazyParameter, Params} import pl.touk.nussknacker.engine.api.definition.ParameterDeclarationBuilder.ParamType import pl.touk.nussknacker.engine.api.definition.ParameterDeclarationBuilder.ParamType._ import pl.touk.nussknacker.engine.api.definition.ParameterExtractor._ import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.util.NotNothing -import pl.touk.nussknacker.engine.api.{LazyParameter, Params} import scala.reflect.runtime.universe._ diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/definition/ParameterEditor.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/definition/ParameterEditor.scala index e64c64ba133..43d935fddcf 100644 --- a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/definition/ParameterEditor.scala +++ b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/definition/ParameterEditor.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.api.definition +import io.circe.{Decoder, Encoder, Json} import io.circe.generic.JsonCodec import io.circe.generic.extras.ConfiguredJsonCodec -import io.circe.{Decoder, Encoder, Json} import pl.touk.nussknacker.engine.api.CirceUtil._ import pl.touk.nussknacker.engine.api.editor.DualEditorMode diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/generics/ExpressionParseError.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/generics/ExpressionParseError.scala index 3abfb48e70f..96118ff67e0 100644 --- a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/generics/ExpressionParseError.scala +++ b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/generics/ExpressionParseError.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.api.generics +import io.circe.{Codec, Decoder, Encoder} import io.circe.generic.JsonCodec import io.circe.generic.extras.{Configuration, ConfiguredJsonCodec} -import io.circe.{Codec, Decoder, Encoder} import pl.touk.nussknacker.engine.api.generics.ExpressionParseError.ErrorDetails import pl.touk.nussknacker.engine.api.typed.typing.TypingResult diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/process/ContextInitializer.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/process/ContextInitializer.scala index c0d17859514..fa5c61c14db 100644 --- a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/process/ContextInitializer.scala +++ b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/process/ContextInitializer.scala @@ -1,11 +1,11 @@ package pl.touk.nussknacker.engine.api.process import cats.data.ValidatedNel +import pl.touk.nussknacker.engine.api.{Context, VariableConstants} +import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext} import pl.touk.nussknacker.engine.api.runtimecontext.ContextIdGenerator import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.api.{Context, VariableConstants} -import pl.touk.nussknacker.engine.api.NodeId /** * ContextInitializer provides implementation of transformation from raw event generated by source to Context. diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/process/Source.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/process/Source.scala index dbfb9904573..8b864fa8a29 100644 --- a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/process/Source.scala +++ b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/process/Source.scala @@ -1,14 +1,14 @@ package pl.touk.nussknacker.engine.api.process -import pl.touk.nussknacker.engine.api.component.Component._ +import pl.touk.nussknacker.engine.api.{MethodToInvoke, NodeId, VariableConstants} import pl.touk.nussknacker.engine.api.component.{Component, ProcessingMode} +import pl.touk.nussknacker.engine.api.component.Component._ import pl.touk.nussknacker.engine.api.context.ContextTransformation import pl.touk.nussknacker.engine.api.definition.{Parameter, WithExplicitTypesToExtract} import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.test.{TestData, TestRecordParser} import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult} -import pl.touk.nussknacker.engine.api.{MethodToInvoke, NodeId, VariableConstants} import shapeless.=:!= import scala.reflect.runtime.universe._ diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/AssignabilityDeterminer.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/AssignabilityDeterminer.scala index 0c016839665..2697a4b0a70 100644 --- a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/AssignabilityDeterminer.scala +++ b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/AssignabilityDeterminer.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.api.typed -import cats.data.Validated._ import cats.data.{NonEmptyList, Validated, ValidatedNel} +import cats.data.Validated._ import cats.implicits.{catsSyntaxValidatedId, _} import org.apache.commons.lang3.ClassUtils import pl.touk.nussknacker.engine.api.typed.typing._ diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/TypeConversionHandler.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/TypeConversionHandler.scala index e5629241152..0905264e2b4 100644 --- a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/TypeConversionHandler.scala +++ b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/TypeConversionHandler.scala @@ -11,7 +11,7 @@ import java.nio.charset.Charset import java.time._ import java.time.chrono.{ChronoLocalDate, ChronoLocalDateTime} import java.util.{Currency, UUID} -import scala.reflect.{ClassTag, classTag} +import scala.reflect.{classTag, ClassTag} import scala.util.Try /** diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/TypeEncoders.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/TypeEncoders.scala index bb4f5e62eb1..42b8b3bbc5d 100644 --- a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/TypeEncoders.scala +++ b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/TypeEncoders.scala @@ -1,10 +1,10 @@ package pl.touk.nussknacker.engine.api.typed import cats.data.NonEmptyList -import io.circe.Json._ import io.circe._ +import io.circe.Json._ import pl.touk.nussknacker.engine.api.typed.TypeEncoders.typeField -import pl.touk.nussknacker.engine.api.typed.TypingType.{TypingType, decoder} +import pl.touk.nussknacker.engine.api.typed.TypingType.{decoder, TypingType} import pl.touk.nussknacker.engine.api.typed.typing._ import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/supertype/CommonSupertypeFinder.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/supertype/CommonSupertypeFinder.scala index f86120ecce6..1093f269fd8 100644 --- a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/supertype/CommonSupertypeFinder.scala +++ b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/supertype/CommonSupertypeFinder.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.engine.api.typed.supertype import cats.data.NonEmptyList import cats.implicits.toTraverseOps import pl.touk.nussknacker.engine.api.typed.supertype.CommonSupertypeFinder.{ - SupertypeClassResolutionStrategy, - looseFinder + looseFinder, + SupertypeClassResolutionStrategy } import pl.touk.nussknacker.engine.api.typed.typing._ import pl.touk.nussknacker.engine.util.Implicits.RichIterable diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/supertype/NumberTypesPromotionStrategy.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/supertype/NumberTypesPromotionStrategy.scala index 88ae7bcad62..e442d48194e 100644 --- a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/supertype/NumberTypesPromotionStrategy.scala +++ b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/supertype/NumberTypesPromotionStrategy.scala @@ -1,12 +1,11 @@ package pl.touk.nussknacker.engine.api.typed.supertype import cats.data.NonEmptyList - -import java.lang import org.apache.commons.lang3.ClassUtils import pl.touk.nussknacker.engine.api.typed.supertype.NumberTypesPromotionStrategy.AllNumbers import pl.touk.nussknacker.engine.api.typed.typing._ +import java.lang import scala.util.Try /** diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/javaapi/context/transformation/JavaDynamicComponent.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/javaapi/context/transformation/JavaDynamicComponent.scala index d983c0ef7ba..9f2095efbd9 100644 --- a/components-api/src/main/scala/pl/touk/nussknacker/engine/javaapi/context/transformation/JavaDynamicComponent.scala +++ b/components-api/src/main/scala/pl/touk/nussknacker/engine/javaapi/context/transformation/JavaDynamicComponent.scala @@ -1,14 +1,14 @@ package pl.touk.nussknacker.engine.javaapi.context.transformation -import java.util.Optional import pl.touk.nussknacker.engine.api.{CustomStreamTransformer, NodeId, Params} -import pl.touk.nussknacker.engine.api.context.transformation._ +import pl.touk.nussknacker.engine.api.component.UnboundedStreamComponent import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext} +import pl.touk.nussknacker.engine.api.context.transformation._ import pl.touk.nussknacker.engine.api.definition.{NodeDependency, Parameter} -import pl.touk.nussknacker.engine.api.process.{Source, SourceFactory} -import pl.touk.nussknacker.engine.api.component.UnboundedStreamComponent import pl.touk.nussknacker.engine.api.parameter.ParameterName +import pl.touk.nussknacker.engine.api.process.{Source, SourceFactory} +import java.util.Optional import scala.jdk.CollectionConverters._ trait JavaDynamicComponent[T, VC, PAR, ST] { diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/util/config/FicusReaders.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/util/config/FicusReaders.scala index cdac7f31468..0aaa3fb7a5d 100644 --- a/components-api/src/main/scala/pl/touk/nussknacker/engine/util/config/FicusReaders.scala +++ b/components-api/src/main/scala/pl/touk/nussknacker/engine/util/config/FicusReaders.scala @@ -4,8 +4,8 @@ import com.typesafe.config.ConfigRenderOptions import io.circe.Decoder import net.ceedubs.ficus.readers.ValueReader import pl.touk.nussknacker.engine.api.CirceUtil -import pl.touk.nussknacker.engine.api.definition.{ParameterEditor, ParameterValidator} import pl.touk.nussknacker.engine.api.component.ScenarioPropertyConfig +import pl.touk.nussknacker.engine.api.definition.{ParameterEditor, ParameterValidator} import scala.reflect.ClassTag diff --git a/components-api/src/test/scala/pl/touk/nussknacker/engine/api/component/NussknackerVersionTest.scala b/components-api/src/test/scala/pl/touk/nussknacker/engine/api/component/NussknackerVersionTest.scala index dcad01b97b2..09863915f70 100644 --- a/components-api/src/test/scala/pl/touk/nussknacker/engine/api/component/NussknackerVersionTest.scala +++ b/components-api/src/test/scala/pl/touk/nussknacker/engine/api/component/NussknackerVersionTest.scala @@ -2,6 +2,7 @@ package pl.touk.nussknacker.engine.api.component import org.scalatest.funsuite.AnyFunSuiteLike import org.scalatest.matchers.should.Matchers + import scala.jdk.CollectionConverters._ class NussknackerVersionTest extends AnyFunSuiteLike with Matchers { diff --git a/components-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/TypedFromInstanceTest.scala b/components-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/TypedFromInstanceTest.scala index b1d98cd537d..3ab1c1d4ac8 100644 --- a/components-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/TypedFromInstanceTest.scala +++ b/components-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/TypedFromInstanceTest.scala @@ -4,8 +4,8 @@ import org.scalatest.LoneElement import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks -import pl.touk.nussknacker.engine.api.typed.typing.Typed.typedListWithElementValues import pl.touk.nussknacker.engine.api.typed.typing.{Unknown, _} +import pl.touk.nussknacker.engine.api.typed.typing.Typed.typedListWithElementValues class TypedFromInstanceTest extends AnyFunSuite with Matchers with LoneElement with TableDrivenPropertyChecks { diff --git a/components-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/TypingResultDecoderSpec.scala b/components-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/TypingResultDecoderSpec.scala index b9cd3c45767..4ba0add80b2 100644 --- a/components-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/TypingResultDecoderSpec.scala +++ b/components-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/TypingResultDecoderSpec.scala @@ -4,8 +4,8 @@ import com.typesafe.scalalogging.LazyLogging import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks -import pl.touk.nussknacker.engine.api.typed.typing.Typed.typedListWithElementValues import pl.touk.nussknacker.engine.api.typed.typing._ +import pl.touk.nussknacker.engine.api.typed.typing.Typed.typedListWithElementValues import pl.touk.nussknacker.test.EitherValuesDetailedMessage import java.time.LocalDateTime diff --git a/components-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/TypingResultErrorMessagesSpec.scala b/components-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/TypingResultErrorMessagesSpec.scala index 22d0836fd1b..a80714a5d9b 100644 --- a/components-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/TypingResultErrorMessagesSpec.scala +++ b/components-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/TypingResultErrorMessagesSpec.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.api.typed -import cats.implicits._ import cats.data.NonEmptyList +import cats.implicits._ import org.scalatest.{Inside, OptionValues} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers diff --git a/components-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/TypingResultSpec.scala b/components-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/TypingResultSpec.scala index 1581edf488c..d603b5a521c 100644 --- a/components-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/TypingResultSpec.scala +++ b/components-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/TypingResultSpec.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.engine.api.typed import com.typesafe.scalalogging.LazyLogging +import org.scalatest.{Inside, OptionValues} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{Inside, OptionValues} import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks import pl.touk.nussknacker.engine.api.typed.supertype.{CommonSupertypeFinder, NumberTypesPromotionStrategy} import pl.touk.nussknacker.engine.api.typed.typing._ diff --git a/components/openapi/src/it/scala/pl/touk/nussknacker/openapi/functional/OpenAPIServiceSpec.scala b/components/openapi/src/it/scala/pl/touk/nussknacker/openapi/functional/OpenAPIServiceSpec.scala index 2d9b6631609..873d215344e 100644 --- a/components/openapi/src/it/scala/pl/touk/nussknacker/openapi/functional/OpenAPIServiceSpec.scala +++ b/components/openapi/src/it/scala/pl/touk/nussknacker/openapi/functional/OpenAPIServiceSpec.scala @@ -3,9 +3,9 @@ package pl.touk.nussknacker.openapi.functional import cats.data.Validated.Valid import com.typesafe.scalalogging.LazyLogging import org.asynchttpclient.DefaultAsyncHttpClient +import org.scalatest.{BeforeAndAfterAll, Outcome} import org.scalatest.funsuite.FixtureAnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{BeforeAndAfterAll, Outcome} import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.ComponentUseCase @@ -15,9 +15,9 @@ import pl.touk.nussknacker.engine.util.ResourceLoader import pl.touk.nussknacker.engine.util.runtimecontext.TestEngineRuntimeContext import pl.touk.nussknacker.engine.util.service.EagerServiceWithStaticParametersAndReturnType import pl.touk.nussknacker.http.backend.FixedAsyncHttpClientBackendProvider +import pl.touk.nussknacker.openapi.{ApiKeySecret, OpenAPIServicesConfig, SecurityConfig, SecuritySchemeName} import pl.touk.nussknacker.openapi.enrichers.{SwaggerEnricherCreator, SwaggerEnrichers} import pl.touk.nussknacker.openapi.parser.SwaggerParser -import pl.touk.nussknacker.openapi.{ApiKeySecret, OpenAPIServicesConfig, SecurityConfig, SecuritySchemeName} import pl.touk.nussknacker.test.PatientScalaFutures import java.net.URL diff --git a/components/openapi/src/it/scala/pl/touk/nussknacker/openapi/functional/OpenApiScenarioIntegrationTest.scala b/components/openapi/src/it/scala/pl/touk/nussknacker/openapi/functional/OpenApiScenarioIntegrationTest.scala index b3ae22022e8..7092ecab274 100644 --- a/components/openapi/src/it/scala/pl/touk/nussknacker/openapi/functional/OpenApiScenarioIntegrationTest.scala +++ b/components/openapi/src/it/scala/pl/touk/nussknacker/openapi/functional/OpenApiScenarioIntegrationTest.scala @@ -13,12 +13,12 @@ import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.flink.minicluster.FlinkMiniClusterFactory import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.util.test.{ClassBasedTestScenarioRunner, RunResult, TestScenarioRunner} +import pl.touk.nussknacker.openapi.{OpenAPIServicesConfig, SingleBodyParameter} import pl.touk.nussknacker.openapi.enrichers.SwaggerEnricher import pl.touk.nussknacker.openapi.parser.SwaggerParser -import pl.touk.nussknacker.openapi.{OpenAPIServicesConfig, SingleBodyParameter} import pl.touk.nussknacker.test.{ValidatedValuesDetailedMessage, VeryPatientScalaFutures} -import sttp.client3.testing.SttpBackendStub import sttp.client3.{Response, SttpBackend} +import sttp.client3.testing.SttpBackendStub import sttp.model.{Header, HeaderNames, MediaType, StatusCode} import java.net.URL diff --git a/components/openapi/src/it/scala/pl/touk/nussknacker/openapi/functional/StubService.scala b/components/openapi/src/it/scala/pl/touk/nussknacker/openapi/functional/StubService.scala index cd0563714ca..41612a079dd 100644 --- a/components/openapi/src/it/scala/pl/touk/nussknacker/openapi/functional/StubService.scala +++ b/components/openapi/src/it/scala/pl/touk/nussknacker/openapi/functional/StubService.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.openapi.functional +import org.apache.http.{HttpRequest, HttpResponse} import org.apache.http.entity.{InputStreamEntity, StringEntity} import org.apache.http.impl.bootstrap.ServerBootstrap import org.apache.http.protocol.{HttpContext, HttpRequestHandler} -import org.apache.http.{HttpRequest, HttpResponse} import pl.touk.nussknacker.test.AvailablePortFinder class StubService(val swaggerDefinition: String = "/customer-swagger.json") { diff --git a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/OpenAPIServicesConfig.scala b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/OpenAPIServicesConfig.scala index 9f88df8152f..5fa5104ca2c 100644 --- a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/OpenAPIServicesConfig.scala +++ b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/OpenAPIServicesConfig.scala @@ -49,6 +49,7 @@ object OpenAPIServicesConfig { import net.ceedubs.ficus.Ficus._ import pl.touk.nussknacker.engine.util.config.ConfigEnrichments._ + import HttpClientConfig._ implicit val securitySchemeNameVR: ValueReader[SecuritySchemeName] = diff --git a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/discovery/SwaggerOpenApiDefinitionDiscovery.scala b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/discovery/SwaggerOpenApiDefinitionDiscovery.scala index 84d4ed7dd09..a5bdf42244d 100644 --- a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/discovery/SwaggerOpenApiDefinitionDiscovery.scala +++ b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/discovery/SwaggerOpenApiDefinitionDiscovery.scala @@ -6,16 +6,16 @@ import org.apache.commons.io.FileUtils import org.asynchttpclient.DefaultAsyncHttpClient import pl.touk.nussknacker.engine.util.ResourceLoader import pl.touk.nussknacker.http.backend.HttpClientConfig -import pl.touk.nussknacker.openapi.parser.{ServiceParseError, SwaggerParser} import pl.touk.nussknacker.openapi.{OpenAPIServicesConfig, SwaggerService} +import pl.touk.nussknacker.openapi.parser.{ServiceParseError, SwaggerParser} +import sttp.client3.{basicRequest, SttpBackend} import sttp.client3.asynchttpclient.future.AsyncHttpClientFutureBackend -import sttp.client3.{SttpBackend, basicRequest} import sttp.model.Uri import java.io.File import java.nio.charset.StandardCharsets -import scala.concurrent.duration.DurationInt import scala.concurrent.{Await, Future} +import scala.concurrent.duration.DurationInt object SwaggerOpenApiDefinitionDiscovery extends SwaggerOpenApiDefinitionDiscovery()( diff --git a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/enrichers/SwaggerEnricher.scala b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/enrichers/SwaggerEnricher.scala index 5640ea9e88c..f59da027d89 100644 --- a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/enrichers/SwaggerEnricher.scala +++ b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/enrichers/SwaggerEnricher.scala @@ -1,6 +1,7 @@ package pl.touk.nussknacker.openapi.enrichers import org.asynchttpclient.DefaultAsyncHttpClient +import pl.touk.nussknacker.engine.api.{ContextId, MetaData} import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.ComponentUseCase @@ -8,7 +9,6 @@ import pl.touk.nussknacker.engine.api.runtimecontext.EngineRuntimeContext import pl.touk.nussknacker.engine.api.test.InvocationCollectors.ServiceInvocationCollector import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{ContextId, MetaData} import pl.touk.nussknacker.engine.util.service.{EagerServiceWithStaticParametersAndReturnType, TimeMeasuringService} import pl.touk.nussknacker.http.backend.{ FixedAsyncHttpClientBackendProvider, diff --git a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/extractor/HandleResponse.scala b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/extractor/HandleResponse.scala index f0f0257c6df..f04c1d0006c 100644 --- a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/extractor/HandleResponse.scala +++ b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/extractor/HandleResponse.scala @@ -1,9 +1,10 @@ package pl.touk.nussknacker.openapi.extractor -import java.util.Collections import io.circe.Json -import pl.touk.nussknacker.engine.json.swagger.decode.FromJsonSchemaBasedDecoder import pl.touk.nussknacker.engine.json.swagger.{SwaggerArray, SwaggerTyped} +import pl.touk.nussknacker.engine.json.swagger.decode.FromJsonSchemaBasedDecoder + +import java.util.Collections object HandleResponse { diff --git a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/extractor/ParametersExtractor.scala b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/extractor/ParametersExtractor.scala index 38f2253685d..2382849f9a6 100644 --- a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/extractor/ParametersExtractor.scala +++ b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/extractor/ParametersExtractor.scala @@ -2,9 +2,9 @@ package pl.touk.nussknacker.openapi.extractor import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.parameter.ParameterName +import pl.touk.nussknacker.engine.json.swagger.{SwaggerArray, SwaggerObject, SwaggerTyped} import pl.touk.nussknacker.engine.json.swagger.implicits.RichSwaggerTyped import pl.touk.nussknacker.engine.json.swagger.parser.PropertyName -import pl.touk.nussknacker.engine.json.swagger.{SwaggerArray, SwaggerObject, SwaggerTyped} import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap import pl.touk.nussknacker.openapi._ diff --git a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/extractor/ServiceRequest.scala b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/extractor/ServiceRequest.scala index 698053d31b5..f1a7c2a1d50 100644 --- a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/extractor/ServiceRequest.scala +++ b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/extractor/ServiceRequest.scala @@ -8,8 +8,8 @@ import pl.touk.nussknacker.openapi._ import pl.touk.nussknacker.openapi.extractor.ServiceRequest.SwaggerRequestType import sttp.client3._ import sttp.client3.circe._ -import sttp.model.Uri.PathSegment import sttp.model.{Header, MediaType, Method, Uri} +import sttp.model.Uri.PathSegment import java.net.URL diff --git a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/package.scala b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/package.scala index 556fb29a3b6..ae7b48578d5 100644 --- a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/package.scala +++ b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/package.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker -import io.circe.generic.JsonCodec import io.circe.{Decoder, Encoder} +import io.circe.generic.JsonCodec import pl.touk.nussknacker.engine.json.swagger.SwaggerTyped import java.net.URL diff --git a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/parser/ParseToSwaggerService.scala b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/parser/ParseToSwaggerService.scala index 040083c82f7..71c9f3f0e5c 100644 --- a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/parser/ParseToSwaggerService.scala +++ b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/parser/ParseToSwaggerService.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.openapi.parser -import cats.data.Validated.Valid import cats.data.{NonEmptyList, Validated, ValidatedNel} +import cats.data.Validated.Valid import com.typesafe.scalalogging.LazyLogging +import io.swagger.v3.oas.models.{OpenAPI, Operation} import io.swagger.v3.oas.models.PathItem.HttpMethod import io.swagger.v3.oas.models.media.{Content, MediaType, Schema} import io.swagger.v3.oas.models.parameters.{Parameter, RequestBody} import io.swagger.v3.oas.models.responses.ApiResponse -import io.swagger.v3.oas.models.{OpenAPI, Operation} import pl.touk.nussknacker.engine.json.swagger.SwaggerTyped import pl.touk.nussknacker.engine.json.swagger.parser.ParseSwaggerRefSchemas import pl.touk.nussknacker.openapi._ @@ -52,9 +52,10 @@ private[parser] class ParseToSwaggerService(openapi: OpenAPI, openAPIsConfig: Op private val swaggerRefSchemas = ParseSwaggerRefSchemas(openapi) private val servers = openapi.getServers.asScala.toList - import ParseToSwaggerService._ import cats.implicits._ + import ParseToSwaggerService._ + def apply( serviceName: ServiceName, uriWithParameters: String, diff --git a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/parser/ParseToSwaggerServices.scala b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/parser/ParseToSwaggerServices.scala index 5a32f9707ad..19673bfc957 100644 --- a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/parser/ParseToSwaggerServices.scala +++ b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/parser/ParseToSwaggerServices.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.openapi.parser import cats.data.Validated -import io.swagger.v3.oas.models.PathItem.HttpMethod import io.swagger.v3.oas.models.{OpenAPI, Operation} +import io.swagger.v3.oas.models.PathItem.HttpMethod import pl.touk.nussknacker.openapi.{OpenAPIServicesConfig, ServiceName, SwaggerService} import scala.jdk.CollectionConverters._ diff --git a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/parser/SecuritiesParser.scala b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/parser/SecuritiesParser.scala index 7a0e2a52699..febf58a06cd 100644 --- a/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/parser/SecuritiesParser.scala +++ b/components/openapi/src/main/scala/pl/touk/nussknacker/openapi/parser/SecuritiesParser.scala @@ -5,7 +5,6 @@ import cats.implicits._ import com.typesafe.scalalogging.LazyLogging import io.swagger.v3.oas.models.security.{SecurityRequirement, SecurityScheme} import pl.touk.nussknacker.engine.api.util.ReflectUtils -import pl.touk.nussknacker.openapi.parser.ParseToSwaggerService.ValidationResult import pl.touk.nussknacker.openapi.{ ApiKeyInCookie, ApiKeyInHeader, @@ -16,6 +15,7 @@ import pl.touk.nussknacker.openapi.{ SecuritySchemeName, SwaggerSecurity } +import pl.touk.nussknacker.openapi.parser.ParseToSwaggerService.ValidationResult import scala.jdk.CollectionConverters._ diff --git a/components/openapi/src/test/scala/pl/touk/nussknacker/openapi/BaseOpenAPITest.scala b/components/openapi/src/test/scala/pl/touk/nussknacker/openapi/BaseOpenAPITest.scala index e4392b42363..4f6222a1309 100644 --- a/components/openapi/src/test/scala/pl/touk/nussknacker/openapi/BaseOpenAPITest.scala +++ b/components/openapi/src/test/scala/pl/touk/nussknacker/openapi/BaseOpenAPITest.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.openapi import cats.data.Validated import cats.data.Validated.{Invalid, Valid} import org.apache.commons.io.IOUtils -import pl.touk.nussknacker.engine.api.process.ComponentUseCase import pl.touk.nussknacker.engine.api._ +import pl.touk.nussknacker.engine.api.process.ComponentUseCase import pl.touk.nussknacker.engine.util.runtimecontext.TestEngineRuntimeContext import pl.touk.nussknacker.engine.util.service.EagerServiceWithStaticParametersAndReturnType import pl.touk.nussknacker.openapi.enrichers.{SwaggerEnricherCreator, SwaggerEnrichers} diff --git a/components/openapi/src/test/scala/pl/touk/nussknacker/openapi/OpenAPIServicesConfigTest.scala b/components/openapi/src/test/scala/pl/touk/nussknacker/openapi/OpenAPIServicesConfigTest.scala index 6262fd013a3..c8bcf8d2ca7 100644 --- a/components/openapi/src/test/scala/pl/touk/nussknacker/openapi/OpenAPIServicesConfigTest.scala +++ b/components/openapi/src/test/scala/pl/touk/nussknacker/openapi/OpenAPIServicesConfigTest.scala @@ -8,6 +8,7 @@ import org.scalatest.matchers.should.Matchers class OpenAPIServicesConfigTest extends AnyFunSuite with Matchers with OptionValues { import net.ceedubs.ficus.Ficus._ + import OpenAPIServicesConfig._ test("should parse apikey secret for each scheme") { diff --git a/components/openapi/src/test/scala/pl/touk/nussknacker/openapi/SecurityTest.scala b/components/openapi/src/test/scala/pl/touk/nussknacker/openapi/SecurityTest.scala index e9de5f99285..e5956619e37 100644 --- a/components/openapi/src/test/scala/pl/touk/nussknacker/openapi/SecurityTest.scala +++ b/components/openapi/src/test/scala/pl/touk/nussknacker/openapi/SecurityTest.scala @@ -1,15 +1,15 @@ package pl.touk.nussknacker.openapi import com.typesafe.scalalogging.LazyLogging +import org.scalatest.{Assertion, BeforeAndAfterAll, LoneElement, TryValues} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{Assertion, BeforeAndAfterAll, LoneElement, TryValues} import pl.touk.nussknacker.engine.api.ContextId import pl.touk.nussknacker.engine.api.test.EmptyInvocationCollector.Instance import pl.touk.nussknacker.engine.api.typed.TypedMap import pl.touk.nussknacker.test.PatientScalaFutures -import sttp.client3.testing.SttpBackendStub import sttp.client3.{Request, Response, SttpBackend} +import sttp.client3.testing.SttpBackendStub import sttp.model.{HeaderNames, StatusCode} import scala.concurrent.ExecutionContext.Implicits.global diff --git a/components/openapi/src/test/scala/pl/touk/nussknacker/openapi/extractor/ServiceRequestTest.scala b/components/openapi/src/test/scala/pl/touk/nussknacker/openapi/extractor/ServiceRequestTest.scala index abab63a52bc..9ac3bd5072b 100644 --- a/components/openapi/src/test/scala/pl/touk/nussknacker/openapi/extractor/ServiceRequestTest.scala +++ b/components/openapi/src/test/scala/pl/touk/nussknacker/openapi/extractor/ServiceRequestTest.scala @@ -1,8 +1,5 @@ package pl.touk.nussknacker.openapi.extractor -import java.lang -import java.net.URL -import java.util.Collections.singletonMap import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.openapi.{OpenAPIServicesConfig, SingleBodyParameter} @@ -11,6 +8,9 @@ import pl.touk.nussknacker.openapi.parser.SwaggerParser import sttp.client3.StringBody import sttp.model.Uri +import java.lang +import java.net.URL +import java.util.Collections.singletonMap import scala.jdk.CollectionConverters._ class ServiceRequestTest extends AnyFunSuite with Matchers { diff --git a/components/sql/src/main/scala/pl/touk/nussknacker/sql/db/schema/ColumnDefinition.scala b/components/sql/src/main/scala/pl/touk/nussknacker/sql/db/schema/ColumnDefinition.scala index 9350089a53c..a346a41f8cf 100644 --- a/components/sql/src/main/scala/pl/touk/nussknacker/sql/db/schema/ColumnDefinition.scala +++ b/components/sql/src/main/scala/pl/touk/nussknacker/sql/db/schema/ColumnDefinition.scala @@ -2,11 +2,11 @@ package pl.touk.nussknacker.sql.db.schema import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult} +import java.{sql, util} import java.io.BufferedReader import java.sql.{Clob, ResultSet, ResultSetMetaData} import java.time.{Instant, LocalDate, LocalTime} import java.util.stream.Collectors -import java.{sql, util} import scala.util.Using final case class ColumnDefinition( diff --git a/components/sql/src/main/scala/pl/touk/nussknacker/sql/service/DatabaseEnricherInvoker.scala b/components/sql/src/main/scala/pl/touk/nussknacker/sql/service/DatabaseEnricherInvoker.scala index 85e5fcad56d..03734be8b2e 100644 --- a/components/sql/src/main/scala/pl/touk/nussknacker/sql/service/DatabaseEnricherInvoker.scala +++ b/components/sql/src/main/scala/pl/touk/nussknacker/sql/service/DatabaseEnricherInvoker.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.sql.service +import pl.touk.nussknacker.engine.api.{Context, Params, ServiceInvoker} import pl.touk.nussknacker.engine.api.process.ComponentUseCase import pl.touk.nussknacker.engine.api.test.InvocationCollectors.ServiceInvocationCollector import pl.touk.nussknacker.engine.api.typed.typing -import pl.touk.nussknacker.engine.api.{Context, Params, ServiceInvoker} import pl.touk.nussknacker.engine.util.service.AsyncExecutionTimeMeasurement import pl.touk.nussknacker.sql.db.WithDBConnectionPool import pl.touk.nussknacker.sql.db.query._ diff --git a/components/sql/src/main/scala/pl/touk/nussknacker/sql/service/DatabaseLookupEnricher.scala b/components/sql/src/main/scala/pl/touk/nussknacker/sql/service/DatabaseLookupEnricher.scala index 35cf6de072a..2daef80d123 100644 --- a/components/sql/src/main/scala/pl/touk/nussknacker/sql/service/DatabaseLookupEnricher.scala +++ b/components/sql/src/main/scala/pl/touk/nussknacker/sql/service/DatabaseLookupEnricher.scala @@ -1,21 +1,21 @@ package pl.touk.nussknacker.sql.service import com.typesafe.scalalogging.LazyLogging +import pl.touk.nussknacker.engine.api.{Context, NodeId, Params} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.context.transformation.{DefinedEagerParameter, NodeDependencyValue} import pl.touk.nussknacker.engine.api.definition.{FixedExpressionValue, FixedValuesParameterEditor, Parameter} import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{Context, NodeId, Params} import pl.touk.nussknacker.sql.db.pool.DBPoolConfig import pl.touk.nussknacker.sql.db.query.{QueryArgument, QueryArguments, SingleResultStrategy} import pl.touk.nussknacker.sql.db.schema.{DbMetaDataProvider, SchemaDefinition, TableDefinition} import pl.touk.nussknacker.sql.service.DatabaseLookupEnricher.TableParamName import pl.touk.nussknacker.sql.service.DatabaseQueryEnricher.{ - TransformationState, cacheTTLParamDeclaration, - cacheTTLParamName + cacheTTLParamName, + TransformationState } import scala.util.control.NonFatal diff --git a/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseLookupEnricherTest.scala b/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseLookupEnricherTest.scala index 2d514213c0d..29ce1f1d8a6 100644 --- a/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseLookupEnricherTest.scala +++ b/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseLookupEnricherTest.scala @@ -1,10 +1,10 @@ package pl.touk.nussknacker.sql.service +import pl.touk.nussknacker.engine.api.{Context, NodeId, Params} import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.context.transformation.OutputVariableNameValue import pl.touk.nussknacker.engine.api.definition.{FixedExpressionValue, FixedValuesParameterEditor} import pl.touk.nussknacker.engine.api.typed.TypedMap -import pl.touk.nussknacker.engine.api.{Context, NodeId, Params} import pl.touk.nussknacker.sql.db.pool.DBPoolConfig import pl.touk.nussknacker.sql.db.query.ResultSetStrategy import pl.touk.nussknacker.sql.db.schema.{JdbcMetaDataProvider, MetaDataProviderFactory, TableDefinition} @@ -15,8 +15,8 @@ import scala.concurrent.Await class DatabaseLookupEnricherTest extends BaseHsqlQueryEnricherTest { - import scala.jdk.CollectionConverters._ import scala.concurrent.duration._ + import scala.jdk.CollectionConverters._ override val prepareHsqlDDLs: List[String] = List( "CREATE TABLE persons (id INT, name VARCHAR(40), birth_date DATE);", diff --git a/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseLookupEnricherWithCacheTest.scala b/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseLookupEnricherWithCacheTest.scala index 372b12f56f9..f394f87ac58 100644 --- a/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseLookupEnricherWithCacheTest.scala +++ b/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseLookupEnricherWithCacheTest.scala @@ -12,8 +12,8 @@ import scala.concurrent.Await class DatabaseLookupEnricherWithCacheTest extends BaseHsqlQueryEnricherTest { - import scala.jdk.CollectionConverters._ import scala.concurrent.duration._ + import scala.jdk.CollectionConverters._ override val service = new DatabaseLookupEnricher(hsqlDbPoolConfig, new MetaDataProviderFactory().create(hsqlDbPoolConfig)) diff --git a/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseQueryEnricherPostgresqlTest.scala b/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseQueryEnricherPostgresqlTest.scala index f2a7f413b45..52b2315d123 100644 --- a/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseQueryEnricherPostgresqlTest.scala +++ b/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseQueryEnricherPostgresqlTest.scala @@ -5,7 +5,7 @@ import pl.touk.nussknacker.engine.api.typed.TypedMap import pl.touk.nussknacker.sql.db.schema.MetaDataProviderFactory import pl.touk.nussknacker.sql.utils.BasePostgresqlQueryEnricherTest -import java.time.{LocalDate, LocalDateTime, LocalTime, ZoneId, ZonedDateTime} +import java.time.{LocalDate, LocalDateTime, LocalTime, ZonedDateTime, ZoneId} class DatabaseQueryEnricherPostgresqlTest extends BasePostgresqlQueryEnricherTest diff --git a/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseQueryEnricherQueryWithEnricher.scala b/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseQueryEnricherQueryWithEnricher.scala index 76918c792c8..631f3db3d69 100644 --- a/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseQueryEnricherQueryWithEnricher.scala +++ b/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseQueryEnricherQueryWithEnricher.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.sql.service +import pl.touk.nussknacker.engine.api.Context import pl.touk.nussknacker.engine.api.Params import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.typed.TypedMap -import pl.touk.nussknacker.engine.api.Context import pl.touk.nussknacker.sql.db.query.{ResultSetStrategy, UpdateResultStrategy} import pl.touk.nussknacker.sql.db.schema.TableDefinition import pl.touk.nussknacker.sql.utils.BaseDatabaseQueryEnricherTest diff --git a/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseQueryEnricherValidationTest.scala b/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseQueryEnricherValidationTest.scala index 62a2873475a..13bc3cdb217 100644 --- a/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseQueryEnricherValidationTest.scala +++ b/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseQueryEnricherValidationTest.scala @@ -1,11 +1,11 @@ package pl.touk.nussknacker.sql.service +import pl.touk.nussknacker.engine.api.{NodeId, TemplateEvaluationResult} import pl.touk.nussknacker.engine.api.TemplateRenderedPart.RenderedLiteral +import pl.touk.nussknacker.engine.api.context.{OutputVar, ValidationContext} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError import pl.touk.nussknacker.engine.api.context.transformation.{DefinedEagerParameter, OutputVariableNameValue} -import pl.touk.nussknacker.engine.api.context.{OutputVar, ValidationContext} import pl.touk.nussknacker.engine.api.typed.typing.{Typed, Unknown} -import pl.touk.nussknacker.engine.api.{NodeId, TemplateEvaluationResult} import pl.touk.nussknacker.sql.db.query.{ResultSetStrategy, SingleResultStrategy} import pl.touk.nussknacker.sql.db.schema.MetaDataProviderFactory import pl.touk.nussknacker.sql.utils.BaseHsqlQueryEnricherTest diff --git a/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseQueryEnricherWithCacheTest.scala b/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseQueryEnricherWithCacheTest.scala index 625a13db802..4d6e334d193 100644 --- a/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseQueryEnricherWithCacheTest.scala +++ b/components/sql/src/test/scala/pl/touk/nussknacker/sql/service/DatabaseQueryEnricherWithCacheTest.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.sql.service -import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.{Context, Params} +import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.typed.TypedMap import pl.touk.nussknacker.sql.db.query.ResultSetStrategy import pl.touk.nussknacker.sql.db.schema.{MetaDataProviderFactory, TableDefinition} @@ -12,8 +12,8 @@ import scala.concurrent.Await class DatabaseQueryEnricherWithCacheTest extends BaseHsqlQueryEnricherTest { - import scala.jdk.CollectionConverters._ import scala.concurrent.duration._ + import scala.jdk.CollectionConverters._ override val prepareHsqlDDLs: List[String] = List( "CREATE TABLE persons (id INT, name VARCHAR(40));", diff --git a/components/sql/src/test/scala/pl/touk/nussknacker/sql/utils/ignite/WithIgniteDB.scala b/components/sql/src/test/scala/pl/touk/nussknacker/sql/utils/ignite/WithIgniteDB.scala index 61c45ff8fc7..35b8e91f772 100644 --- a/components/sql/src/test/scala/pl/touk/nussknacker/sql/utils/ignite/WithIgniteDB.scala +++ b/components/sql/src/test/scala/pl/touk/nussknacker/sql/utils/ignite/WithIgniteDB.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.sql.utils.ignite -import org.apache.ignite.configuration.{ClientConnectorConfiguration, IgniteConfiguration} import org.apache.ignite.{Ignite, IgniteJdbcThinDriver, Ignition} +import org.apache.ignite.configuration.{ClientConnectorConfiguration, IgniteConfiguration} import org.scalatest.{BeforeAndAfterAll, Suite} import pl.touk.nussknacker.sql.db.pool.DBPoolConfig import pl.touk.nussknacker.test.AvailablePortFinder diff --git a/defaultModel/src/main/scala/pl/touk/nussknacker/defaultmodel/DefaultConfigCreator.scala b/defaultModel/src/main/scala/pl/touk/nussknacker/defaultmodel/DefaultConfigCreator.scala index 8020e1a89d3..4e08f3ae425 100644 --- a/defaultModel/src/main/scala/pl/touk/nussknacker/defaultmodel/DefaultConfigCreator.scala +++ b/defaultModel/src/main/scala/pl/touk/nussknacker/defaultmodel/DefaultConfigCreator.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.defaultmodel import pl.touk.nussknacker.engine.api.modelinfo.ModelInfo -import pl.touk.nussknacker.engine.api.process.WithCategories.anyCategory import pl.touk.nussknacker.engine.api.process.{EmptyProcessConfigCreator, _} +import pl.touk.nussknacker.engine.api.process.WithCategories.anyCategory class DefaultConfigCreator extends EmptyProcessConfigCreator { diff --git a/defaultModel/src/test/scala/pl/touk/nussknacker/defaultModel/migrations/DecisionTableParameterNamesMigrationSpec.scala b/defaultModel/src/test/scala/pl/touk/nussknacker/defaultModel/migrations/DecisionTableParameterNamesMigrationSpec.scala index 0d41187c7dd..c37782920ab 100644 --- a/defaultModel/src/test/scala/pl/touk/nussknacker/defaultModel/migrations/DecisionTableParameterNamesMigrationSpec.scala +++ b/defaultModel/src/test/scala/pl/touk/nussknacker/defaultModel/migrations/DecisionTableParameterNamesMigrationSpec.scala @@ -5,10 +5,10 @@ import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.defaultmodel.migrations.DecisionTableParameterNamesMigration import pl.touk.nussknacker.engine.api.{MetaData, StreamMetaData} import pl.touk.nussknacker.engine.api.parameter.ParameterName -import pl.touk.nussknacker.engine.graph.node.Enricher -import pl.touk.nussknacker.engine.graph.service.ServiceRef import pl.touk.nussknacker.engine.graph.evaluatedparam.Parameter import pl.touk.nussknacker.engine.graph.expression.Expression +import pl.touk.nussknacker.engine.graph.node.Enricher +import pl.touk.nussknacker.engine.graph.service.ServiceRef import pl.touk.nussknacker.engine.spel.SpelExtension._ class DecisionTableParameterNamesMigrationSpec extends AnyFreeSpecLike with Matchers { diff --git a/defaultModel/src/test/scala/pl/touk/nussknacker/defaultModel/migrations/PeriodicToSampleGeneratorSpec.scala b/defaultModel/src/test/scala/pl/touk/nussknacker/defaultModel/migrations/PeriodicToSampleGeneratorSpec.scala index 5efe21612cd..01c3a84f21d 100644 --- a/defaultModel/src/test/scala/pl/touk/nussknacker/defaultModel/migrations/PeriodicToSampleGeneratorSpec.scala +++ b/defaultModel/src/test/scala/pl/touk/nussknacker/defaultModel/migrations/PeriodicToSampleGeneratorSpec.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.defaultModel.migrations import org.scalatest.freespec.AnyFreeSpecLike import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.defaultmodel.migrations.PeriodicToSampleGeneratorMigration -import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.{MetaData, StreamMetaData} +import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.graph.evaluatedparam.Parameter import pl.touk.nussknacker.engine.graph.node.Source import pl.touk.nussknacker.engine.graph.source.SourceRef diff --git a/defaultModel/src/test/scala/pl/touk/nussknacker/defaultModel/migrations/SampleGeneratorToEventGeneratorAndPeriodicToScheduleSpec.scala b/defaultModel/src/test/scala/pl/touk/nussknacker/defaultModel/migrations/SampleGeneratorToEventGeneratorAndPeriodicToScheduleSpec.scala index 2f3bd778d74..3dd154ab903 100644 --- a/defaultModel/src/test/scala/pl/touk/nussknacker/defaultModel/migrations/SampleGeneratorToEventGeneratorAndPeriodicToScheduleSpec.scala +++ b/defaultModel/src/test/scala/pl/touk/nussknacker/defaultModel/migrations/SampleGeneratorToEventGeneratorAndPeriodicToScheduleSpec.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.defaultModel.migrations import org.scalatest.freespec.AnyFreeSpecLike import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.defaultmodel.migrations.SampleGeneratorToEventGeneratorAndPeriodToScheduleParameter -import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.{MetaData, StreamMetaData} +import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.graph.evaluatedparam.Parameter import pl.touk.nussknacker.engine.graph.node.Source import pl.touk.nussknacker.engine.graph.source.SourceRef diff --git a/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/DeploymentManagerDependencies.scala b/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/DeploymentManagerDependencies.scala index f158709a00f..ad076c5772c 100644 --- a/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/DeploymentManagerDependencies.scala +++ b/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/DeploymentManagerDependencies.scala @@ -2,12 +2,12 @@ package pl.touk.nussknacker.engine import akka.actor.ActorSystem import cats.effect.unsafe.IORuntime +import pl.touk.nussknacker.engine.api.component.{ComponentAdditionalConfig, DesignerWideComponentId} import pl.touk.nussknacker.engine.api.deployment.{ ProcessingTypeActionService, ProcessingTypeDeployedScenariosProvider, ScenarioActivityManager } -import pl.touk.nussknacker.engine.api.component.{ComponentAdditionalConfig, DesignerWideComponentId} import sttp.client3.SttpBackend import scala.concurrent.{ExecutionContext, Future} diff --git a/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/DeploymentManagerProvider.scala b/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/DeploymentManagerProvider.scala index 34681c71348..6e1ab643f93 100644 --- a/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/DeploymentManagerProvider.scala +++ b/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/DeploymentManagerProvider.scala @@ -3,10 +3,10 @@ package pl.touk.nussknacker.engine import cats.data.ValidatedNel import com.typesafe.config.Config import pl.touk.nussknacker.engine.MetaDataInitializer.MetadataType +import pl.touk.nussknacker.engine.api.{MetaData, NamedServiceProvider, ProcessAdditionalFields} import pl.touk.nussknacker.engine.api.component.ScenarioPropertyConfig import pl.touk.nussknacker.engine.api.deployment.DeploymentManager import pl.touk.nussknacker.engine.api.process.ProcessName -import pl.touk.nussknacker.engine.api.{MetaData, NamedServiceProvider, ProcessAdditionalFields} import pl.touk.nussknacker.engine.deployment.EngineSetupName import pl.touk.nussknacker.engine.util.IdToTitleConverter diff --git a/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/DeploymentStatus.scala b/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/DeploymentStatus.scala index 9c1bda6b670..d394c71e88e 100644 --- a/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/DeploymentStatus.scala +++ b/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/DeploymentStatus.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.api.deployment -import enumeratum.EnumEntry.UpperSnakecase import enumeratum.{Enum, EnumEntry} +import enumeratum.EnumEntry.UpperSnakecase import io.circe.Codec import io.circe.generic.extras.semiauto.deriveUnwrappedCodec diff --git a/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/scheduler/services/ProcessConfigEnricher.scala b/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/scheduler/services/ProcessConfigEnricher.scala index 0e89cd851cb..c1f9385291d 100644 --- a/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/scheduler/services/ProcessConfigEnricher.scala +++ b/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/scheduler/services/ProcessConfigEnricher.scala @@ -3,7 +3,11 @@ package pl.touk.nussknacker.engine.api.deployment.scheduler.services import com.typesafe.config.{Config, ConfigFactory} import pl.touk.nussknacker.engine.api.ProcessVersion import pl.touk.nussknacker.engine.api.deployment.scheduler.model.{ScheduledDeploymentDetails, ScheduledProcessDetails} -import pl.touk.nussknacker.engine.api.deployment.scheduler.services.ProcessConfigEnricher.{DeployData, EnrichedProcessConfig, InitialScheduleData} +import pl.touk.nussknacker.engine.api.deployment.scheduler.services.ProcessConfigEnricher.{ + DeployData, + EnrichedProcessConfig, + InitialScheduleData +} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.modelconfig.InputConfigDuringExecution import sttp.client3.SttpBackend @@ -42,10 +46,10 @@ object ProcessConfigEnricher { ) extends ProcessConfigEnricherInputData case class DeployData( - canonicalProcess: CanonicalProcess, - processVersion: ProcessVersion, - inputConfigDuringExecutionJson: String, - deploymentDetails: ScheduledDeploymentDetails, + canonicalProcess: CanonicalProcess, + processVersion: ProcessVersion, + inputConfigDuringExecutionJson: String, + deploymentDetails: ScheduledDeploymentDetails, ) extends ProcessConfigEnricherInputData case class EnrichedProcessConfig(inputConfigDuringExecutionJson: String) diff --git a/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/simple/SimpleProcessStateDefinitionManager.scala b/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/simple/SimpleProcessStateDefinitionManager.scala index 53178e28055..6a9d118a823 100644 --- a/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/simple/SimpleProcessStateDefinitionManager.scala +++ b/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/simple/SimpleProcessStateDefinitionManager.scala @@ -1,15 +1,15 @@ package pl.touk.nussknacker.engine.api.deployment.simple -import pl.touk.nussknacker.engine.api.deployment.ProcessStateDefinitionManager.ScenarioStatusWithScenarioContext -import pl.touk.nussknacker.engine.api.deployment.ScenarioActionName.DefaultActions -import pl.touk.nussknacker.engine.api.deployment.StateStatus.StatusName -import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus.{ProblemStateStatus, statusActionsPF} import pl.touk.nussknacker.engine.api.deployment.{ ProcessStateDefinitionManager, ScenarioActionName, StateDefinitionDetails, StateStatus } +import pl.touk.nussknacker.engine.api.deployment.ProcessStateDefinitionManager.ScenarioStatusWithScenarioContext +import pl.touk.nussknacker.engine.api.deployment.ScenarioActionName.DefaultActions +import pl.touk.nussknacker.engine.api.deployment.StateStatus.StatusName +import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus.{statusActionsPF, ProblemStateStatus} /** * Base [[ProcessStateDefinitionManager]] with basic state definitions and state transitions. diff --git a/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/simple/SimpleStateStatus.scala b/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/simple/SimpleStateStatus.scala index 4286403c699..481c1e0a324 100644 --- a/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/simple/SimpleStateStatus.scala +++ b/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/simple/SimpleStateStatus.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.api.deployment.simple -import pl.touk.nussknacker.engine.api.deployment.StateStatus.StatusName import pl.touk.nussknacker.engine.api.deployment._ +import pl.touk.nussknacker.engine.api.deployment.StateStatus.StatusName import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus.ProblemStateStatus.defaultActions import pl.touk.nussknacker.engine.api.process.VersionId import pl.touk.nussknacker.engine.deployment.DeploymentId diff --git a/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/testing/DeploymentManagerStub.scala b/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/testing/DeploymentManagerStub.scala index 446b28af9fa..9a6920c7f47 100644 --- a/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/testing/DeploymentManagerStub.scala +++ b/designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/testing/DeploymentManagerStub.scala @@ -2,22 +2,22 @@ package pl.touk.nussknacker.engine.testing import cats.data.{Validated, ValidatedNel} import com.typesafe.config.Config -import pl.touk.nussknacker.engine.api.StreamMetaData -import pl.touk.nussknacker.engine.api.component.ScenarioPropertyConfig -import pl.touk.nussknacker.engine.api.definition._ -import pl.touk.nussknacker.engine.api.deployment._ -import pl.touk.nussknacker.engine.api.deployment.simple.{SimpleProcessStateDefinitionManager, SimpleStateStatus} -import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.engine.{ BaseModelData, DeploymentManagerDependencies, DeploymentManagerProvider, MetaDataInitializer } +import pl.touk.nussknacker.engine.api.StreamMetaData +import pl.touk.nussknacker.engine.api.component.ScenarioPropertyConfig +import pl.touk.nussknacker.engine.api.definition._ +import pl.touk.nussknacker.engine.api.deployment._ +import pl.touk.nussknacker.engine.api.deployment.simple.{SimpleProcessStateDefinitionManager, SimpleStateStatus} +import pl.touk.nussknacker.engine.api.process.ProcessName import scala.collection.concurrent.TrieMap -import scala.concurrent.duration.FiniteDuration import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.duration.FiniteDuration class DeploymentManagerStub(implicit ec: ExecutionContext) extends BaseDeploymentManager { diff --git a/designer/listener-api/src/main/scala/pl/touk/nussknacker/ui/listener/ListenerScenarioWithDetails.scala b/designer/listener-api/src/main/scala/pl/touk/nussknacker/ui/listener/ListenerScenarioWithDetails.scala index eceb69a92e2..78953f45e7e 100644 --- a/designer/listener-api/src/main/scala/pl/touk/nussknacker/ui/listener/ListenerScenarioWithDetails.scala +++ b/designer/listener-api/src/main/scala/pl/touk/nussknacker/ui/listener/ListenerScenarioWithDetails.scala @@ -2,7 +2,7 @@ package pl.touk.nussknacker.ui.listener import pl.touk.nussknacker.engine.api.deployment.ProcessAction import pl.touk.nussknacker.engine.api.graph.ScenarioGraph -import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, ProcessingType, ScenarioVersion, VersionId} +import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessingType, ProcessName, ScenarioVersion, VersionId} import java.time.Instant diff --git a/designer/processReports/src/main/scala/pl/touk/nussknacker/processCounts/CountsReporter.scala b/designer/processReports/src/main/scala/pl/touk/nussknacker/processCounts/CountsReporter.scala index bba91e81f43..c69bdb049c8 100644 --- a/designer/processReports/src/main/scala/pl/touk/nussknacker/processCounts/CountsReporter.scala +++ b/designer/processReports/src/main/scala/pl/touk/nussknacker/processCounts/CountsReporter.scala @@ -4,8 +4,8 @@ import com.typesafe.config.Config import pl.touk.nussknacker.engine.api.process.ProcessName import sttp.client3.SttpBackend -import java.time.format.DateTimeFormatter import java.time.{Instant, ZoneId} +import java.time.format.DateTimeFormatter import scala.concurrent.Future import scala.language.higherKinds diff --git a/designer/processReports/src/main/scala/pl/touk/nussknacker/processCounts/influxdb/InfluxGenerator.scala b/designer/processReports/src/main/scala/pl/touk/nussknacker/processCounts/influxdb/InfluxGenerator.scala index c402300201f..0d68ff6a651 100644 --- a/designer/processReports/src/main/scala/pl/touk/nussknacker/processCounts/influxdb/InfluxGenerator.scala +++ b/designer/processReports/src/main/scala/pl/touk/nussknacker/processCounts/influxdb/InfluxGenerator.scala @@ -1,15 +1,15 @@ package pl.touk.nussknacker.processCounts.influxdb -import java.time.format.DateTimeFormatter -import java.time.{Instant, ZonedDateTime} +import com.typesafe.scalalogging.LazyLogging +import pl.touk.nussknacker.engine.api.process.ProcessName +import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap import sttp.client3.SttpBackend import sttp.monad.MonadError import sttp.monad.syntax._ -import com.typesafe.scalalogging.LazyLogging -import pl.touk.nussknacker.engine.api.process.ProcessName +import java.time.{Instant, ZonedDateTime} +import java.time.format.DateTimeFormatter import scala.language.higherKinds -import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap private[influxdb] class InfluxGenerator[F[_]](config: InfluxConfig, env: String)(implicit backend: SttpBackend[F, Any]) extends LazyLogging { diff --git a/designer/processReports/src/main/scala/pl/touk/nussknacker/processCounts/influxdb/SimpleInfluxClient.scala b/designer/processReports/src/main/scala/pl/touk/nussknacker/processCounts/influxdb/SimpleInfluxClient.scala index 736ac479a74..0cf1c6bca1c 100644 --- a/designer/processReports/src/main/scala/pl/touk/nussknacker/processCounts/influxdb/SimpleInfluxClient.scala +++ b/designer/processReports/src/main/scala/pl/touk/nussknacker/processCounts/influxdb/SimpleInfluxClient.scala @@ -5,8 +5,8 @@ import pl.touk.nussknacker.engine.api.CirceUtil._ import pl.touk.nussknacker.http.backend.SttpJson import sttp.client3._ import sttp.client3.circe._ -import sttp.monad.syntax.MonadErrorOps import sttp.monad.MonadError +import sttp.monad.syntax.MonadErrorOps import scala.language.{higherKinds, implicitConversions} diff --git a/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/BaseEndpointDefinitions.scala b/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/BaseEndpointDefinitions.scala index 36ea5f9f81b..44be77c5a13 100644 --- a/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/BaseEndpointDefinitions.scala +++ b/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/BaseEndpointDefinitions.scala @@ -5,8 +5,8 @@ import pl.touk.nussknacker.security.AuthCredentials import pl.touk.nussknacker.ui.security.api.{AuthenticationError, AuthorizationError, SecurityError} import pl.touk.nussknacker.ui.security.api.SecurityError._ import sttp.model.StatusCode.{Forbidden, NotImplemented, Unauthorized} -import sttp.tapir.EndpointIO.Example import sttp.tapir._ +import sttp.tapir.EndpointIO.Example import scala.language.implicitConversions diff --git a/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/component/ComponentApiEndpoints.scala b/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/component/ComponentApiEndpoints.scala index c0726422f07..e63731f1f8b 100644 --- a/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/component/ComponentApiEndpoints.scala +++ b/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/component/ComponentApiEndpoints.scala @@ -1,12 +1,12 @@ package pl.touk.nussknacker.restmodel.component -import pl.touk.nussknacker.engine.api.component.Component.AllowedProcessingModes import pl.touk.nussknacker.engine.api.component.{ ComponentGroupName, ComponentType, DesignerWideComponentId, ProcessingMode } +import pl.touk.nussknacker.engine.api.component.Component.AllowedProcessingModes import pl.touk.nussknacker.engine.api.deployment.ProcessActionId import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, VersionId} import pl.touk.nussknacker.restmodel.BaseEndpointDefinitions @@ -14,9 +14,9 @@ import pl.touk.nussknacker.restmodel.BaseEndpointDefinitions.SecuredEndpoint import pl.touk.nussknacker.restmodel.component.NodeUsageData.ScenarioUsageData import pl.touk.nussknacker.security.AuthCredentials import sttp.model.StatusCode.{NotFound, Ok} +import sttp.tapir._ import sttp.tapir.Codec.PlainCodec import sttp.tapir.EndpointIO.Example -import sttp.tapir._ import sttp.tapir.generic.auto.schemaForCaseClass import sttp.tapir.json.circe.jsonBody diff --git a/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/component/package.scala b/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/component/package.scala index 8f4e5931de7..57d36c76124 100644 --- a/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/component/package.scala +++ b/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/component/package.scala @@ -1,18 +1,18 @@ package pl.touk.nussknacker.restmodel import cats.data.NonEmptySet +import io.circe.{Decoder, DecodingFailure, Encoder} import io.circe.generic.JsonCodec import io.circe.generic.extras.ConfiguredJsonCodec import io.circe.syntax.EncoderOps -import io.circe.{Decoder, DecodingFailure, Encoder} -import pl.touk.nussknacker.engine.api.component.Component.AllowedProcessingModes -import pl.touk.nussknacker.engine.api.component.ComponentType.ComponentType import pl.touk.nussknacker.engine.api.component.{ ComponentGroupName, ComponentId, DesignerWideComponentId, ProcessingMode } +import pl.touk.nussknacker.engine.api.component.Component.AllowedProcessingModes +import pl.touk.nussknacker.engine.api.component.ComponentType.ComponentType import pl.touk.nussknacker.engine.api.process.ProcessName import sttp.tapir.{Schema, SchemaType} diff --git a/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/definition/package.scala b/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/definition/package.scala index b45b976a019..a850c2c1085 100644 --- a/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/definition/package.scala +++ b/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/definition/package.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.restmodel +import io.circe.{Decoder, Encoder} import io.circe.generic.JsonCodec import io.circe.generic.extras.semiauto.{deriveConfiguredDecoder, deriveConfiguredEncoder} -import io.circe.{Decoder, Encoder} import pl.touk.nussknacker.engine.api.component.{ComponentGroupName, ComponentId} import pl.touk.nussknacker.engine.api.definition.ParameterEditor import pl.touk.nussknacker.engine.api.typed.typing.TypingResult diff --git a/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/scenariodetails/ScenarioWithDetailsForMigrations.scala b/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/scenariodetails/ScenarioWithDetailsForMigrations.scala index d926934159b..ad762a67d8c 100644 --- a/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/scenariodetails/ScenarioWithDetailsForMigrations.scala +++ b/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/scenariodetails/ScenarioWithDetailsForMigrations.scala @@ -2,7 +2,7 @@ package pl.touk.nussknacker.restmodel.scenariodetails import io.circe.{Codec, Decoder, Encoder} import pl.touk.nussknacker.engine.api.graph.ScenarioGraph -import pl.touk.nussknacker.engine.api.process.{ProcessName, ProcessingType, ScenarioVersion} +import pl.touk.nussknacker.engine.api.process.{ProcessingType, ProcessName, ScenarioVersion} import pl.touk.nussknacker.restmodel.validation.ValidationResults import pl.touk.nussknacker.restmodel.validation.ValidationResults.ValidationResult diff --git a/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/validation/PrettyValidationErrors.scala b/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/validation/PrettyValidationErrors.scala index 6cc314cec29..ae42c6e1a2a 100644 --- a/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/validation/PrettyValidationErrors.scala +++ b/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/validation/PrettyValidationErrors.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.restmodel.validation import org.apache.commons.lang3.StringUtils -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.context.{ParameterValidationError, ProcessCompilationError} +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.generics.ExpressionParseError.ErrorDetails import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.util.ReflectUtils diff --git a/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/validation/ValidationResults.scala b/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/validation/ValidationResults.scala index 3bdd16a7b46..4cd3a34b9d2 100644 --- a/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/validation/ValidationResults.scala +++ b/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/validation/ValidationResults.scala @@ -1,12 +1,12 @@ package pl.touk.nussknacker.restmodel.validation import cats.implicits._ -import io.circe.generic.JsonCodec import io.circe.{Decoder, Encoder} +import io.circe.generic.JsonCodec import pl.touk.nussknacker.engine.api.expression.ExpressionTypingInfo import pl.touk.nussknacker.engine.api.generics.ExpressionParseError.ErrorDetails +import pl.touk.nussknacker.engine.api.typed.{typing, TypeEncoders} import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.api.typed.{TypeEncoders, typing} import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap import pl.touk.nussknacker.restmodel.definition.UIParameter diff --git a/designer/restmodel/src/test/scala/pl/touk/nussknacker/restmodel/NodeDataCodecSpec.scala b/designer/restmodel/src/test/scala/pl/touk/nussknacker/restmodel/NodeDataCodecSpec.scala index 87a39ecc54b..adfbfe31ddb 100644 --- a/designer/restmodel/src/test/scala/pl/touk/nussknacker/restmodel/NodeDataCodecSpec.scala +++ b/designer/restmodel/src/test/scala/pl/touk/nussknacker/restmodel/NodeDataCodecSpec.scala @@ -1,15 +1,15 @@ package pl.touk.nussknacker.restmodel -import io.circe.{Decoder, Encoder, Json, parser} +import io.circe.{parser, Decoder, Encoder, Json} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.{ProcessAdditionalFields, StreamMetaData} import pl.touk.nussknacker.engine.api.graph.{Edge, ProcessProperties, ScenarioGraph} import pl.touk.nussknacker.engine.api.parameter.ParameterName -import pl.touk.nussknacker.engine.api.{ProcessAdditionalFields, StreamMetaData} import pl.touk.nussknacker.engine.graph.evaluatedparam.{Parameter => NodeParameter} import pl.touk.nussknacker.engine.graph.expression.Expression -import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.node.{CustomNode, FragmentInputDefinition, UserDefinedAdditionalNodeFields} +import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.test.EitherValuesDetailedMessage class NodeDataCodecSpec extends AnyFunSuite with Matchers with EitherValuesDetailedMessage { diff --git a/designer/restmodel/src/test/scala/pl/touk/nussknacker/restmodel/validation/PrettyValidationErrorsTest.scala b/designer/restmodel/src/test/scala/pl/touk/nussknacker/restmodel/validation/PrettyValidationErrorsTest.scala index b70a050b07a..2ebeaf6d735 100644 --- a/designer/restmodel/src/test/scala/pl/touk/nussknacker/restmodel/validation/PrettyValidationErrorsTest.scala +++ b/designer/restmodel/src/test/scala/pl/touk/nussknacker/restmodel/validation/PrettyValidationErrorsTest.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.restmodel.validation import org.scalatest.Inside import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import org.scalatest.prop.TableDrivenPropertyChecks.{forAll, Table} import org.scalatest.prop.TableFor3 -import org.scalatest.prop.TableDrivenPropertyChecks.{Table, forAll} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.{ BlankId, diff --git a/designer/server/src/main/scala/db/migration/V1_013__GroupNodesChange.scala b/designer/server/src/main/scala/db/migration/V1_013__GroupNodesChange.scala index 8220f8d04b8..22c3b5dae32 100644 --- a/designer/server/src/main/scala/db/migration/V1_013__GroupNodesChange.scala +++ b/designer/server/src/main/scala/db/migration/V1_013__GroupNodesChange.scala @@ -1,7 +1,7 @@ package db.migration -import io.circe.Json._ import io.circe._ +import io.circe.Json._ import pl.touk.nussknacker.ui.db.migration.ProcessJsonMigration trait V1_013__GroupNodesChange extends ProcessJsonMigration { diff --git a/designer/server/src/main/scala/db/migration/V1_016__TypeSpecificMetaDataChange.scala b/designer/server/src/main/scala/db/migration/V1_016__TypeSpecificMetaDataChange.scala index b4133dbea2b..7b99d88913f 100644 --- a/designer/server/src/main/scala/db/migration/V1_016__TypeSpecificMetaDataChange.scala +++ b/designer/server/src/main/scala/db/migration/V1_016__TypeSpecificMetaDataChange.scala @@ -1,7 +1,7 @@ package db.migration -import io.circe.Json._ import io.circe._ +import io.circe.Json._ import pl.touk.nussknacker.ui.db.migration.ProcessJsonMigration trait V1_016__TypeSpecificMetaDataChange extends ProcessJsonMigration { diff --git a/designer/server/src/main/scala/db/migration/V1_019__SourceSinkExceptionHandlerExpressionsChange.scala b/designer/server/src/main/scala/db/migration/V1_019__SourceSinkExceptionHandlerExpressionsChange.scala index 014bad161b3..6322abb8274 100644 --- a/designer/server/src/main/scala/db/migration/V1_019__SourceSinkExceptionHandlerExpressionsChange.scala +++ b/designer/server/src/main/scala/db/migration/V1_019__SourceSinkExceptionHandlerExpressionsChange.scala @@ -1,7 +1,7 @@ package db.migration -import io.circe.Json._ import io.circe._ +import io.circe.Json._ import pl.touk.nussknacker.ui.db.migration.ProcessJsonMigration trait V1_019__SourceSinkExceptionHandlerExpressionsChange extends ProcessJsonMigration { diff --git a/designer/server/src/main/scala/db/migration/V1_041__RemoveTypeSpecificDataDefinition.scala b/designer/server/src/main/scala/db/migration/V1_041__RemoveTypeSpecificDataDefinition.scala index 1d729931fbc..4dcfc40b51e 100644 --- a/designer/server/src/main/scala/db/migration/V1_041__RemoveTypeSpecificDataDefinition.scala +++ b/designer/server/src/main/scala/db/migration/V1_041__RemoveTypeSpecificDataDefinition.scala @@ -3,9 +3,9 @@ package db.migration import com.typesafe.scalalogging.LazyLogging import db.migration.V1_041__RemoveTypeSpecificDataDefinition.migrateMetaData import io.circe._ -import pl.touk.nussknacker.ui.db.migration.ProcessJsonMigration import io.circe.syntax._ import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess +import pl.touk.nussknacker.ui.db.migration.ProcessJsonMigration trait V1_041__RemoveTypeSpecificDataDefinition extends ProcessJsonMigration with LazyLogging { diff --git a/designer/server/src/main/scala/db/migration/V1_046__RenameSubprocessToFragmentDefinition.scala b/designer/server/src/main/scala/db/migration/V1_046__RenameSubprocessToFragmentDefinition.scala index ff2820d2165..46d8fc86037 100644 --- a/designer/server/src/main/scala/db/migration/V1_046__RenameSubprocessToFragmentDefinition.scala +++ b/designer/server/src/main/scala/db/migration/V1_046__RenameSubprocessToFragmentDefinition.scala @@ -1,7 +1,7 @@ package db.migration -import io.circe.Json._ import io.circe._ +import io.circe.Json._ import pl.touk.nussknacker.ui.db.migration.ProcessJsonMigration trait V1_046__RenameSubprocessToFragmentDefinition extends ProcessJsonMigration { diff --git a/designer/server/src/main/scala/db/migration/V1_056__CreateScenarioActivitiesDefinition.scala b/designer/server/src/main/scala/db/migration/V1_056__CreateScenarioActivitiesDefinition.scala index 28f1d2c208a..389e826b099 100644 --- a/designer/server/src/main/scala/db/migration/V1_056__CreateScenarioActivitiesDefinition.scala +++ b/designer/server/src/main/scala/db/migration/V1_056__CreateScenarioActivitiesDefinition.scala @@ -102,7 +102,8 @@ object V1_056__CreateScenarioActivitiesDefinition { override def * = (id :: tupleWithoutAutoIncId.productElements).tupled <> ( - ScenarioActivityEntityData.apply _ tupled, ScenarioActivityEntityData.unapply + ScenarioActivityEntityData.apply _ tupled, + ScenarioActivityEntityData.unapply ) } diff --git a/designer/server/src/main/scala/db/migration/V1_057__MigrateActionsAndCommentsToScenarioActivitiesDefinition.scala b/designer/server/src/main/scala/db/migration/V1_057__MigrateActionsAndCommentsToScenarioActivitiesDefinition.scala index 472b2705343..1beacde2def 100644 --- a/designer/server/src/main/scala/db/migration/V1_057__MigrateActionsAndCommentsToScenarioActivitiesDefinition.scala +++ b/designer/server/src/main/scala/db/migration/V1_057__MigrateActionsAndCommentsToScenarioActivitiesDefinition.scala @@ -7,8 +7,8 @@ import pl.touk.nussknacker.ui.db.entity.{ScenarioActivityEntityFactory, Scenario import pl.touk.nussknacker.ui.db.migration.SlickMigration import slick.ast.Library.JdbcFunction import slick.jdbc.JdbcProfile -import slick.lifted.FunctionSymbolExtensionMethods.functionSymbolExtensionMethods import slick.lifted.{ProvenShape, TableQuery => LTableQuery} +import slick.lifted.FunctionSymbolExtensionMethods.functionSymbolExtensionMethods import slick.sql.SqlProfile.ColumnOption.NotNull import java.sql.Timestamp @@ -194,7 +194,8 @@ object V1_057__MigrateActionsAndCommentsToScenarioActivitiesDefinition extends L commentId, buildInfo ) <> ( - ProcessActionEntityData.apply _ tupled, ProcessActionEntityData.unapply + ProcessActionEntityData.apply _ tupled, + ProcessActionEntityData.unapply ) } @@ -250,7 +251,8 @@ object V1_057__MigrateActionsAndCommentsToScenarioActivitiesDefinition extends L impersonatedByUsername, createDate ) <> ( - CommentEntityData.apply _ tupled, CommentEntityData.unapply + CommentEntityData.apply _ tupled, + CommentEntityData.unapply ) } diff --git a/designer/server/src/main/scala/db/migration/V1_058__UpdateAndAddMissingScenarioActivitiesDefinition.scala b/designer/server/src/main/scala/db/migration/V1_058__UpdateAndAddMissingScenarioActivitiesDefinition.scala index 5eb0e0d7458..d73ea758e87 100644 --- a/designer/server/src/main/scala/db/migration/V1_058__UpdateAndAddMissingScenarioActivitiesDefinition.scala +++ b/designer/server/src/main/scala/db/migration/V1_058__UpdateAndAddMissingScenarioActivitiesDefinition.scala @@ -7,8 +7,8 @@ import pl.touk.nussknacker.ui.db.entity.{ScenarioActivityEntityFactory, Scenario import pl.touk.nussknacker.ui.db.migration.SlickMigration import slick.ast.Library.JdbcFunction import slick.jdbc.JdbcProfile -import slick.lifted.FunctionSymbolExtensionMethods.functionSymbolExtensionMethods import slick.lifted.{TableQuery => LTableQuery} +import slick.lifted.FunctionSymbolExtensionMethods.functionSymbolExtensionMethods import slick.sql.SqlProfile.ColumnOption.NotNull import java.sql.Timestamp diff --git a/designer/server/src/main/scala/db/migration/V1_060__CreateStickyNotesDefinition.scala b/designer/server/src/main/scala/db/migration/V1_060__CreateStickyNotesDefinition.scala index eef502e1b11..575b4953e57 100644 --- a/designer/server/src/main/scala/db/migration/V1_060__CreateStickyNotesDefinition.scala +++ b/designer/server/src/main/scala/db/migration/V1_060__CreateStickyNotesDefinition.scala @@ -3,9 +3,10 @@ package db.migration import com.typesafe.scalalogging.LazyLogging import db.migration.V1_060__CreateStickyNotesDefinition.StickyNotesDefinitions import pl.touk.nussknacker.ui.db.migration.SlickMigration +import shapeless.syntax.std.tuple._ import slick.jdbc.JdbcProfile import slick.sql.SqlProfile.ColumnOption.NotNull -import shapeless.syntax.std.tuple._ + import java.sql.Timestamp import java.util.UUID import scala.concurrent.ExecutionContext.Implicits.global @@ -64,7 +65,8 @@ object V1_060__CreateStickyNotesDefinition { override def * = (id :: tupleWithoutAutoIncId.productElements).tupled <> ( - StickyNoteEventEntityData.apply _ tupled, StickyNoteEventEntityData.unapply + StickyNoteEventEntityData.apply _ tupled, + StickyNoteEventEntityData.unapply ) } diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/LocalNussknackerWithSingleModel.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/LocalNussknackerWithSingleModel.scala index 74aa94fad22..86513894744 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/LocalNussknackerWithSingleModel.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/LocalNussknackerWithSingleModel.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.ui import cats.effect.{IO, Resource} import com.typesafe.config.{Config, ConfigFactory, ConfigValue, ConfigValueFactory} import org.apache.commons.io.FileUtils -import pl.touk.nussknacker.engine.util.loader.DeploymentManagersClassLoader import pl.touk.nussknacker.engine.{DeploymentManagerProvider, ModelData} +import pl.touk.nussknacker.engine.util.loader.DeploymentManagersClassLoader import pl.touk.nussknacker.ui.config.{DesignerConfig, SimpleConfigLoadingDesignerConfigLoader} import pl.touk.nussknacker.ui.factory.NussknackerAppFactory import pl.touk.nussknacker.ui.process.processingtype.loader.LocalProcessingTypeDataLoader diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ActionInfoHttpService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ActionInfoHttpService.scala index b1adb1c6a91..c080ba73676 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ActionInfoHttpService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ActionInfoHttpService.scala @@ -3,7 +3,7 @@ package pl.touk.nussknacker.ui.api import com.typesafe.scalalogging.LazyLogging import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.restmodel.BaseEndpointDefinitions -import pl.touk.nussknacker.ui.api.ActionInfoHttpService.{ActionInfoError, toUiParameters} +import pl.touk.nussknacker.ui.api.ActionInfoHttpService.{toUiParameters, ActionInfoError} import pl.touk.nussknacker.ui.api.ActionInfoHttpService.ActionInfoError.{NoPermission, NoScenario} import pl.touk.nussknacker.ui.api.BaseHttpService.CustomAuthorizationError import pl.touk.nussknacker.ui.api.description.ActionInfoEndpoints diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/AppApiHttpService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/AppApiHttpService.scala index 3d4f75316ba..d5c6d44350b 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/AppApiHttpService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/AppApiHttpService.scala @@ -5,19 +5,19 @@ import com.typesafe.scalalogging.LazyLogging import io.circe.parser import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus.ProblemStateStatus import pl.touk.nussknacker.engine.api.modelinfo.ModelInfo -import pl.touk.nussknacker.engine.api.process.{ProcessName, ProcessingType} +import pl.touk.nussknacker.engine.api.process.{ProcessingType, ProcessName} import pl.touk.nussknacker.engine.util.ExecutionContextWithIORuntime import pl.touk.nussknacker.engine.util.Implicits.RichTupleList import pl.touk.nussknacker.engine.version.BuildInfo import pl.touk.nussknacker.restmodel.scenariodetails.{ScenarioStatusDto, ScenarioStatusNameWrapperDto} import pl.touk.nussknacker.ui.api.description.AppApiEndpoints import pl.touk.nussknacker.ui.api.description.AppApiEndpoints.Dtos._ +import pl.touk.nussknacker.ui.process.{ProcessService, ScenarioQuery} import pl.touk.nussknacker.ui.process.ProcessService.GetScenarioWithDetailsOptions import pl.touk.nussknacker.ui.process.processingtype.provider.{ ProcessingTypeDataProvider, ReloadableProcessingTypeDataProvider } -import pl.touk.nussknacker.ui.process.{ProcessService, ScenarioQuery} import pl.touk.nussknacker.ui.security.api.{AuthManager, LoggedUser, NussknackerInternalUser} import scala.concurrent.Future diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/BaseHttpService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/BaseHttpService.scala index 63f684bc3d4..25174146106 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/BaseHttpService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/BaseHttpService.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.ui.api import cats.data.EitherT import pl.touk.nussknacker.security.AuthCredentials import pl.touk.nussknacker.ui.api.BaseHttpService.{CustomAuthorizationError, NoRequirementServerEndpoint} -import pl.touk.nussknacker.ui.security.api.SecurityError.InsufficientPermission import pl.touk.nussknacker.ui.security.api._ +import pl.touk.nussknacker.ui.security.api.SecurityError.InsufficientPermission import sttp.tapir.server.{PartialServerEndpoint, ServerEndpoint} import java.util.concurrent.atomic.AtomicReference diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/DictApiHttpService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/DictApiHttpService.scala index 1d4e0b6bb45..c64c8bde008 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/DictApiHttpService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/DictApiHttpService.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.ui.api import cats.data.Validated.{Invalid, Valid} import com.typesafe.scalalogging.LazyLogging import org.springframework.util.ClassUtils -import pl.touk.nussknacker.engine.api.dict.DictRegistry.DictNotDeclared import pl.touk.nussknacker.engine.api.dict.{DictDefinition, DictQueryService} +import pl.touk.nussknacker.engine.api.dict.DictRegistry.DictNotDeclared import pl.touk.nussknacker.engine.api.typed.TypingResultDecoder import pl.touk.nussknacker.ui.api.description.DictApiEndpoints import pl.touk.nussknacker.ui.api.description.DictApiEndpoints.DictError diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ManagementResources.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ManagementResources.scala index 349f85d1d55..673f93003f0 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ManagementResources.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ManagementResources.scala @@ -6,14 +6,14 @@ import akka.http.scaladsl.server._ import akka.http.scaladsl.unmarshalling.{FromEntityUnmarshaller, Unmarshaller} import com.typesafe.scalalogging.LazyLogging import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport +import io.circe.{parser, Decoder, Encoder, Json} import io.circe.generic.extras.semiauto.deriveConfiguredEncoder -import io.circe.{Decoder, Encoder, Json, parser} import io.dropwizard.metrics5.MetricRegistry import pl.touk.nussknacker.engine.ModelData import pl.touk.nussknacker.engine.api.Comment import pl.touk.nussknacker.engine.api.component.NodesDeploymentData -import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment._ +import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.graph.ScenarioGraph import pl.touk.nussknacker.engine.testmode.TestProcess._ import pl.touk.nussknacker.restmodel.{CancelRequest, DeployRequest, RunOffScheduleRequest, RunOffScheduleResponse} @@ -21,8 +21,8 @@ import pl.touk.nussknacker.ui.api.ProcessesResources.ProcessUnmarshallingError import pl.touk.nussknacker.ui.api.description.NodesApiEndpoints.Dtos.AdhocTestParametersRequest import pl.touk.nussknacker.ui.metrics.TimeMeasuring.measureTime import pl.touk.nussknacker.ui.process.ProcessService -import pl.touk.nussknacker.ui.process.deployment.LoggedUserConversions.LoggedUserOps import pl.touk.nussknacker.ui.process.deployment._ +import pl.touk.nussknacker.ui.process.deployment.LoggedUserConversions.LoggedUserOps import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataProvider import pl.touk.nussknacker.ui.process.test.{RawScenarioTestData, ResultsWithCounts, ScenarioTestService} import pl.touk.nussknacker.ui.security.api.LoggedUser @@ -31,9 +31,8 @@ import scala.concurrent.{ExecutionContext, Future} object ManagementResources { - import pl.touk.nussknacker.engine.api.CirceUtil._ - import io.circe.syntax._ + import pl.touk.nussknacker.engine.api.CirceUtil._ implicit val resultsWithCountsEncoder: Encoder[ResultsWithCounts] = deriveConfiguredEncoder diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/MigrationApiHttpService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/MigrationApiHttpService.scala index 17477dc3b20..727bbd9577c 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/MigrationApiHttpService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/MigrationApiHttpService.scala @@ -4,8 +4,8 @@ import cats.data.EitherT import com.typesafe.scalalogging.LazyLogging import pl.touk.nussknacker.ui.api.description.MigrationApiEndpoints import pl.touk.nussknacker.ui.api.description.MigrationApiEndpoints.Dtos._ -import pl.touk.nussknacker.ui.migrations.MigrationService.MigrationError import pl.touk.nussknacker.ui.migrations.{MigrateScenarioData, MigrationApiAdapterService, MigrationService} +import pl.touk.nussknacker.ui.migrations.MigrationService.MigrationError import pl.touk.nussknacker.ui.security.api.AuthManager import scala.concurrent.{ExecutionContext, Future} diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/NodesApiHttpService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/NodesApiHttpService.scala index d18f812862d..f5617bc9687 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/NodesApiHttpService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/NodesApiHttpService.scala @@ -6,7 +6,7 @@ import com.typesafe.scalalogging.LazyLogging import io.circe.Decoder import pl.touk.nussknacker.engine.ModelData import pl.touk.nussknacker.engine.api.graph.{ProcessProperties, ScenarioGraph} -import pl.touk.nussknacker.engine.api.process.{ProcessName, ProcessingType} +import pl.touk.nussknacker.engine.api.process.{ProcessingType, ProcessName} import pl.touk.nussknacker.engine.api.typed.typing.TypingResult import pl.touk.nussknacker.engine.graph.node.SourceNodeData import pl.touk.nussknacker.engine.spel.ExpressionSuggestion @@ -16,6 +16,19 @@ import pl.touk.nussknacker.ui.additionalInfo.AdditionalInfoProviders import pl.touk.nussknacker.ui.api.BaseHttpService.CustomAuthorizationError import pl.touk.nussknacker.ui.api.description.NodesApiEndpoints import pl.touk.nussknacker.ui.api.description.NodesApiEndpoints.Dtos +import pl.touk.nussknacker.ui.api.description.NodesApiEndpoints.Dtos.{ + decodeVariableTypes, + prepareTypingResultDecoder, + ExpressionSuggestionDto, + NodesError, + NodeValidationRequest, + NodeValidationRequestDto, + NodeValidationResult, + NodeValidationResultDto, + ParametersValidationRequest, + ParametersValidationRequestDto, + ParametersValidationResultDto +} import pl.touk.nussknacker.ui.api.description.NodesApiEndpoints.Dtos.NodesError.BadRequestNodesError.{ InvalidNodeType, MalformedTypingResult, @@ -30,19 +43,6 @@ import pl.touk.nussknacker.ui.api.description.NodesApiEndpoints.Dtos.NodesError. NoProcessingType, NoScenario } -import pl.touk.nussknacker.ui.api.description.NodesApiEndpoints.Dtos.{ - ExpressionSuggestionDto, - NodeValidationRequest, - NodeValidationRequestDto, - NodeValidationResult, - NodeValidationResultDto, - NodesError, - ParametersValidationRequest, - ParametersValidationRequestDto, - ParametersValidationResultDto, - decodeVariableTypes, - prepareTypingResultDecoder -} import pl.touk.nussknacker.ui.api.utils.ScenarioDetailsOps._ import pl.touk.nussknacker.ui.api.utils.ScenarioHttpServiceExtensions import pl.touk.nussknacker.ui.process.ProcessService diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ProcessesExportResources.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ProcessesExportResources.scala index ae73ee4eac1..8168679df09 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ProcessesExportResources.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ProcessesExportResources.scala @@ -7,18 +7,18 @@ import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport import io.circe.syntax._ import pl.touk.nussknacker.engine.api.ProcessVersion import pl.touk.nussknacker.engine.api.graph.ScenarioGraph -import pl.touk.nussknacker.engine.api.process.{ProcessName, ProcessingType} +import pl.touk.nussknacker.engine.api.process.{ProcessingType, ProcessName} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.Legacy.ProcessActivity import pl.touk.nussknacker.ui.process.ProcessService import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataProvider -import pl.touk.nussknacker.ui.process.repository.activities.ScenarioActivityRepository import pl.touk.nussknacker.ui.process.repository.{ DBIOActionRunner, FetchingProcessRepository, ScenarioWithDetailsEntity } +import pl.touk.nussknacker.ui.process.repository.activities.ScenarioActivityRepository import pl.touk.nussknacker.ui.security.api.LoggedUser import pl.touk.nussknacker.ui.uiresolving.UIProcessResolver import pl.touk.nussknacker.ui.util._ diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ProcessesResources.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ProcessesResources.scala index c0b310e1597..e6719651aa3 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ProcessesResources.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ProcessesResources.scala @@ -12,8 +12,9 @@ import pl.touk.nussknacker.engine.api.process.{ProcessName, VersionId} import pl.touk.nussknacker.engine.util.Implicits._ import pl.touk.nussknacker.restmodel.scenariodetails.ScenarioStatusDto import pl.touk.nussknacker.ui._ -import pl.touk.nussknacker.ui.listener.ProcessChangeEvent._ import pl.touk.nussknacker.ui.listener.{ProcessChangeEvent, ProcessChangeListener, User} +import pl.touk.nussknacker.ui.listener.ProcessChangeEvent._ +import pl.touk.nussknacker.ui.process._ import pl.touk.nussknacker.ui.process.ProcessService.{ CreateScenarioCommand, FetchScenarioGraph, @@ -21,7 +22,6 @@ import pl.touk.nussknacker.ui.process.ProcessService.{ UpdateScenarioCommand } import pl.touk.nussknacker.ui.process.ScenarioWithDetailsConversions._ -import pl.touk.nussknacker.ui.process._ import pl.touk.nussknacker.ui.process.deployment.scenariostatus.ScenarioStatusProvider import pl.touk.nussknacker.ui.security.api.LoggedUser import pl.touk.nussknacker.ui.util._ diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/RemoteEnvironmentResources.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/RemoteEnvironmentResources.scala index a1a64a9ba93..e6a69fe4080 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/RemoteEnvironmentResources.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/RemoteEnvironmentResources.scala @@ -13,14 +13,14 @@ import pl.touk.nussknacker.engine.api.process.{ProcessIdWithName, ProcessName, V import pl.touk.nussknacker.restmodel.scenariodetails.ScenarioWithDetails import pl.touk.nussknacker.ui.NuDesignerError import pl.touk.nussknacker.ui.NuDesignerError.XError +import pl.touk.nussknacker.ui.process.{ProcessService, ScenarioQuery} import pl.touk.nussknacker.ui.process.ProcessService.GetScenarioWithDetailsOptions import pl.touk.nussknacker.ui.process.migrate.{RemoteEnvironment, RemoteEnvironmentCommunicationError} import pl.touk.nussknacker.ui.process.repository.DBIOActionRunner import pl.touk.nussknacker.ui.process.repository.activities.ScenarioActivityRepository -import pl.touk.nussknacker.ui.process.{ProcessService, ScenarioQuery} import pl.touk.nussknacker.ui.security.api.LoggedUser -import pl.touk.nussknacker.ui.util.LoggedUserUtils.Ops import pl.touk.nussknacker.ui.util.{NuPathMatchers, ScenarioGraphComparator} +import pl.touk.nussknacker.ui.util.LoggedUserUtils.Ops import java.time.{Clock, Instant} import scala.concurrent.{ExecutionContext, Future} diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ScenarioActivityApiHttpService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ScenarioActivityApiHttpService.scala index 56f73440b71..b92736acced 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ScenarioActivityApiHttpService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ScenarioActivityApiHttpService.scala @@ -7,6 +7,8 @@ import pl.touk.nussknacker.engine.api.deployment.{ScenarioActivity, _} import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessIdWithName, ProcessName} import pl.touk.nussknacker.security.Permission import pl.touk.nussknacker.security.Permission.Permission +import pl.touk.nussknacker.ui.api.description.scenarioActivity.{Dtos, Endpoints} +import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.{Comment => _, _} import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.ScenarioActivityError.{ InvalidComment, NoActivity, @@ -15,18 +17,16 @@ import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.ScenarioActi NoPermission, NoScenario } -import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.{Comment => _, _} -import pl.touk.nussknacker.ui.api.description.scenarioActivity.{Dtos, Endpoints} +import pl.touk.nussknacker.ui.process.{ProcessService, ScenarioAttachmentService} import pl.touk.nussknacker.ui.process.ProcessService.GetScenarioWithDetailsOptions +import pl.touk.nussknacker.ui.process.repository.{DBIOActionRunner, DeploymentComment} import pl.touk.nussknacker.ui.process.repository.activities.ScenarioActivityRepository import pl.touk.nussknacker.ui.process.repository.activities.ScenarioActivityRepository.{ CommentModificationMetadata, DeleteAttachmentError, ModifyCommentError } -import pl.touk.nussknacker.ui.process.repository.{DBIOActionRunner, DeploymentComment} import pl.touk.nussknacker.ui.process.scenarioactivity.FetchScenarioActivityService -import pl.touk.nussknacker.ui.process.{ProcessService, ScenarioAttachmentService} import pl.touk.nussknacker.ui.security.api.{AuthManager, LoggedUser} import pl.touk.nussknacker.ui.server.HeadersSupport.ContentDisposition import pl.touk.nussknacker.ui.server.TapirStreamEndpointProvider diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/SettingsResources.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/SettingsResources.scala index e2915233594..a3cb9087add 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/SettingsResources.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/SettingsResources.scala @@ -5,9 +5,9 @@ import cats.data.Validated import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport import io.circe.{Decoder, Encoder} import io.circe.generic.JsonCodec -import pl.touk.nussknacker.ui.config.{FeatureTogglesConfig, UsageStatisticsReportsConfig} import pl.touk.nussknacker.engine.api.CirceUtil.codecs._ import pl.touk.nussknacker.ui.api.description.stickynotes.Dtos.StickyNotesSettings +import pl.touk.nussknacker.ui.config.{FeatureTogglesConfig, UsageStatisticsReportsConfig} import pl.touk.nussknacker.ui.statistics.{Fingerprint, FingerprintService} import java.net.URL diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/StickyNotesApiHttpService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/StickyNotesApiHttpService.scala index 0c29c5257c3..24c77c96e6d 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/StickyNotesApiHttpService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/StickyNotesApiHttpService.scala @@ -11,9 +11,9 @@ import pl.touk.nussknacker.ui.api.description.stickynotes.Dtos.{ StickyNoteAddRequest, StickyNoteCorrelationId, StickyNoteId, - StickyNoteUpdateRequest, StickyNotesError, - StickyNotesSettings + StickyNotesSettings, + StickyNoteUpdateRequest } import pl.touk.nussknacker.ui.api.description.stickynotes.Dtos.StickyNotesError.{ NoPermission, @@ -21,9 +21,9 @@ import pl.touk.nussknacker.ui.api.description.stickynotes.Dtos.StickyNotesError. StickyNoteContentTooLong, StickyNoteCountLimitReached } -import pl.touk.nussknacker.ui.process.repository.stickynotes.StickyNotesRepository -import pl.touk.nussknacker.ui.process.repository.DBIOActionRunner import pl.touk.nussknacker.ui.process.ProcessService +import pl.touk.nussknacker.ui.process.repository.DBIOActionRunner +import pl.touk.nussknacker.ui.process.repository.stickynotes.StickyNotesRepository import pl.touk.nussknacker.ui.security.api.{AuthManager, LoggedUser} import scala.concurrent.{ExecutionContext, Future} diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/TapirCodecs.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/TapirCodecs.scala index 8dd477c5443..eeb5b4f611a 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/TapirCodecs.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/TapirCodecs.scala @@ -12,9 +12,9 @@ import pl.touk.nussknacker.engine.deployment.EngineSetupName import pl.touk.nussknacker.restmodel.definition.{UIParameter, UISourceParameters} import pl.touk.nussknacker.ui.process.test.RawScenarioTestData import pl.touk.nussknacker.ui.server.HeadersSupport.{ContentDisposition, FileName} +import sttp.tapir.{Codec, CodecFormat, DecodeResult, Schema, Validator} import sttp.tapir.Codec.PlainCodec import sttp.tapir.CodecFormat.TextPlain -import sttp.tapir.{Codec, CodecFormat, DecodeResult, Schema, Validator} import java.net.URL diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/TestingApiHttpService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/TestingApiHttpService.scala index 6a0bca1b4a4..987d6a20a8c 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/TestingApiHttpService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/TestingApiHttpService.scala @@ -2,7 +2,7 @@ package pl.touk.nussknacker.ui.api import cats.data.EitherT import com.typesafe.scalalogging.LazyLogging -import pl.touk.nussknacker.engine.api.process.{ProcessName, ProcessingType} +import pl.touk.nussknacker.engine.api.process.{ProcessingType, ProcessName} import pl.touk.nussknacker.restmodel.BaseEndpointDefinitions import pl.touk.nussknacker.ui.api.BaseHttpService.CustomAuthorizationError import pl.touk.nussknacker.ui.api.TestingApiHttpService.TestingError @@ -16,8 +16,8 @@ import pl.touk.nussknacker.ui.process.test.ScenarioTestService import pl.touk.nussknacker.ui.security.api.AuthManager import pl.touk.nussknacker.ui.validation.ParametersValidator import sttp.model.StatusCode.{BadRequest, NotFound} +import sttp.tapir.{oneOfVariantFromMatchType, plainBody, Codec, CodecFormat, EndpointOutput} import sttp.tapir.EndpointIO.Example -import sttp.tapir.{Codec, CodecFormat, EndpointOutput, oneOfVariantFromMatchType, plainBody} import scala.concurrent.{ExecutionContext, Future} diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/ActionInfoEndpoints.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/ActionInfoEndpoints.scala index a0457a80983..7a46f4d2c1f 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/ActionInfoEndpoints.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/ActionInfoEndpoints.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.ui.api.description import io.circe.generic.JsonCodec -import pl.touk.nussknacker.engine.api.deployment.ScenarioActionName import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.definition.{ParameterEditor, RawParameterEditor} +import pl.touk.nussknacker.engine.api.deployment.ScenarioActionName import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.restmodel.BaseEndpointDefinitions import pl.touk.nussknacker.restmodel.BaseEndpointDefinitions.SecuredEndpoint @@ -17,8 +17,8 @@ import pl.touk.nussknacker.ui.api.description.ActionInfoEndpoints.Dtos.{ } import pl.touk.nussknacker.ui.api.description.ActionInfoEndpoints.Examples.noScenarioExample import sttp.model.StatusCode.{NotFound, Ok} -import sttp.tapir.EndpointIO.Example import sttp.tapir._ +import sttp.tapir.EndpointIO.Example import sttp.tapir.json.circe.jsonBody class ActionInfoEndpoints(auth: EndpointInput[AuthCredentials]) extends BaseEndpointDefinitions { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/AppApiEndpoints.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/AppApiEndpoints.scala index 8048f464909..94de1b92790 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/AppApiEndpoints.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/AppApiEndpoints.scala @@ -2,18 +2,18 @@ package pl.touk.nussknacker.ui.api.description import derevo.circe.{decoder, encoder} import derevo.derive -import enumeratum.EnumEntry.Uppercase import enumeratum._ -import io.circe.syntax.EncoderOps +import enumeratum.EnumEntry.Uppercase import io.circe.{Codec => CirceCodec, Decoder, Encoder, Json} +import io.circe.syntax.EncoderOps import pl.touk.nussknacker.engine.api.CirceUtil.HCursorExt import pl.touk.nussknacker.engine.api.modelinfo.ModelInfo import pl.touk.nussknacker.restmodel.BaseEndpointDefinitions import pl.touk.nussknacker.restmodel.BaseEndpointDefinitions.SecuredEndpoint import pl.touk.nussknacker.security.AuthCredentials import sttp.model.StatusCode.{InternalServerError, NoContent, Ok} -import sttp.tapir.EndpointIO.Example import sttp.tapir._ +import sttp.tapir.EndpointIO.Example import sttp.tapir.codec.enumeratum._ import sttp.tapir.derevo.schema import sttp.tapir.json.circe.jsonBody diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/DeploymentApiEndpoints.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/DeploymentApiEndpoints.scala index e5e8c9afcbc..989e2d67ea8 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/DeploymentApiEndpoints.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/DeploymentApiEndpoints.scala @@ -3,6 +3,7 @@ package pl.touk.nussknacker.ui.api.description import cats.data.NonEmptyList import derevo.circe.{decoder, encoder} import derevo.derive +import pl.touk.nussknacker.engine.api.Comment import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.{ EmptyProcess, @@ -19,11 +20,10 @@ import pl.touk.nussknacker.restmodel.validation.PrettyValidationErrors import pl.touk.nussknacker.restmodel.validation.ValidationResults.{UIGlobalError, ValidationErrors} import pl.touk.nussknacker.security.AuthCredentials import pl.touk.nussknacker.ui.api.BaseHttpService.CustomAuthorizationError -import pl.touk.nussknacker.engine.api.Comment import sttp.model.StatusCode +import sttp.tapir._ import sttp.tapir.Codec.PlainCodec import sttp.tapir.EndpointIO.{Example, Info} -import sttp.tapir._ import sttp.tapir.derevo.schema import sttp.tapir.json.circe.jsonBody diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/MigrationApiEndpoints.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/MigrationApiEndpoints.scala index 35db61209cb..610d5d950d3 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/MigrationApiEndpoints.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/MigrationApiEndpoints.scala @@ -34,8 +34,8 @@ import pl.touk.nussknacker.ui.migrations.MigrationService.MigrationError.{ import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter import pl.touk.nussknacker.ui.security.api.RealLoggedUser import sttp.model.StatusCode._ -import sttp.tapir.EndpointIO.Example import sttp.tapir._ +import sttp.tapir.EndpointIO.Example import sttp.tapir.derevo.schema import sttp.tapir.json.circe.jsonBody diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/NodesApiEndpoints.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/NodesApiEndpoints.scala index 14572c57056..f052135858c 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/NodesApiEndpoints.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/NodesApiEndpoints.scala @@ -1,16 +1,16 @@ package pl.touk.nussknacker.ui.api.description -import cats.implicits.toTraverseOps import cats.data.NonEmptyList +import cats.implicits.toTraverseOps import derevo.circe.{decoder, encoder} import derevo.derive +import io.circe.{Decoder, Encoder, Json, KeyDecoder, KeyEncoder} import io.circe.generic.JsonCodec import io.circe.generic.extras.semiauto.deriveConfiguredDecoder -import io.circe.{Decoder, Encoder, Json, KeyDecoder, KeyEncoder} import org.springframework.util.ClassUtils import pl.touk.nussknacker.engine.additionalInfo.{AdditionalInfo, MarkdownAdditionalInfo} -import pl.touk.nussknacker.engine.api.CirceUtil._ import pl.touk.nussknacker.engine.api.{LayoutData, ProcessAdditionalFields, StreamMetaData} +import pl.touk.nussknacker.engine.api.CirceUtil._ import pl.touk.nussknacker.engine.api.definition.{ FixedExpressionValue, FixedExpressionValueWithIcon, @@ -25,21 +25,21 @@ import pl.touk.nussknacker.engine.api.parameter.{ ParameterValueCompileTimeValidation, ParameterValueInput } -import pl.touk.nussknacker.engine.api.process.{ProcessName, ProcessingType} +import pl.touk.nussknacker.engine.api.process.{ProcessingType, ProcessName} import pl.touk.nussknacker.engine.api.typed.TypingResultDecoder import pl.touk.nussknacker.engine.api.typed.typing._ import pl.touk.nussknacker.engine.graph.EdgeType import pl.touk.nussknacker.engine.graph.evaluatedparam.{Parameter => EvaluatedParameter} import pl.touk.nussknacker.engine.graph.evaluatedparam.BranchParameters import pl.touk.nussknacker.engine.graph.expression.Expression -import pl.touk.nussknacker.engine.graph.fragment.FragmentRef import pl.touk.nussknacker.engine.graph.expression.Expression.Language -import pl.touk.nussknacker.engine.graph.node.NodeData +import pl.touk.nussknacker.engine.graph.fragment.FragmentRef +import pl.touk.nussknacker.engine.graph.node._ +import pl.touk.nussknacker.engine.graph.node.{BranchEndDefinition, FragmentInput} import pl.touk.nussknacker.engine.graph.node.{Enricher, Filter} import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} +import pl.touk.nussknacker.engine.graph.node.NodeData import pl.touk.nussknacker.engine.graph.node.NodeData.nodeDataEncoder -import pl.touk.nussknacker.engine.graph.node.{BranchEndDefinition, FragmentInput} -import pl.touk.nussknacker.engine.graph.node._ import pl.touk.nussknacker.engine.graph.service.ServiceRef import pl.touk.nussknacker.engine.graph.sink.SinkRef import pl.touk.nussknacker.engine.graph.source.SourceRef @@ -51,9 +51,9 @@ import pl.touk.nussknacker.restmodel.BaseEndpointDefinitions.SecuredEndpoint import pl.touk.nussknacker.restmodel.definition.{UIParameter, UIValueParameter} import pl.touk.nussknacker.restmodel.validation.ValidationResults.{NodeValidationError, NodeValidationErrorType} import pl.touk.nussknacker.security.AuthCredentials +import pl.touk.nussknacker.ui.api.BaseHttpService.CustomAuthorizationError import pl.touk.nussknacker.ui.api.TapirCodecs.ScenarioGraphCodec._ import pl.touk.nussknacker.ui.api.TapirCodecs.ScenarioNameCodec._ -import pl.touk.nussknacker.ui.api.BaseHttpService.CustomAuthorizationError import pl.touk.nussknacker.ui.api.description.NodesApiEndpoints.Dtos.NodeDataSchemas.nodeDataSchema import pl.touk.nussknacker.ui.api.description.NodesApiEndpoints.Dtos.NodesError.{ BadRequestNodesError, @@ -83,10 +83,10 @@ import pl.touk.nussknacker.ui.api.description.TypingDtoSchemas.TypedTaggedSchema import pl.touk.nussknacker.ui.api.description.TypingDtoSchemas.TypedUnionSchemaHelper.typedUnionTypeSchema import pl.touk.nussknacker.ui.api.description.TypingDtoSchemas.UnknownSchemaHelper.unknownTypeSchema import sttp.model.StatusCode.{BadRequest, InternalServerError, NotFound, Ok} +import sttp.tapir._ import sttp.tapir.EndpointIO.Example import sttp.tapir.Schema.{SName, Typeclass} -import sttp.tapir.SchemaType.{SProduct, SProductField, SString, SchemaWithValue} -import sttp.tapir._ +import sttp.tapir.SchemaType.{SchemaWithValue, SProduct, SProductField, SString} import sttp.tapir.derevo.schema import sttp.tapir.json.circe.jsonBody @@ -1638,9 +1638,9 @@ object NodesApiEndpoints { object TypingDtoSchemas { import pl.touk.nussknacker.engine.api.typed.typing._ + import sttp.tapir.{FieldName, Schema, SchemaType} import sttp.tapir.Schema.SName import sttp.tapir.SchemaType.SProductField - import sttp.tapir.{FieldName, Schema, SchemaType} implicit lazy val typingResult: Schema[TypingResult] = { Schema( diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/NotificationApiEndpoints.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/NotificationApiEndpoints.scala index df2f41e7328..7aad0962dbb 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/NotificationApiEndpoints.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/NotificationApiEndpoints.scala @@ -6,9 +6,9 @@ import pl.touk.nussknacker.restmodel.BaseEndpointDefinitions.SecuredEndpoint import pl.touk.nussknacker.security.AuthCredentials import pl.touk.nussknacker.ui.notifications.{DataToRefresh, Notification} import sttp.model.StatusCode.Ok +import sttp.tapir.{query, statusCode, Codec, CodecFormat, EndpointInput} import sttp.tapir.EndpointIO.Example import sttp.tapir.json.circe.jsonBody -import sttp.tapir.{Codec, CodecFormat, EndpointInput, query, statusCode} class NotificationApiEndpoints(auth: EndpointInput[AuthCredentials]) extends BaseEndpointDefinitions { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/ScenarioLabelsApiEndpoints.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/ScenarioLabelsApiEndpoints.scala index 5015cf9e5de..8800ccc3393 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/ScenarioLabelsApiEndpoints.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/ScenarioLabelsApiEndpoints.scala @@ -12,8 +12,8 @@ import pl.touk.nussknacker.ui.api.description.ScenarioLabelsApiEndpoints.Dtos.{ ValidationError } import sttp.model.StatusCode.Ok -import sttp.tapir.EndpointIO.Example import sttp.tapir._ +import sttp.tapir.EndpointIO.Example import sttp.tapir.derevo.schema import sttp.tapir.json.circe.jsonBody diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/ScenarioParametersApiEndpoints.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/ScenarioParametersApiEndpoints.scala index 97f3a9e8901..b489dd3e133 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/ScenarioParametersApiEndpoints.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/ScenarioParametersApiEndpoints.scala @@ -10,8 +10,8 @@ import pl.touk.nussknacker.restmodel.scenariodetails.ScenarioParameters import pl.touk.nussknacker.security.AuthCredentials import pl.touk.nussknacker.ui.api.description.ScenarioParametersApiEndpoints.Dtos.ScenarioParametersCombinationWithEngineErrors import sttp.model.StatusCode.Ok -import sttp.tapir.EndpointIO.Example import sttp.tapir._ +import sttp.tapir.EndpointIO.Example import sttp.tapir.derevo.schema import sttp.tapir.json.circe.jsonBody diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/StatisticsApiEndpoints.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/StatisticsApiEndpoints.scala index 85d714289ac..0b2ccd3b750 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/StatisticsApiEndpoints.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/StatisticsApiEndpoints.scala @@ -2,15 +2,15 @@ package pl.touk.nussknacker.ui.api.description import derevo.circe.{decoder, encoder} import derevo.derive -import enumeratum.EnumEntry.UpperSnakecase import enumeratum.{CirceEnum, Enum, EnumEntry} +import enumeratum.EnumEntry.UpperSnakecase import pl.touk.nussknacker.restmodel.BaseEndpointDefinitions import pl.touk.nussknacker.restmodel.BaseEndpointDefinitions.SecuredEndpoint import pl.touk.nussknacker.security.AuthCredentials import pl.touk.nussknacker.ui.api.TapirCodecs import sttp.model.StatusCode.{InternalServerError, NoContent, Ok} -import sttp.tapir.EndpointIO.Example import sttp.tapir._ +import sttp.tapir.EndpointIO.Example import sttp.tapir.codec.enumeratum._ import sttp.tapir.derevo.schema import sttp.tapir.json.circe.jsonBody diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/StickyNotesApiEndpoints.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/StickyNotesApiEndpoints.scala index 4dff4ac3d0e..f572cb7dd83 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/StickyNotesApiEndpoints.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/StickyNotesApiEndpoints.scala @@ -23,8 +23,8 @@ import pl.touk.nussknacker.ui.api.description.stickynotes.Dtos.StickyNotesError. StickyNoteCountLimitReached } import sttp.model.StatusCode.{BadRequest, NotFound, Ok} -import sttp.tapir.EndpointIO.Example import sttp.tapir._ +import sttp.tapir.EndpointIO.Example import sttp.tapir.json.circe.jsonBody import java.time.Instant @@ -32,6 +32,7 @@ import java.time.Instant class StickyNotesApiEndpoints(auth: EndpointInput[AuthCredentials]) extends BaseEndpointDefinitions { import stickynotes.Dtos._ + import TapirCodecs.VersionIdCodec._ lazy val encoder: Encoder[TypingResult] = TypingResult.encoder diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/TestingApiEndpoints.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/TestingApiEndpoints.scala index 51536d7edc8..b1dce17bee4 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/TestingApiEndpoints.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/TestingApiEndpoints.scala @@ -25,8 +25,8 @@ import pl.touk.nussknacker.ui.api.TestingApiHttpService.Examples.{ import pl.touk.nussknacker.ui.api.TestingApiHttpService.TestingError import pl.touk.nussknacker.ui.definition.DefinitionsService import sttp.model.StatusCode.Ok -import sttp.tapir.EndpointIO.Example import sttp.tapir._ +import sttp.tapir.EndpointIO.Example import sttp.tapir.json.circe.jsonBody class TestingApiEndpoints(auth: EndpointInput[AuthCredentials]) extends BaseEndpointDefinitions { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/UserApiEndpoints.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/UserApiEndpoints.scala index 1095c09e4d6..58cc1d8d987 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/UserApiEndpoints.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/UserApiEndpoints.scala @@ -5,13 +5,13 @@ import derevo.derive import pl.touk.nussknacker.restmodel.BaseEndpointDefinitions import pl.touk.nussknacker.restmodel.BaseEndpointDefinitions.SecuredEndpoint import pl.touk.nussknacker.security.AuthCredentials -import pl.touk.nussknacker.ui.security.api.GlobalPermission.GlobalPermission import pl.touk.nussknacker.ui.security.api._ +import pl.touk.nussknacker.ui.security.api.GlobalPermission.GlobalPermission import sttp.model.StatusCode.Ok +import sttp.tapir.{statusCode, EndpointInput} import sttp.tapir.EndpointIO.Example import sttp.tapir.derevo.schema import sttp.tapir.json.circe.jsonBody -import sttp.tapir.{EndpointInput, statusCode} class UserApiEndpoints(auth: EndpointInput[AuthCredentials]) extends BaseEndpointDefinitions { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/scenarioActivity/Dtos.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/scenarioActivity/Dtos.scala index 2d43ec65e15..0929f6a14c0 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/scenarioActivity/Dtos.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/scenarioActivity/Dtos.scala @@ -2,12 +2,12 @@ package pl.touk.nussknacker.ui.api.description.scenarioActivity import derevo.circe.{decoder, encoder} import derevo.derive -import enumeratum.EnumEntry.UpperSnakecase import enumeratum.{Enum, EnumEntry} +import enumeratum.EnumEntry.UpperSnakecase import io.circe +import io.circe.{Decoder, Encoder} import io.circe.generic.extras import io.circe.generic.extras.semiauto.deriveConfiguredCodec -import io.circe.{Decoder, Encoder} import pl.touk.nussknacker.engine.api.deployment.ScheduledExecutionStatus import pl.touk.nussknacker.engine.api.process.{ProcessName, VersionId} import pl.touk.nussknacker.restmodel.BaseEndpointDefinitions @@ -21,8 +21,8 @@ import sttp.tapir.derevo.schema import sttp.tapir.generic.Configuration import java.io.InputStream -import java.time.format.DateTimeFormatter import java.time.{Instant, ZoneId} +import java.time.format.DateTimeFormatter import java.util.UUID import scala.collection.immutable diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/scenarioActivity/Endpoints.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/scenarioActivity/Endpoints.scala index 91ab6c82018..6c039de1984 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/scenarioActivity/Endpoints.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/scenarioActivity/Endpoints.scala @@ -18,13 +18,14 @@ import java.util.UUID class Endpoints(auth: EndpointInput[AuthCredentials], streamProvider: TapirStreamEndpointProvider, zoneId: ZoneId) extends BaseEndpointDefinitions { + import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos._ + import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.ScenarioActivityError._ + import pl.touk.nussknacker.ui.api.description.scenarioActivity.InputOutput._ + import TapirCodecs.ContentDispositionCodec._ import TapirCodecs.HeaderCodec._ import TapirCodecs.ScenarioNameCodec._ import TapirCodecs.VersionIdCodec._ - import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.ScenarioActivityError._ - import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos._ - import pl.touk.nussknacker.ui.api.description.scenarioActivity.InputOutput._ lazy val deprecatedScenarioActivityEndpoint : SecuredEndpoint[ProcessName, ScenarioActivityError, Legacy.ProcessActivity, Any] = diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/scenarioActivity/Examples.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/scenarioActivity/Examples.scala index d789875e202..44d5ad23dc9 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/scenarioActivity/Examples.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/scenarioActivity/Examples.scala @@ -2,6 +2,7 @@ package pl.touk.nussknacker.ui.api.description.scenarioActivity import pl.touk.nussknacker.engine.api.deployment.ScheduledExecutionStatus import pl.touk.nussknacker.engine.api.process.ProcessName +import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos._ import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.ScenarioActivityError.{ InvalidComment, NoActivity, @@ -9,7 +10,6 @@ import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.ScenarioActi NoComment, NoScenario } -import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos._ import sttp.tapir.EndpointIO.Example import java.time.{Instant, ZoneId} diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/scenarioActivity/InputOutput.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/scenarioActivity/InputOutput.scala index 317ebf02054..a7e5b74f5db 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/scenarioActivity/InputOutput.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/scenarioActivity/InputOutput.scala @@ -4,8 +4,8 @@ import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.ScenarioActivityError import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.ScenarioActivityError.NoScenario import sttp.model.StatusCode.NotFound +import sttp.tapir.{oneOf, oneOfVariantFromMatchType, plainBody, EndpointOutput} import sttp.tapir.EndpointIO.Example -import sttp.tapir.{EndpointOutput, oneOf, oneOfVariantFromMatchType, plainBody} object InputOutput { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/stickynotes/Dtos.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/stickynotes/Dtos.scala index 82e0e0e5d4a..4b1d0fe586e 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/stickynotes/Dtos.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/stickynotes/Dtos.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.ui.api.description.stickynotes import derevo.circe.{decoder, encoder} import derevo.derive -import io.circe.generic.JsonCodec import io.circe.{Decoder, Encoder} +import io.circe.generic.JsonCodec import pl.touk.nussknacker.engine.api.LayoutData import pl.touk.nussknacker.engine.api.process.{ProcessName, VersionId} import pl.touk.nussknacker.restmodel.BaseEndpointDefinitions diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/config/AttachmentsConfig.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/config/AttachmentsConfig.scala index 0372bb83389..67cf8882387 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/config/AttachmentsConfig.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/config/AttachmentsConfig.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.ui.config import com.typesafe.config.Config -import pl.touk.nussknacker.ui.config.Implicits.parseOptionalConfig -import net.ceedubs.ficus.readers.ArbitraryTypeReader._ import net.ceedubs.ficus.Ficus._ +import net.ceedubs.ficus.readers.ArbitraryTypeReader._ +import pl.touk.nussknacker.ui.config.Implicits.parseOptionalConfig object AttachmentsConfig { val default = AttachmentsConfig(10 * 1024 * 1024) // 10mb diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/config/ComponentsActionConfigExtractor.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/config/ComponentsActionConfigExtractor.scala index 776170ac1af..cd6b15fc7d6 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/config/ComponentsActionConfigExtractor.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/config/ComponentsActionConfigExtractor.scala @@ -2,12 +2,12 @@ package pl.touk.nussknacker.ui.config import com.typesafe.config.Config import net.ceedubs.ficus.readers.{OptionReader, ValueReader} -import pl.touk.nussknacker.engine.api.component.DesignerWideComponentId import pl.touk.nussknacker.engine.api.component.ComponentType.ComponentType +import pl.touk.nussknacker.engine.api.component.DesignerWideComponentId import pl.touk.nussknacker.engine.util.UriUtils import pl.touk.nussknacker.restmodel.component.ComponentLink -import pl.touk.nussknacker.ui.security.api.GlobalPermission.GlobalPermission import pl.touk.nussknacker.ui.security.api.{AdminUser, CommonUser, ImpersonatedUser, LoggedUser, RealLoggedUser} +import pl.touk.nussknacker.ui.security.api.GlobalPermission.GlobalPermission import java.net.URI diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/config/DesignerConfig.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/config/DesignerConfig.scala index 9747b4f487f..f21612ef09c 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/config/DesignerConfig.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/config/DesignerConfig.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.ui.config import com.typesafe.config.{Config, ConfigFactory} +import pl.touk.nussknacker.engine.{ConfigWithUnresolvedVersion, ProcessingTypeConfig} import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap import pl.touk.nussknacker.engine.util.StringUtils._ -import pl.touk.nussknacker.engine.{ConfigWithUnresolvedVersion, ProcessingTypeConfig} import pl.touk.nussknacker.ui.config.DesignerConfig.ConfigurationMalformedException import pl.touk.nussknacker.ui.configloader.ProcessingTypeConfigs @@ -14,9 +14,10 @@ import scala.jdk.CollectionConverters._ // Thanks to that it will be easier to split processing type config from rest of configs and use this interface programmatically final case class DesignerConfig private (rawConfig: ConfigWithUnresolvedVersion) { - import DesignerConfig._ import net.ceedubs.ficus.Ficus._ + import DesignerConfig._ + def processingTypeConfigs: ProcessingTypeConfigs = ProcessingTypeConfigs(processingTypeConfigsRaw.asMap.mapValuesNow(ProcessingTypeConfig.read)) diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/config/scenariotoolbar/CategoriesScenarioToolbarsConfigParser.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/config/scenariotoolbar/CategoriesScenarioToolbarsConfigParser.scala index ffc653baa7b..4ee6bc54077 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/config/scenariotoolbar/CategoriesScenarioToolbarsConfigParser.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/config/scenariotoolbar/CategoriesScenarioToolbarsConfigParser.scala @@ -6,8 +6,9 @@ import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap object CategoriesScenarioToolbarsConfigParser extends LazyLogging { - import pl.touk.nussknacker.engine.util.config.CustomFicusInstances._ import net.ceedubs.ficus.readers.ArbitraryTypeReader._ + import pl.touk.nussknacker.engine.util.config.CustomFicusInstances._ + import ScenarioToolbarsConfig._ // TODO: process -> scenario diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/AttachmentEntityFactory.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/AttachmentEntityFactory.scala index 09462d57175..468b8ccadec 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/AttachmentEntityFactory.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/AttachmentEntityFactory.scala @@ -45,7 +45,8 @@ trait AttachmentEntityFactory extends BaseEntityFactory { impersonatedByUsername, createDate ) <> ( - AttachmentEntityData.apply _ tupled, AttachmentEntityData.unapply + AttachmentEntityData.apply _ tupled, + AttachmentEntityData.unapply ) } diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/BaseEntityFactory.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/BaseEntityFactory.scala index 28276619b8c..15c6c6944db 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/BaseEntityFactory.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/BaseEntityFactory.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.ui.db.entity import com.typesafe.scalalogging.LazyLogging -import pl.touk.nussknacker.engine.api.deployment.ProcessActionState.ProcessActionState import pl.touk.nussknacker.engine.api.deployment.{ DeploymentStatusName, ProcessActionId, ProcessActionState, ScenarioActionName } +import pl.touk.nussknacker.engine.api.deployment.ProcessActionState.ProcessActionState import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, VersionId} import pl.touk.nussknacker.engine.newdeployment.DeploymentId import slick.jdbc.JdbcProfile diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/PeriodicProcessDeploymentsTable.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/PeriodicProcessDeploymentsTable.scala index c36e85b578e..48e43935f6c 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/PeriodicProcessDeploymentsTable.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/PeriodicProcessDeploymentsTable.scala @@ -1,11 +1,11 @@ package pl.touk.nussknacker.ui.db.entity -import pl.touk.nussknacker.ui.process.periodic.model.PeriodicProcessDeploymentStatus.PeriodicProcessDeploymentStatus import pl.touk.nussknacker.ui.process.periodic.model.{ PeriodicProcessDeploymentId, PeriodicProcessDeploymentStatus, PeriodicProcessId } +import pl.touk.nussknacker.ui.process.periodic.model.PeriodicProcessDeploymentStatus.PeriodicProcessDeploymentStatus import slick.jdbc.{JdbcProfile, JdbcType} import slick.lifted.ProvenShape import slick.sql.SqlProfile.ColumnOption.NotNull diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/PeriodicProcessesTable.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/PeriodicProcessesTable.scala index 4a8463772cb..0a43c318cb1 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/PeriodicProcessesTable.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/PeriodicProcessesTable.scala @@ -109,7 +109,10 @@ trait PeriodicProcessesTableFactory extends BaseEntityFactory { active, createdAt, processActionId - ) <> (PeriodicProcessEntityWithoutDeploymentDetails.apply _ tupled, PeriodicProcessEntityWithoutDeploymentDetails.unapply) + ) <> ( + PeriodicProcessEntityWithoutDeploymentDetails.apply _ tupled, + PeriodicProcessEntityWithoutDeploymentDetails.unapply + ) } diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/ProcessEntityFactory.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/ProcessEntityFactory.scala index 0edcf8e1b52..ec71b67a7ed 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/ProcessEntityFactory.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/ProcessEntityFactory.scala @@ -1,6 +1,6 @@ package pl.touk.nussknacker.ui.db.entity -import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, ProcessingType} +import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessingType, ProcessName} import slick.lifted.{ProvenShape, TableQuery => LTableQuery} import slick.sql.SqlProfile.ColumnOption.NotNull @@ -52,7 +52,8 @@ trait ProcessEntityFactory extends BaseEntityFactory { impersonatedByIdentity, impersonatedByUsername ) <> ( - ProcessEntityData.apply _ tupled, ProcessEntityData.unapply + ProcessEntityData.apply _ tupled, + ProcessEntityData.unapply ) } diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/ProcessVersionEntityFactory.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/ProcessVersionEntityFactory.scala index 75fa4588da5..9c4c2f77f4d 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/ProcessVersionEntityFactory.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/ProcessVersionEntityFactory.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.ui.db.entity +import io.circe.{Decoder, Encoder} import io.circe.generic.JsonCodec import io.circe.syntax._ -import io.circe.{Decoder, Encoder} import pl.touk.nussknacker.engine.api.CirceUtil import pl.touk.nussknacker.engine.api.component.ComponentId import pl.touk.nussknacker.engine.api.component.ComponentType.ComponentType @@ -17,9 +17,10 @@ import java.sql.Timestamp trait ProcessVersionEntityFactory extends BaseEntityFactory { - import ScenarioComponentsUsagesJsonCodec._ import profile.api._ + import ScenarioComponentsUsagesJsonCodec._ + val processesTable: LTableQuery[ProcessEntityFactory#ProcessEntity] class ProcessVersionEntity(tag: Tag) extends BaseProcessVersionEntity(tag) { @@ -29,15 +30,48 @@ trait ProcessVersionEntityFactory extends BaseEntityFactory { def componentsUsages: Rep[String] = column[String]("components_usages", NotNull) def * : ProvenShape[ProcessVersionEntityData] = - (id, processId, json, createDate, user, modelVersion, componentsUsages) <> ({ + (id, processId, json, createDate, user, modelVersion, componentsUsages) <> ( + { + case ( + versionId: VersionId, + processId: ProcessId, + jsonString: String, + createDate: Timestamp, + user: String, + modelVersion: Option[Int], + componentsUsages: String + ) => + ProcessVersionEntityData( + versionId, + processId, + Some(ProcessMarshaller.fromJsonUnsafe(jsonString)), + createDate, + user, + modelVersion, + Some(CirceUtil.decodeJsonUnsafe[ScenarioComponentsUsages](componentsUsages)) + ) + }, + (e: ProcessVersionEntityData) => + ProcessVersionEntityData.unapply(e).map { t => + (t._1, t._2, t._3.get.asJson.noSpaces, t._4, t._5, t._6, t._7.get.asJson.noSpaces) + } + ) + + } + + class ProcessVersionEntityWithScenarioJson(tag: Tag) extends BaseProcessVersionEntity(tag) { + + def json: Rep[String] = column[String]("json", NotNull) + + def * : ProvenShape[ProcessVersionEntityData] = (id, processId, json, createDate, user, modelVersion) <> ( + { case ( versionId: VersionId, processId: ProcessId, jsonString: String, createDate: Timestamp, user: String, - modelVersion: Option[Int], - componentsUsages: String + modelVersion: Option[Int] ) => ProcessVersionEntityData( versionId, @@ -46,41 +80,12 @@ trait ProcessVersionEntityFactory extends BaseEntityFactory { createDate, user, modelVersion, - Some(CirceUtil.decodeJsonUnsafe[ScenarioComponentsUsages](componentsUsages)) + None ) }, (e: ProcessVersionEntityData) => - ProcessVersionEntityData.unapply(e).map { t => - (t._1, t._2, t._3.get.asJson.noSpaces, t._4, t._5, t._6, t._7.get.asJson.noSpaces) - }) - - } - - class ProcessVersionEntityWithScenarioJson(tag: Tag) extends BaseProcessVersionEntity(tag) { - - def json: Rep[String] = column[String]("json", NotNull) - - def * : ProvenShape[ProcessVersionEntityData] = (id, processId, json, createDate, user, modelVersion) <> ({ - case ( - versionId: VersionId, - processId: ProcessId, - jsonString: String, - createDate: Timestamp, - user: String, - modelVersion: Option[Int] - ) => - ProcessVersionEntityData( - versionId, - processId, - Some(ProcessMarshaller.fromJsonUnsafe(jsonString)), - createDate, - user, - modelVersion, - None - ) - }, - (e: ProcessVersionEntityData) => - ProcessVersionEntityData.unapply(e).map { t => (t._1, t._2, t._3.get.asJson.noSpaces, t._4, t._5, t._6) }) + ProcessVersionEntityData.unapply(e).map { t => (t._1, t._2, t._3.get.asJson.noSpaces, t._4, t._5, t._6) } + ) } @@ -89,27 +94,29 @@ trait ProcessVersionEntityFactory extends BaseEntityFactory { def componentsUsages: Rep[String] = column[String]("components_usages", NotNull) def * : ProvenShape[ProcessVersionEntityData] = - (id, processId, createDate, user, modelVersion, componentsUsages) <> ({ - case ( - versionId: VersionId, - processId: ProcessId, - createDate: Timestamp, - user: String, - modelVersion: Option[Int], - componentsUsages: String - ) => - ProcessVersionEntityData( - versionId, - processId, - None, - createDate, - user, - modelVersion, - Some(CirceUtil.decodeJsonUnsafe[ScenarioComponentsUsages](componentsUsages)) - ) - }, - (e: ProcessVersionEntityData) => - ProcessVersionEntityData.unapply(e).map { t => (t._1, t._2, t._4, t._5, t._6, t._7.get.asJson.noSpaces) }) + (id, processId, createDate, user, modelVersion, componentsUsages) <> ( + { + case ( + versionId: VersionId, + processId: ProcessId, + createDate: Timestamp, + user: String, + modelVersion: Option[Int], + componentsUsages: String + ) => + ProcessVersionEntityData( + versionId, + processId, + None, + createDate, + user, + modelVersion, + Some(CirceUtil.decodeJsonUnsafe[ScenarioComponentsUsages](componentsUsages)) + ) + }, + (e: ProcessVersionEntityData) => + ProcessVersionEntityData.unapply(e).map { t => (t._1, t._2, t._4, t._5, t._6, t._7.get.asJson.noSpaces) } + ) } diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/ScenarioActivityEntityFactory.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/ScenarioActivityEntityFactory.scala index 3e9adc13a73..2e5e604cc84 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/ScenarioActivityEntityFactory.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/ScenarioActivityEntityFactory.scala @@ -1,11 +1,11 @@ package pl.touk.nussknacker.ui.db.entity -import enumeratum.EnumEntry.UpperSnakecase import enumeratum._ +import enumeratum.EnumEntry.UpperSnakecase import io.circe.Decoder import io.circe.syntax.EncoderOps -import pl.touk.nussknacker.engine.api.deployment.ProcessActionState.ProcessActionState import pl.touk.nussknacker.engine.api.deployment._ +import pl.touk.nussknacker.engine.api.deployment.ProcessActionState.ProcessActionState import pl.touk.nussknacker.engine.api.process.ProcessId import slick.lifted.{TableQuery => LTableQuery} import slick.sql.SqlProfile.ColumnOption.NotNull @@ -82,7 +82,8 @@ trait ScenarioActivityEntityFactory extends BaseEntityFactory { errorMessage, additionalProperties, ) <> ( - ScenarioActivityEntityData.apply _ tupled, ScenarioActivityEntityData.unapply + ScenarioActivityEntityData.apply _ tupled, + ScenarioActivityEntityData.unapply ) } diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/StickyNotesEntityFactory.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/StickyNotesEntityFactory.scala index 2bff4a1b639..0b3280389b5 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/StickyNotesEntityFactory.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/entity/StickyNotesEntityFactory.scala @@ -1,19 +1,19 @@ package pl.touk.nussknacker.ui.db.entity +import io.circe._ +import io.circe.syntax._ import pl.touk.nussknacker.engine.api.LayoutData import pl.touk.nussknacker.engine.api.process.{ProcessId, VersionId} -import pl.touk.nussknacker.ui.api.description.stickynotes.StickyNoteEvent -import pl.touk.nussknacker.ui.api.description.stickynotes.StickyNoteEvent.StickyNoteEvent -import slick.lifted.{ProvenShape, TableQuery => LTableQuery} -import slick.sql.SqlProfile.ColumnOption.NotNull -import io.circe.syntax._ -import io.circe._ import pl.touk.nussknacker.ui.api.description.stickynotes.Dtos.{ Dimensions, StickyNote, StickyNoteCorrelationId, StickyNoteId } +import pl.touk.nussknacker.ui.api.description.stickynotes.StickyNoteEvent +import pl.touk.nussknacker.ui.api.description.stickynotes.StickyNoteEvent.StickyNoteEvent +import slick.lifted.{ProvenShape, TableQuery => LTableQuery} +import slick.sql.SqlProfile.ColumnOption.NotNull import java.sql.Timestamp import java.util.UUID diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/timeseries/questdb/FlushDataTask.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/timeseries/questdb/FlushDataTask.scala index 9d2a90e5c69..34dc6dc2d2a 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/timeseries/questdb/FlushDataTask.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/timeseries/questdb/FlushDataTask.scala @@ -5,8 +5,8 @@ import io.questdb.cairo.CairoEngine import io.questdb.cairo.wal.{ApplyWal2TableJob, WalWriter} import java.util.concurrent.TimeUnit -import scala.concurrent.duration.FiniteDuration import scala.concurrent.{Await, ExecutionContext, Future} +import scala.concurrent.duration.FiniteDuration private[questdb] class FlushDataTask( private val engine: CairoEngine, diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/timeseries/questdb/QuestDbFEStatisticsRepository.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/timeseries/questdb/QuestDbFEStatisticsRepository.scala index ee78f21a61f..e1f3bcef18d 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/timeseries/questdb/QuestDbFEStatisticsRepository.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/timeseries/questdb/QuestDbFEStatisticsRepository.scala @@ -10,6 +10,7 @@ import io.questdb.cairo.security.AllowAllSecurityContext import io.questdb.cairo.sql.RecordCursorFactory import io.questdb.cairo.wal.WalWriter import io.questdb.griffin.{SqlExecutionContext, SqlExecutionContextImpl} +import pl.touk.nussknacker.ui.db.timeseries.{FEStatisticsRepository, NoOpFEStatisticsRepository} import pl.touk.nussknacker.ui.db.timeseries.questdb.QuestDbExtensions.{ BuildCairoEngineExtension, CairoEngineExtension, @@ -21,14 +22,13 @@ import pl.touk.nussknacker.ui.db.timeseries.questdb.QuestDbFEStatisticsRepositor selectQuery, tableName } -import pl.touk.nussknacker.ui.db.timeseries.{FEStatisticsRepository, NoOpFEStatisticsRepository} import pl.touk.nussknacker.ui.statistics.RawFEStatistics import java.time.Clock -import java.util.concurrent.atomic.{AtomicBoolean, AtomicReference} import java.util.concurrent.{ArrayBlockingQueue, ConcurrentHashMap, ThreadPoolExecutor, TimeUnit} -import scala.concurrent.duration.{Duration, FiniteDuration} +import java.util.concurrent.atomic.{AtomicBoolean, AtomicReference} import scala.concurrent.{ExecutionContext, ExecutionContextExecutorService, Future} +import scala.concurrent.duration.{Duration, FiniteDuration} import scala.jdk.CollectionConverters._ import scala.util.{Failure, Success, Try} @@ -46,9 +46,8 @@ private class QuestDbFEStatisticsRepository(private val engine: AtomicReference[ private val recordCursorPool: ThreadAwareObjectPool[RecordCursorFactory] = new ThreadAwareObjectPool(() => engine.get().select(selectQuery, sqlContextPool.get())) - private val walTableWriterPool: ThreadAwareObjectPool[WalWriter] = new ThreadAwareObjectPool(() => - engine.get().getWalWriter(engine.get().getTableTokenIfExists(tableName)) - ) + private val walTableWriterPool: ThreadAwareObjectPool[WalWriter] = + new ThreadAwareObjectPool(() => engine.get().getWalWriter(engine.get().getTableTokenIfExists(tableName))) private val taskRecovery = new TaskRecovery(engine, recover, tableName) private val flushDataTask = new AtomicReference(createFlushDataTask()) diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/AlignedComponentsDefinitionProvider.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/AlignedComponentsDefinitionProvider.scala index 0f0306f835a..c039642220a 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/AlignedComponentsDefinitionProvider.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/AlignedComponentsDefinitionProvider.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.ui.definition -import pl.touk.nussknacker.engine.api.component.Component.AllowedProcessingModes import pl.touk.nussknacker.engine.api.component.{ComponentType, ProcessingMode} +import pl.touk.nussknacker.engine.api.component.Component.AllowedProcessingModes import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.definition.component.{ComponentDefinitionWithImplementation, Components} import pl.touk.nussknacker.engine.definition.component.bultin.BuiltInComponentsDefinitionsPreparer diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/DefinitionsService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/DefinitionsService.scala index fce28f475ce..1ba8b118587 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/DefinitionsService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/DefinitionsService.scala @@ -12,9 +12,9 @@ import pl.touk.nussknacker.engine.definition.component.methodbased.MethodBasedCo import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap import pl.touk.nussknacker.restmodel.definition._ import pl.touk.nussknacker.ui.definition.DefinitionsService.{ - ComponentUiConfigMode, createUIParameter, - createUIScenarioPropertyConfig + createUIScenarioPropertyConfig, + ComponentUiConfigMode } import pl.touk.nussknacker.ui.definition.component.{ComponentGroupsPreparer, ComponentWithStaticDefinition} import pl.touk.nussknacker.ui.definition.scenarioproperty.{FragmentPropertiesConfig, UiScenarioPropertyEditorDeterminer} diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/component/ComponentService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/component/ComponentService.scala index e7133fd8638..b8042e9418e 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/component/ComponentService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/component/ComponentService.scala @@ -17,16 +17,16 @@ import pl.touk.nussknacker.ui.NuDesignerError.XError import pl.touk.nussknacker.ui.config.ComponentLinksConfigExtractor.ComponentLinksConfig import pl.touk.nussknacker.ui.definition.AlignedComponentsDefinitionProvider import pl.touk.nussknacker.ui.definition.component.ComponentListQueryOptions.{ - FetchAllWithUsages, FetchAllWithoutUsages, - FetchNonFragmentsWithUsages, - FetchNonFragmentsWithoutUsages + FetchAllWithUsages, + FetchNonFragmentsWithoutUsages, + FetchNonFragmentsWithUsages } import pl.touk.nussknacker.ui.definition.component.DefaultComponentService.toComponentUsagesInScenario +import pl.touk.nussknacker.ui.process.{ProcessService, ScenarioQuery} import pl.touk.nussknacker.ui.process.fragment.FragmentRepository import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataProvider import pl.touk.nussknacker.ui.process.repository.ScenarioWithDetailsEntity -import pl.touk.nussknacker.ui.process.{ProcessService, ScenarioQuery} import pl.touk.nussknacker.ui.security.api.LoggedUser import scala.concurrent.{ExecutionContext, Future} diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/component/ComponentsUsageHelper.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/component/ComponentsUsageHelper.scala index 3f4aa080a69..962379b8d50 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/component/ComponentsUsageHelper.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/component/ComponentsUsageHelper.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.ui.definition.component import pl.touk.nussknacker.engine.api.component.{ComponentId, ComponentType, DesignerWideComponentId} -import pl.touk.nussknacker.engine.api.process.{ProcessName, ProcessingType} -import pl.touk.nussknacker.restmodel.component.NodeUsageData._ +import pl.touk.nussknacker.engine.api.process.{ProcessingType, ProcessName} import pl.touk.nussknacker.restmodel.component.{NodeId, NodeUsageData, ScenarioComponentsUsages} +import pl.touk.nussknacker.restmodel.component.NodeUsageData._ import pl.touk.nussknacker.ui.process.repository.ScenarioWithDetailsEntity object ComponentsUsageHelper { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/component/ComponentsValidator.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/component/ComponentsValidator.scala index a4ab6ac0822..45807222ebd 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/component/ComponentsValidator.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/component/ComponentsValidator.scala @@ -3,6 +3,7 @@ package pl.touk.nussknacker.ui.definition.component import cats.data.{NonEmptyList, Validated, ValidatedNel} import pl.touk.nussknacker.engine.api.component.DesignerWideComponentId import pl.touk.nussknacker.restmodel.component.ComponentListElement + import WrongConfigurationAttribute.{ ComponentGroupNameAttribute, ComponentTypeAttribute, diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/ScenarioPropertyConfigValidatorDeterminer.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/ScenarioPropertyConfigValidatorDeterminer.scala index 9195596f526..e9fdaf8ebe3 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/ScenarioPropertyConfigValidatorDeterminer.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/ScenarioPropertyConfigValidatorDeterminer.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.ui.definition.scenarioproperty -import pl.touk.nussknacker.engine.api.definition.ParameterValidator import pl.touk.nussknacker.engine.api.component.ScenarioPropertyConfig +import pl.touk.nussknacker.engine.api.definition.ParameterValidator protected class ScenarioPropertyConfigValidatorDeterminer(config: ScenarioPropertyConfig) extends ScenarioPropertyValidatorDeterminer { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/ScenarioPropertyValidatorDeterminerChain.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/ScenarioPropertyValidatorDeterminerChain.scala index 4830d1bab21..62d52c4a49f 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/ScenarioPropertyValidatorDeterminerChain.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/ScenarioPropertyValidatorDeterminerChain.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.ui.definition.scenarioproperty -import pl.touk.nussknacker.engine.api.definition.ParameterValidator import pl.touk.nussknacker.engine.api.component.ScenarioPropertyConfig +import pl.touk.nussknacker.engine.api.definition.ParameterValidator object ScenarioPropertyValidatorDeterminerChain { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/UiScenarioPropertyEditorDeterminer.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/UiScenarioPropertyEditorDeterminer.scala index 3bb177f29f6..c81320296ce 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/UiScenarioPropertyEditorDeterminer.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/UiScenarioPropertyEditorDeterminer.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.ui.definition.scenarioproperty -import pl.touk.nussknacker.engine.api.definition.{SimpleParameterEditor, StringParameterEditor} import pl.touk.nussknacker.engine.api.component.ScenarioPropertyConfig +import pl.touk.nussknacker.engine.api.definition.{SimpleParameterEditor, StringParameterEditor} object UiScenarioPropertyEditorDeterminer { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/factory/NussknackerAppFactory.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/factory/NussknackerAppFactory.scala index 63c76befde1..1cb32fda31c 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/factory/NussknackerAppFactory.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/factory/NussknackerAppFactory.scala @@ -2,28 +2,28 @@ package pl.touk.nussknacker.ui.factory import akka.actor.ActorSystem import akka.stream.Materializer -import cats.effect.unsafe.IORuntime import cats.effect.{IO, Resource} +import cats.effect.unsafe.IORuntime import com.typesafe.scalalogging.LazyLogging import io.dropwizard.metrics5.MetricRegistry import io.dropwizard.metrics5.jmx.JmxReporter import pl.touk.nussknacker.engine.{ConfigWithUnresolvedVersion, ProcessingTypeConfig} -import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap -import pl.touk.nussknacker.engine.util.loader.{DeploymentManagersClassLoader, ScalaServiceLoader} import pl.touk.nussknacker.engine.util.{ ExecutionContextWithIORuntimeAdapter, JavaClassVersionChecker, SLF4JBridgeHandlerRegistrar } +import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap +import pl.touk.nussknacker.engine.util.loader.{DeploymentManagersClassLoader, ScalaServiceLoader} import pl.touk.nussknacker.ui.config.{DesignerConfig, DesignerConfigLoader} import pl.touk.nussknacker.ui.configloader.{ProcessingTypeConfigsLoader, ProcessingTypeConfigsLoaderFactory} import pl.touk.nussknacker.ui.db.DbRef import pl.touk.nussknacker.ui.db.timeseries.questdb.QuestDbFEStatisticsRepository +import pl.touk.nussknacker.ui.process.processingtype.{ModelClassLoaderDependencies, ModelClassLoaderProvider} import pl.touk.nussknacker.ui.process.processingtype.loader.{ ProcessingTypeDataLoader, ProcessingTypesConfigBasedProcessingTypeDataLoader } -import pl.touk.nussknacker.ui.process.processingtype.{ModelClassLoaderDependencies, ModelClassLoaderProvider} import pl.touk.nussknacker.ui.server.{AkkaHttpBasedRouteProvider, NussknackerHttpServer} import pl.touk.nussknacker.ui.util.IOToFutureSttpBackendConverter import sttp.client3.SttpBackend diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/initialization/Initialization.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/initialization/Initialization.scala index 8e90c525c83..ebe8bc620f3 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/initialization/Initialization.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/initialization/Initialization.scala @@ -6,8 +6,8 @@ import com.typesafe.scalalogging.LazyLogging import db.util.DBIOActionInstances._ import pl.touk.nussknacker.engine.api.graph.ScenarioGraph import pl.touk.nussknacker.engine.migration.ProcessMigrations -import pl.touk.nussknacker.ui.db.entity.EnvironmentsEntityData import pl.touk.nussknacker.ui.db.{DbRef, NuTables} +import pl.touk.nussknacker.ui.db.entity.EnvironmentsEntityData import pl.touk.nussknacker.ui.process.ScenarioQuery import pl.touk.nussknacker.ui.process.label.ScenarioLabel import pl.touk.nussknacker.ui.process.migrate.ProcessModelMigrator @@ -19,8 +19,8 @@ import slick.dbio.DBIOAction import slick.jdbc.JdbcProfile import java.time.Clock -import scala.concurrent.duration._ import scala.concurrent.{Await, ExecutionContext} +import scala.concurrent.duration._ object Initialization { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/metrics/RepositoryGauges.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/metrics/RepositoryGauges.scala index e79776d3164..a363abf6bc3 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/metrics/RepositoryGauges.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/metrics/RepositoryGauges.scala @@ -8,9 +8,9 @@ import pl.touk.nussknacker.ui.security.api.{LoggedUser, NussknackerInternalUser} import java.time.Duration import java.util.concurrent.TimeUnit +import scala.concurrent.{Await, Future} import scala.concurrent.ExecutionContext.Implicits._ import scala.concurrent.duration.DurationInt -import scala.concurrent.{Await, Future} class RepositoryGauges( metricRegistry: MetricRegistry, diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/migrations/MigrationService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/migrations/MigrationService.scala index abffb39ef79..815654d19b8 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/migrations/MigrationService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/migrations/MigrationService.scala @@ -3,15 +3,16 @@ package pl.touk.nussknacker.ui.migrations import cats.data.EitherT import com.typesafe.config.Config import pl.touk.nussknacker.engine.api.graph.ScenarioGraph -import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessIdWithName, ProcessName, ProcessingType} +import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessIdWithName, ProcessingType, ProcessName} import pl.touk.nussknacker.engine.util.Implicits._ import pl.touk.nussknacker.restmodel.scenariodetails.ScenarioParameters import pl.touk.nussknacker.restmodel.validation.ValidationResults import pl.touk.nussknacker.restmodel.validation.ValidationResults.ValidationErrors import pl.touk.nussknacker.security.Permission +import pl.touk.nussknacker.ui.{NuDesignerError, UnauthorizedError} import pl.touk.nussknacker.ui.api.{AuthorizeProcess, ListenerApiUser} -import pl.touk.nussknacker.ui.listener.ProcessChangeEvent.OnSaved import pl.touk.nussknacker.ui.listener.{ProcessChangeEvent, ProcessChangeListener, User} +import pl.touk.nussknacker.ui.listener.ProcessChangeEvent.OnSaved import pl.touk.nussknacker.ui.migrations.MigrateScenarioData.CurrentMigrateScenarioData import pl.touk.nussknacker.ui.migrations.MigrationService.MigrationError import pl.touk.nussknacker.ui.process.ProcessService @@ -30,7 +31,6 @@ import pl.touk.nussknacker.ui.security.api.LoggedUser import pl.touk.nussknacker.ui.uiresolving.UIProcessResolver import pl.touk.nussknacker.ui.util.{ApiAdapterServiceError, OutOfRangeAdapterRequestError} import pl.touk.nussknacker.ui.validation.FatalValidationError -import pl.touk.nussknacker.ui.{NuDesignerError, UnauthorizedError} import scala.concurrent.{ExecutionContext, Future} import scala.util.{Failure, Success} diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/notifications/NotificationService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/notifications/NotificationService.scala index b259fb396fe..ce2d6a05109 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/notifications/NotificationService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/notifications/NotificationService.scala @@ -9,8 +9,8 @@ import pl.touk.nussknacker.ui.security.api.LoggedUser import pl.touk.nussknacker.ui.util.InMemoryTimeseriesRepository import java.time.{Clock, Instant} -import scala.concurrent.duration.FiniteDuration import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.duration.FiniteDuration final case class NotificationConfig(duration: FiniteDuration) diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/NewProcessPreparer.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/NewProcessPreparer.scala index 2f73da2ee65..ced42e9ad0b 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/NewProcessPreparer.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/NewProcessPreparer.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.ui.process import pl.touk.nussknacker.engine.MetaDataInitializer +import pl.touk.nussknacker.engine.api.{FragmentSpecificData, MetaData, ProcessAdditionalFields} import pl.touk.nussknacker.engine.api.component.ScenarioPropertyConfig import pl.touk.nussknacker.engine.api.process.ProcessName -import pl.touk.nussknacker.engine.api.{FragmentSpecificData, MetaData, ProcessAdditionalFields} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.definition.component.defaultconfig.DefaultsComponentGroupName import pl.touk.nussknacker.engine.definition.component.defaultconfig.DefaultsComponentIcon diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ProcessService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ProcessService.scala index c60b37fe8cd..c9ca8694683 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ProcessService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ProcessService.scala @@ -8,11 +8,11 @@ import cats.syntax.functor._ import com.typesafe.scalalogging.LazyLogging import db.util.DBIOActionInstances.DB import io.circe.generic.JsonCodec +import pl.touk.nussknacker.engine.api.{Comment, ProcessVersion} import pl.touk.nussknacker.engine.api.component.ProcessingMode import pl.touk.nussknacker.engine.api.deployment.{DataFreshnessPolicy, ProcessAction, ScenarioActionName} import pl.touk.nussknacker.engine.api.graph.ScenarioGraph import pl.touk.nussknacker.engine.api.process._ -import pl.touk.nussknacker.engine.api.{Comment, ProcessVersion} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.deployment.EngineSetupName import pl.touk.nussknacker.engine.marshall.ProcessMarshaller @@ -30,12 +30,12 @@ import pl.touk.nussknacker.ui.process.label.ScenarioLabel import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter import pl.touk.nussknacker.ui.process.processingtype.ScenarioParametersService import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataProvider +import pl.touk.nussknacker.ui.process.repository._ import pl.touk.nussknacker.ui.process.repository.ProcessDBQueryRepository.{ ProcessNotFoundError, ProcessVersionNotFoundError } import pl.touk.nussknacker.ui.process.repository.ProcessRepository._ -import pl.touk.nussknacker.ui.process.repository._ import pl.touk.nussknacker.ui.security.api.LoggedUser import pl.touk.nussknacker.ui.uiresolving.UIProcessResolver import pl.touk.nussknacker.ui.validation.FatalValidationError diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ScenarioMetadata.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ScenarioMetadata.scala index c03a12647e9..2b71be4ed74 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ScenarioMetadata.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ScenarioMetadata.scala @@ -1,6 +1,6 @@ package pl.touk.nussknacker.ui.process -import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, ProcessingType} +import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessingType, ProcessName} import pl.touk.nussknacker.ui.process.label.ScenarioLabel import java.sql.Timestamp diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ScenarioToolbarService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ScenarioToolbarService.scala index 9ea0033c591..3537c60fe8c 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ScenarioToolbarService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ScenarioToolbarService.scala @@ -2,10 +2,10 @@ package pl.touk.nussknacker.ui.process import io.circe.generic.JsonCodec import pl.touk.nussknacker.engine.util.UriUtils +import pl.touk.nussknacker.ui.config.scenariotoolbar._ import pl.touk.nussknacker.ui.config.scenariotoolbar.ToolbarButtonConfigType.ToolbarButtonType import pl.touk.nussknacker.ui.config.scenariotoolbar.ToolbarButtonsConfigVariant.ToolbarButtonVariant import pl.touk.nussknacker.ui.config.scenariotoolbar.ToolbarPanelTypeConfig.ToolbarPanelType -import pl.touk.nussknacker.ui.config.scenariotoolbar._ import pl.touk.nussknacker.ui.process.repository.ScenarioWithDetailsEntity trait ScenarioToolbarService { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/ActionInfoService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/ActionInfoService.scala index e2d6491984a..ae3be47aaf4 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/ActionInfoService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/ActionInfoService.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.ui.process.deployment -import pl.touk.nussknacker.engine.api.definition.{ParameterEditor, RawParameterEditor} import pl.touk.nussknacker.engine.api.{NodeId, ProcessVersion} +import pl.touk.nussknacker.engine.api.definition.{ParameterEditor, RawParameterEditor} import pl.touk.nussknacker.engine.api.deployment.ScenarioActionName import pl.touk.nussknacker.engine.api.graph.ScenarioGraph import pl.touk.nussknacker.engine.definition.action.ActionInfoProvider diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/ActionService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/ActionService.scala index 0305477ac09..842e2468917 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/ActionService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/ActionService.scala @@ -6,21 +6,21 @@ import pl.touk.nussknacker.engine.api.Comment import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.ui.api.{DeploymentCommentSettings, ListenerApiUser} -import pl.touk.nussknacker.ui.listener.ProcessChangeEvent.{OnActionExecutionFinished, OnActionFailed, OnActionSuccess} import pl.touk.nussknacker.ui.listener.{ProcessChangeListener, User => ListenerUser} +import pl.touk.nussknacker.ui.listener.ProcessChangeEvent.{OnActionExecutionFinished, OnActionFailed, OnActionSuccess} import pl.touk.nussknacker.ui.process.deployment.scenariostatus.{ ScenarioStatusProvider, ScenarioStatusWithAllowedActions } import pl.touk.nussknacker.ui.process.exception.ProcessIllegalAction -import pl.touk.nussknacker.ui.process.repository.ProcessDBQueryRepository.ProcessNotFoundError import pl.touk.nussknacker.ui.process.repository._ +import pl.touk.nussknacker.ui.process.repository.ProcessDBQueryRepository.ProcessNotFoundError import pl.touk.nussknacker.ui.security.api.{AdminUser, LoggedUser, NussknackerInternalUser} import slick.dbio.DBIOAction import java.time.Clock -import scala.concurrent.duration.DurationInt import scala.concurrent.{Await, ExecutionContext, Future} +import scala.concurrent.duration.DurationInt import scala.util.{Failure, Success} // Responsibility of this class is to wrap deployment actions with persistent, transactional context. diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/LoggedUserConversions.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/LoggedUserConversions.scala index 3ffbd03fb47..5115e822130 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/LoggedUserConversions.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/LoggedUserConversions.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.ui.process.deployment -import pl.touk.nussknacker.ui.security.api.LoggedUser import pl.touk.nussknacker.engine.deployment.{User => ManagerUser} +import pl.touk.nussknacker.ui.security.api.LoggedUser object LoggedUserConversions { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/ScenarioTestExecutorService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/ScenarioTestExecutorService.scala index 7bef7060de4..c1e15d8c891 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/ScenarioTestExecutorService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/ScenarioTestExecutorService.scala @@ -2,7 +2,7 @@ package pl.touk.nussknacker.ui.process.deployment import io.circe.Json import pl.touk.nussknacker.engine.api.ProcessVersion -import pl.touk.nussknacker.engine.api.deployment.{DMTestScenarioCommand, DeploymentManager} +import pl.touk.nussknacker.engine.api.deployment.{DeploymentManager, DMTestScenarioCommand} import pl.touk.nussknacker.engine.api.test.ScenarioTestData import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.testmode.TestProcess.TestResults diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/deploymentstatus/DeploymentManagerReliableStatusesWrapper.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/deploymentstatus/DeploymentManagerReliableStatusesWrapper.scala index a5814ecac84..4666e63bee1 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/deploymentstatus/DeploymentManagerReliableStatusesWrapper.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/deploymentstatus/DeploymentManagerReliableStatusesWrapper.scala @@ -2,7 +2,7 @@ package pl.touk.nussknacker.ui.process.deployment.deploymentstatus import akka.actor.ActorSystem import pl.touk.nussknacker.engine.api.deployment.{DataFreshnessPolicy, DeploymentStatusDetails, WithDataFreshnessStatus} -import pl.touk.nussknacker.engine.api.process.{ProcessName, ProcessingType} +import pl.touk.nussknacker.engine.api.process.{ProcessingType, ProcessName} import pl.touk.nussknacker.ui.process.deployment.DeploymentManagerDispatcher import pl.touk.nussknacker.ui.process.repository.ScenarioIdData import pl.touk.nussknacker.ui.security.api.LoggedUser diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/deploymentstatus/EngineSideDeploymentStatusesProvider.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/deploymentstatus/EngineSideDeploymentStatusesProvider.scala index 5ba3dbe1d52..135566563b9 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/deploymentstatus/EngineSideDeploymentStatusesProvider.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/deploymentstatus/EngineSideDeploymentStatusesProvider.scala @@ -3,15 +3,15 @@ package pl.touk.nussknacker.ui.process.deployment.deploymentstatus import akka.actor.ActorSystem import com.typesafe.scalalogging.LazyLogging import pl.touk.nussknacker.engine.api.deployment._ -import pl.touk.nussknacker.engine.api.process.{ProcessName, ProcessingType} +import pl.touk.nussknacker.engine.api.process.{ProcessingType, ProcessName} import pl.touk.nussknacker.engine.util.WithDataFreshnessStatusUtils.WithDataFreshnessStatusMapOps import pl.touk.nussknacker.ui.process.deployment.DeploymentManagerDispatcher import pl.touk.nussknacker.ui.process.deployment.deploymentstatus.DeploymentManagerReliableStatusesWrapper.Ops import pl.touk.nussknacker.ui.process.repository._ import pl.touk.nussknacker.ui.security.api.LoggedUser -import scala.concurrent.duration.FiniteDuration import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.duration.FiniteDuration import scala.util.control.NonFatal // This class returns information about deployments basen on information from DeploymentManager's diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/scenariostatus/InconsistentStateDetector.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/scenariostatus/InconsistentStateDetector.scala index 27d50f26e65..9bbc95975ad 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/scenariostatus/InconsistentStateDetector.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/scenariostatus/InconsistentStateDetector.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.ui.process.deployment.scenariostatus import com.typesafe.scalalogging.LazyLogging +import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus.ProblemStateStatus -import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.deployment.DeploymentId object InconsistentStateDetector extends InconsistentStateDetector diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/scenariostatus/ScenarioStatusProvider.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/scenariostatus/ScenarioStatusProvider.scala index 9ace1349e0e..22249cda1b4 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/scenariostatus/ScenarioStatusProvider.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/scenariostatus/ScenarioStatusProvider.scala @@ -5,9 +5,9 @@ import cats.implicits.{toFoldableOps, toTraverseOps} import cats.syntax.functor._ import com.typesafe.scalalogging.LazyLogging import db.util.DBIOActionInstances._ +import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.deployment.ProcessStateDefinitionManager.ScenarioStatusWithScenarioContext import pl.touk.nussknacker.engine.api.deployment.ScenarioActionName.{Cancel, Deploy} -import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus.ProblemStateStatus import pl.touk.nussknacker.engine.api.process._ @@ -19,8 +19,8 @@ import pl.touk.nussknacker.ui.process.deployment.deploymentstatus.{ GetDeploymentsStatusesError } import pl.touk.nussknacker.ui.process.periodic.PeriodicProcessService.PeriodicScenarioStatus -import pl.touk.nussknacker.ui.process.repository.ProcessDBQueryRepository.ProcessNotFoundError import pl.touk.nussknacker.ui.process.repository._ +import pl.touk.nussknacker.ui.process.repository.ProcessDBQueryRepository.ProcessNotFoundError import pl.touk.nussknacker.ui.security.api.LoggedUser import slick.dbio.{DBIO, DBIOAction} diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/fragment/FragmentRepository.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/fragment/FragmentRepository.scala index 4c57a57d1bf..464491e612b 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/fragment/FragmentRepository.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/fragment/FragmentRepository.scala @@ -1,14 +1,14 @@ package pl.touk.nussknacker.ui.process.fragment import cats.implicits.toTraverseOps -import pl.touk.nussknacker.engine.api.process.{ProcessName, ProcessingType} +import pl.touk.nussknacker.engine.api.process.{ProcessingType, ProcessName} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.ui.process.ScenarioQuery import pl.touk.nussknacker.ui.process.repository.FetchingProcessRepository import pl.touk.nussknacker.ui.security.api.LoggedUser -import scala.concurrent.duration._ import scala.concurrent.{Await, ExecutionContext, Future} +import scala.concurrent.duration._ trait FragmentRepository { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/fragment/FragmentResolver.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/fragment/FragmentResolver.scala index 6dc89be1b3a..bd28ef4ce8f 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/fragment/FragmentResolver.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/fragment/FragmentResolver.scala @@ -2,7 +2,7 @@ package pl.touk.nussknacker.ui.process.fragment import cats.data.ValidatedNel import pl.touk.nussknacker.engine.api.context.ProcessCompilationError -import pl.touk.nussknacker.engine.api.process.{ProcessName, ProcessingType} +import pl.touk.nussknacker.engine.api.process.{ProcessingType, ProcessName} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.ui.security.api.LoggedUser diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/marshall/CanonicalProcessConverter.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/marshall/CanonicalProcessConverter.scala index 8c0ff2a8e67..d8524287545 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/marshall/CanonicalProcessConverter.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/marshall/CanonicalProcessConverter.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.ui.process.marshall import pl.touk.nussknacker.engine.api.graph import pl.touk.nussknacker.engine.api.graph.{Edge, ProcessProperties, ScenarioGraph} import pl.touk.nussknacker.engine.api.process.ProcessName +import pl.touk.nussknacker.engine.canonicalgraph.{canonicalnode, CanonicalProcess} import pl.touk.nussknacker.engine.canonicalgraph.canonicalnode._ -import pl.touk.nussknacker.engine.canonicalgraph.{CanonicalProcess, canonicalnode} import pl.touk.nussknacker.engine.graph.EdgeType import pl.touk.nussknacker.engine.graph.EdgeType.FragmentOutput import pl.touk.nussknacker.engine.graph.node._ diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/migrate/RemoteEnvironment.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/migrate/RemoteEnvironment.scala index c2aedf8f98a..1c6af9df673 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/migrate/RemoteEnvironment.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/migrate/RemoteEnvironment.scala @@ -1,11 +1,11 @@ package pl.touk.nussknacker.ui.process.migrate import akka.actor.ActorSystem -import akka.http.scaladsl.model.Uri.{Path, Query} +import akka.http.scaladsl.{Http, HttpExt} import akka.http.scaladsl.model._ +import akka.http.scaladsl.model.Uri.{Path, Query} import akka.http.scaladsl.model.headers.{Authorization, BasicHttpCredentials} import akka.http.scaladsl.unmarshalling.{Unmarshal, Unmarshaller} -import akka.http.scaladsl.{Http, HttpExt} import akka.stream.Materializer import cats.data.EitherT import cats.implicits._ @@ -19,18 +19,18 @@ import pl.touk.nussknacker.engine.api.process.{ProcessName, ScenarioVersion, Ver import pl.touk.nussknacker.engine.deployment.EngineSetupName import pl.touk.nussknacker.restmodel.scenariodetails.ScenarioWithDetailsForMigrations import pl.touk.nussknacker.restmodel.validation.ValidationResults.ValidationErrors +import pl.touk.nussknacker.ui.{FatalError, NuDesignerError} import pl.touk.nussknacker.ui.NuDesignerError.XError import pl.touk.nussknacker.ui.api.description.MigrationApiEndpoints.Dtos.ApiVersion import pl.touk.nussknacker.ui.migrations.{MigrateScenarioData, MigrateScenarioDataV2, MigrationApiAdapterService} import pl.touk.nussknacker.ui.security.api.LoggedUser -import pl.touk.nussknacker.ui.util.ScenarioGraphComparator.Difference import pl.touk.nussknacker.ui.util.{ApiAdapterServiceError, OutOfRangeAdapterRequestError, ScenarioGraphComparator} -import pl.touk.nussknacker.ui.{FatalError, NuDesignerError} +import pl.touk.nussknacker.ui.util.ScenarioGraphComparator.Difference import scala.collection.parallel.ExecutionContextTaskSupport import scala.collection.parallel.immutable.ParVector -import scala.concurrent.duration.{DurationInt, FiniteDuration} import scala.concurrent.{Await, ExecutionContext, Future} +import scala.concurrent.duration.{DurationInt, FiniteDuration} trait RemoteEnvironment { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/migrate/TestModelMigrations.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/migrate/TestModelMigrations.scala index d35abcb9650..0619e79d0cc 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/migrate/TestModelMigrations.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/migrate/TestModelMigrations.scala @@ -2,7 +2,7 @@ package pl.touk.nussknacker.ui.process.migrate import com.typesafe.scalalogging.LazyLogging import pl.touk.nussknacker.engine.api.graph.ScenarioGraph -import pl.touk.nussknacker.engine.api.process.{ProcessName, ProcessingType} +import pl.touk.nussknacker.engine.api.process.{ProcessingType, ProcessName} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.util.Implicits.RichTupleList import pl.touk.nussknacker.restmodel.scenariodetails.ScenarioWithDetailsForMigrations diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/newactivity/ActivityService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/newactivity/ActivityService.scala index aeff6e772ad..f25c70315cb 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/newactivity/ActivityService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/newactivity/ActivityService.scala @@ -6,10 +6,10 @@ import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.process.{ProcessId, VersionId} import pl.touk.nussknacker.ui.api.DeploymentCommentSettings import pl.touk.nussknacker.ui.process.newactivity.ActivityService._ -import pl.touk.nussknacker.ui.process.newdeployment.DeploymentService.RunDeploymentError import pl.touk.nussknacker.ui.process.newdeployment.{DeploymentService, RunDeploymentCommand} -import pl.touk.nussknacker.ui.process.repository.activities.ScenarioActivityRepository +import pl.touk.nussknacker.ui.process.newdeployment.DeploymentService.RunDeploymentError import pl.touk.nussknacker.ui.process.repository.{DBIOActionRunner, DeploymentComment} +import pl.touk.nussknacker.ui.process.repository.activities.ScenarioActivityRepository import pl.touk.nussknacker.ui.security.api.LoggedUser import pl.touk.nussknacker.ui.util.LoggedUserUtils.Ops diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/newdeployment/DeploymentRepository.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/newdeployment/DeploymentRepository.scala index ac44170d3b6..af9306d73fc 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/newdeployment/DeploymentRepository.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/newdeployment/DeploymentRepository.scala @@ -5,8 +5,8 @@ import db.util.DBIOActionInstances._ import pl.touk.nussknacker.engine.api.deployment.{DeploymentStatus, DeploymentStatusName, ProblemDeploymentStatus} import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessingType} import pl.touk.nussknacker.engine.newdeployment.DeploymentId -import pl.touk.nussknacker.ui.db.entity.ProcessEntityData import pl.touk.nussknacker.ui.db.{DbRef, NuTables, SqlStates} +import pl.touk.nussknacker.ui.db.entity.ProcessEntityData import pl.touk.nussknacker.ui.process.newdeployment.DeploymentEntityFactory.DeploymentEntityData import pl.touk.nussknacker.ui.process.newdeployment.DeploymentRepository.{ ConflictingDeploymentIdError, diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/newdeployment/DeploymentService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/newdeployment/DeploymentService.scala index f30004cb49e..9a7217a95e5 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/newdeployment/DeploymentService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/newdeployment/DeploymentService.scala @@ -4,14 +4,14 @@ import cats.Applicative import cats.data.{EitherT, NonEmptyList} import com.typesafe.scalalogging.LazyLogging import db.util.DBIOActionInstances._ +import pl.touk.nussknacker.engine.api.{ProcessVersion => RuntimeVersionData} import pl.touk.nussknacker.engine.api.component.{ ComponentAdditionalConfig, DesignerWideComponentId, NodesDeploymentData } import pl.touk.nussknacker.engine.api.deployment._ -import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, ProcessingType, VersionId} -import pl.touk.nussknacker.engine.api.{ProcessVersion => RuntimeVersionData} +import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessingType, ProcessName, VersionId} import pl.touk.nussknacker.engine.deployment.{ AdditionalModelConfigs, DeploymentData, diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicDeploymentManagerDecorator.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicDeploymentManagerDecorator.scala index 4e299d7edad..0774a999de9 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicDeploymentManagerDecorator.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicDeploymentManagerDecorator.scala @@ -5,12 +5,12 @@ import com.typesafe.scalalogging.LazyLogging import pl.touk.nussknacker.engine.DeploymentManagerDependencies import pl.touk.nussknacker.engine.api.component.ScenarioPropertyConfig import pl.touk.nussknacker.engine.api.definition.{MandatoryParameterValidator, StringParameterEditor} +import pl.touk.nussknacker.engine.api.deployment.{DeploymentManager, SchedulingSupported} import pl.touk.nussknacker.engine.api.deployment.scheduler.services.{ EmptyScheduledProcessListenerFactory, ProcessConfigEnricherFactory, SchedulePropertyExtractorFactory } -import pl.touk.nussknacker.engine.api.deployment.{DeploymentManager, SchedulingSupported} import pl.touk.nussknacker.ui.db.DbRef import pl.touk.nussknacker.ui.process.periodic.cron.{CronParameterValidator, CronSchedulePropertyExtractor} import pl.touk.nussknacker.ui.process.periodic.legacy.db.{LegacyDbInitializer, SlickLegacyPeriodicProcessesRepository} diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicProcessService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicProcessService.scala index 25b7a213420..a7aa671b0d8 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicProcessService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicProcessService.scala @@ -8,8 +8,8 @@ import pl.touk.nussknacker.engine.api.component.{ DesignerWideComponentId, NodesDeploymentData } -import pl.touk.nussknacker.engine.api.deployment.StateStatus.StatusName import pl.touk.nussknacker.engine.api.deployment._ +import pl.touk.nussknacker.engine.api.deployment.StateStatus.StatusName import pl.touk.nussknacker.engine.api.deployment.scheduler.model.{ScheduleProperty => _, _} import pl.touk.nussknacker.engine.api.deployment.scheduler.services._ import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus @@ -20,14 +20,14 @@ import pl.touk.nussknacker.engine.deployment.{AdditionalModelConfigs, Deployment import pl.touk.nussknacker.engine.util.AdditionalComponentConfigsForRuntimeExtractor import pl.touk.nussknacker.ui.process.periodic.PeriodicProcessService._ import pl.touk.nussknacker.ui.process.periodic.PeriodicStateStatus._ -import pl.touk.nussknacker.ui.process.periodic.model.PeriodicProcessDeploymentStatus.PeriodicProcessDeploymentStatus import pl.touk.nussknacker.ui.process.periodic.model._ +import pl.touk.nussknacker.ui.process.periodic.model.PeriodicProcessDeploymentStatus.PeriodicProcessDeploymentStatus import pl.touk.nussknacker.ui.process.periodic.utils.DeterministicUUIDFromLong import pl.touk.nussknacker.ui.process.repository.PeriodicProcessesRepository +import java.time.{Clock, Instant, LocalDateTime} import java.time.chrono.ChronoLocalDateTime import java.time.temporal.ChronoUnit -import java.time.{Clock, Instant, LocalDateTime} import scala.concurrent.{ExecutionContext, Future} import scala.util.control.NonFatal diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicProcessStateDefinitionManager.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicProcessStateDefinitionManager.scala index 544410cbd87..da898f868a2 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicProcessStateDefinitionManager.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicProcessStateDefinitionManager.scala @@ -1,15 +1,15 @@ package pl.touk.nussknacker.ui.process.periodic -import pl.touk.nussknacker.engine.api.deployment.ProcessStateDefinitionManager.{ - DefaultVisibleActions, - ScenarioStatusWithScenarioContext -} import pl.touk.nussknacker.engine.api.deployment.{ OverridingProcessStateDefinitionManager, ProcessStateDefinitionManager, ScenarioActionName, StateStatus } +import pl.touk.nussknacker.engine.api.deployment.ProcessStateDefinitionManager.{ + DefaultVisibleActions, + ScenarioStatusWithScenarioContext +} import pl.touk.nussknacker.ui.process.periodic.PeriodicProcessService.{ MaxDeploymentsStatus, PeriodicDeploymentStatus, diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicStateStatus.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicStateStatus.scala index 9897ce887ad..99962225c7a 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicStateStatus.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicStateStatus.scala @@ -1,10 +1,10 @@ package pl.touk.nussknacker.ui.process.periodic +import pl.touk.nussknacker.engine.api.deployment.{ScenarioActionName, StateDefinitionDetails, StateStatus} import pl.touk.nussknacker.engine.api.deployment.ProcessStateDefinitionManager.ScenarioStatusWithScenarioContext import pl.touk.nussknacker.engine.api.deployment.StateStatus.StatusName import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus.ProblemStateStatus -import pl.touk.nussknacker.engine.api.deployment.{ScenarioActionName, StateDefinitionDetails, StateStatus} import pl.touk.nussknacker.engine.api.process.VersionId import java.net.URI diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/ScheduleProperty.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/ScheduleProperty.scala index 86f01f37130..d84774f6197 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/ScheduleProperty.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/ScheduleProperty.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.ui.process.periodic +import com.cronutils.model.{Cron, CronType} import com.cronutils.model.definition.CronDefinitionBuilder import com.cronutils.model.time.ExecutionTime -import com.cronutils.model.{Cron, CronType} import com.cronutils.parser.CronParser import io.circe.generic.JsonCodec import io.circe.generic.extras.{Configuration, ConfiguredJsonCodec} -import java.time.{Clock, LocalDateTime, ZoneId, ZonedDateTime} +import java.time.{Clock, LocalDateTime, ZonedDateTime, ZoneId} import scala.util.Try object ScheduleProperty { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/Utils.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/Utils.scala index a3ba8073295..fc54d38f727 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/Utils.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/Utils.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.ui.process.periodic import akka.actor.{ActorRef, ActorSystem, Props} import com.typesafe.scalalogging.LazyLogging -import scala.concurrent.duration.DurationInt import scala.concurrent.{Await, ExecutionContext, Future} +import scala.concurrent.duration.DurationInt import scala.util.{Failure, Success, Try} object Utils extends LazyLogging { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/cron/CronSchedulePropertyExtractor.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/cron/CronSchedulePropertyExtractor.scala index 96294b9a08a..dde9bbc288f 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/cron/CronSchedulePropertyExtractor.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/cron/CronSchedulePropertyExtractor.scala @@ -4,9 +4,9 @@ import com.typesafe.scalalogging.LazyLogging import pl.touk.nussknacker.engine.api.deployment.scheduler.model.{ScheduleProperty => ApiScheduleProperty} import pl.touk.nussknacker.engine.api.deployment.scheduler.services.SchedulePropertyExtractor import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess +import pl.touk.nussknacker.ui.process.periodic.{CronScheduleProperty, MultipleScheduleProperty, SingleScheduleProperty} import pl.touk.nussknacker.ui.process.periodic.cron.CronSchedulePropertyExtractor.CronPropertyDefaultName import pl.touk.nussknacker.ui.process.periodic.utils.SchedulePropertyExtractorUtils -import pl.touk.nussknacker.ui.process.periodic.{CronScheduleProperty, MultipleScheduleProperty, SingleScheduleProperty} object CronSchedulePropertyExtractor { val CronPropertyDefaultName = "cron" diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/legacy/db/LegacyPeriodicProcessDeploymentsTableFactory.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/legacy/db/LegacyPeriodicProcessDeploymentsTableFactory.scala index c46626ac88c..41812d38d47 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/legacy/db/LegacyPeriodicProcessDeploymentsTableFactory.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/legacy/db/LegacyPeriodicProcessDeploymentsTableFactory.scala @@ -1,11 +1,11 @@ package pl.touk.nussknacker.ui.process.periodic.legacy.db -import pl.touk.nussknacker.ui.process.periodic.model.PeriodicProcessDeploymentStatus.PeriodicProcessDeploymentStatus import pl.touk.nussknacker.ui.process.periodic.model.{ PeriodicProcessDeploymentId, PeriodicProcessDeploymentStatus, PeriodicProcessId } +import pl.touk.nussknacker.ui.process.periodic.model.PeriodicProcessDeploymentStatus.PeriodicProcessDeploymentStatus import slick.jdbc.{JdbcProfile, JdbcType} import slick.lifted.ProvenShape import slick.sql.SqlProfile.ColumnOption.NotNull diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/legacy/db/LegacyPeriodicProcessesRepository.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/legacy/db/LegacyPeriodicProcessesRepository.scala index 269656257f2..4b78640bb8b 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/legacy/db/LegacyPeriodicProcessesRepository.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/legacy/db/LegacyPeriodicProcessesRepository.scala @@ -12,13 +12,13 @@ import pl.touk.nussknacker.engine.api.process.{ProcessName, VersionId} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.ui.process.periodic.ScheduleProperty import pl.touk.nussknacker.ui.process.periodic.legacy.db.LegacyPeriodicProcessesRepository.createPeriodicProcess -import pl.touk.nussknacker.ui.process.periodic.model.PeriodicProcessDeploymentStatus.PeriodicProcessDeploymentStatus import pl.touk.nussknacker.ui.process.periodic.model._ +import pl.touk.nussknacker.ui.process.periodic.model.PeriodicProcessDeploymentStatus.PeriodicProcessDeploymentStatus import pl.touk.nussknacker.ui.process.repository.{FetchingProcessRepository, PeriodicProcessesRepository} import pl.touk.nussknacker.ui.security.api.NussknackerInternalUser import slick.dbio.{DBIOAction, Effect, NoStream} -import slick.jdbc.PostgresProfile.api._ import slick.jdbc.{JdbcBackend, JdbcProfile} +import slick.jdbc.PostgresProfile.api._ import java.time.{Clock, LocalDateTime} import scala.concurrent.{ExecutionContext, Future} diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/utils/SchedulePropertyExtractorUtils.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/utils/SchedulePropertyExtractorUtils.scala index 0e2ccb4bd55..97dd1d4df79 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/utils/SchedulePropertyExtractorUtils.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/periodic/utils/SchedulePropertyExtractorUtils.scala @@ -3,7 +3,12 @@ package pl.touk.nussknacker.ui.process.periodic.utils import cats.instances.list._ import cats.syntax.traverse._ import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess -import pl.touk.nussknacker.ui.process.periodic.{CronScheduleProperty, MultipleScheduleProperty, ScheduleProperty, SingleScheduleProperty} +import pl.touk.nussknacker.ui.process.periodic.{ + CronScheduleProperty, + MultipleScheduleProperty, + ScheduleProperty, + SingleScheduleProperty +} import java.time.Clock diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/ProcessingTypeData.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/ProcessingTypeData.scala index c1bf1fae275..4efb87c1d9e 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/ProcessingTypeData.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/ProcessingTypeData.scala @@ -3,15 +3,15 @@ package pl.touk.nussknacker.ui.process.processingtype import com.typesafe.config.Config import pl.touk.nussknacker.engine._ import pl.touk.nussknacker.engine.api.component.ScenarioPropertyConfig -import pl.touk.nussknacker.engine.api.deployment.cache.ScenarioStateCachingConfig import pl.touk.nussknacker.engine.api.deployment.{NoSchedulingSupport, SchedulingSupported} +import pl.touk.nussknacker.engine.api.deployment.cache.ScenarioStateCachingConfig import pl.touk.nussknacker.engine.api.process.ProcessingType -import pl.touk.nussknacker.engine.definition.component.Components.ComponentDefinitionExtractionMode import pl.touk.nussknacker.engine.definition.component.{ ComponentDefinitionWithImplementation, Components, DynamicComponentStaticDefinitionDeterminer } +import pl.touk.nussknacker.engine.definition.component.Components.ComponentDefinitionExtractionMode import pl.touk.nussknacker.engine.deployment.EngineSetupName import pl.touk.nussknacker.restmodel.scenariodetails.ScenarioParameters import pl.touk.nussknacker.ui.db.DbRef diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/ScenarioParametersService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/ScenarioParametersService.scala index ed7e13a12b7..43d9433a083 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/ScenarioParametersService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/ScenarioParametersService.scala @@ -8,8 +8,8 @@ import pl.touk.nussknacker.engine.deployment.EngineSetupName import pl.touk.nussknacker.engine.util.Implicits.{RichScalaMap, RichTupleList} import pl.touk.nussknacker.restmodel.scenariodetails.ScenarioParameters import pl.touk.nussknacker.security.Permission -import pl.touk.nussknacker.ui.security.api.LoggedUser import pl.touk.nussknacker.ui.{BadRequestError, NuDesignerError, UnauthorizedError} +import pl.touk.nussknacker.ui.security.api.LoggedUser class ScenarioParametersService private ( parametersForProcessingType: Map[ProcessingType, ScenarioParameters], diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/loader/LocalProcessingTypeDataLoader.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/loader/LocalProcessingTypeDataLoader.scala index 46f28fd3b6b..793b3f3510d 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/loader/LocalProcessingTypeDataLoader.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/loader/LocalProcessingTypeDataLoader.scala @@ -6,14 +6,14 @@ import pl.touk.nussknacker.engine._ import pl.touk.nussknacker.engine.api.process.ProcessingType import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap import pl.touk.nussknacker.ui.db.DbRef -import pl.touk.nussknacker.ui.process.processingtype.ProcessingTypeData.SchedulingForProcessingType -import pl.touk.nussknacker.ui.process.processingtype.loader.ProcessingTypeDataLoader.toValueWithRestriction -import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataState import pl.touk.nussknacker.ui.process.processingtype.{ CombinedProcessingTypeData, ModelClassLoaderProvider, ProcessingTypeData } +import pl.touk.nussknacker.ui.process.processingtype.ProcessingTypeData.SchedulingForProcessingType +import pl.touk.nussknacker.ui.process.processingtype.loader.ProcessingTypeDataLoader.toValueWithRestriction +import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataState class LocalProcessingTypeDataLoader( modelData: Map[ProcessingType, (String, ModelData)], diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/loader/ProcessingTypeDataLoader.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/loader/ProcessingTypeDataLoader.scala index 277dd6b96a1..089e21306b8 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/loader/ProcessingTypeDataLoader.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/loader/ProcessingTypeDataLoader.scala @@ -1,16 +1,16 @@ package pl.touk.nussknacker.ui.process.processingtype.loader import cats.effect.IO -import pl.touk.nussknacker.engine.api.process.ProcessingType import pl.touk.nussknacker.engine.{DeploymentManagerDependencies, ModelDependencies} +import pl.touk.nussknacker.engine.api.process.ProcessingType import pl.touk.nussknacker.ui.db.DbRef -import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataState import pl.touk.nussknacker.ui.process.processingtype.{ CombinedProcessingTypeData, ModelClassLoaderProvider, ProcessingTypeData, ValueWithRestriction } +import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataState trait ProcessingTypeDataLoader { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/loader/ProcessingTypesConfigBasedProcessingTypeDataLoader.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/loader/ProcessingTypesConfigBasedProcessingTypeDataLoader.scala index 2cad01afc34..4c620fe90b1 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/loader/ProcessingTypesConfigBasedProcessingTypeDataLoader.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/loader/ProcessingTypesConfigBasedProcessingTypeDataLoader.scala @@ -8,8 +8,8 @@ import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap import pl.touk.nussknacker.engine.util.loader.{DeploymentManagersClassLoader, ScalaServiceLoader} import pl.touk.nussknacker.ui.configloader.{ProcessingTypeConfigs, ProcessingTypeConfigsLoader} import pl.touk.nussknacker.ui.db.DbRef -import pl.touk.nussknacker.ui.process.processingtype.ProcessingTypeData.SchedulingForProcessingType import pl.touk.nussknacker.ui.process.processingtype._ +import pl.touk.nussknacker.ui.process.processingtype.ProcessingTypeData.SchedulingForProcessingType import pl.touk.nussknacker.ui.process.processingtype.loader.ProcessingTypeDataLoader.toValueWithRestriction import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataState diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/DBFetchingProcessRepository.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/DBFetchingProcessRepository.scala index 6903a09d9ae..396047f7bf3 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/DBFetchingProcessRepository.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/DBFetchingProcessRepository.scala @@ -11,10 +11,10 @@ import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.ui.db.DbRef import pl.touk.nussknacker.ui.db.entity._ +import pl.touk.nussknacker.ui.process.{repository, ScenarioQuery} import pl.touk.nussknacker.ui.process.label.ScenarioLabel import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter import pl.touk.nussknacker.ui.process.repository.ProcessDBQueryRepository.ProcessNotFoundError -import pl.touk.nussknacker.ui.process.{ScenarioQuery, repository} import pl.touk.nussknacker.ui.security.api.LoggedUser import scala.concurrent.{ExecutionContext, Future} diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/DBIOActionRunner.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/DBIOActionRunner.scala index 5b36b4c227e..6868dc68a13 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/DBIOActionRunner.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/DBIOActionRunner.scala @@ -6,8 +6,8 @@ import pl.touk.nussknacker.ui.process.repository.DBIOActionRunner.TransactionsRu import slick.jdbc.{JdbcProfile, TransactionIsolation} import java.sql.SQLException -import scala.concurrent.duration.{DurationInt, FiniteDuration} import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.duration.{DurationInt, FiniteDuration} import scala.language.higherKinds import scala.util.{Failure, Success, Try} diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/DeploymentComment.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/DeploymentComment.scala index f832b0ffcec..e6d458be4c2 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/DeploymentComment.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/DeploymentComment.scala @@ -2,9 +2,9 @@ package pl.touk.nussknacker.ui.process.repository import cats.data.Validated import cats.data.Validated.{Invalid, Valid} +import pl.touk.nussknacker.engine.api.Comment import pl.touk.nussknacker.ui.BadRequestError import pl.touk.nussknacker.ui.api.DeploymentCommentSettings -import pl.touk.nussknacker.engine.api.Comment object DeploymentComment { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/PeriodicProcessesRepository.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/PeriodicProcessesRepository.scala index b23eceeb86f..dae2d1277b4 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/PeriodicProcessesRepository.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/PeriodicProcessesRepository.scala @@ -12,13 +12,13 @@ import pl.touk.nussknacker.engine.api.process.{ProcessName, VersionId} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.ui.db.entity._ import pl.touk.nussknacker.ui.process.periodic.ScheduleProperty -import pl.touk.nussknacker.ui.process.periodic.model.PeriodicProcessDeploymentStatus.PeriodicProcessDeploymentStatus import pl.touk.nussknacker.ui.process.periodic.model._ +import pl.touk.nussknacker.ui.process.periodic.model.PeriodicProcessDeploymentStatus.PeriodicProcessDeploymentStatus import pl.touk.nussknacker.ui.process.repository.PeriodicProcessesRepository.createPeriodicProcess import pl.touk.nussknacker.ui.security.api.NussknackerInternalUser import slick.dbio.{DBIOAction, Effect, NoStream} -import slick.jdbc.PostgresProfile.api._ import slick.jdbc.{JdbcBackend, JdbcProfile} +import slick.jdbc.PostgresProfile.api._ import java.time.{Clock, LocalDateTime} import scala.concurrent.{ExecutionContext, Future} diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ProcessDBQueryRepository.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ProcessDBQueryRepository.scala index 172e5db1ce1..2f53e970249 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ProcessDBQueryRepository.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ProcessDBQueryRepository.scala @@ -3,10 +3,10 @@ package pl.touk.nussknacker.ui.process.repository import pl.touk.nussknacker.engine.api.deployment.ProcessAction import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, ScenarioVersion, VersionId} import pl.touk.nussknacker.security.Permission +import pl.touk.nussknacker.ui.{BadRequestError, NotFoundError} import pl.touk.nussknacker.ui.db.NuTables import pl.touk.nussknacker.ui.db.entity._ import pl.touk.nussknacker.ui.security.api._ -import pl.touk.nussknacker.ui.{BadRequestError, NotFoundError} import java.sql.Timestamp import scala.language.higherKinds diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ProcessRepository.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ProcessRepository.scala index 505ec16d56f..eda0e2e91b1 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ProcessRepository.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ProcessRepository.scala @@ -10,8 +10,8 @@ import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.migration.{ProcessMigration, ProcessMigrations} -import pl.touk.nussknacker.ui.db.entity.{ProcessEntityData, ProcessVersionEntityData} import pl.touk.nussknacker.ui.db.{DbRef, NuTables} +import pl.touk.nussknacker.ui.db.entity.{ProcessEntityData, ProcessVersionEntityData} import pl.touk.nussknacker.ui.process.label.ScenarioLabel import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataProvider import pl.touk.nussknacker.ui.process.repository.ProcessDBQueryRepository._ diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioActionRepository.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioActionRepository.scala index 70813cdd6c9..3739cd57bf8 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioActionRepository.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioActionRepository.scala @@ -4,17 +4,17 @@ import cats.data.NonEmptyList import com.typesafe.scalalogging.LazyLogging import db.util.DBIOActionInstances._ import pl.touk.nussknacker.engine.api.Comment -import pl.touk.nussknacker.engine.api.deployment.ProcessActionState.ProcessActionState import pl.touk.nussknacker.engine.api.deployment._ +import pl.touk.nussknacker.engine.api.deployment.ProcessActionState.ProcessActionState import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, VersionId} import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap +import pl.touk.nussknacker.ui.db.{DbRef, NuTables} import pl.touk.nussknacker.ui.db.entity.{ AdditionalProperties, ScenarioActivityEntityData, ScenarioActivityEntityFactory, ScenarioActivityType } -import pl.touk.nussknacker.ui.db.{DbRef, NuTables} import pl.touk.nussknacker.ui.security.api.LoggedUser import slick.dbio.DBIOAction @@ -382,8 +382,10 @@ class DbScenarioActionReadOnlyRepository( .map(pa => (pa.scenarioId, pa.activityType)) run( query.result - .map(_.groupBy { case (process_id, _) => ProcessId(process_id.value) } - .mapValuesNow(_.map(_._2).toSet.flatMap(actionName))) + .map( + _.groupBy { case (process_id, _) => ProcessId(process_id.value) } + .mapValuesNow(_.map(_._2).toSet.flatMap(actionName)) + ) ) } diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioActionRepositoryAuditLogDecorator.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioActionRepositoryAuditLogDecorator.scala index 54507d4acd6..0ac6444ce91 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioActionRepositoryAuditLogDecorator.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioActionRepositoryAuditLogDecorator.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.ui.process.repository import db.util.DBIOActionInstances._ import pl.touk.nussknacker.engine.api.Comment -import pl.touk.nussknacker.engine.api.deployment.ProcessActionState.ProcessActionState import pl.touk.nussknacker.engine.api.deployment._ +import pl.touk.nussknacker.engine.api.deployment.ProcessActionState.ProcessActionState import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, VersionId} import pl.touk.nussknacker.ui.process.ScenarioActivityAuditLog import pl.touk.nussknacker.ui.security.api.LoggedUser diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioLabelsRepository.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioLabelsRepository.scala index fd95ceb90a6..42b1e2e11dd 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioLabelsRepository.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioLabelsRepository.scala @@ -4,8 +4,8 @@ import cats.data.NonEmptyList import db.util.DBIOActionInstances.{DB, _} import pl.touk.nussknacker.engine.api.process.ProcessId import pl.touk.nussknacker.security.Permission -import pl.touk.nussknacker.ui.db.entity.{ProcessEntityData, ProcessEntityFactory, ScenarioLabelEntityData} import pl.touk.nussknacker.ui.db.{DbRef, NuTables} +import pl.touk.nussknacker.ui.db.entity.{ProcessEntityData, ProcessEntityFactory, ScenarioLabelEntityData} import pl.touk.nussknacker.ui.process.label.ScenarioLabel import pl.touk.nussknacker.ui.security.api.{AdminUser, CommonUser, ImpersonatedUser, LoggedUser, RealLoggedUser} import slick.jdbc.JdbcProfile diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioWithDetailsEntity.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioWithDetailsEntity.scala index 48edf7cc7f6..6ae09cb1095 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioWithDetailsEntity.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioWithDetailsEntity.scala @@ -1,17 +1,17 @@ package pl.touk.nussknacker.ui.process.repository -import pl.touk.nussknacker.engine.api.deployment.ProcessActionState.ProcessActionState +import pl.touk.nussknacker.engine.api.{ProcessVersion => EngineProcessVersion} import pl.touk.nussknacker.engine.api.deployment.{ProcessAction, ProcessActionId, ScenarioActionName} +import pl.touk.nussknacker.engine.api.deployment.ProcessActionState.ProcessActionState import pl.touk.nussknacker.engine.api.graph.ScenarioGraph import pl.touk.nussknacker.engine.api.process.{ ProcessId, ProcessIdWithName, - ProcessName, ProcessingType, + ProcessName, ScenarioVersion, VersionId } -import pl.touk.nussknacker.engine.api.{ProcessVersion => EngineProcessVersion} import pl.touk.nussknacker.ui.listener.ListenerScenarioWithDetails import java.time.Instant diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/activities/DbScenarioActivityRepository.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/activities/DbScenarioActivityRepository.scala index ee3f0d7e626..dac09f6a576 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/activities/DbScenarioActivityRepository.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/activities/DbScenarioActivityRepository.scala @@ -5,18 +5,18 @@ import com.typesafe.scalalogging.LazyLogging import db.util.DBIOActionInstances.DB import pl.touk.nussknacker.engine.api.Comment import pl.touk.nussknacker.engine.api.component.ProcessingMode -import pl.touk.nussknacker.engine.api.deployment.ScenarioAttachment.{AttachmentFilename, AttachmentId} import pl.touk.nussknacker.engine.api.deployment._ +import pl.touk.nussknacker.engine.api.deployment.ScenarioAttachment.{AttachmentFilename, AttachmentId} import pl.touk.nussknacker.engine.api.modelinfo.ModelInfo import pl.touk.nussknacker.engine.api.process.ProcessId import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.Legacy +import pl.touk.nussknacker.ui.db.{DbRef, NuTables} import pl.touk.nussknacker.ui.db.entity.{ AdditionalProperties, AttachmentEntityData, ScenarioActivityEntityData, ScenarioActivityType } -import pl.touk.nussknacker.ui.db.{DbRef, NuTables} import pl.touk.nussknacker.ui.process.ScenarioAttachmentService.AttachmentToAdd import pl.touk.nussknacker.ui.process.repository.DbioRepository import pl.touk.nussknacker.ui.process.repository.activities.ScenarioActivityRepository.{ diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/activities/ScenarioActivityRepositoryAuditLogDecorator.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/activities/ScenarioActivityRepositoryAuditLogDecorator.scala index 4a4638d017a..4260acfd6dc 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/activities/ScenarioActivityRepositoryAuditLogDecorator.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/activities/ScenarioActivityRepositoryAuditLogDecorator.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.ui.process.repository.activities import cats.effect.IO -import db.util.DBIOActionInstances.{DB, dbMonad} +import db.util.DBIOActionInstances.{dbMonad, DB} import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.process.ProcessId import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.Legacy diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/stickynotes/DbStickyNotesRepository.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/stickynotes/DbStickyNotesRepository.scala index 8acf546cf28..868b67159ee 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/stickynotes/DbStickyNotesRepository.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/stickynotes/DbStickyNotesRepository.scala @@ -11,8 +11,8 @@ import pl.touk.nussknacker.ui.api.description.stickynotes.Dtos.{ StickyNoteId } import pl.touk.nussknacker.ui.api.description.stickynotes.StickyNoteEvent -import pl.touk.nussknacker.ui.db.entity.StickyNoteEventEntityData import pl.touk.nussknacker.ui.db.{DbRef, NuTables} +import pl.touk.nussknacker.ui.db.entity.StickyNoteEventEntityData import pl.touk.nussknacker.ui.process.repository.DbioRepository import pl.touk.nussknacker.ui.security.api.LoggedUser import slick.dbio.DBIOAction diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/scenarioactivity/FetchScenarioActivityService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/scenarioactivity/FetchScenarioActivityService.scala index ebb757dd068..9cc49c66ad7 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/scenarioactivity/FetchScenarioActivityService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/scenarioactivity/FetchScenarioActivityService.scala @@ -4,8 +4,8 @@ import cats.data.EitherT import pl.touk.nussknacker.engine.api.deployment.{ManagerSpecificScenarioActivitiesStoredByManager, ScenarioActivity} import pl.touk.nussknacker.engine.api.process.{ProcessIdWithName, ProcessName} import pl.touk.nussknacker.ui.process.deployment.DeploymentManagerDispatcher -import pl.touk.nussknacker.ui.process.repository.activities.ScenarioActivityRepository import pl.touk.nussknacker.ui.process.repository.{DBIOActionRunner, FetchingProcessRepository} +import pl.touk.nussknacker.ui.process.repository.activities.ScenarioActivityRepository import pl.touk.nussknacker.ui.process.scenarioactivity.FetchScenarioActivityService.ScenarioActivityFetchError import pl.touk.nussknacker.ui.process.scenarioactivity.FetchScenarioActivityService.ScenarioActivityFetchError.NoScenario import pl.touk.nussknacker.ui.security.api.LoggedUser diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/test/ScenarioTestService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/test/ScenarioTestService.scala index f92d7412f59..d50be6a025d 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/test/ScenarioTestService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/test/ScenarioTestService.scala @@ -2,15 +2,15 @@ package pl.touk.nussknacker.ui.process.test import com.carrotsearch.sizeof.RamUsageEstimator import com.typesafe.scalalogging.LazyLogging +import pl.touk.nussknacker.engine.api.{MetaData, ProcessVersion} import pl.touk.nussknacker.engine.api.definition.{DualParameterEditor, Parameter, StringParameterEditor} import pl.touk.nussknacker.engine.api.editor.DualEditorMode import pl.touk.nussknacker.engine.api.graph.ScenarioGraph import pl.touk.nussknacker.engine.api.test.ScenarioTestData import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{MetaData, ProcessVersion} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess -import pl.touk.nussknacker.engine.definition.test.TestInfoProvider.SourceTestDataGenerationError import pl.touk.nussknacker.engine.definition.test.{TestInfoProvider, TestingCapabilities} +import pl.touk.nussknacker.engine.definition.test.TestInfoProvider.SourceTestDataGenerationError import pl.touk.nussknacker.engine.graph.node.SourceNodeData import pl.touk.nussknacker.engine.testmode.TestProcess.TestResults import pl.touk.nussknacker.restmodel.definition.UISourceParameters diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/version/ScenarioGraphVersionRepository.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/version/ScenarioGraphVersionRepository.scala index 8bc9925ef2d..a7ee8e510cd 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/version/ScenarioGraphVersionRepository.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/version/ScenarioGraphVersionRepository.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.ui.process.version -import db.util.DBIOActionInstances.{DB, toEffectAll} +import db.util.DBIOActionInstances.{toEffectAll, DB} import pl.touk.nussknacker.engine.api.process.ProcessId -import pl.touk.nussknacker.ui.db.entity.ProcessVersionEntityData import pl.touk.nussknacker.ui.db.{DbRef, NuTables} +import pl.touk.nussknacker.ui.db.entity.ProcessVersionEntityData import slick.jdbc.JdbcProfile import scala.concurrent.ExecutionContext diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/server/AkkaHttpBasedRouteProvider.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/server/AkkaHttpBasedRouteProvider.scala index e05bcb5ecb5..bce74ef8b1c 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/server/AkkaHttpBasedRouteProvider.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/server/AkkaHttpBasedRouteProvider.scala @@ -9,6 +9,7 @@ import com.typesafe.scalalogging.LazyLogging import io.dropwizard.metrics5.MetricRegistry import net.ceedubs.ficus.Ficus._ import net.ceedubs.ficus.readers.ArbitraryTypeReader.arbitraryTypeValueReader +import pl.touk.nussknacker.engine.{DeploymentManagerDependencies, ModelDependencies} import pl.touk.nussknacker.engine.api.component._ import pl.touk.nussknacker.engine.api.process.ProcessingType import pl.touk.nussknacker.engine.compile.ProcessValidator @@ -19,11 +20,9 @@ import pl.touk.nussknacker.engine.dict.ProcessDictSubstitutor import pl.touk.nussknacker.engine.util.ExecutionContextWithIORuntime import pl.touk.nussknacker.engine.util.loader.ScalaServiceLoader import pl.touk.nussknacker.engine.util.multiplicity.{Empty, Many, Multiplicity, One} -import pl.touk.nussknacker.engine.{DeploymentManagerDependencies, ModelDependencies} -import pl.touk.nussknacker.processCounts.influxdb.InfluxCountsReporterCreator import pl.touk.nussknacker.processCounts.{CountsReporter, CountsReporterCreator} +import pl.touk.nussknacker.processCounts.influxdb.InfluxCountsReporterCreator import pl.touk.nussknacker.ui.api._ -import pl.touk.nussknacker.ui.config.scenariotoolbar.CategoriesScenarioToolbarsConfigParser import pl.touk.nussknacker.ui.config.{ AttachmentsConfig, ComponentLinksConfigExtractor, @@ -31,14 +30,15 @@ import pl.touk.nussknacker.ui.config.{ FeatureTogglesConfig, UsageStatisticsReportsConfig } +import pl.touk.nussknacker.ui.config.scenariotoolbar.CategoriesScenarioToolbarsConfigParser import pl.touk.nussknacker.ui.db.DbRef import pl.touk.nussknacker.ui.db.timeseries.FEStatisticsRepository -import pl.touk.nussknacker.ui.definition.component.{ComponentServiceProcessingTypeData, DefaultComponentService} import pl.touk.nussknacker.ui.definition.{ AlignedComponentsDefinitionProvider, DefinitionsService, ScenarioPropertiesConfigFinalizer } +import pl.touk.nussknacker.ui.definition.component.{ComponentServiceProcessingTypeData, DefaultComponentService} import pl.touk.nussknacker.ui.initialization.Initialization import pl.touk.nussknacker.ui.initialization.Initialization.nussknackerUser import pl.touk.nussknacker.ui.listener.ProcessChangeListenerLoader @@ -47,13 +47,6 @@ import pl.touk.nussknacker.ui.metrics.RepositoryGauges import pl.touk.nussknacker.ui.migrations.{MigrationApiAdapterService, MigrationService} import pl.touk.nussknacker.ui.notifications.{Notification, NotificationConfig, NotificationServiceImpl} import pl.touk.nussknacker.ui.process._ -import pl.touk.nussknacker.ui.process.deployment.deploymentstatus.EngineSideDeploymentStatusesProvider -import pl.touk.nussknacker.ui.process.deployment.reconciliation.{ - FinishedDeploymentsStatusesSynchronizationConfig, - FinishedDeploymentsStatusesSynchronizationScheduler, - ScenarioDeploymentReconciler -} -import pl.touk.nussknacker.ui.process.deployment.scenariostatus.ScenarioStatusProvider import pl.touk.nussknacker.ui.process.deployment.{ ActionInfoService, ActionService, @@ -65,19 +58,26 @@ import pl.touk.nussknacker.ui.process.deployment.{ ScenarioResolver, ScenarioTestExecutorServiceImpl } +import pl.touk.nussknacker.ui.process.deployment.deploymentstatus.EngineSideDeploymentStatusesProvider +import pl.touk.nussknacker.ui.process.deployment.reconciliation.{ + FinishedDeploymentsStatusesSynchronizationConfig, + FinishedDeploymentsStatusesSynchronizationScheduler, + ScenarioDeploymentReconciler +} +import pl.touk.nussknacker.ui.process.deployment.scenariostatus.ScenarioStatusProvider import pl.touk.nussknacker.ui.process.fragment.{DefaultFragmentRepository, FragmentResolver} import pl.touk.nussknacker.ui.process.label.ScenarioLabelsService import pl.touk.nussknacker.ui.process.migrate.{HttpRemoteEnvironment, ProcessModelMigrator, TestModelMigrations} import pl.touk.nussknacker.ui.process.newactivity.ActivityService +import pl.touk.nussknacker.ui.process.newdeployment.{DeploymentRepository, DeploymentService} import pl.touk.nussknacker.ui.process.newdeployment.synchronize.{ DeploymentsStatusesSynchronizationConfig, DeploymentsStatusesSynchronizationScheduler, DeploymentsStatusesSynchronizer } -import pl.touk.nussknacker.ui.process.newdeployment.{DeploymentRepository, DeploymentService} +import pl.touk.nussknacker.ui.process.processingtype.{ModelClassLoaderProvider, ProcessingTypeData} import pl.touk.nussknacker.ui.process.processingtype.loader.ProcessingTypeDataLoader import pl.touk.nussknacker.ui.process.processingtype.provider.ReloadableProcessingTypeDataProvider -import pl.touk.nussknacker.ui.process.processingtype.{ModelClassLoaderProvider, ProcessingTypeData} import pl.touk.nussknacker.ui.process.repository._ import pl.touk.nussknacker.ui.process.repository.activities.{DbScenarioActivityRepository, ScenarioActivityRepository} import pl.touk.nussknacker.ui.process.repository.stickynotes.DbStickyNotesRepository @@ -85,15 +85,15 @@ import pl.touk.nussknacker.ui.process.scenarioactivity.FetchScenarioActivityServ import pl.touk.nussknacker.ui.process.test.{PreliminaryScenarioTestDataSerDe, ScenarioTestService} import pl.touk.nussknacker.ui.process.version.{ScenarioGraphVersionRepository, ScenarioGraphVersionService} import pl.touk.nussknacker.ui.processreport.ProcessCounter -import pl.touk.nussknacker.ui.security.api.{AuthManager, AuthenticationResources, NussknackerInternalUser} +import pl.touk.nussknacker.ui.security.api.{AuthenticationResources, AuthManager, NussknackerInternalUser} import pl.touk.nussknacker.ui.services.NuDesignerExposedApiHttpService -import pl.touk.nussknacker.ui.statistics.repository.FingerprintRepositoryImpl import pl.touk.nussknacker.ui.statistics.{ FingerprintService, PublicEncryptionKey, StatisticUrlConfig, UsageStatisticsReportsSettingsService } +import pl.touk.nussknacker.ui.statistics.repository.FingerprintRepositoryImpl import pl.touk.nussknacker.ui.suggester.ExpressionSuggester import pl.touk.nussknacker.ui.uiresolving.UIProcessResolver import pl.touk.nussknacker.ui.util._ diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/server/AkkaHttpBasedTapirStreamEndpointProvider.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/server/AkkaHttpBasedTapirStreamEndpointProvider.scala index d1829077f9b..c73e136058f 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/server/AkkaHttpBasedTapirStreamEndpointProvider.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/server/AkkaHttpBasedTapirStreamEndpointProvider.scala @@ -5,9 +5,9 @@ import akka.stream.scaladsl.{Source, StreamConverters} import akka.util.ByteString import sttp.capabilities.Streams import sttp.capabilities.akka.AkkaStreams +import sttp.tapir.{Codec, CodecFormat, DecodeResult, EndpointInput, EndpointIO, EndpointOutput, Schema, StreamBodyIO} import sttp.tapir.CodecFormat.OctetStream import sttp.tapir.EndpointIO.StreamBodyWrapper -import sttp.tapir.{Codec, CodecFormat, DecodeResult, EndpointIO, EndpointInput, EndpointOutput, Schema, StreamBodyIO} import java.io.InputStream import java.util.concurrent.TimeUnit diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/server/NuAkkaHttpServerInterpreterForTapirPurposes.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/server/NuAkkaHttpServerInterpreterForTapirPurposes.scala index 4e45cbd72b9..0f85bd59e27 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/server/NuAkkaHttpServerInterpreterForTapirPurposes.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/server/NuAkkaHttpServerInterpreterForTapirPurposes.scala @@ -3,13 +3,13 @@ package pl.touk.nussknacker.ui.server import com.typesafe.scalalogging.LazyLogging import sttp.model.StatusCode import sttp.monad.FutureMonad +import sttp.tapir.{statusCode, stringBody, DecodeResult} import sttp.tapir.EndpointIO.Header import sttp.tapir.server.akkahttp.{AkkaHttpServerInterpreter, AkkaHttpServerOptions} import sttp.tapir.server.interceptor._ import sttp.tapir.server.interceptor.decodefailure.{DecodeFailureHandler, DefaultDecodeFailureHandler} import sttp.tapir.server.interceptor.exception.{ExceptionContext, ExceptionHandler} import sttp.tapir.server.model.ValuedEndpointOutput -import sttp.tapir.{DecodeResult, statusCode, stringBody} import scala.concurrent.{ExecutionContext, Future} diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/server/NussknackerHttpServer.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/server/NussknackerHttpServer.scala index a98e33fac83..c639400894b 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/server/NussknackerHttpServer.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/server/NussknackerHttpServer.scala @@ -1,12 +1,12 @@ package pl.touk.nussknacker.ui.server import akka.actor.ActorSystem -import akka.http.scaladsl.server.Route import akka.http.scaladsl.{Http, HttpsConnectionContext} +import akka.http.scaladsl.server.Route import cats.effect.{IO, Resource} import com.typesafe.scalalogging.LazyLogging -import fr.davit.akka.http.metrics.core.HttpMetrics._ import fr.davit.akka.http.metrics.core.{HttpMetricsRegistry, HttpMetricsSettings} +import fr.davit.akka.http.metrics.core.HttpMetrics._ import fr.davit.akka.http.metrics.dropwizard.{DropwizardRegistry, DropwizardSettings} import io.dropwizard.metrics5.MetricRegistry import pl.touk.nussknacker.engine.ConfigWithUnresolvedVersion @@ -15,8 +15,8 @@ import pl.touk.nussknacker.ui.security.ssl.{HttpsConnectionContextFactory, SslCo import java.util.concurrent.atomic.AtomicReference import java.util.function.Supplier -import scala.concurrent.duration.DurationInt import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.duration.DurationInt import scala.util.{Failure, Success} class NussknackerHttpServer(routeProvider: RouteProvider[Route], system: ActorSystem) extends LazyLogging { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/statistics/Encryption.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/statistics/Encryption.scala index a8740c97eec..a72915f5537 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/statistics/Encryption.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/statistics/Encryption.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.ui.statistics import com.typesafe.scalalogging.LazyLogging import java.nio.charset.StandardCharsets -import java.security.spec.{EncodedKeySpec, X509EncodedKeySpec} import java.security.{Key, KeyFactory, PublicKey} +import java.security.spec.{EncodedKeySpec, X509EncodedKeySpec} import java.util.Base64 import javax.crypto.{Cipher, KeyGenerator, SecretKey} import scala.util.{Failure, Success, Try} diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/statistics/UsageStatisticsReportsSettingsService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/statistics/UsageStatisticsReportsSettingsService.scala index d73af284664..effc93a18fd 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/statistics/UsageStatisticsReportsSettingsService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/statistics/UsageStatisticsReportsSettingsService.scala @@ -12,12 +12,12 @@ import pl.touk.nussknacker.engine.version.BuildInfo import pl.touk.nussknacker.ui.config.UsageStatisticsReportsConfig import pl.touk.nussknacker.ui.db.timeseries.{FEStatisticsRepository, ReadFEStatisticsRepository} import pl.touk.nussknacker.ui.definition.component.ComponentService +import pl.touk.nussknacker.ui.process.{ProcessService, ScenarioQuery} import pl.touk.nussknacker.ui.process.ProcessService.GetScenarioWithDetailsOptions import pl.touk.nussknacker.ui.process.processingtype.DeploymentManagerType import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataProvider import pl.touk.nussknacker.ui.process.repository.DBIOActionRunner import pl.touk.nussknacker.ui.process.repository.activities.ScenarioActivityRepository -import pl.touk.nussknacker.ui.process.{ProcessService, ScenarioQuery} import pl.touk.nussknacker.ui.security.api.{LoggedUser, NussknackerInternalUser} import java.time.Clock diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/AkkaHttpResponse.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/AkkaHttpResponse.scala index 3703f6f602c..48bdbacaab5 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/AkkaHttpResponse.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/AkkaHttpResponse.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.ui.util +import akka.http.scaladsl.model.{headers, HttpResponse, ResponseEntity, StatusCodes} import akka.http.scaladsl.model.headers.ContentDispositionTypes -import akka.http.scaladsl.model.{HttpResponse, ResponseEntity, StatusCodes, headers} object AkkaHttpResponse { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/CorsSupport.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/CorsSupport.scala index 86ff7a1e9fd..b7b2bc328f1 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/CorsSupport.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/CorsSupport.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.ui.util import akka.http.scaladsl.model.headers._ -import akka.http.scaladsl.server.Directives.respondWithHeaders import akka.http.scaladsl.server.{Directive, Directive0} +import akka.http.scaladsl.server.Directives.respondWithHeaders import org.typelevel.ci._ object CorsSupport { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/MultipartUtils.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/MultipartUtils.scala index 1af6d3aaa37..7ada9260113 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/MultipartUtils.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/MultipartUtils.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.ui.util -import akka.http.scaladsl.model.Multipart.FormData import akka.http.scaladsl.model.{ContentTypes, HttpEntity, Multipart} +import akka.http.scaladsl.model.Multipart.FormData import akka.stream.Materializer import akka.stream.scaladsl.{Sink, Source} import akka.util.ByteString diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/OptionsMethodSupport.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/OptionsMethodSupport.scala index 0ef8132c4a1..110f4646a3d 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/OptionsMethodSupport.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/OptionsMethodSupport.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.ui.util import akka.http.scaladsl.model.{HttpMethods, HttpResponse, StatusCodes} -import akka.http.scaladsl.server.Directives.complete import akka.http.scaladsl.server.{Directive, Directive0} +import akka.http.scaladsl.server.Directives.complete object OptionsMethodSupport { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/PdfExporter.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/PdfExporter.scala index a0e7fae5647..c8d6a479376 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/PdfExporter.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/PdfExporter.scala @@ -1,27 +1,27 @@ package pl.touk.nussknacker.ui.util -import java.io._ -import java.net.URI -import java.nio.charset.StandardCharsets -import java.time.{Instant, ZoneId} -import java.time.format.DateTimeFormatter -import javax.xml.transform.TransformerFactory -import javax.xml.transform.sax.SAXResult -import javax.xml.transform.stream.StreamSource import com.typesafe.scalalogging.LazyLogging import org.apache.commons.io.IOUtils import org.apache.fop.apps.FopConfParser import org.apache.fop.apps.io.ResourceResolverFactory import org.apache.xmlgraphics.util.MimeConstants import pl.touk.nussknacker.engine.api.graph.ScenarioGraph +import pl.touk.nussknacker.engine.graph.fragment.FragmentRef import pl.touk.nussknacker.engine.graph.node._ import pl.touk.nussknacker.engine.graph.service.ServiceRef import pl.touk.nussknacker.engine.graph.sink.SinkRef import pl.touk.nussknacker.engine.graph.source.SourceRef -import pl.touk.nussknacker.engine.graph.fragment.FragmentRef import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.Legacy.ProcessActivity import pl.touk.nussknacker.ui.process.repository.ScenarioWithDetailsEntity +import java.io._ +import java.net.URI +import java.nio.charset.StandardCharsets +import java.time.{Instant, ZoneId} +import java.time.format.DateTimeFormatter +import javax.xml.transform.TransformerFactory +import javax.xml.transform.sax.SAXResult +import javax.xml.transform.stream.StreamSource import scala.xml.{Elem, NodeSeq, XML} object PdfExporter extends LazyLogging { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/Project.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/Project.scala index 4dab82408bf..d0ed01a0cbe 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/Project.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/Project.scala @@ -1,6 +1,7 @@ package pl.touk.nussknacker.ui.util import better.files.File + import java.nio.file.Path object Project { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/ScenarioGraphComparator.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/ScenarioGraphComparator.scala index 1eade5e54b8..9b26df64c03 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/ScenarioGraphComparator.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/ScenarioGraphComparator.scala @@ -50,8 +50,8 @@ object ScenarioGraphComparator { .toMap } - import pl.touk.nussknacker.engine.graph.node.NodeData._ import pl.touk.nussknacker.engine.api.CirceUtil._ + import pl.touk.nussknacker.engine.graph.node.NodeData._ @ConfiguredJsonCodec sealed trait Difference { def id: String diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/SecurityHeadersSupport.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/SecurityHeadersSupport.scala index cd8cbf42c29..93f6a78c31c 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/SecurityHeadersSupport.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/util/SecurityHeadersSupport.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.ui.util -import org.typelevel.ci._ import akka.http.scaladsl.model.headers.RawHeader import akka.http.scaladsl.server.Directive0 import akka.http.scaladsl.server.Directives.respondWithHeaders +import org.typelevel.ci._ object SecurityHeadersSupport { diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/validation/NodeValidator.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/validation/NodeValidator.scala index e24ad84bee3..f6ecc0c72fa 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/validation/NodeValidator.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/validation/NodeValidator.scala @@ -1,17 +1,17 @@ package pl.touk.nussknacker.ui.validation import pl.touk.nussknacker.engine.ModelData -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.MissingParameters +import pl.touk.nussknacker.engine.api.{JobData, ProcessVersion} import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext} +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.MissingParameters import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.api.{JobData, ProcessVersion} import pl.touk.nussknacker.engine.compile.FragmentResolver -import pl.touk.nussknacker.engine.compile.nodecompilation.NodeDataValidator.OutgoingEdge import pl.touk.nussknacker.engine.compile.nodecompilation.{ NodeDataValidator, ValidationNotPerformed, ValidationPerformed } +import pl.touk.nussknacker.engine.compile.nodecompilation.NodeDataValidator.OutgoingEdge import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap import pl.touk.nussknacker.engine.variables.GlobalVariablesPreparer import pl.touk.nussknacker.restmodel.validation.PrettyValidationErrors diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/validation/ScenarioPropertiesValidator.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/validation/ScenarioPropertiesValidator.scala index 458ac206e06..a5a28c10b36 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/validation/ScenarioPropertiesValidator.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/validation/ScenarioPropertiesValidator.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.ui.validation import cats.data.Validated -import cats.data.Validated.{Invalid, Valid, invalid, valid} +import cats.data.Validated.{invalid, valid, Invalid, Valid} import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.component.ScenarioPropertyConfig import pl.touk.nussknacker.engine.api.context.PartSubGraphCompilationError diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/validation/UIProcessValidator.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/validation/UIProcessValidator.scala index 28f4417695f..17bf3329db0 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/validation/UIProcessValidator.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/validation/UIProcessValidator.scala @@ -2,17 +2,17 @@ package pl.touk.nussknacker.ui.validation import cats.data.{NonEmptyList, Validated} import cats.data.Validated.{Invalid, Valid} +import pl.touk.nussknacker.engine.CustomProcessValidator +import pl.touk.nussknacker.engine.api.{JobData, ProcessVersion} import pl.touk.nussknacker.engine.api.component.ScenarioPropertyConfig import pl.touk.nussknacker.engine.api.context.ProcessCompilationError import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.graph.{Edge, ScenarioGraph} -import pl.touk.nussknacker.engine.api.process.{ProcessName, ProcessingType} +import pl.touk.nussknacker.engine.api.process.{ProcessingType, ProcessName} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.compile.{IdValidator, NodeTypingInfo, ProcessValidator} import pl.touk.nussknacker.engine.graph.node.{Disableable, FragmentInputDefinition, NodeData, Source} import pl.touk.nussknacker.engine.util.validated.ValidatedSyntax._ -import pl.touk.nussknacker.engine.CustomProcessValidator -import pl.touk.nussknacker.engine.api.{JobData, ProcessVersion} import pl.touk.nussknacker.restmodel.validation.PrettyValidationErrors import pl.touk.nussknacker.restmodel.validation.ValidationResults.{ NodeTypingData, diff --git a/designer/server/src/test/scala/db/migration/V1_032__StandaloneToRequestResponseSpec.scala b/designer/server/src/test/scala/db/migration/V1_032__StandaloneToRequestResponseSpec.scala index 855e751bb1b..e3e727fe7c0 100644 --- a/designer/server/src/test/scala/db/migration/V1_032__StandaloneToRequestResponseSpec.scala +++ b/designer/server/src/test/scala/db/migration/V1_032__StandaloneToRequestResponseSpec.scala @@ -1,11 +1,11 @@ package db.migration import io.circe.Json +import io.circe.syntax._ import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.api.{CirceUtil, MetaData, RequestResponseMetaData, StreamMetaData} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess -import io.circe.syntax._ class V1_032__StandaloneToRequestResponseSpec extends AnyFlatSpec with Matchers { diff --git a/designer/server/src/test/scala/db/migration/V1_041__RemoveTypeSpecificDataSpec.scala b/designer/server/src/test/scala/db/migration/V1_041__RemoveTypeSpecificDataSpec.scala index 03b21c8ae1d..7b01b4eaf29 100644 --- a/designer/server/src/test/scala/db/migration/V1_041__RemoveTypeSpecificDataSpec.scala +++ b/designer/server/src/test/scala/db/migration/V1_041__RemoveTypeSpecificDataSpec.scala @@ -1,10 +1,10 @@ package db.migration import db.migration.V1_041__RemoveTypeSpecificDataDefinition.migrateMetaData +import io.circe.Json import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.api.CirceUtil -import io.circe.Json class V1_041__RemoveTypeSpecificDataSpec extends AnyFunSuite with Matchers { diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/base/db/DbTesting.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/base/db/DbTesting.scala index dc025503e88..8b311f7ad22 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/base/db/DbTesting.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/base/db/DbTesting.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.test.base.db import cats.effect.unsafe.implicits.global import com.dimafeng.testcontainers.{ForAllTestContainer, PostgreSQLContainer} import com.typesafe.config.{Config, ConfigFactory} -import org.scalatest.time.{Second, Seconds, Span} import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, Suite} +import org.scalatest.time.{Second, Seconds, Span} import org.testcontainers.utility.DockerImageName import pl.touk.nussknacker.test.PatientScalaFutures import pl.touk.nussknacker.ui.db.{DatabaseInitializer, DbRef} diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/base/it/NuResourcesTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/base/it/NuResourcesTest.scala index 6a71076d176..be2ffe4bc7b 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/base/it/NuResourcesTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/base/it/NuResourcesTest.scala @@ -10,18 +10,18 @@ import com.typesafe.config.Config import com.typesafe.scalalogging.LazyLogging import db.util.DBIOActionInstances.DB import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport +import io.circe.{parser, Decoder, Encoder, Json} import io.circe.syntax._ -import io.circe.{Decoder, Encoder, Json, parser} import io.dropwizard.metrics5.MetricRegistry +import org.scalatest.{Assertion, BeforeAndAfterEach, OptionValues, Suite} import org.scalatest.concurrent.ScalaFutures import org.scalatest.matchers.should.Matchers -import org.scalatest.{Assertion, BeforeAndAfterEach, OptionValues, Suite} import pl.touk.nussknacker.engine._ import pl.touk.nussknacker.engine.api.CirceUtil.humanReadablePrinter import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.graph.ScenarioGraph -import pl.touk.nussknacker.engine.api.process.VersionId.initialVersionId import pl.touk.nussknacker.engine.api.process._ +import pl.touk.nussknacker.engine.api.process.VersionId.initialVersionId import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.definition.test.{ModelDataTestInfoProvider, TestInfoProvider} import pl.touk.nussknacker.restmodel.{CancelRequest, DeployRequest} @@ -30,35 +30,35 @@ import pl.touk.nussknacker.security.Permission import pl.touk.nussknacker.test.EitherValuesDetailedMessage import pl.touk.nussknacker.test.base.db.WithHsqlDbTesting import pl.touk.nussknacker.test.base.it.ProcessesQueryEnrichments.RichProcessesQuery +import pl.touk.nussknacker.test.config.{ConfigWithScalaVersion, WithSimplifiedDesignerConfig} +import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.{TestCategory, TestProcessingType} import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestCategory.Category1 import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestProcessingType.Streaming -import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.{TestCategory, TestProcessingType} -import pl.touk.nussknacker.test.config.{ConfigWithScalaVersion, WithSimplifiedDesignerConfig} import pl.touk.nussknacker.test.mock.{ MockDeploymentManager, MockManagerProvider, TestProcessChangeListener, WithTestDeploymentManagerClassLoader } -import pl.touk.nussknacker.test.utils.domain.TestFactory._ import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestFactory} +import pl.touk.nussknacker.test.utils.domain.TestFactory._ import pl.touk.nussknacker.test.utils.scalas.AkkaHttpExtensions.toRequestEntity import pl.touk.nussknacker.ui.api._ -import pl.touk.nussknacker.ui.config.scenariotoolbar.CategoriesScenarioToolbarsConfigParser import pl.touk.nussknacker.ui.config.{DesignerConfig, FeatureTogglesConfig} -import pl.touk.nussknacker.ui.process.ProcessService.{CreateScenarioCommand, UpdateScenarioCommand} +import pl.touk.nussknacker.ui.config.scenariotoolbar.CategoriesScenarioToolbarsConfigParser import pl.touk.nussknacker.ui.process._ +import pl.touk.nussknacker.ui.process.ProcessService.{CreateScenarioCommand, UpdateScenarioCommand} import pl.touk.nussknacker.ui.process.deployment._ import pl.touk.nussknacker.ui.process.deployment.deploymentstatus.EngineSideDeploymentStatusesProvider import pl.touk.nussknacker.ui.process.deployment.scenariostatus.ScenarioStatusProvider import pl.touk.nussknacker.ui.process.fragment.DefaultFragmentRepository import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter -import pl.touk.nussknacker.ui.process.processingtype.ProcessingTypeData.SchedulingForProcessingType import pl.touk.nussknacker.ui.process.processingtype._ +import pl.touk.nussknacker.ui.process.processingtype.ProcessingTypeData.SchedulingForProcessingType import pl.touk.nussknacker.ui.process.processingtype.loader.ProcessingTypesConfigBasedProcessingTypeDataLoader import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataProvider -import pl.touk.nussknacker.ui.process.repository.ProcessRepository.CreateProcessAction import pl.touk.nussknacker.ui.process.repository._ +import pl.touk.nussknacker.ui.process.repository.ProcessRepository.CreateProcessAction import pl.touk.nussknacker.ui.process.repository.activities.ScenarioActivityRepository import pl.touk.nussknacker.ui.process.test.{PreliminaryScenarioTestDataSerDe, ScenarioTestService} import pl.touk.nussknacker.ui.processreport.ProcessCounter diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/config/ConfigWithScalaVersion.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/config/ConfigWithScalaVersion.scala index 6fbf6cea3c1..7abfccac06e 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/config/ConfigWithScalaVersion.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/config/ConfigWithScalaVersion.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.test.config -import com.typesafe.config.ConfigValueFactory.fromAnyRef import com.typesafe.config.{Config, ConfigFactory, ConfigValueFactory} +import com.typesafe.config.ConfigValueFactory.fromAnyRef import pl.touk.nussknacker.engine.ConfigWithUnresolvedVersion import pl.touk.nussknacker.engine.util.config.ScalaMajorVersionConfig import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestProcessingType.Streaming diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/MockDeploymentManager.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/MockDeploymentManager.scala index 3945e208760..30bcfd35819 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/MockDeploymentManager.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/MockDeploymentManager.scala @@ -7,7 +7,6 @@ import cats.effect.unsafe.IORuntime import com.typesafe.config.Config import org.apache.flink.api.common.{JobID, JobStatus} import org.apache.flink.configuration.Configuration -import sttp.client3.testing.SttpBackendStub import pl.touk.nussknacker.engine._ import pl.touk.nussknacker.engine.api.ProcessVersion import pl.touk.nussknacker.engine.api.deployment._ @@ -16,9 +15,9 @@ import pl.touk.nussknacker.engine.api.process.{ProcessName, VersionId} import pl.touk.nussknacker.engine.deployment._ import pl.touk.nussknacker.engine.flink.minicluster.FlinkMiniClusterFactory import pl.touk.nussknacker.engine.flink.minicluster.scenariotesting.ScenarioStateVerificationConfig +import pl.touk.nussknacker.engine.management.{FlinkConfig, FlinkDeploymentManager, FlinkDeploymentManagerProvider} import pl.touk.nussknacker.engine.management.jobrunner.FlinkScenarioJobRunner import pl.touk.nussknacker.engine.management.rest.flinkRestModel.{JobOverview, JobTasksOverview} -import pl.touk.nussknacker.engine.management.{FlinkConfig, FlinkDeploymentManager, FlinkDeploymentManagerProvider} import pl.touk.nussknacker.engine.util.loader.{DeploymentManagersClassLoader, ModelClassLoader} import pl.touk.nussknacker.test.config.ConfigWithScalaVersion import pl.touk.nussknacker.test.mock.MockDeploymentManager.{ @@ -28,12 +27,13 @@ import pl.touk.nussknacker.test.mock.MockDeploymentManager.{ } import pl.touk.nussknacker.test.utils.domain.TestFactory import pl.touk.nussknacker.ui.process.periodic.flink.FlinkClientStub +import sttp.client3.testing.SttpBackendStub import java.time.Instant import java.util.UUID import java.util.concurrent.{ConcurrentHashMap, ConcurrentLinkedQueue} -import scala.concurrent.duration._ import scala.concurrent.{ExecutionContext, Future, Promise} +import scala.concurrent.duration._ import scala.jdk.CollectionConverters._ import scala.util.Try diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/MockFetchingProcessRepository.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/MockFetchingProcessRepository.scala index 6bc0ea06d1a..33a7140772f 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/MockFetchingProcessRepository.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/MockFetchingProcessRepository.scala @@ -12,13 +12,13 @@ import pl.touk.nussknacker.test.utils.domain.TestFactory import pl.touk.nussknacker.ui.db.DbRef import pl.touk.nussknacker.ui.process.ScenarioQuery import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter +import pl.touk.nussknacker.ui.process.repository._ import pl.touk.nussknacker.ui.process.repository.ScenarioShapeFetchStrategy.{ FetchCanonical, FetchComponentsUsages, FetchScenarioGraph, NotFetch } -import pl.touk.nussknacker.ui.process.repository._ import pl.touk.nussknacker.ui.security.api.LoggedUser import scala.concurrent.{ExecutionContext, Future} diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/MockFetchingProcessRepositorySpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/MockFetchingProcessRepositorySpec.scala index 58e885dff12..232c1c94be9 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/MockFetchingProcessRepositorySpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/MockFetchingProcessRepositorySpec.scala @@ -7,9 +7,9 @@ import pl.touk.nussknacker.engine.api.deployment.ScenarioActionName._ import pl.touk.nussknacker.engine.api.graph.ScenarioGraph import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, VersionId} import pl.touk.nussknacker.security.Permission -import pl.touk.nussknacker.test.utils.domain.TestProcessUtil.{createFragmentEntity, createScenarioEntity} import pl.touk.nussknacker.test.base.it.ProcessesQueryEnrichments._ import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestFactory} +import pl.touk.nussknacker.test.utils.domain.TestProcessUtil.{createFragmentEntity, createScenarioEntity} import pl.touk.nussknacker.ui.process.ScenarioQuery import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter import pl.touk.nussknacker.ui.process.repository.{ScenarioShapeFetchStrategy, ScenarioWithDetailsEntity} diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/StubFragmentRepository.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/StubFragmentRepository.scala index a7a6460d5fd..a51bf1354ce 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/StubFragmentRepository.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/StubFragmentRepository.scala @@ -1,6 +1,6 @@ package pl.touk.nussknacker.test.mock -import pl.touk.nussknacker.engine.api.process.{ProcessName, ProcessingType} +import pl.touk.nussknacker.engine.api.process.{ProcessingType, ProcessName} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.ui.process.fragment.FragmentRepository import pl.touk.nussknacker.ui.security.api.LoggedUser diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/DesignerTestConfigValidator.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/DesignerTestConfigValidator.scala index a44df22d50a..6eb5e196eb1 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/DesignerTestConfigValidator.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/DesignerTestConfigValidator.scala @@ -1,6 +1,7 @@ package pl.touk.nussknacker.test.utils import com.typesafe.config.{Config, ConfigObject} + import scala.jdk.CollectionConverters._ private[test] class DesignerTestConfigValidator(config: Config) { diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/OpenAPIExamplesValidator.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/OpenAPIExamplesValidator.scala index f0f2ab0fe0a..6865df337b4 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/OpenAPIExamplesValidator.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/OpenAPIExamplesValidator.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.test.utils import com.networknt.schema.{InputFormat, JsonSchemaFactory, SchemaValidatorsConfig, ValidationMessage} -import io.circe.yaml.{parser => YamlParser} import io.circe.{ACursor, Json} +import io.circe.yaml.{parser => YamlParser} import org.scalactic.anyvals.NonEmptyList import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap import pl.touk.nussknacker.test.TapirJsonSchemaFactory diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ProcessTestData.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ProcessTestData.scala index 209b2593591..49e5d561ad5 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ProcessTestData.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ProcessTestData.scala @@ -1,17 +1,18 @@ package pl.touk.nussknacker.test.utils.domain import pl.touk.nussknacker.engine.{CustomProcessValidator, MetaDataInitializer} +import pl.touk.nussknacker.engine.api.{FragmentSpecificData, MetaData, ProcessAdditionalFields, StreamMetaData} +import pl.touk.nussknacker.engine.api.Comment import pl.touk.nussknacker.engine.api.component.{ComponentGroupName, ProcessingMode, ScenarioPropertyConfig} import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.dict.DictDefinition import pl.touk.nussknacker.engine.api.graph.{Edge, ProcessProperties, ScenarioGraph} import pl.touk.nussknacker.engine.api.parameter.{ParameterName, ValueInputWithDictEditor} -import pl.touk.nussknacker.engine.api.process.{ProcessName, ProcessingType, VersionId} +import pl.touk.nussknacker.engine.api.process.{ProcessingType, ProcessName, VersionId} import pl.touk.nussknacker.engine.api.typed.typing.{Typed, Unknown} -import pl.touk.nussknacker.engine.api.{FragmentSpecificData, MetaData, ProcessAdditionalFields, StreamMetaData} import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} +import pl.touk.nussknacker.engine.canonicalgraph.{canonicalnode, CanonicalProcess} import pl.touk.nussknacker.engine.canonicalgraph.canonicalnode.{FlatNode, SplitNode} -import pl.touk.nussknacker.engine.canonicalgraph.{CanonicalProcess, canonicalnode} import pl.touk.nussknacker.engine.compile.ProcessValidator import pl.touk.nussknacker.engine.definition.component.CustomComponentSpecificData import pl.touk.nussknacker.engine.definition.model.ModelDefinition @@ -19,8 +20,8 @@ import pl.touk.nussknacker.engine.deployment.EngineSetupName import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.graph.expression.Expression.spelTemplate import pl.touk.nussknacker.engine.graph.node -import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.node._ +import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.sink.SinkRef import pl.touk.nussknacker.engine.graph.source.SourceRef import pl.touk.nussknacker.engine.kafka.KafkaFactory @@ -37,14 +38,14 @@ import pl.touk.nussknacker.ui.definition.editor.JavaSampleEnum import pl.touk.nussknacker.ui.process.ProcessService.UpdateScenarioCommand import pl.touk.nussknacker.ui.process.fragment.FragmentResolver import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter -import pl.touk.nussknacker.engine.api.Comment import pl.touk.nussknacker.ui.validation.{ScenarioLabelsValidator, UIProcessValidator} object ProcessTestData { - import KafkaFactory._ import pl.touk.nussknacker.engine.spel.SpelExtension._ + import KafkaFactory._ + val existingSourceFactory = "barSource" val otherExistingSourceFactory = "fooSource" val csvSourceFactory = "csv-source" diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ReflectionBasedUtils.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ReflectionBasedUtils.scala index d1a5309b3e8..a5ae179f4ed 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ReflectionBasedUtils.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ReflectionBasedUtils.scala @@ -4,7 +4,7 @@ import org.reflections.Reflections import org.reflections.util.ConfigurationBuilder import scala.jdk.CollectionConverters._ -import scala.reflect.{ClassTag, classTag} +import scala.reflect.{classTag, ClassTag} object ReflectionBasedUtils { diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ScenarioHelper.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ScenarioHelper.scala index 5473eacfa9b..6f7f71d4eec 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ScenarioHelper.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ScenarioHelper.scala @@ -2,9 +2,9 @@ package pl.touk.nussknacker.test.utils.domain import com.typesafe.config.{Config, ConfigObject, ConfigRenderOptions} import pl.touk.nussknacker.engine.MetaDataInitializer +import pl.touk.nussknacker.engine.api.{Comment, StreamMetaData} import pl.touk.nussknacker.engine.api.deployment.ScenarioActionName import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessIdWithName, ProcessName, VersionId} -import pl.touk.nussknacker.engine.api.{Comment, StreamMetaData} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.management.FlinkStreamingPropertiesConfig import pl.touk.nussknacker.test.PatientScalaFutures @@ -16,12 +16,12 @@ import pl.touk.nussknacker.ui.definition.ScenarioPropertiesConfigFinalizer import pl.touk.nussknacker.ui.process.NewProcessPreparer import pl.touk.nussknacker.ui.process.processingtype.ValueWithRestriction import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataProvider +import pl.touk.nussknacker.ui.process.repository._ import pl.touk.nussknacker.ui.process.repository.ProcessRepository.{ CreateProcessAction, ProcessUpdated, UpdateProcessAction } -import pl.touk.nussknacker.ui.process.repository._ import pl.touk.nussknacker.ui.process.repository.activities.DbScenarioActivityRepository import pl.touk.nussknacker.ui.process.repository.stickynotes.{DbStickyNotesRepository, StickyNotesRepository} import pl.touk.nussknacker.ui.security.api.{LoggedUser, RealLoggedUser} diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ScenarioToJsonHelper.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ScenarioToJsonHelper.scala index 7700ac136f8..dbe8daa7d82 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ScenarioToJsonHelper.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ScenarioToJsonHelper.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.test.utils.domain import io.circe.{Encoder, Json} -import pl.touk.nussknacker.engine.api.CirceUtil._ import io.circe.generic.extras.semiauto.deriveConfiguredEncoder import io.circe.syntax.EncoderOps +import pl.touk.nussknacker.engine.api.CirceUtil._ import pl.touk.nussknacker.engine.api.graph.ScenarioGraph import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.ui.process.ProcessService.UpdateScenarioCommand diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/TestFactory.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/TestFactory.scala index 915ed0c1a54..4dd4ec4b2fd 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/TestFactory.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/TestFactory.scala @@ -6,6 +6,7 @@ import cats.effect.unsafe.IORuntime import cats.instances.future._ import com.typesafe.config.ConfigFactory import db.util.DBIOActionInstances._ +import pl.touk.nussknacker.engine.{DeploymentManagerDependencies, ModelDependencies} import pl.touk.nussknacker.engine.api.component.{ComponentAdditionalConfig, DesignerWideComponentId, ProcessingMode} import pl.touk.nussknacker.engine.api.definition.FixedExpressionValue import pl.touk.nussknacker.engine.api.deployment.{ @@ -18,25 +19,24 @@ import pl.touk.nussknacker.engine.deployment.EngineSetupName import pl.touk.nussknacker.engine.dict.{ProcessDictSubstitutor, SimpleDictRegistry} import pl.touk.nussknacker.engine.management.FlinkStreamingPropertiesConfig import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap -import pl.touk.nussknacker.engine.{DeploymentManagerDependencies, ModelDependencies} import pl.touk.nussknacker.restmodel.scenariodetails.ScenarioParameters import pl.touk.nussknacker.security.Permission -import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestProcessingType.Streaming import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.{TestCategory, TestProcessingType} +import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestProcessingType.Streaming import pl.touk.nussknacker.test.mock.{StubFragmentRepository, TestAdditionalUIConfigProvider} -import pl.touk.nussknacker.ui.api.{RouteWithUser, RouteWithoutUser} +import pl.touk.nussknacker.ui.api.{RouteWithoutUser, RouteWithUser} import pl.touk.nussknacker.ui.db.DbRef import pl.touk.nussknacker.ui.definition.ScenarioPropertiesConfigFinalizer import pl.touk.nussknacker.ui.process.NewProcessPreparer import pl.touk.nussknacker.ui.process.deployment.ScenarioResolver import pl.touk.nussknacker.ui.process.fragment.{DefaultFragmentRepository, FragmentResolver} import pl.touk.nussknacker.ui.process.newdeployment.DeploymentRepository -import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataProvider import pl.touk.nussknacker.ui.process.processingtype.{ ScenarioParametersService, ScenarioParametersWithEngineSetupErrors, ValueWithRestriction } +import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataProvider import pl.touk.nussknacker.ui.process.repository._ import pl.touk.nussknacker.ui.process.repository.activities.DbScenarioActivityRepository import pl.touk.nussknacker.ui.process.version.{ScenarioGraphVersionRepository, ScenarioGraphVersionService} diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/TestProcessUtil.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/TestProcessUtil.scala index f437fb93cda..3c050b7b2f4 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/TestProcessUtil.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/TestProcessUtil.scala @@ -1,20 +1,20 @@ package pl.touk.nussknacker.test.utils.domain import io.circe.{Encoder, Json} -import pl.touk.nussknacker.engine.api.deployment.ScenarioActionName.Deploy +import pl.touk.nussknacker.engine.api.{FragmentSpecificData, StreamMetaData} import pl.touk.nussknacker.engine.api.deployment.{ ProcessAction, ProcessActionId, ProcessActionState, ScenarioActionName } +import pl.touk.nussknacker.engine.api.deployment.ScenarioActionName.Deploy import pl.touk.nussknacker.engine.api.graph.{ProcessProperties, ScenarioGraph} import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process._ -import pl.touk.nussknacker.engine.api.{FragmentSpecificData, StreamMetaData} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess -import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.node.{FragmentInputDefinition, NodeData} +import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.restmodel.scenariodetails._ import pl.touk.nussknacker.restmodel.validation.ValidationResults.ValidationResult import pl.touk.nussknacker.ui.definition.component.ComponentModelData._ diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/generators/NodeDataGen.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/generators/NodeDataGen.scala index 13635def869..0d49fd96e6b 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/generators/NodeDataGen.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/generators/NodeDataGen.scala @@ -7,8 +7,8 @@ import pl.touk.nussknacker.engine.graph.evaluatedparam.{BranchParameters, Parame import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.graph.expression.Expression.Language import pl.touk.nussknacker.engine.graph.fragment.FragmentRef -import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.node._ +import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.service.ServiceRef import pl.touk.nussknacker.engine.graph.source.SourceRef import pl.touk.nussknacker.engine.graph.variable.Field diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/scalas/CatsTestExtensions.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/scalas/CatsTestExtensions.scala index e895d9287b6..5a25a6e4bca 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/scalas/CatsTestExtensions.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/scalas/CatsTestExtensions.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.test.utils.scalas -import cats.effect.unsafe.implicits.global import cats.effect.{IO, Resource} +import cats.effect.unsafe.implicits.global trait CatsTestExtensions { diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ActionInfoResourcesSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ActionInfoResourcesSpec.scala index 50a4e4c6d1b..96e5421f4dd 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ActionInfoResourcesSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ActionInfoResourcesSpec.scala @@ -4,10 +4,10 @@ import io.restassured.RestAssured.`given` import io.restassured.module.scala.RestAssuredSupport.AddThenToResponse import org.scalatest.freespec.AnyFreeSpecLike import pl.touk.nussknacker.engine.build.ScenarioBuilder +import pl.touk.nussknacker.engine.spel.SpelExtension._ +import pl.touk.nussknacker.test.{NuRestAssureMatchers, RestAssuredVerboseLoggingIfValidationFails} import pl.touk.nussknacker.test.base.it.{NuItTest, WithSimplifiedConfigScenarioHelper} import pl.touk.nussknacker.test.config.{WithBusinessCaseRestAssuredUsersExtensions, WithSimplifiedDesignerConfig} -import pl.touk.nussknacker.test.{NuRestAssureMatchers, RestAssuredVerboseLoggingIfValidationFails} -import pl.touk.nussknacker.engine.spel.SpelExtension._ class ActionInfoResourcesSpec extends AnyFreeSpecLike diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/AppApiHttpServiceBusinessSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/AppApiHttpServiceBusinessSpec.scala index 49c2e396516..9162279f4c6 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/AppApiHttpServiceBusinessSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/AppApiHttpServiceBusinessSpec.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.ui.api -import com.typesafe.config.ConfigValueFactory.fromAnyRef import com.typesafe.config.{Config, ConfigFactory} +import com.typesafe.config.ConfigValueFactory.fromAnyRef import com.typesafe.scalalogging.LazyLogging import io.restassured.RestAssured._ import io.restassured.module.scala.RestAssuredSupport.AddThenToResponse @@ -13,8 +13,8 @@ import pl.touk.nussknacker.development.manager.MockableDeploymentManagerProvider import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus.ProblemStateStatus import pl.touk.nussknacker.engine.api.process.{ProcessName, VersionId} -import pl.touk.nussknacker.test.ProcessUtils.convertToAnyShouldWrapper import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} +import pl.touk.nussknacker.test.ProcessUtils.convertToAnyShouldWrapper import pl.touk.nussknacker.test.base.it.{NuItTest, WithSimplifiedConfigScenarioHelper} import pl.touk.nussknacker.test.config.{ WithBusinessCaseRestAssuredUsersExtensions, diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/AppApiHttpServiceSecuritySpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/AppApiHttpServiceSecuritySpec.scala index c2a22681d0f..1013b926abd 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/AppApiHttpServiceSecuritySpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/AppApiHttpServiceSecuritySpec.scala @@ -13,12 +13,12 @@ import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus.Proble import pl.touk.nussknacker.engine.api.process.{ProcessName, VersionId} import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} import pl.touk.nussknacker.test.base.it.{NuItTest, WithAccessControlCheckingConfigScenarioHelper} -import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.{Category1, Category2} import pl.touk.nussknacker.test.config.{ WithAccessControlCheckingConfigRestAssuredUsersExtensions, WithAccessControlCheckingDesignerConfig, WithMockableDeploymentManager } +import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.{Category1, Category2} class AppApiHttpServiceSecuritySpec extends AnyFreeSpecLike diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/BaseDeploymentApiHttpServiceBusinessSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/BaseDeploymentApiHttpServiceBusinessSpec.scala index db09749650c..5748e0fae2b 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/BaseDeploymentApiHttpServiceBusinessSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/BaseDeploymentApiHttpServiceBusinessSpec.scala @@ -5,11 +5,11 @@ import io.restassured.RestAssured.`given` import io.restassured.module.scala.RestAssuredSupport.AddThenToResponse import org.apache.commons.io.FileUtils import org.hamcrest.Matchers.{anyOf, equalTo} +import org.scalatest.{LoneElement, Suite} import org.scalatest.concurrent.Eventually import org.scalatest.concurrent.PatienceConfiguration.{Interval, Timeout} import org.scalatest.matchers.should.Matchers import org.scalatest.time.{Seconds, Span} -import org.scalatest.{LoneElement, Suite} import org.testcontainers.containers.BindMode import pl.touk.nussknacker.engine.api.deployment.DeploymentStatusName import pl.touk.nussknacker.engine.build.ScenarioBuilder @@ -24,8 +24,8 @@ import pl.touk.nussknacker.test.config.{ import pl.touk.nussknacker.test.containers.FileSystemBind import java.io.File -import java.nio.file.attribute.PosixFilePermissions import java.nio.file.{Files, Path} +import java.nio.file.attribute.PosixFilePermissions trait BaseDeploymentApiHttpServiceBusinessSpec extends WithFlinkContainersDeploymentManager { self: NuItTest diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ComponentApiHttpServiceBusinessSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ComponentApiHttpServiceBusinessSpec.scala index 061e1071d7d..774db7fd27c 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ComponentApiHttpServiceBusinessSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ComponentApiHttpServiceBusinessSpec.scala @@ -8,21 +8,21 @@ import org.scalatest.freespec.AnyFreeSpecLike import org.scalatest.matchers.must.Matchers.contain import pl.touk.nussknacker.engine.api.component.{ComponentId, ComponentType, DesignerWideComponentId} import pl.touk.nussknacker.engine.build.ScenarioBuilder -import pl.touk.nussknacker.test.ProcessUtils.convertToAnyShouldWrapper import pl.touk.nussknacker.test.{ NuRestAssureExtensions, NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails } +import pl.touk.nussknacker.test.ProcessUtils.convertToAnyShouldWrapper import pl.touk.nussknacker.test.base.it.{NuItTest, WithSimplifiedConfigScenarioHelper} -import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestCategory.Category1 -import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestProcessingType.Streaming import pl.touk.nussknacker.test.config.{ WithBusinessCaseRestAssuredUsersExtensions, WithMockableDeploymentManager, WithSimplifiedDesignerConfig } +import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestCategory.Category1 +import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestProcessingType.Streaming class ComponentApiHttpServiceBusinessSpec extends AnyFreeSpecLike diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ComponentApiHttpServiceSecuritySpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ComponentApiHttpServiceSecuritySpec.scala index bc687c07262..3dcebb976dc 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ComponentApiHttpServiceSecuritySpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ComponentApiHttpServiceSecuritySpec.scala @@ -8,20 +8,20 @@ import org.scalatest.freespec.AnyFreeSpecLike import org.scalatest.matchers.must.Matchers.contain import pl.touk.nussknacker.engine.api.component.{ComponentId, ComponentType, DesignerWideComponentId} import pl.touk.nussknacker.engine.build.ScenarioBuilder -import pl.touk.nussknacker.test.ProcessUtils.convertToAnyShouldWrapper -import pl.touk.nussknacker.test.base.it.{NuItTest, WithAccessControlCheckingConfigScenarioHelper} -import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory -import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.{Category1, Category2} -import pl.touk.nussknacker.test.config.{ - WithAccessControlCheckingConfigRestAssuredUsersExtensions, - WithAccessControlCheckingDesignerConfig -} import pl.touk.nussknacker.test.{ NuRestAssureExtensions, NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails } +import pl.touk.nussknacker.test.ProcessUtils.convertToAnyShouldWrapper +import pl.touk.nussknacker.test.base.it.{NuItTest, WithAccessControlCheckingConfigScenarioHelper} +import pl.touk.nussknacker.test.config.{ + WithAccessControlCheckingConfigRestAssuredUsersExtensions, + WithAccessControlCheckingDesignerConfig +} +import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory +import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.{Category1, Category2} class ComponentApiHttpServiceSecuritySpec extends AnyFreeSpecLike diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DefinitionResourcesSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DefinitionResourcesSpec.scala index d62d72a92db..acf2f872319 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DefinitionResourcesSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DefinitionResourcesSpec.scala @@ -3,25 +3,25 @@ package pl.touk.nussknacker.ui.api import akka.http.scaladsl.model.StatusCodes import akka.http.scaladsl.testkit.ScalatestRouteTest import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport -import io.circe.{Json, parser} +import io.circe.{parser, Json} +import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, OptionValues} import org.scalatest.funspec.AnyFunSpec import org.scalatest.matchers.should.Matchers -import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, OptionValues} +import pl.touk.nussknacker.engine.api.{FragmentSpecificData, MetaData} import pl.touk.nussknacker.engine.api.CirceUtil.RichACursor import pl.touk.nussknacker.engine.api.definition.FixedExpressionValue import pl.touk.nussknacker.engine.api.parameter.{ParameterName, ValueInputWithFixedValuesProvided} import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult, Unknown} -import pl.touk.nussknacker.engine.api.{FragmentSpecificData, MetaData} +import pl.touk.nussknacker.engine.canonicalgraph.{canonicalnode, CanonicalProcess} import pl.touk.nussknacker.engine.canonicalgraph.canonicalnode.FlatNode -import pl.touk.nussknacker.engine.canonicalgraph.{CanonicalProcess, canonicalnode} -import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.node.{FragmentInputDefinition, FragmentOutputDefinition} +import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.security.Permission import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, PatientScalaFutures} -import pl.touk.nussknacker.test.utils.domain.TestFactory.withPermissions import pl.touk.nussknacker.test.base.it.NuResourcesTest import pl.touk.nussknacker.test.mock.TestAdditionalUIConfigProvider import pl.touk.nussknacker.test.utils.domain.ProcessTestData +import pl.touk.nussknacker.test.utils.domain.TestFactory.withPermissions import pl.touk.nussknacker.ui.definition.{ AlignedComponentsDefinitionProvider, DefinitionsService, diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DeploymentApiHttpServiceBusinessSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DeploymentApiHttpServiceBusinessSpec.scala index 2af191341dc..93ff8c4526b 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DeploymentApiHttpServiceBusinessSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DeploymentApiHttpServiceBusinessSpec.scala @@ -11,13 +11,13 @@ import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.api.deployment.DeploymentStatus import pl.touk.nussknacker.engine.api.process.{ProcessIdWithName, ProcessName} import pl.touk.nussknacker.engine.newdeployment.DeploymentId -import pl.touk.nussknacker.test.base.it.{NuItTest, WithBatchConfigScenarioHelper} -import pl.touk.nussknacker.test.config.{WithBatchDesignerConfig, WithBusinessCaseRestAssuredUsersExtensions} import pl.touk.nussknacker.test.{ NuRestAssureMatchers, RestAssuredVerboseLoggingIfValidationFails, VeryPatientScalaFutures } +import pl.touk.nussknacker.test.base.it.{NuItTest, WithBatchConfigScenarioHelper} +import pl.touk.nussknacker.test.config.{WithBatchDesignerConfig, WithBusinessCaseRestAssuredUsersExtensions} import java.nio.charset.StandardCharsets import java.nio.file.Path diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DeploymentApiHttpServiceDeploymentCommentSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DeploymentApiHttpServiceDeploymentCommentSpec.scala index 6d487417933..1fca54c26ff 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DeploymentApiHttpServiceDeploymentCommentSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DeploymentApiHttpServiceDeploymentCommentSpec.scala @@ -10,13 +10,13 @@ import org.scalatest.freespec.AnyFreeSpecLike import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.api.deployment.DeploymentStatus import pl.touk.nussknacker.engine.newdeployment.DeploymentId -import pl.touk.nussknacker.test.base.it.{NuItTest, WithBatchConfigScenarioHelper} -import pl.touk.nussknacker.test.config.{WithBatchDesignerConfig, WithBusinessCaseRestAssuredUsersExtensions} import pl.touk.nussknacker.test.{ NuRestAssureMatchers, RestAssuredVerboseLoggingIfValidationFails, VeryPatientScalaFutures } +import pl.touk.nussknacker.test.base.it.{NuItTest, WithBatchConfigScenarioHelper} +import pl.touk.nussknacker.test.config.{WithBatchDesignerConfig, WithBusinessCaseRestAssuredUsersExtensions} import java.nio.charset.StandardCharsets import java.nio.file.Path diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DictApiHttpServiceSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DictApiHttpServiceSpec.scala index 119187e2d4b..8e6edc6cd8d 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DictApiHttpServiceSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DictApiHttpServiceSpec.scala @@ -5,8 +5,8 @@ import io.restassured.module.scala.RestAssuredSupport.AddThenToResponse import org.scalatest.freespec.AnyFreeSpecLike import pl.touk.nussknacker.test.RestAssuredVerboseLoggingIfValidationFails import pl.touk.nussknacker.test.base.it.NuItTest -import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestProcessingType.Streaming import pl.touk.nussknacker.test.config.{WithBusinessCaseRestAssuredUsersExtensions, WithSimplifiedDesignerConfig} +import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestProcessingType.Streaming class DictApiHttpServiceSpec extends AnyFreeSpecLike diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ExpressionSuggesterSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ExpressionSuggesterSpec.scala index 29068d3e4ff..588b2f23a4a 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ExpressionSuggesterSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ExpressionSuggesterSpec.scala @@ -3,11 +3,11 @@ package pl.touk.nussknacker.ui.api import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks -import pl.touk.nussknacker.engine.api.dict.embedded.EmbeddedDictDefinition +import pl.touk.nussknacker.engine.api.{Documentation, VariableConstants} import pl.touk.nussknacker.engine.api.dict.{DictInstance, UiDictServices} +import pl.touk.nussknacker.engine.api.dict.embedded.EmbeddedDictDefinition import pl.touk.nussknacker.engine.api.generics.{MethodTypeInfo, Parameter => GenericsParameter} import pl.touk.nussknacker.engine.api.typed.typing._ -import pl.touk.nussknacker.engine.api.{Documentation, VariableConstants} import pl.touk.nussknacker.engine.definition.clazz.{ ClassDefinition, ClassDefinitionSet, @@ -25,8 +25,8 @@ import pl.touk.nussknacker.ui.api.ExpressionSuggesterTestData._ import pl.touk.nussknacker.ui.suggester.ExpressionSuggester import java.nio.charset.Charset -import java.time.chrono.{ChronoLocalDate, ChronoLocalDateTime} import java.time.{Duration, LocalDate, LocalDateTime, LocalTime, ZoneId, ZoneOffset} +import java.time.chrono.{ChronoLocalDate, ChronoLocalDateTime} import java.util.{Currency, Locale, UUID} import scala.collection.immutable.ListMap import scala.concurrent.ExecutionContext diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ManagementApiHttpServiceBusinessSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ManagementApiHttpServiceBusinessSpec.scala index 5ab222d6f7a..917fa30bfe1 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ManagementApiHttpServiceBusinessSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ManagementApiHttpServiceBusinessSpec.scala @@ -7,17 +7,17 @@ import org.scalatest.freespec.AnyFreeSpecLike import pl.touk.nussknacker.development.manager.MockableDeploymentManagerProvider.MockableDeploymentManager import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.testmode.TestProcess.TestResults +import pl.touk.nussknacker.test.{ + NuRestAssureExtensions, + NuRestAssureMatchers, + RestAssuredVerboseLoggingIfValidationFails +} import pl.touk.nussknacker.test.base.it.{NuItTest, WithSimplifiedConfigScenarioHelper} import pl.touk.nussknacker.test.config.{ WithBusinessCaseRestAssuredUsersExtensions, WithMockableDeploymentManager, WithSimplifiedDesignerConfig } -import pl.touk.nussknacker.test.{ - NuRestAssureExtensions, - NuRestAssureMatchers, - RestAssuredVerboseLoggingIfValidationFails -} import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter.toScenarioGraph import java.util.UUID diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ManagementResourcesBatchBusinessSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ManagementResourcesBatchBusinessSpec.scala index dfe6527f4c8..29db03879b5 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ManagementResourcesBatchBusinessSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ManagementResourcesBatchBusinessSpec.scala @@ -7,13 +7,13 @@ import org.hamcrest.Matchers.equalTo import org.scalatest.freespec.AnyFreeSpecLike import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.graph.expression.Expression -import pl.touk.nussknacker.test.base.it.{NuItTest, WithBatchConfigScenarioHelper} -import pl.touk.nussknacker.test.config.{WithBatchDesignerConfig, WithBusinessCaseRestAssuredUsersExtensions} import pl.touk.nussknacker.test.{ NuRestAssureExtensions, NuRestAssureMatchers, RestAssuredVerboseLoggingIfValidationFails } +import pl.touk.nussknacker.test.base.it.{NuItTest, WithBatchConfigScenarioHelper} +import pl.touk.nussknacker.test.config.{WithBatchDesignerConfig, WithBusinessCaseRestAssuredUsersExtensions} import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter.toScenarioGraph import java.util.UUID diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ManagementResourcesConcurrentSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ManagementResourcesConcurrentSpec.scala index 5c71e827b8b..5ba7aa5e48f 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ManagementResourcesConcurrentSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ManagementResourcesConcurrentSpec.scala @@ -3,10 +3,10 @@ package pl.touk.nussknacker.ui.api import akka.http.scaladsl.model.{StatusCode, StatusCodes} import akka.http.scaladsl.testkit.ScalatestRouteTest import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport +import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, OptionValues} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.tags.Slow -import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, OptionValues} import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.test.PatientScalaFutures import pl.touk.nussknacker.test.base.it.NuResourcesTest diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ManagementResourcesSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ManagementResourcesSpec.scala index debdb17785f..17a5c390351 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ManagementResourcesSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ManagementResourcesSpec.scala @@ -7,14 +7,14 @@ import akka.http.scaladsl.unmarshalling.{FromEntityUnmarshaller, Unmarshaller} import cats.instances.all._ import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport import io.circe.Json +import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, OptionValues} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.BeMatcher import org.scalatest.matchers.should.Matchers -import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, OptionValues} -import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus +import pl.touk.nussknacker.engine.api.{MetaData, StreamMetaData} import pl.touk.nussknacker.engine.api.deployment.{ProcessAction, ScenarioActionName} +import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.process.{ProcessName, VersionId} -import pl.touk.nussknacker.engine.api.{MetaData, StreamMetaData} import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.kafka.KafkaFactory import pl.touk.nussknacker.engine.spel.SpelExtension._ @@ -24,8 +24,8 @@ import pl.touk.nussknacker.security.Permission import pl.touk.nussknacker.test.PatientScalaFutures import pl.touk.nussknacker.test.base.it.NuResourcesTest import pl.touk.nussknacker.test.mock.MockDeploymentManagerSyntaxSugar.Ops -import pl.touk.nussknacker.test.utils.domain.TestFactory.{withAllPermissions, withPermissions} import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestFactory} +import pl.touk.nussknacker.test.utils.domain.TestFactory.{withAllPermissions, withPermissions} import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos import pl.touk.nussknacker.ui.process.ScenarioQuery import pl.touk.nussknacker.ui.process.exception.ProcessIllegalAction diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/MigrationApiHttpServiceBusinessSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/MigrationApiHttpServiceBusinessSpec.scala index 0a77eb5b960..ae50e17773f 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/MigrationApiHttpServiceBusinessSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/MigrationApiHttpServiceBusinessSpec.scala @@ -10,16 +10,16 @@ import org.scalatest.freespec.AnyFreeSpecLike import pl.touk.nussknacker.engine.api.graph.ScenarioGraph import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.engine.build.ScenarioBuilder -import pl.touk.nussknacker.test.base.it.{NuItTest, WithCategoryUsedMoreThanOnceConfigScenarioHelper} -import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.Category1 -import pl.touk.nussknacker.test.config.WithCategoryUsedMoreThanOnceDesignerConfig -import pl.touk.nussknacker.test.processes.WithScenarioActivitySpecAsserts import pl.touk.nussknacker.test.{ NuRestAssureExtensions, NuRestAssureMatchers, RestAssuredVerboseLoggingIfValidationFails, StandardPatientScalaFutures } +import pl.touk.nussknacker.test.base.it.{NuItTest, WithCategoryUsedMoreThanOnceConfigScenarioHelper} +import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.Category1 +import pl.touk.nussknacker.test.config.WithCategoryUsedMoreThanOnceDesignerConfig +import pl.touk.nussknacker.test.processes.WithScenarioActivitySpecAsserts import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter // FIXME: For migrating between different API version should be written end to end test (e2e-tests directory) diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/MigrationApiHttpServiceSecuritySpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/MigrationApiHttpServiceSecuritySpec.scala index 856c006d782..e9c40e66a25 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/MigrationApiHttpServiceSecuritySpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/MigrationApiHttpServiceSecuritySpec.scala @@ -6,15 +6,15 @@ import io.restassured.module.scala.RestAssuredSupport.AddThenToResponse import org.scalatest.freespec.AnyFreeSpecLike import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.engine.build.ScenarioBuilder +import pl.touk.nussknacker.test.{NuRestAssureMatchers, RestAssuredVerboseLoggingIfValidationFails} import pl.touk.nussknacker.test.base.it.{NuItTest, WithAccessControlCheckingConfigScenarioHelper} -import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory -import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.{Category1, Category2} import pl.touk.nussknacker.test.config.{ WithAccessControlCheckingConfigRestAssuredUsersExtensions, WithAccessControlCheckingDesignerConfig, WithMockableDeploymentManager } -import pl.touk.nussknacker.test.{NuRestAssureMatchers, RestAssuredVerboseLoggingIfValidationFails} +import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory +import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.{Category1, Category2} import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter class MigrationApiHttpServiceSecuritySpec diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NodesApiEndpointsSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NodesApiEndpointsSpec.scala index b0e8e0c3721..d67c735bbea 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NodesApiEndpointsSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NodesApiEndpointsSpec.scala @@ -4,9 +4,9 @@ import io.circe.syntax.EncoderOps import org.scalatest.freespec.AnyFreeSpecLike import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks import pl.touk.nussknacker.engine.api.typed.{EnabledTypedFeatures, TypingResultGen} +import pl.touk.nussknacker.test.{NuScalaTestAssertions, NuTapirSchemaTestHelpers} import pl.touk.nussknacker.test.ProcessUtils.convertToAnyShouldWrapper import pl.touk.nussknacker.test.utils.generators.NodeDataGen -import pl.touk.nussknacker.test.{NuScalaTestAssertions, NuTapirSchemaTestHelpers} import pl.touk.nussknacker.ui.api.description.{NodesApiEndpoints, TypingDtoSchemas} import scala.util.control.Breaks.{break, breakable} diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NodesApiHttpServiceBusinessSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NodesApiHttpServiceBusinessSpec.scala index e24066e888c..4eaa2911a08 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NodesApiHttpServiceBusinessSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NodesApiHttpServiceBusinessSpec.scala @@ -6,13 +6,13 @@ import org.hamcrest.Matchers.equalTo import org.scalatest.freespec.AnyFreeSpecLike import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.spel.SpelExtension.SpelExpresion +import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} import pl.touk.nussknacker.test.base.it.{NuItTest, WithSimplifiedConfigScenarioHelper} import pl.touk.nussknacker.test.config.{ WithBusinessCaseRestAssuredUsersExtensions, WithMockableDeploymentManager, WithSimplifiedDesignerConfig } -import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} class NodesApiHttpServiceBusinessSpec extends AnyFreeSpecLike diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NodesApiHttpServiceSecuritySpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NodesApiHttpServiceSecuritySpec.scala index 3c9f22a722c..92549d92e3e 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NodesApiHttpServiceSecuritySpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NodesApiHttpServiceSecuritySpec.scala @@ -7,16 +7,16 @@ import org.scalatest.freespec.AnyFreeSpecLike import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} import pl.touk.nussknacker.test.base.it.{NuItTest, WithAccessControlCheckingConfigScenarioHelper} -import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.{Category1, Category2} -import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestProcessingType.{ - Streaming1, - Streaming2 -} import pl.touk.nussknacker.test.config.{ WithAccessControlCheckingConfigRestAssuredUsersExtensions, WithAccessControlCheckingDesignerConfig, WithMockableDeploymentManager } +import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.{Category1, Category2} +import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestProcessingType.{ + Streaming1, + Streaming2 +} class NodesApiHttpServiceSecuritySpec extends AnyFreeSpecLike diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NotificationApiHttpServiceBusinessSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NotificationApiHttpServiceBusinessSpec.scala index c4419987cc6..3180e03b18d 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NotificationApiHttpServiceBusinessSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NotificationApiHttpServiceBusinessSpec.scala @@ -5,13 +5,13 @@ import io.restassured.module.scala.RestAssuredSupport.AddThenToResponse import org.hamcrest.Matchers.equalTo import org.scalatest.freespec.AnyFreeSpecLike import pl.touk.nussknacker.engine.api.process.ProcessName +import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} import pl.touk.nussknacker.test.base.it.{NuItTest, WithSimplifiedConfigScenarioHelper} import pl.touk.nussknacker.test.config.{ WithBusinessCaseRestAssuredUsersExtensions, WithMockableDeploymentManager, WithSimplifiedDesignerConfig } -import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} class NotificationApiHttpServiceBusinessSpec extends AnyFreeSpecLike diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NotificationApiHttpServiceSecuritySpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NotificationApiHttpServiceSecuritySpec.scala index 80d45dc7c69..a3c972887aa 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NotificationApiHttpServiceSecuritySpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NotificationApiHttpServiceSecuritySpec.scala @@ -5,14 +5,14 @@ import io.restassured.module.scala.RestAssuredSupport.AddThenToResponse import org.hamcrest.Matchers.equalTo import org.scalatest.freespec.AnyFreeSpecLike import pl.touk.nussknacker.engine.api.process.ProcessName +import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} import pl.touk.nussknacker.test.base.it.{NuItTest, WithAccessControlCheckingConfigScenarioHelper} -import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.{Category1, Category2} import pl.touk.nussknacker.test.config.{ WithAccessControlCheckingConfigRestAssuredUsersExtensions, WithAccessControlCheckingDesignerConfig, WithMockableDeploymentManager } -import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} +import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.{Category1, Category2} class NotificationApiHttpServiceSecuritySpec extends AnyFreeSpecLike diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NuDesignerApiAvailableToExposeYamlSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NuDesignerApiAvailableToExposeYamlSpec.scala index 84f870dda28..cb1ddbe0d1f 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NuDesignerApiAvailableToExposeYamlSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NuDesignerApiAvailableToExposeYamlSpec.scala @@ -7,15 +7,15 @@ import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks._ import pl.touk.nussknacker.restmodel.BaseEndpointDefinitions import pl.touk.nussknacker.security.AuthCredentials.PassedAuthCredentials -import pl.touk.nussknacker.test.utils.domain.ReflectionBasedUtils import pl.touk.nussknacker.test.utils.{InvalidExample, OpenAPIExamplesValidator, OpenAPISchemaComponents} +import pl.touk.nussknacker.test.utils.domain.ReflectionBasedUtils import pl.touk.nussknacker.ui.security.api.AuthManager.ImpersonationConsideringInputEndpoint import pl.touk.nussknacker.ui.server.{AkkaHttpBasedTapirStreamEndpointProvider, TapirStreamEndpointProvider} import pl.touk.nussknacker.ui.services.NuDesignerExposedApiHttpService import pl.touk.nussknacker.ui.util.Project import sttp.apispec.openapi.circe.yaml.RichOpenAPI +import sttp.tapir.{auth, Endpoint, EndpointInput} import sttp.tapir.docs.openapi.OpenAPIDocsInterpreter -import sttp.tapir.{Endpoint, EndpointInput, auth} import java.lang.reflect.{Method, Modifier} import java.time.{ZoneId, ZoneOffset} diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NussknackerHttpServerSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NussknackerHttpServerSpec.scala index 73ae8434f93..72363010a8f 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NussknackerHttpServerSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/NussknackerHttpServerSpec.scala @@ -8,14 +8,14 @@ import com.typesafe.config.ConfigValueFactory.fromAnyRef import io.dropwizard.metrics5.MetricRegistry import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.test.{DefaultUniquePortProvider, WithTestHttpClientCreator} import pl.touk.nussknacker.test.config.ConfigWithScalaVersion import pl.touk.nussknacker.test.utils.scalas.CatsTestExtensions._ -import pl.touk.nussknacker.test.{DefaultUniquePortProvider, WithTestHttpClientCreator} import pl.touk.nussknacker.ui.config.DesignerConfig import pl.touk.nussknacker.ui.security.ssl.HttpsConnectionContextFactory.prepareSSLContext import pl.touk.nussknacker.ui.security.ssl.KeyStoreConfig import pl.touk.nussknacker.ui.server.{NussknackerHttpServer, RouteProvider} -import sttp.client3.{UriContext, basicRequest} +import sttp.client3.{basicRequest, UriContext} import sttp.model.StatusCode class NussknackerHttpServerSpec diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ProcessesChangeListenerSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ProcessesChangeListenerSpec.scala index f08e9135969..c93d3d76532 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ProcessesChangeListenerSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ProcessesChangeListenerSpec.scala @@ -3,17 +3,17 @@ package pl.touk.nussknacker.ui.api import akka.http.scaladsl.model.StatusCodes import akka.http.scaladsl.testkit.ScalatestRouteTest import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport +import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, Inside} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, Inside} import pl.touk.nussknacker.engine.api.deployment.ScenarioActionName import pl.touk.nussknacker.engine.api.process.{ProcessName, VersionId} import pl.touk.nussknacker.security.Permission import pl.touk.nussknacker.test.PatientScalaFutures -import pl.touk.nussknacker.test.utils.domain.TestFactory.withAllPermissions import pl.touk.nussknacker.test.base.it.NuResourcesTest import pl.touk.nussknacker.test.mock.MockDeploymentManagerSyntaxSugar.Ops import pl.touk.nussknacker.test.utils.domain.ProcessTestData +import pl.touk.nussknacker.test.utils.domain.TestFactory.withAllPermissions import pl.touk.nussknacker.ui.listener.ProcessChangeEvent._ import pl.touk.nussknacker.ui.security.api.LoggedUser diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ProcessesExportImportResourcesSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ProcessesExportImportResourcesSpec.scala index b7dfe34a120..b89def5021e 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ProcessesExportImportResourcesSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ProcessesExportImportResourcesSpec.scala @@ -6,18 +6,18 @@ import akka.http.scaladsl.testkit.ScalatestRouteTest import akka.http.scaladsl.unmarshalling.{FromEntityUnmarshaller, Unmarshaller} import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport import io.circe.syntax._ +import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, Inside, OptionValues} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, Inside, OptionValues} -import pl.touk.nussknacker.engine.api.graph.ScenarioGraph import pl.touk.nussknacker.engine.api.{ProcessAdditionalFields, StreamMetaData} +import pl.touk.nussknacker.engine.api.graph.ScenarioGraph import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.marshall.ProcessMarshaller import pl.touk.nussknacker.restmodel.validation.ScenarioGraphWithValidationResult import pl.touk.nussknacker.test.PatientScalaFutures -import pl.touk.nussknacker.test.utils.domain.TestFactory.{asAdmin, processResolverByProcessingType, withAllPermissions} import pl.touk.nussknacker.test.base.it.NuResourcesTest import pl.touk.nussknacker.test.utils.domain.ProcessTestData +import pl.touk.nussknacker.test.utils.domain.TestFactory.{asAdmin, processResolverByProcessingType, withAllPermissions} import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter import pl.touk.nussknacker.ui.util.MultipartUtils diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ProcessesResourcesSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ProcessesResourcesSpec.scala index 15c25c40347..2fe141d5d5a 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ProcessesResourcesSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ProcessesResourcesSpec.scala @@ -1,15 +1,15 @@ package pl.touk.nussknacker.ui.api -import akka.http.scaladsl.model.headers.{BasicHttpCredentials, RawHeader} import akka.http.scaladsl.model.{ContentTypeRange, StatusCode, StatusCodes} +import akka.http.scaladsl.model.headers.{BasicHttpCredentials, RawHeader} import akka.http.scaladsl.testkit.{RouteTestTimeout, ScalatestRouteTest} import akka.http.scaladsl.unmarshalling.{FromEntityUnmarshaller, Unmarshaller} import cats.data.OptionT import cats.instances.all._ import com.typesafe.config.{Config, ConfigValueFactory} import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport -import org.scalatest.LoneElement._ import org.scalatest._ +import org.scalatest.LoneElement._ import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.development.manager.BasicStatusDetails @@ -28,32 +28,32 @@ import pl.touk.nussknacker.restmodel.scenariodetails.ScenarioWithDetails import pl.touk.nussknacker.restmodel.validation.ValidationResults.ValidationResult import pl.touk.nussknacker.test.PatientScalaFutures import pl.touk.nussknacker.test.base.it._ +import pl.touk.nussknacker.test.config.{WithAccessControlCheckingDesignerConfig, WithMockableDeploymentManager} +import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.{TestCategory, TestProcessingType} import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.{Category1, Category2} import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestProcessingType.{ Streaming1, Streaming2 } -import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.{TestCategory, TestProcessingType} -import pl.touk.nussknacker.test.config.{WithAccessControlCheckingDesignerConfig, WithMockableDeploymentManager} +import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestFactory} import pl.touk.nussknacker.test.utils.domain.ProcessTestData.{ existingSinkFactory, existingSourceFactory, sampleFragmentOneOut, sampleFragmentWithPreset } -import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestFactory} import pl.touk.nussknacker.test.utils.scalas.AkkaHttpExtensions.toRequestEntity -import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.Legacy.ProcessActivity -import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.ScenarioActivityCommentContent.{ - Available, - NotAvailable -} import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.{ ScenarioActivities, ScenarioActivity, ScenarioActivityComment, ScenarioActivityType } +import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.Legacy.ProcessActivity +import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.ScenarioActivityCommentContent.{ + Available, + NotAvailable +} import pl.touk.nussknacker.ui.config.scenariotoolbar.CategoriesScenarioToolbarsConfigParser import pl.touk.nussknacker.ui.config.scenariotoolbar.ToolbarButtonConfigType.{CustomLink, ProcessDeploy, ProcessSave} import pl.touk.nussknacker.ui.config.scenariotoolbar.ToolbarPanelTypeConfig.{ @@ -62,12 +62,12 @@ import pl.touk.nussknacker.ui.config.scenariotoolbar.ToolbarPanelTypeConfig.{ SearchPanel, TipsPanel } +import pl.touk.nussknacker.ui.process.{ScenarioQuery, ScenarioToolbarSettings, ToolbarButton, ToolbarPanel} import pl.touk.nussknacker.ui.process.ProcessService.{CreateScenarioCommand, UpdateScenarioCommand} import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter import pl.touk.nussknacker.ui.process.repository.FetchingProcessRepository -import pl.touk.nussknacker.ui.process.{ScenarioQuery, ScenarioToolbarSettings, ToolbarButton, ToolbarPanel} -import pl.touk.nussknacker.ui.security.api.SecurityError.ImpersonationMissingPermissionError import pl.touk.nussknacker.ui.security.api.{AuthManager, LoggedUser} +import pl.touk.nussknacker.ui.security.api.SecurityError.ImpersonationMissingPermissionError import pl.touk.nussknacker.ui.server.RouteInterceptor import scala.concurrent.Future @@ -90,10 +90,11 @@ class ProcessesResourcesSpec with OptionValues with EitherValues { - import ProcessesQueryEnrichments._ import io.circe._ import io.circe.parser._ + import ProcessesQueryEnrichments._ + private implicit final val string: FromEntityUnmarshaller[String] = Unmarshaller.stringUnmarshaller.forContentTypes(ContentTypeRange.*) diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/RemoteEnvironmentResourcesSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/RemoteEnvironmentResourcesSpec.scala index 04ec9937007..527c3c2d6f4 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/RemoteEnvironmentResourcesSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/RemoteEnvironmentResourcesSpec.scala @@ -4,9 +4,9 @@ import akka.http.scaladsl.model.{ContentTypeRange, StatusCodes} import akka.http.scaladsl.testkit.ScalatestRouteTest import akka.http.scaladsl.unmarshalling.{FromEntityUnmarshaller, Unmarshaller} import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport +import org.scalatest.{BeforeAndAfterEach, Inside} import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import org.scalatest.{BeforeAndAfterEach, Inside} import pl.touk.nussknacker.engine.api.component.ProcessingMode import pl.touk.nussknacker.engine.api.graph.ScenarioGraph import pl.touk.nussknacker.engine.api.process.{ProcessName, ScenarioVersion, VersionId} diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioActivityApiHttpServiceBusinessSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioActivityApiHttpServiceBusinessSpec.scala index dd99b751867..47bf7e4d012 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioActivityApiHttpServiceBusinessSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioActivityApiHttpServiceBusinessSpec.scala @@ -6,6 +6,11 @@ import org.scalatest.freespec.AnyFreeSpecLike import pl.touk.nussknacker.development.manager.MockableDeploymentManagerProvider.MockableDeploymentManager import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.build.ScenarioBuilder +import pl.touk.nussknacker.test.{ + NuRestAssureExtensions, + NuRestAssureMatchers, + RestAssuredVerboseLoggingIfValidationFails +} import pl.touk.nussknacker.test.base.it.{NuItTest, WithSimplifiedConfigScenarioHelper} import pl.touk.nussknacker.test.config.{ WithBusinessCaseRestAssuredUsersExtensions, @@ -13,11 +18,6 @@ import pl.touk.nussknacker.test.config.{ WithSimplifiedDesignerConfig } import pl.touk.nussknacker.test.processes.WithScenarioActivitySpecAsserts -import pl.touk.nussknacker.test.{ - NuRestAssureExtensions, - NuRestAssureMatchers, - RestAssuredVerboseLoggingIfValidationFails -} import java.util.UUID diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioActivityApiHttpServiceSecuritySpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioActivityApiHttpServiceSecuritySpec.scala index 73cb789ad6d..f82aabe44fc 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioActivityApiHttpServiceSecuritySpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioActivityApiHttpServiceSecuritySpec.scala @@ -6,12 +6,12 @@ import org.scalatest.freespec.AnyFreeSpecLike import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.test.{NuRestAssureMatchers, RestAssuredVerboseLoggingIfValidationFails} import pl.touk.nussknacker.test.base.it.{NuItTest, WithAccessControlCheckingConfigScenarioHelper} -import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.{Category1, Category2} import pl.touk.nussknacker.test.config.{ WithAccessControlCheckingConfigRestAssuredUsersExtensions, WithAccessControlCheckingDesignerConfig, WithMockableDeploymentManager } +import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.{Category1, Category2} class ScenarioActivityApiHttpServiceSecuritySpec extends AnyFreeSpecLike diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioLabelsApiHttpServiceBusinessSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioLabelsApiHttpServiceBusinessSpec.scala index 50db33e112b..f14c7042561 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioLabelsApiHttpServiceBusinessSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioLabelsApiHttpServiceBusinessSpec.scala @@ -6,6 +6,11 @@ import io.restassured.module.scala.RestAssuredSupport.AddThenToResponse import org.scalatest.freespec.AnyFreeSpecLike import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess +import pl.touk.nussknacker.test.{ + NuRestAssureExtensions, + NuRestAssureMatchers, + RestAssuredVerboseLoggingIfValidationFails +} import pl.touk.nussknacker.test.base.it.{NuItTest, WithSimplifiedConfigScenarioHelper} import pl.touk.nussknacker.test.config.{ WithBusinessCaseRestAssuredUsersExtensions, @@ -13,11 +18,6 @@ import pl.touk.nussknacker.test.config.{ WithSimplifiedDesignerConfig } import pl.touk.nussknacker.test.processes.WithScenarioActivitySpecAsserts -import pl.touk.nussknacker.test.{ - NuRestAssureExtensions, - NuRestAssureMatchers, - RestAssuredVerboseLoggingIfValidationFails -} import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter import java.util.UUID diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioLabelsApiHttpServiceSecuritySpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioLabelsApiHttpServiceSecuritySpec.scala index 666cd3a0839..558be828d2e 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioLabelsApiHttpServiceSecuritySpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioLabelsApiHttpServiceSecuritySpec.scala @@ -12,12 +12,12 @@ import pl.touk.nussknacker.test.base.it.{ WithAccessControlCheckingConfigScenarioHelper, WithSimplifiedConfigScenarioHelper } -import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.Category1 import pl.touk.nussknacker.test.config.{ WithAccessControlCheckingConfigRestAssuredUsersExtensions, WithAccessControlCheckingDesignerConfig, WithMockableDeploymentManager } +import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.Category1 import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter import java.util.UUID diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioParametersApiHttpServiceBusinessSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioParametersApiHttpServiceBusinessSpec.scala index 17f3efe6747..daf0e1308f6 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioParametersApiHttpServiceBusinessSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioParametersApiHttpServiceBusinessSpec.scala @@ -3,9 +3,9 @@ package pl.touk.nussknacker.ui.api import io.restassured.RestAssured.`given` import io.restassured.module.scala.RestAssuredSupport.AddThenToResponse import org.scalatest.freespec.AnyFreeSpecLike +import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} import pl.touk.nussknacker.test.base.it.NuItTest import pl.touk.nussknacker.test.config.{WithBusinessCaseRestAssuredUsersExtensions, WithSimplifiedDesignerConfig} -import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} class ScenarioParametersApiHttpServiceBusinessSpec extends AnyFreeSpecLike diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioParametersApiHttpServiceSecuritySpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioParametersApiHttpServiceSecuritySpec.scala index 7d4eeead531..4af357ac8f0 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioParametersApiHttpServiceSecuritySpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ScenarioParametersApiHttpServiceSecuritySpec.scala @@ -3,12 +3,12 @@ package pl.touk.nussknacker.ui.api import io.restassured.RestAssured.`given` import io.restassured.module.scala.RestAssuredSupport.AddThenToResponse import org.scalatest.freespec.AnyFreeSpecLike +import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} import pl.touk.nussknacker.test.base.it.NuItTest import pl.touk.nussknacker.test.config.{ WithAccessControlCheckingConfigRestAssuredUsersExtensions, WithAccessControlCheckingDesignerConfig } -import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} class ScenarioParametersApiHttpServiceSecuritySpec extends AnyFreeSpecLike diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/SettingsResourcesSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/SettingsResourcesSpec.scala index a717bca0b99..cee397d2bfc 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/SettingsResourcesSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/SettingsResourcesSpec.scala @@ -5,9 +5,9 @@ import akka.http.scaladsl.testkit.ScalatestRouteTest import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport import org.mockito.invocation.InvocationOnMock import org.mockito.stubbing.Answer +import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} import org.scalatest.funspec.AnyFunSpec import org.scalatest.matchers.should.Matchers -import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} import org.scalatestplus.mockito.MockitoSugar.mock import pl.touk.nussknacker.test.PatientScalaFutures import pl.touk.nussknacker.test.base.it.NuResourcesTest diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/StatisticsApiHttpServiceBusinessSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/StatisticsApiHttpServiceBusinessSpec.scala index 02fbbc550a8..9835cd27775 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/StatisticsApiHttpServiceBusinessSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/StatisticsApiHttpServiceBusinessSpec.scala @@ -7,8 +7,8 @@ import com.typesafe.scalalogging.LazyLogging import io.restassured.RestAssured.`given` import io.restassured.module.scala.RestAssuredSupport.AddThenToResponse import io.restassured.response.ValidatableResponse -import org.hamcrest.Matchers.{equalTo, matchesRegex} import org.hamcrest.{BaseMatcher, Description, Matcher} +import org.hamcrest.Matchers.{equalTo, matchesRegex} import org.mockito.Mockito.when import org.mockito.invocation.InvocationOnMock import org.mockito.stubbing.Answer @@ -21,25 +21,25 @@ import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.graph.expression.Expression.Language import pl.touk.nussknacker.engine.version.BuildInfo +import pl.touk.nussknacker.test.{ + NuRestAssureExtensions, + NuRestAssureMatchers, + RestAssuredVerboseLoggingIfValidationFails +} import pl.touk.nussknacker.test.base.it.{NuItTest, WithAccessControlCheckingConfigScenarioHelper} -import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.Category1 import pl.touk.nussknacker.test.config.{ WithAccessControlCheckingConfigRestAssuredUsersExtensions, WithAccessControlCheckingDesignerConfig, WithDesignerConfig } +import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.Category1 import pl.touk.nussknacker.test.utils.{QueryParamsHelper, StatisticEncryptionSupport} -import pl.touk.nussknacker.test.{ - NuRestAssureExtensions, - NuRestAssureMatchers, - RestAssuredVerboseLoggingIfValidationFails -} import pl.touk.nussknacker.ui.api.description.StatisticsApiEndpoints.Dtos.StatisticName import pl.touk.nussknacker.ui.statistics._ +import java.time.{Clock, Instant, ZoneOffset} import java.time.format.DateTimeFormatter import java.time.temporal.ChronoUnit -import java.time.{Clock, Instant, ZoneOffset} import java.util.UUID import scala.util.{Failure, Random, Success, Try} diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/StatisticsApiHttpServiceSecuritySpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/StatisticsApiHttpServiceSecuritySpec.scala index f24069b3f8b..e5e33f67004 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/StatisticsApiHttpServiceSecuritySpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/StatisticsApiHttpServiceSecuritySpec.scala @@ -4,12 +4,12 @@ import io.restassured.RestAssured.`given` import io.restassured.module.scala.RestAssuredSupport.AddThenToResponse import org.hamcrest.Matchers.equalTo import org.scalatest.freespec.AnyFreeSpecLike +import pl.touk.nussknacker.test.{NuRestAssureExtensions, NuRestAssureMatchers} import pl.touk.nussknacker.test.base.it.{NuItTest, WithAccessControlCheckingConfigScenarioHelper} import pl.touk.nussknacker.test.config.{ WithAccessControlCheckingConfigRestAssuredUsersExtensions, WithAccessControlCheckingDesignerConfig } -import pl.touk.nussknacker.test.{NuRestAssureExtensions, NuRestAssureMatchers} class StatisticsApiHttpServiceSecuritySpec extends AnyFreeSpecLike diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/StickyNotesApiHttpServiceBusinessSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/StickyNotesApiHttpServiceBusinessSpec.scala index fcaeffd1ae3..a39cd409d99 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/StickyNotesApiHttpServiceBusinessSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/StickyNotesApiHttpServiceBusinessSpec.scala @@ -6,17 +6,17 @@ import org.scalatest.freespec.AnyFreeSpecLike import pl.touk.nussknacker.engine.api.LayoutData import pl.touk.nussknacker.engine.api.process.{ProcessName, VersionId} import pl.touk.nussknacker.engine.build.ScenarioBuilder +import pl.touk.nussknacker.test.{ + NuRestAssureExtensions, + NuRestAssureMatchers, + RestAssuredVerboseLoggingIfValidationFails +} import pl.touk.nussknacker.test.base.it.{NuItTest, WithSimplifiedConfigScenarioHelper} import pl.touk.nussknacker.test.config.{ WithBusinessCaseRestAssuredUsersExtensions, WithMockableDeploymentManager, WithSimplifiedDesignerConfig } -import pl.touk.nussknacker.test.{ - NuRestAssureExtensions, - NuRestAssureMatchers, - RestAssuredVerboseLoggingIfValidationFails -} import pl.touk.nussknacker.ui.api.description.stickynotes.Dtos.{Dimensions, StickyNoteAddRequest} import java.util.UUID diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/TestingApiHttpServiceSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/TestingApiHttpServiceSpec.scala index 2c7d0e62824..6ae7224451a 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/TestingApiHttpServiceSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/TestingApiHttpServiceSpec.scala @@ -13,13 +13,13 @@ import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} +import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} import pl.touk.nussknacker.test.base.it.{NuItTest, WithSimplifiedConfigScenarioHelper} import pl.touk.nussknacker.test.config.{ WithBusinessCaseRestAssuredUsersExtensions, WithMockableDeploymentManager, WithSimplifiedDesignerConfig } -import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} import pl.touk.nussknacker.ui.api.description.NodesApiEndpoints.Dtos.{AdhocTestParametersRequest, TestSourceParameters} import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/UserApiHttpServiceCategoryUsedMoreThanOnceConfigSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/UserApiHttpServiceCategoryUsedMoreThanOnceConfigSpec.scala index 4cb4d2b6ff4..dbc5403f4f3 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/UserApiHttpServiceCategoryUsedMoreThanOnceConfigSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/UserApiHttpServiceCategoryUsedMoreThanOnceConfigSpec.scala @@ -3,13 +3,13 @@ package pl.touk.nussknacker.ui.api import io.restassured.RestAssured.given import io.restassured.module.scala.RestAssuredSupport.AddThenToResponse import org.scalatest.freespec.AnyFreeSpecLike +import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} import pl.touk.nussknacker.test.base.it.NuItTest -import pl.touk.nussknacker.test.config.WithCategoryUsedMoreThanOnceDesignerConfig.TestCategory import pl.touk.nussknacker.test.config.{ WithBusinessCaseRestAssuredUsersExtensions, WithCategoryUsedMoreThanOnceDesignerConfig } -import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} +import pl.touk.nussknacker.test.config.WithCategoryUsedMoreThanOnceDesignerConfig.TestCategory class UserApiHttpServiceCategoryUsedMoreThanOnceConfigSpec extends AnyFreeSpecLike diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/UserApiHttpServiceSecuritySpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/UserApiHttpServiceSecuritySpec.scala index 9c4f284f125..5466e06688b 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/UserApiHttpServiceSecuritySpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/UserApiHttpServiceSecuritySpec.scala @@ -4,12 +4,12 @@ import io.restassured.RestAssured.given import io.restassured.module.scala.RestAssuredSupport.AddThenToResponse import org.hamcrest.Matchers.equalTo import org.scalatest.freespec.AnyFreeSpecLike +import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} import pl.touk.nussknacker.test.base.it.NuItTest import pl.touk.nussknacker.test.config.{ WithAccessControlCheckingConfigRestAssuredUsersExtensions, WithAccessControlCheckingDesignerConfig } -import pl.touk.nussknacker.test.{NuRestAssureMatchers, PatientScalaFutures, RestAssuredVerboseLoggingIfValidationFails} class UserApiHttpServiceSecuritySpec extends AnyFreeSpecLike diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ValidationResourcesSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ValidationResourcesSpec.scala index 0654b8d9491..063016c3077 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ValidationResourcesSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/ValidationResourcesSpec.scala @@ -1,14 +1,14 @@ package pl.touk.nussknacker.ui.api -import akka.http.scaladsl.model.Uri.Path import akka.http.scaladsl.model.{ContentTypeRange, StatusCodes, Uri} +import akka.http.scaladsl.model.Uri.Path import akka.http.scaladsl.server.Route import akka.http.scaladsl.testkit.ScalatestRouteTest import akka.http.scaladsl.unmarshalling.{FromEntityUnmarshaller, Unmarshaller} import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport +import org.scalatest.{Assertion, BeforeAndAfterAll, BeforeAndAfterEach, OptionValues} import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import org.scalatest.{Assertion, BeforeAndAfterAll, BeforeAndAfterEach, OptionValues} import pl.touk.nussknacker.engine.api.StreamMetaData import pl.touk.nussknacker.engine.api.component.ScenarioPropertyConfig import pl.touk.nussknacker.engine.api.definition._ @@ -26,11 +26,11 @@ import pl.touk.nussknacker.engine.graph.source.SourceRef import pl.touk.nussknacker.restmodel.validation.ValidationResults.ValidationResult import pl.touk.nussknacker.security.Permission import pl.touk.nussknacker.test.PatientScalaFutures -import pl.touk.nussknacker.test.utils.domain.TestFactory.{mapProcessingTypeDataProvider, withPermissions} import pl.touk.nussknacker.test.base.it.NuResourcesTest import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestProcessingType.Streaming -import pl.touk.nussknacker.test.utils.scalas.AkkaHttpExtensions.toRequestEntity import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestFactory} +import pl.touk.nussknacker.test.utils.domain.TestFactory.{mapProcessingTypeDataProvider, withPermissions} +import pl.touk.nussknacker.test.utils.scalas.AkkaHttpExtensions.toRequestEntity import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter import pl.touk.nussknacker.ui.uiresolving.UIProcessResolver diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/config/ConfigurationTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/config/ConfigurationTest.scala index 8ec5c7c737b..fd73c261178 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/config/ConfigurationTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/config/ConfigurationTest.scala @@ -3,11 +3,11 @@ package pl.touk.nussknacker.ui.config import cats.effect.unsafe.implicits.global import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import pl.touk.nussknacker.engine.util.loader.ModelClassLoader import pl.touk.nussknacker.engine.{ModelData, ProcessingTypeConfig} +import pl.touk.nussknacker.engine.util.loader.ModelClassLoader import pl.touk.nussknacker.test.config.ConfigWithScalaVersion -import pl.touk.nussknacker.test.utils.domain.TestFactory import pl.touk.nussknacker.test.mock.WithTestDeploymentManagerClassLoader +import pl.touk.nussknacker.test.utils.domain.TestFactory import java.net.URI import java.nio.file.Files diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/config/processingtype/ProcessingTypeDataLoaderSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/config/processingtype/ProcessingTypeDataLoaderSpec.scala index 4aa610c9922..a4eaecc419a 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/config/processingtype/ProcessingTypeDataLoaderSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/config/processingtype/ProcessingTypeDataLoaderSpec.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.ui.config.processingtype -import cats.effect.unsafe.implicits.global import cats.effect.{IO, Ref} +import cats.effect.unsafe.implicits.global import com.typesafe import com.typesafe.config.{Config, ConfigFactory} import org.scalatest.funsuite.AnyFunSuite diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/config/scenariotoolbar/CategoriesScenarioToolbarsConfigParserSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/config/scenariotoolbar/CategoriesScenarioToolbarsConfigParserSpec.scala index 9d9a2c82a1d..fd3fd2cbabf 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/config/scenariotoolbar/CategoriesScenarioToolbarsConfigParserSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/config/scenariotoolbar/CategoriesScenarioToolbarsConfigParserSpec.scala @@ -8,9 +8,10 @@ import java.util.UUID class CategoriesScenarioToolbarsConfigParserSpec extends AnyFlatSpec with Matchers { + import org.scalatest.prop.TableDrivenPropertyChecks._ + import ToolbarButtonsConfigVariant._ import ToolbarPanelTypeConfig._ - import org.scalatest.prop.TableDrivenPropertyChecks._ private val scenarioToolbarConfig = CategoriesScenarioToolbarsConfigParser.parse( ConfigFactory.parseString(""" diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/DefinitionsServiceSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/DefinitionsServiceSpec.scala index ba488dbc163..cc11019df6d 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/DefinitionsServiceSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/DefinitionsServiceSpec.scala @@ -4,6 +4,7 @@ import com.typesafe.config.ConfigFactory import org.scalatest.OptionValues import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.{ModelData, ProcessingTypeConfig} import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.component._ import pl.touk.nussknacker.engine.api.definition._ @@ -18,14 +19,13 @@ import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.modelconfig.ComponentsUiConfigParser import pl.touk.nussknacker.engine.testing.LocalModelData import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap -import pl.touk.nussknacker.engine.{ModelData, ProcessingTypeConfig} import pl.touk.nussknacker.restmodel.definition.UIDefinitions import pl.touk.nussknacker.test.PatientScalaFutures import pl.touk.nussknacker.test.config.ConfigWithScalaVersion import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestProcessingType.Streaming import pl.touk.nussknacker.test.mock.{StubFragmentRepository, TestAdditionalUIConfigProvider} import pl.touk.nussknacker.test.utils.domain.ProcessTestData -import pl.touk.nussknacker.ui.definition.DefinitionsService.{ComponentUiConfigMode, createUIScenarioPropertyConfig} +import pl.touk.nussknacker.ui.definition.DefinitionsService.{createUIScenarioPropertyConfig, ComponentUiConfigMode} import pl.touk.nussknacker.ui.process.processingtype.DesignerModelData.DynamicComponentsStaticDefinitions import pl.touk.nussknacker.ui.security.api.AdminUser diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/EdgeTypesPreparerTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/EdgeTypesPreparerTest.scala index 1807f645662..50ef94758d7 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/EdgeTypesPreparerTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/EdgeTypesPreparerTest.scala @@ -2,13 +2,13 @@ package pl.touk.nussknacker.ui.definition import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import pl.touk.nussknacker.engine.api.component.Component.AllowedProcessingModes import pl.touk.nussknacker.engine.api.component.{ BuiltInComponentId, ComponentId, ComponentType, DesignerWideComponentId } +import pl.touk.nussknacker.engine.api.component.Component.AllowedProcessingModes import pl.touk.nussknacker.engine.definition.clazz.{ClassDefinition, ClassDefinitionSet} import pl.touk.nussknacker.engine.definition.fragment.FragmentComponentDefinitionExtractor import pl.touk.nussknacker.engine.graph.EdgeType.{FilterFalse, FilterTrue, FragmentOutput, NextSwitch, SwitchDefault} diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/ComponentGroupsPreparerSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/ComponentGroupsPreparerSpec.scala index 30903066fbf..56ea0d5a04b 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/ComponentGroupsPreparerSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/ComponentGroupsPreparerSpec.scala @@ -9,14 +9,14 @@ import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.typed.typing.Unknown import pl.touk.nussknacker.engine.definition.clazz.{ClassDefinition, ClassDefinitionSet} -import pl.touk.nussknacker.engine.definition.component.bultin.BuiltInComponentsDefinitionsPreparer -import pl.touk.nussknacker.engine.definition.component.defaultconfig.DefaultsComponentGroupName -import pl.touk.nussknacker.engine.definition.component.methodbased.MethodBasedComponentDefinitionWithImplementation import pl.touk.nussknacker.engine.definition.component.{ ComponentDefinitionWithImplementation, Components, CustomComponentSpecificData } +import pl.touk.nussknacker.engine.definition.component.bultin.BuiltInComponentsDefinitionsPreparer +import pl.touk.nussknacker.engine.definition.component.defaultconfig.DefaultsComponentGroupName +import pl.touk.nussknacker.engine.definition.component.methodbased.MethodBasedComponentDefinitionWithImplementation import pl.touk.nussknacker.engine.definition.fragment.FragmentComponentDefinitionExtractor import pl.touk.nussknacker.engine.definition.model.ModelDefinition import pl.touk.nussknacker.engine.graph.expression.Expression @@ -27,7 +27,7 @@ import pl.touk.nussknacker.engine.testing.ModelDefinitionBuilder import pl.touk.nussknacker.restmodel.definition.UIComponentGroup import pl.touk.nussknacker.test.ValidatedValuesDetailedMessage import pl.touk.nussknacker.test.utils.domain.ProcessTestData -import pl.touk.nussknacker.ui.definition.{AlignedComponentsDefinitionProvider, component} +import pl.touk.nussknacker.ui.definition.{component, AlignedComponentsDefinitionProvider} class ComponentGroupsPreparerSpec extends AnyFunSuite diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/ComponentModels.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/ComponentModels.scala index 7142a195aaa..77fffe0b6b1 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/ComponentModels.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/ComponentModels.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.ui.definition.component +import pl.touk.nussknacker.engine.api.{CustomStreamTransformer, MethodToInvoke, Service} import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.api.typed.typing.Unknown -import pl.touk.nussknacker.engine.api.{CustomStreamTransformer, MethodToInvoke, Service} import scala.concurrent.{ExecutionContext, Future} import scala.util.Random diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/ComponentsUsageHelperTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/ComponentsUsageHelperTest.scala index 644b03f1d56..8335879f38b 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/ComponentsUsageHelperTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/ComponentsUsageHelperTest.scala @@ -3,8 +3,9 @@ package pl.touk.nussknacker.ui.definition.component import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.prop.{TableDrivenPropertyChecks, TableFor2} -import pl.touk.nussknacker.engine.api.component.ComponentType._ +import pl.touk.nussknacker.engine.api.{FragmentSpecificData, MetaData} import pl.touk.nussknacker.engine.api.component._ +import pl.touk.nussknacker.engine.api.component.ComponentType._ import pl.touk.nussknacker.engine.api.deployment.{ ProcessAction, ProcessActionId, @@ -15,20 +16,19 @@ import pl.touk.nussknacker.engine.api.graph.ScenarioGraph import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.VersionId import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{FragmentSpecificData, MetaData} import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} +import pl.touk.nussknacker.engine.canonicalgraph.{canonicalnode, CanonicalProcess} import pl.touk.nussknacker.engine.canonicalgraph.canonicalnode.FlatNode -import pl.touk.nussknacker.engine.canonicalgraph.{CanonicalProcess, canonicalnode} import pl.touk.nussknacker.engine.definition.clazz.{ClassDefinition, ClassDefinitionSet} import pl.touk.nussknacker.engine.definition.component.CustomComponentSpecificData import pl.touk.nussknacker.engine.definition.component.bultin.BuiltInComponentsDefinitionsPreparer import pl.touk.nussknacker.engine.definition.fragment.FragmentComponentDefinitionExtractor -import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.node.{Case, CustomNode, FragmentInputDefinition, FragmentOutputDefinition} +import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.modelconfig.ComponentsUiConfig import pl.touk.nussknacker.engine.testing.ModelDefinitionBuilder -import pl.touk.nussknacker.restmodel.component.NodeUsageData.ScenarioUsageData import pl.touk.nussknacker.restmodel.component.{NodeUsageData, ScenarioComponentsUsages} +import pl.touk.nussknacker.restmodel.component.NodeUsageData.ScenarioUsageData import pl.touk.nussknacker.test.utils.domain.ProcessTestData import pl.touk.nussknacker.test.utils.domain.TestProcessUtil.{toCanonical, wrapGraphWithScenarioDetailsEntity} import pl.touk.nussknacker.ui.definition.AlignedComponentsDefinitionProvider diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/DefaultComponentServiceSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/DefaultComponentServiceSpec.scala index de5fa6fe4c1..4f16c332e44 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/DefaultComponentServiceSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/DefaultComponentServiceSpec.scala @@ -8,11 +8,11 @@ import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers import org.scalatestplus.mockito.MockitoSugar.mock import pl.touk.nussknacker.engine.ModelData +import pl.touk.nussknacker.engine.api.component._ import pl.touk.nussknacker.engine.api.component.Component.AllowedProcessingModes import pl.touk.nussknacker.engine.api.component.ComponentType._ -import pl.touk.nussknacker.engine.api.component._ import pl.touk.nussknacker.engine.api.graph.ScenarioGraph -import pl.touk.nussknacker.engine.api.process.{ProcessObjectDependencies, ProcessingType} +import pl.touk.nussknacker.engine.api.process.{ProcessingType, ProcessObjectDependencies} import pl.touk.nussknacker.engine.definition.component.Components.ComponentDefinitionExtractionMode import pl.touk.nussknacker.engine.definition.component.Components.ComponentDefinitionExtractionMode.FinalDefinition import pl.touk.nussknacker.engine.definition.component.defaultconfig.DefaultsComponentGroupName._ @@ -21,22 +21,22 @@ import pl.touk.nussknacker.engine.definition.component.defaultconfig.DefaultsCom import pl.touk.nussknacker.engine.deployment.EngineSetupName import pl.touk.nussknacker.engine.testing.LocalModelData import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap -import pl.touk.nussknacker.restmodel.component.NodeUsageData.{FragmentUsageData, ScenarioUsageData} import pl.touk.nussknacker.restmodel.component.{ComponentLink, ComponentListElement, NodeUsageData} +import pl.touk.nussknacker.restmodel.component.NodeUsageData.{FragmentUsageData, ScenarioUsageData} import pl.touk.nussknacker.security.Permission +import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, PatientScalaFutures, ValidatedValuesDetailedMessage} import pl.touk.nussknacker.test.mock.{MockFetchingProcessRepository, MockManagerProvider} import pl.touk.nussknacker.test.utils.domain.TestFactory import pl.touk.nussknacker.test.utils.domain.TestProcessUtil.createFragmentEntity -import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, PatientScalaFutures, ValidatedValuesDetailedMessage} import pl.touk.nussknacker.ui.api.ScenarioStatusPresenter -import pl.touk.nussknacker.ui.config.ComponentLinkConfig._ import pl.touk.nussknacker.ui.config.{ComponentLinkConfig, ComponentLinksConfigExtractor} +import pl.touk.nussknacker.ui.config.ComponentLinkConfig._ import pl.touk.nussknacker.ui.definition.AlignedComponentsDefinitionProvider import pl.touk.nussknacker.ui.definition.component.ComponentListQueryOptions.{ - FetchAllWithUsages, FetchAllWithoutUsages, - FetchNonFragmentsWithUsages, - FetchNonFragmentsWithoutUsages + FetchAllWithUsages, + FetchNonFragmentsWithoutUsages, + FetchNonFragmentsWithUsages } import pl.touk.nussknacker.ui.definition.component.ComponentModelData._ import pl.touk.nussknacker.ui.definition.component.ComponentTestProcessData._ @@ -44,13 +44,13 @@ import pl.touk.nussknacker.ui.definition.component.DynamicComponentProvider._ import pl.touk.nussknacker.ui.process.DBProcessService import pl.touk.nussknacker.ui.process.deployment.scenariostatus.ScenarioStatusProvider import pl.touk.nussknacker.ui.process.fragment.DefaultFragmentRepository +import pl.touk.nussknacker.ui.process.processingtype.{ProcessingTypeData, ScenarioParametersService} import pl.touk.nussknacker.ui.process.processingtype.ProcessingTypeData.SchedulingForProcessingType import pl.touk.nussknacker.ui.process.processingtype.loader.ProcessingTypeDataLoader import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataProvider -import pl.touk.nussknacker.ui.process.processingtype.{ProcessingTypeData, ScenarioParametersService} import pl.touk.nussknacker.ui.process.repository.ScenarioWithDetailsEntity -import pl.touk.nussknacker.ui.security.api.GlobalPermission.GlobalPermission import pl.touk.nussknacker.ui.security.api.{AdminUser, CommonUser, ImpersonatedUser, LoggedUser, RealLoggedUser} +import pl.touk.nussknacker.ui.security.api.GlobalPermission.GlobalPermission import java.net.URI import scala.annotation.tailrec @@ -549,20 +549,24 @@ class DefaultComponentServiceSpec .create(ConfigFactory.empty, ProcessObjectDependencies.withConfig(ConfigFactory.empty())) private val modelDataMap: Map[ProcessingType, (ModelData, String)] = Map( - ProcessingTypeStreaming -> (LocalModelData( - streamingConfig, - providerComponents, - ComponentMarketingTestConfigCreator, - determineDesignerWideId = DesignerWideComponentId.default(ProcessingTypeStreaming, _) - ), - CategoryMarketing), - ProcessingTypeFraud -> (LocalModelData( - fraudConfig, - providerComponents, - ComponentFraudTestConfigCreator, - determineDesignerWideId = DesignerWideComponentId.default(ProcessingTypeFraud, _) + ProcessingTypeStreaming -> ( + LocalModelData( + streamingConfig, + providerComponents, + ComponentMarketingTestConfigCreator, + determineDesignerWideId = DesignerWideComponentId.default(ProcessingTypeStreaming, _) + ), + CategoryMarketing ), - CategoryFraud) + ProcessingTypeFraud -> ( + LocalModelData( + fraudConfig, + providerComponents, + ComponentFraudTestConfigCreator, + determineDesignerWideId = DesignerWideComponentId.default(ProcessingTypeFraud, _) + ), + CategoryFraud + ) ) private val fragmentFromCategories = modelDataMap.toList @@ -680,18 +684,24 @@ class DefaultComponentServiceSpec it should "throws exception when components are wrong configured" in { import pl.touk.nussknacker.ui.definition.component.WrongConfigurationAttribute._ val badModelDataMap = Map( - ProcessingTypeStreaming -> (LocalModelData( - streamingConfig, - providerComponents, - ComponentMarketingTestConfigCreator, - determineDesignerWideId = DesignerWideComponentId.default(ProcessingTypeStreaming, _) - ), CategoryMarketing), - ProcessingTypeFraud -> (LocalModelData( - wrongConfig, - providerComponents, - WronglyConfiguredConfigCreator, - determineDesignerWideId = DesignerWideComponentId.default(ProcessingTypeFraud, _) - ), CategoryFraud) + ProcessingTypeStreaming -> ( + LocalModelData( + streamingConfig, + providerComponents, + ComponentMarketingTestConfigCreator, + determineDesignerWideId = DesignerWideComponentId.default(ProcessingTypeStreaming, _) + ), + CategoryMarketing + ), + ProcessingTypeFraud -> ( + LocalModelData( + wrongConfig, + providerComponents, + WronglyConfiguredConfigCreator, + determineDesignerWideId = DesignerWideComponentId.default(ProcessingTypeFraud, _) + ), + CategoryFraud + ) ) val componentService = prepareService(badModelDataMap, List.empty, List.empty) diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/DynamicComponentProvider.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/DynamicComponentProvider.scala index 9b4833cbd23..f46f45311d9 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/DynamicComponentProvider.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/component/DynamicComponentProvider.scala @@ -1,10 +1,10 @@ package pl.touk.nussknacker.ui.definition.component import com.typesafe.config.Config +import pl.touk.nussknacker.engine.api.{MethodToInvoke, Service} import pl.touk.nussknacker.engine.api.component.{ComponentDefinition, ComponentProvider, NussknackerVersion} import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.api.typed.typing.Unknown -import pl.touk.nussknacker.engine.api.{MethodToInvoke, Service} import scala.concurrent.Future diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/ScenarioPropertyValidatorsDeterminerChainTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/ScenarioPropertyValidatorsDeterminerChainTest.scala index 89cd7595efc..f55fe4c41ca 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/ScenarioPropertyValidatorsDeterminerChainTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/ScenarioPropertyValidatorsDeterminerChainTest.scala @@ -2,13 +2,13 @@ package pl.touk.nussknacker.ui.definition.scenarioproperty import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.component.ScenarioPropertyConfig import pl.touk.nussknacker.engine.api.definition.{ FixedExpressionValue, FixedValuesParameterEditor, FixedValuesValidator, MandatoryParameterValidator } -import pl.touk.nussknacker.engine.api.component.ScenarioPropertyConfig class ScenarioPropertyValidatorsDeterminerChainTest extends AnyFunSuite with Matchers { diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/UiScenarioPropertyEditorDeterminerTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/UiScenarioPropertyEditorDeterminerTest.scala index 9141056df72..906a232db0c 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/UiScenarioPropertyEditorDeterminerTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/definition/scenarioproperty/UiScenarioPropertyEditorDeterminerTest.scala @@ -2,12 +2,12 @@ package pl.touk.nussknacker.ui.definition.scenarioproperty import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.component.ScenarioPropertyConfig import pl.touk.nussknacker.engine.api.definition.{ FixedExpressionValue, FixedValuesParameterEditor, StringParameterEditor } -import pl.touk.nussknacker.engine.api.component.ScenarioPropertyConfig class UiScenarioPropertyEditorDeterminerTest extends AnyFunSuite with Matchers { diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/initialization/InitializationOnDbItSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/initialization/InitializationOnDbItSpec.scala index d33fe349e9b..914b1604388 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/initialization/InitializationOnDbItSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/initialization/InitializationOnDbItSpec.scala @@ -1,15 +1,15 @@ package pl.touk.nussknacker.ui.initialization +import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers import org.scalatest.tags.Slow -import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.test.PatientScalaFutures import pl.touk.nussknacker.test.base.db.{DbTesting, WithHsqlDbTesting, WithPostgresDbTesting, WithTestDb} import pl.touk.nussknacker.test.base.it.WithClock -import pl.touk.nussknacker.test.utils.domain.TestFactory.mapProcessingTypeDataProvider import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestFactory} +import pl.touk.nussknacker.test.utils.domain.TestFactory.mapProcessingTypeDataProvider import pl.touk.nussknacker.ui.process.ScenarioQuery import pl.touk.nussknacker.ui.process.migrate.TestMigrations import pl.touk.nussknacker.ui.process.repository.ProcessRepository.CreateProcessAction @@ -27,10 +27,10 @@ abstract class InitializationOnDbItSpec with BeforeAndAfterAll { this: DbTesting with WithTestDb with WithClock => - import Initialization.nussknackerUser - import scala.concurrent.ExecutionContext.Implicits.global + import Initialization.nussknackerUser + private val processName = ProcessName("proc1") private val migrations = mapProcessingTypeDataProvider("streaming" -> new TestMigrations(1, 2)) diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/integration/BaseFlowTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/integration/BaseFlowTest.scala index 055f9df09c8..d21a01d1919 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/integration/BaseFlowTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/integration/BaseFlowTest.scala @@ -1,26 +1,26 @@ package pl.touk.nussknacker.ui.integration -import io.circe.Json.{Null, arr, fromBoolean, fromFields, fromString, obj} -import io.circe.syntax.EncoderOps import io.circe.{Decoder, Json, JsonObject} +import io.circe.Json.{arr, fromBoolean, fromFields, fromString, obj, Null} +import io.circe.syntax.EncoderOps import org.apache.commons.io.FileUtils import org.scalatest.OptionValues import org.scalatest.funsuite.AnyFunSuiteLike import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks import org.typelevel.ci._ +import pl.touk.nussknacker.engine.api.{FragmentSpecificData, StreamMetaData} import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.editor.DualEditorMode import pl.touk.nussknacker.engine.api.graph.{Edge, ProcessProperties, ScenarioGraph} import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.ProcessName -import pl.touk.nussknacker.engine.api.{FragmentSpecificData, StreamMetaData} import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.definition.component.defaultconfig.DefaultsComponentIcon import pl.touk.nussknacker.engine.graph.expression.Expression -import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.node.{FragmentInputDefinition, FragmentOutputDefinition, Processor} +import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.service.ServiceRef import pl.touk.nussknacker.engine.management.FlinkStreamingPropertiesConfig import pl.touk.nussknacker.engine.spel.SpelExtension._ @@ -31,6 +31,7 @@ import pl.touk.nussknacker.restmodel.validation.ValidationResults.{ ValidationErrors, ValidationResult } +import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, WithTestHttpClient} import pl.touk.nussknacker.test.base.it.NuItTest import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestCategory.Category1 @@ -39,16 +40,15 @@ import pl.touk.nussknacker.test.mock.TestAdditionalUIConfigProvider import pl.touk.nussknacker.test.utils.domain.ProcessTestData import pl.touk.nussknacker.test.utils.domain.ScenarioToJsonHelper.{ScenarioGraphToJson, ScenarioToJson} import pl.touk.nussknacker.test.utils.domain.TestProcessUtil.toJson -import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, WithTestHttpClient} -import pl.touk.nussknacker.ui.api.description.NodesApiEndpoints.Dtos.NodeValidationRequest import pl.touk.nussknacker.ui.api.ScenarioValidationRequest +import pl.touk.nussknacker.ui.api.description.NodesApiEndpoints.Dtos.NodeValidationRequest import pl.touk.nussknacker.ui.definition.DefinitionsService.createUIScenarioPropertyConfig import pl.touk.nussknacker.ui.process.ProcessService.CreateScenarioCommand import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter -import pl.touk.nussknacker.ui.util.MultipartUtils.sttpPrepareMultiParts import pl.touk.nussknacker.ui.util.{CorsSupport, SecurityHeadersSupport} +import pl.touk.nussknacker.ui.util.MultipartUtils.sttpPrepareMultiParts +import sttp.client3.{quickRequest, UriContext} import sttp.client3.circe.asJson -import sttp.client3.{UriContext, quickRequest} import sttp.model.{Header, MediaType, StatusCode} import java.io.File diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/integration/DictsFlowTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/integration/DictsFlowTest.scala index 7e6468e84b0..c8a9cdb9b3d 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/integration/DictsFlowTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/integration/DictsFlowTest.scala @@ -14,18 +14,18 @@ import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.graph.expression.Expression.Language import pl.touk.nussknacker.engine.spel.SpelExtension._ +import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, WithTestHttpClient} import pl.touk.nussknacker.test.base.it.NuItTest +import pl.touk.nussknacker.test.config.{ConfigWithScalaVersion, WithDesignerConfig} import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestCategory.Category1 import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestProcessingType.Streaming -import pl.touk.nussknacker.test.config.{ConfigWithScalaVersion, WithDesignerConfig} import pl.touk.nussknacker.test.utils.domain.ScenarioToJsonHelper.ScenarioToJson import pl.touk.nussknacker.test.utils.domain.TestProcessUtil.toJson -import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, WithTestHttpClient} import pl.touk.nussknacker.ui.api.ScenarioValidationRequest import pl.touk.nussknacker.ui.process.ProcessService.CreateScenarioCommand import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter import pl.touk.nussknacker.ui.util.MultipartUtils.sttpPrepareMultiParts -import sttp.client3.{UriContext, quickRequest} +import sttp.client3.{quickRequest, UriContext} import sttp.model.{MediaType, StatusCode} import java.util.UUID diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/notifications/NotificationServiceTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/notifications/NotificationServiceTest.scala index 206d0fc0b3b..51071179e2d 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/notifications/NotificationServiceTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/notifications/NotificationServiceTest.scala @@ -3,14 +3,14 @@ package pl.touk.nussknacker.ui.notifications import akka.actor.ActorSystem import org.mockito.ArgumentMatchers.any import org.mockito.Mockito.when +import org.scalatest.{BeforeAndAfterAll, OptionValues} import org.scalatest.exceptions.TestFailedException import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{BeforeAndAfterAll, OptionValues} import org.scalatestplus.mockito.MockitoSugar import pl.touk.nussknacker.engine.api.component.NodesDeploymentData -import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment._ +import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment.simple.SimpleProcessStateDefinitionManager import pl.touk.nussknacker.engine.api.process.{ProcessIdWithName, ProcessName} import pl.touk.nussknacker.engine.build.ScenarioBuilder @@ -21,34 +21,34 @@ import pl.touk.nussknacker.engine.deployment.{ DeploymentId, ExternalDeploymentId } +import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, PatientScalaFutures} import pl.touk.nussknacker.test.base.db.WithHsqlDbTesting import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestProcessingType.Streaming import pl.touk.nussknacker.test.mock.MockDeploymentManager -import pl.touk.nussknacker.test.utils.domain.TestFactory.mapProcessingTypeDataProvider import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestFactory} +import pl.touk.nussknacker.test.utils.domain.TestFactory.mapProcessingTypeDataProvider import pl.touk.nussknacker.test.utils.scalas.DBIOActionValues -import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, PatientScalaFutures} import pl.touk.nussknacker.ui.listener.ProcessChangeListener import pl.touk.nussknacker.ui.notifications.NotificationService.NotificationsScope -import pl.touk.nussknacker.ui.process.deployment.LoggedUserConversions._ import pl.touk.nussknacker.ui.process.deployment._ +import pl.touk.nussknacker.ui.process.deployment.LoggedUserConversions._ import pl.touk.nussknacker.ui.process.deployment.deploymentstatus.EngineSideDeploymentStatusesProvider import pl.touk.nussknacker.ui.process.deployment.scenariostatus.ScenarioStatusProvider import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataProvider -import pl.touk.nussknacker.ui.process.repository.ProcessRepository.CreateProcessAction -import pl.touk.nussknacker.ui.process.repository.activities.DbScenarioActivityRepository import pl.touk.nussknacker.ui.process.repository.{ DBIOActionRunner, DbScenarioActionRepository, ScenarioWithDetailsEntity } +import pl.touk.nussknacker.ui.process.repository.ProcessRepository.CreateProcessAction +import pl.touk.nussknacker.ui.process.repository.activities.DbScenarioActivityRepository import pl.touk.nussknacker.ui.process.scenarioactivity.FetchScenarioActivityService import pl.touk.nussknacker.ui.security.api.LoggedUser import pl.touk.nussknacker.ui.util.InMemoryTimeseriesRepository import pl.touk.nussknacker.ui.validation.UIProcessValidator -import java.time.temporal.ChronoUnit import java.time.{Clock, Duration, Instant, ZoneId} +import java.time.temporal.ChronoUnit import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future import scala.concurrent.duration.DurationInt diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/ConfigScenarioToolbarServiceSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/ConfigScenarioToolbarServiceSpec.scala index b997e1cf699..dd332c81c0b 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/ConfigScenarioToolbarServiceSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/ConfigScenarioToolbarServiceSpec.scala @@ -11,10 +11,11 @@ import pl.touk.nussknacker.ui.process.repository.ScenarioWithDetailsEntity class ConfigScenarioToolbarServiceSpec extends AnyFlatSpec with Matchers { + import org.scalatest.prop.TableDrivenPropertyChecks._ + import ToolbarButtonConfigType._ import ToolbarButtonsConfigVariant._ import ToolbarPanelTypeConfig._ - import org.scalatest.prop.TableDrivenPropertyChecks._ private lazy val parsedConfig = CategoriesScenarioToolbarsConfigParser.parse( ConfigFactory.parseString( diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/DBProcessServiceSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/DBProcessServiceSpec.scala index 4cc82459014..66d4441ce5b 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/DBProcessServiceSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/DBProcessServiceSpec.scala @@ -16,8 +16,8 @@ import pl.touk.nussknacker.test.PatientScalaFutures import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory.{Category1, Category2} import pl.touk.nussknacker.test.mock.MockFetchingProcessRepository -import pl.touk.nussknacker.test.utils.domain.TestProcessUtil.{createFragmentEntity, createScenarioEntity} import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestFactory} +import pl.touk.nussknacker.test.utils.domain.TestProcessUtil.{createFragmentEntity, createScenarioEntity} import pl.touk.nussknacker.ui.NuDesignerError import pl.touk.nussknacker.ui.NuDesignerError.XError import pl.touk.nussknacker.ui.api.ProcessesResources.ProcessUnmarshallingError diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/ProcessStateDefinitionServiceSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/ProcessStateDefinitionServiceSpec.scala index cf2c5678503..26741c8e81a 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/ProcessStateDefinitionServiceSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/ProcessStateDefinitionServiceSpec.scala @@ -4,10 +4,10 @@ import com.typesafe.config.ConfigFactory import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.api.component.ComponentDefinition +import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.deployment.ProcessStateDefinitionManager.ScenarioStatusWithScenarioContext import pl.touk.nussknacker.engine.api.deployment.StateDefinitionDetails.UnknownIcon import pl.touk.nussknacker.engine.api.deployment.StateStatus.StatusName -import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.process.{ProcessingType, Source, SourceFactory} import pl.touk.nussknacker.engine.deployment.EngineSetupName import pl.touk.nussknacker.engine.testing.LocalModelData @@ -15,9 +15,9 @@ import pl.touk.nussknacker.security.Permission import pl.touk.nussknacker.test.mock.{MockDeploymentManager, MockManagerProvider} import pl.touk.nussknacker.test.utils.domain.TestFactory import pl.touk.nussknacker.test.utils.domain.TestFactory.modelDependencies +import pl.touk.nussknacker.ui.process.processingtype.{ProcessingTypeData, ValueWithRestriction} import pl.touk.nussknacker.ui.process.processingtype.ProcessingTypeData.SchedulingForProcessingType import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataProvider -import pl.touk.nussknacker.ui.process.processingtype.{ProcessingTypeData, ValueWithRestriction} import pl.touk.nussknacker.ui.security.api.{AdminUser, CommonUser, LoggedUser} class ProcessStateDefinitionServiceSpec extends AnyFunSuite with Matchers { diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/deployment/DeploymentServiceSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/deployment/DeploymentServiceSpec.scala index 9849610161e..d6ce28ab5fe 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/deployment/DeploymentServiceSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/deployment/DeploymentServiceSpec.scala @@ -3,36 +3,36 @@ package pl.touk.nussknacker.ui.process.deployment import cats.implicits.toTraverseOps import cats.instances.list._ import db.util.DBIOActionInstances.DB +import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, OptionValues} import org.scalatest.LoneElement._ import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, OptionValues} import pl.touk.nussknacker.engine.api.Comment import pl.touk.nussknacker.engine.api.component.NodesDeploymentData +import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment.ProcessStateDefinitionManager.ScenarioStatusWithScenarioContext import pl.touk.nussknacker.engine.api.deployment.ScenarioActionName.{Cancel, Deploy} -import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus.ProblemStateStatus import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.deployment.DeploymentId +import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, NuScalaTestAssertions, PatientScalaFutures} import pl.touk.nussknacker.test.base.db.WithHsqlDbTesting import pl.touk.nussknacker.test.base.it.WithClock import pl.touk.nussknacker.test.mock.MockDeploymentManager import pl.touk.nussknacker.test.mock.MockDeploymentManagerSyntaxSugar.Ops -import pl.touk.nussknacker.test.utils.domain.TestFactory._ import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestFactory} +import pl.touk.nussknacker.test.utils.domain.TestFactory._ import pl.touk.nussknacker.test.utils.scalas.DBIOActionValues -import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, NuScalaTestAssertions, PatientScalaFutures} import pl.touk.nussknacker.ui.api.DeploymentCommentSettings import pl.touk.nussknacker.ui.listener.ProcessChangeEvent.{OnActionExecutionFinished, OnActionSuccess} import pl.touk.nussknacker.ui.process.ScenarioQuery import pl.touk.nussknacker.ui.process.deployment.scenariostatus.FragmentStateException import pl.touk.nussknacker.ui.process.periodic.flink.FlinkClientStub -import pl.touk.nussknacker.ui.process.repository.ProcessRepository.CreateProcessAction import pl.touk.nussknacker.ui.process.repository.{CommentValidationError, DBIOActionRunner} +import pl.touk.nussknacker.ui.process.repository.ProcessRepository.CreateProcessAction import pl.touk.nussknacker.ui.security.api.LoggedUser import slick.dbio.DBIOAction @@ -62,9 +62,10 @@ class DeploymentServiceSpec private val deploymentServiceFactory = new TestDeploymentServiceFactory(testDbRef) - import TestDeploymentServiceFactory._ import deploymentServiceFactory._ + import TestDeploymentServiceFactory._ + private val deploymentManager: MockDeploymentManager = MockDeploymentManager.create( defaultProcessStateStatus = SimpleStateStatus.Running, scenarioActivityManager = deploymentServiceFactory.deploymentManagerDependencies.scenarioActivityManager, diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/deployment/TestDeploymentServiceFactory.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/deployment/TestDeploymentServiceFactory.scala index e771ed1cfad..9f92a7e17cc 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/deployment/TestDeploymentServiceFactory.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/deployment/TestDeploymentServiceFactory.scala @@ -3,19 +3,19 @@ package pl.touk.nussknacker.ui.process.deployment import akka.actor.ActorSystem import cats.effect.unsafe.IORuntime import db.util.DBIOActionInstances.DB +import pl.touk.nussknacker.engine.{DeploymentManagerDependencies, ModelData} import pl.touk.nussknacker.engine.api.deployment.{ DeploymentManager, ProcessingTypeActionServiceStub, ProcessingTypeDeployedScenariosProviderStub } import pl.touk.nussknacker.engine.compile.ProcessValidator -import pl.touk.nussknacker.engine.{DeploymentManagerDependencies, ModelData} import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestProcessingType import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestProcessingType.Streaming import pl.touk.nussknacker.test.mock.{StubModelDataWithModelDefinition, TestProcessChangeListener} +import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestFactory} import pl.touk.nussknacker.test.utils.domain.ProcessTestData.modelDefinition import pl.touk.nussknacker.test.utils.domain.TestFactory._ -import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestFactory} import pl.touk.nussknacker.ui.api.DeploymentCommentSettings import pl.touk.nussknacker.ui.db.DbRef import pl.touk.nussknacker.ui.process.deployment.TestDeploymentServiceFactory.{actorSystem, clock, ec, processingType} @@ -24,8 +24,8 @@ import pl.touk.nussknacker.ui.process.deployment.reconciliation.ScenarioDeployme import pl.touk.nussknacker.ui.process.deployment.scenariostatus.ScenarioStatusProvider import pl.touk.nussknacker.ui.process.processingtype.ValueWithRestriction import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataProvider -import pl.touk.nussknacker.ui.process.repository.activities.ScenarioActivityRepository import pl.touk.nussknacker.ui.process.repository.{DBFetchingProcessRepository, ScenarioActionRepository} +import pl.touk.nussknacker.ui.process.repository.activities.ScenarioActivityRepository import sttp.client3.testing.SttpBackendStub import java.time.Clock diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/fragment/FragmentRepositorySpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/fragment/FragmentRepositorySpec.scala index 7d3d00362b5..0b806bfbcf3 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/fragment/FragmentRepositorySpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/fragment/FragmentRepositorySpec.scala @@ -7,10 +7,10 @@ import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.test.VeryPatientScalaFutures -import pl.touk.nussknacker.test.utils.domain.ProcessTestData.sampleFragmentName import pl.touk.nussknacker.test.base.it.NuResourcesTest import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestProcessingType.Streaming import pl.touk.nussknacker.test.utils.domain.ProcessTestData +import pl.touk.nussknacker.test.utils.domain.ProcessTestData.sampleFragmentName import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter class FragmentRepositorySpec diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/marshall/CanonicalProcessConverterSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/marshall/CanonicalProcessConverterSpec.scala index 5d3364e6f85..1005bb50317 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/marshall/CanonicalProcessConverterSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/marshall/CanonicalProcessConverterSpec.scala @@ -3,9 +3,9 @@ package pl.touk.nussknacker.ui.process.marshall import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks +import pl.touk.nussknacker.engine.api.{MetaData, StreamMetaData} import pl.touk.nussknacker.engine.api.graph.{Edge, ProcessProperties, ScenarioGraph} import pl.touk.nussknacker.engine.api.process.ProcessName -import pl.touk.nussknacker.engine.api.{MetaData, StreamMetaData} import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.graph.EdgeType diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/migrate/StandardRemoteEnvironmentSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/migrate/StandardRemoteEnvironmentSpec.scala index f9a9feb33f2..7513765f3cb 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/migrate/StandardRemoteEnvironmentSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/migrate/StandardRemoteEnvironmentSpec.scala @@ -12,10 +12,10 @@ import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.restmodel.scenariodetails.ScenarioWithDetailsForMigrations +import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, PatientScalaFutures} +import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestProcessUtil} import pl.touk.nussknacker.test.utils.domain.TestFactory.{flinkProcessValidator, mapProcessingTypeDataProvider} import pl.touk.nussknacker.test.utils.domain.TestProcessUtil.wrapGraphWithScenarioDetailsEntity -import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestProcessUtil} -import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, PatientScalaFutures} import pl.touk.nussknacker.ui.NuDesignerError import pl.touk.nussknacker.ui.api.description.MigrationApiEndpoints.Dtos.{ ApiVersion, @@ -27,9 +27,9 @@ import pl.touk.nussknacker.ui.process.ScenarioWithDetailsConversions import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter import pl.touk.nussknacker.ui.security.api.{LoggedUser, RealLoggedUser} +import scala.concurrent.{ExecutionContext, Future} import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.duration._ -import scala.concurrent.{ExecutionContext, Future} class StandardRemoteEnvironmentSpec extends AnyFlatSpec diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/migrate/TestMigrations.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/migrate/TestMigrations.scala index 7e516f9a84a..05dacf89b29 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/migrate/TestMigrations.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/migrate/TestMigrations.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.ui.process.migrate -import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.{MetaData, StreamMetaData} +import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.graph.evaluatedparam.{Parameter => NodeParameter} import pl.touk.nussknacker.engine.graph.node diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/migrate/TestModelMigrationsSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/migrate/TestModelMigrationsSpec.scala index e4ec705b344..2b77572a72e 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/migrate/TestModelMigrationsSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/migrate/TestModelMigrationsSpec.scala @@ -12,10 +12,10 @@ import pl.touk.nussknacker.restmodel.validation.ValidationResults.{ ValidationResult, ValidationWarnings } +import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestFactory} import pl.touk.nussknacker.test.utils.domain.ProcessTestData.{multipleSourcesValidScenarioGraph, validScenarioGraph} import pl.touk.nussknacker.test.utils.domain.TestFactory.{flinkProcessValidator, mapProcessingTypeDataProvider} import pl.touk.nussknacker.test.utils.domain.TestProcessUtil.wrapWithDetailsForMigration -import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestFactory} import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter import pl.touk.nussknacker.ui.security.api.{AdminUser, LoggedUser} diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/newdeployment/DeploymentServiceTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/newdeployment/DeploymentServiceTest.scala index 16114f92628..c47463c9e71 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/newdeployment/DeploymentServiceTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/newdeployment/DeploymentServiceTest.scala @@ -10,12 +10,12 @@ import pl.touk.nussknacker.engine.api.deployment.{DeploymentStatus, ProblemDeplo import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.newdeployment.DeploymentId +import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, PatientScalaFutures} import pl.touk.nussknacker.test.base.db.WithHsqlDbTesting import pl.touk.nussknacker.test.base.it.WithClock import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestProcessingType.Streaming import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestFactory} import pl.touk.nussknacker.test.utils.scalas.DBIOActionValues -import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, PatientScalaFutures} import pl.touk.nussknacker.ui.process.deployment.DeploymentManagerDispatcher import pl.touk.nussknacker.ui.process.processingtype.ValueWithRestriction import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataProvider @@ -23,7 +23,6 @@ import pl.touk.nussknacker.ui.process.repository.DBIOActionRunner import pl.touk.nussknacker.ui.process.repository.ProcessRepository.CreateProcessAction import java.time.{Clock, Instant, ZoneOffset} - import scala.concurrent.ExecutionContext import scala.util.Failure diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicProcessServiceIntegrationTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicProcessServiceIntegrationTest.scala index 3d27ba84d8c..69dc9259d42 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicProcessServiceIntegrationTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicProcessServiceIntegrationTest.scala @@ -13,6 +13,7 @@ import org.scalatest.concurrent.ScalaFutures import org.scalatest.exceptions.TestFailedException import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.{MetaData, ProcessVersion, StreamMetaData} import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.deployment.scheduler.services.{ ProcessConfigEnricher, @@ -22,7 +23,6 @@ import pl.touk.nussknacker.engine.api.deployment.scheduler.services.{ import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus.ProblemStateStatus import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessIdWithName, ProcessName, VersionId} -import pl.touk.nussknacker.engine.api.{MetaData, ProcessVersion, StreamMetaData} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.test.PatientScalaFutures import pl.touk.nussknacker.test.base.db.WithPostgresDbTesting @@ -34,13 +34,13 @@ import pl.touk.nussknacker.ui.process.periodic.PeriodicProcessService.PeriodicSc import pl.touk.nussknacker.ui.process.periodic.flink.{DeploymentManagerStub, ScheduledExecutionPerformerStub} import pl.touk.nussknacker.ui.process.periodic.legacy.db.{LegacyDbInitializer, SlickLegacyPeriodicProcessesRepository} import pl.touk.nussknacker.ui.process.periodic.model._ -import pl.touk.nussknacker.ui.process.repository.ProcessRepository.CreateProcessAction import pl.touk.nussknacker.ui.process.repository.{ DBIOActionRunner, DBProcessRepository, PeriodicProcessesRepository, SlickPeriodicProcessesRepository } +import pl.touk.nussknacker.ui.process.repository.ProcessRepository.CreateProcessAction import pl.touk.nussknacker.ui.security.api.AdminUser import slick.jdbc import slick.jdbc.JdbcProfile diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicProcessesFetchingTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicProcessesFetchingTest.scala index f8312cac91c..4f2819882b9 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicProcessesFetchingTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicProcessesFetchingTest.scala @@ -1,21 +1,21 @@ package pl.touk.nussknacker.ui.process.periodic +import org.scalatest.{Inside, OptionValues} import org.scalatest.concurrent.ScalaFutures import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks -import org.scalatest.{Inside, OptionValues} import pl.touk.nussknacker.engine.api.deployment._ +import pl.touk.nussknacker.engine.api.deployment.scheduler.services.{EmptyListener, ProcessConfigEnricher} import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.engine.deployment.DeploymentData import pl.touk.nussknacker.test.PatientScalaFutures +import pl.touk.nussknacker.ui.process.periodic.cron.CronSchedulePropertyExtractor import pl.touk.nussknacker.ui.process.periodic.flink.{DeploymentManagerStub, ScheduledExecutionPerformerStub} import pl.touk.nussknacker.ui.process.periodic.flink.db.InMemPeriodicProcessesRepository import pl.touk.nussknacker.ui.process.periodic.flink.db.InMemPeriodicProcessesRepository.getLatestDeploymentQueryCount import pl.touk.nussknacker.ui.process.periodic.model.PeriodicProcessDeploymentStatus -import pl.touk.nussknacker.engine.api.deployment.scheduler.services.{EmptyListener, ProcessConfigEnricher} -import pl.touk.nussknacker.ui.process.periodic.cron.CronSchedulePropertyExtractor import pl.touk.nussknacker.ui.process.repository.{FetchingProcessRepository, PeriodicProcessesRepository} import java.time.Clock diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/CronSchedulePropertyExtractorTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/CronSchedulePropertyExtractorTest.scala index 4b0c326fd2e..932b6c10a16 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/CronSchedulePropertyExtractorTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/CronSchedulePropertyExtractorTest.scala @@ -9,8 +9,8 @@ import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, ValidatedValuesDetailedMessage} -import pl.touk.nussknacker.ui.process.periodic.cron.{CronParameterValidator, CronSchedulePropertyExtractor} import pl.touk.nussknacker.ui.process.periodic.{CronScheduleProperty, MultipleScheduleProperty} +import pl.touk.nussknacker.ui.process.periodic.cron.{CronParameterValidator, CronSchedulePropertyExtractor} class CronSchedulePropertyExtractorTest extends AnyFunSuite diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/CronSchedulePropertyTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/CronSchedulePropertyTest.scala index 0177cd9fea3..2e6c821ea4e 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/CronSchedulePropertyTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/CronSchedulePropertyTest.scala @@ -4,7 +4,7 @@ import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.ui.process.periodic.CronScheduleProperty -import java.time.{Clock, LocalDateTime, ZoneId, ZonedDateTime} +import java.time.{Clock, LocalDateTime, ZonedDateTime, ZoneId} class CronSchedulePropertyTest extends AnyFunSuite with Matchers { diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/FlinkClientStub.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/FlinkClientStub.scala index 5b5ae61654c..eb64133093a 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/FlinkClientStub.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/FlinkClientStub.scala @@ -3,13 +3,13 @@ package pl.touk.nussknacker.ui.process.periodic.flink import org.apache.flink.api.common.JobID import org.apache.flink.configuration.Configuration import pl.touk.nussknacker.engine.api.deployment.{DataFreshnessPolicy, SavepointResult, WithDataFreshnessStatus} +import pl.touk.nussknacker.engine.management.rest.{flinkRestModel, FlinkClient} import pl.touk.nussknacker.engine.management.rest.flinkRestModel.{ ClusterOverview, ExecutionConfig, JobDetails, JobOverview } -import pl.touk.nussknacker.engine.management.rest.{FlinkClient, flinkRestModel} import java.io.File import scala.concurrent.Future diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/PeriodicDeploymentManagerTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/PeriodicDeploymentManagerTest.scala index 93204a18dab..26279b35079 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/PeriodicDeploymentManagerTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/PeriodicDeploymentManagerTest.scala @@ -1,21 +1,21 @@ package pl.touk.nussknacker.ui.process.periodic.flink +import org.scalatest.{Inside, OptionValues} import org.scalatest.concurrent.ScalaFutures import org.scalatest.exceptions.TestFailedException import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks -import org.scalatest.{Inside, OptionValues} +import pl.touk.nussknacker.engine.api.{MetaData, ProcessVersion, StreamMetaData} import pl.touk.nussknacker.engine.api.component.NodesDeploymentData +import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy.RestoreStateFromReplacedJobSavepoint import pl.touk.nussknacker.engine.api.deployment.ProcessStateDefinitionManager.ScenarioStatusWithScenarioContext -import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.deployment.scheduler.services.{EmptyListener, ProcessConfigEnricher} import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus.ProblemStateStatus import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessIdWithName, ProcessName, VersionId} -import pl.touk.nussknacker.engine.api.{MetaData, ProcessVersion, StreamMetaData} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.deployment.{DeploymentData, User} import pl.touk.nussknacker.test.PatientScalaFutures @@ -24,9 +24,9 @@ import pl.touk.nussknacker.test.utils.domain.TestFactory import pl.touk.nussknacker.test.utils.domain.TestFactory.newWriteProcessRepository import pl.touk.nussknacker.test.utils.scalas.DBIOActionValues import pl.touk.nussknacker.ui.process.deployment.{CommonCommandData, RunDeploymentCommand, TestDeploymentServiceFactory} +import pl.touk.nussknacker.ui.process.periodic._ import pl.touk.nussknacker.ui.process.periodic.PeriodicProcessService.PeriodicScenarioStatus import pl.touk.nussknacker.ui.process.periodic.PeriodicStateStatus.{ScheduledStatus, WaitingForScheduleStatus} -import pl.touk.nussknacker.ui.process.periodic._ import pl.touk.nussknacker.ui.process.periodic.cron.CronSchedulePropertyExtractor import pl.touk.nussknacker.ui.process.periodic.flink.db.InMemPeriodicProcessesRepository import pl.touk.nussknacker.ui.process.periodic.model.{PeriodicProcessDeploymentId, PeriodicProcessDeploymentStatus} @@ -52,9 +52,10 @@ class PeriodicDeploymentManagerTest private implicit val user: LoggedUser = TestFactory.adminUser("user") - import TestDeploymentServiceFactory._ import org.scalatest.LoneElement._ + import TestDeploymentServiceFactory._ + override protected def dbioRunner: DBIOActionRunner = DBIOActionRunner(testDbRef) private val writeProcessRepository = newWriteProcessRepository(testDbRef, clock) diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/PeriodicProcessDeploymentGen.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/PeriodicProcessDeploymentGen.scala index dc7ab3014bd..0a0666069ae 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/PeriodicProcessDeploymentGen.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/PeriodicProcessDeploymentGen.scala @@ -1,6 +1,12 @@ package pl.touk.nussknacker.ui.process.periodic.flink -import pl.touk.nussknacker.ui.process.periodic.model.{PeriodicProcessDeployment, PeriodicProcessDeploymentId, PeriodicProcessDeploymentState, PeriodicProcessDeploymentStatus, ScheduleName} +import pl.touk.nussknacker.ui.process.periodic.model.{ + PeriodicProcessDeployment, + PeriodicProcessDeploymentId, + PeriodicProcessDeploymentState, + PeriodicProcessDeploymentStatus, + ScheduleName +} import java.time.LocalDateTime diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/PeriodicProcessServiceTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/PeriodicProcessServiceTest.scala index 57b52135cfa..eb733076c92 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/PeriodicProcessServiceTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/PeriodicProcessServiceTest.scala @@ -8,24 +8,24 @@ import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks import pl.touk.nussknacker.engine.api.ProcessVersion +import pl.touk.nussknacker.engine.api.deployment.{DataFreshnessPolicy, ProcessActionId, ProcessingTypeActionServiceStub} import pl.touk.nussknacker.engine.api.deployment.scheduler.model.ScheduledDeploymentDetails -import pl.touk.nussknacker.engine.api.deployment.scheduler.services.ProcessConfigEnricher.EnrichedProcessConfig import pl.touk.nussknacker.engine.api.deployment.scheduler.services._ +import pl.touk.nussknacker.engine.api.deployment.scheduler.services.ProcessConfigEnricher.EnrichedProcessConfig import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus.ProblemStateStatus -import pl.touk.nussknacker.engine.api.deployment.{DataFreshnessPolicy, ProcessActionId, ProcessingTypeActionServiceStub} import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, VersionId} import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.test.PatientScalaFutures -import pl.touk.nussknacker.ui.process.periodic.PeriodicProcessService.PeriodicScenarioStatus import pl.touk.nussknacker.ui.process.periodic._ +import pl.touk.nussknacker.ui.process.periodic.PeriodicProcessService.PeriodicScenarioStatus import pl.touk.nussknacker.ui.process.periodic.flink.db.InMemPeriodicProcessesRepository import pl.touk.nussknacker.ui.process.periodic.flink.db.InMemPeriodicProcessesRepository.createPeriodicProcessDeployment import pl.touk.nussknacker.ui.process.periodic.model.PeriodicProcessDeploymentStatus import pl.touk.nussknacker.ui.process.periodic.model.PeriodicProcessDeploymentStatus.PeriodicProcessDeploymentStatus -import java.time.temporal.ChronoField import java.time.{Clock, LocalDate, LocalDateTime} +import java.time.temporal.ChronoField import java.util.UUID import scala.collection.mutable.ArrayBuffer import scala.concurrent.Future diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/PeriodicProcessStateDefinitionManagerTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/PeriodicProcessStateDefinitionManagerTest.scala index 30505f25cb1..e3aa46dfbc3 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/PeriodicProcessStateDefinitionManagerTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/PeriodicProcessStateDefinitionManagerTest.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.ui.process.periodic.flink import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import pl.touk.nussknacker.engine.api.deployment.ProcessStateDefinitionManager.ScenarioStatusWithScenarioContext import pl.touk.nussknacker.engine.api.deployment.{DeploymentStatusDetails, ScenarioActionName} +import pl.touk.nussknacker.engine.api.deployment.ProcessStateDefinitionManager.ScenarioStatusWithScenarioContext import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.process.VersionId import pl.touk.nussknacker.ui.process.periodic.PeriodicProcessService.PeriodicDeploymentStatus diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/RescheduleFinishedActorTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/RescheduleFinishedActorTest.scala index aa05869e6ec..2fd4b85fd9d 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/RescheduleFinishedActorTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/RescheduleFinishedActorTest.scala @@ -2,9 +2,9 @@ package pl.touk.nussknacker.ui.process.periodic.flink import akka.actor.ActorSystem import akka.testkit.{TestKit, TestKitBase, TestProbe} +import org.scalatest.BeforeAndAfterAll import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.BeforeAndAfterAll import pl.touk.nussknacker.ui.process.periodic.RescheduleFinishedActor import scala.concurrent.Future diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/UtilsSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/UtilsSpec.scala index ace8ffe0fc7..ad7d0db90e1 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/UtilsSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/UtilsSpec.scala @@ -9,8 +9,8 @@ import org.scalatest.wordspec.AnyWordSpecLike import pl.touk.nussknacker.ui.process.periodic.Utils import pl.touk.nussknacker.ui.process.periodic.Utils.createActorWithRetry -import scala.concurrent.duration.Duration import scala.concurrent.{Await, Future} +import scala.concurrent.duration.Duration class UtilsSpec extends TestKit(ActorSystem("UtilsSpec")) diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/db/InMemPeriodicProcessesRepository.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/db/InMemPeriodicProcessesRepository.scala index 9ed5d7d3bae..7c2cd607544 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/db/InMemPeriodicProcessesRepository.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/periodic/flink/db/InMemPeriodicProcessesRepository.scala @@ -9,12 +9,12 @@ import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.ui.process.periodic._ import pl.touk.nussknacker.ui.process.periodic.flink.db.InMemPeriodicProcessesRepository._ -import pl.touk.nussknacker.ui.process.periodic.model.PeriodicProcessDeploymentStatus.PeriodicProcessDeploymentStatus import pl.touk.nussknacker.ui.process.periodic.model._ +import pl.touk.nussknacker.ui.process.periodic.model.PeriodicProcessDeploymentStatus.PeriodicProcessDeploymentStatus import pl.touk.nussknacker.ui.process.repository.PeriodicProcessesRepository -import java.time.chrono.ChronoLocalDateTime import java.time.{LocalDateTime, ZoneId} +import java.time.chrono.ChronoLocalDateTime import java.util.concurrent.atomic.AtomicLong import scala.collection.mutable import scala.collection.mutable.ListBuffer diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/repository/DBFetchingProcessRepositorySpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/repository/DBFetchingProcessRepositorySpec.scala index 9348c015a01..5d5c1bb7159 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/repository/DBFetchingProcessRepositorySpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/process/repository/DBFetchingProcessRepositorySpec.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.ui.process.repository +import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, OptionValues} import org.scalatest.exceptions.TestFailedException import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, OptionValues} import pl.touk.nussknacker.engine.api.component.{ComponentId, ComponentType} import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessIdWithName, ProcessName, VersionId} @@ -14,8 +14,8 @@ import pl.touk.nussknacker.security.Permission import pl.touk.nussknacker.test.PatientScalaFutures import pl.touk.nussknacker.test.base.db.WithHsqlDbTesting import pl.touk.nussknacker.test.base.it.WithClock -import pl.touk.nussknacker.test.utils.domain.TestFactory.mapProcessingTypeDataProvider import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestFactory} +import pl.touk.nussknacker.test.utils.domain.TestFactory.mapProcessingTypeDataProvider import pl.touk.nussknacker.ui.api.description.scenarioActivity.Dtos.Legacy.Comment import pl.touk.nussknacker.ui.process.ScenarioQuery import pl.touk.nussknacker.ui.process.repository.ProcessDBQueryRepository.ProcessAlreadyExists diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/statistics/UsageStatisticsReportsSettingsServiceTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/statistics/UsageStatisticsReportsSettingsServiceTest.scala index 502c290d659..d796290da3f 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/statistics/UsageStatisticsReportsSettingsServiceTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/statistics/UsageStatisticsReportsSettingsServiceTest.scala @@ -8,10 +8,10 @@ import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks import org.scalatestplus.mockito.MockitoSugar +import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, Service} import pl.touk.nussknacker.engine.api.component.{DesignerWideComponentId, ProcessingMode} import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.process.VersionId -import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, Service} import pl.touk.nussknacker.engine.definition.component.ComponentDefinitionWithImplementation import pl.touk.nussknacker.engine.version.BuildInfo import pl.touk.nussknacker.test.PatientScalaFutures diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/util/ScenarioGraphComparatorSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/util/ScenarioGraphComparatorSpec.scala index 1f5e639a731..bedf21edbc1 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/util/ScenarioGraphComparatorSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/util/ScenarioGraphComparatorSpec.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.ui.util import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import pl.touk.nussknacker.engine.api.graph.{Edge, ProcessProperties, ScenarioGraph} import pl.touk.nussknacker.engine.api.{ProcessAdditionalFields, StreamMetaData} +import pl.touk.nussknacker.engine.api.graph.{Edge, ProcessProperties, ScenarioGraph} import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.graph.EdgeType.{FilterTrue, NextSwitch} diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/validation/UIProcessValidatorSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/validation/UIProcessValidatorSpec.scala index 2e5e9b4ec4c..697cd81842e 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/ui/validation/UIProcessValidatorSpec.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/ui/validation/UIProcessValidatorSpec.scala @@ -1,14 +1,15 @@ package pl.touk.nussknacker.ui.validation import cats.data.{Validated, ValidatedNel} -import com.typesafe.config.ConfigValueFactory.{fromAnyRef, fromIterable, fromMap} import com.typesafe.config.{Config, ConfigFactory} +import com.typesafe.config.ConfigValueFactory.{fromAnyRef, fromIterable, fromMap} import org.scalatest.Inside.inside import org.scalatest.OptionValues import org.scalatest.funsuite.AnyFunSuite -import org.scalatest.matchers.should.Matchers import org.scalatest.matchers.{BeMatcher, MatchResult} +import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks +import pl.touk.nussknacker.engine.CustomProcessValidator import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.component._ import pl.touk.nussknacker.engine.api.context.ProcessCompilationError @@ -26,16 +27,16 @@ import pl.touk.nussknacker.engine.api.process.{ ComponentUseCase, EmptyProcessConfigCreator, ExpressionConfig, + ProcessingType, ProcessName, ProcessObjectDependencies, - ProcessingType, WithCategories } import pl.touk.nussknacker.engine.api.test.InvocationCollectors.ServiceInvocationCollector import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.{Typed, Unknown} -import pl.touk.nussknacker.engine.build.GraphBuilder.fragmentOutput import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} +import pl.touk.nussknacker.engine.build.GraphBuilder.fragmentOutput import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.canonicalgraph.canonicalnode.{FlatNode, SplitNode} import pl.touk.nussknacker.engine.compile.ProcessValidator @@ -45,9 +46,10 @@ import pl.touk.nussknacker.engine.graph.EdgeType.{NextSwitch, SwitchDefault} import pl.touk.nussknacker.engine.graph.evaluatedparam.{Parameter => NodeParameter} import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.graph.expression.Expression.Language +import pl.touk.nussknacker.engine.graph.expression.Expression.Language.Spel import pl.touk.nussknacker.engine.graph.fragment.FragmentRef -import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.node._ +import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.service.ServiceRef import pl.touk.nussknacker.engine.graph.sink.SinkRef import pl.touk.nussknacker.engine.graph.source.SourceRef @@ -55,15 +57,9 @@ import pl.touk.nussknacker.engine.graph.variable.Field import pl.touk.nussknacker.engine.management.FlinkStreamingPropertiesConfig import pl.touk.nussknacker.engine.testing.{LocalModelData, ModelDefinitionBuilder} import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap -import pl.touk.nussknacker.engine.util.service.EagerServiceWithStaticParametersAndReturnType -import pl.touk.nussknacker.engine.CustomProcessValidator -import pl.touk.nussknacker.engine.graph.expression.Expression.Language.Spel import pl.touk.nussknacker.engine.util.functions.collection -import pl.touk.nussknacker.restmodel.validation.ValidationResults.NodeValidationErrorType.{ - RenderNotAllowed, - SaveAllowed, - SaveNotAllowed -} +import pl.touk.nussknacker.engine.util.service.EagerServiceWithStaticParametersAndReturnType +import pl.touk.nussknacker.restmodel.validation.{PrettyValidationErrors, ValidationResults} import pl.touk.nussknacker.restmodel.validation.ValidationResults.{ NodeValidationError, NodeValidationErrorType, @@ -72,7 +68,11 @@ import pl.touk.nussknacker.restmodel.validation.ValidationResults.{ ValidationResult, ValidationWarnings } -import pl.touk.nussknacker.restmodel.validation.{PrettyValidationErrors, ValidationResults} +import pl.touk.nussknacker.restmodel.validation.ValidationResults.NodeValidationErrorType.{ + RenderNotAllowed, + SaveAllowed, + SaveNotAllowed +} import pl.touk.nussknacker.test.config.ConfigWithScalaVersion import pl.touk.nussknacker.test.config.WithSimplifiedDesignerConfig.TestProcessingType.Streaming import pl.touk.nussknacker.test.mock.{ @@ -80,8 +80,8 @@ import pl.touk.nussknacker.test.mock.{ StubModelDataWithModelDefinition, TestAdditionalUIConfigProvider } -import pl.touk.nussknacker.test.utils.domain.ProcessTestData._ import pl.touk.nussknacker.test.utils.domain.{ProcessTestData, TestFactory} +import pl.touk.nussknacker.test.utils.domain.ProcessTestData._ import pl.touk.nussknacker.ui.config.ScenarioLabelConfig import pl.touk.nussknacker.ui.definition.ScenarioPropertiesConfigFinalizer import pl.touk.nussknacker.ui.process.fragment.FragmentResolver @@ -95,9 +95,10 @@ import scala.jdk.CollectionConverters._ class UIProcessValidatorSpec extends AnyFunSuite with Matchers with TableDrivenPropertyChecks with OptionValues { - import UIProcessValidatorSpec._ import pl.touk.nussknacker.engine.spel.SpelExtension._ + import UIProcessValidatorSpec._ + private val validationExpression = Expression.spel(s"#${ValidationExpressionParameterValidator.variableName}.length() < 7") diff --git a/engine/common/components-tests/src/test/scala/pl/touk/nussknacker/engine/common/components/DecisionTableSpec.scala b/engine/common/components-tests/src/test/scala/pl/touk/nussknacker/engine/common/components/DecisionTableSpec.scala index 71c3947f078..d4123e1469f 100644 --- a/engine/common/components-tests/src/test/scala/pl/touk/nussknacker/engine/common/components/DecisionTableSpec.scala +++ b/engine/common/components-tests/src/test/scala/pl/touk/nussknacker/engine/common/components/DecisionTableSpec.scala @@ -18,10 +18,10 @@ import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.flink.minicluster.FlinkMiniClusterFactory import pl.touk.nussknacker.engine.flink.util.test.FlinkTestScenarioRunner -import pl.touk.nussknacker.engine.lite.util.test.LiteTestScenarioRunner._ import pl.touk.nussknacker.engine.flink.util.test.FlinkTestScenarioRunner._ import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.lite.util.test.LiteTestScenarioRunner +import pl.touk.nussknacker.engine.lite.util.test.LiteTestScenarioRunner._ import pl.touk.nussknacker.engine.util.test.{RunListResult, TestScenarioRunner} import pl.touk.nussknacker.test.{ValidatedValuesDetailedMessage, VeryPatientScalaFutures} diff --git a/engine/development/deploymentManager/src/main/scala/pl/touk/nussknacker/development/manager/DevelopmentDeploymentManagerProvider.scala b/engine/development/deploymentManager/src/main/scala/pl/touk/nussknacker/development/manager/DevelopmentDeploymentManagerProvider.scala index 3bbf4769ec8..1cf31e364b5 100644 --- a/engine/development/deploymentManager/src/main/scala/pl/touk/nussknacker/development/manager/DevelopmentDeploymentManagerProvider.scala +++ b/engine/development/deploymentManager/src/main/scala/pl/touk/nussknacker/development/manager/DevelopmentDeploymentManagerProvider.scala @@ -20,17 +20,18 @@ import pl.touk.nussknacker.engine.management.FlinkStreamingPropertiesConfig import java.util.UUID import java.util.concurrent.TimeUnit import scala.collection.concurrent.TrieMap -import scala.concurrent.duration.{DurationInt, FiniteDuration} import scala.concurrent.{Future, Promise} +import scala.concurrent.duration.{DurationInt, FiniteDuration} import scala.util.{Failure, Success} class DevelopmentDeploymentManager(dependencies: DeploymentManagerDependencies, modelData: BaseModelData) extends DeploymentManager with LazyLogging { - import SimpleStateStatus._ import dependencies._ + import SimpleStateStatus._ + // Use these "magic" description values to simulate deployment/validation failure private val descriptionForValidationFail = "validateFail" private val descriptionForDeploymentFail = "deployFail" diff --git a/engine/development/deploymentManager/src/main/scala/pl/touk/nussknacker/development/manager/DevelopmentProcessStateDefinitionManager.scala b/engine/development/deploymentManager/src/main/scala/pl/touk/nussknacker/development/manager/DevelopmentProcessStateDefinitionManager.scala index 692a27adaea..3e09b3f8390 100644 --- a/engine/development/deploymentManager/src/main/scala/pl/touk/nussknacker/development/manager/DevelopmentProcessStateDefinitionManager.scala +++ b/engine/development/deploymentManager/src/main/scala/pl/touk/nussknacker/development/manager/DevelopmentProcessStateDefinitionManager.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.development.manager +import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.deployment.ProcessStateDefinitionManager.ScenarioStatusWithScenarioContext import pl.touk.nussknacker.engine.api.deployment.StateDefinitionDetails.UnknownIcon import pl.touk.nussknacker.engine.api.deployment.StateStatus.StatusName -import pl.touk.nussknacker.engine.api.deployment._ class DevelopmentProcessStateDefinitionManager(delegate: ProcessStateDefinitionManager) extends OverridingProcessStateDefinitionManager( diff --git a/engine/development/deploymentManager/src/main/scala/pl/touk/nussknacker/development/manager/MockableDeploymentManagerProvider.scala b/engine/development/deploymentManager/src/main/scala/pl/touk/nussknacker/development/manager/MockableDeploymentManagerProvider.scala index 6a0d0b8aff3..8a53f4f7ef1 100644 --- a/engine/development/deploymentManager/src/main/scala/pl/touk/nussknacker/development/manager/MockableDeploymentManagerProvider.scala +++ b/engine/development/deploymentManager/src/main/scala/pl/touk/nussknacker/development/manager/MockableDeploymentManagerProvider.scala @@ -22,8 +22,8 @@ import pl.touk.nussknacker.engine.testmode.TestProcess.TestResults import java.time.Instant import java.util.concurrent.atomic.AtomicReference -import scala.concurrent.duration.{DurationInt, FiniteDuration} import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.duration.{DurationInt, FiniteDuration} import scala.util.Try class MockableDeploymentManagerProvider extends DeploymentManagerProvider { diff --git a/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/NkGlobalParameters.scala b/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/NkGlobalParameters.scala index ce0658f659f..225689a60d3 100644 --- a/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/NkGlobalParameters.scala +++ b/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/NkGlobalParameters.scala @@ -1,5 +1,6 @@ package pl.touk.nussknacker.engine.flink.api +import _root_.java.util import com.typesafe.config.Config import com.typesafe.scalalogging.LazyLogging import io.circe.Encoder @@ -12,7 +13,6 @@ import pl.touk.nussknacker.engine.api.namespaces.NamingStrategy import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, VersionId} import pl.touk.nussknacker.engine.flink.api.NkGlobalParameters.NkGlobalParametersToMapEncoder -import _root_.java.util import scala.jdk.CollectionConverters._ //we can use this class to pass config through RuntimeContext to places where it would be difficult to use otherwise diff --git a/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/exception/ExceptionHandler.scala b/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/exception/ExceptionHandler.scala index 8726f60e9a3..63563221480 100644 --- a/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/exception/ExceptionHandler.scala +++ b/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/exception/ExceptionHandler.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.flink.api.exception -import pl.touk.nussknacker.engine.api.component.NodeComponentInfo import pl.touk.nussknacker.engine.api.{Context, Lifecycle} +import pl.touk.nussknacker.engine.api.component.NodeComponentInfo trait ExceptionHandler extends Lifecycle { diff --git a/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/process/FlinkCustomNodeContext.scala b/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/process/FlinkCustomNodeContext.scala index efe4e4cb281..b9d0c9105b4 100644 --- a/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/process/FlinkCustomNodeContext.scala +++ b/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/process/FlinkCustomNodeContext.scala @@ -2,12 +2,12 @@ package pl.touk.nussknacker.engine.flink.api.process import org.apache.flink.api.common.functions.RuntimeContext import org.apache.flink.api.common.typeinfo.TypeInformation +import pl.touk.nussknacker.engine.api.{Context, JobData, MetaData, ValueWithContext} import pl.touk.nussknacker.engine.api.component.NodesDeploymentData.NodeDeploymentData import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.process.ComponentUseCase import pl.touk.nussknacker.engine.api.runtimecontext.EngineRuntimeContext import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult, Unknown} -import pl.touk.nussknacker.engine.api.{Context, JobData, MetaData, ValueWithContext} import pl.touk.nussknacker.engine.flink.api.NkGlobalParameters import pl.touk.nussknacker.engine.flink.api.exception.ExceptionHandler import pl.touk.nussknacker.engine.flink.api.typeinformation.TypeInformationDetection diff --git a/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/process/FlinkCustomStreamTransformation.scala b/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/process/FlinkCustomStreamTransformation.scala index b233c96263e..e82ac3d52d7 100644 --- a/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/process/FlinkCustomStreamTransformation.scala +++ b/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/process/FlinkCustomStreamTransformation.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.engine.flink.api.process import org.apache.flink.streaming.api.datastream.DataStream -import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.api.typed.{ReturningType, typing} import pl.touk.nussknacker.engine.api.{Context, ValueWithContext} +import pl.touk.nussknacker.engine.api.typed.{typing, ReturningType} +import pl.touk.nussknacker.engine.api.typed.typing.TypingResult object FlinkCustomStreamTransformation { diff --git a/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/process/FlinkLazyParameterFunctionHelper.scala b/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/process/FlinkLazyParameterFunctionHelper.scala index de801f542c0..ee5f1ddd2c4 100644 --- a/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/process/FlinkLazyParameterFunctionHelper.scala +++ b/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/process/FlinkLazyParameterFunctionHelper.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.flink.api.process import org.apache.flink.api.common.functions._ import org.apache.flink.util.Collector -import pl.touk.nussknacker.engine.api.LazyParameter.Evaluate import pl.touk.nussknacker.engine.api._ +import pl.touk.nussknacker.engine.api.LazyParameter.Evaluate import pl.touk.nussknacker.engine.api.component.NodeComponentInfo import pl.touk.nussknacker.engine.flink.api.exception.ExceptionHandler diff --git a/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/process/FlinkSink.scala b/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/process/FlinkSink.scala index be42b9cfbad..7b719468359 100644 --- a/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/process/FlinkSink.scala +++ b/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/process/FlinkSink.scala @@ -4,9 +4,9 @@ import org.apache.flink.api.common.functions.FlatMapFunction import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.streaming.api.datastream.{DataStream, DataStreamSink} import org.apache.flink.streaming.api.functions.sink.SinkFunction +import pl.touk.nussknacker.engine.api.{Context, ValueWithContext} import pl.touk.nussknacker.engine.api.process.Sink import pl.touk.nussknacker.engine.api.typed.typing.{TypingResult, Unknown} -import pl.touk.nussknacker.engine.api.{Context, ValueWithContext} import pl.touk.nussknacker.engine.flink.api.compat.ExplicitUidInOperatorsSupport import pl.touk.nussknacker.engine.flink.api.typeinformation.TypeInformationDetection diff --git a/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/typeinformation/TypeInformationDetection.scala b/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/typeinformation/TypeInformationDetection.scala index 34bfbee9e3b..3bdeef9f980 100644 --- a/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/typeinformation/TypeInformationDetection.scala +++ b/engine/flink/components-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/typeinformation/TypeInformationDetection.scala @@ -1,16 +1,16 @@ package pl.touk.nussknacker.engine.flink.api.typeinformation import org.apache.flink.api.common.typeinfo.{TypeInformation, Types} +import pl.touk.nussknacker.engine.api.{Context, ValueWithContext} import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.generics.GenericType import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult} -import pl.touk.nussknacker.engine.api.{Context, ValueWithContext} import pl.touk.nussknacker.engine.util.Implicits.RichStringList import java.net.URLClassLoader import java.util.ServiceLoader import scala.jdk.CollectionConverters._ -import scala.reflect.{ClassTag, classTag} +import scala.reflect.{classTag, ClassTag} /** * This is trait that allows for providing more details TypeInformation when ValidationContext is known, diff --git a/engine/flink/components-api/src/test/scala/pl/touk/nussknacker/engine/flink/api/typeinformation/FlinkTypeInfoRegistrarTest.scala b/engine/flink/components-api/src/test/scala/pl/touk/nussknacker/engine/flink/api/typeinformation/FlinkTypeInfoRegistrarTest.scala index 6514ba0c21d..6a9620e7306 100644 --- a/engine/flink/components-api/src/test/scala/pl/touk/nussknacker/engine/flink/api/typeinformation/FlinkTypeInfoRegistrarTest.scala +++ b/engine/flink/components-api/src/test/scala/pl/touk/nussknacker/engine/flink/api/typeinformation/FlinkTypeInfoRegistrarTest.scala @@ -5,8 +5,8 @@ import org.apache.flink.api.java.typeutils.GenericTypeInfo import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import java.time.{Instant, LocalDate, LocalDateTime, LocalTime} import java.sql.{Date, Time, Timestamp} +import java.time.{Instant, LocalDate, LocalDateTime, LocalTime} class FlinkTypeInfoRegistrarTest extends AnyFunSuite with Matchers { diff --git a/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/typeinformation/ConcreteCaseClassTypeInfo.scala b/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/typeinformation/ConcreteCaseClassTypeInfo.scala index dc654c6a84f..8a071294a55 100644 --- a/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/typeinformation/ConcreteCaseClassTypeInfo.scala +++ b/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/typeinformation/ConcreteCaseClassTypeInfo.scala @@ -6,7 +6,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.common.typeutils.TypeSerializer import pl.touk.nussknacker.engine.flink.api.typeinfo.caseclass.{CaseClassTypeInfo, ScalaCaseClassSerializer} -import scala.reflect.{ClassTag, classTag} +import scala.reflect.{classTag, ClassTag} class ConcreteCaseClassTypeInfo[T <: Product](cls: Class[T], fields: List[(String, TypeInformation[_])]) extends CaseClassTypeInfo[T](cls, Array.empty, fields.map(_._2), fields.map(_._1)) { diff --git a/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/typeinformation/FixedValueTypeInformationHelper.scala b/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/typeinformation/FixedValueTypeInformationHelper.scala index d169d2844a5..e9cc2270592 100644 --- a/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/typeinformation/FixedValueTypeInformationHelper.scala +++ b/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/typeinformation/FixedValueTypeInformationHelper.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.flink.typeinformation import org.apache.flink.api.common.typeinfo.BasicTypeInfo -import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton import org.apache.flink.api.common.typeutils.{SimpleTypeSerializerSnapshot, TypeSerializer, TypeSerializerSnapshot} +import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton import org.apache.flink.core.memory.{DataInputView, DataOutputView} import java.util.function.Supplier diff --git a/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/util/keyed.scala b/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/util/keyed.scala index 32adff7dd60..cc2f8031b78 100644 --- a/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/util/keyed.scala +++ b/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/util/keyed.scala @@ -4,9 +4,9 @@ import cats.data.ValidatedNel import org.apache.flink.api.common.functions.RichFlatMapFunction import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.util.Collector +import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext} import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.flink.api.process.{ FlinkCustomNodeContext, FlinkLazyParameterFunctionHelper, diff --git a/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/util/richflink.scala b/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/util/richflink.scala index 64d2b0da5f7..d232b02c219 100644 --- a/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/util/richflink.scala +++ b/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/util/richflink.scala @@ -4,7 +4,7 @@ import org.apache.flink.streaming.api.datastream.{DataStream, KeyedStream, Singl import pl.touk.nussknacker.engine.api.{Context, LazyParameter, ValueWithContext} import pl.touk.nussknacker.engine.flink.api.compat.ExplicitUidInOperatorsSupport import pl.touk.nussknacker.engine.flink.api.process.FlinkCustomNodeContext -import pl.touk.nussknacker.engine.flink.util.keyed.{StringKeyOnlyMapper, StringKeyedValueMapper} +import pl.touk.nussknacker.engine.flink.util.keyed.{StringKeyedValueMapper, StringKeyOnlyMapper} import pl.touk.nussknacker.engine.util.KeyedValue import scala.reflect.runtime.universe.TypeTag diff --git a/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/util/sink/SingleValueSinkFactory.scala b/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/util/sink/SingleValueSinkFactory.scala index 70bf24ca041..3450bdb7c8a 100644 --- a/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/util/sink/SingleValueSinkFactory.scala +++ b/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/util/sink/SingleValueSinkFactory.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.flink.util.sink import org.apache.flink.api.common.functions.FlatMapFunction import org.apache.flink.streaming.api.functions.sink.SinkFunction -import pl.touk.nussknacker.engine.api.process.SinkFactory import pl.touk.nussknacker.engine.api._ +import pl.touk.nussknacker.engine.api.process.SinkFactory import pl.touk.nussknacker.engine.flink.api.process.{ BasicFlinkSink, FlinkCustomNodeContext, diff --git a/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/util/source/ReturningClassInstanceSource.scala b/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/util/source/ReturningClassInstanceSource.scala index a6fc3dbb22a..56eb25bc76a 100644 --- a/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/util/source/ReturningClassInstanceSource.scala +++ b/engine/flink/components-utils/src/main/scala/pl/touk/nussknacker/engine/flink/util/source/ReturningClassInstanceSource.scala @@ -1,10 +1,10 @@ package pl.touk.nussknacker.engine.flink.util.source +import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName} import pl.touk.nussknacker.engine.api.component.UnboundedStreamComponent import pl.touk.nussknacker.engine.api.editor.{DualEditor, DualEditorMode, SimpleEditor, SimpleEditorType} import pl.touk.nussknacker.engine.api.process.SourceFactory import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName} class ReturningClassInstanceSource extends SourceFactory with UnboundedStreamComponent { diff --git a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/SpelTemplateLazyParameterTest.scala b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/SpelTemplateLazyParameterTest.scala index 85d35bd3c7c..62257a4e6f1 100644 --- a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/SpelTemplateLazyParameterTest.scala +++ b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/SpelTemplateLazyParameterTest.scala @@ -8,8 +8,8 @@ import org.apache.flink.util.Collector import org.scalatest.BeforeAndAfterAll import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import pl.touk.nussknacker.engine.api.TemplateRenderedPart.{RenderedLiteral, RenderedSubExpression} import pl.touk.nussknacker.engine.api._ +import pl.touk.nussknacker.engine.api.TemplateRenderedPart.{RenderedLiteral, RenderedSubExpression} import pl.touk.nussknacker.engine.api.component.{BoundedStreamComponent, ComponentDefinition} import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.context.transformation.{ diff --git a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/table/aggregate/TableAggregationTest.scala b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/table/aggregate/TableAggregationTest.scala index e2d84eb3530..25c6ac9b2f4 100644 --- a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/table/aggregate/TableAggregationTest.scala +++ b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/table/aggregate/TableAggregationTest.scala @@ -2,11 +2,11 @@ package pl.touk.nussknacker.engine.flink.table.aggregate import com.typesafe.config.ConfigFactory import org.apache.flink.api.connector.source.Boundedness +import org.scalatest.{BeforeAndAfterAll, Inside} import org.scalatest.LoneElement._ import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks -import org.scalatest.{BeforeAndAfterAll, Inside} import pl.touk.nussknacker.engine.api.component.ComponentDefinition import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError import pl.touk.nussknacker.engine.api.parameter.ParameterName @@ -16,9 +16,9 @@ import pl.touk.nussknacker.engine.flink.minicluster.FlinkMiniClusterFactory import pl.touk.nussknacker.engine.flink.table.FlinkTableComponentProvider import pl.touk.nussknacker.engine.flink.table.SpelValues._ import pl.touk.nussknacker.engine.flink.table.aggregate.TableAggregationTest.{ + buildMultipleAggregationsScenario, AggregationParameters, - TestRecord, - buildMultipleAggregationsScenario + TestRecord } import pl.touk.nussknacker.engine.flink.util.test.FlinkTestScenarioRunner._ import pl.touk.nussknacker.engine.graph.expression.Expression diff --git a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/table/join/TableJoinTest.scala b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/table/join/TableJoinTest.scala index 7ecd19768c0..6b4ddb63852 100644 --- a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/table/join/TableJoinTest.scala +++ b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/table/join/TableJoinTest.scala @@ -3,9 +3,9 @@ package pl.touk.nussknacker.engine.flink.table.join import com.typesafe.config.ConfigFactory import org.apache.flink.api.connector.source.Boundedness import org.apache.flink.types.Row +import org.scalatest.{BeforeAndAfterAll, Inside, LoneElement} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{BeforeAndAfterAll, Inside, LoneElement} import pl.touk.nussknacker.engine.api.component.ComponentDefinition import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError import pl.touk.nussknacker.engine.api.parameter.ParameterName diff --git a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/ForEachTransformerSpec.scala b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/ForEachTransformerSpec.scala index 0e49f84d033..f38f124deb8 100644 --- a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/ForEachTransformerSpec.scala +++ b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/ForEachTransformerSpec.scala @@ -5,10 +5,10 @@ import org.apache.flink.api.common.typeinfo.TypeInfo import org.scalatest.Inside import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.{JobData, ProcessVersion} import pl.touk.nussknacker.engine.api.component.ComponentDefinition import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{JobData, ProcessVersion} import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.compile.ProcessValidator diff --git a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/UnionTransformerSpec.scala b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/UnionTransformerSpec.scala index 5dc2dcb9a50..2b5114b817d 100644 --- a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/UnionTransformerSpec.scala +++ b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/UnionTransformerSpec.scala @@ -19,10 +19,11 @@ class UnionTransformerSpec with LazyLogging with VeryPatientScalaFutures { - import ValidatedValuesDetailedMessage._ import pl.touk.nussknacker.engine.flink.util.test.FlinkTestScenarioRunner._ import pl.touk.nussknacker.engine.spel.SpelExtension._ + import ValidatedValuesDetailedMessage._ + private val BranchFooId = "foo" private val BranchBarId = "bar" diff --git a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/UnionWithMemoTransformerSpec.scala b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/UnionWithMemoTransformerSpec.scala index 2e99f414b80..7cf40da0864 100644 --- a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/UnionWithMemoTransformerSpec.scala +++ b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/UnionWithMemoTransformerSpec.scala @@ -5,10 +5,10 @@ import cats.data.Validated.Invalid import com.typesafe.config.ConfigFactory import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.{JobData, ProcessVersion} import pl.touk.nussknacker.engine.api.component.ComponentDefinition import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError import pl.touk.nussknacker.engine.api.process.SourceFactory -import pl.touk.nussknacker.engine.api.{JobData, ProcessVersion} import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.compile.ProcessValidator @@ -22,15 +22,16 @@ import pl.touk.nussknacker.engine.testing.LocalModelData import pl.touk.nussknacker.engine.testmode.{ResultsCollectingListener, ResultsCollectingListenerHolder} import pl.touk.nussknacker.test.VeryPatientScalaFutures -import java.time.Duration import java.{util => jul} +import java.time.Duration import scala.jdk.CollectionConverters._ class UnionWithMemoTransformerSpec extends AnyFunSuite with FlinkSpec with Matchers with VeryPatientScalaFutures { - import UnionWithMemoTransformerSpec._ import pl.touk.nussknacker.engine.spel.SpelExtension._ + import UnionWithMemoTransformerSpec._ + private val UnionNodeId = "joined-node-id" private val EndNodeId = "end-node-id" diff --git a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/AggregatesSpec.scala b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/AggregatesSpec.scala index d875ce51b21..1a4af47e498 100644 --- a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/AggregatesSpec.scala +++ b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/AggregatesSpec.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.flink.util.transformer.aggregate -import org.scalatest.prop.TableDrivenPropertyChecks import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import org.scalatest.prop.TableDrivenPropertyChecks import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypedClass, TypedObjectTypingResult, TypingResult, Unknown} import pl.touk.nussknacker.engine.flink.util.transformer.aggregate.AggregatesSpec.{EPS_BIG_DECIMAL, EPS_DOUBLE} import pl.touk.nussknacker.engine.flink.util.transformer.aggregate.aggregates.{ diff --git a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/FullOuterJoinTransformerSpec.scala b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/FullOuterJoinTransformerSpec.scala index e2d2c17ca50..4ce91820e0c 100644 --- a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/FullOuterJoinTransformerSpec.scala +++ b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/FullOuterJoinTransformerSpec.scala @@ -36,9 +36,10 @@ import scala.jdk.CollectionConverters._ class FullOuterJoinTransformerSpec extends AnyFunSuite with FlinkSpec with Matchers with VeryPatientScalaFutures { - import FullOuterJoinTransformerSpec._ import pl.touk.nussknacker.engine.spel.SpelExtension._ + import FullOuterJoinTransformerSpec._ + private val JoinNodeId = "joined-node-id" private val EndNodeId = "end-node-id" diff --git a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/ModelUtilExceptionHandlingSpec.scala b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/ModelUtilExceptionHandlingSpec.scala index e79cdc94cab..352991e3264 100644 --- a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/ModelUtilExceptionHandlingSpec.scala +++ b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/ModelUtilExceptionHandlingSpec.scala @@ -11,8 +11,8 @@ import pl.touk.nussknacker.engine.api.exception.NuExceptionInfo import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.flink.FlinkBaseUnboundedComponentProvider -import pl.touk.nussknacker.engine.flink.test.ScalatestMiniClusterJobStatusCheckingOps.miniClusterWithServicesToOps import pl.touk.nussknacker.engine.flink.test._ +import pl.touk.nussknacker.engine.flink.test.ScalatestMiniClusterJobStatusCheckingOps.miniClusterWithServicesToOps import pl.touk.nussknacker.engine.flink.util.transformer.FlinkBaseComponentProvider import pl.touk.nussknacker.engine.flink.util.transformer.join.BranchType import pl.touk.nussknacker.engine.process.runner.FlinkScenarioUnitTestJob diff --git a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/SingleSideJoinTransformerSpec.scala b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/SingleSideJoinTransformerSpec.scala index e441b5e73bc..e4f65b723cb 100644 --- a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/SingleSideJoinTransformerSpec.scala +++ b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/SingleSideJoinTransformerSpec.scala @@ -37,9 +37,10 @@ import scala.util.Using class SingleSideJoinTransformerSpec extends AnyFunSuite with FlinkSpec with Matchers with VeryPatientScalaFutures { - import SingleSideJoinTransformerSpec._ import pl.touk.nussknacker.engine.spel.SpelExtension._ + import SingleSideJoinTransformerSpec._ + private val MainBranchId = "main" private val JoinedBranchId = "joined" diff --git a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/TransformersTest.scala b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/TransformersTest.scala index 567b6535597..cb93d162386 100644 --- a/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/TransformersTest.scala +++ b/engine/flink/components/base-tests/src/test/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/TransformersTest.scala @@ -8,6 +8,7 @@ import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks.forAll import org.scalatest.prop.Tables.Table +import pl.touk.nussknacker.engine.api.{FragmentSpecificData, JobData, MetaData, ProcessVersion, VariableConstants} import pl.touk.nussknacker.engine.api.component.ComponentDefinition import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.{ CannotCreateObjectError, @@ -16,9 +17,8 @@ import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.{ import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult} -import pl.touk.nussknacker.engine.api.{FragmentSpecificData, JobData, MetaData, ProcessVersion, VariableConstants} import pl.touk.nussknacker.engine.build.ScenarioBuilder -import pl.touk.nussknacker.engine.canonicalgraph.{CanonicalProcess, canonicalnode} +import pl.touk.nussknacker.engine.canonicalgraph.{canonicalnode, CanonicalProcess} import pl.touk.nussknacker.engine.compile.{CompilationResult, FragmentResolver, ProcessValidator} import pl.touk.nussknacker.engine.definition.component.parameter.editor.ParameterTypeEditorDeterminer import pl.touk.nussknacker.engine.flink.FlinkBaseUnboundedComponentProvider @@ -28,8 +28,8 @@ import pl.touk.nussknacker.engine.flink.util.source.EmitWatermarkAfterEachElemen import pl.touk.nussknacker.engine.flink.util.transformer.FlinkBaseComponentProvider import pl.touk.nussknacker.engine.graph.evaluatedparam.{Parameter => NodeParameter} import pl.touk.nussknacker.engine.graph.expression.Expression -import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.node.{CustomNode, FragmentInputDefinition, FragmentOutputDefinition} +import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.variable.Field import pl.touk.nussknacker.engine.process.helpers.ConfigCreatorWithCollectingListener import pl.touk.nussknacker.engine.process.runner.FlinkScenarioUnitTestJob diff --git a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/FlinkBaseUnboundedComponentProvider.scala b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/FlinkBaseUnboundedComponentProvider.scala index f38e702fe0f..47021681340 100644 --- a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/FlinkBaseUnboundedComponentProvider.scala +++ b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/FlinkBaseUnboundedComponentProvider.scala @@ -3,6 +3,7 @@ package pl.touk.nussknacker.engine.flink import com.typesafe.config.Config import pl.touk.nussknacker.engine.api.component.{ComponentDefinition, ComponentProvider, NussknackerVersion} import pl.touk.nussknacker.engine.api.process.ProcessObjectDependencies +import pl.touk.nussknacker.engine.flink.util.transformer.{EventGeneratorSourceFactory, UnionWithMemoTransformer} import pl.touk.nussknacker.engine.flink.util.transformer.aggregate.AggregateWindowsConfig import pl.touk.nussknacker.engine.flink.util.transformer.aggregate.sampleTransformers.{ SessionWindowAggregateTransformer, @@ -10,7 +11,6 @@ import pl.touk.nussknacker.engine.flink.util.transformer.aggregate.sampleTransfo TumblingAggregateTransformer } import pl.touk.nussknacker.engine.flink.util.transformer.join.{FullOuterJoinTransformer, SingleSideJoinTransformer} -import pl.touk.nussknacker.engine.flink.util.transformer.{EventGeneratorSourceFactory, UnionWithMemoTransformer} import pl.touk.nussknacker.engine.util.config.DocsConfig class FlinkBaseUnboundedComponentProvider extends ComponentProvider { diff --git a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/EventGeneratorSourceFactory.scala b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/EventGeneratorSourceFactory.scala index 220dd029c8c..57f03e740ed 100644 --- a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/EventGeneratorSourceFactory.scala +++ b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/EventGeneratorSourceFactory.scala @@ -10,7 +10,7 @@ import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.component.UnboundedStreamComponent import pl.touk.nussknacker.engine.api.editor.{DualEditor, DualEditorMode, SimpleEditor, SimpleEditorType} import pl.touk.nussknacker.engine.api.process.{Source, SourceFactory} -import pl.touk.nussknacker.engine.api.typed.{ReturningType, typing} +import pl.touk.nussknacker.engine.api.typed.{typing, ReturningType} import pl.touk.nussknacker.engine.flink.api.process.{ CustomizableTimestampWatermarkHandlerSource, FlinkCustomNodeContext, @@ -23,9 +23,9 @@ import pl.touk.nussknacker.engine.flink.api.timestampwatermark.{ import pl.touk.nussknacker.engine.flink.api.typeinformation.TypeInformationDetection import pl.touk.nussknacker.engine.util.TimestampUtils.supportedTypeToMillis +import java.{util => jul} import java.time.Duration import java.time.temporal.ChronoUnit -import java.{util => jul} import javax.annotation.Nullable import javax.validation.constraints.Min import scala.jdk.CollectionConverters._ diff --git a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/UnionWithMemoTransformer.scala b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/UnionWithMemoTransformer.scala index 66f66ca0a86..da98aa632b9 100644 --- a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/UnionWithMemoTransformer.scala +++ b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/UnionWithMemoTransformer.scala @@ -7,6 +7,7 @@ import org.apache.flink.streaming.api.datastream.{DataStream, SingleOutputStream import org.apache.flink.streaming.api.functions.KeyedProcessFunction import org.apache.flink.streaming.runtime.operators.windowing.TimestampedValue import org.apache.flink.util.Collector +import pl.touk.nussknacker.engine.api.{NodeId, _} import pl.touk.nussknacker.engine.api.component.UnboundedStreamComponent import pl.touk.nussknacker.engine.api.context.{ ContextTransformation, @@ -15,7 +16,6 @@ import pl.touk.nussknacker.engine.api.context.{ ValidationContext } import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{NodeId, _} import pl.touk.nussknacker.engine.flink.api.compat.ExplicitUidInOperatorsSupport import pl.touk.nussknacker.engine.flink.api.datastream.DataStreamImplicits.DataStreamExtension import pl.touk.nussknacker.engine.flink.api.process.{FlinkCustomJoinTransformation, FlinkCustomNodeContext} diff --git a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/Aggregator.scala b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/Aggregator.scala index de33b410b02..6a40cfc2fe2 100644 --- a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/Aggregator.scala +++ b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/Aggregator.scala @@ -2,10 +2,10 @@ package pl.touk.nussknacker.engine.flink.util.transformer.aggregate import cats.data.{NonEmptyList, Validated, ValidatedNel} import org.apache.flink.api.common.functions.AggregateFunction -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CannotCreateObjectError +import pl.touk.nussknacker.engine.api.{Hidden, LazyParameter, NodeId} import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext} +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CannotCreateObjectError import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.api.{Hidden, LazyParameter, NodeId} import pl.touk.nussknacker.engine.flink.util.keyed.KeyEnricher /* diff --git a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/AggregatorFunction.scala b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/AggregatorFunction.scala index fb9adef8fc6..b9a280a2927 100644 --- a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/AggregatorFunction.scala +++ b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/AggregatorFunction.scala @@ -7,16 +7,16 @@ import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.streaming.api.TimerService import org.apache.flink.streaming.api.functions.KeyedProcessFunction import org.apache.flink.util.Collector +import pl.touk.nussknacker.engine.api.{Context => NkContext, NodeId, ValueWithContext} import pl.touk.nussknacker.engine.api.runtimecontext.EngineRuntimeContext import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.api.{Context => NkContext, NodeId, ValueWithContext} import pl.touk.nussknacker.engine.flink.api.state.{LatelyEvictableStateFunction, StateHolder} import pl.touk.nussknacker.engine.flink.util.keyed.{KeyEnricher, StringKeyedValue} import pl.touk.nussknacker.engine.flink.util.orderedmap.FlinkRangeMap import pl.touk.nussknacker.engine.flink.util.orderedmap.FlinkRangeMap._ import pl.touk.nussknacker.engine.util -import pl.touk.nussknacker.engine.util.metrics.common.naming.nodeIdTag import pl.touk.nussknacker.engine.util.metrics.{MetricIdentifier, MetricsProviderForScenario} +import pl.touk.nussknacker.engine.util.metrics.common.naming.nodeIdTag import scala.language.higherKinds diff --git a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/CardinalityAggregator.scala b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/CardinalityAggregator.scala index 4453dc65ad8..873173e112f 100644 --- a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/CardinalityAggregator.scala +++ b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/CardinalityAggregator.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.engine.flink.util.transformer.aggregate import cats.data.Validated import cats.data.Validated.Valid import com.clearspring.analytics.stream.cardinality.{HyperLogLogPlus, ICardinality} -import com.esotericsoftware.kryo.io.{Input, Output} import com.esotericsoftware.kryo.{Kryo, KryoSerializable} +import com.esotericsoftware.kryo.io.{Input, Output} import org.apache.flink.core.memory.{DataInputView, DataOutputView} import org.apache.flink.types.Value import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult} diff --git a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/EmitExtraWindowWhenNoDataTumblingAggregatorFunction.scala b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/EmitExtraWindowWhenNoDataTumblingAggregatorFunction.scala index dc5fcaf0c2d..74d26bebd3a 100644 --- a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/EmitExtraWindowWhenNoDataTumblingAggregatorFunction.scala +++ b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/EmitExtraWindowWhenNoDataTumblingAggregatorFunction.scala @@ -6,9 +6,9 @@ import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.streaming.api.TimerService import org.apache.flink.streaming.api.functions.KeyedProcessFunction import org.apache.flink.util.Collector +import pl.touk.nussknacker.engine.api.{Context => NkContext, NodeId, ValueWithContext} import pl.touk.nussknacker.engine.api.runtimecontext.{ContextIdGenerator, EngineRuntimeContext} import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.api.{Context => NkContext, NodeId, ValueWithContext} import pl.touk.nussknacker.engine.flink.api.state.StateHolder import pl.touk.nussknacker.engine.flink.util.keyed.{KeyEnricher, StringKeyedValue} import pl.touk.nussknacker.engine.flink.util.orderedmap.FlinkRangeMap diff --git a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/EmitWhenEventLeftAggregatorFunction.scala b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/EmitWhenEventLeftAggregatorFunction.scala index d7605bfb92e..553434137b4 100644 --- a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/EmitWhenEventLeftAggregatorFunction.scala +++ b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/EmitWhenEventLeftAggregatorFunction.scala @@ -5,9 +5,9 @@ import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.streaming.api.TimerService import org.apache.flink.streaming.api.functions.KeyedProcessFunction import org.apache.flink.util.Collector +import pl.touk.nussknacker.engine.api.{Context => NkContext, NodeId, ValueWithContext} import pl.touk.nussknacker.engine.api.runtimecontext.{ContextIdGenerator, EngineRuntimeContext} import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.api.{Context => NkContext, NodeId, ValueWithContext} import pl.touk.nussknacker.engine.flink.api.state.LatelyEvictableStateFunction import pl.touk.nussknacker.engine.flink.util.keyed.{KeyEnricher, StringKeyedValue} import pl.touk.nussknacker.engine.flink.util.orderedmap.FlinkRangeMap diff --git a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/EnrichingWithKeyFunction.scala b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/EnrichingWithKeyFunction.scala index 97824a1ccef..54d9c82c1b4 100644 --- a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/EnrichingWithKeyFunction.scala +++ b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/EnrichingWithKeyFunction.scala @@ -4,8 +4,8 @@ import org.apache.flink.api.common.functions.{OpenContext, RuntimeContext} import org.apache.flink.streaming.api.functions.windowing.ProcessWindowFunction import org.apache.flink.streaming.api.windowing.windows.TimeWindow import org.apache.flink.util.Collector -import pl.touk.nussknacker.engine.api.runtimecontext.{ContextIdGenerator, EngineRuntimeContext} import pl.touk.nussknacker.engine.api.{Context => NkContext, ValueWithContext} +import pl.touk.nussknacker.engine.api.runtimecontext.{ContextIdGenerator, EngineRuntimeContext} import pl.touk.nussknacker.engine.flink.api.process.FlinkCustomNodeContext import pl.touk.nussknacker.engine.flink.util.keyed.KeyEnricher diff --git a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/OnEventTriggerWindowOperator.scala b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/OnEventTriggerWindowOperator.scala index 1ca336bcdff..afbf12e31b1 100644 --- a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/OnEventTriggerWindowOperator.scala +++ b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/OnEventTriggerWindowOperator.scala @@ -18,9 +18,9 @@ import pl.touk.nussknacker.engine.api.runtimecontext.{ContextIdGenerator, Engine import pl.touk.nussknacker.engine.flink.api.process.FlinkCustomNodeContext import pl.touk.nussknacker.engine.flink.util.keyed.{KeyEnricher, StringKeyedValue} import pl.touk.nussknacker.engine.flink.util.transformer.aggregate.OnEventTriggerWindowOperator.{ - Input, elementHolder, - stateDescriptorName + stateDescriptorName, + Input } import pl.touk.nussknacker.engine.flink.util.transformer.aggregate.transformers.AggregatorTypeInformations import pl.touk.nussknacker.engine.flink.util.transformer.aggregate.triggers.FireOnEachEvent diff --git a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/aggregates.scala b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/aggregates.scala index 7fe0b0122f6..159acadc1f5 100644 --- a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/aggregates.scala +++ b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/aggregates.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.engine.flink.util.transformer.aggregate -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, Validated} +import cats.data.Validated.{Invalid, Valid} import cats.instances.list._ import org.apache.flink.api.common.typeinfo.TypeInfo +import pl.touk.nussknacker.engine.api.typed.{typing, NumberTypeUtils} import pl.touk.nussknacker.engine.api.typed.supertype.NumberTypesPromotionStrategy import pl.touk.nussknacker.engine.api.typed.supertype.NumberTypesPromotionStrategy.ForLargeFloatingNumbersOperation import pl.touk.nussknacker.engine.api.typed.typing._ -import pl.touk.nussknacker.engine.api.typed.{NumberTypeUtils, typing} import pl.touk.nussknacker.engine.flink.api.typeinfo.caseclass.CaseClassTypeInfoFactory import pl.touk.nussknacker.engine.flink.util.transformer.aggregate.median.MedianHelper import pl.touk.nussknacker.engine.util.Implicits._ diff --git a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/transformers.scala b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/transformers.scala index 84ea9e8b90e..8f9299abd45 100644 --- a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/transformers.scala +++ b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/transformers.scala @@ -8,8 +8,8 @@ import org.apache.flink.streaming.api.windowing.assigners.{EventTimeSessionWindo import org.apache.flink.streaming.api.windowing.time.Time import org.apache.flink.streaming.api.windowing.triggers.EventTimeTrigger import org.apache.flink.streaming.api.windowing.windows.TimeWindow -import pl.touk.nussknacker.engine.api.context.ContextTransformation import pl.touk.nussknacker.engine.api.{Context => NkContext, NodeId, _} +import pl.touk.nussknacker.engine.api.context.ContextTransformation import pl.touk.nussknacker.engine.flink.api.compat.ExplicitUidInOperatorsSupport import pl.touk.nussknacker.engine.flink.api.process._ import pl.touk.nussknacker.engine.flink.api.typeinformation.TypeInformationDetection diff --git a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/join/FullOuterJoinTransformer.scala b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/join/FullOuterJoinTransformer.scala index 57908938873..0ad6bd78104 100644 --- a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/join/FullOuterJoinTransformer.scala +++ b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/join/FullOuterJoinTransformer.scala @@ -11,14 +11,14 @@ import org.apache.flink.streaming.api.functions.KeyedProcessFunction import org.apache.flink.streaming.runtime.operators.windowing.TimestampedValue import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.component.UnboundedStreamComponent -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError -import pl.touk.nussknacker.engine.api.context.transformation._ import pl.touk.nussknacker.engine.api.context.{ ContextTransformation, OutputVar, ProcessCompilationError, ValidationContext } +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError +import pl.touk.nussknacker.engine.api.context.transformation._ import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.runtimecontext.EngineRuntimeContext @@ -34,8 +34,9 @@ import pl.touk.nussknacker.engine.flink.typeinformation.KeyedValueType import pl.touk.nussknacker.engine.flink.util.keyed.{StringKeyedValue, StringKeyedValueMapper} import pl.touk.nussknacker.engine.flink.util.richflink._ import pl.touk.nussknacker.engine.flink.util.timestamp.TimestampAssignmentHelper -import pl.touk.nussknacker.engine.flink.util.transformer.aggregate.aggregates.{MapAggregator, OptionAggregator} import pl.touk.nussknacker.engine.flink.util.transformer.aggregate.{AggregateHelper, Aggregator} +import pl.touk.nussknacker.engine.flink.util.transformer.aggregate.aggregates.{MapAggregator, OptionAggregator} +import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap import pl.touk.nussknacker.engine.util.KeyedValue import java.time.Duration @@ -43,7 +44,6 @@ import java.util.concurrent.TimeUnit import scala.collection.immutable.SortedMap import scala.concurrent.duration.FiniteDuration import scala.jdk.CollectionConverters._ -import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap class FullOuterJoinTransformer( timestampAssigner: Option[TimestampWatermarkHandler[TimestampedValue[ValueWithContext[AnyRef]]]] diff --git a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/join/SingleSideJoinAggregatorFunction.scala b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/join/SingleSideJoinAggregatorFunction.scala index 7b64b0e6ab0..96771c36ea8 100644 --- a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/join/SingleSideJoinAggregatorFunction.scala +++ b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/join/SingleSideJoinAggregatorFunction.scala @@ -5,13 +5,13 @@ import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.streaming.api.functions.co.CoProcessFunction import org.apache.flink.util.Collector import pl.touk.nussknacker.engine.api._ +import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.runtimecontext.EngineRuntimeContext import pl.touk.nussknacker.engine.api.typed.typing.TypingResult import pl.touk.nussknacker.engine.flink.api.state.LatelyEvictableStateCoFunction import pl.touk.nussknacker.engine.flink.util.keyed.StringKeyedValue import pl.touk.nussknacker.engine.flink.util.orderedmap.FlinkRangeMap import pl.touk.nussknacker.engine.flink.util.transformer.aggregate.{Aggregator, AggregatorFunctionMixin} -import pl.touk.nussknacker.engine.api.NodeId import scala.language.higherKinds diff --git a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/join/SingleSideJoinTransformer.scala b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/join/SingleSideJoinTransformer.scala index 4fa84fe7166..2f1fbddaaec 100644 --- a/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/join/SingleSideJoinTransformer.scala +++ b/engine/flink/components/base-unbounded/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/join/SingleSideJoinTransformer.scala @@ -8,9 +8,9 @@ import org.apache.flink.streaming.api.functions.co.CoProcessFunction import org.apache.flink.streaming.runtime.operators.windowing.TimestampedValue import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.component.UnboundedStreamComponent +import pl.touk.nussknacker.engine.api.context.{OutputVar, ValidationContext} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError import pl.touk.nussknacker.engine.api.context.transformation._ -import pl.touk.nussknacker.engine.api.context.{OutputVar, ValidationContext} import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.runtimecontext.EngineRuntimeContext @@ -21,7 +21,7 @@ import pl.touk.nussknacker.engine.flink.api.process.{FlinkCustomJoinTransformati import pl.touk.nussknacker.engine.flink.api.timestampwatermark.TimestampWatermarkHandler import pl.touk.nussknacker.engine.flink.api.typeinformation.TypeInformationDetection import pl.touk.nussknacker.engine.flink.typeinformation.KeyedValueType -import pl.touk.nussknacker.engine.flink.util.keyed.{StringKeyOnlyMapper, StringKeyedValue, StringKeyedValueMapper} +import pl.touk.nussknacker.engine.flink.util.keyed.{StringKeyedValue, StringKeyedValueMapper, StringKeyOnlyMapper} import pl.touk.nussknacker.engine.flink.util.richflink._ import pl.touk.nussknacker.engine.flink.util.timestamp.TimestampAssignmentHelper import pl.touk.nussknacker.engine.flink.util.transformer.aggregate.{AggregateHelper, Aggregator} diff --git a/engine/flink/components/base/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/ForEachTransformer.scala b/engine/flink/components/base/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/ForEachTransformer.scala index e5f961a79df..1ee6fbe4da6 100644 --- a/engine/flink/components/base/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/ForEachTransformer.scala +++ b/engine/flink/components/base/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/ForEachTransformer.scala @@ -3,7 +3,7 @@ package pl.touk.nussknacker.engine.flink.util.transformer import org.apache.flink.streaming.api.datastream.DataStream import org.apache.flink.util.Collector import pl.touk.nussknacker.engine.api._ -import pl.touk.nussknacker.engine.api.typed.{ReturningType, typing} +import pl.touk.nussknacker.engine.api.typed.{typing, ReturningType} import pl.touk.nussknacker.engine.api.typed.typing.{SingleTypingResult, Typed, Unknown} import pl.touk.nussknacker.engine.flink.api.process.{FlinkCustomNodeContext, FlinkCustomStreamTransformation} diff --git a/engine/flink/components/base/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/UnionTransformer.scala b/engine/flink/components/base/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/UnionTransformer.scala index 2e667ae0096..7f5cda24a83 100644 --- a/engine/flink/components/base/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/UnionTransformer.scala +++ b/engine/flink/components/base/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/UnionTransformer.scala @@ -8,13 +8,13 @@ import org.apache.flink.streaming.api.functions.co.CoMapFunction import org.apache.flink.streaming.runtime.operators.windowing.TimestampedValue import org.apache.flink.util.Collector import pl.touk.nussknacker.engine.api._ -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CannotCreateObjectError import pl.touk.nussknacker.engine.api.context.{ ContextTransformation, JoinContextTransformation, ProcessCompilationError, ValidationContext } +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CannotCreateObjectError import pl.touk.nussknacker.engine.api.typed.supertype.CommonSupertypeFinder import pl.touk.nussknacker.engine.api.typed.typing.{TypedObjectTypingResult, TypingResult} import pl.touk.nussknacker.engine.flink.api.process.{ diff --git a/engine/flink/components/kafka/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/FlinkKafkaComponentProvider.scala b/engine/flink/components/kafka/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/FlinkKafkaComponentProvider.scala index ed892a6721d..35a99d9c435 100644 --- a/engine/flink/components/kafka/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/FlinkKafkaComponentProvider.scala +++ b/engine/flink/components/kafka/src/main/scala/pl/touk/nussknacker/engine/flink/util/transformer/FlinkKafkaComponentProvider.scala @@ -2,13 +2,13 @@ package pl.touk.nussknacker.engine.flink.util.transformer import com.typesafe.config.Config import com.typesafe.config.ConfigValueFactory.fromAnyRef -import pl.touk.nussknacker.engine.api.component.ComponentType.ComponentType import pl.touk.nussknacker.engine.api.component.{ ComponentDefinition, ComponentProvider, ComponentType, NussknackerVersion } +import pl.touk.nussknacker.engine.api.component.ComponentType.ComponentType import pl.touk.nussknacker.engine.api.namespaces.NamingStrategy import pl.touk.nussknacker.engine.api.process.ProcessObjectDependencies import pl.touk.nussknacker.engine.kafka.KafkaConfig diff --git a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/FlinkTableComponentProvider.scala b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/FlinkTableComponentProvider.scala index b5c2f3805a7..8bb3d69e20f 100644 --- a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/FlinkTableComponentProvider.scala +++ b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/FlinkTableComponentProvider.scala @@ -102,8 +102,8 @@ final case class TableComponentProviderConfig( object TableComponentProviderConfig { import net.ceedubs.ficus.Ficus._ - import net.ceedubs.ficus.readers.EnumerationReader._ import net.ceedubs.ficus.readers.ArbitraryTypeReader._ + import net.ceedubs.ficus.readers.EnumerationReader._ import pl.touk.nussknacker.engine.util.config.ConfigEnrichments.RichConfig private[table] def parse(config: Config) = config.rootAs[TableComponentProviderConfig] diff --git a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/aggregate/TableAggregation.scala b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/aggregate/TableAggregation.scala index 8c0eb79a15b..cefe6d481d6 100644 --- a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/aggregate/TableAggregation.scala +++ b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/aggregate/TableAggregation.scala @@ -9,8 +9,8 @@ import org.apache.flink.table.api.bridge.java.StreamTableEnvironment import org.apache.flink.types.Row import org.apache.flink.util.Collector import pl.touk.nussknacker.engine.api -import pl.touk.nussknacker.engine.api.VariableConstants.KeyVariableName import pl.touk.nussknacker.engine.api._ +import pl.touk.nussknacker.engine.api.VariableConstants.KeyVariableName import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.runtimecontext.{ContextIdGenerator, EngineRuntimeContext} import pl.touk.nussknacker.engine.api.typed.typing.TypingResult diff --git a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/aggregate/TableAggregationFactory.scala b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/aggregate/TableAggregationFactory.scala index 7ae0bb77860..b796ccb5472 100644 --- a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/aggregate/TableAggregationFactory.scala +++ b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/aggregate/TableAggregationFactory.scala @@ -1,15 +1,15 @@ package pl.touk.nussknacker.engine.flink.table.aggregate import org.apache.flink.table.types.logical.LogicalTypeRoot -import pl.touk.nussknacker.engine.api.VariableConstants.KeyVariableName import pl.touk.nussknacker.engine.api._ +import pl.touk.nussknacker.engine.api.VariableConstants.KeyVariableName +import pl.touk.nussknacker.engine.api.context.{OutputVar, ValidationContext} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError import pl.touk.nussknacker.engine.api.context.transformation.{ DefinedEagerParameter, NodeDependencyValue, SingleInputDynamicComponent } -import pl.touk.nussknacker.engine.api.context.{OutputVar, ValidationContext} import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.typed.typing.{TypingResult, Unknown} diff --git a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/join/TableJoinComponent.scala b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/join/TableJoinComponent.scala index d0e9b905a5e..0ed74f7775f 100644 --- a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/join/TableJoinComponent.scala +++ b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/join/TableJoinComponent.scala @@ -8,9 +8,9 @@ import org.apache.flink.table.api.bridge.java.StreamTableEnvironment import org.apache.flink.types.Row import org.apache.flink.util.Collector import pl.touk.nussknacker.engine.api._ +import pl.touk.nussknacker.engine.api.context.{OutputVar, ValidationContext} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError import pl.touk.nussknacker.engine.api.context.transformation._ -import pl.touk.nussknacker.engine.api.context.{OutputVar, ValidationContext} import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.typed.supertype.CommonSupertypeFinder @@ -23,7 +23,7 @@ import pl.touk.nussknacker.engine.flink.api.process.{ } import pl.touk.nussknacker.engine.flink.api.typeinformation.TypeInformationDetection import pl.touk.nussknacker.engine.flink.table.utils.{RowConversions, ToTableTypeEncoder} -import pl.touk.nussknacker.engine.flink.table.utils.RowConversions.{TypeInformationDetectionExtension, rowToContext} +import pl.touk.nussknacker.engine.flink.table.utils.RowConversions.{rowToContext, TypeInformationDetectionExtension} import pl.touk.nussknacker.engine.flink.util.transformer.join.BranchType import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap diff --git a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/sink/TableSink.scala b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/sink/TableSink.scala index 032a10dad64..14ca2d0f924 100644 --- a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/sink/TableSink.scala +++ b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/sink/TableSink.scala @@ -9,9 +9,9 @@ import org.apache.flink.table.api.bridge.java.StreamTableEnvironment import org.apache.flink.table.types.logical.RowType import org.apache.flink.types.Row import org.apache.flink.util.Collector +import pl.touk.nussknacker.engine.api.{Context, LazyParameter, ValueWithContext} import pl.touk.nussknacker.engine.api.component.{ComponentType, NodeComponentInfo} import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.api.{Context, LazyParameter, ValueWithContext} import pl.touk.nussknacker.engine.flink.api.exception.{ExceptionHandler, WithExceptionHandler} import pl.touk.nussknacker.engine.flink.api.process.{FlinkCustomNodeContext, FlinkSink} import pl.touk.nussknacker.engine.flink.api.typeinformation.TypeInformationDetection diff --git a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/sink/TableSinkFactory.scala b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/sink/TableSinkFactory.scala index d0463699fde..d100fcd0b62 100644 --- a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/sink/TableSinkFactory.scala +++ b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/sink/TableSinkFactory.scala @@ -1,8 +1,9 @@ package pl.touk.nussknacker.engine.flink.table.sink -import cats.data.Validated.{invalid, valid} import cats.data.{NonEmptyList, Validated, ValidatedNel} +import cats.data.Validated.{invalid, valid} import cats.implicits._ +import pl.touk.nussknacker.engine.api.{NodeId, Params} import pl.touk.nussknacker.engine.api.component.BoundedStreamComponent import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError import pl.touk.nussknacker.engine.api.context.ValidationContext @@ -14,10 +15,9 @@ import pl.touk.nussknacker.engine.api.context.transformation.{ import pl.touk.nussknacker.engine.api.definition.{BoolParameterEditor, NodeDependency, Parameter, ParameterDeclaration} import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.{Sink, SinkFactory} -import pl.touk.nussknacker.engine.api.{NodeId, Params} import pl.touk.nussknacker.engine.flink.table.TableDefinition -import pl.touk.nussknacker.engine.flink.table.definition.FlinkDataDefinition._ import pl.touk.nussknacker.engine.flink.table.definition.{FlinkDataDefinition, TablesDefinitionDiscovery} +import pl.touk.nussknacker.engine.flink.table.definition.FlinkDataDefinition._ import pl.touk.nussknacker.engine.flink.table.sink.TableSinkFactory._ import pl.touk.nussknacker.engine.flink.table.utils.DataTypesExtensions._ import pl.touk.nussknacker.engine.flink.table.utils.TableComponentFactory diff --git a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/sink/TableTypeOutputValidator.scala b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/sink/TableTypeOutputValidator.scala index 5b22fca0343..9d6fc692ec4 100644 --- a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/sink/TableTypeOutputValidator.scala +++ b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/sink/TableTypeOutputValidator.scala @@ -1,11 +1,11 @@ package pl.touk.nussknacker.engine.flink.table.sink -import cats.data.Validated.{Valid, invalidNel} +import cats.data.Validated.{invalidNel, Valid} import cats.data.ValidatedNel import org.apache.flink.table.types.logical.LogicalType import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.flink.table.utils.ToTableTypeSchemaBasedEncoder import pl.touk.nussknacker.engine.flink.table.utils.DataTypesExtensions._ +import pl.touk.nussknacker.engine.flink.table.utils.ToTableTypeSchemaBasedEncoder import pl.touk.nussknacker.engine.util.output.{OutputValidatorError, OutputValidatorExpected, OutputValidatorTypeError} object TableTypeOutputValidator { diff --git a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/source/FlinkMiniClusterTableOperations.scala b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/source/FlinkMiniClusterTableOperations.scala index 0a0216db6e9..8ef13120612 100644 --- a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/source/FlinkMiniClusterTableOperations.scala +++ b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/source/FlinkMiniClusterTableOperations.scala @@ -6,8 +6,8 @@ import io.circe.parser.parse import org.apache.commons.io.FileUtils import org.apache.flink.configuration.{Configuration, CoreOptions, PipelineOptions} import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment -import org.apache.flink.table.api.Expressions.$ import org.apache.flink.table.api._ +import org.apache.flink.table.api.Expressions.$ import org.apache.flink.table.api.bridge.java.StreamTableEnvironment import org.apache.flink.table.catalog.ObjectIdentifier import org.apache.flink.types.Row diff --git a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/source/TableSource.scala b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/source/TableSource.scala index 5f475f58314..51d16b5379b 100644 --- a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/source/TableSource.scala +++ b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/source/TableSource.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.flink.table.source; import org.apache.flink.streaming.api.datastream.DataStream import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment -import org.apache.flink.table.api.bridge.java.StreamTableEnvironment import org.apache.flink.table.api.{DataTypes, Schema} +import org.apache.flink.table.api.bridge.java.StreamTableEnvironment import org.apache.flink.table.catalog.Column.{ComputedColumn, MetadataColumn, PhysicalColumn} import org.apache.flink.types.Row import pl.touk.nussknacker.engine.api.definition.Parameter diff --git a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/source/TableSourceFactory.scala b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/source/TableSourceFactory.scala index c0ce0256ab4..4a6fd6020ea 100644 --- a/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/source/TableSourceFactory.scala +++ b/engine/flink/components/table/src/main/scala/pl/touk/nussknacker/engine/flink/table/source/TableSourceFactory.scala @@ -1,5 +1,6 @@ package pl.touk.nussknacker.engine.flink.table.source +import pl.touk.nussknacker.engine.api.{NodeId, Params} import pl.touk.nussknacker.engine.api.component.BoundedStreamComponent import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.context.transformation.{ @@ -9,7 +10,6 @@ import pl.touk.nussknacker.engine.api.context.transformation.{ } import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.process.{BasicContextInitializer, Source, SourceFactory} -import pl.touk.nussknacker.engine.api.{NodeId, Params} import pl.touk.nussknacker.engine.flink.table.TableComponentProviderConfig.TestDataGenerationMode.TestDataGenerationMode import pl.touk.nussknacker.engine.flink.table.TableDefinition import pl.touk.nussknacker.engine.flink.table.definition.{FlinkDataDefinition, TablesDefinitionDiscovery} diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/ExecutionConfigPreparer.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/ExecutionConfigPreparer.scala index ebf47875c8a..59651b9418d 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/ExecutionConfigPreparer.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/ExecutionConfigPreparer.scala @@ -9,8 +9,8 @@ import pl.touk.nussknacker.engine.api.JobData import pl.touk.nussknacker.engine.api.modelinfo.ModelInfo import pl.touk.nussknacker.engine.api.namespaces.NamingStrategy import pl.touk.nussknacker.engine.deployment.DeploymentData -import pl.touk.nussknacker.engine.flink.api.typeinformation.FlinkTypeInfoRegistrar import pl.touk.nussknacker.engine.flink.api.{NamespaceMetricsTags, NkGlobalParameters} +import pl.touk.nussknacker.engine.flink.api.typeinformation.FlinkTypeInfoRegistrar import pl.touk.nussknacker.engine.process.util.Serializers /** diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/FlinkScenarioNameValidator.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/FlinkScenarioNameValidator.scala index 0dff5b875c5..4434045aedd 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/FlinkScenarioNameValidator.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/FlinkScenarioNameValidator.scala @@ -1,11 +1,11 @@ package pl.touk.nussknacker.engine.process -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, ValidatedNel} +import cats.data.Validated.{Invalid, Valid} import com.typesafe.config.Config +import pl.touk.nussknacker.engine.{CustomProcessValidator, CustomProcessValidatorFactory} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.ScenarioNameValidationError import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess -import pl.touk.nussknacker.engine.{CustomProcessValidator, CustomProcessValidatorFactory} class FlinkScenarioNameValidatorFactory extends CustomProcessValidatorFactory { override def validator(config: Config): CustomProcessValidator = new FlinkScenarioNameValidator(config) diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/FlinkProcessCompilerData.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/FlinkProcessCompilerData.scala index 194cc7bf854..22f37ea2150 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/FlinkProcessCompilerData.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/FlinkProcessCompilerData.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.engine.process.compiler -import cats.data.Validated.{Invalid, Valid} import cats.data._ +import cats.data.Validated.{Invalid, Valid} import org.apache.flink.api.common.functions.RuntimeContext import org.apache.flink.api.common.restartstrategy.RestartStrategies import pl.touk.nussknacker.engine.Interpreter +import pl.touk.nussknacker.engine.api.{JobData, MetaData} import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext} import pl.touk.nussknacker.engine.api.process.{AsyncExecutionContextPreparer, ComponentUseCase} -import pl.touk.nussknacker.engine.api.{JobData, MetaData} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.compile.ProcessCompilerData import pl.touk.nussknacker.engine.compile.nodecompilation.EvaluableLazyParameterCreatorDeps diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/FlinkProcessCompilerDataFactory.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/FlinkProcessCompilerDataFactory.scala index dbe245cb12c..31250a03278 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/FlinkProcessCompilerDataFactory.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/FlinkProcessCompilerDataFactory.scala @@ -1,11 +1,12 @@ package pl.touk.nussknacker.engine.process.compiler import com.typesafe.config.Config +import pl.touk.nussknacker.engine.{CustomProcessValidatorLoader, ModelData} import pl.touk.nussknacker.engine.ModelData.ExtractDefinitionFun +import pl.touk.nussknacker.engine.api.{JobData, MetaData, ProcessListener, ProcessVersion} import pl.touk.nussknacker.engine.api.component.{ComponentAdditionalConfig, DesignerWideComponentId} import pl.touk.nussknacker.engine.api.dict.EngineDictRegistry import pl.touk.nussknacker.engine.api.process.{ComponentUseCase, ProcessConfigCreator, ProcessObjectDependencies} -import pl.touk.nussknacker.engine.api.{JobData, MetaData, ProcessListener, ProcessVersion} import pl.touk.nussknacker.engine.compile._ import pl.touk.nussknacker.engine.compile.nodecompilation.LazyParameterCreationStrategy import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionSet @@ -19,7 +20,6 @@ import pl.touk.nussknacker.engine.process.exception.FlinkExceptionHandler import pl.touk.nussknacker.engine.resultcollector.ResultCollector import pl.touk.nussknacker.engine.util.LoggingListener import pl.touk.nussknacker.engine.util.metrics.common.{EndCountingListener, NodeCountingListener} -import pl.touk.nussknacker.engine.{CustomProcessValidatorLoader, ModelData} import scala.concurrent.duration.FiniteDuration diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/StubbedFlinkProcessCompilerDataFactory.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/StubbedFlinkProcessCompilerDataFactory.scala index 1411d1cd9dd..10dcbc843aa 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/StubbedFlinkProcessCompilerDataFactory.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/StubbedFlinkProcessCompilerDataFactory.scala @@ -2,20 +2,20 @@ package pl.touk.nussknacker.engine.process.compiler import com.typesafe.config.Config import pl.touk.nussknacker.engine.ModelData.ExtractDefinitionFun +import pl.touk.nussknacker.engine.api.{NodeId, Params} import pl.touk.nussknacker.engine.api.component.{ComponentAdditionalConfig, ComponentType, DesignerWideComponentId} import pl.touk.nussknacker.engine.api.context.ContextTransformation import pl.touk.nussknacker.engine.api.process.{ComponentUseCase, ProcessConfigCreator} import pl.touk.nussknacker.engine.api.typed.ReturningType import pl.touk.nussknacker.engine.api.typed.typing.{TypingResult, Unknown} -import pl.touk.nussknacker.engine.api.{NodeId, Params} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionSet -import pl.touk.nussknacker.engine.definition.component.dynamic.DynamicComponentDefinitionWithImplementation -import pl.touk.nussknacker.engine.definition.component.methodbased.MethodBasedComponentDefinitionWithImplementation import pl.touk.nussknacker.engine.definition.component.{ ComponentDefinitionWithImplementation, ComponentImplementationInvoker } +import pl.touk.nussknacker.engine.definition.component.dynamic.DynamicComponentDefinitionWithImplementation +import pl.touk.nussknacker.engine.definition.component.methodbased.MethodBasedComponentDefinitionWithImplementation import pl.touk.nussknacker.engine.definition.fragment.FragmentParametersDefinitionExtractor import pl.touk.nussknacker.engine.definition.model.ModelDefinition import pl.touk.nussknacker.engine.graph.node.{FragmentInputDefinition, Source} diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/StubbedFragmentSourceDefinitionPreparer.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/StubbedFragmentSourceDefinitionPreparer.scala index 72b5efdc63d..5133bbf84ed 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/StubbedFragmentSourceDefinitionPreparer.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/StubbedFragmentSourceDefinitionPreparer.scala @@ -2,6 +2,7 @@ package pl.touk.nussknacker.engine.process.compiler import cats.data.Validated.Valid import cats.data.ValidatedNel +import pl.touk.nussknacker.engine.api.{Context, NodeId, Params} import pl.touk.nussknacker.engine.api.component.Component.AllowedProcessingModes import pl.touk.nussknacker.engine.api.component.DesignerWideComponentId import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext} @@ -15,7 +16,6 @@ import pl.touk.nussknacker.engine.api.process.{ } import pl.touk.nussknacker.engine.api.runtimecontext.ContextIdGenerator import pl.touk.nussknacker.engine.api.test.TestRecordParser -import pl.touk.nussknacker.engine.api.{Context, NodeId, Params} import pl.touk.nussknacker.engine.definition.component.ComponentDefinitionWithImplementation import pl.touk.nussknacker.engine.definition.component.defaultconfig.DefaultsComponentIcon.FragmentIcon import pl.touk.nussknacker.engine.definition.fragment.{ diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/TestFlinkProcessCompilerDataFactory.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/TestFlinkProcessCompilerDataFactory.scala index 3f9d2a3ef78..7be7d5b4d5c 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/TestFlinkProcessCompilerDataFactory.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/TestFlinkProcessCompilerDataFactory.scala @@ -4,10 +4,10 @@ import com.github.ghik.silencer.silent import org.apache.flink.api.common.restartstrategy.RestartStrategies import org.apache.flink.api.connector.source.Boundedness import pl.touk.nussknacker.engine.ModelData +import pl.touk.nussknacker.engine.api.{JobData, MetaData, NodeId, ProcessListener} import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.api.test.ScenarioTestData import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.api.{JobData, MetaData, NodeId, ProcessListener} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.definition.component.ComponentDefinitionWithImplementation import pl.touk.nussknacker.engine.flink.api.exception.FlinkEspExceptionConsumer diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/VerificationFlinkProcessCompilerDataFactory.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/VerificationFlinkProcessCompilerDataFactory.scala index 845fb925577..c9135085514 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/VerificationFlinkProcessCompilerDataFactory.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/compiler/VerificationFlinkProcessCompilerDataFactory.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.engine.process.compiler import pl.touk.nussknacker.engine.ModelData +import pl.touk.nussknacker.engine.api.{NodeId, ProcessListener} import pl.touk.nussknacker.engine.api.process.{ComponentUseCase, ProcessObjectDependencies} import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.api.{NodeId, ProcessListener} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.definition.component.ComponentDefinitionWithImplementation import pl.touk.nussknacker.engine.flink.util.source.EmptySource diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/exception/FlinkExceptionHandler.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/exception/FlinkExceptionHandler.scala index c57e9b2a757..1f8cb9912f0 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/exception/FlinkExceptionHandler.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/exception/FlinkExceptionHandler.scala @@ -4,11 +4,11 @@ import com.github.ghik.silencer.silent import com.typesafe.config.Config import net.ceedubs.ficus.Ficus.{booleanValueReader, optionValueReader, stringValueReader, toFicusConfig} import org.apache.flink.api.common.restartstrategy.RestartStrategies +import pl.touk.nussknacker.engine.api.{Context, MetaData, ProcessListener} import pl.touk.nussknacker.engine.api.component.NodeComponentInfo import pl.touk.nussknacker.engine.api.exception.{NuExceptionInfo, WithExceptionExtractor} import pl.touk.nussknacker.engine.api.process.ProcessObjectDependencies import pl.touk.nussknacker.engine.api.runtimecontext.EngineRuntimeContext -import pl.touk.nussknacker.engine.api.{Context, MetaData, ProcessListener} import pl.touk.nussknacker.engine.flink.api.exception.{ ExceptionHandler, FlinkEspExceptionConsumer, diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/AsyncInterpretationDeterminer.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/AsyncInterpretationDeterminer.scala index 18994f94404..35edf5eecd9 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/AsyncInterpretationDeterminer.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/AsyncInterpretationDeterminer.scala @@ -5,7 +5,7 @@ import pl.touk.nussknacker.engine.api.async.{DefaultAsyncInterpretationValue, De import pl.touk.nussknacker.engine.api.process.AsyncExecutionContextPreparer import pl.touk.nussknacker.engine.flink.api.ConfigGlobalParameters import pl.touk.nussknacker.engine.graph.node.{Enricher, NodeData, Processor} -import pl.touk.nussknacker.engine.splittedgraph.{SplittedNodesCollector, splittednode} +import pl.touk.nussknacker.engine.splittedgraph.{splittednode, SplittedNodesCollector} private[registrar] case class AsyncInterpretationDeterminer( configParameters: Option[ConfigGlobalParameters], diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/CollectingSinkFunction.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/CollectingSinkFunction.scala index 3ceb0d135d1..406b390bc09 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/CollectingSinkFunction.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/CollectingSinkFunction.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.process.registrar import org.apache.flink.streaming.api.functions.sink.{RichSinkFunction, SinkFunction} -import pl.touk.nussknacker.engine.api.component.{ComponentType, NodeComponentInfo} import pl.touk.nussknacker.engine.api.ValueWithContext +import pl.touk.nussknacker.engine.api.component.{ComponentType, NodeComponentInfo} import pl.touk.nussknacker.engine.process.ExceptionHandlerFunction import pl.touk.nussknacker.engine.process.compiler.FlinkProcessCompilerData import pl.touk.nussknacker.engine.testmode.SinkInvocationCollector diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/FlinkProcessRegistrar.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/FlinkProcessRegistrar.scala index 408428d2453..74326da829c 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/FlinkProcessRegistrar.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/FlinkProcessRegistrar.scala @@ -22,20 +22,20 @@ import pl.touk.nussknacker.engine.flink.api.process._ import pl.touk.nussknacker.engine.flink.api.typeinformation.TypeInformationDetection import pl.touk.nussknacker.engine.graph.node.{BranchEndDefinition, NodeData} import pl.touk.nussknacker.engine.node.NodeComponentInfoExtractor.fromScenarioNode +import pl.touk.nussknacker.engine.process.{ExecutionConfigPreparer, FlinkCompatibilityProvider, FlinkJobConfig} import pl.touk.nussknacker.engine.process.compiler.{ FlinkEngineRuntimeContextImpl, FlinkProcessCompilerData, FlinkProcessCompilerDataFactory, UsedNodes } -import pl.touk.nussknacker.engine.process.{ExecutionConfigPreparer, FlinkCompatibilityProvider, FlinkJobConfig} import pl.touk.nussknacker.engine.resultcollector.{ProductionServiceInvocationCollector, ResultCollector} +import pl.touk.nussknacker.engine.splittedgraph.{splittednode, SplittedNodesCollector} import pl.touk.nussknacker.engine.splittedgraph.end.BranchEnd -import pl.touk.nussknacker.engine.splittedgraph.{SplittedNodesCollector, splittednode} import pl.touk.nussknacker.engine.testmode.TestServiceInvocationCollector +import pl.touk.nussknacker.engine.util.{MetaDataExtractor, ThreadUtils} import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap import pl.touk.nussknacker.engine.util.loader.ScalaServiceLoader -import pl.touk.nussknacker.engine.util.{MetaDataExtractor, ThreadUtils} import shapeless.syntax.typeable.typeableOps import java.util.concurrent.TimeUnit @@ -193,10 +193,13 @@ class FlinkProcessRegistrar( ): Map[BranchEndDefinition, BranchEndData] = { val inputs: Map[String, (DataStream[Context], ValidationContext)] = branchEnds.collect { case (BranchEndDefinition(id, joinId), BranchEndData(validationContext, stream)) if joinPart.id == joinId => - id -> (stream.map( - (value: InterpretationResult) => value.finalContext, - TypeInformationDetection.instance.forContext(validationContext) - ), validationContext) + id -> ( + stream.map( + (value: InterpretationResult) => value.finalContext, + TypeInformationDetection.instance.forContext(validationContext) + ), + validationContext + ) } val transformer = joinPart.transformer match { diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/SplitFunction.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/SplitFunction.scala index 2dfa525465e..03d902b0dd4 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/SplitFunction.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/SplitFunction.scala @@ -4,8 +4,8 @@ import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.streaming.api.functions.ProcessFunction import org.apache.flink.util.{Collector, OutputTag} import pl.touk.nussknacker.engine.InterpretationResult -import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.{EndingReference, JoinReference, NextPartReference} +import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.process.registrar.FlinkProcessRegistrar.EndId import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/StreamExecutionEnvPreparer.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/StreamExecutionEnvPreparer.scala index ff3add8d68f..b048ab6cc31 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/StreamExecutionEnvPreparer.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/StreamExecutionEnvPreparer.scala @@ -9,12 +9,12 @@ import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment import org.apache.flink.util.{FlinkUserCodeClassLoaders, OutputTag} import pl.touk.nussknacker.engine.api.StreamMetaData import pl.touk.nussknacker.engine.deployment.DeploymentData +import pl.touk.nussknacker.engine.process.{ExecutionConfigPreparer, FlinkJobConfig} import pl.touk.nussknacker.engine.process.FlinkJobConfig.ExecutionMode import pl.touk.nussknacker.engine.process.FlinkJobConfig.ExecutionMode.ExecutionMode import pl.touk.nussknacker.engine.process.compiler.FlinkProcessCompilerData import pl.touk.nussknacker.engine.process.util.StateConfiguration import pl.touk.nussknacker.engine.process.util.StateConfiguration.RocksDBStateBackendConfig -import pl.touk.nussknacker.engine.process.{ExecutionConfigPreparer, FlinkJobConfig} import pl.touk.nussknacker.engine.util.MetaDataExtractor /* diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/ToEvaluateFunctionConverterWithLifecycle.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/ToEvaluateFunctionConverterWithLifecycle.scala index 5f58629f20a..5a78c55d4cb 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/ToEvaluateFunctionConverterWithLifecycle.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/registrar/ToEvaluateFunctionConverterWithLifecycle.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.process.registrar import org.apache.flink.api.common.functions.RuntimeContext -import pl.touk.nussknacker.engine.api.LazyParameter.Evaluate import pl.touk.nussknacker.engine.api.{LazyParameter, ToEvaluateFunctionConverter} +import pl.touk.nussknacker.engine.api.LazyParameter.Evaluate import pl.touk.nussknacker.engine.compile.nodecompilation.DefaultToEvaluateFunctionConverter import pl.touk.nussknacker.engine.process.compiler.FlinkProcessCompilerData diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/runner/FlinkScenarioJob.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/runner/FlinkScenarioJob.scala index 7484308f006..3cca49e1769 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/runner/FlinkScenarioJob.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/runner/FlinkScenarioJob.scala @@ -2,14 +2,14 @@ package pl.touk.nussknacker.engine.process.runner import org.apache.flink.api.common.JobExecutionResult import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment +import pl.touk.nussknacker.engine.{BaseModelData, ModelData} import pl.touk.nussknacker.engine.ModelData.BaseModelDataExt import pl.touk.nussknacker.engine.api.ProcessVersion import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.deployment.DeploymentData +import pl.touk.nussknacker.engine.process.{ExecutionConfigPreparer, FlinkJobConfig} import pl.touk.nussknacker.engine.process.compiler.FlinkProcessCompilerDataFactory import pl.touk.nussknacker.engine.process.registrar.FlinkProcessRegistrar -import pl.touk.nussknacker.engine.process.{ExecutionConfigPreparer, FlinkJobConfig} -import pl.touk.nussknacker.engine.{BaseModelData, ModelData} object FlinkScenarioJob { diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/runner/FlinkScenarioUnitTestJob.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/runner/FlinkScenarioUnitTestJob.scala index 2ae8bc869fa..b0e43af552d 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/runner/FlinkScenarioUnitTestJob.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/runner/FlinkScenarioUnitTestJob.scala @@ -6,9 +6,9 @@ import pl.touk.nussknacker.engine.ModelData import pl.touk.nussknacker.engine.api.ProcessVersion import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.deployment.DeploymentData +import pl.touk.nussknacker.engine.process.{ExecutionConfigPreparer, FlinkJobConfig} import pl.touk.nussknacker.engine.process.compiler.FlinkProcessCompilerDataFactory import pl.touk.nussknacker.engine.process.registrar.FlinkProcessRegistrar -import pl.touk.nussknacker.engine.process.{ExecutionConfigPreparer, FlinkJobConfig} // This is a temporary solution for unit tests purpose. It is in production code, because we don't have flink-executor-test-utils // module with dependency to flink-executor. We have flink-test-utils but there is a dependency from flink-executor to flink-test-utils. diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/scenariotesting/FlinkScenarioStateVerificationJob.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/scenariotesting/FlinkScenarioStateVerificationJob.scala index ef1140a1cdd..fb936b97b31 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/scenariotesting/FlinkScenarioStateVerificationJob.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/scenariotesting/FlinkScenarioStateVerificationJob.scala @@ -7,9 +7,9 @@ import pl.touk.nussknacker.engine.ModelData import pl.touk.nussknacker.engine.api.ProcessVersion import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.deployment.DeploymentData +import pl.touk.nussknacker.engine.process.{ExecutionConfigPreparer, FlinkJobConfig} import pl.touk.nussknacker.engine.process.compiler.VerificationFlinkProcessCompilerDataFactory import pl.touk.nussknacker.engine.process.registrar.FlinkProcessRegistrar -import pl.touk.nussknacker.engine.process.{ExecutionConfigPreparer, FlinkJobConfig} import pl.touk.nussknacker.engine.testmode.{ResultsCollectingListenerHolder, TestServiceInvocationCollector} object FlinkScenarioStateVerificationJob { diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/scenariotesting/FlinkScenarioTestingJob.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/scenariotesting/FlinkScenarioTestingJob.scala index ad14ba12daa..cf288312d2b 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/scenariotesting/FlinkScenarioTestingJob.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/scenariotesting/FlinkScenarioTestingJob.scala @@ -5,13 +5,13 @@ import io.circe.Json import org.apache.flink.api.common.JobExecutionResult import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment import pl.touk.nussknacker.engine.ModelData -import pl.touk.nussknacker.engine.api.test.ScenarioTestData import pl.touk.nussknacker.engine.api.{JobData, ProcessVersion} +import pl.touk.nussknacker.engine.api.test.ScenarioTestData import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.deployment.{AdditionalModelConfigs, DeploymentData} +import pl.touk.nussknacker.engine.process.{ExecutionConfigPreparer, FlinkJobConfig} import pl.touk.nussknacker.engine.process.compiler.TestFlinkProcessCompilerDataFactory import pl.touk.nussknacker.engine.process.registrar.FlinkProcessRegistrar -import pl.touk.nussknacker.engine.process.{ExecutionConfigPreparer, FlinkJobConfig} import pl.touk.nussknacker.engine.testmode.{ResultsCollectingListener, TestServiceInvocationCollector} object FlinkScenarioTestingJob { diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/typeinformation/TypingResultAwareTypeInformationDetection.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/typeinformation/TypingResultAwareTypeInformationDetection.scala index 7d89fb427cd..7c2c62daa49 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/typeinformation/TypingResultAwareTypeInformationDetection.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/typeinformation/TypingResultAwareTypeInformationDetection.scala @@ -3,9 +3,9 @@ package pl.touk.nussknacker.engine.process.typeinformation import org.apache.flink.api.common.typeinfo.{TypeInformation, Types} import org.apache.flink.api.java.typeutils.{ListTypeInfo, MapTypeInfo, MultisetTypeInfo, RowTypeInfo} import org.apache.flink.types.Row +import pl.touk.nussknacker.engine.api.{Context, ValueWithContext} import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.typed.typing._ -import pl.touk.nussknacker.engine.api.{Context, ValueWithContext} import pl.touk.nussknacker.engine.flink.api.TypedMultiset import pl.touk.nussknacker.engine.flink.api.typeinformation.{FlinkTypeInfoRegistrar, TypeInformationDetection} import pl.touk.nussknacker.engine.flink.typeinformation.ConcreteCaseClassTypeInfo diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/typeinformation/internal/typedobject/TypedJavaMapBasedTypeInformation.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/typeinformation/internal/typedobject/TypedJavaMapBasedTypeInformation.scala index df03b2c5c15..b8966ec545b 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/typeinformation/internal/typedobject/TypedJavaMapBasedTypeInformation.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/typeinformation/internal/typedobject/TypedJavaMapBasedTypeInformation.scala @@ -1,9 +1,10 @@ package pl.touk.nussknacker.engine.process.typeinformation.internal.typedobject -import java.{util => jutil} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.common.typeutils.{TypeSerializer, TypeSerializerSnapshot} +import java.{util => jutil} + case class TypedJavaMapTypeInformation( informations: Map[String, TypeInformation[_]] ) extends TypedObjectBasedTypeInformation[jutil.Map[String, AnyRef]](informations) { diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/typeinformation/internal/typedobject/TypedObjectBasedTypeInformation.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/typeinformation/internal/typedobject/TypedObjectBasedTypeInformation.scala index e7ca4c1e5a8..e075caed945 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/typeinformation/internal/typedobject/TypedObjectBasedTypeInformation.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/typeinformation/internal/typedobject/TypedObjectBasedTypeInformation.scala @@ -4,13 +4,13 @@ import com.github.ghik.silencer.silent import com.typesafe.scalalogging.LazyLogging import org.apache.flink.api.common.ExecutionConfig import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.common.typeutils.CompositeTypeSerializerUtil.IntermediateCompatibilityResult import org.apache.flink.api.common.typeutils.{ CompositeTypeSerializerUtil, TypeSerializer, TypeSerializerSchemaCompatibility, TypeSerializerSnapshot } +import org.apache.flink.api.common.typeutils.CompositeTypeSerializerUtil.IntermediateCompatibilityResult import org.apache.flink.core.memory.{DataInputView, DataOutputView} import scala.reflect.ClassTag diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/util/Serializers.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/util/Serializers.scala index 834a5497840..e37b5fb3fae 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/util/Serializers.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/util/Serializers.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.process.util -import com.esotericsoftware.kryo.io.{Input, Output} import com.esotericsoftware.kryo.{Kryo, Serializer} +import com.esotericsoftware.kryo.io.{Input, Output} import com.typesafe.scalalogging.LazyLogging import org.apache.flink.api.common.ExecutionConfig import pl.touk.nussknacker.engine.ModelData diff --git a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/util/SpelHack.scala b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/util/SpelHack.scala index 8d65990eb34..9cdc081495d 100644 --- a/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/util/SpelHack.scala +++ b/engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/util/SpelHack.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.process.util -import com.esotericsoftware.kryo.io.{Input, Output} import com.esotericsoftware.kryo.{Kryo, Serializer} +import com.esotericsoftware.kryo.io.{Input, Output} import pl.touk.nussknacker.engine.flink.api.serialization.{ClassBasedKryoSerializerRegistrar, SerializerRegistrar} import java.util diff --git a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/api/EvictableStateTest.scala b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/api/EvictableStateTest.scala index f36ae44d79b..e3d52049e33 100644 --- a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/api/EvictableStateTest.scala +++ b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/api/EvictableStateTest.scala @@ -6,9 +6,9 @@ import org.apache.flink.api.common.state.ValueStateDescriptor import org.apache.flink.streaming.api.functions.KeyedProcessFunction import org.apache.flink.streaming.api.functions.sink.SinkFunction import org.apache.flink.util.Collector +import org.scalatest.{BeforeAndAfter, BeforeAndAfterAll} import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import org.scalatest.{BeforeAndAfter, BeforeAndAfterAll} import pl.touk.nussknacker.engine.flink.api.state.EvictableStateFunction import pl.touk.nussknacker.engine.flink.minicluster.FlinkMiniClusterFactory import pl.touk.nussknacker.engine.flink.test.ScalatestMiniClusterJobStatusCheckingOps.miniClusterWithServicesToOps diff --git a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/compiler/StubbedFlinkProcessCompilerDataFactoryTest.scala b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/compiler/StubbedFlinkProcessCompilerDataFactoryTest.scala index 760373e0221..998cf74c918 100644 --- a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/compiler/StubbedFlinkProcessCompilerDataFactoryTest.scala +++ b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/compiler/StubbedFlinkProcessCompilerDataFactoryTest.scala @@ -5,13 +5,13 @@ import com.typesafe.config.ConfigValueFactory._ import io.circe.Json import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.{CirceUtil, JobData, NodeId, ProcessVersion} import pl.touk.nussknacker.engine.api.component.ComponentDefinition import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.{SourceFactory, TestWithParametersSupport} import pl.touk.nussknacker.engine.api.test._ import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{CirceUtil, JobData, NodeId, ProcessVersion} import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.compiledgraph.CompiledProcessParts diff --git a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/exception/FlinkExceptionHandlerSpec.scala b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/exception/FlinkExceptionHandlerSpec.scala index 74e985c651b..020fd0f27d9 100644 --- a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/exception/FlinkExceptionHandlerSpec.scala +++ b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/exception/FlinkExceptionHandlerSpec.scala @@ -5,9 +5,9 @@ import com.typesafe.config.{Config, ConfigFactory} import org.apache.flink.api.common.restartstrategy.RestartStrategies import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.{Context, MetaData, StreamMetaData} import pl.touk.nussknacker.engine.api.exception.{NonTransientException, NuExceptionInfo} import pl.touk.nussknacker.engine.api.process.ProcessObjectDependencies -import pl.touk.nussknacker.engine.api.{Context, MetaData, StreamMetaData} import pl.touk.nussknacker.engine.flink.api.exception.{FlinkEspExceptionConsumer, FlinkEspExceptionConsumerProvider} import pl.touk.nussknacker.test.ClassLoaderWithServices diff --git a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/functional/FlinkSinkSpec.scala b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/functional/FlinkSinkSpec.scala index 666a5872e10..6316418e82a 100644 --- a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/functional/FlinkSinkSpec.scala +++ b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/functional/FlinkSinkSpec.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.engine.process.functional import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.build.ScenarioBuilder -import pl.touk.nussknacker.engine.process.helpers.SampleNodes.SimpleRecord import pl.touk.nussknacker.engine.process.helpers.{ProcessTestHelpers, SinkAccessingNodeContext} +import pl.touk.nussknacker.engine.process.helpers.SampleNodes.SimpleRecord import java.util.Date diff --git a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/functional/FragmentSpec.scala b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/functional/FragmentSpec.scala index 46476c1e160..a89e8674388 100644 --- a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/functional/FragmentSpec.scala +++ b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/functional/FragmentSpec.scala @@ -2,17 +2,17 @@ package pl.touk.nussknacker.engine.process.functional import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.{FragmentSpecificData, MetaData} +import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.build.ScenarioBuilder +import pl.touk.nussknacker.engine.canonicalgraph.{canonicalnode, CanonicalProcess} import pl.touk.nussknacker.engine.canonicalgraph.canonicalnode.FlatNode -import pl.touk.nussknacker.engine.canonicalgraph.{CanonicalProcess, canonicalnode} import pl.touk.nussknacker.engine.compile.FragmentResolver -import pl.touk.nussknacker.engine.graph.evaluatedparam.BranchParameters import pl.touk.nussknacker.engine.graph.evaluatedparam.{Parameter => NodeParameter} +import pl.touk.nussknacker.engine.graph.evaluatedparam.BranchParameters import pl.touk.nussknacker.engine.graph.expression.Expression -import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.node._ +import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.sink.SinkRef import pl.touk.nussknacker.engine.graph.variable.Field import pl.touk.nussknacker.engine.process.helpers.ProcessTestHelpers diff --git a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/functional/MetricsSpec.scala b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/functional/MetricsSpec.scala index 018f490f268..1b04f05fdd1 100644 --- a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/functional/MetricsSpec.scala +++ b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/functional/MetricsSpec.scala @@ -3,10 +3,10 @@ package pl.touk.nussknacker.engine.process.functional import com.typesafe.config.{ConfigFactory, ConfigValueFactory} import org.apache.flink.configuration.Configuration import org.apache.flink.metrics.{Counter, Gauge, Histogram} +import org.scalatest.{BeforeAndAfterEach, Outcome} import org.scalatest.LoneElement._ import org.scalatest.funsuite.FixtureAnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{BeforeAndAfterEach, Outcome} import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} import pl.touk.nussknacker.engine.flink.util.sink.SingleValueSinkFactory.SingleValueParamName diff --git a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/functional/ProcessSpec.scala b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/functional/ProcessSpec.scala index 65b759522dc..781f5b8f800 100644 --- a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/functional/ProcessSpec.scala +++ b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/functional/ProcessSpec.scala @@ -18,6 +18,7 @@ import java.util.{Date, UUID} class ProcessSpec extends AnyFunSuite with Matchers with ProcessTestHelpers { import pl.touk.nussknacker.engine.spel.SpelExtension._ + import SingleValueSinkFactory._ test("skip null records") { diff --git a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/registrar/InterpretationFunctionFlinkGraphSpec.scala b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/registrar/InterpretationFunctionFlinkGraphSpec.scala index cb3aea1d2da..39359fa7586 100644 --- a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/registrar/InterpretationFunctionFlinkGraphSpec.scala +++ b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/registrar/InterpretationFunctionFlinkGraphSpec.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.process.registrar -import com.typesafe.config.ConfigValueFactory.fromAnyRef import com.typesafe.config.{Config, ConfigFactory} +import com.typesafe.config.ConfigValueFactory.fromAnyRef import org.apache.flink.streaming.api.graph.{StreamGraph, StreamNode} import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} diff --git a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/runner/FlinkScenarioJobSpec.scala b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/runner/FlinkScenarioJobSpec.scala index 794470ab4a7..84fb4bf0a1c 100644 --- a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/runner/FlinkScenarioJobSpec.scala +++ b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/runner/FlinkScenarioJobSpec.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.engine.process.runner import com.typesafe.config.ConfigFactory +import org.scalatest.{BeforeAndAfterAll, Inside} import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import org.scalatest.{BeforeAndAfterAll, Inside} import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.deployment.DeploymentData diff --git a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/runner/SimpleProcessConfigCreator.scala b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/runner/SimpleProcessConfigCreator.scala index 008ba927175..05a95adce7e 100644 --- a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/runner/SimpleProcessConfigCreator.scala +++ b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/runner/SimpleProcessConfigCreator.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.process.runner -import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.api.{CustomStreamTransformer, Service} +import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.process.helpers.SampleNodes._ import pl.touk.nussknacker.engine.process.helpers.TestResultsHolder import pl.touk.nussknacker.engine.process.runner.SimpleProcessConfigCreator.{ diff --git a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/typeinformation/TypingResultAwareTypeInformationDetectionSpec.scala b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/typeinformation/TypingResultAwareTypeInformationDetectionSpec.scala index f0b9b72f8c7..7a926594e20 100644 --- a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/typeinformation/TypingResultAwareTypeInformationDetectionSpec.scala +++ b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/typeinformation/TypingResultAwareTypeInformationDetectionSpec.scala @@ -1,27 +1,27 @@ package pl.touk.nussknacker.engine.process.typeinformation -import com.esotericsoftware.kryo.io.{Input, Output} import com.esotericsoftware.kryo.{Kryo, Serializer} +import com.esotericsoftware.kryo.io.{Input, Output} import com.github.ghik.silencer.silent import org.apache.flink.api.common.ExecutionConfig import org.apache.flink.api.common.typeinfo.{TypeInformation, Types} import org.apache.flink.api.common.typeutils.TypeSerializer -import org.apache.flink.api.common.typeutils.base.array.StringArraySerializer import org.apache.flink.api.common.typeutils.base.{ GenericArraySerializer, IntSerializer, LongSerializer, StringSerializer } +import org.apache.flink.api.common.typeutils.base.array.StringArraySerializer import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer +import org.scalatest.{Assertion, OptionValues} import org.scalatest.Inside.inside import org.scalatest.Inspectors.forAll import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{Assertion, OptionValues} +import pl.touk.nussknacker.engine.api.{Context, ValueWithContext} import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{Context, ValueWithContext} import pl.touk.nussknacker.engine.flink.api.typeinfo.caseclass.ScalaCaseClassSerializer import pl.touk.nussknacker.engine.flink.api.typeinformation.{FlinkTypeInfoRegistrar, TypeInformationDetection} import pl.touk.nussknacker.engine.flink.serialization.FlinkTypeInformationSerializationMixin diff --git a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/util/MetaDataExtractorTest.scala b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/util/MetaDataExtractorTest.scala index 0ea391879da..bee142bbb23 100644 --- a/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/util/MetaDataExtractorTest.scala +++ b/engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/util/MetaDataExtractorTest.scala @@ -1,11 +1,12 @@ package pl.touk.nussknacker.engine.process.util -import java.time._ import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.api.{MetaData, ProcessAdditionalFields, StreamMetaData} import pl.touk.nussknacker.engine.util.MetaDataExtractor +import java.time._ + class MetaDataExtractorTest extends AnyFunSuite with Matchers { private val metaData = MetaData.combineTypeSpecificProperties( diff --git a/engine/flink/extensions-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/exception/FlinkEspExceptionConsumer.scala b/engine/flink/extensions-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/exception/FlinkEspExceptionConsumer.scala index 2d6817418dc..53822c0858e 100644 --- a/engine/flink/extensions-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/exception/FlinkEspExceptionConsumer.scala +++ b/engine/flink/extensions-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/exception/FlinkEspExceptionConsumer.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.flink.api.exception import com.typesafe.config.Config -import pl.touk.nussknacker.engine.api.exception.EspExceptionConsumer import pl.touk.nussknacker.engine.api.{Lifecycle, MetaData, NamedServiceProvider} +import pl.touk.nussknacker.engine.api.exception.EspExceptionConsumer trait FlinkEspExceptionConsumer extends EspExceptionConsumer with Lifecycle diff --git a/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaExceptionConsumer.scala b/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaExceptionConsumer.scala index 411f790e210..15084922b18 100644 --- a/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaExceptionConsumer.scala +++ b/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaExceptionConsumer.scala @@ -10,9 +10,9 @@ import pl.touk.nussknacker.engine.api.MetaData import pl.touk.nussknacker.engine.api.exception.{NonTransientException, NuExceptionInfo} import pl.touk.nussknacker.engine.api.runtimecontext.EngineRuntimeContext import pl.touk.nussknacker.engine.flink.api.exception.{FlinkEspExceptionConsumer, FlinkEspExceptionConsumerProvider} +import pl.touk.nussknacker.engine.kafka.{DefaultProducerCreator, KafkaConfig, KafkaProducerCreator, KafkaUtils} import pl.touk.nussknacker.engine.kafka.serialization.KafkaSerializationSchema import pl.touk.nussknacker.engine.kafka.sharedproducer.WithSharedKafkaProducer -import pl.touk.nussknacker.engine.kafka.{DefaultProducerCreator, KafkaConfig, KafkaProducerCreator, KafkaUtils} import pl.touk.nussknacker.engine.util.SynchronousExecutionContextAndIORuntime import pl.touk.nussknacker.engine.util.config.ConfigEnrichments.RichConfig diff --git a/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/generic/DelayedFlinkKafkaConsumer.scala b/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/generic/DelayedFlinkKafkaConsumer.scala index 0f29f74707e..d2439ffcbde 100644 --- a/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/generic/DelayedFlinkKafkaConsumer.scala +++ b/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/generic/DelayedFlinkKafkaConsumer.scala @@ -31,17 +31,17 @@ import pl.touk.nussknacker.engine.flink.api.timestampwatermark.{ StandardTimestampWatermarkHandler, TimestampWatermarkHandler } +import pl.touk.nussknacker.engine.kafka.{KafkaConfig, KafkaUtils, PreparedKafkaTopic} import pl.touk.nussknacker.engine.kafka.generic.DelayedFlinkKafkaConsumer.ExtractTimestampForDelay import pl.touk.nussknacker.engine.kafka.serialization.FlinkSerializationSchemaConversions.wrapToFlinkDeserializationSchema import pl.touk.nussknacker.engine.kafka.serialization.KafkaDeserializationSchema import pl.touk.nussknacker.engine.kafka.source.delayed.DelayCalculator import pl.touk.nussknacker.engine.kafka.source.flink.FlinkKafkaConsumerHandlingExceptions -import pl.touk.nussknacker.engine.kafka.{KafkaConfig, KafkaUtils, PreparedKafkaTopic} +import java.{lang, time, util} import java.time.temporal.ChronoUnit import java.util.Properties import java.util.function.Consumer -import java.{lang, time, util} import scala.jdk.CollectionConverters._ object DelayedFlinkKafkaConsumer { diff --git a/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/generic/FlinkKafkaDelayedSourceImplFactory.scala b/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/generic/FlinkKafkaDelayedSourceImplFactory.scala index 5da3cee207e..e8c190f4fb7 100644 --- a/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/generic/FlinkKafkaDelayedSourceImplFactory.scala +++ b/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/generic/FlinkKafkaDelayedSourceImplFactory.scala @@ -14,19 +14,19 @@ import pl.touk.nussknacker.engine.flink.api.timestampwatermark.{ StandardTimestampWatermarkHandler, TimestampWatermarkHandler } +import pl.touk.nussknacker.engine.kafka.{KafkaConfig, PreparedKafkaTopic, RecordFormatter} import pl.touk.nussknacker.engine.kafka.serialization.KafkaDeserializationSchema import pl.touk.nussknacker.engine.kafka.source.KafkaSourceFactory.KafkaTestParametersInfo +import pl.touk.nussknacker.engine.kafka.source.delayed.{DelayCalculator, FixedDelayCalculator} import pl.touk.nussknacker.engine.kafka.source.delayed.DelayedKafkaSourceFactory.{ extractDelayInMillis, extractTimestampField } -import pl.touk.nussknacker.engine.kafka.source.delayed.{DelayCalculator, FixedDelayCalculator} import pl.touk.nussknacker.engine.kafka.source.flink.{ FlinkConsumerRecordBasedKafkaSource, FlinkKafkaSource, FlinkKafkaSourceImplFactory } -import pl.touk.nussknacker.engine.kafka.{KafkaConfig, PreparedKafkaTopic, RecordFormatter} /** * `createDelayedKafkaSourceWithFixedDelay` is used to create KafkaSource with specified fixed delay (eg 2 hours). diff --git a/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/generic/sinks.scala b/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/generic/sinks.scala index 66e9f789559..85145556b6a 100644 --- a/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/generic/sinks.scala +++ b/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/generic/sinks.scala @@ -2,10 +2,10 @@ package pl.touk.nussknacker.engine.kafka.generic import pl.touk.nussknacker.engine.api.LazyParameter import pl.touk.nussknacker.engine.api.process.{Sink, TopicName} +import pl.touk.nussknacker.engine.kafka.{KafkaConfig, PreparedKafkaTopic} import pl.touk.nussknacker.engine.kafka.serialization.KafkaSerializationSchema import pl.touk.nussknacker.engine.kafka.sink.KafkaSinkImplFactory import pl.touk.nussknacker.engine.kafka.sink.flink.FlinkKafkaSink -import pl.touk.nussknacker.engine.kafka.{KafkaConfig, PreparedKafkaTopic} //TODO: Move it to sink package object sinks { diff --git a/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/serialization/FlinkSerializationSchemaConversions.scala b/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/serialization/FlinkSerializationSchemaConversions.scala index cf9c0935e71..b44d3d40de6 100644 --- a/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/serialization/FlinkSerializationSchemaConversions.scala +++ b/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/serialization/FlinkSerializationSchemaConversions.scala @@ -7,9 +7,9 @@ import org.apache.flink.api.java.typeutils.ResultTypeQueryable import org.apache.flink.streaming.connectors.kafka import org.apache.kafka.clients.consumer.ConsumerRecord import org.apache.kafka.clients.producer.ProducerRecord +import pl.touk.nussknacker.engine.api.{Context, NodeId} import pl.touk.nussknacker.engine.api.component.{ComponentType, NodeComponentInfo} import pl.touk.nussknacker.engine.api.runtimecontext.ContextIdGenerator -import pl.touk.nussknacker.engine.api.{Context, NodeId} import pl.touk.nussknacker.engine.flink.api.exception.ExceptionHandler import pl.touk.nussknacker.engine.kafka.serialization diff --git a/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/sharedproducer/KafkaSharedProducer.scala b/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/sharedproducer/KafkaSharedProducer.scala index 79ae2cad3ee..b0d48a49f05 100644 --- a/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/sharedproducer/KafkaSharedProducer.scala +++ b/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/sharedproducer/KafkaSharedProducer.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.kafka.sharedproducer import com.typesafe.scalalogging.LazyLogging import org.apache.kafka.clients.producer.{Producer, ProducerRecord} -import pl.touk.nussknacker.engine.api.runtimecontext.EngineRuntimeContext import pl.touk.nussknacker.engine.api.{Lifecycle, MetaData} +import pl.touk.nussknacker.engine.api.runtimecontext.EngineRuntimeContext import pl.touk.nussknacker.engine.kafka.{KafkaProducerCreator, KafkaUtils} import pl.touk.nussknacker.engine.util.sharedservice.{SharedService, SharedServiceHolder} diff --git a/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/sink/flink/FlinkKafkaSink.scala b/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/sink/flink/FlinkKafkaSink.scala index 6b9b1ab00b0..5b16e14066b 100644 --- a/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/sink/flink/FlinkKafkaSink.scala +++ b/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/sink/flink/FlinkKafkaSink.scala @@ -2,15 +2,15 @@ package pl.touk.nussknacker.engine.kafka.sink.flink import org.apache.flink.api.common.functions.FlatMapFunction import org.apache.flink.streaming.api.functions.sink.SinkFunction -import pl.touk.nussknacker.engine.api.process.TopicName import pl.touk.nussknacker.engine.api.{Context, LazyParameter, ValueWithContext} +import pl.touk.nussknacker.engine.api.process.TopicName import pl.touk.nussknacker.engine.flink.api.process.{ BasicFlinkSink, FlinkCustomNodeContext, FlinkLazyParameterFunctionHelper } -import pl.touk.nussknacker.engine.kafka.serialization.KafkaSerializationSchema import pl.touk.nussknacker.engine.kafka.{KafkaConfig, PartitionByKeyFlinkKafkaProducer, PreparedKafkaTopic} +import pl.touk.nussknacker.engine.kafka.serialization.KafkaSerializationSchema import java.nio.charset.StandardCharsets diff --git a/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/flink/FlinkKafkaSource.scala b/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/flink/FlinkKafkaSource.scala index f76f4a6b6ca..281f07a80fd 100644 --- a/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/flink/FlinkKafkaSource.scala +++ b/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/flink/FlinkKafkaSource.scala @@ -25,15 +25,15 @@ import pl.touk.nussknacker.engine.flink.api.process.{ StandardFlinkSource, StandardFlinkSourceFunctionUtils } -import pl.touk.nussknacker.engine.flink.api.timestampwatermark.StandardTimestampWatermarkHandler.SimpleSerializableTimestampAssigner import pl.touk.nussknacker.engine.flink.api.timestampwatermark.{ StandardTimestampWatermarkHandler, TimestampWatermarkHandler } +import pl.touk.nussknacker.engine.flink.api.timestampwatermark.StandardTimestampWatermarkHandler.SimpleSerializableTimestampAssigner import pl.touk.nussknacker.engine.kafka._ import pl.touk.nussknacker.engine.kafka.serialization.FlinkSerializationSchemaConversions.{ - FlinkDeserializationSchemaWrapper, - wrapToFlinkDeserializationSchema + wrapToFlinkDeserializationSchema, + FlinkDeserializationSchemaWrapper } import pl.touk.nussknacker.engine.kafka.source.KafkaSourceFactory.KafkaTestParametersInfo import pl.touk.nussknacker.engine.kafka.source.flink.FlinkKafkaSource.OFFSET_RESET_STRATEGY_PARAM_NAME diff --git a/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/flink/FlinkKafkaSourceImplFactory.scala b/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/flink/FlinkKafkaSourceImplFactory.scala index 3f0be0b82d4..e50184f9c36 100644 --- a/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/flink/FlinkKafkaSourceImplFactory.scala +++ b/engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/flink/FlinkKafkaSourceImplFactory.scala @@ -7,9 +7,9 @@ import pl.touk.nussknacker.engine.api.context.transformation.NodeDependencyValue import pl.touk.nussknacker.engine.api.namespaces.NamingStrategy import pl.touk.nussknacker.engine.api.process.{ContextInitializer, Source, TopicName} import pl.touk.nussknacker.engine.flink.api.timestampwatermark.TimestampWatermarkHandler +import pl.touk.nussknacker.engine.kafka.{KafkaConfig, PreparedKafkaTopic, RecordFormatter} import pl.touk.nussknacker.engine.kafka.serialization.KafkaDeserializationSchema import pl.touk.nussknacker.engine.kafka.source.KafkaSourceFactory.{KafkaSourceImplFactory, KafkaTestParametersInfo} -import pl.touk.nussknacker.engine.kafka.{KafkaConfig, PreparedKafkaTopic, RecordFormatter} class FlinkKafkaSourceImplFactory[K, V]( protected val timestampAssigner: Option[TimestampWatermarkHandler[ConsumerRecord[K, V]]] diff --git a/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/consumerrecord/ConsumerRecordToJsonFormatterSpec.scala b/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/consumerrecord/ConsumerRecordToJsonFormatterSpec.scala index 8506837a79f..263a69139ba 100644 --- a/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/consumerrecord/ConsumerRecordToJsonFormatterSpec.scala +++ b/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/consumerrecord/ConsumerRecordToJsonFormatterSpec.scala @@ -11,11 +11,11 @@ import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.api.process.TopicName import pl.touk.nussknacker.engine.api.test.TestRecord import pl.touk.nussknacker.engine.kafka._ -import pl.touk.nussknacker.engine.kafka.source.flink.KafkaSourceFactoryMixin._ import pl.touk.nussknacker.engine.kafka.source.flink.{ KafkaSourceFactoryMixin, SampleConsumerRecordDeserializationSchemaFactory } +import pl.touk.nussknacker.engine.kafka.source.flink.KafkaSourceFactoryMixin._ import java.nio.charset.StandardCharsets import java.util.Optional diff --git a/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaExceptionConsumerSerializationSpec.scala b/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaExceptionConsumerSerializationSpec.scala index 7b5df7153e8..7b232bcff49 100644 --- a/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaExceptionConsumerSerializationSpec.scala +++ b/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaExceptionConsumerSerializationSpec.scala @@ -4,9 +4,9 @@ import org.apache.kafka.clients.producer.MockProducer import org.apache.kafka.common.serialization.ByteArraySerializer import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.{CirceUtil, Context, MetaData, StreamMetaData, VariableConstants} import pl.touk.nussknacker.engine.api.component.{ComponentType, NodeComponentInfo} import pl.touk.nussknacker.engine.api.exception.{NonTransientException, NuExceptionInfo} -import pl.touk.nussknacker.engine.api.{CirceUtil, Context, MetaData, StreamMetaData, VariableConstants} import pl.touk.nussknacker.engine.kafka.MockProducerCreator import pl.touk.nussknacker.engine.util.json.ToJsonEncoder diff --git a/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaExceptionConsumerSpec.scala b/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaExceptionConsumerSpec.scala index 90c8a242ce2..75e1c24197c 100644 --- a/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaExceptionConsumerSpec.scala +++ b/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaExceptionConsumerSpec.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.engine.kafka.exception import com.typesafe.config.ConfigValueFactory.fromAnyRef +import org.scalatest.{EitherValues, OptionValues} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{EitherValues, OptionValues} import pl.touk.nussknacker.engine.api.component.ComponentDefinition import pl.touk.nussknacker.engine.api.process.SinkFactory import pl.touk.nussknacker.engine.build.ScenarioBuilder diff --git a/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactoryDefinitionExtractorSpec.scala b/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactoryDefinitionExtractorSpec.scala index 646833227bb..e212da282fc 100644 --- a/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactoryDefinitionExtractorSpec.scala +++ b/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactoryDefinitionExtractorSpec.scala @@ -1,12 +1,13 @@ package pl.touk.nussknacker.engine.kafka.source.flink -import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.definition.clazz.{ClassDefinition, StaticMethodDefinition} -import KafkaSourceFactoryMixin.{SampleKey, SampleValue} import io.circe.Json import pl.touk.nussknacker.engine.api.generics.MethodTypeInfo +import pl.touk.nussknacker.engine.api.typed.typing.Typed +import pl.touk.nussknacker.engine.definition.clazz.{ClassDefinition, StaticMethodDefinition} import pl.touk.nussknacker.engine.kafka.source.flink.KafkaSourceFactoryProcessConfigCreator.ResultsHolders +import KafkaSourceFactoryMixin.{SampleKey, SampleValue} + class KafkaSourceFactoryDefinitionExtractorSpec extends KafkaSourceFactoryProcessMixin { test( diff --git a/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactoryMixin.scala b/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactoryMixin.scala index abfdafd5c97..603af8f0a66 100644 --- a/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactoryMixin.scala +++ b/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactoryMixin.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.kafka.source.flink -import io.circe.generic.JsonCodec import io.circe.{Decoder, Encoder} +import io.circe.generic.JsonCodec import org.apache.kafka.clients.consumer.ConsumerRecord import org.apache.kafka.clients.producer.{ProducerRecord, RecordMetadata} import org.apache.kafka.common.header.Headers @@ -13,6 +13,7 @@ import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.api.CirceUtil.decodeJsonUnsafe import pl.touk.nussknacker.engine.api.DisplayJsonWithEncoder import pl.touk.nussknacker.engine.api.process.ProcessObjectDependencies +import pl.touk.nussknacker.engine.kafka.{serialization, KafkaConfig, KafkaRecordUtils, KafkaSpec} import pl.touk.nussknacker.engine.kafka.consumerrecord.{ ConsumerRecordDeserializationSchemaFactory, ConsumerRecordToJsonFormatterFactory @@ -20,7 +21,6 @@ import pl.touk.nussknacker.engine.kafka.consumerrecord.{ import pl.touk.nussknacker.engine.kafka.serialization.schemas.BaseSimpleSerializationSchema import pl.touk.nussknacker.engine.kafka.source.KafkaSourceFactory import pl.touk.nussknacker.engine.kafka.source.flink.KafkaSourceFactoryMixin._ -import pl.touk.nussknacker.engine.kafka.{KafkaConfig, KafkaRecordUtils, KafkaSpec, serialization} import pl.touk.nussknacker.test.PatientScalaFutures import java.nio.charset.StandardCharsets diff --git a/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactoryProcessConfigCreator.scala b/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactoryProcessConfigCreator.scala index 47af93f2b7c..8b78f0eb0cc 100644 --- a/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactoryProcessConfigCreator.scala +++ b/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactoryProcessConfigCreator.scala @@ -6,18 +6,18 @@ import pl.touk.nussknacker.engine.api.CustomStreamTransformer import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.kafka.consumerrecord.ConsumerRecordToJsonFormatterFactory +import pl.touk.nussknacker.engine.kafka.source.{InputMeta, KafkaSourceFactory} import pl.touk.nussknacker.engine.kafka.source.flink.KafkaSourceFactoryMixin.{ + createDeserializer, SampleKey, - SampleValue, - createDeserializer + SampleValue } import pl.touk.nussknacker.engine.kafka.source.flink.KafkaSourceFactoryProcessConfigCreator.{ KafkaConsumerRecordSourceHelper, ResultsHolders } -import pl.touk.nussknacker.engine.kafka.source.{InputMeta, KafkaSourceFactory} -import pl.touk.nussknacker.engine.process.helpers.SampleNodes.{ExtractAndTransformTimestamp, SinkForStrings} import pl.touk.nussknacker.engine.process.helpers.{SinkForType, TestResultsHolder} +import pl.touk.nussknacker.engine.process.helpers.SampleNodes.{ExtractAndTransformTimestamp, SinkForStrings} import scala.reflect.ClassTag diff --git a/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactoryProcessMixin.scala b/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactoryProcessMixin.scala index 24c47ea8b8b..81aebf4cf0f 100644 --- a/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactoryProcessMixin.scala +++ b/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactoryProcessMixin.scala @@ -6,9 +6,9 @@ import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess -import pl.touk.nussknacker.engine.flink.test.ScalatestMiniClusterJobStatusCheckingOps.miniClusterWithServicesToOps import pl.touk.nussknacker.engine.deployment.DeploymentData import pl.touk.nussknacker.engine.flink.test.{FlinkSpec, RecordingExceptionConsumer} +import pl.touk.nussknacker.engine.flink.test.ScalatestMiniClusterJobStatusCheckingOps.miniClusterWithServicesToOps import pl.touk.nussknacker.engine.kafka.KafkaFactory.{SinkValueParamName, TopicParamName} import pl.touk.nussknacker.engine.kafka.source.InputMeta import pl.touk.nussknacker.engine.kafka.source.flink.KafkaSourceFactoryMixin.ObjToSerialize diff --git a/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactorySpec.scala b/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactorySpec.scala index 5f51a473537..9eb9a2acaf4 100644 --- a/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactorySpec.scala +++ b/engine/flink/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/flink/KafkaSourceFactorySpec.scala @@ -4,18 +4,18 @@ import org.apache.kafka.clients.consumer.ConsumerRecord import org.apache.kafka.common.record.TimestampType import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.{MetaData, NodeId, Params, StreamMetaData, VariableConstants} import pl.touk.nussknacker.engine.api.context.transformation.TypedNodeDependencyValue import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.api.typed.ReturningType import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{MetaData, NodeId, Params, StreamMetaData, VariableConstants} import pl.touk.nussknacker.engine.flink.api.process.FlinkSourceTestSupport +import pl.touk.nussknacker.engine.kafka.{KafkaRecordUtils, KafkaSpec} import pl.touk.nussknacker.engine.kafka.KafkaFactory.TopicParamName import pl.touk.nussknacker.engine.kafka.serialization.schemas.SimpleSerializationSchema +import pl.touk.nussknacker.engine.kafka.source.{KafkaContextInitializer, KafkaSourceFactory} import pl.touk.nussknacker.engine.kafka.source.KafkaSourceFactory.KafkaSourceFactoryState import pl.touk.nussknacker.engine.kafka.source.flink.KafkaSourceFactoryMixin._ -import pl.touk.nussknacker.engine.kafka.source.{KafkaContextInitializer, KafkaSourceFactory} -import pl.touk.nussknacker.engine.kafka.{KafkaRecordUtils, KafkaSpec} import pl.touk.nussknacker.test.PatientScalaFutures import java.util.Optional diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/DevProcessConfigCreator.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/DevProcessConfigCreator.scala index 6de9d8f782c..6899ce4b77f 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/DevProcessConfigCreator.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/DevProcessConfigCreator.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.engine.management.sample import com.cronutils.model.CronType import com.cronutils.model.definition.CronDefinitionBuilder import com.cronutils.parser.CronParser -import io.circe.parser.decode import io.circe.{Decoder, Encoder} +import io.circe.parser.decode import org.apache.flink.api.common.serialization.{DeserializationSchema, SimpleStringSchema} import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.streaming.api.functions.sink.DiscardingSink diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/component/SampleComponentProvider.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/component/SampleComponentProvider.scala index 55a66e1fffc..36af293c5d7 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/component/SampleComponentProvider.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/component/SampleComponentProvider.scala @@ -2,6 +2,7 @@ package pl.touk.nussknacker.engine.management.sample.component import com.typesafe.config.{Config, ConfigValueFactory} import net.ceedubs.ficus.Ficus._ +import pl.touk.nussknacker.engine.api.{ContextId, MetaData} import pl.touk.nussknacker.engine.api.component.{ComponentDefinition, ComponentProvider, NussknackerVersion} import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.parameter.ParameterName @@ -9,7 +10,6 @@ import pl.touk.nussknacker.engine.api.process.{ComponentUseCase, ProcessObjectDe import pl.touk.nussknacker.engine.api.test.InvocationCollectors import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{ContextId, MetaData} import pl.touk.nussknacker.engine.util.service.EagerServiceWithStaticParametersAndReturnType import scala.concurrent.{ExecutionContext, Future} diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/dict/BooleanDictionary.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/dict/BooleanDictionary.scala index 8b433b6d204..ef29b6576f4 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/dict/BooleanDictionary.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/dict/BooleanDictionary.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.management.sample.dict -import pl.touk.nussknacker.engine.api.dict.embedded.EmbeddedDictDefinition import pl.touk.nussknacker.engine.api.dict.{DictDefinition, DictInstance, ReturningKeyWithoutTransformation} +import pl.touk.nussknacker.engine.api.dict.embedded.EmbeddedDictDefinition import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.Typed diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/dict/IntegerDictionary.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/dict/IntegerDictionary.scala index 02a29313783..1961cfe09b9 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/dict/IntegerDictionary.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/dict/IntegerDictionary.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.management.sample.dict -import pl.touk.nussknacker.engine.api.dict.embedded.EmbeddedDictDefinition import pl.touk.nussknacker.engine.api.dict.{DictDefinition, DictInstance, ReturningKeyWithoutTransformation} +import pl.touk.nussknacker.engine.api.dict.embedded.EmbeddedDictDefinition import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.Typed diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/dict/LongDictionary.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/dict/LongDictionary.scala index 9458211aca3..1fe0c76a991 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/dict/LongDictionary.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/dict/LongDictionary.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.management.sample.dict -import pl.touk.nussknacker.engine.api.dict.embedded.EmbeddedDictDefinition import pl.touk.nussknacker.engine.api.dict.{DictDefinition, DictInstance, ReturningKeyWithoutTransformation} +import pl.touk.nussknacker.engine.api.dict.embedded.EmbeddedDictDefinition import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.Typed diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/global/ConfigTypedGlobalVariable.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/global/ConfigTypedGlobalVariable.scala index b7949097dba..5c5cbe089a2 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/global/ConfigTypedGlobalVariable.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/global/ConfigTypedGlobalVariable.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.management.sample.global import pl.touk.nussknacker.engine.api.MetaData -import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult} import pl.touk.nussknacker.engine.api.typed.{TypedGlobalVariable, TypedMap} +import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult} /** * Returns sample configuration - list of typed maps, based on environment property from process properties. diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/global/DocumentationFunctions.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/global/DocumentationFunctions.scala index 768f8f202a4..0d04ddc7144 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/global/DocumentationFunctions.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/global/DocumentationFunctions.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.management.sample.global import cats.data.{NonEmptyList, ValidatedNel} import cats.implicits.catsSyntaxValidatedId -import pl.touk.nussknacker.engine.api.generics.GenericFunctionTypingError.{ArgumentTypeError, OtherError} import pl.touk.nussknacker.engine.api.generics._ +import pl.touk.nussknacker.engine.api.generics.GenericFunctionTypingError.{ArgumentTypeError, OtherError} import pl.touk.nussknacker.engine.api.typed.supertype.CommonSupertypeFinder import pl.touk.nussknacker.engine.api.typed.typing._ diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/global/ExampleFunctions.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/global/ExampleFunctions.scala index 8c998464dd1..163cd284160 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/global/ExampleFunctions.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/global/ExampleFunctions.scala @@ -3,7 +3,6 @@ package pl.touk.nussknacker.engine.management.sample.global import cats.data.{NonEmptyList, ValidatedNel} import cats.implicits.catsSyntaxValidatedId import pl.touk.nussknacker.engine.api.Documentation -import pl.touk.nussknacker.engine.api.generics.GenericFunctionTypingError.ArgumentTypeError import pl.touk.nussknacker.engine.api.generics.{ GenericFunctionTypingError, GenericType, @@ -11,6 +10,7 @@ import pl.touk.nussknacker.engine.api.generics.{ Parameter, TypingFunction } +import pl.touk.nussknacker.engine.api.generics.GenericFunctionTypingError.ArgumentTypeError import pl.touk.nussknacker.engine.api.typed.typing.{ Typed, TypedClass, diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/helper/DateProcessHelper.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/helper/DateProcessHelper.scala index 5c65dd0aea5..3a808478793 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/helper/DateProcessHelper.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/helper/DateProcessHelper.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.engine.management.sample.helper -import java.time.LocalDateTime - import pl.touk.nussknacker.engine.api.{Documentation, HideToString, ParamName} +import java.time.LocalDateTime + object DateProcessHelper extends HideToString { @Documentation( diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/CampaignService.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/CampaignService.scala index 1ffb9b78777..12783eec987 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/CampaignService.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/CampaignService.scala @@ -1,11 +1,11 @@ package pl.touk.nussknacker.engine.management.sample.service -import javax.annotation.Nullable -import javax.validation.constraints.NotBlank +import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, Service} import pl.touk.nussknacker.engine.api.editor._ import pl.touk.nussknacker.engine.api.validation.CompileTimeEvaluableValue -import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, Service} +import javax.annotation.Nullable +import javax.validation.constraints.NotBlank import scala.concurrent.Future object CampaignService extends Service with Serializable { diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/ClientFakeHttpService.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/ClientFakeHttpService.scala index 69fae0755fe..ead15870c52 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/ClientFakeHttpService.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/ClientFakeHttpService.scala @@ -1,12 +1,12 @@ package pl.touk.nussknacker.engine.management.sample.service import io.circe.generic.JsonCodec +import pl.touk.nussknacker.engine.api.{DisplayJsonWithEncoder, MethodToInvoke, ParamName, Service} import pl.touk.nussknacker.engine.api.test.InvocationCollectors.{ CollectableAction, ServiceInvocationCollector, TransmissionNames } -import pl.touk.nussknacker.engine.api.{DisplayJsonWithEncoder, MethodToInvoke, ParamName, Service} import pl.touk.nussknacker.engine.management.sample.dto.Client import scala.concurrent.{ExecutionContext, Future} diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/ConfiguratorService.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/ConfiguratorService.scala index 62a9fc9dc8d..6f8647863dd 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/ConfiguratorService.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/ConfiguratorService.scala @@ -1,11 +1,11 @@ package pl.touk.nussknacker.engine.management.sample.service -import javax.annotation.Nullable -import javax.validation.constraints.NotBlank +import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, Service} import pl.touk.nussknacker.engine.api.editor.{DualEditor, DualEditorMode, SimpleEditor, SimpleEditorType} import pl.touk.nussknacker.engine.api.validation.CompileTimeEvaluableValue -import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, Service} +import javax.annotation.Nullable +import javax.validation.constraints.NotBlank import scala.concurrent.Future object ConfiguratorService extends Service with Serializable { diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/CustomValidatedService.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/CustomValidatedService.scala index abe2d86aa70..7f5036c55fd 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/CustomValidatedService.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/CustomValidatedService.scala @@ -1,10 +1,10 @@ package pl.touk.nussknacker.engine.management.sample.service -import cats.data.Validated.Valid import cats.data.{Validated, ValidatedNel} +import cats.data.Validated.Valid import pl.touk.nussknacker.engine.api._ -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError import pl.touk.nussknacker.engine.api.context.{ContextTransformation, ProcessCompilationError} +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.ComponentUseCase import pl.touk.nussknacker.engine.api.test.InvocationCollectors diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/DatesTypesService.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/DatesTypesService.scala index 42dbf939060..57736e10f7d 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/DatesTypesService.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/DatesTypesService.scala @@ -1,12 +1,11 @@ package pl.touk.nussknacker.engine.management.sample.service -import java.time.{Duration, LocalDate, LocalDateTime, LocalTime, Period, ZonedDateTime} -import java.time.temporal.ChronoUnit - import com.cronutils.model.Cron import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, Service} import pl.touk.nussknacker.engine.api.editor.{DualEditor, DualEditorMode, SimpleEditor, SimpleEditorType} +import java.time.{Duration, LocalDate, LocalDateTime, LocalTime, Period, ZonedDateTime} +import java.time.temporal.ChronoUnit import scala.concurrent.Future class DatesTypesService extends Service with Serializable { diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/DynamicMultipleParamsService.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/DynamicMultipleParamsService.scala index 59f379af871..afc157e3204 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/DynamicMultipleParamsService.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/DynamicMultipleParamsService.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.management.sample.service -import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.{Context, EagerService, NodeId, Params, ServiceInvoker} +import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.context.transformation.{ DefinedEagerParameter, NodeDependencyValue, @@ -13,11 +13,11 @@ import pl.touk.nussknacker.engine.api.definition.{ NodeDependency, Parameter } +import pl.touk.nussknacker.engine.api.definition.FixedExpressionValue.nullFixedValue +import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.ComponentUseCase import pl.touk.nussknacker.engine.api.test.InvocationCollectors import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.definition.FixedExpressionValue.nullFixedValue -import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.graph.expression.Expression import scala.concurrent.{ExecutionContext, Future} diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/DynamicService.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/DynamicService.scala index 6ffb3ea507b..d3d57dd8608 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/DynamicService.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/DynamicService.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.engine.management.sample.service import org.apache.commons.io.FileUtils +import pl.touk.nussknacker.engine.api.{ContextId, MetaData} import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.ComponentUseCase import pl.touk.nussknacker.engine.api.test.InvocationCollectors.ServiceInvocationCollector import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{ContextId, MetaData} import pl.touk.nussknacker.engine.util.service.EagerServiceWithStaticParametersAndReturnType import java.io.File diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/MeetingService.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/MeetingService.scala index 9c2cdca7242..442b03bfa48 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/MeetingService.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/MeetingService.scala @@ -1,14 +1,13 @@ package pl.touk.nussknacker.engine.management.sample.service -import java.time._ -import java.time.temporal.ChronoUnit - import com.cronutils.model.Cron -import javax.annotation.Nullable -import pl.touk.nussknacker.engine.api.editor.{DualEditor, DualEditorMode, SimpleEditor, SimpleEditorType} import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, Service} +import pl.touk.nussknacker.engine.api.editor.{DualEditor, DualEditorMode, SimpleEditor, SimpleEditorType} import pl.touk.nussknacker.engine.util.service.TimeMeasuringService +import java.time._ +import java.time.temporal.ChronoUnit +import javax.annotation.Nullable import scala.concurrent.{ExecutionContext, Future} object MeetingService extends Service with Serializable with TimeMeasuringService { diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/MultipleParamsService.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/MultipleParamsService.scala index c40b6429b53..0c7859f1f57 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/MultipleParamsService.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/MultipleParamsService.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.management.sample.service -import pl.touk.nussknacker.engine.api.editor.{DualEditor, DualEditorMode, SimpleEditor, SimpleEditorType} import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, Service} +import pl.touk.nussknacker.engine.api.editor.{DualEditor, DualEditorMode, SimpleEditor, SimpleEditorType} import scala.concurrent.Future diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/OptionalTypesService.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/OptionalTypesService.scala index 1d423d7946c..2d3b096984d 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/OptionalTypesService.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/OptionalTypesService.scala @@ -1,11 +1,10 @@ package pl.touk.nussknacker.engine.management.sample.service +import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, Service} + import java.time.LocalDateTime import java.util.Optional - import javax.annotation.Nullable -import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, Service} - import scala.concurrent.Future class OptionalTypesService extends Service with Serializable { diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/SampleServices.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/SampleServices.scala index bc4cc0d0cb0..00899184375 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/SampleServices.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/SampleServices.scala @@ -1,15 +1,15 @@ package pl.touk.nussknacker.engine.management.sample.service -import java.util import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, Service} import pl.touk.nussknacker.engine.api.editor.{LabeledExpression, SimpleEditor, SimpleEditorType} -import pl.touk.nussknacker.engine.management.sample.dto.{ComplexObject, RichObject} import pl.touk.nussknacker.engine.management.sample.TariffType +import pl.touk.nussknacker.engine.management.sample.dto.{ComplexObject, RichObject} import pl.touk.sample.JavaSampleEnum +import java.util import java.util.Optional -import scala.jdk.CollectionConverters._ import scala.concurrent.Future +import scala.jdk.CollectionConverters._ case object EmptyService extends Service { @MethodToInvoke diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/ServiceWithDictParameterEditor.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/ServiceWithDictParameterEditor.scala index ebb87d1c7f2..7829207ffb3 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/ServiceWithDictParameterEditor.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/ServiceWithDictParameterEditor.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.management.sample.service -import pl.touk.nussknacker.engine.api.editor.{DualEditor, DualEditorMode, SimpleEditor, SimpleEditorType} import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, Service} +import pl.touk.nussknacker.engine.api.editor.{DualEditor, DualEditorMode, SimpleEditor, SimpleEditorType} import pl.touk.nussknacker.engine.util.service.TimeMeasuringService import scala.concurrent.Future diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/SimpleTypesService.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/SimpleTypesService.scala index b371aa43644..5191d098325 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/SimpleTypesService.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/SimpleTypesService.scala @@ -1,10 +1,10 @@ package pl.touk.nussknacker.engine.management.sample.service -import javax.validation.constraints.NotBlank +import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, Service} import pl.touk.nussknacker.engine.api.editor._ import pl.touk.nussknacker.engine.api.validation.CompileTimeEvaluableValue -import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, Service} +import javax.validation.constraints.NotBlank import scala.concurrent.Future // In services all parameters are lazy evaluated diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/UnionReturnObjectService.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/UnionReturnObjectService.scala index 1db2210e10f..60e03c51e59 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/UnionReturnObjectService.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/UnionReturnObjectService.scala @@ -1,12 +1,12 @@ package pl.touk.nussknacker.engine.management.sample.service +import pl.touk.nussknacker.engine.api.{ContextId, MetaData} import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.ComponentUseCase import pl.touk.nussknacker.engine.api.test.InvocationCollectors.ServiceInvocationCollector import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{ContextId, MetaData} import pl.touk.nussknacker.engine.util.service.EagerServiceWithStaticParametersAndReturnType import scala.concurrent.{ExecutionContext, Future} diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/sink/LiteDeadEndSink.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/sink/LiteDeadEndSink.scala index dc972d131e5..4349fc1491d 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/sink/LiteDeadEndSink.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/sink/LiteDeadEndSink.scala @@ -4,9 +4,10 @@ import cats.Monad import cats.data.Writer import pl.touk.nussknacker.engine.api.Context import pl.touk.nussknacker.engine.api.typed.typing -import pl.touk.nussknacker.engine.lite.api.commonTypes.ResultType import pl.touk.nussknacker.engine.lite.api.{commonTypes, customComponentTypes} +import pl.touk.nussknacker.engine.lite.api.commonTypes.ResultType import pl.touk.nussknacker.engine.lite.api.customComponentTypes.LiteSink + import scala.language.higherKinds // copy-paste from lite base components to avoid dependency to many utils diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/BoundedSource.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/BoundedSource.scala index a403d73ed01..a35fef0de60 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/BoundedSource.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/BoundedSource.scala @@ -2,13 +2,13 @@ package pl.touk.nussknacker.engine.management.sample.source import org.apache.flink.streaming.api.datastream.DataStreamSource import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment +import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName} import pl.touk.nussknacker.engine.api.component.{ParameterConfig, UnboundedStreamComponent} import pl.touk.nussknacker.engine.api.definition.RawParameterEditor import pl.touk.nussknacker.engine.api.deployment.{ScenarioActionName, WithActionParametersSupport} import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.SourceFactory import pl.touk.nussknacker.engine.api.typed.typing.Unknown -import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName} import pl.touk.nussknacker.engine.flink.api.process.FlinkCustomNodeContext import pl.touk.nussknacker.engine.flink.util.source.CollectionSource diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/DynamicParametersSource.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/DynamicParametersSource.scala index ea4d85e6431..e3525e07860 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/DynamicParametersSource.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/DynamicParametersSource.scala @@ -1,5 +1,6 @@ package pl.touk.nussknacker.engine.management.sample.source +import pl.touk.nussknacker.engine.api.{NodeId, Params} import pl.touk.nussknacker.engine.api.component.UnboundedStreamComponent import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.context.transformation.{BaseDefinedParameter, NodeDependencyValue} @@ -7,7 +8,6 @@ import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.SourceFactory import pl.touk.nussknacker.engine.api.typed.TypedMap import pl.touk.nussknacker.engine.api.typed.typing.{Typed, Unknown} -import pl.touk.nussknacker.engine.api.{NodeId, Params} import pl.touk.nussknacker.engine.flink.util.source.CollectionSource import pl.touk.nussknacker.engine.management.sample.transformer.DynamicParametersMixin diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/GenericSourceWithCustomVariablesSample.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/GenericSourceWithCustomVariablesSample.scala index 27f65285391..ee84902a721 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/GenericSourceWithCustomVariablesSample.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/GenericSourceWithCustomVariablesSample.scala @@ -2,16 +2,16 @@ package pl.touk.nussknacker.engine.management.sample.source import cats.data.ValidatedNel import io.circe.Json +import pl.touk.nussknacker.engine.api.{CirceUtil, Context, NodeId, Params} import pl.touk.nussknacker.engine.api.component.UnboundedStreamComponent -import pl.touk.nussknacker.engine.api.context.transformation.{NodeDependencyValue, SingleInputDynamicComponent} import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext} +import pl.touk.nussknacker.engine.api.context.transformation.{NodeDependencyValue, SingleInputDynamicComponent} import pl.touk.nussknacker.engine.api.definition.{NodeDependency, Parameter, ParameterDeclaration} import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.api.runtimecontext.ContextIdGenerator import pl.touk.nussknacker.engine.api.test.{TestData, TestRecord, TestRecordParser} import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{CirceUtil, Context, NodeId, Params} import pl.touk.nussknacker.engine.flink.api.process._ import pl.touk.nussknacker.engine.flink.api.timestampwatermark.TimestampWatermarkHandler import pl.touk.nussknacker.engine.flink.util.source.CollectionSource diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/LiteCsvSource.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/LiteCsvSource.scala index 4c8d7f2912e..e0e69b3c9c2 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/LiteCsvSource.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/LiteCsvSource.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.engine.management.sample.source import io.circe.Json +import pl.touk.nussknacker.engine.api.{CirceUtil, Context, NodeId, VariableConstants} import pl.touk.nussknacker.engine.api.process.{SourceTestSupport, TestDataGenerator} import pl.touk.nussknacker.engine.api.test.{TestData, TestRecord, TestRecordParser} -import pl.touk.nussknacker.engine.api.{CirceUtil, Context, NodeId, VariableConstants} import pl.touk.nussknacker.engine.lite.api.utils.sources.BaseLiteSource import pl.touk.nussknacker.engine.management.sample.dto.CsvRecord diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/SqlSource.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/SqlSource.scala index fdccb9b7a4a..2f5c73c2610 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/SqlSource.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/source/SqlSource.scala @@ -1,10 +1,10 @@ package pl.touk.nussknacker.engine.management.sample.source +import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, TemplateEvaluationResult} import pl.touk.nussknacker.engine.api.component.UnboundedStreamComponent import pl.touk.nussknacker.engine.api.editor.{SimpleEditor, SimpleEditorType} import pl.touk.nussknacker.engine.api.process.SourceFactory import pl.touk.nussknacker.engine.api.typed.typing.Unknown -import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, TemplateEvaluationResult} import pl.touk.nussknacker.engine.flink.util.source.CollectionSource //It's only for test FE sql editor diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/DynamicParametersMixin.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/DynamicParametersMixin.scala index c5bb21d1793..6149f6456d7 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/DynamicParametersMixin.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/DynamicParametersMixin.scala @@ -1,5 +1,9 @@ package pl.touk.nussknacker.engine.management.sample.transformer +import pl.touk.nussknacker.engine.api.MetaData +import pl.touk.nussknacker.engine.api.NodeId +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError +import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.context.transformation.{ BaseDefinedParameter, DefinedEagerParameter, @@ -14,10 +18,6 @@ import pl.touk.nussknacker.engine.api.definition.{ Parameter, TypedNodeDependency } -import pl.touk.nussknacker.engine.api.MetaData -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError -import pl.touk.nussknacker.engine.api.context.ValidationContext -import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.parameter.ParameterName trait DynamicParametersMixin extends SingleInputDynamicComponent[AnyRef] { diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/DynamicParametersTransformer.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/DynamicParametersTransformer.scala index f827aeca698..441abcae270 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/DynamicParametersTransformer.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/DynamicParametersTransformer.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.management.sample.transformer -import pl.touk.nussknacker.engine.api.context.transformation._ import pl.touk.nussknacker.engine.api.{CustomStreamTransformer, Params, ValueWithContext} +import pl.touk.nussknacker.engine.api.context.transformation._ import pl.touk.nussknacker.engine.flink.api.process.FlinkCustomStreamTransformation object DynamicParametersTransformer extends CustomStreamTransformer with DynamicParametersMixin { diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/EnrichWithAdditionalDataTransformer.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/EnrichWithAdditionalDataTransformer.scala index d8300b45b13..f9d41d750ab 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/EnrichWithAdditionalDataTransformer.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/EnrichWithAdditionalDataTransformer.scala @@ -4,11 +4,6 @@ import org.apache.flink.api.common.state.ValueStateDescriptor import org.apache.flink.streaming.api.datastream.DataStream import org.apache.flink.streaming.api.functions.co.KeyedCoProcessFunction import org.apache.flink.util.Collector -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError -import pl.touk.nussknacker.engine.api.context.{OutputVar, ValidationContext} -import pl.touk.nussknacker.engine.api.context.transformation._ -import pl.touk.nussknacker.engine.api.definition._ -import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.{ Context, CustomStreamTransformer, @@ -17,6 +12,11 @@ import pl.touk.nussknacker.engine.api.{ Params, ValueWithContext } +import pl.touk.nussknacker.engine.api.context.{OutputVar, ValidationContext} +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError +import pl.touk.nussknacker.engine.api.context.transformation._ +import pl.touk.nussknacker.engine.api.definition._ +import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.flink.api.process.{ FlinkCustomJoinTransformation, FlinkCustomNodeContext, diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/HidingVariablesTransformer.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/HidingVariablesTransformer.scala index 7771d3295d6..e1a42027dbf 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/HidingVariablesTransformer.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/HidingVariablesTransformer.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.engine.management.sample.transformer import pl.touk.nussknacker.engine.api.{CustomStreamTransformer, Params} +import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.context.transformation.{NodeDependencyValue, SingleInputDynamicComponent} import pl.touk.nussknacker.engine.api.definition.{NodeDependency, Parameter} +import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.typed.typing.Typed import pl.touk.nussknacker.engine.flink.api.process.FlinkCustomStreamTransformation -import pl.touk.nussknacker.engine.api.NodeId -import pl.touk.nussknacker.engine.api.parameter.ParameterName object HidingVariablesTransformer extends CustomStreamTransformer diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/JoinTransformerWithEditors.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/JoinTransformerWithEditors.scala index 76fa7c9366b..07c75a243e1 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/JoinTransformerWithEditors.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/JoinTransformerWithEditors.scala @@ -2,13 +2,13 @@ package pl.touk.nussknacker.engine.management.sample.transformer import cats.data.Validated.Invalid import pl.touk.nussknacker.engine.api._ +import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.context.{ ContextTransformation, JoinContextTransformation, OutputVar, ProcessCompilationError } -import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.sample.JavaSampleEnum diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/LastVariableFilterTransformer.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/LastVariableFilterTransformer.scala index 4e4b5bf9a05..b7fa9513f51 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/LastVariableFilterTransformer.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/LastVariableFilterTransformer.scala @@ -4,6 +4,7 @@ import org.apache.flink.api.common.state.ValueStateDescriptor import org.apache.flink.streaming.api.datastream.DataStream import org.apache.flink.streaming.api.functions.KeyedProcessFunction import org.apache.flink.util.Collector +import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.context.transformation.{ DefinedLazyParameter, @@ -12,9 +13,8 @@ import pl.touk.nussknacker.engine.api.context.transformation.{ SingleInputDynamicComponent } import pl.touk.nussknacker.engine.api.definition._ -import pl.touk.nussknacker.engine.api.typed.typing.{TypingResult, Unknown} -import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.parameter.ParameterName +import pl.touk.nussknacker.engine.api.typed.typing.{TypingResult, Unknown} import pl.touk.nussknacker.engine.flink.api.process.{ FlinkCustomNodeContext, FlinkCustomStreamTransformation, diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/StatefulTransformer.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/StatefulTransformer.scala index 1eaf4f30789..19d77efbe0d 100644 --- a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/StatefulTransformer.scala +++ b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/transformer/StatefulTransformer.scala @@ -11,8 +11,8 @@ import pl.touk.nussknacker.engine.api.{ ParamName, ValueWithContext } -import pl.touk.nussknacker.engine.flink.api.process.{FlinkCustomNodeContext, FlinkCustomStreamTransformation} import pl.touk.nussknacker.engine.flink.api.datastream.DataStreamImplicits.DataStreamExtension +import pl.touk.nussknacker.engine.flink.api.process.{FlinkCustomNodeContext, FlinkCustomStreamTransformation} import java.util diff --git a/engine/flink/management/dev-model/src/test/scala/pl/touk/nussknacker/engine/process/CronEditorTest.scala b/engine/flink/management/dev-model/src/test/scala/pl/touk/nussknacker/engine/process/CronEditorTest.scala index 0b84bc1d380..25dd2c58fff 100644 --- a/engine/flink/management/dev-model/src/test/scala/pl/touk/nussknacker/engine/process/CronEditorTest.scala +++ b/engine/flink/management/dev-model/src/test/scala/pl/touk/nussknacker/engine/process/CronEditorTest.scala @@ -3,11 +3,11 @@ package pl.touk.nussknacker.engine.process import com.typesafe.config.ConfigFactory import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.typed.typing.Unknown import pl.touk.nussknacker.engine.compile.ExpressionCompiler import pl.touk.nussknacker.engine.graph.expression.Expression -import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.management.sample.DevProcessConfigCreator import pl.touk.nussknacker.engine.testing.LocalModelData diff --git a/engine/flink/management/dev-model/src/test/scala/pl/touk/nussknacker/engine/process/SampleComponentProviderTest.scala b/engine/flink/management/dev-model/src/test/scala/pl/touk/nussknacker/engine/process/SampleComponentProviderTest.scala index b9b9a5536e1..b3398526410 100644 --- a/engine/flink/management/dev-model/src/test/scala/pl/touk/nussknacker/engine/process/SampleComponentProviderTest.scala +++ b/engine/flink/management/dev-model/src/test/scala/pl/touk/nussknacker/engine/process/SampleComponentProviderTest.scala @@ -3,6 +3,7 @@ package pl.touk.nussknacker.engine.process import com.typesafe.config.{Config, ConfigFactory} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.{ClassLoaderModelData, ConfigWithUnresolvedVersion} import pl.touk.nussknacker.engine.api.component.DesignerWideComponentId import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess @@ -12,7 +13,6 @@ import pl.touk.nussknacker.engine.flink.test.ScalatestMiniClusterJobStatusChecki import pl.touk.nussknacker.engine.process.runner.FlinkScenarioUnitTestJob import pl.touk.nussknacker.engine.spel.SpelExtension._ import pl.touk.nussknacker.engine.util.loader.ModelClassLoader -import pl.touk.nussknacker.engine.{ClassLoaderModelData, ConfigWithUnresolvedVersion} class SampleComponentProviderTest extends AnyFunSuite with FlinkSpec with Matchers { diff --git a/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/DockerTest.scala b/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/DockerTest.scala index 973aa6e48a5..a4d24d49cf7 100644 --- a/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/DockerTest.scala +++ b/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/DockerTest.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.engine.management import com.dimafeng.testcontainers._ -import com.typesafe.config.ConfigValueFactory.fromAnyRef import com.typesafe.config.{Config, ConfigValueFactory} +import com.typesafe.config.ConfigValueFactory.fromAnyRef import com.typesafe.scalalogging.StrictLogging import org.scalatest.{BeforeAndAfterAll, Suite} +import pl.touk.nussknacker.engine.{ConfigWithUnresolvedVersion, ProcessingTypeConfig} import pl.touk.nussknacker.engine.deployment.User import pl.touk.nussknacker.engine.flink.test.docker.{WithFlinkContainers, WithKafkaContainer} -import pl.touk.nussknacker.engine.{ConfigWithUnresolvedVersion, ProcessingTypeConfig} import pl.touk.nussknacker.test.{ExtremelyPatientScalaFutures, KafkaConfigProperties, WithConfig} import scala.jdk.CollectionConverters._ diff --git a/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/BaseFlinkDeploymentManagerSpec.scala b/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/BaseFlinkDeploymentManagerSpec.scala index 0b2f95acaf1..39a0e05b0c0 100644 --- a/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/BaseFlinkDeploymentManagerSpec.scala +++ b/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/BaseFlinkDeploymentManagerSpec.scala @@ -4,10 +4,11 @@ import com.typesafe.scalalogging.StrictLogging import org.apache.flink.api.common.JobID import org.scalatest.funsuite.AnyFunSuiteLike import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.{ModelData, ModelDependencies} import pl.touk.nussknacker.engine.api.ProcessVersion import pl.touk.nussknacker.engine.api.component.{ComponentId, ComponentType, DesignerWideComponentId} -import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment._ +import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, VersionId} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess @@ -15,7 +16,6 @@ import pl.touk.nussknacker.engine.definition.component.Components.ComponentDefin import pl.touk.nussknacker.engine.deployment.{DeploymentData, DeploymentId, ExternalDeploymentId} import pl.touk.nussknacker.engine.flink.minicluster.FlinkMiniClusterFactory import pl.touk.nussknacker.engine.util.loader.ModelClassLoader -import pl.touk.nussknacker.engine.{ModelData, ModelDependencies} import java.net.URI import java.nio.file.{Files, Paths} diff --git a/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/FlinkDeploymentManagerScenarioTestingSpec.scala b/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/FlinkDeploymentManagerScenarioTestingSpec.scala index 2eb502b5d8c..91fa566f74c 100644 --- a/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/FlinkDeploymentManagerScenarioTestingSpec.scala +++ b/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/FlinkDeploymentManagerScenarioTestingSpec.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.management.streaming import cats.effect.unsafe.implicits.global -import com.typesafe.config.ConfigValueFactory.fromAnyRef import com.typesafe.config.{Config, ConfigValueFactory} +import com.typesafe.config.ConfigValueFactory.fromAnyRef import io.circe.Json import org.scalatest.BeforeAndAfterAll import org.scalatest.flatspec.AnyFlatSpec diff --git a/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/FlinkDeploymentManagerSlotsCountSpec.scala b/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/FlinkDeploymentManagerSlotsCountSpec.scala index 18c6dcddb93..f930751a904 100644 --- a/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/FlinkDeploymentManagerSlotsCountSpec.scala +++ b/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/FlinkDeploymentManagerSlotsCountSpec.scala @@ -4,8 +4,8 @@ import com.typesafe.scalalogging.StrictLogging import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.api.ProcessVersion +import pl.touk.nussknacker.engine.api.deployment.{DeploymentUpdateStrategy, DMRunDeploymentCommand} import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy -import pl.touk.nussknacker.engine.api.deployment.{DMRunDeploymentCommand, DeploymentUpdateStrategy} import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, VersionId} import pl.touk.nussknacker.engine.deployment.DeploymentData import pl.touk.nussknacker.engine.management.FlinkSlotsChecker.{NotEnoughSlotsException, SlotsBalance} diff --git a/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/JavaConfigDeploymentManagerSpec.scala b/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/JavaConfigDeploymentManagerSpec.scala index 3b9f74ebe28..d39552e01a9 100644 --- a/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/JavaConfigDeploymentManagerSpec.scala +++ b/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/JavaConfigDeploymentManagerSpec.scala @@ -4,13 +4,13 @@ import com.typesafe.scalalogging.StrictLogging import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.api.ProcessVersion -import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy -import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.deployment.{ + DeploymentUpdateStrategy, DMCancelScenarioCommand, - DMRunDeploymentCommand, - DeploymentUpdateStrategy + DMRunDeploymentCommand } +import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy +import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.deployment.DeploymentData diff --git a/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/StreamingDockerTest.scala b/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/StreamingDockerTest.scala index 55d2bc2ad62..f0330c78e2e 100644 --- a/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/StreamingDockerTest.scala +++ b/engine/flink/management/src/it/scala/pl/touk/nussknacker/engine/management/streaming/StreamingDockerTest.scala @@ -4,12 +4,12 @@ import cats.effect.IO import cats.effect.kernel.Resource import cats.effect.unsafe.implicits.global import com.typesafe.scalalogging.StrictLogging -import org.scalatest.matchers.should.Matchers import org.scalatest.{BeforeAndAfterAll, OptionValues, Suite} +import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.ConfigWithUnresolvedVersion import pl.touk.nussknacker.engine.api.ProcessVersion -import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment._ +import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess diff --git a/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/FlinkDeploymentManager.scala b/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/FlinkDeploymentManager.scala index a084833da80..1e64b50f5a0 100644 --- a/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/FlinkDeploymentManager.scala +++ b/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/FlinkDeploymentManager.scala @@ -5,9 +5,10 @@ import cats.implicits._ import com.typesafe.config.Config import com.typesafe.scalalogging.LazyLogging import org.apache.flink.api.common.{JobID, JobStatus} +import pl.touk.nussknacker.engine.{newdeployment, BaseModelData, DeploymentManagerDependencies} import pl.touk.nussknacker.engine.api.ProcessVersion -import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment._ +import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment.scheduler.services._ import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.process.ProcessName @@ -25,7 +26,6 @@ import pl.touk.nussknacker.engine.management.rest.FlinkClient import pl.touk.nussknacker.engine.management.rest.flinkRestModel.JobOverview import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap import pl.touk.nussknacker.engine.util.WithDataFreshnessStatusUtils.WithDataFreshnessStatusMapOps -import pl.touk.nussknacker.engine.{BaseModelData, DeploymentManagerDependencies, newdeployment} import scala.concurrent.Future diff --git a/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/FlinkScheduledExecutionPerformer.scala b/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/FlinkScheduledExecutionPerformer.scala index a551fa89d3e..3211052bc93 100644 --- a/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/FlinkScheduledExecutionPerformer.scala +++ b/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/FlinkScheduledExecutionPerformer.scala @@ -3,6 +3,7 @@ package pl.touk.nussknacker.engine.management import com.typesafe.config.Config import com.typesafe.scalalogging.LazyLogging import org.apache.flink.api.common.JobID +import pl.touk.nussknacker.engine.{newdeployment, BaseModelData} import pl.touk.nussknacker.engine.api.ProcessVersion import pl.touk.nussknacker.engine.api.deployment.scheduler.model.{DeploymentWithRuntimeParams, RuntimeParams} import pl.touk.nussknacker.engine.api.deployment.scheduler.services.ScheduledExecutionPerformer @@ -12,7 +13,6 @@ import pl.touk.nussknacker.engine.management.FlinkScheduledExecutionPerformer.ja import pl.touk.nussknacker.engine.management.jobrunner.{FlinkModelJarProvider, RemoteFlinkScenarioJobRunner} import pl.touk.nussknacker.engine.management.rest.FlinkClient import pl.touk.nussknacker.engine.modelconfig.InputConfigDuringExecution -import pl.touk.nussknacker.engine.{BaseModelData, newdeployment} import java.nio.file.{Files, Path, Paths} import scala.concurrent.Future diff --git a/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/FlinkStatusDetailsDeterminer.scala b/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/FlinkStatusDetailsDeterminer.scala index 5c2b1ea7b43..c058b860c82 100644 --- a/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/FlinkStatusDetailsDeterminer.scala +++ b/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/FlinkStatusDetailsDeterminer.scala @@ -2,12 +2,12 @@ package pl.touk.nussknacker.engine.management import com.typesafe.scalalogging.LazyLogging import org.apache.flink.api.common.{JobID, JobStatus} -import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.deployment.{DeploymentStatus, DeploymentStatusDetails} +import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.namespaces.NamingStrategy import pl.touk.nussknacker.engine.api.process.{ProcessName, VersionId} import pl.touk.nussknacker.engine.deployment.DeploymentId -import pl.touk.nussknacker.engine.management.FlinkStatusDetailsDeterminer.{ParsedJobConfig, toDeploymentStatus} +import pl.touk.nussknacker.engine.management.FlinkStatusDetailsDeterminer.{toDeploymentStatus, ParsedJobConfig} import pl.touk.nussknacker.engine.management.rest.flinkRestModel import pl.touk.nussknacker.engine.management.rest.flinkRestModel.{BaseJobStatusCounts, JobOverview} import pl.touk.nussknacker.engine.util.Implicits.RichTupleList diff --git a/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/jobrunner/RemoteFlinkScenarioJobRunner.scala b/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/jobrunner/RemoteFlinkScenarioJobRunner.scala index 26db6a0781f..611a0ad86c5 100644 --- a/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/jobrunner/RemoteFlinkScenarioJobRunner.scala +++ b/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/jobrunner/RemoteFlinkScenarioJobRunner.scala @@ -8,7 +8,7 @@ import pl.touk.nussknacker.engine.api.deployment.DMRunDeploymentCommand import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.deployment.DeploymentData import pl.touk.nussknacker.engine.management.FlinkDeploymentManager.DeploymentIdOps -import pl.touk.nussknacker.engine.management.jobrunner.RemoteFlinkScenarioJobRunner.{MainClassName, prepareProgramArgs} +import pl.touk.nussknacker.engine.management.jobrunner.RemoteFlinkScenarioJobRunner.{prepareProgramArgs, MainClassName} import pl.touk.nussknacker.engine.management.rest.FlinkClient import scala.concurrent.{ExecutionContext, Future} diff --git a/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/rest/CachedFlinkClient.scala b/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/rest/CachedFlinkClient.scala index 8dd32a5f383..05417dd2d63 100644 --- a/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/rest/CachedFlinkClient.scala +++ b/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/rest/CachedFlinkClient.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.engine.management.rest import com.github.benmanes.caffeine.cache.{AsyncCache, Cache, Caffeine} import org.apache.flink.api.common.JobID import org.apache.flink.configuration.Configuration -import pl.touk.nussknacker.engine.api.deployment.DataFreshnessPolicy.{CanBeCached, Fresh} import pl.touk.nussknacker.engine.api.deployment.{DataFreshnessPolicy, SavepointResult, WithDataFreshnessStatus} +import pl.touk.nussknacker.engine.api.deployment.DataFreshnessPolicy.{CanBeCached, Fresh} import pl.touk.nussknacker.engine.management.rest.flinkRestModel.{ExecutionConfig, JobDetails, JobOverview} import java.io.File diff --git a/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/rest/HttpFlinkClient.scala b/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/rest/HttpFlinkClient.scala index f527eafbe30..e9b4e905c0a 100644 --- a/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/rest/HttpFlinkClient.scala +++ b/engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/rest/HttpFlinkClient.scala @@ -15,8 +15,8 @@ import sttp.model.Uri import java.io.File import java.net.URI import java.util.concurrent.TimeoutException -import scala.concurrent.duration.FiniteDuration import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.duration.FiniteDuration class HttpFlinkClient(restUrl: URI, scenarioStateRequestTimeout: FiniteDuration, jobManagerTimeout: FiniteDuration)( implicit backend: SttpBackend[Future, Any], diff --git a/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/FlinkDeploymentManagerSpec.scala b/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/FlinkDeploymentManagerSpec.scala index b9da2ddeea8..1de011c79fc 100644 --- a/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/FlinkDeploymentManagerSpec.scala +++ b/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/FlinkDeploymentManagerSpec.scala @@ -12,12 +12,12 @@ import org.scalatest.concurrent.PatienceConfiguration.Timeout import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.DeploymentManagerDependencies +import pl.touk.nussknacker.engine.api.{MetaData, ProcessVersion, StreamMetaData} import pl.touk.nussknacker.engine.api.component.NodesDeploymentData -import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment._ +import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, VersionId} -import pl.touk.nussknacker.engine.api.{MetaData, ProcessVersion, StreamMetaData} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.deployment._ import pl.touk.nussknacker.engine.flink.minicluster.scenariotesting.ScenarioStateVerificationConfig @@ -25,18 +25,18 @@ import pl.touk.nussknacker.engine.management.rest.flinkRestModel._ import pl.touk.nussknacker.engine.management.utils.JobIdGenerator.generateJobId import pl.touk.nussknacker.engine.testing.LocalModelData import pl.touk.nussknacker.test.{AvailablePortFinder, PatientScalaFutures} +import sttp.client3.{Response, StringBody, SttpBackend, SttpClientException} import sttp.client3.asynchttpclient.future.AsyncHttpClientFutureBackend import sttp.client3.testing.SttpBackendStub -import sttp.client3.{Response, StringBody, SttpBackend, SttpClientException} import sttp.model.{Method, StatusCode} import java.net.NoRouteToHostException import java.util.Collections import java.util.concurrent.TimeoutException import scala.collection.mutable +import scala.concurrent.{ExecutionContext, Future} import scala.concurrent.ExecutionContext.Implicits._ import scala.concurrent.duration._ -import scala.concurrent.{ExecutionContext, Future} //TODO move some tests to FlinkHttpClientTest class FlinkDeploymentManagerSpec extends AnyFunSuite with Matchers with PatientScalaFutures with LoneElement { diff --git a/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/FlinkScenarioStatusDtoSpec.scala b/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/FlinkScenarioStatusDtoSpec.scala index a049322740b..215ff6cc519 100644 --- a/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/FlinkScenarioStatusDtoSpec.scala +++ b/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/FlinkScenarioStatusDtoSpec.scala @@ -3,12 +3,12 @@ package pl.touk.nussknacker.engine.management import org.scalatest.Inside import org.scalatest.funsuite.AnyFunSuiteLike import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.deployment.{ScenarioActionName, StateStatus} import pl.touk.nussknacker.engine.api.deployment.ProcessStateDefinitionManager.{ ScenarioStatusPresentationDetails, ScenarioStatusWithScenarioContext } import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus -import pl.touk.nussknacker.engine.api.deployment.{ScenarioActionName, StateStatus} class FlinkScenarioStatusDtoSpec extends AnyFunSuiteLike with Matchers with Inside { diff --git a/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/FlinkSlotsCheckerTest.scala b/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/FlinkSlotsCheckerTest.scala index a13eddfe423..66978383b44 100644 --- a/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/FlinkSlotsCheckerTest.scala +++ b/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/FlinkSlotsCheckerTest.scala @@ -10,14 +10,14 @@ import pl.touk.nussknacker.engine.management.rest.HttpFlinkClient import pl.touk.nussknacker.engine.management.rest.flinkRestModel._ import pl.touk.nussknacker.engine.management.utils.JobIdGenerator.generateJobId import pl.touk.nussknacker.test.PatientScalaFutures -import sttp.client3.testing.SttpBackendStub import sttp.client3.{Response, SttpBackend, SttpClientException} +import sttp.client3.testing.SttpBackendStub import sttp.model.{Method, StatusCode} import java.net.{ConnectException, URI} import java.util.{Collections, UUID} -import scala.concurrent.duration._ import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.duration._ import scala.util.{Failure, Success, Try} class FlinkSlotsCheckerTest extends AnyFunSuite with Matchers with PatientScalaFutures { @@ -95,8 +95,8 @@ class FlinkSlotsCheckerTest extends AnyFunSuite with Matchers with PatientScalaF ) // be default used config with all default values ): FlinkSlotsChecker = { import scala.jdk.CollectionConverters._ - val slotsChecker = createSlotsCheckerWithBackend(SttpBackendStub.asynchronousFuture.whenRequestMatchesPartial { - case req => + val slotsChecker = createSlotsCheckerWithBackend( + SttpBackendStub.asynchronousFuture.whenRequestMatchesPartial { case req => val toReturn = (req.uri.path, req.method) match { case (List("jobs", "overview"), Method.GET) => JobsResponse(statuses) @@ -121,7 +121,8 @@ class FlinkSlotsCheckerTest extends AnyFunSuite with Matchers with PatientScalaF case _ => throw new IllegalStateException() } Response(Right(toReturn), statusCode) - }) + } + ) slotsChecker } diff --git a/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/rest/FlinkHttpClientTest.scala b/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/rest/FlinkHttpClientTest.scala index 21e3f6fc285..14fc060f160 100644 --- a/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/rest/FlinkHttpClientTest.scala +++ b/engine/flink/management/src/test/scala/pl/touk/nussknacker/engine/management/rest/FlinkHttpClientTest.scala @@ -9,17 +9,17 @@ import pl.touk.nussknacker.engine.management.rest.flinkRestModel.{JarFile, JarsR import pl.touk.nussknacker.engine.management.utils.JobIdGenerator.generateJobId import pl.touk.nussknacker.http.backend.HttpClientError import pl.touk.nussknacker.test.PatientScalaFutures -import sttp.client3.testing.SttpBackendStub import sttp.client3.{HttpError, Response, SttpBackend} +import sttp.client3.testing.SttpBackendStub import sttp.model.{Method, StatusCode} import sttp.monad.FutureMonad import java.io.File import java.net.URI import java.util.UUID +import scala.concurrent.{Await, Future} import scala.concurrent.ExecutionContext.Implicits._ import scala.concurrent.duration._ -import scala.concurrent.{Await, Future} import scala.util.Failure class FlinkHttpClientTest extends AnyFunSuite with Matchers with ScalaFutures with PatientScalaFutures { diff --git a/engine/flink/scala-utils/src/main/scala/pl/touk/nussknacker/engine/flink/api/typeinfo/caseclass/CaseClassTypeInfo.scala b/engine/flink/scala-utils/src/main/scala/pl/touk/nussknacker/engine/flink/api/typeinfo/caseclass/CaseClassTypeInfo.scala index 84203e6c9b2..8643732adab 100644 --- a/engine/flink/scala-utils/src/main/scala/pl/touk/nussknacker/engine/flink/api/typeinfo/caseclass/CaseClassTypeInfo.scala +++ b/engine/flink/scala-utils/src/main/scala/pl/touk/nussknacker/engine/flink/api/typeinfo/caseclass/CaseClassTypeInfo.scala @@ -22,18 +22,18 @@ import org.apache.flink.annotation.{Public, PublicEvolving} import org.apache.flink.api.common.ExecutionConfig import org.apache.flink.api.common.operators.Keys.ExpressionKeys import org.apache.flink.api.common.typeinfo.TypeInformation +import org.apache.flink.api.common.typeutils._ import org.apache.flink.api.common.typeutils.CompositeType.{ FlatFieldDescriptor, InvalidFieldReferenceException, TypeComparatorBuilder } -import org.apache.flink.api.common.typeutils._ import org.apache.flink.api.java.typeutils.TupleTypeInfoBase import java.util import java.util.regex.{Matcher, Pattern} -import scala.jdk.CollectionConverters._ import scala.collection.mutable.ArrayBuffer +import scala.jdk.CollectionConverters._ /** * TypeInformation for Case Classes. Creation and access is different from our Java Tuples so we diff --git a/engine/flink/scala-utils/src/test/scala/pl/touk/nussknacker/engine/flink/api/typeinfo/caseclass/CaseClassSerializationTest.scala b/engine/flink/scala-utils/src/test/scala/pl/touk/nussknacker/engine/flink/api/typeinfo/caseclass/CaseClassSerializationTest.scala index 2b3b21b0dff..a69303ffc36 100644 --- a/engine/flink/scala-utils/src/test/scala/pl/touk/nussknacker/engine/flink/api/typeinfo/caseclass/CaseClassSerializationTest.scala +++ b/engine/flink/scala-utils/src/test/scala/pl/touk/nussknacker/engine/flink/api/typeinfo/caseclass/CaseClassSerializationTest.scala @@ -11,7 +11,7 @@ import org.scalatest.matchers.must.Matchers import pl.touk.nussknacker.test.ProcessUtils.convertToAnyShouldWrapper import java.io.{ByteArrayInputStream, ByteArrayOutputStream} -import scala.reflect.{ClassTag, classTag} +import scala.reflect.{classTag, ClassTag} class CaseClassSerializationTest extends AnyFunSuite with Matchers { diff --git a/engine/flink/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/FlinkUniversalSchemaBasedSerdeProvider.scala b/engine/flink/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/FlinkUniversalSchemaBasedSerdeProvider.scala index 4a56c525bbd..e12870bc94a 100644 --- a/engine/flink/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/FlinkUniversalSchemaBasedSerdeProvider.scala +++ b/engine/flink/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/FlinkUniversalSchemaBasedSerdeProvider.scala @@ -1,14 +1,14 @@ package pl.touk.nussknacker.engine.schemedkafka +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{SchemaBasedSerdeProvider, SchemaRegistryClientFactory} import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.serialization.KafkaSchemaRegistryBasedValueSerializationSchemaFactory -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.UniversalSchemaBasedSerdeProvider.createSchemaIdFromMessageExtractor import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.{ UniversalKafkaDeserializerFactory, UniversalSchemaValidator, UniversalSerializerFactory, UniversalToJsonFormatterFactory } -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{SchemaBasedSerdeProvider, SchemaRegistryClientFactory} +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.UniversalSchemaBasedSerdeProvider.createSchemaIdFromMessageExtractor import pl.touk.nussknacker.engine.schemedkafka.source.flink.FlinkKafkaSchemaRegistryBasedKeyValueDeserializationSchemaFactory object FlinkUniversalSchemaBasedSerdeProvider { diff --git a/engine/flink/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/kryo/SchemaIdBasedAvroGenericRecordSerializer.scala b/engine/flink/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/kryo/SchemaIdBasedAvroGenericRecordSerializer.scala index 104a463bc28..1ac1fcad98e 100644 --- a/engine/flink/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/kryo/SchemaIdBasedAvroGenericRecordSerializer.scala +++ b/engine/flink/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/kryo/SchemaIdBasedAvroGenericRecordSerializer.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.kryo -import com.esotericsoftware.kryo.io.{Input, Output} import com.esotericsoftware.kryo.{Kryo, Serializer} +import com.esotericsoftware.kryo.io.{Input, Output} import com.github.ghik.silencer.silent import org.apache.avro.generic.GenericData import org.apache.avro.io.{DecoderFactory, EncoderFactory} diff --git a/engine/flink/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/FlinkKafkaUniversalSink.scala b/engine/flink/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/FlinkKafkaUniversalSink.scala index 7c3531147a5..19e84131f78 100644 --- a/engine/flink/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/FlinkKafkaUniversalSink.scala +++ b/engine/flink/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/FlinkKafkaUniversalSink.scala @@ -7,17 +7,17 @@ import org.apache.flink.api.common.typeinfo.{TypeInformation, Types} import org.apache.flink.formats.avro.typeutils.NkSerializableParsedSchema import org.apache.flink.streaming.api.datastream.{DataStream, DataStreamSink} import org.apache.flink.streaming.api.functions.sink.SinkFunction +import pl.touk.nussknacker.engine.api.{Context, LazyParameter, ValueWithContext} import pl.touk.nussknacker.engine.api.component.{ComponentType, NodeComponentInfo} import pl.touk.nussknacker.engine.api.process.TopicName import pl.touk.nussknacker.engine.api.validation.ValidationMode -import pl.touk.nussknacker.engine.api.{Context, LazyParameter, ValueWithContext} import pl.touk.nussknacker.engine.flink.api.exception.{ExceptionHandler, WithExceptionHandler} import pl.touk.nussknacker.engine.flink.api.process.{FlinkCustomNodeContext, FlinkSink} import pl.touk.nussknacker.engine.flink.typeinformation.KeyedValueType import pl.touk.nussknacker.engine.flink.util.keyed import pl.touk.nussknacker.engine.flink.util.keyed.KeyedValueMapper -import pl.touk.nussknacker.engine.kafka.serialization.KafkaSerializationSchema import pl.touk.nussknacker.engine.kafka.{KafkaConfig, PartitionByKeyFlinkKafkaProducer, PreparedKafkaTopic} +import pl.touk.nussknacker.engine.kafka.serialization.KafkaSerializationSchema import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.UniversalSchemaSupportDispatcher import pl.touk.nussknacker.engine.util.KeyedValue diff --git a/engine/flink/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/FlinkKafkaUniversalSinkImplFactory.scala b/engine/flink/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/FlinkKafkaUniversalSinkImplFactory.scala index 2b639ebeed6..a5e3d7604de 100644 --- a/engine/flink/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/FlinkKafkaUniversalSinkImplFactory.scala +++ b/engine/flink/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/FlinkKafkaUniversalSinkImplFactory.scala @@ -4,10 +4,10 @@ import io.confluent.kafka.schemaregistry.ParsedSchema import pl.touk.nussknacker.engine.api.LazyParameter import pl.touk.nussknacker.engine.api.process.{Sink, TopicName} import pl.touk.nussknacker.engine.api.validation.ValidationMode +import pl.touk.nussknacker.engine.kafka.{KafkaConfig, PreparedKafkaTopic} +import pl.touk.nussknacker.engine.kafka.serialization.KafkaSerializationSchema import pl.touk.nussknacker.engine.schemedkafka.RuntimeSchemaData import pl.touk.nussknacker.engine.schemedkafka.sink.UniversalKafkaSinkImplFactory -import pl.touk.nussknacker.engine.kafka.serialization.KafkaSerializationSchema -import pl.touk.nussknacker.engine.kafka.{KafkaConfig, PreparedKafkaTopic} import pl.touk.nussknacker.engine.util.KeyedValue object FlinkKafkaUniversalSinkImplFactory extends UniversalKafkaSinkImplFactory with Serializable { diff --git a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaAvroNamespacedSpec.scala b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaAvroNamespacedSpec.scala index 6fc0b59f253..fd95b5b5a36 100644 --- a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaAvroNamespacedSpec.scala +++ b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaAvroNamespacedSpec.scala @@ -10,12 +10,12 @@ import pl.touk.nussknacker.engine.process.helpers.TestResultsHolder import pl.touk.nussknacker.engine.schemedkafka.KafkaAvroNamespacedSpec.sinkForInputMetaResultsHolder import pl.touk.nussknacker.engine.schemedkafka.helpers.KafkaAvroSpecMixin import pl.touk.nussknacker.engine.schemedkafka.schema.PaymentV1 +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ExistingSchemaVersion, SchemaRegistryClientFactory} import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.client.{ MockConfluentSchemaRegistryClientBuilder, MockSchemaRegistryClient } import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.MockSchemaRegistryClientFactory -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ExistingSchemaVersion, SchemaRegistryClientFactory} import pl.touk.nussknacker.engine.testing.LocalModelData class KafkaAvroNamespacedSpec extends KafkaAvroSpecMixin with OptionValues { diff --git a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaAvroPayloadIntegrationSpec.scala b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaAvroPayloadIntegrationSpec.scala index 40a9a7f7c73..c054344c7ba 100644 --- a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaAvroPayloadIntegrationSpec.scala +++ b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaAvroPayloadIntegrationSpec.scala @@ -24,18 +24,19 @@ import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.client.{ } import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.MockSchemaRegistryClientFactory import pl.touk.nussknacker.engine.testing.LocalModelData -import scala.jdk.CollectionConverters._ import java.nio.charset.StandardCharsets +import scala.jdk.CollectionConverters._ class KafkaAvroPayloadIntegrationSpec extends KafkaAvroSpecMixin with BeforeAndAfter { - import KafkaAvroIntegrationMockSchemaRegistry._ import pl.touk.nussknacker.engine.kafka.KafkaTestUtils.richConsumer import pl.touk.nussknacker.engine.spel.SpelExtension._ import scala.jdk.CollectionConverters._ + import KafkaAvroIntegrationMockSchemaRegistry._ + private lazy val creator: KafkaAvroTestProcessConfigCreator = new KafkaAvroTestProcessConfigCreator( sinkForInputMetaResultsHolder ) { diff --git a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaAvroTestProcessConfigCreator.scala b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaAvroTestProcessConfigCreator.scala index 97dc25a2c5d..7ab51ca53fb 100644 --- a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaAvroTestProcessConfigCreator.scala +++ b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaAvroTestProcessConfigCreator.scala @@ -4,8 +4,8 @@ import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.kafka.KafkaConfig import pl.touk.nussknacker.engine.kafka.source.flink.FlinkKafkaSourceImplFactory -import pl.touk.nussknacker.engine.process.helpers.SampleNodes.ExtractAndTransformTimestamp import pl.touk.nussknacker.engine.process.helpers.{SinkForType, TestResultsHolder} +import pl.touk.nussknacker.engine.process.helpers.SampleNodes.ExtractAndTransformTimestamp import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.SchemaRegistryClientFactory import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.UniversalSchemaBasedSerdeProvider import pl.touk.nussknacker.engine.schemedkafka.sink.UniversalKafkaSinkFactory diff --git a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaJsonPayloadIntegrationSpec.scala b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaJsonPayloadIntegrationSpec.scala index 68a1e270b61..d31a47412e7 100644 --- a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaJsonPayloadIntegrationSpec.scala +++ b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaJsonPayloadIntegrationSpec.scala @@ -13,9 +13,9 @@ import pl.touk.nussknacker.engine.schemedkafka.helpers.{ SimpleKafkaJsonSerializer } import pl.touk.nussknacker.engine.schemedkafka.schema.PaymentV1 +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ExistingSchemaVersion, SchemaRegistryClientFactory} import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.client.MockSchemaRegistryClient import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.MockSchemaRegistryClientFactory -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ExistingSchemaVersion, SchemaRegistryClientFactory} import pl.touk.nussknacker.engine.testing.LocalModelData import pl.touk.nussknacker.engine.util.json.ToJsonEncoder diff --git a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/encode/ToAvroSchemaBasedEncoderSpec.scala b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/encode/ToAvroSchemaBasedEncoderSpec.scala index 214f29ace28..27b80c053f5 100644 --- a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/encode/ToAvroSchemaBasedEncoderSpec.scala +++ b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/encode/ToAvroSchemaBasedEncoderSpec.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.engine.schemedkafka.encode import cats.data.ValidatedNel -import org.apache.avro.generic.GenericData.{EnumSymbol, Fixed} -import org.apache.avro.generic.{GenericData, GenericRecord} import org.apache.avro.{AvroRuntimeException, Schema} +import org.apache.avro.generic.{GenericData, GenericRecord} +import org.apache.avro.generic.GenericData.{EnumSymbol, Fixed} import org.scalatest.funspec.AnyFunSpec import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.api.validation.ValidationMode diff --git a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/flink/typeinfo/ConsumerRecordSerializerSpec.scala b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/flink/typeinfo/ConsumerRecordSerializerSpec.scala index b78342235a2..f40e2b61bac 100644 --- a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/flink/typeinfo/ConsumerRecordSerializerSpec.scala +++ b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/flink/typeinfo/ConsumerRecordSerializerSpec.scala @@ -19,7 +19,7 @@ import java.io.{ByteArrayInputStream, ByteArrayOutputStream} import java.nio.charset.StandardCharsets import java.time.LocalDate import java.util.Optional -import scala.reflect.{ClassTag, classTag} +import scala.reflect.{classTag, ClassTag} import scala.util.Random class ConsumerRecordSerializerSpec extends AnyFunSuite with Matchers with TableDrivenPropertyChecks { diff --git a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/helpers/KafkaAvroSpecMixin.scala b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/helpers/KafkaAvroSpecMixin.scala index e2140b5eb49..33225482d7d 100644 --- a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/helpers/KafkaAvroSpecMixin.scala +++ b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/helpers/KafkaAvroSpecMixin.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.schemedkafka.helpers -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, Validated} +import cats.data.Validated.{Invalid, Valid} import com.typesafe.scalalogging.LazyLogging import org.apache.flink.api.common.ExecutionConfig import org.apache.kafka.clients.consumer.ConsumerRecord @@ -10,13 +10,13 @@ import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.ModelData import pl.touk.nussknacker.engine.api._ +import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError import pl.touk.nussknacker.engine.api.context.transformation.{ DefinedEagerParameter, OutputVariableNameValue, TypedNodeDependencyValue } -import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext} import pl.touk.nussknacker.engine.api.process.{Source, SourceFactory, TestDataGenerator, TopicName} import pl.touk.nussknacker.engine.api.validation.ValidationMode import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} @@ -37,13 +37,13 @@ import pl.touk.nussknacker.engine.process.runner.FlinkScenarioUnitTestJob import pl.touk.nussknacker.engine.schemedkafka.KafkaUniversalComponentTransformer import pl.touk.nussknacker.engine.schemedkafka.KafkaUniversalComponentTransformer._ import pl.touk.nussknacker.engine.schemedkafka.kryo.AvroSerializersRegistrar -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.UniversalSchemaBasedSerdeProvider import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ ExistingSchemaVersion, LatestSchemaVersion, SchemaRegistryClientFactory, SchemaVersionOption } +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.UniversalSchemaBasedSerdeProvider import pl.touk.nussknacker.engine.schemedkafka.sink.UniversalKafkaSinkFactory import pl.touk.nussknacker.engine.schemedkafka.sink.flink.FlinkKafkaUniversalSinkImplFactory import pl.touk.nussknacker.engine.schemedkafka.source.UniversalKafkaSourceFactory diff --git a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/kryo/SchemaIdBasedAvroGenericRecordSerializerSpec.scala b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/kryo/SchemaIdBasedAvroGenericRecordSerializerSpec.scala index 1804e5d3187..a41aa62c196 100644 --- a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/kryo/SchemaIdBasedAvroGenericRecordSerializerSpec.scala +++ b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/kryo/SchemaIdBasedAvroGenericRecordSerializerSpec.scala @@ -8,10 +8,10 @@ import org.apache.flink.core.memory.{DataInputDeserializer, DataOutputSerializer import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.kafka.KafkaConfig +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{GenericRecordWithSchemaId, SchemaId} import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.client.MockSchemaRegistryClient import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.kryo.SchemaIdBasedAvroGenericRecordSerializerSpec.schema import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.MockSchemaRegistryClientFactory -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{GenericRecordWithSchemaId, SchemaId} class SchemaIdBasedAvroGenericRecordSerializerSpec extends AnyFunSuite with Matchers { diff --git a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/serialization/ConfluentKafkaAvroSeDeSpecMixin.scala b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/serialization/ConfluentKafkaAvroSeDeSpecMixin.scala index 24599cccacf..a239c357b2b 100644 --- a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/serialization/ConfluentKafkaAvroSeDeSpecMixin.scala +++ b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/serialization/ConfluentKafkaAvroSeDeSpecMixin.scala @@ -5,12 +5,12 @@ import org.apache.kafka.clients.producer.RecordMetadata import org.apache.kafka.common.serialization.{Deserializer, Serializer} import org.scalatest.prop.TableDrivenPropertyChecks import pl.touk.nussknacker.engine.flink.util.keyed.StringKeyedValue -import pl.touk.nussknacker.engine.kafka.{KafkaClient, serialization} +import pl.touk.nussknacker.engine.kafka.{serialization, KafkaClient} import pl.touk.nussknacker.engine.schemedkafka.helpers._ import pl.touk.nussknacker.engine.schemedkafka.schema.FullNameV1 +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{SchemaBasedSerdeProvider, SchemaRegistryClientFactory} import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.client.MockConfluentSchemaRegistryClientBuilder import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.MockSchemaRegistryClientFactory -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{SchemaBasedSerdeProvider, SchemaRegistryClientFactory} import pl.touk.nussknacker.engine.util.KeyedValue trait ConfluentKafkaAvroSeDeSpecMixin extends SchemaRegistryMixin with TableDrivenPropertyChecks { diff --git a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/serialization/UniversalKafkaDeserializerTest.scala b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/serialization/UniversalKafkaDeserializerTest.scala index 01d99cdf459..f4102d54168 100644 --- a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/serialization/UniversalKafkaDeserializerTest.scala +++ b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/serialization/UniversalKafkaDeserializerTest.scala @@ -13,6 +13,7 @@ import pl.touk.nussknacker.engine.kafka.UnspecializedTopicName.ToUnspecializedTo import pl.touk.nussknacker.engine.schemedkafka.RuntimeSchemaData import pl.touk.nussknacker.engine.schemedkafka.helpers.{SchemaRegistryMixin, SimpleKafkaAvroSerializer} import pl.touk.nussknacker.engine.schemedkafka.schema.{PaymentV1, PaymentV2} +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ChainedSchemaIdFromMessageExtractor, SchemaId} import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.ConfluentUtils import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.client.DefaultConfluentSchemaRegistryClient import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.schemaid.SchemaIdFromNuHeadersPotentiallyShiftingConfluentPayload.ValueSchemaIdHeaderName @@ -20,7 +21,6 @@ import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.{ UniversalKafkaDeserializer, UniversalSchemaBasedSerdeProvider } -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ChainedSchemaIdFromMessageExtractor, SchemaId} import java.io.OutputStream diff --git a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/SinkValueEditorWithAvroPayloadIntegrationTest.scala b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/SinkValueEditorWithAvroPayloadIntegrationTest.scala index 4c6df5ea3ae..0c6483f8115 100644 --- a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/SinkValueEditorWithAvroPayloadIntegrationTest.scala +++ b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/SinkValueEditorWithAvroPayloadIntegrationTest.scala @@ -8,17 +8,17 @@ import pl.touk.nussknacker.engine.api.validation.ValidationMode import pl.touk.nussknacker.engine.graph.expression import pl.touk.nussknacker.engine.kafka.source.InputMeta import pl.touk.nussknacker.engine.process.helpers.TestResultsHolder +import pl.touk.nussknacker.engine.schemedkafka.{AvroUtils, KafkaAvroTestProcessConfigCreator} import pl.touk.nussknacker.engine.schemedkafka.KafkaAvroIntegrationMockSchemaRegistry.schemaRegistryMockClient import pl.touk.nussknacker.engine.schemedkafka.encode.ToAvroSchemaBasedEncoder import pl.touk.nussknacker.engine.schemedkafka.helpers.KafkaAvroSpecMixin import pl.touk.nussknacker.engine.schemedkafka.schema.TestSchemaWithRecord -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.MockSchemaRegistryClientFactory import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ ExistingSchemaVersion, SchemaRegistryClientFactory, SchemaRegistryClientFactoryWithRegistration } -import pl.touk.nussknacker.engine.schemedkafka.{AvroUtils, KafkaAvroTestProcessConfigCreator} +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.MockSchemaRegistryClientFactory import pl.touk.nussknacker.engine.spel.SpelExtension._ import pl.touk.nussknacker.engine.testing.LocalModelData diff --git a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/UniversalKafkaSinkValidationSpec.scala b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/UniversalKafkaSinkValidationSpec.scala index 1736514d80e..60ec848ab71 100644 --- a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/UniversalKafkaSinkValidationSpec.scala +++ b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/UniversalKafkaSinkValidationSpec.scala @@ -2,11 +2,11 @@ package pl.touk.nussknacker.engine.schemedkafka.sink.flink import com.typesafe.config.ConfigFactory import io.confluent.kafka.schemaregistry.client.{SchemaRegistryClient => CSchemaRegistryClient} +import pl.touk.nussknacker.engine.api.{JobData, MetaData, NodeId, ProcessVersion, StreamMetaData, VariableConstants} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.{CustomNodeError, InvalidPropertyFixedValue} import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.validation.ValidationMode -import pl.touk.nussknacker.engine.api.{JobData, MetaData, NodeId, ProcessVersion, StreamMetaData, VariableConstants} import pl.touk.nussknacker.engine.compile.nodecompilation.{DynamicNodeValidator, TransformationResult} import pl.touk.nussknacker.engine.graph.evaluatedparam.{Parameter => NodeParameter} import pl.touk.nussknacker.engine.graph.expression.Expression @@ -19,9 +19,10 @@ import pl.touk.nussknacker.engine.testing.LocalModelData class UniversalKafkaSinkValidationSpec extends KafkaAvroSpecMixin with KafkaAvroSinkSpecMixin { - import KafkaAvroSinkMockSchemaRegistry._ import pl.touk.nussknacker.test.LiteralSpELImplicits._ + import KafkaAvroSinkMockSchemaRegistry._ + override protected def schemaRegistryClient: CSchemaRegistryClient = schemaRegistryMockClient override protected def schemaRegistryClientFactory: SchemaRegistryClientFactory = factory diff --git a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/source/flink/DelayedUniversalKafkaSourceIntegrationMixinSpec.scala b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/source/flink/DelayedUniversalKafkaSourceIntegrationMixinSpec.scala index ecd9256e251..36bc6e66cd2 100644 --- a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/source/flink/DelayedUniversalKafkaSourceIntegrationMixinSpec.scala +++ b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/source/flink/DelayedUniversalKafkaSourceIntegrationMixinSpec.scala @@ -12,8 +12,8 @@ import pl.touk.nussknacker.engine.kafka.source.delayed.DelayedKafkaSourceFactory delayParameter, timestampFieldParamName } -import pl.touk.nussknacker.engine.process.helpers.TestResultsHolder import pl.touk.nussknacker.engine.process.helpers.SampleNodes.SinkForLongs +import pl.touk.nussknacker.engine.process.helpers.TestResultsHolder import pl.touk.nussknacker.engine.schemedkafka.KafkaAvroIntegrationMockSchemaRegistry.schemaRegistryMockClient import pl.touk.nussknacker.engine.schemedkafka.KafkaAvroTestProcessConfigCreator import pl.touk.nussknacker.engine.schemedkafka.KafkaUniversalComponentTransformer.{ @@ -22,12 +22,12 @@ import pl.touk.nussknacker.engine.schemedkafka.KafkaUniversalComponentTransforme topicParamName } import pl.touk.nussknacker.engine.schemedkafka.helpers.KafkaAvroSpecMixin +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{SchemaRegistryClientFactory, SchemaVersionOption} import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.client.MockSchemaRegistryClient import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.{ MockSchemaRegistryClientFactory, UniversalSchemaBasedSerdeProvider } -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{SchemaRegistryClientFactory, SchemaVersionOption} import pl.touk.nussknacker.engine.schemedkafka.source.delayed.DelayedUniversalKafkaSourceFactory import pl.touk.nussknacker.engine.spel import pl.touk.nussknacker.engine.testing.LocalModelData diff --git a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/source/flink/KafkaAvroPayloadSourceFactorySpec.scala b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/source/flink/KafkaAvroPayloadSourceFactorySpec.scala index c9e11e71eee..dc0a2bc72f7 100644 --- a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/source/flink/KafkaAvroPayloadSourceFactorySpec.scala +++ b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/source/flink/KafkaAvroPayloadSourceFactorySpec.scala @@ -6,11 +6,11 @@ import com.typesafe.config.ConfigFactory import io.confluent.kafka.schemaregistry.client.{SchemaRegistryClient => CSchemaRegistryClient} import io.confluent.kafka.serializers.NonRecordContainer import org.apache.avro.generic.{GenericData, GenericRecord} +import pl.touk.nussknacker.engine.api.{JobData, MetaData, NodeId, ProcessVersion, StreamMetaData, VariableConstants} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.{CustomNodeError, InvalidPropertyFixedValue} import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypedObjectTypingResult, Unknown} -import pl.touk.nussknacker.engine.api.{JobData, MetaData, NodeId, ProcessVersion, StreamMetaData, VariableConstants} import pl.touk.nussknacker.engine.compile.nodecompilation.{DynamicNodeValidator, TransformationResult} import pl.touk.nussknacker.engine.graph.evaluatedparam.{Parameter => NodeParameter} import pl.touk.nussknacker.engine.graph.expression.Expression diff --git a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/source/flink/TopicSelectionStrategySpec.scala b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/source/flink/TopicSelectionStrategySpec.scala index 14e34f6c576..2e9332792f8 100644 --- a/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/source/flink/TopicSelectionStrategySpec.scala +++ b/engine/flink/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/source/flink/TopicSelectionStrategySpec.scala @@ -2,14 +2,14 @@ package pl.touk.nussknacker.engine.schemedkafka.source.flink import io.confluent.kafka.schemaregistry.client.{SchemaRegistryClient => CSchemaRegistryClient} import pl.touk.nussknacker.engine.kafka.source.flink.FlinkKafkaSourceImplFactory -import pl.touk.nussknacker.engine.schemedkafka.helpers.KafkaAvroSpecMixin -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.SchemaRegistryClientFactory -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.UniversalSchemaBasedSerdeProvider -import pl.touk.nussknacker.engine.schemedkafka.source.UniversalKafkaSourceFactory import pl.touk.nussknacker.engine.schemedkafka.{ TopicsMatchingPatternWithExistingSubjectsSelectionStrategy, TopicsWithExistingSubjectSelectionStrategy } +import pl.touk.nussknacker.engine.schemedkafka.helpers.KafkaAvroSpecMixin +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.SchemaRegistryClientFactory +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.UniversalSchemaBasedSerdeProvider +import pl.touk.nussknacker.engine.schemedkafka.source.UniversalKafkaSourceFactory import java.util.regex.Pattern diff --git a/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/flink/test/ClassDiscoveryBaseTest.scala b/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/flink/test/ClassDiscoveryBaseTest.scala index 0ff385fa406..9ea70bd984c 100644 --- a/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/flink/test/ClassDiscoveryBaseTest.scala +++ b/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/flink/test/ClassDiscoveryBaseTest.scala @@ -3,19 +3,20 @@ package pl.touk.nussknacker.engine.flink.test import cats.data.NonEmptyList import cats.implicits.toFunctorOps import com.typesafe.scalalogging.LazyLogging +import io.circe._ import io.circe.generic.extras.semiauto.{deriveConfiguredDecoder, deriveConfiguredEncoder} import io.circe.parser.parse import io.circe.syntax.EncoderOps -import io.circe._ import org.apache.commons.io.FileUtils import org.scalatest.Inside import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.springframework.util.ClassUtils import pl.touk.nussknacker.engine.ModelData +import pl.touk.nussknacker.engine.api.CirceUtil._ import pl.touk.nussknacker.engine.api.generics.{MethodTypeInfo, Parameter} -import pl.touk.nussknacker.engine.api.typed.typing.{TypedClass, TypingResult} import pl.touk.nussknacker.engine.api.typed.{TypeEncoders, TypingResultDecoder} +import pl.touk.nussknacker.engine.api.typed.typing.{TypedClass, TypingResult} import pl.touk.nussknacker.engine.definition.clazz.{ ClassDefinition, FunctionalMethodDefinition, @@ -27,8 +28,6 @@ import pl.touk.nussknacker.engine.util.ResourceLoader import java.io.File import java.nio.charset.StandardCharsets -import pl.touk.nussknacker.engine.api.CirceUtil._ - import scala.util.Properties trait ClassDiscoveryBaseTest extends AnyFunSuite with Matchers with Inside with LazyLogging { diff --git a/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/flink/test/RecordingExceptionConsumer.scala b/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/flink/test/RecordingExceptionConsumer.scala index 52ebeecf1b7..e8c008b7857 100644 --- a/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/flink/test/RecordingExceptionConsumer.scala +++ b/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/flink/test/RecordingExceptionConsumer.scala @@ -44,9 +44,11 @@ object RecordingExceptionConsumerProvider { } class RecordingExceptionConsumerProvider extends FlinkEspExceptionConsumerProvider { - import RecordingExceptionConsumerProvider._ + import net.ceedubs.ficus.Ficus._ + import RecordingExceptionConsumerProvider._ + override val name: String = providerName override def create(metaData: MetaData, exceptionHandlerConfig: Config): FlinkEspExceptionConsumer = { diff --git a/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/flink/test/ScalatestMiniClusterJobStatusCheckingOps.scala b/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/flink/test/ScalatestMiniClusterJobStatusCheckingOps.scala index 15652dff08d..2c933a44b9b 100644 --- a/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/flink/test/ScalatestMiniClusterJobStatusCheckingOps.scala +++ b/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/flink/test/ScalatestMiniClusterJobStatusCheckingOps.scala @@ -2,14 +2,14 @@ package pl.touk.nussknacker.engine.flink.test import org.apache.flink.api.common.JobID import org.apache.flink.runtime.minicluster.MiniCluster -import org.scalatest.concurrent.ScalaFutures.{PatienceConfig, convertScalaFuture, scaled} +import org.scalatest.concurrent.ScalaFutures.{convertScalaFuture, scaled, PatienceConfig} import org.scalatest.time.{Millis, Seconds, Span} -import pl.touk.nussknacker.engine.flink.minicluster.util.DurationToRetryPolicyConverter import pl.touk.nussknacker.engine.flink.minicluster.{FlinkMiniClusterWithServices, MiniClusterJobStatusCheckingOps} +import pl.touk.nussknacker.engine.flink.minicluster.util.DurationToRetryPolicyConverter +import scala.concurrent.{blocking, Future} import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.duration.DurationInt -import scala.concurrent.{Future, blocking} import scala.language.implicitConversions object ScalatestMiniClusterJobStatusCheckingOps { diff --git a/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/flink/test/docker/WithFlinkContainers.scala b/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/flink/test/docker/WithFlinkContainers.scala index 49084c8733b..2128c6f1b6f 100644 --- a/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/flink/test/docker/WithFlinkContainers.scala +++ b/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/flink/test/docker/WithFlinkContainers.scala @@ -10,8 +10,8 @@ import pl.touk.nussknacker.engine.util.ResourceLoader import pl.touk.nussknacker.engine.util.config.ScalaMajorVersionConfig import pl.touk.nussknacker.test.containers.{FileSystemBind, WithDockerContainers} -import java.nio.file.attribute.{PosixFilePermission, PosixFilePermissions} import java.nio.file.{Files, Path} +import java.nio.file.attribute.{PosixFilePermission, PosixFilePermissions} import scala.jdk.CollectionConverters._ trait WithFlinkContainers extends WithDockerContainers { self: Suite with StrictLogging => diff --git a/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/process/functional/TestReporter.scala b/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/process/functional/TestReporter.scala index 96335c8156e..923bf752d41 100644 --- a/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/process/functional/TestReporter.scala +++ b/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/process/functional/TestReporter.scala @@ -5,12 +5,11 @@ import org.apache.flink.metrics._ import org.apache.flink.metrics.reporter.{MetricReporter, MetricReporterFactory} import org.apache.flink.runtime.metrics.scope.ScopeFormat import pl.touk.nussknacker.engine.api.process.ProcessName - -import java.util.concurrent.ConcurrentHashMap -import scala.jdk.CollectionConverters._ import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap import java.util.Properties +import java.util.concurrent.ConcurrentHashMap +import scala.jdk.CollectionConverters._ object TestReporterUtil { diff --git a/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/process/helpers/SampleNodes.scala b/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/process/helpers/SampleNodes.scala index fb4607b53da..cd489d871d9 100644 --- a/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/process/helpers/SampleNodes.scala +++ b/engine/flink/test-utils/src/main/scala/pl/touk/nussknacker/engine/process/helpers/SampleNodes.scala @@ -18,18 +18,18 @@ import org.apache.flink.streaming.runtime.streamrecord.{RecordAttributes, Stream import org.apache.flink.util.Collector import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.component.UnboundedStreamComponent -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError import pl.touk.nussknacker.engine.api.context._ +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError import pl.touk.nussknacker.engine.api.context.transformation._ import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.exception.NuExceptionInfo import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.api.runtimecontext.{ContextIdGenerator, EngineRuntimeContext} -import pl.touk.nussknacker.engine.api.test.InvocationCollectors.ServiceInvocationCollector import pl.touk.nussknacker.engine.api.test.{TestData, TestRecord, TestRecordParser} +import pl.touk.nussknacker.engine.api.test.InvocationCollectors.ServiceInvocationCollector +import pl.touk.nussknacker.engine.api.typed.{typing, ReturningType, TypedMap} import pl.touk.nussknacker.engine.api.typed.typing.{Typed, Unknown} -import pl.touk.nussknacker.engine.api.typed.{ReturningType, TypedMap, typing} import pl.touk.nussknacker.engine.flink.api.compat.ExplicitUidInOperatorsSupport import pl.touk.nussknacker.engine.flink.api.datastream.DataStreamImplicits._ import pl.touk.nussknacker.engine.flink.api.process._ @@ -43,8 +43,8 @@ import pl.touk.nussknacker.engine.process.SimpleJavaEnum import pl.touk.nussknacker.engine.util.service.{EnricherContextTransformation, TimeMeasuringService} import pl.touk.nussknacker.engine.util.typing.TypingUtils -import java.util.concurrent.atomic.AtomicInteger import java.util.{Date, Optional, UUID} +import java.util.concurrent.atomic.AtomicInteger import javax.annotation.Nullable import scala.concurrent.{ExecutionContext, Future} import scala.jdk.CollectionConverters._ diff --git a/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/FlinkNamespacedKafkaTest.scala b/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/FlinkNamespacedKafkaTest.scala index de2b7f34270..56102d57035 100644 --- a/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/FlinkNamespacedKafkaTest.scala +++ b/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/FlinkNamespacedKafkaTest.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.defaultmodel -import com.typesafe.config.ConfigValueFactory.fromAnyRef import com.typesafe.config.{Config, ConfigFactory} +import com.typesafe.config.ConfigValueFactory.fromAnyRef import io.circe.Json import io.confluent.kafka.schemaregistry.json.JsonSchema import pl.touk.nussknacker.engine.api.process.TopicName diff --git a/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/FlinkWithKafkaSuite.scala b/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/FlinkWithKafkaSuite.scala index eeee14b3937..9a9ba43d09a 100644 --- a/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/FlinkWithKafkaSuite.scala +++ b/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/FlinkWithKafkaSuite.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.defaultmodel -import com.typesafe.config.ConfigValueFactory.fromAnyRef import com.typesafe.config.{Config, ConfigFactory} +import com.typesafe.config.ConfigValueFactory.fromAnyRef import io.circe.Json import io.confluent.kafka.schemaregistry.ParsedSchema import io.confluent.kafka.serializers.{KafkaAvroDeserializer, KafkaAvroSerializer} @@ -9,42 +9,42 @@ import org.apache.avro.Schema import org.apache.avro.generic.GenericData import org.apache.flink.api.common.ExecutionConfig import org.apache.kafka.clients.producer.RecordMetadata +import org.scalatest.{BeforeAndAfter, BeforeAndAfterAll} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{BeforeAndAfter, BeforeAndAfterAll} import pl.touk.nussknacker.defaultmodel.MockSchemaRegistryClientHolder.MockSchemaRegistryClientProvider import pl.touk.nussknacker.defaultmodel.SampleSchemas.RecordSchemaV1 +import pl.touk.nussknacker.engine.api.{JobData, ProcessListener, ProcessVersion} import pl.touk.nussknacker.engine.api.component.ComponentDefinition import pl.touk.nussknacker.engine.api.process.{ProcessObjectDependencies, TopicName} import pl.touk.nussknacker.engine.api.validation.ValidationMode -import pl.touk.nussknacker.engine.api.{JobData, ProcessListener, ProcessVersion} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.deployment.DeploymentData import pl.touk.nussknacker.engine.flink.FlinkBaseUnboundedComponentProvider import pl.touk.nussknacker.engine.flink.test.FlinkSpec import pl.touk.nussknacker.engine.flink.test.ScalatestMiniClusterJobStatusCheckingOps.miniClusterWithServicesToOps import pl.touk.nussknacker.engine.flink.util.transformer.{FlinkBaseComponentProvider, FlinkKafkaComponentProvider} -import pl.touk.nussknacker.engine.kafka.UnspecializedTopicName.ToUnspecializedTopicName import pl.touk.nussknacker.engine.kafka.{KafkaConfig, KafkaSpec} +import pl.touk.nussknacker.engine.kafka.UnspecializedTopicName.ToUnspecializedTopicName +import pl.touk.nussknacker.engine.process.{ExecutionConfigPreparer, FlinkJobConfig} import pl.touk.nussknacker.engine.process.ExecutionConfigPreparer.{ ProcessSettingsPreparer, UnoptimizedSerializationPreparer } import pl.touk.nussknacker.engine.process.compiler.FlinkProcessCompilerDataFactory import pl.touk.nussknacker.engine.process.registrar.FlinkProcessRegistrar -import pl.touk.nussknacker.engine.process.{ExecutionConfigPreparer, FlinkJobConfig} import pl.touk.nussknacker.engine.schemedkafka.AvroUtils import pl.touk.nussknacker.engine.schemedkafka.encode.ToAvroSchemaBasedEncoder import pl.touk.nussknacker.engine.schemedkafka.kryo.AvroSerializersRegistrar -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.ConfluentUtils -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.client.MockSchemaRegistryClient -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.MockSchemaRegistryClientFactory import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ ExistingSchemaVersion, LatestSchemaVersion, SchemaRegistryClientFactory, SchemaVersionOption } +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.ConfluentUtils +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.client.MockSchemaRegistryClient +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.MockSchemaRegistryClientFactory import pl.touk.nussknacker.engine.testing.LocalModelData import pl.touk.nussknacker.engine.testmode.TestRunId import pl.touk.nussknacker.engine.util.LoggingListener diff --git a/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/KafkaAvroItSpec.scala b/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/KafkaAvroItSpec.scala index 0acce1673c3..207f91ffe8c 100644 --- a/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/KafkaAvroItSpec.scala +++ b/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/KafkaAvroItSpec.scala @@ -16,6 +16,7 @@ import java.time.temporal.ChronoUnit class KafkaAvroItSpec extends FlinkWithKafkaSuite with PatientScalaFutures with LazyLogging { import pl.touk.nussknacker.engine.kafka.KafkaTestUtils.richConsumer + import SampleSchemas._ private val givenMatchingAvroObjConvertedToV2 = avroEncoder.encodeRecordOrError( diff --git a/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/KafkaAvroSchemaJsonPayloadItSpec.scala b/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/KafkaAvroSchemaJsonPayloadItSpec.scala index c55014e9a81..e3dd3cb17a4 100644 --- a/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/KafkaAvroSchemaJsonPayloadItSpec.scala +++ b/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/KafkaAvroSchemaJsonPayloadItSpec.scala @@ -14,9 +14,10 @@ import java.time.temporal.ChronoUnit class KafkaAvroSchemaJsonPayloadItSpec extends FlinkWithKafkaSuite with PatientScalaFutures with LazyLogging { import pl.touk.nussknacker.engine.kafka.KafkaTestUtils.richConsumer - import SampleSchemas._ import pl.touk.nussknacker.engine.spel.SpelExtension._ + import SampleSchemas._ + private val givenMatchingJsonObj = """{ | "first": "Jan", diff --git a/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/kafkaschemaless/BaseKafkaJsonSchemalessItSpec.scala b/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/kafkaschemaless/BaseKafkaJsonSchemalessItSpec.scala index a66cf68391f..fbed46c5011 100644 --- a/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/kafkaschemaless/BaseKafkaJsonSchemalessItSpec.scala +++ b/engine/flink/tests/src/test/scala/pl/touk/nussknacker/defaultmodel/kafkaschemaless/BaseKafkaJsonSchemalessItSpec.scala @@ -1,6 +1,6 @@ package pl.touk.nussknacker.defaultmodel.kafkaschemaless -import io.circe.{Json, parser} +import io.circe.{parser, Json} import pl.touk.nussknacker.defaultmodel.FlinkWithKafkaSuite import pl.touk.nussknacker.engine.api.process.TopicName.ForSource import pl.touk.nussknacker.engine.api.validation.ValidationMode diff --git a/engine/flink/tests/src/test/scala/pl/touk/nussknacker/engine/flink/minicluster/scenariotesting/FlinkMiniClusterScenarioTestRunnerSpec.scala b/engine/flink/tests/src/test/scala/pl/touk/nussknacker/engine/flink/minicluster/scenariotesting/FlinkMiniClusterScenarioTestRunnerSpec.scala index 4286cdcbc02..f39dc7062e7 100644 --- a/engine/flink/tests/src/test/scala/pl/touk/nussknacker/engine/flink/minicluster/scenariotesting/FlinkMiniClusterScenarioTestRunnerSpec.scala +++ b/engine/flink/tests/src/test/scala/pl/touk/nussknacker/engine/flink/minicluster/scenariotesting/FlinkMiniClusterScenarioTestRunnerSpec.scala @@ -3,11 +3,12 @@ package pl.touk.nussknacker.engine.flink.minicluster.scenariotesting import cats.effect.unsafe.IORuntime import com.typesafe.config.{Config, ConfigFactory, ConfigValueFactory} import io.circe.Json +import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, Inside, OptionValues} import org.scalatest.concurrent.PatienceConfiguration.Timeout import org.scalatest.exceptions.TestFailedException import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, Inside, OptionValues} +import pl.touk.nussknacker.engine.api.{DisplayJsonWithEncoder, FragmentSpecificData, MetaData} import pl.touk.nussknacker.engine.api.component.{ ComponentAdditionalConfig, DesignerWideComponentId, @@ -20,7 +21,6 @@ import pl.touk.nussknacker.engine.api.parameter.{ } import pl.touk.nussknacker.engine.api.process.ComponentUseCase import pl.touk.nussknacker.engine.api.test.{ScenarioTestData, ScenarioTestJsonRecord} -import pl.touk.nussknacker.engine.api.{DisplayJsonWithEncoder, FragmentSpecificData, MetaData} import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.canonicalgraph.canonicalnode.FlatNode @@ -35,8 +35,8 @@ import pl.touk.nussknacker.engine.flink.minicluster.util.DurationToRetryPolicyCo import pl.touk.nussknacker.engine.flink.minicluster.util.DurationToRetryPolicyConverterOps._ import pl.touk.nussknacker.engine.flink.test.{RecordingExceptionConsumer, RecordingExceptionConsumerProvider} import pl.touk.nussknacker.engine.graph.expression.Expression -import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.node.{Case, FragmentInputDefinition, FragmentOutputDefinition} +import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.process.helpers.SampleNodes._ import pl.touk.nussknacker.engine.process.runner.SimpleProcessConfigCreator import pl.touk.nussknacker.engine.testing.LocalModelData diff --git a/engine/flink/tests/src/test/scala/pl/touk/nussknacker/engine/flink/minicluster/scenariotesting/kafka/KafkaScenarioTestingSpec.scala b/engine/flink/tests/src/test/scala/pl/touk/nussknacker/engine/flink/minicluster/scenariotesting/kafka/KafkaScenarioTestingSpec.scala index 9866c4927bc..5719634154e 100644 --- a/engine/flink/tests/src/test/scala/pl/touk/nussknacker/engine/flink/minicluster/scenariotesting/kafka/KafkaScenarioTestingSpec.scala +++ b/engine/flink/tests/src/test/scala/pl/touk/nussknacker/engine/flink/minicluster/scenariotesting/kafka/KafkaScenarioTestingSpec.scala @@ -5,11 +5,11 @@ import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigValueFactory.fromAnyRef import com.typesafe.scalalogging.LazyLogging import io.circe.Json -import io.circe.Json.{Null, fromString, obj} +import io.circe.Json.{fromString, obj, Null} import org.apache.kafka.common.record.TimestampType +import org.scalatest.{BeforeAndAfterAll, OptionValues} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{BeforeAndAfterAll, OptionValues} import pl.touk.nussknacker.engine.ModelData import pl.touk.nussknacker.engine.api.test.{ScenarioTestData, ScenarioTestJsonRecord} import pl.touk.nussknacker.engine.build.ScenarioBuilder diff --git a/engine/flink/tests/src/test/scala/pl/touk/nussknacker/engine/flink/minicluster/scenariotesting/schemedkafka/SchemedKafkaScenarioTestingSpec.scala b/engine/flink/tests/src/test/scala/pl/touk/nussknacker/engine/flink/minicluster/scenariotesting/schemedkafka/SchemedKafkaScenarioTestingSpec.scala index 6c1ba1bc0ca..6b1f01a9e55 100644 --- a/engine/flink/tests/src/test/scala/pl/touk/nussknacker/engine/flink/minicluster/scenariotesting/schemedkafka/SchemedKafkaScenarioTestingSpec.scala +++ b/engine/flink/tests/src/test/scala/pl/touk/nussknacker/engine/flink/minicluster/scenariotesting/schemedkafka/SchemedKafkaScenarioTestingSpec.scala @@ -8,9 +8,9 @@ import io.circe.Json import io.circe.Json._ import org.apache.avro.Schema import org.apache.kafka.common.record.TimestampType +import org.scalatest.{BeforeAndAfterAll, LoneElement, OptionValues} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{BeforeAndAfterAll, LoneElement, OptionValues} import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.test.{ScenarioTestData, ScenarioTestJsonRecord} import pl.touk.nussknacker.engine.build.ScenarioBuilder @@ -30,9 +30,9 @@ import pl.touk.nussknacker.engine.schemedkafka.KafkaUniversalComponentTransforme topicParamName } import pl.touk.nussknacker.engine.schemedkafka.schema.{Address, Company} +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{SchemaRegistryClientFactory, SchemaVersionOption} import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.ConfluentUtils import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.MockSchemaRegistryClientFactory -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{SchemaRegistryClientFactory, SchemaVersionOption} import pl.touk.nussknacker.engine.spel.SpelExtension._ import pl.touk.nussknacker.engine.testing.LocalModelData import pl.touk.nussknacker.engine.testmode.TestProcess._ diff --git a/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/customComponentTypes.scala b/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/customComponentTypes.scala index 5b4dafa4e3a..1eace7dcd75 100644 --- a/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/customComponentTypes.scala +++ b/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/customComponentTypes.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.lite.api +import cats.{~>, Monad} import cats.data.ValidatedNel -import cats.{Monad, ~>} import pl.touk.nussknacker.engine.api.Context import pl.touk.nussknacker.engine.api.context.ProcessCompilationError import pl.touk.nussknacker.engine.api.process.{Sink, Source} diff --git a/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/interpreterTypes.scala b/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/interpreterTypes.scala index f6fd4da0a57..6826f43fd57 100644 --- a/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/interpreterTypes.scala +++ b/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/interpreterTypes.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.engine.lite.api import pl.touk.nussknacker.engine.api.Context +import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.process.Source import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.lite.api.commonTypes.ResultType import scala.language.higherKinds diff --git a/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/utils/sinks.scala b/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/utils/sinks.scala index ed020ea445e..2bfa7605716 100644 --- a/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/utils/sinks.scala +++ b/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/utils/sinks.scala @@ -1,14 +1,15 @@ package pl.touk.nussknacker.engine.lite.api.utils +import cats.{Monad, Monoid} import cats.data.Writer import cats.implicits._ -import cats.{Monad, Monoid} +import pl.touk.nussknacker.engine.api.{Context, LazyParameter} import pl.touk.nussknacker.engine.api.component.{ComponentId, ComponentType} import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.api.{Context, LazyParameter} -import pl.touk.nussknacker.engine.lite.api.commonTypes.{DataBatch, ErrorType, ResultType, monoid} +import pl.touk.nussknacker.engine.lite.api.commonTypes.{monoid, DataBatch, ErrorType, ResultType} import pl.touk.nussknacker.engine.lite.api.customComponentTypes.{CustomComponentContext, LiteSink} import pl.touk.nussknacker.engine.lite.api.utils.errors.withErrors + import scala.language.higherKinds object sinks { diff --git a/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/utils/sources/BaseLiteSource.scala b/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/utils/sources/BaseLiteSource.scala index 97c6fc69485..d49e975f19c 100644 --- a/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/utils/sources/BaseLiteSource.scala +++ b/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/utils/sources/BaseLiteSource.scala @@ -2,11 +2,11 @@ package pl.touk.nussknacker.engine.lite.api.utils.sources import cats.Monad import cats.data.{Validated, ValidatedNel} -import pl.touk.nussknacker.engine.api.component.{ComponentId, ComponentType, NodeComponentInfo} import pl.touk.nussknacker.engine.api.{Context, Lifecycle} +import pl.touk.nussknacker.engine.api.NodeId +import pl.touk.nussknacker.engine.api.component.{ComponentId, ComponentType, NodeComponentInfo} import pl.touk.nussknacker.engine.api.exception.NuExceptionInfo import pl.touk.nussknacker.engine.api.runtimecontext.{ContextIdGenerator, EngineRuntimeContext} -import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.lite.api.commonTypes.ErrorType import pl.touk.nussknacker.engine.lite.api.customComponentTypes import pl.touk.nussknacker.engine.lite.api.customComponentTypes.LiteSource diff --git a/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/utils/transformers.scala b/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/utils/transformers.scala index 4d50de91351..8bbd72ab33c 100644 --- a/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/utils/transformers.scala +++ b/engine/lite/components-api/src/main/scala/pl/touk/nussknacker/engine/lite/api/utils/transformers.scala @@ -4,9 +4,9 @@ import cats.Monad import cats.implicits._ import cats.kernel.Monoid import pl.touk.nussknacker.engine.api.Context +import pl.touk.nussknacker.engine.lite.api.commonTypes._ import pl.touk.nussknacker.engine.lite.api.commonTypes.{DataBatch, ResultType} import pl.touk.nussknacker.engine.lite.api.customComponentTypes._ -import pl.touk.nussknacker.engine.lite.api.commonTypes._ import scala.language.higherKinds diff --git a/engine/lite/components/base/src/main/scala/pl/touk/nussknacker/engine/lite/components/ForEachTransformer.scala b/engine/lite/components/base/src/main/scala/pl/touk/nussknacker/engine/lite/components/ForEachTransformer.scala index 3b8a47732dd..542a7a8b833 100644 --- a/engine/lite/components/base/src/main/scala/pl/touk/nussknacker/engine/lite/components/ForEachTransformer.scala +++ b/engine/lite/components/base/src/main/scala/pl/touk/nussknacker/engine/lite/components/ForEachTransformer.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.lite.components import cats.Monad import pl.touk.nussknacker.engine.api._ +import pl.touk.nussknacker.engine.api.typed.{typing, ReturningType} import pl.touk.nussknacker.engine.api.typed.typing.{SingleTypingResult, Typed, Unknown} -import pl.touk.nussknacker.engine.api.typed.{ReturningType, typing} import pl.touk.nussknacker.engine.lite.api.commonTypes.{DataBatch, ResultType} import pl.touk.nussknacker.engine.lite.api.customComponentTypes.{CustomComponentContext, LiteCustomComponent} import pl.touk.nussknacker.engine.lite.api.utils.transformers.SingleElementComponent diff --git a/engine/lite/components/base/src/main/scala/pl/touk/nussknacker/engine/lite/components/LiteBaseComponentProvider.scala b/engine/lite/components/base/src/main/scala/pl/touk/nussknacker/engine/lite/components/LiteBaseComponentProvider.scala index 7996e2bc4a5..bf55bec485d 100644 --- a/engine/lite/components/base/src/main/scala/pl/touk/nussknacker/engine/lite/components/LiteBaseComponentProvider.scala +++ b/engine/lite/components/base/src/main/scala/pl/touk/nussknacker/engine/lite/components/LiteBaseComponentProvider.scala @@ -8,9 +8,9 @@ import pl.touk.nussknacker.engine.api.component.{ComponentDefinition, ComponentP import pl.touk.nussknacker.engine.api.process.{ProcessObjectDependencies, SinkFactory} import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.common.components.DecisionTable +import pl.touk.nussknacker.engine.lite.api.{commonTypes, customComponentTypes} import pl.touk.nussknacker.engine.lite.api.commonTypes.ResultType import pl.touk.nussknacker.engine.lite.api.customComponentTypes.LiteSink -import pl.touk.nussknacker.engine.lite.api.{commonTypes, customComponentTypes} import pl.touk.nussknacker.engine.util.config.DocsConfig import scala.language.higherKinds diff --git a/engine/lite/components/base/src/main/scala/pl/touk/nussknacker/engine/lite/components/Union.scala b/engine/lite/components/base/src/main/scala/pl/touk/nussknacker/engine/lite/components/Union.scala index a89b68dd93c..e94bbae2595 100644 --- a/engine/lite/components/base/src/main/scala/pl/touk/nussknacker/engine/lite/components/Union.scala +++ b/engine/lite/components/base/src/main/scala/pl/touk/nussknacker/engine/lite/components/Union.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.engine.lite.components import cats.Monad import cats.data.{NonEmptyList, Validated} import pl.touk.nussknacker.engine.api._ -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CannotCreateObjectError import pl.touk.nussknacker.engine.api.context.{ContextTransformation, JoinContextTransformation, ValidationContext} +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CannotCreateObjectError import pl.touk.nussknacker.engine.api.typed.supertype.CommonSupertypeFinder import pl.touk.nussknacker.engine.api.typed.typing.{TypedObjectTypingResult, TypingResult} import pl.touk.nussknacker.engine.lite.api.commonTypes.{DataBatch, ResultType} diff --git a/engine/lite/components/base/src/test/scala/pl/touk/nussknacker/engine/lite/components/UnionTest.scala b/engine/lite/components/base/src/test/scala/pl/touk/nussknacker/engine/lite/components/UnionTest.scala index d8e2314ce53..9ab9aadf47a 100644 --- a/engine/lite/components/base/src/test/scala/pl/touk/nussknacker/engine/lite/components/UnionTest.scala +++ b/engine/lite/components/base/src/test/scala/pl/touk/nussknacker/engine/lite/components/UnionTest.scala @@ -9,8 +9,8 @@ import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.component.{ComponentDefinition, UnboundedStreamComponent} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CannotCreateObjectError import pl.touk.nussknacker.engine.api.process._ +import pl.touk.nussknacker.engine.api.typed.{typing, ReturningType} import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.typed.{ReturningType, typing} import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} import pl.touk.nussknacker.engine.compile.{CompilationResult, ProcessValidator} import pl.touk.nussknacker.engine.lite.api.commonTypes.ErrorType diff --git a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/AzureSchemaRegistryKafkaAvroTest.scala b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/AzureSchemaRegistryKafkaAvroTest.scala index d29efa356ba..24a0ba8b63e 100644 --- a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/AzureSchemaRegistryKafkaAvroTest.scala +++ b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/AzureSchemaRegistryKafkaAvroTest.scala @@ -5,8 +5,8 @@ import com.typesafe.config.ConfigValueFactory.fromAnyRef import com.typesafe.scalalogging.LazyLogging import io.circe.Json import io.confluent.kafka.schemaregistry.avro.AvroSchema -import org.apache.avro.generic.{GenericRecord, GenericRecordBuilder} import org.apache.avro.{Schema, SchemaBuilder} +import org.apache.avro.generic.{GenericRecord, GenericRecordBuilder} import org.apache.kafka.clients.admin.NewTopic import org.apache.kafka.clients.producer.ProducerRecord import org.scalatest.funsuite.AnyFunSuite @@ -15,8 +15,8 @@ import org.scalatest.tags.Network import pl.touk.nussknacker.engine.api.process.TopicName import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess -import pl.touk.nussknacker.engine.kafka.UnspecializedTopicName.ToUnspecializedTopicName import pl.touk.nussknacker.engine.kafka.{KafkaConfig, KafkaUtils, UnspecializedTopicName} +import pl.touk.nussknacker.engine.kafka.UnspecializedTopicName.ToUnspecializedTopicName import pl.touk.nussknacker.engine.lite.components.LiteKafkaComponentProvider.KafkaUniversalName import pl.touk.nussknacker.engine.lite.util.test.{KafkaAvroConsumerRecord, KafkaConsumerRecord} import pl.touk.nussknacker.engine.lite.util.test.LiteKafkaTestScenarioRunner._ @@ -27,12 +27,12 @@ import pl.touk.nussknacker.engine.schemedkafka.KafkaUniversalComponentTransforme sinkValueParamName, topicParamName } +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{SchemaId, SchemaVersionOption} import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.{ AzureSchemaRegistryClientFactory, AzureUtils, SchemaNameTopicMatchStrategy } -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{SchemaId, SchemaVersionOption} import pl.touk.nussknacker.engine.spel.SpelExtension._ import pl.touk.nussknacker.engine.util.test.TestScenarioRunner import pl.touk.nussknacker.engine.util.test.TestScenarioRunner.RunnerListResult diff --git a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaUniversalAvroSchemaFunctionalTest.scala b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaUniversalAvroSchemaFunctionalTest.scala index c56c81c4fbf..d76e62d2d72 100644 --- a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaUniversalAvroSchemaFunctionalTest.scala +++ b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaUniversalAvroSchemaFunctionalTest.scala @@ -1,10 +1,10 @@ package pl.touk.nussknacker.engine.lite.components -import cats.data.Validated.Valid import cats.data.{Validated, ValidatedNel} +import cats.data.Validated.Valid +import org.apache.avro.{AvroRuntimeException, Schema} import org.apache.avro.Schema.Type import org.apache.avro.generic.GenericRecord -import org.apache.avro.{AvroRuntimeException, Schema} import org.apache.kafka.clients.producer.ProducerRecord import org.apache.kafka.common.errors.SerializationException import org.scalatest.Inside @@ -17,14 +17,14 @@ import pl.touk.nussknacker.engine.api.process.TopicName import pl.touk.nussknacker.engine.api.validation.ValidationMode import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.kafka.UnspecializedTopicName.ToUnspecializedTopicName +import pl.touk.nussknacker.engine.lite.components.utils.{AvroGen, ExcludedConfig} import pl.touk.nussknacker.engine.lite.components.utils.AvroGen.genValueForSchema import pl.touk.nussknacker.engine.lite.components.utils.AvroTestData._ -import pl.touk.nussknacker.engine.lite.components.utils.{AvroGen, ExcludedConfig} import pl.touk.nussknacker.engine.lite.util.test.KafkaAvroConsumerRecord import pl.touk.nussknacker.engine.schemedkafka.AvroUtils import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.SchemaVersionOption -import pl.touk.nussknacker.engine.util.test.TestScenarioRunner.RunnerListResult import pl.touk.nussknacker.engine.util.test.{RunListResult, RunResult} +import pl.touk.nussknacker.engine.util.test.TestScenarioRunner.RunnerListResult import pl.touk.nussknacker.test.{SpecialSpELElement, ValidatedValuesDetailedMessage} import java.nio.ByteBuffer @@ -39,13 +39,14 @@ class LiteKafkaUniversalAvroSchemaFunctionalTest with ValidatedValuesDetailedMessage with FunctionalTestMixin { - import LiteKafkaComponentProvider._ - import SpecialSpELElement._ - import ValidationMode._ import pl.touk.nussknacker.engine.lite.components.utils.LiteralSpELWithAvroImplicits._ import pl.touk.nussknacker.engine.schemedkafka.KafkaUniversalComponentTransformer._ import pl.touk.nussknacker.engine.spel.SpelExtension._ + import LiteKafkaComponentProvider._ + import SpecialSpELElement._ + import ValidationMode._ + implicit override val generatorDrivenConfig: PropertyCheckConfiguration = PropertyCheckConfiguration(minSuccessful = 1000, minSize = 0, workers = 5) diff --git a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaUniversalJsonFunctionalTest.scala b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaUniversalJsonFunctionalTest.scala index f6dde0610f9..601e3ae1f60 100644 --- a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaUniversalJsonFunctionalTest.scala +++ b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaUniversalJsonFunctionalTest.scala @@ -1,15 +1,15 @@ package pl.touk.nussknacker.engine.lite.components -import cats.data.Validated.{Invalid, Valid, invalidNel} import cats.data.{NonEmptyList, Validated, ValidatedNel} +import cats.data.Validated.{invalidNel, Invalid, Valid} import io.circe.Json -import io.circe.Json.{Null, fromFields, fromInt, fromLong, fromString, obj} +import io.circe.Json.{fromFields, fromInt, fromLong, fromString, obj, Null} import org.apache.kafka.clients.producer.ProducerRecord import org.everit.json.schema.{ObjectSchema, Schema => EveritSchema, StringSchema} +import org.scalatest.{Assertion, Inside} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks -import org.scalatest.{Assertion, Inside} import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks import pl.touk.nussknacker.engine.api.CirceUtil import pl.touk.nussknacker.engine.api.context.ProcessCompilationError @@ -43,13 +43,14 @@ class LiteKafkaUniversalJsonFunctionalTest with ValidatedValuesDetailedMessage with FunctionalTestMixin { - import LiteKafkaComponentProvider._ - import SpecialSpELElement._ import pl.touk.nussknacker.engine.lite.components.utils.JsonTestData._ import pl.touk.nussknacker.engine.spel.SpelExtension._ import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap import pl.touk.nussknacker.test.LiteralSpELImplicits._ + import LiteKafkaComponentProvider._ + import SpecialSpELElement._ + private val lax = List(ValidationMode.lax) private val strict = List(ValidationMode.strict) private val strictAndLax = ValidationMode.values diff --git a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/UniversalCrossSourceLiteTest.scala b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/UniversalCrossSourceLiteTest.scala index 3dd59487994..07a9d5fa74f 100644 --- a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/UniversalCrossSourceLiteTest.scala +++ b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/UniversalCrossSourceLiteTest.scala @@ -26,11 +26,12 @@ import java.util.Optional class UniversalCrossSourceLiteTest extends AnyFunSuite with Matchers with ValidatedValuesDetailedMessage { - import LiteKafkaComponentProvider._ - import LiteKafkaTestScenarioRunner._ import pl.touk.nussknacker.engine.schemedkafka.KafkaUniversalComponentTransformer._ import pl.touk.nussknacker.engine.spel.SpelExtension._ + import LiteKafkaComponentProvider._ + import LiteKafkaTestScenarioRunner._ + val avroSchema: avro.Schema = AvroTestData.personSchema val jsonSchema: Schema = JsonTestData.schemaPerson diff --git a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/UniversalSourceAvroSchemaLiteTest.scala b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/UniversalSourceAvroSchemaLiteTest.scala index 267ff2085f0..97b364f7955 100644 --- a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/UniversalSourceAvroSchemaLiteTest.scala +++ b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/UniversalSourceAvroSchemaLiteTest.scala @@ -17,11 +17,12 @@ import pl.touk.nussknacker.test.ValidatedValuesDetailedMessage class UniversalSourceAvroSchemaLiteTest extends AnyFunSuite with Matchers with ValidatedValuesDetailedMessage { - import LiteKafkaComponentProvider._ - import LiteKafkaTestScenarioRunner._ import pl.touk.nussknacker.engine.schemedkafka.KafkaUniversalComponentTransformer._ import pl.touk.nussknacker.engine.spel.SpelExtension._ + import LiteKafkaComponentProvider._ + import LiteKafkaTestScenarioRunner._ + private val inputTopic = TopicName.ForSource("input") private val outputTopic = TopicName.ForSink("output") diff --git a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/UniversalSourceJsonSchemaLiteTest.scala b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/UniversalSourceJsonSchemaLiteTest.scala index 2eb24d9d662..0c51fa13ca1 100644 --- a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/UniversalSourceJsonSchemaLiteTest.scala +++ b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/UniversalSourceJsonSchemaLiteTest.scala @@ -22,11 +22,12 @@ class UniversalSourceJsonSchemaLiteTest with ValidatedValuesDetailedMessage with FunctionalTestMixin { - import LiteKafkaComponentProvider._ import io.circe.parser._ import pl.touk.nussknacker.engine.schemedkafka.KafkaUniversalComponentTransformer._ import pl.touk.nussknacker.engine.spel.SpelExtension._ + import LiteKafkaComponentProvider._ + private val schema = JsonSchemaBuilder.parseSchema("""{ | "type": "object", | "properties": { diff --git a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/AvroGen.scala b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/AvroGen.scala index 2a0422240ad..bfc87b4dc7f 100644 --- a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/AvroGen.scala +++ b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/AvroGen.scala @@ -85,9 +85,8 @@ object AvroGen { case Type.RECORD => Gen .sequence( - schema.getFields.asScala.map(field => - genValueForSchema(field.schema()).flatMap(value => field.name() -> value) - ) + schema.getFields.asScala + .map(field => genValueForSchema(field.schema()).flatMap(value => field.name() -> value)) ) .map(data => AvroUtils.createRecord(schema, data.asScala.toMap)) case _ => throw new IllegalArgumentException(s"Unsupported schema: $schema") diff --git a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/AvroSchemaCreator.scala b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/AvroSchemaCreator.scala index a622e46f81b..1bf02a5fb4e 100644 --- a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/AvroSchemaCreator.scala +++ b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/AvroSchemaCreator.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.lite.components.utils -import org.apache.avro.Schema.{Field, Type} import org.apache.avro.{LogicalType, LogicalTypes, Schema} +import org.apache.avro.Schema.{Field, Type} import scala.util.Random diff --git a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/AvroTestData.scala b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/AvroTestData.scala index 2b7a7f262b5..8ce58662515 100644 --- a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/AvroTestData.scala +++ b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/AvroTestData.scala @@ -1,28 +1,28 @@ package pl.touk.nussknacker.engine.lite.components.utils import org.apache.avro +import org.apache.avro.{LogicalTypes, Schema} import org.apache.avro.Schema.Type import org.apache.avro.data.TimeConversions.TimestampMicrosConversion import org.apache.avro.generic.GenericData.{EnumSymbol, Fixed} import org.apache.avro.generic.GenericRecord -import org.apache.avro.{LogicalTypes, Schema} import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.schemedkafka.AvroUtils import pl.touk.nussknacker.engine.lite.components.utils.AvroSchemaCreator.{ - Null, createArray, createEnum, createField, createFixed, createLogical, createMap, - createRecord + createRecord, + Null } +import pl.touk.nussknacker.engine.schemedkafka.AvroUtils import java.nio.charset.StandardCharsets -import java.time.temporal.ChronoUnit import java.time.{Instant, LocalDate, LocalTime} +import java.time.temporal.ChronoUnit import java.util.UUID import java.util.concurrent.TimeUnit diff --git a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/JsonTestData.scala b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/JsonTestData.scala index 686a35a7dc9..19f024c97ce 100644 --- a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/JsonTestData.scala +++ b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/JsonTestData.scala @@ -2,7 +2,6 @@ package pl.touk.nussknacker.engine.lite.components.utils import io.circe.Json import io.circe.Json._ -import org.everit.json.schema.regexp.JavaUtilRegexpFactory import org.everit.json.schema.{ ArraySchema, CombinedSchema, @@ -12,6 +11,7 @@ import org.everit.json.schema.{ Schema, StringSchema } +import org.everit.json.schema.regexp.JavaUtilRegexpFactory import pl.touk.nussknacker.engine.json.JsonSchemaBuilder import pl.touk.nussknacker.test.SpecialSpELElement diff --git a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/LiteralSpELWithAvroImplicits.scala b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/LiteralSpELWithAvroImplicits.scala index a8cddef4079..31daf568d18 100644 --- a/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/LiteralSpELWithAvroImplicits.scala +++ b/engine/lite/components/kafka-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/utils/LiteralSpELWithAvroImplicits.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.lite.components.utils -import org.apache.avro.generic.GenericData.{EnumSymbol, Fixed} import org.apache.avro.generic.{GenericRecord, IndexedRecord} +import org.apache.avro.generic.GenericData.{EnumSymbol, Fixed} import pl.touk.nussknacker.test.LiteralSpEL object LiteralSpELWithAvroImplicits { diff --git a/engine/lite/components/kafka/src/main/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaComponentProvider.scala b/engine/lite/components/kafka/src/main/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaComponentProvider.scala index 317c7fda134..8aba63c233a 100644 --- a/engine/lite/components/kafka/src/main/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaComponentProvider.scala +++ b/engine/lite/components/kafka/src/main/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaComponentProvider.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.engine.lite.components import com.typesafe.config.Config -import pl.touk.nussknacker.engine.api.component.ComponentType.ComponentType import pl.touk.nussknacker.engine.api.component.{ ComponentDefinition, ComponentProvider, ComponentType, NussknackerVersion } +import pl.touk.nussknacker.engine.api.component.ComponentType.ComponentType import pl.touk.nussknacker.engine.api.process.ProcessObjectDependencies import pl.touk.nussknacker.engine.kafka.KafkaConfig import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.SchemaRegistryClientFactory diff --git a/engine/lite/components/kafka/src/main/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaSourceImplFactory.scala b/engine/lite/components/kafka/src/main/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaSourceImplFactory.scala index 35f4fa47007..6380aa52f53 100644 --- a/engine/lite/components/kafka/src/main/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaSourceImplFactory.scala +++ b/engine/lite/components/kafka/src/main/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaSourceImplFactory.scala @@ -2,6 +2,7 @@ package pl.touk.nussknacker.engine.lite.components import cats.data.NonEmptyList import org.apache.kafka.clients.consumer.ConsumerRecord +import pl.touk.nussknacker.engine.api.{Context, NodeId, Params, VariableConstants} import pl.touk.nussknacker.engine.api.context.transformation.NodeDependencyValue import pl.touk.nussknacker.engine.api.definition.{Parameter, TypedNodeDependency} import pl.touk.nussknacker.engine.api.namespaces.NamingStrategy @@ -9,15 +10,14 @@ import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.api.runtimecontext.EngineRuntimeContext import pl.touk.nussknacker.engine.api.test.{TestRecord, TestRecordParser} -import pl.touk.nussknacker.engine.api.{Context, NodeId, Params, VariableConstants} -import pl.touk.nussknacker.engine.kafka.serialization.KafkaDeserializationSchema -import pl.touk.nussknacker.engine.kafka.source.KafkaSourceFactory.{KafkaSourceImplFactory, KafkaTestParametersInfo} import pl.touk.nussknacker.engine.kafka.{ KafkaConfig, PreparedKafkaTopic, RecordFormatter, RecordFormatterBaseTestDataGenerator } +import pl.touk.nussknacker.engine.kafka.serialization.KafkaDeserializationSchema +import pl.touk.nussknacker.engine.kafka.source.KafkaSourceFactory.{KafkaSourceImplFactory, KafkaTestParametersInfo} import pl.touk.nussknacker.engine.lite.kafka.api.LiteKafkaSource import pl.touk.nussknacker.engine.util.parameters.TestingParametersSupport diff --git a/engine/lite/components/kafka/src/main/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaUniversalSinkImplFactory.scala b/engine/lite/components/kafka/src/main/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaUniversalSinkImplFactory.scala index aad12eb13ce..dbba6a03b17 100644 --- a/engine/lite/components/kafka/src/main/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaUniversalSinkImplFactory.scala +++ b/engine/lite/components/kafka/src/main/scala/pl/touk/nussknacker/engine/lite/components/LiteKafkaUniversalSinkImplFactory.scala @@ -5,8 +5,8 @@ import org.apache.kafka.clients.producer.ProducerRecord import pl.touk.nussknacker.engine.api.LazyParameter import pl.touk.nussknacker.engine.api.process.{Sink, TopicName} import pl.touk.nussknacker.engine.api.validation.ValidationMode -import pl.touk.nussknacker.engine.kafka.serialization.KafkaSerializationSchema import pl.touk.nussknacker.engine.kafka.{KafkaConfig, PreparedKafkaTopic} +import pl.touk.nussknacker.engine.kafka.serialization.KafkaSerializationSchema import pl.touk.nussknacker.engine.lite.api.utils.sinks.LazyParamSink import pl.touk.nussknacker.engine.schemedkafka.RuntimeSchemaData import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.UniversalSchemaSupportDispatcher diff --git a/engine/lite/components/request-response-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/LiteRequestResponseFunctionalTest.scala b/engine/lite/components/request-response-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/LiteRequestResponseFunctionalTest.scala index 42994174f0c..a1a92b6d091 100644 --- a/engine/lite/components/request-response-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/LiteRequestResponseFunctionalTest.scala +++ b/engine/lite/components/request-response-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/LiteRequestResponseFunctionalTest.scala @@ -1,10 +1,10 @@ package pl.touk.nussknacker.engine.lite.components.requestresponse import akka.http.scaladsl.model.{HttpMethods, HttpRequest} -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, Validated, ValidatedNel} +import cats.data.Validated.{Invalid, Valid} import io.circe.Json -import io.circe.Json.{Null, arr, fromInt, fromString, obj} +import io.circe.Json.{arr, fromInt, fromString, obj, Null} import io.circe.syntax.EncoderOps import org.everit.json.schema.{NumberSchema, Schema, StringSchema} import org.scalatest.Inside.inside @@ -28,8 +28,8 @@ import pl.touk.nussknacker.engine.lite.util.test.RequestResponseTestScenarioRunn import pl.touk.nussknacker.engine.spel.SpelExtension._ import pl.touk.nussknacker.engine.util.output.OutputValidatorErrorsMessageFormatter import pl.touk.nussknacker.engine.util.test.TestScenarioRunner -import pl.touk.nussknacker.test.SpecialSpELElement.{EmptyMap, Input} import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, SpecialSpELElement, ValidatedValuesDetailedMessage} +import pl.touk.nussknacker.test.SpecialSpELElement.{EmptyMap, Input} //More tests e2e with json are available at LiteKafkaUniversalJsonFunctionalTest class LiteRequestResponseFunctionalTest diff --git a/engine/lite/components/request-response-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/RequestResponseTestWithParametersTest.scala b/engine/lite/components/request-response-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/RequestResponseTestWithParametersTest.scala index 1adfc4db50c..531bea625ce 100644 --- a/engine/lite/components/request-response-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/RequestResponseTestWithParametersTest.scala +++ b/engine/lite/components/request-response-tests/src/test/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/RequestResponseTestWithParametersTest.scala @@ -4,11 +4,11 @@ import io.circe.parser.parse import org.everit.json.schema.EmptySchema import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.{MetaData, NodeId, RequestResponseMetaData} import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.editor.DualEditorMode import pl.touk.nussknacker.engine.api.typed.TypedMap import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypedObjectTypingResult, TypingResult, Unknown} -import pl.touk.nussknacker.engine.api.{MetaData, NodeId, RequestResponseMetaData} import pl.touk.nussknacker.engine.json.JsonSchemaBuilder import pl.touk.nussknacker.engine.lite.components.requestresponse.jsonschema.sinks.JsonRequestResponseSink.SinkRawValueParamName import pl.touk.nussknacker.engine.lite.components.requestresponse.jsonschema.sources.JsonSchemaRequestResponseSource diff --git a/engine/lite/components/request-response/src/main/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/jsonschema/sinks/JsonRequestResponseSinkFactory.scala b/engine/lite/components/request-response/src/main/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/jsonschema/sinks/JsonRequestResponseSinkFactory.scala index 5be4e6b3535..8020909e79b 100644 --- a/engine/lite/components/request-response/src/main/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/jsonschema/sinks/JsonRequestResponseSinkFactory.scala +++ b/engine/lite/components/request-response/src/main/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/jsonschema/sinks/JsonRequestResponseSinkFactory.scala @@ -2,6 +2,7 @@ package pl.touk.nussknacker.engine.lite.components.requestresponse.jsonschema.si import cats.data.Validated.valid import org.everit.json.schema.Schema +import pl.touk.nussknacker.engine.api.{MetaData, NodeId, Params} import pl.touk.nussknacker.engine.api.component.RequestResponseComponent import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.context.transformation.{ @@ -13,13 +14,12 @@ import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.{Sink, SinkFactory} import pl.touk.nussknacker.engine.api.validation.ValidationMode -import pl.touk.nussknacker.engine.api.{MetaData, NodeId, Params} import pl.touk.nussknacker.engine.graph.expression.Expression -import pl.touk.nussknacker.engine.json.encode.JsonSchemaOutputValidator import pl.touk.nussknacker.engine.json.{JsonSchemaBasedParameter, JsonSchemaExtractor} +import pl.touk.nussknacker.engine.json.encode.JsonSchemaOutputValidator import pl.touk.nussknacker.engine.requestresponse.api.openapi.RequestResponseOpenApiSettings.OutputSchemaProperty -import pl.touk.nussknacker.engine.util.sinkvalue.SinkValue import pl.touk.nussknacker.engine.util.parameters.{SchemaBasedParameter, SingleSchemaBasedParameter} +import pl.touk.nussknacker.engine.util.sinkvalue.SinkValue object JsonRequestResponseSink { diff --git a/engine/lite/components/request-response/src/main/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/jsonschema/sources/JsonSchemaRequestResponseSource.scala b/engine/lite/components/request-response/src/main/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/jsonschema/sources/JsonSchemaRequestResponseSource.scala index c12d347e4f6..c08aef4a60f 100644 --- a/engine/lite/components/request-response/src/main/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/jsonschema/sources/JsonSchemaRequestResponseSource.scala +++ b/engine/lite/components/request-response/src/main/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/jsonschema/sources/JsonSchemaRequestResponseSource.scala @@ -3,27 +3,27 @@ package pl.touk.nussknacker.engine.lite.components.requestresponse.jsonschema.so import com.typesafe.scalalogging.LazyLogging import io.circe.Json import org.everit.json.schema.{CombinedSchema, Schema} +import pl.touk.nussknacker.engine.api.{CirceUtil, MetaData, NodeId} import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.{SourceTestSupport, TestWithParametersSupport} import pl.touk.nussknacker.engine.api.test.{TestRecord, TestRecordParser} -import pl.touk.nussknacker.engine.api.typed.{ReturningType, typing} +import pl.touk.nussknacker.engine.api.typed.{typing, ReturningType} import pl.touk.nussknacker.engine.api.validation.ValidationMode -import pl.touk.nussknacker.engine.api.{CirceUtil, MetaData, NodeId} import pl.touk.nussknacker.engine.json.{JsonSchemaBasedParameter, SwaggerBasedJsonSchemaTypeDefinitionExtractor} import pl.touk.nussknacker.engine.json.serde.CirceJsonDeserializer import pl.touk.nussknacker.engine.json.swagger.SwaggerTyped import pl.touk.nussknacker.engine.json.swagger.decode.FromJsonSchemaBasedDecoder import pl.touk.nussknacker.engine.lite.components.requestresponse.jsonschema.sinks.JsonRequestResponseSink.SinkRawValueParamName -import pl.touk.nussknacker.engine.requestresponse.api.openapi.OpenApiSourceDefinition import pl.touk.nussknacker.engine.requestresponse.api.{RequestResponsePostSource, ResponseEncoder} +import pl.touk.nussknacker.engine.requestresponse.api.openapi.OpenApiSourceDefinition import pl.touk.nussknacker.engine.requestresponse.utils.encode.SchemaResponseEncoder import pl.touk.nussknacker.engine.util.json.{JsonSchemaUtils, ToJsonEncoder} import pl.touk.nussknacker.engine.util.json.JsonSchemaImplicits._ import pl.touk.nussknacker.engine.util.parameters.TestingParametersSupport -import scala.jdk.CollectionConverters._ import java.nio.charset.StandardCharsets +import scala.jdk.CollectionConverters._ class JsonSchemaRequestResponseSource( val definition: String, diff --git a/engine/lite/components/request-response/src/main/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/jsonschema/sources/JsonSchemaRequestResponseSourceFactory.scala b/engine/lite/components/request-response/src/main/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/jsonschema/sources/JsonSchemaRequestResponseSourceFactory.scala index 9a515232da2..6312eb97c13 100644 --- a/engine/lite/components/request-response/src/main/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/jsonschema/sources/JsonSchemaRequestResponseSourceFactory.scala +++ b/engine/lite/components/request-response/src/main/scala/pl/touk/nussknacker/engine/lite/components/requestresponse/jsonschema/sources/JsonSchemaRequestResponseSourceFactory.scala @@ -1,19 +1,19 @@ package pl.touk.nussknacker.engine.lite.components.requestresponse.jsonschema.sources import org.everit.json.schema.Schema +import pl.touk.nussknacker.engine.api.{MetaData, NodeId, Params} import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.context.transformation.{NodeDependencyValue, SingleInputDynamicComponent} import pl.touk.nussknacker.engine.api.definition.{NodeDependency, TypedNodeDependency} import pl.touk.nussknacker.engine.api.process.{BasicContextInitializer, Source} import pl.touk.nussknacker.engine.api.typed._ import pl.touk.nussknacker.engine.api.typed.typing.Unknown -import pl.touk.nussknacker.engine.api.{MetaData, NodeId, Params} import pl.touk.nussknacker.engine.json.{JsonSchemaExtractor, SwaggerBasedJsonSchemaTypeDefinitionExtractor} +import pl.touk.nussknacker.engine.requestresponse.api.{RequestResponseSource, RequestResponseSourceFactory} import pl.touk.nussknacker.engine.requestresponse.api.openapi.RequestResponseOpenApiSettings.{ InputSchemaProperty, OutputSchemaProperty } -import pl.touk.nussknacker.engine.requestresponse.api.{RequestResponseSource, RequestResponseSourceFactory} class JsonSchemaRequestResponseSourceFactory extends RequestResponseSourceFactory diff --git a/engine/lite/deploymentManager/src/main/scala/pl/touk/nussknacker/lite/manager/LiteDeploymentManagerProvider.scala b/engine/lite/deploymentManager/src/main/scala/pl/touk/nussknacker/lite/manager/LiteDeploymentManagerProvider.scala index 6122c710a95..c5e650df315 100644 --- a/engine/lite/deploymentManager/src/main/scala/pl/touk/nussknacker/lite/manager/LiteDeploymentManagerProvider.scala +++ b/engine/lite/deploymentManager/src/main/scala/pl/touk/nussknacker/lite/manager/LiteDeploymentManagerProvider.scala @@ -1,6 +1,7 @@ package pl.touk.nussknacker.lite.manager import com.typesafe.config.Config +import pl.touk.nussknacker.engine.{DeploymentManagerProvider, MetaDataInitializer} import pl.touk.nussknacker.engine.api.{LiteStreamMetaData, RequestResponseMetaData} import pl.touk.nussknacker.engine.api.component.ScenarioPropertyConfig import pl.touk.nussknacker.engine.api.definition.{ @@ -10,7 +11,6 @@ import pl.touk.nussknacker.engine.api.definition.{ } import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.engine.requestresponse.api.openapi.RequestResponseOpenApiSettings -import pl.touk.nussknacker.engine.{DeploymentManagerProvider, MetaDataInitializer} trait LiteDeploymentManagerProvider extends DeploymentManagerProvider { diff --git a/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/EmbeddedDeploymentManager.scala b/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/EmbeddedDeploymentManager.scala index 03567b2764e..cfa3122fe00 100644 --- a/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/EmbeddedDeploymentManager.scala +++ b/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/EmbeddedDeploymentManager.scala @@ -1,6 +1,7 @@ package pl.touk.nussknacker.engine.embedded import com.typesafe.scalalogging.LazyLogging +import pl.touk.nussknacker.engine.{newdeployment, ModelData} import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus @@ -8,11 +9,10 @@ import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus.Proble import pl.touk.nussknacker.engine.api.process.{ProcessName, VersionId} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.deployment.{DeploymentData, DeploymentId, ExternalDeploymentId} -import pl.touk.nussknacker.engine.{ModelData, newdeployment} import pl.touk.nussknacker.lite.manager.LiteDeploymentManager -import scala.concurrent.duration.DurationInt import scala.concurrent.{Await, ExecutionContext, Future} +import scala.concurrent.duration.DurationInt import scala.util.{Failure, Success, Try} /* diff --git a/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/EmbeddedDeploymentManagerProvider.scala b/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/EmbeddedDeploymentManagerProvider.scala index 00a295f0bc1..104e13909f6 100644 --- a/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/EmbeddedDeploymentManagerProvider.scala +++ b/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/EmbeddedDeploymentManagerProvider.scala @@ -3,6 +3,7 @@ package pl.touk.nussknacker.engine.embedded import cats.data.Validated.valid import cats.data.ValidatedNel import com.typesafe.config.Config +import pl.touk.nussknacker.engine.{BaseModelData, CustomProcessValidator, DeploymentManagerDependencies} import pl.touk.nussknacker.engine.ModelData.BaseModelDataExt import pl.touk.nussknacker.engine.api.deployment.DeploymentManager import pl.touk.nussknacker.engine.api.process.ProcessName @@ -10,7 +11,6 @@ import pl.touk.nussknacker.engine.embedded.requestresponse.RequestResponseDeploy import pl.touk.nussknacker.engine.embedded.streaming.StreamingDeploymentStrategy import pl.touk.nussknacker.engine.lite.api.runtimecontext.LiteEngineRuntimeContextPreparer import pl.touk.nussknacker.engine.lite.metrics.dropwizard.{DropwizardMetricsProviderFactory, LiteMetricRegistryFactory} -import pl.touk.nussknacker.engine.{BaseModelData, CustomProcessValidator, DeploymentManagerDependencies} import pl.touk.nussknacker.lite.manager.LiteDeploymentManagerProvider import scala.concurrent.duration.FiniteDuration diff --git a/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/EmbeddedProcessStateDefinitionManager.scala b/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/EmbeddedProcessStateDefinitionManager.scala index 76024d1aa90..dd927ae43ab 100644 --- a/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/EmbeddedProcessStateDefinitionManager.scala +++ b/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/EmbeddedProcessStateDefinitionManager.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.embedded +import pl.touk.nussknacker.engine.api.deployment.{OverridingProcessStateDefinitionManager, ScenarioActionName} import pl.touk.nussknacker.engine.api.deployment.ProcessStateDefinitionManager.ScenarioStatusWithScenarioContext import pl.touk.nussknacker.engine.api.deployment.simple.{SimpleProcessStateDefinitionManager, SimpleStateStatus} -import pl.touk.nussknacker.engine.api.deployment.{OverridingProcessStateDefinitionManager, ScenarioActionName} // Here we use default stateDefinitions set from SimpleProcessStateDefinitionManager, // but we want to override the behaviour of default "FAILED" state, without introducing another "failed" state: diff --git a/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/EmbeddedRequestResponseScenarioValidator.scala b/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/EmbeddedRequestResponseScenarioValidator.scala index 1b67a20fb12..69fc9e4831a 100644 --- a/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/EmbeddedRequestResponseScenarioValidator.scala +++ b/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/EmbeddedRequestResponseScenarioValidator.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.engine.embedded -import cats.data.Validated.Valid import cats.data.{NonEmptyList, Validated, ValidatedNel} +import cats.data.Validated.Valid import pl.touk.nussknacker.engine.CustomProcessValidator +import pl.touk.nussknacker.engine.api.{FragmentSpecificData, RequestResponseMetaData} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.SpecificDataValidationError import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.ProcessName -import pl.touk.nussknacker.engine.api.{FragmentSpecificData, RequestResponseMetaData} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.embedded.requestresponse.{RequestResponseDeploymentStrategy, UrlUtils} diff --git a/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/requestresponse/RequestResponseDeploymentStrategy.scala b/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/requestresponse/RequestResponseDeploymentStrategy.scala index 05682c5ac9f..1eb0653cf37 100644 --- a/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/requestresponse/RequestResponseDeploymentStrategy.scala +++ b/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/requestresponse/RequestResponseDeploymentStrategy.scala @@ -5,24 +5,24 @@ import akka.http.scaladsl.Http import akka.http.scaladsl.Http.ServerBinding import akka.http.scaladsl.server.Route import akka.stream.Materializer -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, Validated} +import cats.data.Validated.{Invalid, Valid} import com.typesafe.config.Config import com.typesafe.scalalogging.LazyLogging import pl.touk.nussknacker.engine.ModelData +import pl.touk.nussknacker.engine.api.{JobData, MetaData, RequestResponseMetaData} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.FatalUnknownError import pl.touk.nussknacker.engine.api.deployment.DeploymentStatus import pl.touk.nussknacker.engine.api.process.ProcessName -import pl.touk.nussknacker.engine.api.{JobData, MetaData, RequestResponseMetaData} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess -import pl.touk.nussknacker.engine.embedded.requestresponse.RequestResponseDeploymentStrategy.slugForScenario import pl.touk.nussknacker.engine.embedded.{Deployment, DeploymentStrategy} +import pl.touk.nussknacker.engine.embedded.requestresponse.RequestResponseDeploymentStrategy.slugForScenario import pl.touk.nussknacker.engine.lite.api.runtimecontext.LiteEngineRuntimeContextPreparer import pl.touk.nussknacker.engine.requestresponse.{RequestResponseConfig, RequestResponseRunnableScenarioInterpreter} import scala.collection.concurrent.TrieMap -import scala.concurrent.duration.DurationInt import scala.concurrent.{Await, ExecutionContext} +import scala.concurrent.duration.DurationInt import scala.util.{Failure, Success, Try} object RequestResponseDeploymentStrategy { diff --git a/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/requestresponse/ScenarioDispatcherRoute.scala b/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/requestresponse/ScenarioDispatcherRoute.scala index 47cc945c4c6..e19ba9e04d0 100644 --- a/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/requestresponse/ScenarioDispatcherRoute.scala +++ b/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/requestresponse/ScenarioDispatcherRoute.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.embedded.requestresponse import akka.event.Logging import akka.http.scaladsl.model.{HttpResponse, StatusCodes} -import akka.http.scaladsl.server.directives.DebuggingDirectives import akka.http.scaladsl.server.{Directive0, Directives, Route} +import akka.http.scaladsl.server.directives.DebuggingDirectives import akka.stream.Materializer import com.typesafe.scalalogging.LazyLogging diff --git a/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/streaming/StreamingDeploymentStrategy.scala b/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/streaming/StreamingDeploymentStrategy.scala index ef73f9fde4c..a55fa2038f7 100644 --- a/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/streaming/StreamingDeploymentStrategy.scala +++ b/engine/lite/embeddedDeploymentManager/src/main/scala/pl/touk/nussknacker/engine/embedded/streaming/StreamingDeploymentStrategy.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.embedded.streaming import cats.effect.IO import com.typesafe.scalalogging.LazyLogging -import pl.touk.nussknacker.engine.api.deployment.DeploymentStatus import pl.touk.nussknacker.engine.api.{JobData, LiteStreamMetaData, ProcessVersion} +import pl.touk.nussknacker.engine.api.deployment.DeploymentStatus import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.embedded.{Deployment, DeploymentStrategy} import pl.touk.nussknacker.engine.lite.TaskStatus diff --git a/engine/lite/embeddedDeploymentManager/src/test/scala/pl/touk/nussknacker/streaming/embedded/BaseStreamingEmbeddedDeploymentManagerTest.scala b/engine/lite/embeddedDeploymentManager/src/test/scala/pl/touk/nussknacker/streaming/embedded/BaseStreamingEmbeddedDeploymentManagerTest.scala index 2f0d3bdab8f..7bfe10597e9 100644 --- a/engine/lite/embeddedDeploymentManager/src/test/scala/pl/touk/nussknacker/streaming/embedded/BaseStreamingEmbeddedDeploymentManagerTest.scala +++ b/engine/lite/embeddedDeploymentManager/src/test/scala/pl/touk/nussknacker/streaming/embedded/BaseStreamingEmbeddedDeploymentManagerTest.scala @@ -7,8 +7,8 @@ import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.ModelData import pl.touk.nussknacker.engine.api.ProcessVersion -import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment._ +import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.process.{ProcessObjectDependencies, TopicName} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.deployment.DeploymentData diff --git a/engine/lite/embeddedDeploymentManager/src/test/scala/pl/touk/nussknacker/streaming/embedded/RequestResponseEmbeddedDeploymentManagerTest.scala b/engine/lite/embeddedDeploymentManager/src/test/scala/pl/touk/nussknacker/streaming/embedded/RequestResponseEmbeddedDeploymentManagerTest.scala index a62727d81b7..ae2db5f838d 100644 --- a/engine/lite/embeddedDeploymentManager/src/test/scala/pl/touk/nussknacker/streaming/embedded/RequestResponseEmbeddedDeploymentManagerTest.scala +++ b/engine/lite/embeddedDeploymentManager/src/test/scala/pl/touk/nussknacker/streaming/embedded/RequestResponseEmbeddedDeploymentManagerTest.scala @@ -6,9 +6,10 @@ import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigValueFactory.fromAnyRef import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.{DeploymentManagerDependencies, ModelData} import pl.touk.nussknacker.engine.api.ProcessVersion -import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment._ +import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment.cache.ScenarioStateCachingConfig import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.process.ProcessName @@ -20,10 +21,9 @@ import pl.touk.nussknacker.engine.lite.components.requestresponse.RequestRespons import pl.touk.nussknacker.engine.lite.components.requestresponse.jsonschema.sinks.JsonRequestResponseSink.SinkRawEditorParamName import pl.touk.nussknacker.engine.spel.SpelExtension._ import pl.touk.nussknacker.engine.testing.LocalModelData -import pl.touk.nussknacker.engine.{DeploymentManagerDependencies, ModelData} import pl.touk.nussknacker.test.{AvailablePortFinder, ValidatedValuesDetailedMessage, VeryPatientScalaFutures} +import sttp.client3.{basicRequest, HttpURLConnectionBackend, Identity, SttpBackend, UriContext} import sttp.client3.testing.SttpBackendStub -import sttp.client3.{HttpURLConnectionBackend, Identity, SttpBackend, UriContext, basicRequest} import sttp.model.StatusCode class RequestResponseEmbeddedDeploymentManagerTest diff --git a/engine/lite/embeddedDeploymentManager/src/test/scala/pl/touk/nussknacker/streaming/embedded/StreamingEmbeddedDeploymentManagerTest.scala b/engine/lite/embeddedDeploymentManager/src/test/scala/pl/touk/nussknacker/streaming/embedded/StreamingEmbeddedDeploymentManagerTest.scala index 5def40bad13..e05d1b1beb7 100644 --- a/engine/lite/embeddedDeploymentManager/src/test/scala/pl/touk/nussknacker/streaming/embedded/StreamingEmbeddedDeploymentManagerTest.scala +++ b/engine/lite/embeddedDeploymentManager/src/test/scala/pl/touk/nussknacker/streaming/embedded/StreamingEmbeddedDeploymentManagerTest.scala @@ -15,9 +15,8 @@ import pl.touk.nussknacker.engine.deployment.{DeploymentData, User} import pl.touk.nussknacker.engine.schemedkafka.KafkaUniversalComponentTransformer import pl.touk.nussknacker.engine.spel.SpelExtension._ import pl.touk.nussknacker.engine.testmode.TestProcess.ExpressionInvocationResult -import pl.touk.nussknacker.test.EitherValuesDetailedMessage - import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap +import pl.touk.nussknacker.test.EitherValuesDetailedMessage class StreamingEmbeddedDeploymentManagerTest extends BaseStreamingEmbeddedDeploymentManagerTest @@ -27,6 +26,7 @@ class StreamingEmbeddedDeploymentManagerTest protected implicit val freshnessPolicy: DataFreshnessPolicy = DataFreshnessPolicy.Fresh import pl.touk.nussknacker.engine.kafka.KafkaTestUtils.richConsumer + import KafkaUniversalComponentTransformer._ test("Deploys scenario and cancels") { diff --git a/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/kafka/BaseNuKafkaRuntimeDockerTest.scala b/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/kafka/BaseNuKafkaRuntimeDockerTest.scala index ba665b10223..ed88fdec478 100644 --- a/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/kafka/BaseNuKafkaRuntimeDockerTest.scala +++ b/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/kafka/BaseNuKafkaRuntimeDockerTest.scala @@ -6,9 +6,8 @@ import io.confluent.kafka.schemaregistry.client.CachedSchemaRegistryClient import org.scalatest.{BeforeAndAfterAll, TestSuite, TryValues} import org.testcontainers.containers.{GenericContainer => JavaGenericContainer, Network} import org.testcontainers.utility.DockerImageName - -import pl.touk.nussknacker.engine.kafka.exception.KafkaExceptionInfo import pl.touk.nussknacker.engine.kafka.{KafkaClient, KeyMessage} +import pl.touk.nussknacker.engine.kafka.exception.KafkaExceptionInfo import pl.touk.nussknacker.engine.lite.utils.NuRuntimeDockerTestUtils import pl.touk.nussknacker.engine.lite.utils.NuRuntimeDockerTestUtils._ diff --git a/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/kafka/NuKafkaRuntimeDockerAvroTest.scala b/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/kafka/NuKafkaRuntimeDockerAvroTest.scala index 190e4e35d47..f93daadb4c2 100644 --- a/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/kafka/NuKafkaRuntimeDockerAvroTest.scala +++ b/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/kafka/NuKafkaRuntimeDockerAvroTest.scala @@ -6,9 +6,9 @@ import org.apache.avro.generic.GenericRecord import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.kafka.UnspecializedTopicName.ToUnspecializedTopicName -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.ConfluentUtils import pl.touk.nussknacker.engine.lite.kafka.sample.NuKafkaRuntimeTestSamples import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.SchemaId +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.ConfluentUtils import pl.touk.nussknacker.test.PatientScalaFutures class NuKafkaRuntimeDockerAvroTest diff --git a/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/kafka/NuKafkaRuntimeDockerProbesTest.scala b/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/kafka/NuKafkaRuntimeDockerProbesTest.scala index 809abe77997..aa0f15a460e 100644 --- a/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/kafka/NuKafkaRuntimeDockerProbesTest.scala +++ b/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/kafka/NuKafkaRuntimeDockerProbesTest.scala @@ -2,14 +2,14 @@ package pl.touk.nussknacker.engine.lite.kafka import com.dimafeng.testcontainers._ import com.typesafe.scalalogging.LazyLogging -import pl.touk.nussknacker.engine.lite.kafka.sample.NuKafkaRuntimeTestSamples import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.kafka.UnspecializedTopicName.ToUnspecializedTopicName +import pl.touk.nussknacker.engine.lite.kafka.sample.NuKafkaRuntimeTestSamples import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.ConfluentUtils import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, ExtremelyPatientScalaFutures} +import sttp.client3.{asString, basicRequest, SttpBackend, UriContext} import sttp.client3.asynchttpclient.future.AsyncHttpClientFutureBackend -import sttp.client3.{SttpBackend, UriContext, asString, basicRequest} import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future diff --git a/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/kafka/sample/NuKafkaRuntimeTestSamples.scala b/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/kafka/sample/NuKafkaRuntimeTestSamples.scala index a4047de3ebd..ce50add974c 100644 --- a/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/kafka/sample/NuKafkaRuntimeTestSamples.scala +++ b/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/kafka/sample/NuKafkaRuntimeTestSamples.scala @@ -7,6 +7,7 @@ import pl.touk.nussknacker.engine.api.process.{ProcessName, TopicName} import pl.touk.nussknacker.engine.api.validation.ValidationMode import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess +import pl.touk.nussknacker.engine.schemedkafka.{AvroUtils, LogicalTypesGenericRecordBuilder} import pl.touk.nussknacker.engine.schemedkafka.KafkaUniversalComponentTransformer.{ schemaVersionParamName, sinkKeyParamName, @@ -15,7 +16,6 @@ import pl.touk.nussknacker.engine.schemedkafka.KafkaUniversalComponentTransforme sinkValueParamName, topicParamName } -import pl.touk.nussknacker.engine.schemedkafka.{AvroUtils, LogicalTypesGenericRecordBuilder} object NuKafkaRuntimeTestSamples { diff --git a/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/requestresponse/NuReqRespRuntimeBinTest.scala b/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/requestresponse/NuReqRespRuntimeBinTest.scala index fb08b18321d..1a1ee626931 100644 --- a/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/requestresponse/NuReqRespRuntimeBinTest.scala +++ b/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/requestresponse/NuReqRespRuntimeBinTest.scala @@ -7,10 +7,10 @@ import pl.touk.nussknacker.engine.lite.requestresponse.sample.NuReqRespTestSampl jsonPongMessage, pingPongScenario } -import pl.touk.nussknacker.engine.lite.utils.NuRuntimeTestUtils.{saveScenarioToTmp, testCaseId} import pl.touk.nussknacker.engine.lite.utils.{BaseNuRuntimeBinTestMixin, NuRuntimeTestUtils} +import pl.touk.nussknacker.engine.lite.utils.NuRuntimeTestUtils.{saveScenarioToTmp, testCaseId} import pl.touk.nussknacker.test.AvailablePortFinder -import sttp.client3.{HttpURLConnectionBackend, Identity, SttpBackend, UriContext, basicRequest} +import sttp.client3.{basicRequest, HttpURLConnectionBackend, Identity, SttpBackend, UriContext} import sttp.model.StatusCode // depends on liteEngineRuntimeApp / Universal / stage sbt task diff --git a/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/requestresponse/NuReqRespRuntimeDockerTest.scala b/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/requestresponse/NuReqRespRuntimeDockerTest.scala index 5c628e7e56b..163beefcf1e 100644 --- a/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/requestresponse/NuReqRespRuntimeDockerTest.scala +++ b/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/requestresponse/NuReqRespRuntimeDockerTest.scala @@ -13,7 +13,7 @@ import pl.touk.nussknacker.engine.lite.utils.NuRuntimeDockerTestUtils._ import pl.touk.nussknacker.engine.lite.utils.NuRuntimeTestUtils import pl.touk.nussknacker.engine.lite.utils.NuRuntimeTestUtils.testCaseId import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, VeryPatientScalaFutures} -import sttp.client3.{HttpURLConnectionBackend, Identity, SttpBackend, UriContext, basicRequest} +import sttp.client3.{basicRequest, HttpURLConnectionBackend, Identity, SttpBackend, UriContext} class NuReqRespRuntimeDockerTest extends AnyFunSuite diff --git a/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/utils/NuRuntimeDockerTestUtils.scala b/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/utils/NuRuntimeDockerTestUtils.scala index d1a343f59bb..59e5aa1c1a3 100644 --- a/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/utils/NuRuntimeDockerTestUtils.scala +++ b/engine/lite/integration-test/src/it/scala/pl/touk/nussknacker/engine/lite/utils/NuRuntimeDockerTestUtils.scala @@ -2,9 +2,9 @@ package pl.touk.nussknacker.engine.lite.utils import com.dimafeng.testcontainers.GenericContainer import org.slf4j.Logger +import org.testcontainers.containers.{BindMode, Network} import org.testcontainers.containers.output.{OutputFrame, Slf4jLogConsumer} import org.testcontainers.containers.wait.strategy.{Wait, WaitStrategy, WaitStrategyTarget} -import org.testcontainers.containers.{BindMode, Network} import pl.touk.nussknacker.engine.util.config.ScalaMajorVersionConfig import pl.touk.nussknacker.engine.version.BuildInfo diff --git a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManager.scala b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManager.scala index 3a4a91a8ffc..4a2f8decb13 100644 --- a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManager.scala +++ b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManager.scala @@ -1,31 +1,24 @@ package pl.touk.nussknacker.k8s.manager import akka.http.scaladsl.settings.ConnectionPoolSettings -import com.typesafe.config.ConfigValueFactory.fromAnyRef import com.typesafe.config.{Config, ConfigFactory} +import com.typesafe.config.ConfigValueFactory.fromAnyRef import com.typesafe.scalalogging.LazyLogging import io.circe.syntax._ +import pl.touk.nussknacker.engine.{BaseModelData, DeploymentManagerDependencies} import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.deployment.ExternalDeploymentId import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap -import pl.touk.nussknacker.engine.{BaseModelData, DeploymentManagerDependencies} import pl.touk.nussknacker.k8s.manager.K8sDeploymentManager._ import pl.touk.nussknacker.k8s.manager.K8sUtils.{sanitizeLabel, sanitizeObjectName, shortHash} -import pl.touk.nussknacker.k8s.manager.deployment.K8sScalingConfig.DividingParallelismConfig import pl.touk.nussknacker.k8s.manager.deployment._ +import pl.touk.nussknacker.k8s.manager.deployment.K8sScalingConfig.DividingParallelismConfig import pl.touk.nussknacker.k8s.manager.ingress.IngressPreparer import pl.touk.nussknacker.k8s.manager.service.ServicePreparer import pl.touk.nussknacker.lite.manager.LiteDeploymentManager -import skuber.LabelSelector.Requirement -import skuber.LabelSelector.dsl._ -import skuber.api.Configuration -import skuber.api.client.{KubernetesClient, LoggingConfig} -import skuber.apps.v1.Deployment -import skuber.json.format._ -import skuber.networking.v1.Ingress import skuber.{ ConfigMap, LabelSelector, @@ -37,6 +30,13 @@ import skuber.{ Secret, Service } +import skuber.LabelSelector.Requirement +import skuber.LabelSelector.dsl._ +import skuber.api.Configuration +import skuber.api.client.{KubernetesClient, LoggingConfig} +import skuber.apps.v1.Deployment +import skuber.json.format._ +import skuber.networking.v1.Ingress import scala.concurrent.{ExecutionContext, Future} import scala.io.Source diff --git a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerConfig.scala b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerConfig.scala index f0b69c0e62d..2edd0d6ef9b 100644 --- a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerConfig.scala +++ b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerConfig.scala @@ -1,16 +1,18 @@ package pl.touk.nussknacker.k8s.manager import com.typesafe.config.{Config, ConfigFactory} +import net.ceedubs.ficus.Ficus._ +import net.ceedubs.ficus.readers.ArbitraryTypeReader._ import pl.touk.nussknacker.engine.util.config.ConfigEnrichments.RichConfig +import pl.touk.nussknacker.engine.util.config.ScalaMajorVersionConfig import pl.touk.nussknacker.engine.version.BuildInfo import pl.touk.nussknacker.k8s.manager.deployment.K8sScalingConfig import pl.touk.nussknacker.k8s.manager.ingress.IngressConfig -import K8sScalingConfig.valueReader -import net.ceedubs.ficus.Ficus._ -import net.ceedubs.ficus.readers.ArbitraryTypeReader._ -import pl.touk.nussknacker.engine.util.config.ScalaMajorVersionConfig + import scala.concurrent.duration._ +import K8sScalingConfig.valueReader + object K8sDeploymentManagerConfig { def parse(config: Config): K8sDeploymentManagerConfig = config.rootAs[K8sDeploymentManagerConfig] } diff --git a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerProvider.scala b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerProvider.scala index 8e801b3f0a9..32f0b34a71d 100644 --- a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerProvider.scala +++ b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerProvider.scala @@ -2,11 +2,11 @@ package pl.touk.nussknacker.k8s.manager import cats.data.{Validated, ValidatedNel} import com.typesafe.config.Config +import pl.touk.nussknacker.engine.{BaseModelData, CustomProcessValidator, DeploymentManagerDependencies} import pl.touk.nussknacker.engine.ModelData.BaseModelDataExt import pl.touk.nussknacker.engine.api.deployment.DeploymentManager import pl.touk.nussknacker.engine.api.deployment.cache.CachingProcessStateDeploymentManager import pl.touk.nussknacker.engine.api.process.ProcessName -import pl.touk.nussknacker.engine.{BaseModelData, CustomProcessValidator, DeploymentManagerDependencies} import pl.touk.nussknacker.k8s.manager.RequestResponseSlugUtils.defaultSlug import pl.touk.nussknacker.lite.manager.LiteDeploymentManagerProvider diff --git a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentStatusMapper.scala b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentStatusMapper.scala index c38512a1410..c3b19b59b71 100644 --- a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentStatusMapper.scala +++ b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentStatusMapper.scala @@ -2,12 +2,12 @@ package pl.touk.nussknacker.k8s.manager import cats.data.NonEmptyList import com.typesafe.scalalogging.LazyLogging +import pl.touk.nussknacker.engine.api.deployment.{DeploymentStatusDetails, ScenarioActionName, StateStatus} import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus.ProblemStateStatus -import pl.touk.nussknacker.engine.api.deployment.{DeploymentStatusDetails, ScenarioActionName, StateStatus} import pl.touk.nussknacker.k8s.manager.K8sDeploymentManager.parseVersionAnnotation -import skuber.apps.v1.Deployment import skuber.{Container, Pod} +import skuber.apps.v1.Deployment //Based on https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#deployment-status object K8sDeploymentStatusMapper extends LazyLogging { diff --git a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sPodsResourceQuotaChecker.scala b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sPodsResourceQuotaChecker.scala index 38f22026645..e633273a144 100644 --- a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sPodsResourceQuotaChecker.scala +++ b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sPodsResourceQuotaChecker.scala @@ -3,9 +3,9 @@ package pl.touk.nussknacker.k8s.manager import cats.data.Validated import cats.data.Validated.{invalid, valid} import com.typesafe.scalalogging.LazyLogging +import skuber.{ListResource, Resource, ResourceQuotaList} import skuber.Resource.ResourceList import skuber.apps.v1.Deployment.{RollingUpdate, Strategy} -import skuber.{ListResource, Resource, ResourceQuotaList} import scala.language.reflectiveCalls import scala.util.Try diff --git a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sUtils.scala b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sUtils.scala index 4ae70dea8c8..d86be80ec4d 100644 --- a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sUtils.scala +++ b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/K8sUtils.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.k8s.manager import org.apache.commons.codec.digest.DigestUtils import play.api.libs.json.Format -import skuber.api.client.{KubernetesClient, LoggingContext} import skuber.{ObjectResource, ResourceDefinition} +import skuber.api.client.{KubernetesClient, LoggingContext} import scala.concurrent.{ExecutionContext, Future} diff --git a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/RequestResponseScenarioValidator.scala b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/RequestResponseScenarioValidator.scala index 2af97377dd9..c0b7a07782d 100644 --- a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/RequestResponseScenarioValidator.scala +++ b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/RequestResponseScenarioValidator.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.k8s.manager -import cats.data.Validated.Valid import cats.data.{NonEmptyList, Validated, ValidatedNel} +import cats.data.Validated.Valid import pl.touk.nussknacker.engine.CustomProcessValidator import pl.touk.nussknacker.engine.api.{FragmentSpecificData, RequestResponseMetaData} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError diff --git a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/deployment/DeploymentPreparer.scala b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/deployment/DeploymentPreparer.scala index ee772594b92..2330ab60b7b 100644 --- a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/deployment/DeploymentPreparer.scala +++ b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/deployment/DeploymentPreparer.scala @@ -14,11 +14,11 @@ import pl.touk.nussknacker.k8s.manager.K8sDeploymentManager.{ versionAnnotationForScenario } import pl.touk.nussknacker.k8s.manager.K8sDeploymentManagerConfig +import skuber.{Container, EnvVar, HTTPGetAction, LabelSelector, Pod, Probe, Volume} import skuber.EnvVar.FieldRef import skuber.LabelSelector.IsEqualRequirement import skuber.apps.v1.Deployment import skuber.apps.v1.Deployment.Strategy -import skuber.{Container, EnvVar, HTTPGetAction, LabelSelector, Pod, Probe, Volume} case class MountableResources( commonConfigConfigMap: String, diff --git a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/ingress/IngressPreparer.scala b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/ingress/IngressPreparer.scala index 4bee0cc6858..bfe9617b3bb 100644 --- a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/ingress/IngressPreparer.scala +++ b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/ingress/IngressPreparer.scala @@ -4,9 +4,9 @@ import com.typesafe.config.{Config, ConfigFactory, ConfigRenderOptions} import monocle.macros.GenLens import monocle.std.option.some import pl.touk.nussknacker.engine.api.{LiteStreamMetaData, ProcessVersion, RequestResponseMetaData, TypeSpecificData} +import pl.touk.nussknacker.k8s.manager.{K8sDeploymentManager, RequestResponseSlugUtils} import pl.touk.nussknacker.k8s.manager.K8sDeploymentManager.labelsForScenario import pl.touk.nussknacker.k8s.manager.ingress.IngressPreparer.rewriteAnnotation -import pl.touk.nussknacker.k8s.manager.{K8sDeploymentManager, RequestResponseSlugUtils} import play.api.libs.json.Json import skuber.networking.v1.Ingress diff --git a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/service/ServicePreparer.scala b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/service/ServicePreparer.scala index 0ecaca7da69..e8b79654681 100644 --- a/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/service/ServicePreparer.scala +++ b/engine/lite/k8sDeploymentManager/src/main/scala/pl/touk/nussknacker/k8s/manager/service/ServicePreparer.scala @@ -6,8 +6,8 @@ import pl.touk.nussknacker.k8s.manager.K8sDeploymentManagerConfig import pl.touk.nussknacker.k8s.manager.K8sUtils.sanitizeObjectName import pl.touk.nussknacker.k8s.manager.RequestResponseSlugUtils.determineSlug import pl.touk.nussknacker.k8s.manager.service.ServicePreparer.{runtimePodTargetPort, serviceName} -import skuber.Service.Port import skuber.{ObjectMeta, Service} +import skuber.Service.Port class ServicePreparer(config: K8sDeploymentManagerConfig) { diff --git a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/BaseK8sDeploymentManagerTest.scala b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/BaseK8sDeploymentManagerTest.scala index 0805f0a9469..0e0f715fdeb 100644 --- a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/BaseK8sDeploymentManagerTest.scala +++ b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/BaseK8sDeploymentManagerTest.scala @@ -2,27 +2,27 @@ package pl.touk.nussknacker.k8s.manager import akka.actor.ActorSystem import cats.effect.unsafe.IORuntime -import com.typesafe.config.ConfigValueFactory.{fromAnyRef, fromIterable} import com.typesafe.config.{Config, ConfigFactory} +import com.typesafe.config.ConfigValueFactory.{fromAnyRef, fromIterable} import com.typesafe.scalalogging.LazyLogging import org.scalatest._ import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.{DeploymentManagerDependencies, ModelData} import pl.touk.nussknacker.engine.api.ProcessVersion -import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment._ +import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.deployment.DeploymentData -import pl.touk.nussknacker.engine.{DeploymentManagerDependencies, ModelData} import pl.touk.nussknacker.test.{ExtremelyPatientScalaFutures, VeryPatientScalaFutures} +import skuber.{k8sInit, ConfigMap, Event, LabelSelector, ListResource, Pod, Resource, Secret, Service} import skuber.LabelSelector.dsl._ import skuber.Pod.LogQueryParams import skuber.api.client.KubernetesClient import skuber.apps.v1.Deployment import skuber.json.format._ import skuber.networking.v1.Ingress -import skuber.{ConfigMap, Event, LabelSelector, ListResource, Pod, Resource, Secret, Service, k8sInit} import sttp.client3.SttpBackend import sttp.client3.asynchttpclient.future.AsyncHttpClientFutureBackend diff --git a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerKafkaTest.scala b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerKafkaTest.scala index d9def927f36..d61cbf139d4 100644 --- a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerKafkaTest.scala +++ b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerKafkaTest.scala @@ -1,20 +1,20 @@ package pl.touk.nussknacker.k8s.manager -import com.typesafe.config.ConfigValueFactory.{fromAnyRef, fromIterable, fromMap} import com.typesafe.config.{Config, ConfigFactory} +import com.typesafe.config.ConfigValueFactory.{fromAnyRef, fromIterable, fromMap} import com.typesafe.scalalogging.LazyLogging import org.scalatest.Inspectors.forAll import org.scalatest.OptionValues import org.scalatest.tags.Network import pl.touk.nussknacker.engine.api.ProcessVersion -import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment.{ + DataFreshnessPolicy, + DeploymentUpdateStrategy, DMCancelScenarioCommand, DMRunDeploymentCommand, - DMValidateScenarioCommand, - DataFreshnessPolicy, - DeploymentUpdateStrategy + DMValidateScenarioCommand } +import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.process.{ProcessId, VersionId} import pl.touk.nussknacker.engine.build.ScenarioBuilder @@ -25,11 +25,11 @@ import pl.touk.nussknacker.engine.testing.LocalModelData import pl.touk.nussknacker.k8s.manager.K8sDeploymentManager.requirementForName import pl.touk.nussknacker.k8s.manager.K8sPodsResourceQuotaChecker.ResourceQuotaExceededException import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, KafkaConfigProperties} +import skuber.{ConfigMap, EnvVar, ListResource, ObjectMeta, Pod, Resource, Volume} import skuber.Container.Port import skuber.LabelSelector.dsl._ import skuber.Resource.{Quantity, Quota} import skuber.json.format._ -import skuber.{ConfigMap, EnvVar, ListResource, ObjectMeta, Pod, Resource, Volume} import sttp.client3._ import java.nio.file.Files diff --git a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerOnMocksTest.scala b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerOnMocksTest.scala index 60ff1d54d89..69a1160cbe8 100644 --- a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerOnMocksTest.scala +++ b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerOnMocksTest.scala @@ -6,9 +6,9 @@ import cats.effect.unsafe.IORuntime import com.github.tomakehurst.wiremock.WireMockServer import com.github.tomakehurst.wiremock.client.WireMock._ import com.typesafe.config.ConfigFactory +import org.scalatest.{BeforeAndAfterAll, Inside, OptionValues} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{BeforeAndAfterAll, Inside, OptionValues} import pl.touk.nussknacker.engine.DeploymentManagerDependencies import pl.touk.nussknacker.engine.api.deployment.{ DataFreshnessPolicy, diff --git a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerReqRespTest.scala b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerReqRespTest.scala index aff3839938c..1ba635f44c7 100644 --- a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerReqRespTest.scala +++ b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerReqRespTest.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.k8s.manager -import com.typesafe.config.ConfigValueFactory.{fromAnyRef, fromIterable, fromMap} import com.typesafe.config.{Config, ConfigFactory} +import com.typesafe.config.ConfigValueFactory.{fromAnyRef, fromIterable, fromMap} import com.typesafe.scalalogging.LazyLogging import io.circe.parser import org.scalatest.OptionValues @@ -11,13 +11,13 @@ import org.scalatest.time.{Seconds, Span} import pl.touk.nussknacker.engine.ModelData import pl.touk.nussknacker.engine.api.ProcessVersion import pl.touk.nussknacker.engine.api.component.ComponentProvider -import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment.{ - DMRunDeploymentCommand, - DMValidateScenarioCommand, DataFreshnessPolicy, - DeploymentUpdateStrategy + DeploymentUpdateStrategy, + DMRunDeploymentCommand, + DMValidateScenarioCommand } +import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, VersionId} import pl.touk.nussknacker.engine.build.ScenarioBuilder @@ -27,10 +27,10 @@ import pl.touk.nussknacker.engine.spel.SpelExtension._ import pl.touk.nussknacker.engine.testing.LocalModelData import pl.touk.nussknacker.k8s.manager.K8sDeploymentManager.requirementForName import pl.touk.nussknacker.test.EitherValuesDetailedMessage +import skuber.{LabelSelector, ListResource, Service} import skuber.LabelSelector.dsl._ import skuber.json.format._ import skuber.networking.v1.Ingress -import skuber.{LabelSelector, ListResource, Service} import sttp.client3._ import scala.concurrent.ExecutionContext.Implicits._ diff --git a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerUnitTest.scala b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerUnitTest.scala index c8076134865..b671fcad5eb 100644 --- a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerUnitTest.scala +++ b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentManagerUnitTest.scala @@ -2,6 +2,7 @@ package pl.touk.nussknacker.k8s.manager import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import org.scalatest.prop.TableDrivenPropertyChecks._ import pl.touk.nussknacker.engine.api.ProcessVersion import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, VersionId} import pl.touk.nussknacker.k8s.manager.K8sDeploymentManager.{ @@ -12,7 +13,6 @@ import pl.touk.nussknacker.k8s.manager.K8sDeploymentManager.{ scenarioNameLabel, scenarioVersionLabel } -import org.scalatest.prop.TableDrivenPropertyChecks._ import scala.collection.compat.immutable.LazyList.continually diff --git a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentStatusMapperSpec.scala b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentStatusMapperSpec.scala index 1d4baef9b60..e0fc019fef4 100644 --- a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentStatusMapperSpec.scala +++ b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sDeploymentStatusMapperSpec.scala @@ -2,15 +2,15 @@ package pl.touk.nussknacker.k8s.manager import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.deployment.{DeploymentStatusDetails, ScenarioActionName} import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus.ProblemStateStatus -import pl.touk.nussknacker.engine.api.deployment.{DeploymentStatusDetails, ScenarioActionName} import pl.touk.nussknacker.engine.api.process.VersionId import pl.touk.nussknacker.engine.util.ResourceLoader import play.api.libs.json.{Format, Json} +import skuber.{ListResource, Pod} import skuber.apps.v1.Deployment import skuber.json.format._ -import skuber.{ListResource, Pod} //It's no so easy to move deployment in unstable state reliably, so //for now we have unit tests based on real responses - generated manually, using kubectl -v=9 describe deployment [...] diff --git a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sExtraClasses.scala b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sExtraClasses.scala index 44bcaae08d5..816baee7063 100644 --- a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sExtraClasses.scala +++ b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sExtraClasses.scala @@ -5,13 +5,13 @@ import org.apache.commons.io.IOUtils import pl.touk.nussknacker.k8s.manager.K8sExtraClasses.{extraClassesSecretName, serviceLoaderConfigItemName} import pl.touk.nussknacker.test.VeryPatientScalaFutures import play.api.libs.json.Format +import skuber.{ObjectMeta, ResourceDefinition, Secret} import skuber.api.client.{KubernetesClient, LoggingContext} import skuber.json.format._ -import skuber.{ObjectMeta, ResourceDefinition, Secret} import java.net.URL -import scala.jdk.CollectionConverters._ import scala.concurrent.ExecutionContext +import scala.jdk.CollectionConverters._ class K8sExtraClasses(k8s: KubernetesClient, classes: List[Class[_]], serviceLoaderConfigURL: URL) extends VeryPatientScalaFutures { diff --git a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sPodsResourceQuotaCheckerTest.scala b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sPodsResourceQuotaCheckerTest.scala index 543af7b6d9e..f7c277eb5a6 100644 --- a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sPodsResourceQuotaCheckerTest.scala +++ b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sPodsResourceQuotaCheckerTest.scala @@ -3,10 +3,10 @@ package pl.touk.nussknacker.k8s.manager import cats.data.Validated.{Invalid, Valid} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers.convertToAnyShouldWrapper -import pl.touk.nussknacker.k8s.manager.K8sPodsResourceQuotaChecker.{ResourceQuotaExceededException, podsResourceQuota} +import pl.touk.nussknacker.k8s.manager.K8sPodsResourceQuotaChecker.{podsResourceQuota, ResourceQuotaExceededException} +import skuber.{ListResource, Resource} import skuber.Resource.Quota import skuber.apps.v1.Deployment.{RollingUpdate, Strategy} -import skuber.{ListResource, Resource} class K8sPodsResourceQuotaCheckerTest extends AnyFunSuite { diff --git a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sTestUtils.scala b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sTestUtils.scala index 44729fb64db..bd8f360eea0 100644 --- a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sTestUtils.scala +++ b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/K8sTestUtils.scala @@ -6,16 +6,16 @@ import com.typesafe.scalalogging.LazyLogging import org.scalatest.OptionValues import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.test.{AvailablePortFinder, ExtremelyPatientScalaFutures, ProcessUtils} +import skuber.{ConfigMap, Container, ObjectMeta, ObjectResource, Pod, Service, Volume} import skuber.Pod.Phase import skuber.api.client.KubernetesClient import skuber.json.format._ -import skuber.{ConfigMap, Container, ObjectMeta, ObjectResource, Pod, Service, Volume} import java.io.File import java.net.Socket import scala.collection.mutable -import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.{Future, Promise} +import scala.concurrent.ExecutionContext.Implicits.global class K8sTestUtils(k8s: KubernetesClient) extends K8sUtils(k8s) diff --git a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/KafkaK8sSupport.scala b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/KafkaK8sSupport.scala index 5c5c74d9cb3..4f7c18adf08 100644 --- a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/KafkaK8sSupport.scala +++ b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/KafkaK8sSupport.scala @@ -6,9 +6,9 @@ import com.typesafe.scalalogging.LazyLogging import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.k8s.manager.KafkaK8sSupport.{kafkaServiceName, srServiceName} import pl.touk.nussknacker.test.ExtremelyPatientScalaFutures +import skuber.{Container, EnvVar, HTTPGetAction, ObjectMeta, Pod, Probe, Service} import skuber.api.client.KubernetesClient import skuber.json.format._ -import skuber.{Container, EnvVar, HTTPGetAction, ObjectMeta, Pod, Probe, Service} import scala.concurrent.{ExecutionContext, Future, Promise} diff --git a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/TestComponentProvider.scala b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/TestComponentProvider.scala index 05df88c25e9..d499ce74f92 100644 --- a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/TestComponentProvider.scala +++ b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/TestComponentProvider.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.k8s.manager import com.typesafe.config.Config +import pl.touk.nussknacker.engine.api.{MethodToInvoke, NodeId, ParamName, Service} import pl.touk.nussknacker.engine.api.component.{ComponentDefinition, ComponentProvider, NussknackerVersion} import pl.touk.nussknacker.engine.api.process.ProcessObjectDependencies -import pl.touk.nussknacker.engine.api.{MethodToInvoke, NodeId, ParamName, Service} import scala.concurrent.Future diff --git a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/deployment/DeploymentPreparerTest.scala b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/deployment/DeploymentPreparerTest.scala index 847582466e0..1ad5e154dd3 100644 --- a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/deployment/DeploymentPreparerTest.scala +++ b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/deployment/DeploymentPreparerTest.scala @@ -15,12 +15,11 @@ import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.util.config.ScalaMajorVersionConfig import pl.touk.nussknacker.engine.version.BuildInfo import pl.touk.nussknacker.k8s.manager.{K8sDeploymentManager, K8sDeploymentManagerConfig} +import skuber.{Container, EnvVar, HTTPGetAction, LabelSelector, ObjectMeta, Pod, Probe, Volume} import skuber.EnvVar.{FieldRef, SecretKeyRef} import skuber.Resource.Quantity import skuber.apps.v1.Deployment -import skuber.{Container, EnvVar, HTTPGetAction, LabelSelector, ObjectMeta, Pod, Probe, Volume} -import scala.jdk.CollectionConverters._ import scala.jdk.CollectionConverters._ class DeploymentPreparerTest extends AnyFunSuite { diff --git a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/ingress/IngressPreparerTest.scala b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/ingress/IngressPreparerTest.scala index cd12b52068e..cc57f8609e9 100644 --- a/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/ingress/IngressPreparerTest.scala +++ b/engine/lite/k8sDeploymentManager/src/test/scala/pl/touk/nussknacker/k8s/manager/ingress/IngressPreparerTest.scala @@ -4,8 +4,8 @@ import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigValueFactory.{fromIterable, fromMap} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers.convertToAnyShouldWrapper -import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, VersionId} import pl.touk.nussknacker.engine.api.{LiteStreamMetaData, ProcessVersion, RequestResponseMetaData, TypeSpecificData} +import pl.touk.nussknacker.engine.api.process.{ProcessId, ProcessName, VersionId} import skuber.ObjectMeta import skuber.networking.v1.Ingress diff --git a/engine/lite/kafka/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/kafka/KafkaSingleScenarioTaskRun.scala b/engine/lite/kafka/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/kafka/KafkaSingleScenarioTaskRun.scala index f2a15d4860f..91908e2174a 100644 --- a/engine/lite/kafka/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/kafka/KafkaSingleScenarioTaskRun.scala +++ b/engine/lite/kafka/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/kafka/KafkaSingleScenarioTaskRun.scala @@ -11,11 +11,11 @@ import org.apache.kafka.common.errors.{ OutOfOrderSequenceException, ProducerFencedException } +import pl.touk.nussknacker.engine.api.{MetaData, VariableConstants} import pl.touk.nussknacker.engine.api.exception.WithExceptionExtractor import pl.touk.nussknacker.engine.api.namespaces.NamingStrategy import pl.touk.nussknacker.engine.api.process.TopicName import pl.touk.nussknacker.engine.api.runtimecontext.EngineRuntimeContext -import pl.touk.nussknacker.engine.api.{MetaData, VariableConstants} import pl.touk.nussknacker.engine.kafka.KafkaUtils import pl.touk.nussknacker.engine.kafka.exception.{ DefaultKafkaErrorTopicInitializer, diff --git a/engine/lite/kafka/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/kafka/KafkaTransactionalScenarioInterpreter.scala b/engine/lite/kafka/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/kafka/KafkaTransactionalScenarioInterpreter.scala index 2aa782eabf5..bc3c2ad83d3 100644 --- a/engine/lite/kafka/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/kafka/KafkaTransactionalScenarioInterpreter.scala +++ b/engine/lite/kafka/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/kafka/KafkaTransactionalScenarioInterpreter.scala @@ -11,6 +11,12 @@ import pl.touk.nussknacker.engine.api.JobData import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.kafka.KafkaConfig import pl.touk.nussknacker.engine.kafka.exception.KafkaExceptionConsumerConfig +import pl.touk.nussknacker.engine.lite.{ + InterpreterTestRunner, + RunnableScenarioInterpreter, + ScenarioInterpreterFactory, + TestRunner +} import pl.touk.nussknacker.engine.lite.ScenarioInterpreterFactory.ScenarioInterpreterWithLifecycle import pl.touk.nussknacker.engine.lite.TaskStatus.TaskStatus import pl.touk.nussknacker.engine.lite.TestRunner._ @@ -18,16 +24,10 @@ import pl.touk.nussknacker.engine.lite.api.runtimecontext.{LiteEngineRuntimeCont import pl.touk.nussknacker.engine.lite.capabilities.FixedCapabilityTransformer import pl.touk.nussknacker.engine.lite.kafka.KafkaTransactionalScenarioInterpreter.{Input, Output} import pl.touk.nussknacker.engine.lite.metrics.SourceMetrics -import pl.touk.nussknacker.engine.lite.{ - InterpreterTestRunner, - RunnableScenarioInterpreter, - ScenarioInterpreterFactory, - TestRunner -} import pl.touk.nussknacker.engine.util.ExecutionContextWithIORuntimeAdapter -import scala.concurrent.duration._ import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.duration._ import scala.util.Using /* @@ -105,11 +105,12 @@ class KafkaTransactionalScenarioInterpreter private[kafka] ( override def status(): TaskStatus = taskRunner.status() - import KafkaTransactionalScenarioInterpreter._ import net.ceedubs.ficus.Ficus._ import net.ceedubs.ficus.readers.ArbitraryTypeReader._ import net.ceedubs.ficus.readers.EnumerationReader._ + import KafkaTransactionalScenarioInterpreter._ + private val context: LiteEngineRuntimeContext = engineRuntimeContextPreparer.prepare(jobData) private val sourceMetrics = new SourceMetrics(interpreter.sources.keys) diff --git a/engine/lite/kafka/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/kafka/LoopUntilClosed.scala b/engine/lite/kafka/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/kafka/LoopUntilClosed.scala index 65302fd1c30..3432644a26e 100644 --- a/engine/lite/kafka/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/kafka/LoopUntilClosed.scala +++ b/engine/lite/kafka/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/kafka/LoopUntilClosed.scala @@ -9,12 +9,12 @@ import pl.touk.nussknacker.engine.lite.TaskStatus import pl.touk.nussknacker.engine.lite.TaskStatus.{DuringDeploy, Restarting, Running, TaskStatus} import pl.touk.nussknacker.engine.util.metrics.{Gauge, MetricIdentifier, MetricsProviderForScenario} -import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.{Executors, TimeUnit} -import scala.concurrent.duration.{Duration, FiniteDuration} +import java.util.concurrent.atomic.AtomicBoolean import scala.concurrent.{ExecutionContext, Future} -import scala.util.control.NonFatal +import scala.concurrent.duration.{Duration, FiniteDuration} import scala.util.{Failure, Success, Try} +import scala.util.control.NonFatal //Runs task in loop, in several parallel copies restarting on errors //TODO: probably there is some util for that? :) diff --git a/engine/lite/kafka/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/kafka/KafkaErrorTopicInitializerTest.scala b/engine/lite/kafka/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/kafka/KafkaErrorTopicInitializerTest.scala index f613d63e014..3835880fcd7 100644 --- a/engine/lite/kafka/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/kafka/KafkaErrorTopicInitializerTest.scala +++ b/engine/lite/kafka/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/kafka/KafkaErrorTopicInitializerTest.scala @@ -4,8 +4,8 @@ import com.typesafe.config.ConfigValueFactory.fromAnyRef import net.ceedubs.ficus.Ficus._ import net.ceedubs.ficus.readers.ArbitraryTypeReader._ import net.ceedubs.ficus.readers.EnumerationReader._ -import org.scalatest.matchers.should.Matchers import org.scalatest.funsuite.AnyFunSuite +import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.kafka.KafkaSpec import pl.touk.nussknacker.engine.kafka.exception.{DefaultKafkaErrorTopicInitializer, KafkaErrorTopicInitializer} import pl.touk.nussknacker.engine.lite.kafka.KafkaTransactionalScenarioInterpreter._ diff --git a/engine/lite/kafka/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/kafka/KafkaTransactionalScenarioInterpreterTest.scala b/engine/lite/kafka/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/kafka/KafkaTransactionalScenarioInterpreterTest.scala index 5e74151dfc9..ebad29bc047 100644 --- a/engine/lite/kafka/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/kafka/KafkaTransactionalScenarioInterpreterTest.scala +++ b/engine/lite/kafka/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/kafka/KafkaTransactionalScenarioInterpreterTest.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.engine.lite.kafka import cats.effect.unsafe.IORuntime -import com.typesafe.config.ConfigValueFactory.fromAnyRef import com.typesafe.config.{Config, ConfigFactory} +import com.typesafe.config.ConfigValueFactory.fromAnyRef import com.typesafe.scalalogging.LazyLogging import io.dropwizard.metrics5._ +import org.scalatest.{Assertion, OptionValues, Outcome} import org.scalatest.funsuite.FixtureAnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{Assertion, OptionValues, Outcome} import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess @@ -41,9 +41,10 @@ class KafkaTransactionalScenarioInterpreterTest with PatientScalaFutures with OptionValues { - import KafkaTransactionalScenarioInterpreter._ import pl.touk.nussknacker.engine.kafka.KafkaTestUtils.richConsumer + import KafkaTransactionalScenarioInterpreter._ + private val metricRegistry = new MetricRegistry private val preparer = new LiteEngineRuntimeContextPreparer(new DropwizardMetricsProviderFactory(metricRegistry)) diff --git a/engine/lite/request-response/components-api/src/main/scala/pl/touk/nussknacker/engine/requestresponse/api/RequestResponseSourceFactory.scala b/engine/lite/request-response/components-api/src/main/scala/pl/touk/nussknacker/engine/requestresponse/api/RequestResponseSourceFactory.scala index 0325c27d0fd..ebdfed1a7f1 100644 --- a/engine/lite/request-response/components-api/src/main/scala/pl/touk/nussknacker/engine/requestresponse/api/RequestResponseSourceFactory.scala +++ b/engine/lite/request-response/components-api/src/main/scala/pl/touk/nussknacker/engine/requestresponse/api/RequestResponseSourceFactory.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.requestresponse.api +import pl.touk.nussknacker.engine.api.{Context, VariableConstants} import pl.touk.nussknacker.engine.api.component.RequestResponseComponent import pl.touk.nussknacker.engine.api.process.{BasicContextInitializingFunction, SourceFactory} -import pl.touk.nussknacker.engine.api.{Context, VariableConstants} import pl.touk.nussknacker.engine.lite.api.utils.sources.BaseLiteSource import pl.touk.nussknacker.engine.requestresponse.api.openapi.OpenApiSourceDefinition diff --git a/engine/lite/request-response/components-utils/src/main/scala/pl/touk/nussknacker/engine/requestresponse/utils/JsonRequestResponseSourceFactory.scala b/engine/lite/request-response/components-utils/src/main/scala/pl/touk/nussknacker/engine/requestresponse/utils/JsonRequestResponseSourceFactory.scala index 1ca58ae3113..49d02414fdf 100644 --- a/engine/lite/request-response/components-utils/src/main/scala/pl/touk/nussknacker/engine/requestresponse/utils/JsonRequestResponseSourceFactory.scala +++ b/engine/lite/request-response/components-utils/src/main/scala/pl/touk/nussknacker/engine/requestresponse/utils/JsonRequestResponseSourceFactory.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.engine.requestresponse.utils import io.circe.Decoder +import pl.touk.nussknacker.engine.api.{CirceUtil, MethodToInvoke, NodeId, VariableConstants} import pl.touk.nussknacker.engine.api.context.ContextTransformation import pl.touk.nussknacker.engine.api.definition.WithExplicitTypesToExtract import pl.touk.nussknacker.engine.api.process.SourceTestSupport import pl.touk.nussknacker.engine.api.test.{TestRecord, TestRecordParser} import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{CirceUtil, MethodToInvoke, NodeId, VariableConstants} import pl.touk.nussknacker.engine.requestresponse.api.{RequestResponsePostSource, RequestResponseSourceFactory} import scala.reflect.ClassTag diff --git a/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/RequestResponseHttpHandler.scala b/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/RequestResponseHttpHandler.scala index f6b1de8bb01..7ffa11d2a73 100644 --- a/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/RequestResponseHttpHandler.scala +++ b/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/RequestResponseHttpHandler.scala @@ -10,11 +10,11 @@ import pl.touk.nussknacker.engine.api.component.NodeComponentInfo import pl.touk.nussknacker.engine.api.exception.NuExceptionInfo import pl.touk.nussknacker.engine.lite.api.commonTypes.ErrorType import pl.touk.nussknacker.engine.requestresponse.api.{RequestResponseGetSource, RequestResponsePostSource} +import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap import scala.jdk.CollectionConverters._ import scala.language.higherKinds import scala.util.Try -import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap //this class handles parsing, displaying and invoking interpreter. This is the only place we interact with model, hence //only here we care about context classloaders diff --git a/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/RequestResponseInterpreter.scala b/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/RequestResponseInterpreter.scala index 466e08242da..1a6df7b5014 100644 --- a/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/RequestResponseInterpreter.scala +++ b/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/RequestResponseInterpreter.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.requestresponse import cats.Monad -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, Validated, ValidatedNel, WriterT} +import cats.data.Validated.{Invalid, Valid} import cats.implicits.toFunctorOps import io.circe.Json import io.circe.syntax._ @@ -13,13 +13,13 @@ import pl.touk.nussknacker.engine.api.context.ProcessCompilationError import pl.touk.nussknacker.engine.api.process.{ComponentUseCase, ProcessName} import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess +import pl.touk.nussknacker.engine.lite.{InterpreterTestRunner, ScenarioInterpreterFactory, TestRunner} import pl.touk.nussknacker.engine.lite.ScenarioInterpreterFactory.ScenarioInterpreterWithLifecycle import pl.touk.nussknacker.engine.lite.TestRunner.EffectUnwrapper import pl.touk.nussknacker.engine.lite.api.commonTypes.ErrorType import pl.touk.nussknacker.engine.lite.api.customComponentTypes.CapabilityTransformer import pl.touk.nussknacker.engine.lite.api.interpreterTypes.{EndResult, ScenarioInputBatch} import pl.touk.nussknacker.engine.lite.api.runtimecontext.{LiteEngineRuntimeContext, LiteEngineRuntimeContextPreparer} -import pl.touk.nussknacker.engine.lite.{InterpreterTestRunner, ScenarioInterpreterFactory, TestRunner} import pl.touk.nussknacker.engine.requestresponse.api.RequestResponseSource import pl.touk.nussknacker.engine.requestresponse.api.openapi.RequestResponseOpenApiSettings.OutputSchemaProperty import pl.touk.nussknacker.engine.requestresponse.metrics.InvocationMetrics diff --git a/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/RequestResponseRunnableScenarioInterpreter.scala b/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/RequestResponseRunnableScenarioInterpreter.scala index cb24d62035b..28eefc2d8c2 100644 --- a/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/RequestResponseRunnableScenarioInterpreter.scala +++ b/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/RequestResponseRunnableScenarioInterpreter.scala @@ -7,9 +7,9 @@ import pl.touk.nussknacker.engine.ModelData import pl.touk.nussknacker.engine.api.JobData import pl.touk.nussknacker.engine.api.process.ComponentUseCase import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess +import pl.touk.nussknacker.engine.lite.{RunnableScenarioInterpreter, TaskStatus} import pl.touk.nussknacker.engine.lite.TaskStatus.TaskStatus import pl.touk.nussknacker.engine.lite.api.runtimecontext.LiteEngineRuntimeContextPreparer -import pl.touk.nussknacker.engine.lite.{RunnableScenarioInterpreter, TaskStatus} import pl.touk.nussknacker.engine.requestresponse.RequestResponseInterpreter.RequestResponseScenarioInterpreter import pl.touk.nussknacker.engine.resultcollector.ProductionServiceInvocationCollector diff --git a/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/ScenarioRoute.scala b/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/ScenarioRoute.scala index 9d19cf23743..1efeab45fde 100644 --- a/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/ScenarioRoute.scala +++ b/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/ScenarioRoute.scala @@ -1,15 +1,15 @@ package pl.touk.nussknacker.engine.requestresponse import akka.event.Logging -import akka.http.scaladsl.model.MediaTypes.`application/json` import akka.http.scaladsl.model.{HttpEntity, HttpResponse, ResponseEntity, StatusCodes} +import akka.http.scaladsl.model.MediaTypes.`application/json` +import akka.http.scaladsl.server.{Directive0, Directives, Route} import akka.http.scaladsl.server.directives.{ AuthenticationDirective, Credentials, DebuggingDirectives, SecurityDirectives } -import akka.http.scaladsl.server.{Directive0, Directives, Route} import cats.data.NonEmptyList import com.typesafe.scalalogging.LazyLogging import io.circe.Encoder diff --git a/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/metrics/InvocationMetrics.scala b/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/metrics/InvocationMetrics.scala index eb9e10479ee..5b01cde4fce 100644 --- a/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/metrics/InvocationMetrics.scala +++ b/engine/lite/request-response/runtime/src/main/scala/pl/touk/nussknacker/engine/requestresponse/metrics/InvocationMetrics.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.requestresponse.metrics import cats.Monad -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, ValidatedNel} +import cats.data.Validated.{Invalid, Valid} import pl.touk.nussknacker.engine.api.runtimecontext.EngineRuntimeContext import pl.touk.nussknacker.engine.lite.api.commonTypes.ErrorType import pl.touk.nussknacker.engine.util.metrics.MetricIdentifier diff --git a/engine/lite/request-response/runtime/src/test/scala/pl/touk/nussknacker/engine/requestresponse/RequestResponseInterpreterSpec.scala b/engine/lite/request-response/runtime/src/test/scala/pl/touk/nussknacker/engine/requestresponse/RequestResponseInterpreterSpec.scala index 758b6c0ef7e..64b3d1f3dea 100644 --- a/engine/lite/request-response/runtime/src/test/scala/pl/touk/nussknacker/engine/requestresponse/RequestResponseInterpreterSpec.scala +++ b/engine/lite/request-response/runtime/src/test/scala/pl/touk/nussknacker/engine/requestresponse/RequestResponseInterpreterSpec.scala @@ -1,17 +1,17 @@ package pl.touk.nussknacker.engine.requestresponse -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, ValidatedNel} +import cats.data.Validated.{Invalid, Valid} import com.typesafe.config.ConfigFactory import io.dropwizard.metrics5.MetricRegistry import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.{Context, NodeId, ProcessVersion} import pl.touk.nussknacker.engine.api.component.{ComponentType, NodeComponentInfo} import pl.touk.nussknacker.engine.api.exception.NuExceptionInfo import pl.touk.nussknacker.engine.api.process.ComponentUseCase import pl.touk.nussknacker.engine.api.runtimecontext.IncContextIdGenerator import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{Context, NodeId, ProcessVersion} import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.lite.api.commonTypes.ErrorType diff --git a/engine/lite/request-response/runtime/src/test/scala/pl/touk/nussknacker/engine/requestresponse/ScenarioRouteSpec.scala b/engine/lite/request-response/runtime/src/test/scala/pl/touk/nussknacker/engine/requestresponse/ScenarioRouteSpec.scala index 0d96b5edf86..ff145703fb0 100644 --- a/engine/lite/request-response/runtime/src/test/scala/pl/touk/nussknacker/engine/requestresponse/ScenarioRouteSpec.scala +++ b/engine/lite/request-response/runtime/src/test/scala/pl/touk/nussknacker/engine/requestresponse/ScenarioRouteSpec.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.requestresponse -import akka.http.scaladsl.model.headers.{BasicHttpCredentials, HttpChallenge} import akka.http.scaladsl.model.{ContentTypes, HttpEntity, StatusCodes} +import akka.http.scaladsl.model.headers.{BasicHttpCredentials, HttpChallenge} import akka.http.scaladsl.server import akka.http.scaladsl.server.AuthenticationFailedRejection.CredentialsRejected import akka.http.scaladsl.testkit.ScalatestRouteTest diff --git a/engine/lite/runtime-app/src/main/scala/pl/touk/nussknacker/engine/lite/app/NuRuntimeApp.scala b/engine/lite/runtime-app/src/main/scala/pl/touk/nussknacker/engine/lite/app/NuRuntimeApp.scala index 63d503d22ca..08a0ae706a1 100644 --- a/engine/lite/runtime-app/src/main/scala/pl/touk/nussknacker/engine/lite/app/NuRuntimeApp.scala +++ b/engine/lite/runtime-app/src/main/scala/pl/touk/nussknacker/engine/lite/app/NuRuntimeApp.scala @@ -13,9 +13,9 @@ import pl.touk.nussknacker.engine.lite.RunnableScenarioInterpreter import pl.touk.nussknacker.engine.lite.app.NuRuntimeApp.AppStartingError.{CannotParseScenario, MissingArgument} import pl.touk.nussknacker.engine.lite.app.RunnableScenarioInterpreterFactory.prepareScenarioInterpreter import pl.touk.nussknacker.engine.marshall.ScenarioParser +import pl.touk.nussknacker.engine.util.{JavaClassVersionChecker, ResourceLoader, SLF4JBridgeHandlerRegistrar, UriUtils} import pl.touk.nussknacker.engine.util.config.ConfigFactoryExt import pl.touk.nussknacker.engine.util.config.CustomFicusInstances._ -import pl.touk.nussknacker.engine.util.{JavaClassVersionChecker, ResourceLoader, SLF4JBridgeHandlerRegistrar, UriUtils} import java.nio.file.Path import scala.concurrent.duration._ diff --git a/engine/lite/runtime-app/src/main/scala/pl/touk/nussknacker/engine/lite/app/RunnableScenarioInterpreterFactory.scala b/engine/lite/runtime-app/src/main/scala/pl/touk/nussknacker/engine/lite/app/RunnableScenarioInterpreterFactory.scala index 81f57fbccfc..75a7dbe56bd 100644 --- a/engine/lite/runtime-app/src/main/scala/pl/touk/nussknacker/engine/lite/app/RunnableScenarioInterpreterFactory.scala +++ b/engine/lite/runtime-app/src/main/scala/pl/touk/nussknacker/engine/lite/app/RunnableScenarioInterpreterFactory.scala @@ -5,8 +5,9 @@ import cats.effect.{IO, Resource} import com.typesafe.config.Config import com.typesafe.scalalogging.LazyLogging import net.ceedubs.ficus.readers.ArbitraryTypeReader.arbitraryTypeValueReader -import pl.touk.nussknacker.engine.api.namespaces.Namespace +import pl.touk.nussknacker.engine.{ModelConfigs, ModelData} import pl.touk.nussknacker.engine.api.{JobData, LiteStreamMetaData, ProcessVersion, RequestResponseMetaData} +import pl.touk.nussknacker.engine.api.namespaces.Namespace import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.lite.RunnableScenarioInterpreter import pl.touk.nussknacker.engine.lite.api.runtimecontext.LiteEngineRuntimeContextPreparer @@ -15,7 +16,6 @@ import pl.touk.nussknacker.engine.lite.metrics.dropwizard.{DropwizardMetricsProv import pl.touk.nussknacker.engine.requestresponse.{RequestResponseConfig, RequestResponseRunnableScenarioInterpreter} import pl.touk.nussknacker.engine.util.config.CustomFicusInstances._ import pl.touk.nussknacker.engine.util.loader.{DeploymentManagersClassLoader, ModelClassLoader} -import pl.touk.nussknacker.engine.{ModelConfigs, ModelData} object RunnableScenarioInterpreterFactory extends LazyLogging { diff --git a/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/ScenarioInterpreterFactory.scala b/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/ScenarioInterpreterFactory.scala index 7e00b2ce68b..493a1ac31f1 100644 --- a/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/ScenarioInterpreterFactory.scala +++ b/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/ScenarioInterpreterFactory.scala @@ -1,14 +1,15 @@ package pl.touk.nussknacker.engine.lite -import cats.data.Validated.{Invalid, Valid} +import cats.{Monad, Monoid} import cats.data._ +import cats.data.Validated.{Invalid, Valid} import cats.implicits._ -import cats.{Monad, Monoid} +import pl.touk.nussknacker.engine.{compiledgraph, InterpretationResult, ModelData} import pl.touk.nussknacker.engine.Interpreter.InterpreterShape import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.component.{ComponentType, NodeComponentInfo} -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.UnsupportedPart import pl.touk.nussknacker.engine.api.context.{JoinContextTransformation, ProcessCompilationError, ValidationContext} +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.UnsupportedPart import pl.touk.nussknacker.engine.api.exception.NuExceptionInfo import pl.touk.nussknacker.engine.api.process.{ ComponentUseCase, @@ -24,7 +25,7 @@ import pl.touk.nussknacker.engine.compiledgraph.CompiledProcessParts import pl.touk.nussknacker.engine.compiledgraph.node.Node import pl.touk.nussknacker.engine.compiledgraph.part._ import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition -import pl.touk.nussknacker.engine.lite.api.commonTypes.{DataBatch, ErrorType, ResultType, monoid} +import pl.touk.nussknacker.engine.lite.api.commonTypes.{monoid, DataBatch, ErrorType, ResultType} import pl.touk.nussknacker.engine.lite.api.customComponentTypes._ import pl.touk.nussknacker.engine.lite.api.interpreterTypes.{ EndResult, @@ -41,7 +42,6 @@ import pl.touk.nussknacker.engine.util.metrics.common.{ ExceptionCountingListener, NodeCountingListener } -import pl.touk.nussknacker.engine.{InterpretationResult, ModelData, compiledgraph} import scala.concurrent.ExecutionContext import scala.language.higherKinds diff --git a/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/TestRunner.scala b/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/TestRunner.scala index 4d846fd64e8..0b790a828cd 100644 --- a/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/TestRunner.scala +++ b/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/TestRunner.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.lite +import cats.{~>, Id, Monad} import cats.data.Validated.{Invalid, Valid} -import cats.{Id, Monad, ~>} import io.circe.Json import pl.touk.nussknacker.engine.Interpreter.InterpreterShape import pl.touk.nussknacker.engine.ModelData @@ -14,12 +14,12 @@ import pl.touk.nussknacker.engine.lite.api.commonTypes.ResultType import pl.touk.nussknacker.engine.lite.api.customComponentTypes.CapabilityTransformer import pl.touk.nussknacker.engine.lite.api.interpreterTypes.{EndResult, ScenarioInputBatch, SourceId} import pl.touk.nussknacker.engine.lite.api.runtimecontext.LiteEngineRuntimeContextPreparer -import pl.touk.nussknacker.engine.testmode.TestProcess.TestResults import pl.touk.nussknacker.engine.testmode._ +import pl.touk.nussknacker.engine.testmode.TestProcess.TestResults import pl.touk.nussknacker.engine.util.SynchronousExecutionContextAndIORuntime -import scala.concurrent.duration.DurationInt import scala.concurrent.{Await, Future} +import scala.concurrent.duration.DurationInt import scala.language.higherKinds trait TestRunner { diff --git a/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/capabilities.scala b/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/capabilities.scala index d8b2c810f20..bfa28391c9b 100644 --- a/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/capabilities.scala +++ b/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/capabilities.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.lite -import cats.data.Validated.Valid -import cats.data.{Validated, ValidatedNel} import cats.~> +import cats.data.{Validated, ValidatedNel} +import cats.data.Validated.Valid import pl.touk.nussknacker.engine.api.context.ProcessCompilationError import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CannotCreateObjectError import pl.touk.nussknacker.engine.lite.api.customComponentTypes.CapabilityTransformer diff --git a/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/metrics/dropwizard/JmxMetricsReporter.scala b/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/metrics/dropwizard/JmxMetricsReporter.scala index 1229944eed2..3d5a3e9e601 100644 --- a/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/metrics/dropwizard/JmxMetricsReporter.scala +++ b/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/metrics/dropwizard/JmxMetricsReporter.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.lite.metrics.dropwizard import com.typesafe.config.Config -import io.dropwizard.metrics5.jmx.JmxReporter import io.dropwizard.metrics5.{MetricName, MetricRegistry} +import io.dropwizard.metrics5.jmx.JmxReporter class JmxMetricsReporter extends MetricsReporter { diff --git a/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/metrics/dropwizard/influxdb/InfluxDbHttpReporter.scala b/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/metrics/dropwizard/influxdb/InfluxDbHttpReporter.scala index a524b5ddaa9..fc24ea621a9 100644 --- a/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/metrics/dropwizard/influxdb/InfluxDbHttpReporter.scala +++ b/engine/lite/runtime/src/main/scala/pl/touk/nussknacker/engine/lite/metrics/dropwizard/influxdb/InfluxDbHttpReporter.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.lite.metrics.dropwizard.influxdb import com.typesafe.scalalogging.LazyLogging -import io.dropwizard.metrics5.influxdb._ import io.dropwizard.metrics5.{MetricName, MetricRegistry} +import io.dropwizard.metrics5.influxdb._ import sttp.client3._ import java.lang diff --git a/engine/lite/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/InterpreterTestRunnerTest.scala b/engine/lite/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/InterpreterTestRunnerTest.scala index b198649eae1..2f5d2fccf5c 100644 --- a/engine/lite/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/InterpreterTestRunnerTest.scala +++ b/engine/lite/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/InterpreterTestRunnerTest.scala @@ -10,13 +10,13 @@ import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.graph.expression.Expression.Language +import pl.touk.nussknacker.engine.lite.sample.SampleInputWithListAndMap import pl.touk.nussknacker.engine.spel.SpelExtension._ import pl.touk.nussknacker.engine.testmode.TestProcess.{ ExpressionInvocationResult, ExternalInvocationResult, ResultContext } -import pl.touk.nussknacker.engine.lite.sample.SampleInputWithListAndMap import scala.jdk.CollectionConverters._ diff --git a/engine/lite/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/MetricsTest.scala b/engine/lite/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/MetricsTest.scala index f9d4be218c4..608e723d3b5 100644 --- a/engine/lite/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/MetricsTest.scala +++ b/engine/lite/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/MetricsTest.scala @@ -14,8 +14,8 @@ import pl.touk.nussknacker.engine.lite.api.runtimecontext.LiteEngineRuntimeConte import pl.touk.nussknacker.engine.lite.metrics.dropwizard.DropwizardMetricsProviderFactory import pl.touk.nussknacker.engine.lite.sample.SampleInput import pl.touk.nussknacker.engine.spel.SpelExtension._ -import pl.touk.nussknacker.engine.util.metrics.common.naming.{nodeIdTag, scenarioIdTag} import pl.touk.nussknacker.engine.util.metrics.{Gauge, MetricIdentifier} +import pl.touk.nussknacker.engine.util.metrics.common.naming.{nodeIdTag, scenarioIdTag} import scala.jdk.CollectionConverters._ diff --git a/engine/lite/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/metrics/dropwizard/influxdb/LiteEngineInfluxDbReporterTest.scala b/engine/lite/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/metrics/dropwizard/influxdb/LiteEngineInfluxDbReporterTest.scala index 06c11a9e1fa..8091002beda 100644 --- a/engine/lite/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/metrics/dropwizard/influxdb/LiteEngineInfluxDbReporterTest.scala +++ b/engine/lite/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/metrics/dropwizard/influxdb/LiteEngineInfluxDbReporterTest.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.lite.metrics.dropwizard.influxdb import com.typesafe.config.{Config, ConfigFactory} -import io.dropwizard.metrics5.influxdb.InfluxDbReporter import io.dropwizard.metrics5.{MetricName, MetricRegistry} +import io.dropwizard.metrics5.influxdb.InfluxDbReporter import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers diff --git a/engine/lite/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/sample.scala b/engine/lite/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/sample.scala index 3fddab9317b..01c7dcd11cc 100644 --- a/engine/lite/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/sample.scala +++ b/engine/lite/runtime/src/test/scala/pl/touk/nussknacker/engine/lite/sample.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.lite import cats.Monad -import cats.data.Validated.{Invalid, Valid} import cats.data.{State, StateT, ValidatedNel} +import cats.data.Validated.{Invalid, Valid} import com.typesafe.config.ConfigFactory import io.circe.generic.JsonCodec import pl.touk.nussknacker.engine.Interpreter.InterpreterShape @@ -18,8 +18,8 @@ import pl.touk.nussknacker.engine.api.exception.NuExceptionInfo import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.api.test.{ScenarioTestData, TestRecord, TestRecordParser} +import pl.touk.nussknacker.engine.api.typed.{typing, ReturningType} import pl.touk.nussknacker.engine.api.typed.typing.{Typed, Unknown} -import pl.touk.nussknacker.engine.api.typed.{ReturningType, typing} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.lite.TestRunner.EffectUnwrapper import pl.touk.nussknacker.engine.lite.api.commonTypes.{ErrorType, ResultType} @@ -39,8 +39,8 @@ import pl.touk.nussknacker.engine.testmode.TestProcess.TestResults import pl.touk.nussknacker.engine.util.SynchronousExecutionContextAndIORuntime import pl.touk.nussknacker.engine.util.SynchronousExecutionContextAndIORuntime.syncEc -import scala.concurrent.duration.DurationInt import scala.concurrent.{Await, Future} +import scala.concurrent.duration.DurationInt import scala.jdk.CollectionConverters._ import scala.language.higherKinds diff --git a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/conversion/ProcessConfigCreatorMapping.scala b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/conversion/ProcessConfigCreatorMapping.scala index 6d9a7cf83d1..3e7b206ab53 100644 --- a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/conversion/ProcessConfigCreatorMapping.scala +++ b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/conversion/ProcessConfigCreatorMapping.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.api.conversion +import pl.touk.nussknacker.engine.api.{CustomStreamTransformer, ProcessListener, Service} import pl.touk.nussknacker.engine.api.modelinfo.ModelInfo import pl.touk.nussknacker.engine.api.process.{ProcessObjectDependencies, _} -import pl.touk.nussknacker.engine.api.{CustomStreamTransformer, ProcessListener, Service} import pl.touk.nussknacker.engine.javaapi.process import scala.jdk.CollectionConverters._ diff --git a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/ProcessAction.scala b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/ProcessAction.scala index 4fd08eca932..e65431edaf2 100644 --- a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/ProcessAction.scala +++ b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/ProcessAction.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.api.deployment +import io.circe.{Decoder, Encoder, KeyDecoder, KeyEncoder} import io.circe.generic.JsonCodec import io.circe.generic.extras.semiauto.{deriveUnwrappedDecoder, deriveUnwrappedEncoder} -import io.circe.{Decoder, Encoder, KeyDecoder, KeyEncoder} import pl.touk.nussknacker.engine.api.component.ParameterConfig import pl.touk.nussknacker.engine.api.deployment.ProcessActionState.ProcessActionState import pl.touk.nussknacker.engine.api.parameter.ParameterName diff --git a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/ScenarioActivity.scala b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/ScenarioActivity.scala index a26b728a576..bf1de844445 100644 --- a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/ScenarioActivity.scala +++ b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/ScenarioActivity.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.api.deployment -import enumeratum.EnumEntry.UpperSnakecase import enumeratum.{Enum, EnumEntry} +import enumeratum.EnumEntry.UpperSnakecase import pl.touk.nussknacker.engine.api.Comment import pl.touk.nussknacker.engine.api.component.ProcessingMode import pl.touk.nussknacker.engine.api.process.VersionId diff --git a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/dict/embedded/EmbeddedDictRegistry.scala b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/dict/embedded/EmbeddedDictRegistry.scala index c49843faed4..9c7f468d124 100644 --- a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/dict/embedded/EmbeddedDictRegistry.scala +++ b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/dict/embedded/EmbeddedDictRegistry.scala @@ -2,12 +2,12 @@ package pl.touk.nussknacker.engine.api.dict.embedded import cats.data.Validated import cats.data.Validated.{Invalid, Valid} +import pl.touk.nussknacker.engine.api.dict.{DictDefinition, DictEntry, DictQueryService, DictRegistry} import pl.touk.nussknacker.engine.api.dict.DictRegistry.{ DictEntryWithKeyNotExists, DictEntryWithLabelNotExists, DictNotDeclared } -import pl.touk.nussknacker.engine.api.dict.{DictDefinition, DictEntry, DictQueryService, DictRegistry} import scala.concurrent.{ExecutionContext, Future} diff --git a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/graph/ScenarioGraph.scala b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/graph/ScenarioGraph.scala index 7a26a2da8bc..af4696579c2 100644 --- a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/graph/ScenarioGraph.scala +++ b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/graph/ScenarioGraph.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.engine.api.graph +import io.circe.{Decoder, Encoder, HCursor} import io.circe.generic.JsonCodec import io.circe.generic.extras.semiauto.deriveConfiguredDecoder -import io.circe.{Decoder, Encoder, HCursor} -import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.engine.api.{MetaData, ProcessAdditionalFields, TypeSpecificData} -import pl.touk.nussknacker.engine.graph.node.NodeData -import pl.touk.nussknacker.engine.graph.EdgeType import pl.touk.nussknacker.engine.api.CirceUtil._ +import pl.touk.nussknacker.engine.api.process.ProcessName +import pl.touk.nussknacker.engine.graph.EdgeType +import pl.touk.nussknacker.engine.graph.node.NodeData @JsonCodec final case class ScenarioGraph( properties: ProcessProperties, diff --git a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/process/ClassExtractionSettings.scala b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/process/ClassExtractionSettings.scala index 7e9da4b0968..d43ed3f42cc 100644 --- a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/process/ClassExtractionSettings.scala +++ b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/process/ClassExtractionSettings.scala @@ -2,10 +2,10 @@ package pl.touk.nussknacker.engine.api.process import cats.data.NonEmptyList import io.circe.{Decoder, Encoder} +import pl.touk.nussknacker.engine.api.{Hidden, HideToString, TemplateEvaluationResult} import pl.touk.nussknacker.engine.api.definition.ParameterEditor import pl.touk.nussknacker.engine.api.typed.supertype.ReturningSingleClassPromotionStrategy import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{Hidden, HideToString, TemplateEvaluationResult} import java.lang.reflect.{AccessibleObject, Member, Method} import java.text.NumberFormat @@ -13,9 +13,9 @@ import java.time.Clock import java.time.chrono.{ChronoLocalDate, ChronoLocalDateTime, ChronoZonedDateTime} import java.time.temporal.{ChronoUnit, Temporal, TemporalAccessor} import java.util +import java.util.{Calendar, Date, Optional, UUID} import java.util.concurrent.TimeUnit import java.util.regex.Pattern -import java.util.{Calendar, Date, Optional, UUID} // TODO: Rename to ClassDefinitionDiscoverySettings /** diff --git a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/process/EmptyProcessConfigCreator.scala b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/process/EmptyProcessConfigCreator.scala index a2e976da80a..eec32df9e9d 100644 --- a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/process/EmptyProcessConfigCreator.scala +++ b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/process/EmptyProcessConfigCreator.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.api.process -import pl.touk.nussknacker.engine.api.modelinfo.ModelInfo import pl.touk.nussknacker.engine.api.{CustomStreamTransformer, ProcessListener, Service} +import pl.touk.nussknacker.engine.api.modelinfo.ModelInfo class EmptyProcessConfigCreator extends ProcessConfigCreator { diff --git a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/process/ExpressionConfig.scala b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/process/ExpressionConfig.scala index f54b6da6db2..27f58b4931b 100644 --- a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/process/ExpressionConfig.scala +++ b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/process/ExpressionConfig.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.api.process +import pl.touk.nussknacker.engine.api.{ConversionsProvider, SpelExpressionExcludeList} import pl.touk.nussknacker.engine.api.dict.DictDefinition import pl.touk.nussknacker.engine.api.process.ExpressionConfig._ -import pl.touk.nussknacker.engine.api.{ConversionsProvider, SpelExpressionExcludeList} import java.time._ import java.util.UUID diff --git a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/process/ProcessConfigCreator.scala b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/process/ProcessConfigCreator.scala index 3be77522458..28b6c19cd0c 100644 --- a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/process/ProcessConfigCreator.scala +++ b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/api/process/ProcessConfigCreator.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.api.process -import pl.touk.nussknacker.engine.api.modelinfo.ModelInfo import pl.touk.nussknacker.engine.api.{CustomStreamTransformer, ProcessListener, Service} +import pl.touk.nussknacker.engine.api.modelinfo.ModelInfo /** * There Nussknacker fetches information about user defined model. diff --git a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/deployment/DeploymentId.scala b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/deployment/DeploymentId.scala index ef667f4afc0..8eb45223897 100644 --- a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/deployment/DeploymentId.scala +++ b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/deployment/DeploymentId.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.deployment -import io.circe.generic.extras.semiauto.{deriveUnwrappedDecoder, deriveUnwrappedEncoder} import io.circe.{Decoder, Encoder} +import io.circe.generic.extras.semiauto.{deriveUnwrappedDecoder, deriveUnwrappedEncoder} import pl.touk.nussknacker.engine.api.deployment.ProcessActionId import pl.touk.nussknacker.engine.newdeployment diff --git a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/deployment/ExternalDeploymentId.scala b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/deployment/ExternalDeploymentId.scala index 86fe47ea547..28dbdc43c62 100644 --- a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/deployment/ExternalDeploymentId.scala +++ b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/deployment/ExternalDeploymentId.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.deployment -import io.circe.generic.extras.semiauto.{deriveUnwrappedDecoder, deriveUnwrappedEncoder} import io.circe.{Decoder, Encoder} +import io.circe.generic.extras.semiauto.{deriveUnwrappedDecoder, deriveUnwrappedEncoder} //id generated by external system - e.g. Flink JobID final case class ExternalDeploymentId(value: String) extends AnyVal { diff --git a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/modelconfig/ModelConfigLoader.scala b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/modelconfig/ModelConfigLoader.scala index fb9cd771bae..721a6416e81 100644 --- a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/modelconfig/ModelConfigLoader.scala +++ b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/modelconfig/ModelConfigLoader.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.modelconfig -import com.typesafe.config.impl.ConfigImpl import com.typesafe.config.{Config, ConfigFactory, ConfigResolveOptions} +import com.typesafe.config.impl.ConfigImpl import com.typesafe.scalalogging.LazyLogging import pl.touk.nussknacker.engine.ConfigWithUnresolvedVersion import pl.touk.nussknacker.engine.modelconfig.ModelConfigLoader.defaultModelConfigResource diff --git a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/testmode/TestProcess.scala b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/testmode/TestProcess.scala index 3cf53102529..526ad81a117 100644 --- a/extensions-api/src/main/scala/pl/touk/nussknacker/engine/testmode/TestProcess.scala +++ b/extensions-api/src/main/scala/pl/touk/nussknacker/engine/testmode/TestProcess.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.testmode -import pl.touk.nussknacker.engine.api.exception.NuExceptionInfo import pl.touk.nussknacker.engine.api.{Context, ContextId} +import pl.touk.nussknacker.engine.api.exception.NuExceptionInfo object TestProcess { diff --git a/project/FormatStagedScalaFilesPlugin.scala b/project/FormatStagedScalaFilesPlugin.scala index 88e6d535835..eccce8a14c5 100644 --- a/project/FormatStagedScalaFilesPlugin.scala +++ b/project/FormatStagedScalaFilesPlugin.scala @@ -1,7 +1,7 @@ import org.scalafmt.sbt.ScalafmtPlugin +import sbt.{taskKey, Compile, Global, Setting} import sbt.Keys._ -import sbt.nio.Keys.{ReloadOnSourceChanges, onChangedBuildSource} -import sbt.{Compile, Global, Setting, taskKey} +import sbt.nio.Keys.{onChangedBuildSource, ReloadOnSourceChanges} import utils.Step object FormatStagedScalaFilesPlugin extends sbt.AutoPlugin { diff --git a/project/GenerateDesignerOpenApiPlugin.scala b/project/GenerateDesignerOpenApiPlugin.scala index c0f2ef60646..d8eef34dfca 100644 --- a/project/GenerateDesignerOpenApiPlugin.scala +++ b/project/GenerateDesignerOpenApiPlugin.scala @@ -1,5 +1,5 @@ +import sbt.{taskKey, Test} import sbt.Keys.runMain -import sbt.{Test, taskKey} object GenerateDesignerOpenApiPlugin extends sbt.AutoPlugin { override def trigger = noTrigger diff --git a/project/NuToolsGitPathsConfiguratorPlugin.scala b/project/NuToolsGitPathsConfiguratorPlugin.scala index ddd98bb9534..bc130ab363b 100644 --- a/project/NuToolsGitPathsConfiguratorPlugin.scala +++ b/project/NuToolsGitPathsConfiguratorPlugin.scala @@ -1,8 +1,8 @@ import better.files.File import org.eclipse.jgit.storage.file.FileRepositoryBuilder +import sbt.{taskKey, Def, Global, Level, Setting, State} import sbt.Keys.{aggregate, onLoad, streams} import sbt.internal.util.ManagedLogger -import sbt.{Def, Global, Level, Setting, State, taskKey} import scala.util.Using diff --git a/scenario-api/src/main/scala/pl/touk/nussknacker/engine/build/GraphBuilder.scala b/scenario-api/src/main/scala/pl/touk/nussknacker/engine/build/GraphBuilder.scala index 8d7e71371f8..1aaecceffee 100644 --- a/scenario-api/src/main/scala/pl/touk/nussknacker/engine/build/GraphBuilder.scala +++ b/scenario-api/src/main/scala/pl/touk/nussknacker/engine/build/GraphBuilder.scala @@ -1,17 +1,17 @@ package pl.touk.nussknacker.engine.build import pl.touk.nussknacker.engine.api.parameter.ParameterName -import pl.touk.nussknacker.engine.graph.evaluatedparam.BranchParameters +import pl.touk.nussknacker.engine.graph.{node, EdgeType} import pl.touk.nussknacker.engine.graph.evaluatedparam.{Parameter => NodeParameter} +import pl.touk.nussknacker.engine.graph.evaluatedparam.BranchParameters import pl.touk.nussknacker.engine.graph.expression._ -import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} +import pl.touk.nussknacker.engine.graph.fragment.FragmentRef import pl.touk.nussknacker.engine.graph.node._ +import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.service.ServiceRef import pl.touk.nussknacker.engine.graph.sink.SinkRef import pl.touk.nussknacker.engine.graph.source.SourceRef -import pl.touk.nussknacker.engine.graph.fragment.FragmentRef import pl.touk.nussknacker.engine.graph.variable._ -import pl.touk.nussknacker.engine.graph.{EdgeType, node} trait GraphBuilder[R] { diff --git a/scenario-api/src/main/scala/pl/touk/nussknacker/engine/build/ScenarioBuilder.scala b/scenario-api/src/main/scala/pl/touk/nussknacker/engine/build/ScenarioBuilder.scala index c30669e757e..7a518e90429 100644 --- a/scenario-api/src/main/scala/pl/touk/nussknacker/engine/build/ScenarioBuilder.scala +++ b/scenario-api/src/main/scala/pl/touk/nussknacker/engine/build/ScenarioBuilder.scala @@ -7,8 +7,8 @@ import pl.touk.nussknacker.engine.build.GraphBuilder.Creator import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.graph.EspProcess import pl.touk.nussknacker.engine.graph.expression.Expression -import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.FragmentParameter import pl.touk.nussknacker.engine.graph.node.{SourceNode, SubsequentNode} +import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.FragmentParameter class ProcessMetaDataBuilder private[build] (metaData: MetaData) { diff --git a/scenario-api/src/main/scala/pl/touk/nussknacker/engine/canonicalgraph/ProcessNodesRewriter.scala b/scenario-api/src/main/scala/pl/touk/nussknacker/engine/canonicalgraph/ProcessNodesRewriter.scala index dae4a76f03a..e35ba81615d 100644 --- a/scenario-api/src/main/scala/pl/touk/nussknacker/engine/canonicalgraph/ProcessNodesRewriter.scala +++ b/scenario-api/src/main/scala/pl/touk/nussknacker/engine/canonicalgraph/ProcessNodesRewriter.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.canonicalgraph import pl.touk.nussknacker.engine.api.{MetaData, NodeId} import pl.touk.nussknacker.engine.canonicalgraph.canonicalnode._ -import pl.touk.nussknacker.engine.graph.evaluatedparam.BranchParameters import pl.touk.nussknacker.engine.graph.evaluatedparam.{Parameter => NodeParameter} +import pl.touk.nussknacker.engine.graph.evaluatedparam.BranchParameters import pl.touk.nussknacker.engine.graph.expression.{Expression, NodeExpressionId} import pl.touk.nussknacker.engine.graph.expression.NodeExpressionId._ import pl.touk.nussknacker.engine.graph.node diff --git a/scenario-api/src/main/scala/pl/touk/nussknacker/engine/canonize/ProcessCanonizer.scala b/scenario-api/src/main/scala/pl/touk/nussknacker/engine/canonize/ProcessCanonizer.scala index 4d5ceb48611..e5aa39a6424 100644 --- a/scenario-api/src/main/scala/pl/touk/nussknacker/engine/canonize/ProcessCanonizer.scala +++ b/scenario-api/src/main/scala/pl/touk/nussknacker/engine/canonize/ProcessCanonizer.scala @@ -10,9 +10,10 @@ import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap object ProcessCanonizer { - import MaybeArtificial.applicative import cats.syntax.apply._ + import MaybeArtificial.applicative + def canonize(process: EspProcess): CanonicalProcess = { CanonicalProcess( process.metaData, diff --git a/scenario-api/src/main/scala/pl/touk/nussknacker/engine/graph/EdgeType.scala b/scenario-api/src/main/scala/pl/touk/nussknacker/engine/graph/EdgeType.scala index 7db9ddc1d2a..de9a2a29538 100644 --- a/scenario-api/src/main/scala/pl/touk/nussknacker/engine/graph/EdgeType.scala +++ b/scenario-api/src/main/scala/pl/touk/nussknacker/engine/graph/EdgeType.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.graph import io.circe.generic.extras.ConfiguredJsonCodec -import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.api.CirceUtil._ +import pl.touk.nussknacker.engine.graph.expression.Expression //unstable, may change in the future... @ConfiguredJsonCodec sealed abstract class EdgeType { diff --git a/scenario-api/src/main/scala/pl/touk/nussknacker/engine/graph/node.scala b/scenario-api/src/main/scala/pl/touk/nussknacker/engine/graph/node.scala index 0a740880323..52c786bef7a 100644 --- a/scenario-api/src/main/scala/pl/touk/nussknacker/engine/graph/node.scala +++ b/scenario-api/src/main/scala/pl/touk/nussknacker/engine/graph/node.scala @@ -2,9 +2,10 @@ package pl.touk.nussknacker.engine.graph import io.circe._ import io.circe.generic.JsonCodec -import io.circe.generic.extras.semiauto.{deriveConfiguredDecoder, deriveConfiguredEncoder, deriveUnwrappedCodec} import io.circe.generic.extras.{ConfiguredJsonCodec, JsonKey} +import io.circe.generic.extras.semiauto.{deriveConfiguredDecoder, deriveConfiguredEncoder, deriveUnwrappedCodec} import org.apache.commons.lang3.ClassUtils +import pl.touk.nussknacker.engine.api.{JoinReference, LayoutData} import pl.touk.nussknacker.engine.api.CirceUtil._ import pl.touk.nussknacker.engine.api.definition.FixedExpressionValue import pl.touk.nussknacker.engine.api.parameter.{ @@ -12,7 +13,6 @@ import pl.touk.nussknacker.engine.api.parameter.{ ParameterValueCompileTimeValidation, ParameterValueInput } -import pl.touk.nussknacker.engine.api.{JoinReference, LayoutData} import pl.touk.nussknacker.engine.graph.evaluatedparam.{BranchParameters, Parameter => NodeParameter} import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.graph.fragment.FragmentRef diff --git a/scenario-api/src/main/scala/pl/touk/nussknacker/engine/marshall/ProcessMarshaller.scala b/scenario-api/src/main/scala/pl/touk/nussknacker/engine/marshall/ProcessMarshaller.scala index a6de106827d..25e21bb8094 100644 --- a/scenario-api/src/main/scala/pl/touk/nussknacker/engine/marshall/ProcessMarshaller.scala +++ b/scenario-api/src/main/scala/pl/touk/nussknacker/engine/marshall/ProcessMarshaller.scala @@ -9,8 +9,8 @@ import pl.touk.nussknacker.engine.graph.node.{Filter, FragmentInput, NodeData, S object ProcessMarshaller { - import pl.touk.nussknacker.engine.api.CirceUtil._ import io.circe.generic.extras.semiauto._ + import pl.touk.nussknacker.engine.api.CirceUtil._ private implicit val nodeDataEncoder: Encoder[NodeData] = deriveConfiguredEncoder diff --git a/scenario-api/src/test/scala/pl/touk/nussknacker/engine/canonicalgraph/CanonicalProcessTest.scala b/scenario-api/src/test/scala/pl/touk/nussknacker/engine/canonicalgraph/CanonicalProcessTest.scala index f61622249a3..cbb5116d8d1 100644 --- a/scenario-api/src/test/scala/pl/touk/nussknacker/engine/canonicalgraph/CanonicalProcessTest.scala +++ b/scenario-api/src/test/scala/pl/touk/nussknacker/engine/canonicalgraph/CanonicalProcessTest.scala @@ -14,10 +14,10 @@ import pl.touk.nussknacker.engine.canonicalgraph.canonicalnode.{ } import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.graph.expression.Expression.Language +import pl.touk.nussknacker.engine.graph.fragment.FragmentRef import pl.touk.nussknacker.engine.graph.node._ import pl.touk.nussknacker.engine.graph.sink.SinkRef import pl.touk.nussknacker.engine.graph.source.SourceRef -import pl.touk.nussknacker.engine.graph.fragment.FragmentRef import scala.language.implicitConversions diff --git a/scenario-api/src/test/scala/pl/touk/nussknacker/engine/marshall/ProcessMarshallerSpec.scala b/scenario-api/src/test/scala/pl/touk/nussknacker/engine/marshall/ProcessMarshallerSpec.scala index 86bd7344311..cb602a7d4f1 100644 --- a/scenario-api/src/test/scala/pl/touk/nussknacker/engine/marshall/ProcessMarshallerSpec.scala +++ b/scenario-api/src/test/scala/pl/touk/nussknacker/engine/marshall/ProcessMarshallerSpec.scala @@ -2,19 +2,19 @@ package pl.touk.nussknacker.engine.marshall import cats.data.NonEmptyList import cats.data.Validated.{Invalid, Valid} +import io.circe.{Codec, Json} import io.circe.generic.extras.semiauto.deriveConfiguredCodec import io.circe.syntax._ -import io.circe.{Codec, Json} +import org.scalatest.{Inside, OptionValues} import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks -import org.scalatest.{Inside, OptionValues} import pl.touk.nussknacker.engine._ -import pl.touk.nussknacker.engine.api.CirceUtil._ import pl.touk.nussknacker.engine.api._ +import pl.touk.nussknacker.engine.api.CirceUtil._ import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} +import pl.touk.nussknacker.engine.canonicalgraph.{canonicalnode, CanonicalProcess} import pl.touk.nussknacker.engine.canonicalgraph.canonicalnode.{CanonicalNode, FlatNode} -import pl.touk.nussknacker.engine.canonicalgraph.{CanonicalProcess, canonicalnode} import pl.touk.nussknacker.engine.canonize.ProcessCanonizer import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.graph.expression.Expression.Language diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/Interpreter.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/Interpreter.scala index 12eb8a42c02..4243f3c4ee0 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/Interpreter.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/Interpreter.scala @@ -18,8 +18,8 @@ import pl.touk.nussknacker.engine.util.SynchronousExecutionContextAndIORuntime import scala.concurrent.{ExecutionContext, Future} import scala.language.higherKinds -import scala.util.control.NonFatal import scala.util.{Failure, Success} +import scala.util.control.NonFatal // TODO Interpreter and things around for sake of clarity of responsibilities between modules should be moved to the separate // module used only on runtime side. In the scenario-compiler module would stay only things responsible for diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/ModelData.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/ModelData.scala index fdccc7afe1b..917cfb69f4b 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/ModelData.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/ModelData.scala @@ -4,9 +4,9 @@ import com.typesafe.config.Config import com.typesafe.scalalogging.LazyLogging import pl.touk.nussknacker.engine.ClassLoaderModelData.ExtractDefinitionFunImpl import pl.touk.nussknacker.engine.ModelData.ExtractDefinitionFun -import pl.touk.nussknacker.engine.api.modelinfo.ModelInfo import pl.touk.nussknacker.engine.api.component.{ComponentAdditionalConfig, ComponentId, DesignerWideComponentId} import pl.touk.nussknacker.engine.api.dict.{DictServicesFactory, EngineDictRegistry, UiDictServices} +import pl.touk.nussknacker.engine.api.modelinfo.ModelInfo import pl.touk.nussknacker.engine.api.namespaces.NamingStrategy import pl.touk.nussknacker.engine.api.process.{ProcessConfigCreator, ProcessObjectDependencies} import pl.touk.nussknacker.engine.definition.component.Components.ComponentDefinitionExtractionMode diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/CompilationResult.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/CompilationResult.scala index bd747fd665a..1f14162e6f6 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/CompilationResult.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/CompilationResult.scala @@ -1,26 +1,25 @@ package pl.touk.nussknacker.engine.compile -import cats.data.Validated.{Invalid, Valid} +import cats.{Applicative, Traverse} import cats.data.{NonEmptyList, ValidatedNel} +import cats.data.Validated.{Invalid, Valid} import cats.instances.map._ import cats.kernel.Semigroup -import cats.{Applicative, Traverse} import com.typesafe.scalalogging.LazyLogging +import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ProcessUncanonizationError, ValidationContext} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.{ EmptyProcess, InvalidRootNode, InvalidTailOfBranch } -import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ProcessUncanonizationError, ValidationContext} import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.expression.ExpressionTypingInfo import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.canonize.{MaybeArtificial, MaybeArtificialExtractor, ProcessUncanonizationNodeError} import pl.touk.nussknacker.engine.canonize - -import scala.language.{higherKinds, reflectiveCalls} +import pl.touk.nussknacker.engine.canonize.{MaybeArtificial, MaybeArtificialExtractor, ProcessUncanonizationNodeError} import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap +import scala.language.{higherKinds, reflectiveCalls} import scala.reflect.ClassTag case class CompilationResult[+Result]( diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/ComponentExecutorFactory.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/ComponentExecutorFactory.scala index 55084f2c0b1..8ef6b203f57 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/ComponentExecutorFactory.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/ComponentExecutorFactory.scala @@ -2,10 +2,10 @@ package pl.touk.nussknacker.engine.compile import cats.data.IorNel import com.typesafe.scalalogging.LazyLogging +import pl.touk.nussknacker.engine.api.{JobData, MetaData, NodeId, Params, Service} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.process.ComponentUseCase -import pl.touk.nussknacker.engine.api.{JobData, MetaData, NodeId, Params, Service} import pl.touk.nussknacker.engine.compile.nodecompilation.{LazyParameterCreationStrategy, ParameterEvaluator} import pl.touk.nussknacker.engine.compiledgraph.TypedParameter import pl.touk.nussknacker.engine.definition.component.ComponentDefinitionWithImplementation diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/ExpressionCompiler.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/ExpressionCompiler.scala index 5eb7e550412..20b0d895c60 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/ExpressionCompiler.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/ExpressionCompiler.scala @@ -1,12 +1,12 @@ package pl.touk.nussknacker.engine.compile -import cats.data.Validated.{Invalid, Valid, invalid, invalidNel, valid} import cats.data.{Ior, IorNel, NonEmptyList, Validated, ValidatedNel} +import cats.data.Validated.{invalid, invalidNel, valid, Invalid, Valid} import cats.instances.list._ import pl.touk.nussknacker.engine.ModelData import pl.touk.nussknacker.engine.api.{JobData, NodeId} -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.context.{PartSubGraphCompilationError, ProcessCompilationError, ValidationContext} +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.dict.{DictRegistry, EngineDictRegistry} import pl.touk.nussknacker.engine.api.parameter.ParameterName diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/FragmentResolver.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/FragmentResolver.scala index dfd993b895f..a0112d07fc3 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/FragmentResolver.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/FragmentResolver.scala @@ -1,14 +1,14 @@ package pl.touk.nussknacker.engine.compile -import cats.data.Validated.{Invalid, Valid, invalidNel, valid} import cats.data._ +import cats.data.Validated.{invalidNel, valid, Invalid, Valid} import cats.implicits._ import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.context.ProcessCompilationError import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.process.ProcessName +import pl.touk.nussknacker.engine.canonicalgraph.{canonicalnode, CanonicalProcess} import pl.touk.nussknacker.engine.canonicalgraph.canonicalnode.{CanonicalNode, FlatNode} -import pl.touk.nussknacker.engine.canonicalgraph.{CanonicalProcess, canonicalnode} import pl.touk.nussknacker.engine.definition.fragment.{FragmentGraphDefinition, FragmentGraphDefinitionExtractor} import pl.touk.nussknacker.engine.graph.node._ diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/NodeValidationExceptionHandler.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/NodeValidationExceptionHandler.scala index f255be1394c..cfaa2c74b2d 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/NodeValidationExceptionHandler.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/NodeValidationExceptionHandler.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.compile -import cats.data.Validated.Valid import cats.data.{Validated, ValidatedNel} +import cats.data.Validated.Valid import com.typesafe.scalalogging.LazyLogging import pl.touk.nussknacker.engine.api.{MetaData, NodeId} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/PartSubGraphCompiler.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/PartSubGraphCompiler.scala index c640e6ba17a..da5213139fc 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/PartSubGraphCompiler.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/PartSubGraphCompiler.scala @@ -1,16 +1,16 @@ package pl.touk.nussknacker.engine.compile import cats.Applicative -import cats.data.Validated._ import cats.data.{NonEmptyList, ValidatedNel} +import cats.data.Validated._ import cats.instances.list._ import cats.instances.option._ -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ +import pl.touk.nussknacker.engine.api.{JobData, MetaData, NodeId} import pl.touk.nussknacker.engine.api.context.{OutputVar, ProcessCompilationError, ValidationContext} +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.expression.ExpressionTypingInfo import pl.touk.nussknacker.engine.api.typed.typing.Unknown -import pl.touk.nussknacker.engine.api.{JobData, MetaData, NodeId} import pl.touk.nussknacker.engine.compile.nodecompilation.NodeCompiler import pl.touk.nussknacker.engine.compile.nodecompilation.NodeCompiler.NodeCompilationResult import pl.touk.nussknacker.engine.compiledgraph diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/ProcessCompiler.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/ProcessCompiler.scala index f226caede82..3c15631406d 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/ProcessCompiler.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/ProcessCompiler.scala @@ -1,22 +1,22 @@ package pl.touk.nussknacker.engine.compile -import cats.data.Validated._ import cats.data.{NonEmptyList, Validated, ValidatedNel} +import cats.data.Validated._ import cats.instances.list._ import com.typesafe.scalalogging.LazyLogging import pl.touk.nussknacker.engine._ -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ +import pl.touk.nussknacker.engine.api.{JobData, MetaData, NodeId} import pl.touk.nussknacker.engine.api.context._ +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.dict.DictRegistry import pl.touk.nussknacker.engine.api.process.ComponentUseCase -import pl.touk.nussknacker.engine.api.{JobData, MetaData, NodeId} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.canonize.ProcessCanonizer import pl.touk.nussknacker.engine.compile.FragmentValidator.validateUniqueFragmentOutputNames import pl.touk.nussknacker.engine.compile.nodecompilation.{LazyParameterCreationStrategy, NodeCompiler} import pl.touk.nussknacker.engine.compile.nodecompilation.NodeCompiler.NodeCompilationResult +import pl.touk.nussknacker.engine.compiledgraph.{part, CompiledProcessParts} import pl.touk.nussknacker.engine.compiledgraph.part.{PotentiallyStartPart, TypedEnd} -import pl.touk.nussknacker.engine.compiledgraph.{CompiledProcessParts, part} import pl.touk.nussknacker.engine.definition.fragment.FragmentParametersDefinitionExtractor import pl.touk.nussknacker.engine.definition.model.ModelDefinitionWithClasses import pl.touk.nussknacker.engine.expression.ExpressionEvaluator diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/ProcessCompilerData.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/ProcessCompilerData.scala index 6367a0dac17..205ac395662 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/ProcessCompilerData.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/ProcessCompilerData.scala @@ -1,11 +1,12 @@ package pl.touk.nussknacker.engine.compile import cats.data.ValidatedNel +import pl.touk.nussknacker.engine.{CustomProcessValidator, Interpreter} +import pl.touk.nussknacker.engine.api.{JobData, Lifecycle, ProcessListener} import pl.touk.nussknacker.engine.api.component.ComponentType import pl.touk.nussknacker.engine.api.context.ProcessCompilationError import pl.touk.nussknacker.engine.api.dict.EngineDictRegistry import pl.touk.nussknacker.engine.api.process.ComponentUseCase -import pl.touk.nussknacker.engine.api.{JobData, Lifecycle, ProcessListener} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.compile.nodecompilation.{LazyParameterCreationStrategy, NodeCompiler} import pl.touk.nussknacker.engine.compiledgraph.CompiledProcessParts @@ -16,7 +17,6 @@ import pl.touk.nussknacker.engine.graph.node.{NodeData, WithComponent} import pl.touk.nussknacker.engine.resultcollector.ResultCollector import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap import pl.touk.nussknacker.engine.variables.GlobalVariablesPreparer -import pl.touk.nussknacker.engine.{CustomProcessValidator, Interpreter} /* This is helper class, which collects pieces needed for various stages of compilation process diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/Validations.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/Validations.scala index 758bc4c1813..43c4f0b5475 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/Validations.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/Validations.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.compile import cats.data.Validated.valid import pl.touk.nussknacker.engine.api.NodeId -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.{MissingParameters, RedundantParameters} import pl.touk.nussknacker.engine.api.context._ +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.{MissingParameters, RedundantParameters} import pl.touk.nussknacker.engine.api.definition.{Parameter, Validator} import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.compiledgraph.TypedParameter diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/BuiltInNodeCompiler.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/BuiltInNodeCompiler.scala index b4b2c9106da..dac0d4dd2d6 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/BuiltInNodeCompiler.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/BuiltInNodeCompiler.scala @@ -15,8 +15,8 @@ import pl.touk.nussknacker.engine.compile.nodecompilation.BuiltInNodeCompiler._ import pl.touk.nussknacker.engine.compile.nodecompilation.NodeCompiler.NodeCompilationResult import pl.touk.nussknacker.engine.compiledgraph import pl.touk.nussknacker.engine.expression.parse.{CompiledExpression, TypedExpression} -import pl.touk.nussknacker.engine.graph.expression.NodeExpressionId.DefaultExpressionIdParamName import pl.touk.nussknacker.engine.graph.expression._ +import pl.touk.nussknacker.engine.graph.expression.NodeExpressionId.DefaultExpressionIdParamName import pl.touk.nussknacker.engine.graph.node import pl.touk.nussknacker.engine.graph.node._ diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/DynamicNodeValidator.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/DynamicNodeValidator.scala index fa567f77ba9..98ec511b4e7 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/DynamicNodeValidator.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/DynamicNodeValidator.scala @@ -5,13 +5,13 @@ import cats.data.ValidatedNel import cats.instances.list._ import com.typesafe.scalalogging.LazyLogging import pl.touk.nussknacker.engine.ModelData +import pl.touk.nussknacker.engine.api.{JobData, NodeId} import pl.touk.nussknacker.engine.api.component.ParameterConfig -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.MissingParameters import pl.touk.nussknacker.engine.api.context._ +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.MissingParameters import pl.touk.nussknacker.engine.api.context.transformation._ import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.parameter.ParameterName -import pl.touk.nussknacker.engine.api.{JobData, NodeId} import pl.touk.nussknacker.engine.compile.{ExpressionCompiler, NodeValidationExceptionHandler, Validations} import pl.touk.nussknacker.engine.compiledgraph.TypedParameter import pl.touk.nussknacker.engine.definition.component.parameter.StandardParameterEnrichment diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/EvaluableLazyParameter.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/EvaluableLazyParameter.scala index 1e441c02717..ae47a2abc16 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/EvaluableLazyParameter.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/EvaluableLazyParameter.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.compile.nodecompilation +import pl.touk.nussknacker.engine.api.{Context, JobData, MetaData, NodeId} import pl.touk.nussknacker.engine.api.LazyParameter.{CustomLazyParameter, Evaluate} import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.api.{Context, JobData, MetaData, NodeId} import pl.touk.nussknacker.engine.compiledgraph.{BaseCompiledParameter, CompiledParameter} import pl.touk.nussknacker.engine.expression.ExpressionEvaluator diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/EvaluableLazyParameterCreator.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/EvaluableLazyParameterCreator.scala index 1277c3b5de0..86605a8795e 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/EvaluableLazyParameterCreator.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/EvaluableLazyParameterCreator.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.compile.nodecompilation -import pl.touk.nussknacker.engine.api.LazyParameter._ import pl.touk.nussknacker.engine.api._ +import pl.touk.nussknacker.engine.api.LazyParameter._ import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.typed.typing._ import pl.touk.nussknacker.engine.compile.ExpressionCompiler diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/FragmentParameterValidator.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/FragmentParameterValidator.scala index 135b96c9380..0ee1b8838d4 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/FragmentParameterValidator.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/FragmentParameterValidator.scala @@ -1,20 +1,20 @@ package pl.touk.nussknacker.engine.compile.nodecompilation -import cats.data.Validated.{Valid, invalid, invalidNel, valid} import cats.data.{NonEmptyList, Validated, ValidatedNel} +import cats.data.Validated.{invalid, invalidNel, valid, Valid} import cats.implicits.toTraverseOps import org.apache.commons.lang3.ClassUtils import pl.touk.nussknacker.engine.api.NodeId -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.context.{PartSubGraphCompilationError, ProcessCompilationError, ValidationContext} +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.definition._ -import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.dict.DictDefinition import pl.touk.nussknacker.engine.api.parameter.{ ParameterValueInput, ValueInputWithDictEditor, ValueInputWithFixedValuesProvided } +import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.typed.typing.Unknown import pl.touk.nussknacker.engine.api.validation.Validations.validateVariableName import pl.touk.nussknacker.engine.compile.ExpressionCompiler @@ -23,14 +23,14 @@ import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionSet import pl.touk.nussknacker.engine.definition.fragment.FragmentParameterTypingParser import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.graph.expression.Expression.Language -import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.node.{ + qualifiedParamFieldName, DictIdFieldName, FixedValuesListFieldName, InitialValueFieldName, - ParameterNameFieldName, - qualifiedParamFieldName + ParameterNameFieldName } +import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.language.dictWithLabel.DictKeyWithLabelExpressionParser import scala.util.Try diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/NodeCompiler.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/NodeCompiler.scala index 734cf4171e4..8f07b9021f6 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/NodeCompiler.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/NodeCompiler.scala @@ -1,12 +1,13 @@ package pl.touk.nussknacker.engine.compile.nodecompilation -import cats.data.Validated.{Invalid, Valid, invalid, valid} import cats.data.{NonEmptyList, ValidatedNel, Writer} +import cats.data.Validated.{invalid, valid, Invalid, Valid} import cats.implicits._ +import pl.touk.nussknacker.engine.{api, compiledgraph} import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.component.ComponentType -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.context._ +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.context.transformation.{JoinDynamicComponent, SingleInputDynamicComponent} import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.expression.ExpressionTypingInfo @@ -14,13 +15,13 @@ import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.{ComponentUseCase, Source} import pl.touk.nussknacker.engine.api.typed.ReturningType import pl.touk.nussknacker.engine.api.typed.typing.{TypingResult, Unknown} -import pl.touk.nussknacker.engine.compile.nodecompilation.NodeCompiler.NodeCompilationResult import pl.touk.nussknacker.engine.compile.{ ComponentExecutorFactory, ExpressionCompiler, FragmentSourceWithTestWithParametersSupportFactory, NodeValidationExceptionHandler } +import pl.touk.nussknacker.engine.compile.nodecompilation.NodeCompiler.NodeCompilationResult import pl.touk.nussknacker.engine.compiledgraph.{CompiledParameter, TypedParameter} import pl.touk.nussknacker.engine.definition.component.ComponentDefinitionWithImplementation import pl.touk.nussknacker.engine.definition.component.dynamic.{ @@ -33,14 +34,13 @@ import pl.touk.nussknacker.engine.definition.globalvariables.ExpressionConfigDef import pl.touk.nussknacker.engine.definition.model.ModelDefinition import pl.touk.nussknacker.engine.expression.parse.{CompiledExpression, TypedExpression, TypedExpressionMap} import pl.touk.nussknacker.engine.graph.evaluatedparam.{BranchParameters, Parameter => NodeParameter} -import pl.touk.nussknacker.engine.graph.expression.NodeExpressionId.branchParameterExpressionId import pl.touk.nussknacker.engine.graph.expression._ +import pl.touk.nussknacker.engine.graph.expression.NodeExpressionId.branchParameterExpressionId import pl.touk.nussknacker.engine.graph.node._ import pl.touk.nussknacker.engine.graph.service.ServiceRef import pl.touk.nussknacker.engine.resultcollector.ResultCollector import pl.touk.nussknacker.engine.spel.SpelExpressionParser import pl.touk.nussknacker.engine.variables.GlobalVariablesPreparer -import pl.touk.nussknacker.engine.{api, compiledgraph} import shapeless.Typeable import shapeless.syntax.typeable._ diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/NodeDataValidator.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/NodeDataValidator.scala index 64ae53b7227..ae7c8bd1401 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/NodeDataValidator.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/NodeDataValidator.scala @@ -1,19 +1,19 @@ package pl.touk.nussknacker.engine.compile.nodecompilation import cats.Applicative -import cats.data.Validated.{invalidNel, valid} import cats.data.{NonEmptyList, Validated} +import cats.data.Validated.{invalidNel, valid} import cats.implicits.catsSyntaxTuple2Semigroupal import pl.touk.nussknacker.engine.ModelData -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.{FragmentOutputNotDefined, UnknownFragmentOutput} +import pl.touk.nussknacker.engine.api.{JobData, NodeId} import pl.touk.nussknacker.engine.api.context.{OutputVar, ProcessCompilationError, ValidationContext} +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.{FragmentOutputNotDefined, UnknownFragmentOutput} import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.process.ComponentUseCase import pl.touk.nussknacker.engine.api.typed.typing.{TypingResult, Unknown} -import pl.touk.nussknacker.engine.api.{JobData, NodeId} +import pl.touk.nussknacker.engine.compile.{ExpressionCompiler, FragmentResolver, IdValidator, Output} import pl.touk.nussknacker.engine.compile.nodecompilation.NodeCompiler.NodeCompilationResult import pl.touk.nussknacker.engine.compile.nodecompilation.NodeDataValidator.OutgoingEdge -import pl.touk.nussknacker.engine.compile.{ExpressionCompiler, FragmentResolver, IdValidator, Output} import pl.touk.nussknacker.engine.definition.fragment.FragmentParametersDefinitionExtractor import pl.touk.nussknacker.engine.expression.parse.TypedValue import pl.touk.nussknacker.engine.graph.EdgeType diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/RecordValidator.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/RecordValidator.scala index d9f3cc517ac..644aa921c5d 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/RecordValidator.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/RecordValidator.scala @@ -1,6 +1,6 @@ package pl.touk.nussknacker.engine.compile.nodecompilation -import cats.data.Validated.{Invalid, Valid, valid} +import cats.data.Validated.{valid, Invalid, Valid} import cats.data.ValidatedNel import cats.implicits.{catsSyntaxTuple2Semigroupal, toFoldableOps} import pl.touk.nussknacker.engine.api.NodeId @@ -8,9 +8,9 @@ import pl.touk.nussknacker.engine.api.context.{PartSubGraphCompilationError, Pro import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomParameterValidationError import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.compile.nodecompilation.BaseComponentValidationHelper.validateVariableValue -import pl.touk.nussknacker.engine.graph.node.{recordKeyFieldName, recordValueFieldName} import pl.touk.nussknacker.engine.compiledgraph.variable.Field import pl.touk.nussknacker.engine.expression.parse.TypedExpression +import pl.touk.nussknacker.engine.graph.node.{recordKeyFieldName, recordValueFieldName} final case class CompiledIndexedRecordField( field: Field, diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/ValueEditorValidator.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/ValueEditorValidator.scala index ab67ed5592b..9bfe71dfd59 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/ValueEditorValidator.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/ValueEditorValidator.scala @@ -1,6 +1,6 @@ package pl.touk.nussknacker.engine.compile.nodecompilation -import cats.data.Validated.{Valid, invalidNel} +import cats.data.Validated.{invalidNel, Valid} import cats.data.ValidatedNel import cats.implicits.toTraverseOps import pl.touk.nussknacker.engine.api.context.PartSubGraphCompilationError diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compiledgraph/service.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compiledgraph/service.scala index 88426cbd9b7..e3207839ae3 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compiledgraph/service.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compiledgraph/service.scala @@ -1,6 +1,7 @@ package pl.touk.nussknacker.engine.compiledgraph import cats.implicits._ +import pl.touk.nussknacker.engine.api.{Context, ContextId, NodeId, ServiceInvoker} import pl.touk.nussknacker.engine.api.process.{ComponentUseCase, ServiceExecutionContext} import pl.touk.nussknacker.engine.api.test.InvocationCollectors.{ CollectableAction, @@ -8,7 +9,6 @@ import pl.touk.nussknacker.engine.api.test.InvocationCollectors.{ ToCollect, TransmissionNames } -import pl.touk.nussknacker.engine.api.{Context, ContextId, NodeId, ServiceInvoker} import pl.touk.nussknacker.engine.resultcollector.ResultCollector import scala.concurrent.{ExecutionContext, Future} diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/action/CommonModelDataInfoProvider.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/action/CommonModelDataInfoProvider.scala index d08b3b215ab..f6375399378 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/action/CommonModelDataInfoProvider.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/action/CommonModelDataInfoProvider.scala @@ -2,14 +2,14 @@ package pl.touk.nussknacker.engine.definition.action import cats.data.ValidatedNel import pl.touk.nussknacker.engine.ModelData +import pl.touk.nussknacker.engine.api.{process, JobData, NodeId} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError import pl.touk.nussknacker.engine.api.process.{ComponentUseCase, Source} -import pl.touk.nussknacker.engine.api.{JobData, NodeId, process} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.compile.ExpressionCompiler import pl.touk.nussknacker.engine.compile.nodecompilation.{LazyParameterCreationStrategy, NodeCompiler} import pl.touk.nussknacker.engine.definition.fragment.FragmentParametersDefinitionExtractor -import pl.touk.nussknacker.engine.graph.node.{SourceNodeData, asFragmentInputDefinition, asSource} +import pl.touk.nussknacker.engine.graph.node.{asFragmentInputDefinition, asSource, SourceNodeData} import pl.touk.nussknacker.engine.resultcollector.ProductionServiceInvocationCollector abstract class CommonModelDataInfoProvider(modelData: ModelData) { diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/action/ModelDataActionInfoProvider.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/action/ModelDataActionInfoProvider.scala index 6ddf56ec9f5..0b413c62475 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/action/ModelDataActionInfoProvider.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/action/ModelDataActionInfoProvider.scala @@ -2,10 +2,10 @@ package pl.touk.nussknacker.engine.definition.action import cats.data.Validated.{Invalid, Valid} import pl.touk.nussknacker.engine.ModelData +import pl.touk.nussknacker.engine.api.{JobData, NodeId, ProcessVersion} import pl.touk.nussknacker.engine.api.component.ParameterConfig import pl.touk.nussknacker.engine.api.deployment.{ScenarioActionName, WithActionParametersSupport} import pl.touk.nussknacker.engine.api.parameter.ParameterName -import pl.touk.nussknacker.engine.api.{JobData, NodeId, ProcessVersion} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.graph.node.SourceNodeData import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/clazz/ClassDefinitionExtractor.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/clazz/ClassDefinitionExtractor.scala index 865134301ee..c0b0323c73c 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/clazz/ClassDefinitionExtractor.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/clazz/ClassDefinitionExtractor.scala @@ -1,24 +1,24 @@ package pl.touk.nussknacker.engine.definition.clazz -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, StateT} +import cats.data.Validated.{Invalid, Valid} import cats.effect.IO import cats.implicits.catsSyntaxSemigroup import com.typesafe.scalalogging.LazyLogging import org.apache.commons.lang3.{ClassUtils, StringUtils} +import pl.touk.nussknacker.engine.api.{Documentation, ParamName} import pl.touk.nussknacker.engine.api.generics.{GenericType, MethodTypeInfo, Parameter, TypingFunction} -import pl.touk.nussknacker.engine.api.process.PropertyFromGetterExtractionStrategy.{ - AddPropertyNextToGetter, - DoNothing, - ReplaceGetterWithProperty -} import pl.touk.nussknacker.engine.api.process.{ ClassExtractionSettings, TypingFunctionForClassMember, VisibleMembersPredicate } +import pl.touk.nussknacker.engine.api.process.PropertyFromGetterExtractionStrategy.{ + AddPropertyNextToGetter, + DoNothing, + ReplaceGetterWithProperty +} import pl.touk.nussknacker.engine.api.typed.typing._ -import pl.touk.nussknacker.engine.api.{Documentation, ParamName} import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionExtractor.{ extractClass, extractGenericReturnType, diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/clazz/MethodDefinition.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/clazz/MethodDefinition.scala index beac88237fb..dc5e834c1ed 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/clazz/MethodDefinition.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/clazz/MethodDefinition.scala @@ -2,13 +2,13 @@ package pl.touk.nussknacker.engine.definition.clazz import cats.data.{NonEmptyList, ValidatedNel} import cats.implicits.catsSyntaxValidatedId -import pl.touk.nussknacker.engine.api.generics.GenericFunctionTypingError.ArgumentTypeError import pl.touk.nussknacker.engine.api.generics.{ ExpressionParseError, GenericFunctionTypingError, MethodTypeInfo, Parameter } +import pl.touk.nussknacker.engine.api.generics.GenericFunctionTypingError.ArgumentTypeError import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypedClass, TypingResult} import pl.touk.nussknacker.engine.spel.SpelExpressionParseErrorConverter diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/ComponentDefinitionExtractor.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/ComponentDefinitionExtractor.scala index 0f7a99a9fed..17814d37d9c 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/ComponentDefinitionExtractor.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/ComponentDefinitionExtractor.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.engine.definition.component import cats.implicits.catsSyntaxSemigroup +import pl.touk.nussknacker.engine.api.{CustomStreamTransformer, MethodToInvoke, Service} import pl.touk.nussknacker.engine.api.component._ import pl.touk.nussknacker.engine.api.context.JoinContextTransformation import pl.touk.nussknacker.engine.api.context.transformation._ import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.{SinkFactory, SourceFactory} import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult} -import pl.touk.nussknacker.engine.api.{CustomStreamTransformer, MethodToInvoke, Service} import pl.touk.nussknacker.engine.definition.component.defaultconfig.DefaultComponentConfigDeterminer import pl.touk.nussknacker.engine.definition.component.dynamic.{ DynamicComponentDefinitionWithImplementation, diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/ComponentDefinitionWithImplementation.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/ComponentDefinitionWithImplementation.scala index 0dbab6e8833..4639b83d2d3 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/ComponentDefinitionWithImplementation.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/ComponentDefinitionWithImplementation.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.definition.component +import pl.touk.nussknacker.engine.api.component._ import pl.touk.nussknacker.engine.api.component.Component._ import pl.touk.nussknacker.engine.api.component.ComponentType.ComponentType -import pl.touk.nussknacker.engine.api.component._ import pl.touk.nussknacker.engine.api.definition.WithExplicitTypesToExtract import pl.touk.nussknacker.engine.api.typed.typing.TypingResult import pl.touk.nussknacker.engine.modelconfig.ComponentsUiConfig diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/DynamicComponentStaticDefinitionDeterminer.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/DynamicComponentStaticDefinitionDeterminer.scala index 29aee4e4acf..e7dc49ee81f 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/DynamicComponentStaticDefinitionDeterminer.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/DynamicComponentStaticDefinitionDeterminer.scala @@ -2,6 +2,7 @@ package pl.touk.nussknacker.engine.definition.component import com.typesafe.scalalogging.LazyLogging import pl.touk.nussknacker.engine.ModelData +import pl.touk.nussknacker.engine.api.{JobData, MetaData, NodeId, ProcessVersion} import pl.touk.nussknacker.engine.api.component.ComponentId import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.context.transformation.{ @@ -13,7 +14,6 @@ import pl.touk.nussknacker.engine.api.context.transformation.{ import pl.touk.nussknacker.engine.api.definition.{OutputVariableNameDependency, Parameter} import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.engine.api.typed.typing.{TypingResult, Unknown} -import pl.touk.nussknacker.engine.api.{JobData, MetaData, NodeId, ProcessVersion} import pl.touk.nussknacker.engine.compile.nodecompilation.DynamicNodeValidator import pl.touk.nussknacker.engine.definition.component.DynamicComponentStaticDefinitionDeterminer.staticReturnType import pl.touk.nussknacker.engine.definition.component.dynamic.DynamicComponentDefinitionWithImplementation diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/bultin/BuiltInComponentsDefinitionsPreparer.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/bultin/BuiltInComponentsDefinitionsPreparer.scala index bc6eb8b9311..8567348556d 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/bultin/BuiltInComponentsDefinitionsPreparer.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/bultin/BuiltInComponentsDefinitionsPreparer.scala @@ -3,14 +3,14 @@ package pl.touk.nussknacker.engine.definition.component.bultin import cats.implicits.catsSyntaxSemigroup import pl.touk.nussknacker.engine.api.component.BuiltInComponentId import pl.touk.nussknacker.engine.api.component.Component.AllowedProcessingModes -import pl.touk.nussknacker.engine.definition.component.defaultconfig.DefaultComponentConfigDeterminer -import pl.touk.nussknacker.engine.definition.component.methodbased.MethodBasedComponentDefinitionWithImplementation import pl.touk.nussknacker.engine.definition.component.{ BuiltInComponentSpecificData, ComponentDefinitionExtractor, ComponentDefinitionWithImplementation, ComponentStaticDefinition } +import pl.touk.nussknacker.engine.definition.component.defaultconfig.DefaultComponentConfigDeterminer +import pl.touk.nussknacker.engine.definition.component.methodbased.MethodBasedComponentDefinitionWithImplementation import pl.touk.nussknacker.engine.modelconfig.ComponentsUiConfig class BuiltInComponentsDefinitionsPreparer(componentsUiConfig: ComponentsUiConfig) { diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/defaultconfig/DefaultComponentConfigDeterminer.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/defaultconfig/DefaultComponentConfigDeterminer.scala index 6bc74b1fe13..b6f858488e3 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/defaultconfig/DefaultComponentConfigDeterminer.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/defaultconfig/DefaultComponentConfigDeterminer.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.definition.component.defaultconfig -import pl.touk.nussknacker.engine.api.component.ComponentType.ComponentType import pl.touk.nussknacker.engine.api.component._ +import pl.touk.nussknacker.engine.api.component.ComponentType.ComponentType import pl.touk.nussknacker.engine.definition.component._ object DefaultComponentConfigDeterminer { diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/defaultconfig/DefaultsComponentIcon.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/defaultconfig/DefaultsComponentIcon.scala index f93bb70ca94..d503979beb4 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/defaultconfig/DefaultsComponentIcon.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/defaultconfig/DefaultsComponentIcon.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.definition.component.defaultconfig -import pl.touk.nussknacker.engine.api.component.ComponentType.ComponentType import pl.touk.nussknacker.engine.api.component.{BuiltInComponentId, ComponentId, ComponentType} +import pl.touk.nussknacker.engine.api.component.ComponentType.ComponentType object DefaultsComponentIcon { // Warning: In case if component's definition is missing for a node, we have implicit contract that these icon url's diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/methodbased/AbstractMethodDefinitionExtractor.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/methodbased/AbstractMethodDefinitionExtractor.scala index 3a39088aff8..ce4ec4b4388 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/methodbased/AbstractMethodDefinitionExtractor.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/methodbased/AbstractMethodDefinitionExtractor.scala @@ -1,11 +1,11 @@ package pl.touk.nussknacker.engine.definition.component.methodbased +import pl.touk.nussknacker.engine.api.{BranchParamName, MethodToInvoke, OutputVariableName, ParamName} import pl.touk.nussknacker.engine.api.component.ParameterConfig import pl.touk.nussknacker.engine.api.context.ContextTransformation import pl.touk.nussknacker.engine.api.definition.{OutputVariableNameDependency, TypedNodeDependency} import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypedClass, TypingResult, Unknown} -import pl.touk.nussknacker.engine.api.{BranchParamName, MethodToInvoke, OutputVariableName, ParamName} import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionExtractor import pl.touk.nussknacker.engine.definition.component.parameter.ParameterExtractor diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/methodbased/CustomStreamTransformerExtractor.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/methodbased/CustomStreamTransformerExtractor.scala index f34bce10b56..beef04b4a2d 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/methodbased/CustomStreamTransformerExtractor.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/methodbased/CustomStreamTransformerExtractor.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.definition.component.methodbased -import pl.touk.nussknacker.engine.api.process.ComponentUseCase import pl.touk.nussknacker.engine.api.{CustomStreamTransformer, MetaData, NodeId} +import pl.touk.nussknacker.engine.api.process.ComponentUseCase object CustomStreamTransformerExtractor extends AbstractMethodDefinitionExtractor[CustomStreamTransformer] { diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/ParameterData.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/ParameterData.scala index 0f26a70b182..c61f1e09cd9 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/ParameterData.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/ParameterData.scala @@ -1,10 +1,9 @@ package pl.touk.nussknacker.engine.definition.component.parameter -import java.lang.annotation.Annotation -import java.lang.reflect.Parameter - import pl.touk.nussknacker.engine.api.typed.typing.TypingResult +import java.lang.annotation.Annotation +import java.lang.reflect.Parameter import scala.reflect.ClassTag //we extract needed data from java.lang.reflect.Parameter to be able to use it e.g. for fragment parameters diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/ParameterExtractor.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/ParameterExtractor.scala index bcf70c51189..83af547052d 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/ParameterExtractor.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/ParameterExtractor.scala @@ -1,6 +1,7 @@ package pl.touk.nussknacker.engine.definition.component.parameter import pl.touk.nussknacker.engine.api +import pl.touk.nussknacker.engine.api.{AdditionalVariables, BranchParamName, LazyParameter, ParamName} import pl.touk.nussknacker.engine.api.component.ParameterConfig import pl.touk.nussknacker.engine.api.definition.{ AdditionalVariable, @@ -10,7 +11,6 @@ import pl.touk.nussknacker.engine.api.definition.{ } import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypedClass, TypingResult} -import pl.touk.nussknacker.engine.api.{AdditionalVariables, BranchParamName, LazyParameter, ParamName} import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionExtractor import pl.touk.nussknacker.engine.definition.component.parameter.defaults.{ DefaultValueDeterminerChain, diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/defaults/EditorPossibleValuesBasedDefaultValueDeterminer.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/defaults/EditorPossibleValuesBasedDefaultValueDeterminer.scala index b1323d78997..cd23dc95c97 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/defaults/EditorPossibleValuesBasedDefaultValueDeterminer.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/defaults/EditorPossibleValuesBasedDefaultValueDeterminer.scala @@ -7,8 +7,8 @@ import pl.touk.nussknacker.engine.api.definition.{ SpelTemplateParameterEditor, TabularTypedDataEditor } -import pl.touk.nussknacker.engine.graph.expression.Expression.Language import pl.touk.nussknacker.engine.graph.expression.{Expression, TabularTypedData} +import pl.touk.nussknacker.engine.graph.expression.Expression.Language protected object EditorPossibleValuesBasedDefaultValueDeterminer extends ParameterDefaultValueDeterminer { diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/defaults/ParameterDefaultValueDeterminer.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/defaults/ParameterDefaultValueDeterminer.scala index 82a8e90649f..3c37340305b 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/defaults/ParameterDefaultValueDeterminer.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/defaults/ParameterDefaultValueDeterminer.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.definition.component.parameter.defaults -import pl.touk.nussknacker.engine.api.definition.ParameterEditor import pl.touk.nussknacker.engine.api.component.ParameterConfig +import pl.touk.nussknacker.engine.api.definition.ParameterEditor import pl.touk.nussknacker.engine.definition.component.parameter.ParameterData import pl.touk.nussknacker.engine.graph.expression.Expression diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/defaults/TypeRelatedParameterValueDeterminer.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/defaults/TypeRelatedParameterValueDeterminer.scala index b5659217553..44224ec1c94 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/defaults/TypeRelatedParameterValueDeterminer.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/defaults/TypeRelatedParameterValueDeterminer.scala @@ -23,8 +23,8 @@ protected object TypeRelatedParameterValueDeterminer extends ParameterDefaultVal ): Option[Expression] = { // TODO: use classes instead of class names Option(className).map(_.getName).collect { - case "long" | "short" | "int" | "java.lang.Number" | "java.lang.Long" | - "java.lang.Short" | "java.lang.Integer" | "java.math.BigInteger" => + case "long" | "short" | "int" | "java.lang.Number" | "java.lang.Long" | "java.lang.Short" | "java.lang.Integer" | + "java.math.BigInteger" => Expression.spel("0") case "float" | "double" | "java.math.BigDecimal" | "java.lang.Float" | "java.lang.Double" => Expression.spel("0.0") diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/editor/ParameterTypeEditorDeterminer.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/editor/ParameterTypeEditorDeterminer.scala index 3c34a674da4..856ca252191 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/editor/ParameterTypeEditorDeterminer.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/editor/ParameterTypeEditorDeterminer.scala @@ -1,10 +1,11 @@ package pl.touk.nussknacker.engine.definition.component.parameter.editor -import java.time.temporal.ChronoUnit import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.editor.DualEditorMode import pl.touk.nussknacker.engine.api.typed.typing.{SingleTypingResult, TypingResult} +import java.time.temporal.ChronoUnit + class ParameterTypeEditorDeterminer(val typ: TypingResult) extends ParameterEditorDeterminer { override def determine(): Option[ParameterEditor] = { diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/AnnotationValidatorExtractor.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/AnnotationValidatorExtractor.scala index dcb9efc24e9..f6adb182dd8 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/AnnotationValidatorExtractor.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/AnnotationValidatorExtractor.scala @@ -1,9 +1,8 @@ package pl.touk.nussknacker.engine.definition.component.parameter.validator -import java.lang.annotation.Annotation - import pl.touk.nussknacker.engine.api.definition.ParameterValidator +import java.lang.annotation.Annotation import scala.reflect.ClassTag class AnnotationValidatorExtractor[T <: Annotation: ClassTag](parameterValidatorProvider: T => ParameterValidator) diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/MandatoryValidatorExtractor.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/MandatoryValidatorExtractor.scala index b1f39fe5e25..b2fbd2e927c 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/MandatoryValidatorExtractor.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/MandatoryValidatorExtractor.scala @@ -1,8 +1,9 @@ package pl.touk.nussknacker.engine.definition.component.parameter.validator -import javax.annotation.Nullable import pl.touk.nussknacker.engine.api.definition.{MandatoryParameterValidator, ParameterValidator} +import javax.annotation.Nullable + object MandatoryValidatorExtractor extends ValidatorExtractor { override def extract(params: ValidatorExtractorParameters): Option[ParameterValidator] = { diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidationExpressionParameterValidator.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidationExpressionParameterValidator.scala index 8828af73295..4f09ad4cbd5 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidationExpressionParameterValidator.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidationExpressionParameterValidator.scala @@ -2,11 +2,11 @@ package pl.touk.nussknacker.engine.definition.component.parameter.validator import cats.data.Validated import cats.data.Validated.{invalid, valid} +import pl.touk.nussknacker.engine.api.{Context, CustomMetaData, JobData, MetaData, NodeId} import pl.touk.nussknacker.engine.api.context.PartSubGraphCompilationError import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.definition.{CompileTimeEvaluableValueValidator, Validator} import pl.touk.nussknacker.engine.api.parameter.ParameterName -import pl.touk.nussknacker.engine.api.{Context, CustomMetaData, JobData, MetaData, NodeId} import pl.touk.nussknacker.engine.definition.component.parameter.validator.ValidationExpressionParameterValidator.variableName import pl.touk.nussknacker.engine.expression.ExpressionEvaluator import pl.touk.nussknacker.engine.expression.parse.CompiledExpression diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidatorExtractor.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidatorExtractor.scala index 0f6042592d0..4d073816d9c 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidatorExtractor.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidatorExtractor.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.definition.component.parameter.validator -import pl.touk.nussknacker.engine.api.definition.{ParameterEditor, ParameterValidator} import pl.touk.nussknacker.engine.api.component.ParameterConfig +import pl.touk.nussknacker.engine.api.definition.{ParameterEditor, ParameterValidator} import pl.touk.nussknacker.engine.definition.component.parameter.ParameterData trait ValidatorExtractor { diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidatorsExtractor.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidatorsExtractor.scala index 2849eec9935..2daf392bd54 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidatorsExtractor.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidatorsExtractor.scala @@ -1,8 +1,6 @@ package pl.touk.nussknacker.engine.definition.component.parameter.validator import pl.touk.nussknacker.engine.api.definition - -import javax.validation.constraints.{Max, Min, NotBlank} import pl.touk.nussknacker.engine.api.definition.{ MaximalNumberValidator, MinimalNumberValidator, @@ -11,6 +9,8 @@ import pl.touk.nussknacker.engine.api.definition.{ } import pl.touk.nussknacker.engine.api.validation.JsonValidator +import javax.validation.constraints.{Max, Min, NotBlank} + object ValidatorsExtractor { def extract(params: ValidatorExtractorParameters): List[ParameterValidator] = { diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/fragment/FragmentComponentDefinition.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/fragment/FragmentComponentDefinition.scala index c9d720ae84b..0833415b2c4 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/fragment/FragmentComponentDefinition.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/fragment/FragmentComponentDefinition.scala @@ -1,18 +1,18 @@ package pl.touk.nussknacker.engine.definition.fragment -import pl.touk.nussknacker.engine.api.component.Component.AllowedProcessingModes import pl.touk.nussknacker.engine.api.component.{ComponentGroupName, DesignerWideComponentId} +import pl.touk.nussknacker.engine.api.component.Component.AllowedProcessingModes import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.typed.typing.{Typed, Unknown} -import pl.touk.nussknacker.engine.definition.component.defaultconfig.DefaultComponentConfigDeterminer -import pl.touk.nussknacker.engine.definition.component.methodbased.MethodBasedComponentDefinitionWithImplementation -import pl.touk.nussknacker.engine.definition.component.methodbased.MethodBasedComponentDefinitionWithImplementation.FakeComponentWithAllowedProcessingModesSpecified import pl.touk.nussknacker.engine.definition.component.{ ComponentDefinitionWithImplementation, ComponentImplementationInvoker, ComponentStaticDefinition, FragmentSpecificData } +import pl.touk.nussknacker.engine.definition.component.defaultconfig.DefaultComponentConfigDeterminer +import pl.touk.nussknacker.engine.definition.component.methodbased.MethodBasedComponentDefinitionWithImplementation +import pl.touk.nussknacker.engine.definition.component.methodbased.MethodBasedComponentDefinitionWithImplementation.FakeComponentWithAllowedProcessingModesSpecified object FragmentComponentDefinition { diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/fragment/FragmentComponentDefinitionExtractor.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/fragment/FragmentComponentDefinitionExtractor.scala index 983017f34df..c9fa4146568 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/fragment/FragmentComponentDefinitionExtractor.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/fragment/FragmentComponentDefinitionExtractor.scala @@ -1,14 +1,14 @@ package pl.touk.nussknacker.engine.definition.fragment import cats.data.Validated -import pl.touk.nussknacker.engine.api.component.Component.AllowedProcessingModes +import pl.touk.nussknacker.engine.api.{FragmentSpecificData, NodeId} import pl.touk.nussknacker.engine.api.component.{ ComponentGroupName, ComponentId, ComponentType, DesignerWideComponentId } -import pl.touk.nussknacker.engine.api.{FragmentSpecificData, NodeId} +import pl.touk.nussknacker.engine.api.component.Component.AllowedProcessingModes import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionSet import pl.touk.nussknacker.engine.definition.component.{ diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/fragment/FragmentGraphDefinition.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/fragment/FragmentGraphDefinition.scala index 3e484ea63de..602513dc395 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/fragment/FragmentGraphDefinition.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/fragment/FragmentGraphDefinition.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.definition.fragment -import cats.data.Validated.{invalid, valid} import cats.data.{NonEmptyList, ValidatedNel} +import cats.data.Validated.{invalid, valid} import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.context.ProcessCompilationError import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.DuplicateFragmentOutputNamesInScenario diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/fragment/FragmentParametersDefinitionExtractor.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/fragment/FragmentParametersDefinitionExtractor.scala index 7e6ec407cfc..62f950a4034 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/fragment/FragmentParametersDefinitionExtractor.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/fragment/FragmentParametersDefinitionExtractor.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.definition.fragment import cats.Id -import cats.data.Validated.{Invalid, Valid} import cats.data.{Writer, WriterT} +import cats.data.Validated.{Invalid, Valid} import cats.implicits.{catsKernelStdMonoidForList, toTraverseOps} import cats.instances.list._ import org.apache.commons.lang3.ClassUtils @@ -27,8 +27,8 @@ import pl.touk.nussknacker.engine.definition.component.parameter.validator.{ } import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.graph.expression.Expression.Language -import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.FragmentParameter import pl.touk.nussknacker.engine.graph.node.{FragmentInput, FragmentInputDefinition} +import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.FragmentParameter import scala.util.Try diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/globalvariables/ExpressionConfigDefinition.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/globalvariables/ExpressionConfigDefinition.scala index 5f4d1664fc9..d8e9ba658f0 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/globalvariables/ExpressionConfigDefinition.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/globalvariables/ExpressionConfigDefinition.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.definition.globalvariables -import pl.touk.nussknacker.engine.api.dict.DictDefinition import pl.touk.nussknacker.engine.api.{ConversionsProvider, SpelExpressionExcludeList} +import pl.touk.nussknacker.engine.api.dict.DictDefinition // TODO: We should get rid of this. Most of these fields should be parsed from configuration instead of keeping in code // globalVariables and dictionaries should be moved into dedicated services loaded by ServiceLoader diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/model/ModelDefinitionFromConfigCreatorExtractor.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/model/ModelDefinitionFromConfigCreatorExtractor.scala index 525c1d2fb11..301650d03e5 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/model/ModelDefinitionFromConfigCreatorExtractor.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/model/ModelDefinitionFromConfigCreatorExtractor.scala @@ -12,12 +12,12 @@ import pl.touk.nussknacker.engine.api.process.{ ProcessObjectDependencies, WithCategories } -import pl.touk.nussknacker.engine.definition.component.Components.ComponentDefinitionExtractionMode import pl.touk.nussknacker.engine.definition.component.{ ComponentDefinitionExtractor, ComponentDefinitionWithImplementation, Components } +import pl.touk.nussknacker.engine.definition.component.Components.ComponentDefinitionExtractionMode import pl.touk.nussknacker.engine.definition.globalvariables.{ ExpressionConfigDefinition, GlobalVariableDefinitionWithImplementation diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/test/ModelDataTestInfoProvider.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/test/ModelDataTestInfoProvider.scala index 93231df9e42..5291d6a34f5 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/test/ModelDataTestInfoProvider.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/test/ModelDataTestInfoProvider.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.engine.definition.test -import cats.data.Validated.{Invalid, Valid} import cats.data.NonEmptyList +import cats.data.Validated.{Invalid, Valid} import com.typesafe.scalalogging.LazyLogging import pl.touk.nussknacker.engine.ModelData +import pl.touk.nussknacker.engine.api.{JobData, MetaData, NodeId, ProcessVersion} import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.api.test.{ScenarioTestData, ScenarioTestJsonRecord} -import pl.touk.nussknacker.engine.api.{JobData, MetaData, NodeId, ProcessVersion} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.definition.action.CommonModelDataInfoProvider import pl.touk.nussknacker.engine.definition.test.TestInfoProvider.{ diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/test/TestInfoProvider.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/test/TestInfoProvider.scala index 59f5a117ec2..8776108005e 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/test/TestInfoProvider.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/definition/test/TestInfoProvider.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.engine.definition.test +import pl.touk.nussknacker.engine.api.{MetaData, ProcessVersion} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.test.ScenarioTestData -import pl.touk.nussknacker.engine.api.{MetaData, ProcessVersion} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.definition.test.TestInfoProvider.{ ScenarioTestDataGenerationError, diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/dict/ProcessDictSubstitutor.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/dict/ProcessDictSubstitutor.scala index fece4b1d023..d2a7737e77a 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/dict/ProcessDictSubstitutor.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/dict/ProcessDictSubstitutor.scala @@ -17,13 +17,13 @@ import pl.touk.nussknacker.engine.language.dictWithLabel.{ DictKeyWithLabelExpressionTypingInfo } import pl.touk.nussknacker.engine.spel.SpelExpressionTypingInfo -import pl.touk.nussknacker.engine.spel.ast.SpelAst.SpelNodeId import pl.touk.nussknacker.engine.spel.ast.{ OptionallyTypedNode, ReplacingStrategy, SpelSubstitutionsCollector, TypedTreeLevel } +import pl.touk.nussknacker.engine.spel.ast.SpelAst.SpelNodeId class ProcessDictSubstitutor( dictRegistry: DictRegistry, diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/dict/SimpleDictRegistry.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/dict/SimpleDictRegistry.scala index d72f187f369..3dcaa47c224 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/dict/SimpleDictRegistry.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/dict/SimpleDictRegistry.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.dict import cats.data.Validated import com.typesafe.config.Config -import pl.touk.nussknacker.engine.api.dict.DictRegistry.DictEntryWithKeyNotExists import pl.touk.nussknacker.engine.api.dict._ +import pl.touk.nussknacker.engine.api.dict.DictRegistry.DictEntryWithKeyNotExists import pl.touk.nussknacker.engine.api.dict.embedded.{EmbeddedDictQueryService, EmbeddedDictRegistry} import scala.concurrent.{ExecutionContext, Future} diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/expression/ExpressionEvaluator.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/expression/ExpressionEvaluator.scala index 6db0ee2892b..0e1b2aab705 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/expression/ExpressionEvaluator.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/expression/ExpressionEvaluator.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.expression -import pl.touk.nussknacker.engine.api.typed.CustomNodeValidationException import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.parameter.ParameterName +import pl.touk.nussknacker.engine.api.typed.CustomNodeValidationException import pl.touk.nussknacker.engine.compiledgraph.{BaseCompiledParameter, CompiledParameter} import pl.touk.nussknacker.engine.expression.parse.CompiledExpression import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/expression/NullExpression.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/expression/NullExpression.scala index d40f333e3dd..bbcb1a815d4 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/expression/NullExpression.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/expression/NullExpression.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.expression import pl.touk.nussknacker.engine.api.Context -import pl.touk.nussknacker.engine.graph.expression.Expression.Language import pl.touk.nussknacker.engine.expression.parse.CompiledExpression +import pl.touk.nussknacker.engine.graph.expression.Expression.Language import pl.touk.nussknacker.engine.spel.SpelExpressionParser.Flavour case class NullExpression(original: String, flavour: Flavour) extends CompiledExpression { diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/extension/CastOrConversionExt.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/extension/CastOrConversionExt.scala index 8d7c06cf905..fc9b141bca5 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/extension/CastOrConversionExt.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/extension/CastOrConversionExt.scala @@ -17,12 +17,12 @@ import pl.touk.nussknacker.engine.extension.CastOrConversionExt.{ } import pl.touk.nussknacker.engine.extension.ExtensionMethod.SingleArg import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap -import pl.touk.nussknacker.engine.util.classes.Extensions.{ClassExtensions, ClassesExtensions} +import pl.touk.nussknacker.engine.util.classes.Extensions.{ClassesExtensions, ClassExtensions} import java.lang.{Boolean => JBoolean} import java.nio.charset.Charset -import java.time.chrono.{ChronoLocalDate, ChronoLocalDateTime} import java.time.{LocalDate, LocalDateTime, LocalTime, ZoneId, ZoneOffset} +import java.time.chrono.{ChronoLocalDate, ChronoLocalDateTime} import java.util.{Currency, UUID} import scala.util.Try diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/extension/Conversion.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/extension/Conversion.scala index 5fa326215bf..e87d76b1e12 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/extension/Conversion.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/extension/Conversion.scala @@ -19,7 +19,7 @@ import java.lang.{ Short => JShort } import java.math.{BigDecimal => JBigDecimal, BigInteger => JBigInteger} -import scala.reflect.{ClassTag, classTag} +import scala.reflect.{classTag, ClassTag} import scala.util.{Success, Try} abstract class Conversion[T >: Null <: AnyRef: ClassTag] { diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/extension/ExtensionMethods.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/extension/ExtensionMethods.scala index 4b71d05b6fb..6e43a021eb6 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/extension/ExtensionMethods.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/extension/ExtensionMethods.scala @@ -7,7 +7,7 @@ import pl.touk.nussknacker.engine.extension.ExtensionMethods.extensionMethodsDef import java.util import scala.collection.concurrent.TrieMap -import scala.reflect.{ClassTag, classTag} +import scala.reflect.{classTag, ClassTag} class ExtensionMethodResolver(classDefinitionSet: ClassDefinitionSet) extends MethodResolver { private val executorsCache = new TrieMap[(String, Class[_]), Option[MethodExecutor]]() diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/language/dictWithLabel/DictKeyWithLabelExpressionParser.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/language/dictWithLabel/DictKeyWithLabelExpressionParser.scala index 078bc7e5ba7..f11b969cc53 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/language/dictWithLabel/DictKeyWithLabelExpressionParser.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/language/dictWithLabel/DictKeyWithLabelExpressionParser.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.language.dictWithLabel -import cats.data.Validated.{Valid, invalidNel} import cats.data.{NonEmptyList, Validated} +import cats.data.Validated.{invalidNel, Valid} import io.circe.parser import pl.touk.nussknacker.engine.api.Context import pl.touk.nussknacker.engine.api.context.ValidationContext @@ -12,8 +12,8 @@ import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypedClass, TypedObjectWithValue, TypingResult} import pl.touk.nussknacker.engine.expression.NullExpression import pl.touk.nussknacker.engine.expression.parse.{CompiledExpression, ExpressionParser, TypedExpression} -import pl.touk.nussknacker.engine.graph.expression.Expression.Language import pl.touk.nussknacker.engine.graph.expression.{DictKeyWithLabelExpression, Expression} +import pl.touk.nussknacker.engine.graph.expression.Expression.Language import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.KeyWithLabelExpressionParsingError import pl.touk.nussknacker.engine.spel.SpelExpressionParser diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/resultcollector/ResultCollector.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/resultcollector/ResultCollector.scala index 63a454d4613..580710816d2 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/resultcollector/ResultCollector.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/resultcollector/ResultCollector.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.engine.resultcollector import cats.Monad import cats.implicits._ import pl.touk.nussknacker.engine.api.ContextId -import pl.touk.nussknacker.engine.api.test.InvocationCollectors.{CollectableAction, ToCollect, TransmissionNames} import pl.touk.nussknacker.engine.api.NodeId +import pl.touk.nussknacker.engine.api.test.InvocationCollectors.{CollectableAction, ToCollect, TransmissionNames} import scala.language.higherKinds diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/SpelExpression.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/SpelExpression.scala index 72e0fe4b912..06cf466cb95 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/SpelExpression.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/SpelExpression.scala @@ -1,18 +1,19 @@ package pl.touk.nussknacker.engine.spel -import cats.data.Validated.Valid import cats.data.{NonEmptyList, Validated, ValidatedNel} +import cats.data.Validated.Valid import com.typesafe.scalalogging.LazyLogging import org.apache.commons.lang3.StringUtils import org.springframework.expression._ import org.springframework.expression.common.{CompositeStringExpression, LiteralExpression} -import org.springframework.expression.spel.ast.SpelNodeImpl import org.springframework.expression.spel.{ + standard, SpelCompilerMode, SpelEvaluationException, - SpelParserConfiguration, - standard + SpelParserConfiguration } +import org.springframework.expression.spel.ast.SpelNodeImpl +import pl.touk.nussknacker.engine.api.{Context, TemplateEvaluationResult, TemplateRenderedPart} import pl.touk.nussknacker.engine.api.TemplateRenderedPart.{RenderedLiteral, RenderedSubExpression} import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.dict.DictRegistry @@ -20,14 +21,13 @@ import pl.touk.nussknacker.engine.api.exception.NonTransientException import pl.touk.nussknacker.engine.api.generics.ExpressionParseError import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.{SingleTypingResult, TypingResult} -import pl.touk.nussknacker.engine.api.{Context, TemplateEvaluationResult, TemplateRenderedPart} import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionSet import pl.touk.nussknacker.engine.definition.globalvariables.ExpressionConfigDefinition import pl.touk.nussknacker.engine.dict.{KeysDictTyper, LabelsDictTyper} import pl.touk.nussknacker.engine.expression.NullExpression import pl.touk.nussknacker.engine.expression.parse.{CompiledExpression, ExpressionParser, TypedExpression} -import pl.touk.nussknacker.engine.graph.expression.Expression.Language import pl.touk.nussknacker.engine.graph.expression.{Expression => GraphExpression} +import pl.touk.nussknacker.engine.graph.expression.Expression.Language import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.ExpressionCompilationError import pl.touk.nussknacker.engine.spel.SpelExpressionParser.Flavour import pl.touk.nussknacker.engine.spel.internal.EvaluationContextPreparer diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/SpelExpressionSuggester.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/SpelExpressionSuggester.scala index 191cb8300d0..70e3636262e 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/SpelExpressionSuggester.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/SpelExpressionSuggester.scala @@ -1,11 +1,12 @@ package pl.touk.nussknacker.engine.spel +import cats.implicits._ import com.typesafe.scalalogging.LazyLogging import io.circe.generic.JsonCodec import org.springframework.expression.common.TemplateParserContext +import org.springframework.expression.spel.{SpelNode, SpelParserConfiguration} import org.springframework.expression.spel.ast._ import org.springframework.expression.spel.standard.{SpelExpression => SpringSpelExpression} -import org.springframework.expression.spel.{SpelNode, SpelParserConfiguration} import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.dict.UiDictServices import pl.touk.nussknacker.engine.api.typed.typing._ @@ -20,12 +21,10 @@ import pl.touk.nussknacker.engine.spel.Typer.TypingResultWithContext import pl.touk.nussknacker.engine.spel.ast.SpelAst.SpelNodeId import pl.touk.nussknacker.engine.spel.parser.NuTemplateAwareExpressionParser import pl.touk.nussknacker.engine.util.CaretPosition2d - -import scala.collection.compat.immutable.LazyList -import cats.implicits._ import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap -import pl.touk.nussknacker.engine.util.classes.Extensions.{ClassExtensions, ClassesExtensions} +import pl.touk.nussknacker.engine.util.classes.Extensions.{ClassesExtensions, ClassExtensions} +import scala.collection.compat.immutable.LazyList import scala.concurrent.{ExecutionContext, Future} import scala.util.{Failure, Try} diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/SpelExpressionValidator.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/SpelExpressionValidator.scala index 07367413d76..3e6ecbce382 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/SpelExpressionValidator.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/SpelExpressionValidator.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.spel -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, Validated} +import cats.data.Validated.{Invalid, Valid} import org.springframework.expression.Expression import pl.touk.nussknacker.engine.api.TemplateEvaluationResult import pl.touk.nussknacker.engine.api.context.ValidationContext diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/Typer.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/Typer.scala index a1f147bd0db..3bb3c60997f 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/Typer.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/Typer.scala @@ -1,37 +1,37 @@ package pl.touk.nussknacker.engine.spel -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, Validated, ValidatedNel, Writer} +import cats.data.Validated.{Invalid, Valid} import cats.instances.list._ import cats.instances.map._ import cats.kernel.{Monoid, Semigroup} import cats.syntax.traverse._ import com.typesafe.scalalogging.LazyLogging +import org.springframework.expression.{EvaluationContext, Expression} import org.springframework.expression.common.{CompositeStringExpression, LiteralExpression} +import org.springframework.expression.spel.{standard, SpelNode} import org.springframework.expression.spel.ast._ -import org.springframework.expression.spel.{SpelNode, standard} -import org.springframework.expression.{EvaluationContext, Expression} import pl.touk.nussknacker.engine.api.Context import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.expression._ import pl.touk.nussknacker.engine.api.generics.ExpressionParseError import pl.touk.nussknacker.engine.api.typed.supertype.{CommonSupertypeFinder, NumberTypesPromotionStrategy} -import pl.touk.nussknacker.engine.api.typed.typing.Typed.typedListWithElementValues import pl.touk.nussknacker.engine.api.typed.typing._ +import pl.touk.nussknacker.engine.api.typed.typing.Typed.typedListWithElementValues import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionSet import pl.touk.nussknacker.engine.definition.globalvariables.ExpressionConfigDefinition import pl.touk.nussknacker.engine.dict.SpelDictTyper import pl.touk.nussknacker.engine.expression.NullExpression +import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.{ArgumentTypeError, PartTypeError} import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.IllegalOperationError._ import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.MissingObjectError.{ ConstructionOfUnknown, + NonReferenceError, NoPropertyError, NoPropertyTypeError, - NonReferenceError, UnresolvedReferenceError } import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.OperatorError._ -import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.{ArgumentTypeError, PartTypeError} import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.SelectionProjectionError.{ IllegalProjectionError, IllegalSelectionError, @@ -54,8 +54,8 @@ import pl.touk.nussknacker.engine.spel.internal.EvaluationContextPreparer import pl.touk.nussknacker.engine.spel.typer.{MapLikePropertyTyper, MethodReferenceTyper, TypeReferenceTyper} import pl.touk.nussknacker.engine.util.MathUtils -import scala.jdk.CollectionConverters._ import scala.annotation.tailrec +import scala.jdk.CollectionConverters._ import scala.reflect.runtime._ import scala.util.{Failure, Success, Try} diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/internal/DefaultSpelConversionsProvider.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/internal/DefaultSpelConversionsProvider.scala index 119d1acb935..412c72eb368 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/internal/DefaultSpelConversionsProvider.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/internal/DefaultSpelConversionsProvider.scala @@ -5,7 +5,7 @@ import org.springframework.core.convert.converter.{ConditionalConverter, Convert import org.springframework.core.convert.support.GenericConversionService import org.springframework.util.NumberUtils import pl.touk.nussknacker.engine.api.spel.SpelConversionsProvider -import pl.touk.nussknacker.engine.api.typed.TypeConversionHandler.{StringConversion, stringConversions} +import pl.touk.nussknacker.engine.api.typed.TypeConversionHandler.{stringConversions, StringConversion} /** * This class creates SpEL's ConversionService. We don't use DefaultConversionService because it has some conversions diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/internal/OptimizedEvaluationContext.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/internal/OptimizedEvaluationContext.scala index 6ee07a817ef..b112f5723ac 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/internal/OptimizedEvaluationContext.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/internal/OptimizedEvaluationContext.scala @@ -1,15 +1,15 @@ package pl.touk.nussknacker.engine.spel.internal import org.springframework.core.convert.{ConversionService, TypeDescriptor} -import org.springframework.expression.spel.support._ import org.springframework.expression.{EvaluationContext, MethodExecutor, MethodResolver, PropertyAccessor} -import pl.touk.nussknacker.engine.api.spel.SpelConversionsProvider +import org.springframework.expression.spel.support._ import pl.touk.nussknacker.engine.api.{Context, SpelExpressionExcludeList} +import pl.touk.nussknacker.engine.api.spel.SpelConversionsProvider import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionSet import pl.touk.nussknacker.engine.definition.globalvariables.ExpressionConfigDefinition import pl.touk.nussknacker.engine.extension.ExtensionMethodResolver +import pl.touk.nussknacker.engine.spel.{internal, NuReflectiveMethodExecutor} import pl.touk.nussknacker.engine.spel.internal.propertyAccessors.MethodAccessChecker -import pl.touk.nussknacker.engine.spel.{NuReflectiveMethodExecutor, internal} import java.util import java.util.Collections diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/internal/propertyAccessors.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/internal/propertyAccessors.scala index d7726bfc3a2..52cd5bd14e3 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/internal/propertyAccessors.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/internal/propertyAccessors.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.spel.internal -import org.springframework.expression.spel.support.ReflectivePropertyAccessor import org.springframework.expression.{AccessException, EvaluationContext, PropertyAccessor, TypedValue} +import org.springframework.expression.spel.support.ReflectivePropertyAccessor import org.springframework.util.ClassUtils import pl.touk.nussknacker.engine.api.dict.DictInstance import pl.touk.nussknacker.engine.api.exception.NonTransientException diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/typer/MapLikePropertyTyper.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/typer/MapLikePropertyTyper.scala index 9b1931c1986..08f6a6f9384 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/typer/MapLikePropertyTyper.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/typer/MapLikePropertyTyper.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.engine.spel.typer -import java.util - import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypedClass, TypingResult, Unknown} +import java.util + /** * This class determine type of values for classes which behave like a maps - basically implementing Maps or having get(key) method. * We want to be able to know type of their field diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/typer/MethodReferenceTyper.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/typer/MethodReferenceTyper.scala index 08cb6e00379..4e94a817098 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/typer/MethodReferenceTyper.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/typer/MethodReferenceTyper.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.engine.spel.typer -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, ValidatedNel} +import cats.data.Validated.{Invalid, Valid} import pl.touk.nussknacker.engine.api.generics.ExpressionParseError import pl.touk.nussknacker.engine.api.typed.typing._ import pl.touk.nussknacker.engine.definition.clazz.{ClassDefinition, ClassDefinitionSet, MethodDefinition} +import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.{ArgumentTypeError, OverloadedFunctionError} import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.IllegalOperationError.IllegalInvocationError import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.MissingObjectError.UnknownMethodError -import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.{ArgumentTypeError, OverloadedFunctionError} class MethodReferenceTyper(classDefinitionSet: ClassDefinitionSet, methodExecutionForUnknownAllowed: Boolean) { diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/typer/TypeReferenceTyper.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/typer/TypeReferenceTyper.scala index e8806d38cc6..9681c2cbf72 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/typer/TypeReferenceTyper.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/typer/TypeReferenceTyper.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.engine.spel.typer import cats.data.Writer +import org.springframework.expression.{EvaluationContext, EvaluationException} import org.springframework.expression.spel.ExpressionState import org.springframework.expression.spel.ast.TypeReference -import org.springframework.expression.{EvaluationContext, EvaluationException} import pl.touk.nussknacker.engine.api.generics.ExpressionParseError import pl.touk.nussknacker.engine.api.typed.typing.{TypingResult, Unknown} import pl.touk.nussknacker.engine.definition.clazz.{ClassDefinition, ClassDefinitionSet} diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/testing/ModelDefinitionBuilder.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/testing/ModelDefinitionBuilder.scala index c3a2d3fd151..defe99bc93c 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/testing/ModelDefinitionBuilder.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/testing/ModelDefinitionBuilder.scala @@ -1,19 +1,19 @@ package pl.touk.nussknacker.engine.testing import pl.touk.nussknacker.engine.api.SpelExpressionExcludeList -import pl.touk.nussknacker.engine.api.component.Component.AllowedProcessingModes import pl.touk.nussknacker.engine.api.component.{ ComponentGroupName, ComponentId, DesignerWideComponentId, ProcessingMode } +import pl.touk.nussknacker.engine.api.component.Component.AllowedProcessingModes import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.process.ClassExtractionSettings import pl.touk.nussknacker.engine.api.process.ExpressionConfig._ import pl.touk.nussknacker.engine.api.typed.typing.{TypingResult, Unknown} -import pl.touk.nussknacker.engine.definition.component.Components.ComponentDefinitionExtractionMode import pl.touk.nussknacker.engine.definition.component._ +import pl.touk.nussknacker.engine.definition.component.Components.ComponentDefinitionExtractionMode import pl.touk.nussknacker.engine.definition.component.defaultconfig.DefaultComponentConfigDeterminer import pl.touk.nussknacker.engine.definition.component.methodbased.MethodBasedComponentDefinitionWithImplementation import pl.touk.nussknacker.engine.definition.globalvariables.{ diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/testmode/ResultsCollectingListener.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/testmode/ResultsCollectingListener.scala index 6321089bf03..cc5dd50c3aa 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/testmode/ResultsCollectingListener.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/testmode/ResultsCollectingListener.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.testmode -import cats.effect.unsafe.implicits.global import cats.effect.{IO, Resource} +import cats.effect.unsafe.implicits.global import io.circe.Json import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.exception.NuExceptionInfo diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/testmode/TestDataPreparer.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/testmode/TestDataPreparer.scala index 2d25f651d91..2ae3d211757 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/testmode/TestDataPreparer.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/testmode/TestDataPreparer.scala @@ -4,13 +4,13 @@ import cats.data.Validated.{Invalid, Valid} import cats.data.ValidatedNel import cats.implicits._ import pl.touk.nussknacker.engine.ModelData +import pl.touk.nussknacker.engine.api.{Context, JobData, NodeId} import pl.touk.nussknacker.engine.api.context.PartSubGraphCompilationError import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.UnknownProperty import pl.touk.nussknacker.engine.api.definition.Parameter import pl.touk.nussknacker.engine.api.dict.EngineDictRegistry import pl.touk.nussknacker.engine.api.process.{Source, SourceTestSupport, TestWithParametersSupport} import pl.touk.nussknacker.engine.api.test.{ScenarioTestJsonRecord, ScenarioTestParametersRecord, ScenarioTestRecord} -import pl.touk.nussknacker.engine.api.{Context, JobData, NodeId} import pl.touk.nussknacker.engine.compile.ExpressionCompiler import pl.touk.nussknacker.engine.compiledgraph.CompiledParameter import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionSet diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/testmode/TestServiceInvocationCollector.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/testmode/TestServiceInvocationCollector.scala index 64b89c0efab..7d4b4abc763 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/testmode/TestServiceInvocationCollector.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/testmode/TestServiceInvocationCollector.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.testmode import cats.Monad import cats.implicits._ -import pl.touk.nussknacker.engine.api.test.InvocationCollectors.{CollectableAction, ToCollect, TransmissionNames} import pl.touk.nussknacker.engine.api.{Context, ContextId, NodeId} +import pl.touk.nussknacker.engine.api.test.InvocationCollectors.{CollectableAction, ToCollect, TransmissionNames} import pl.touk.nussknacker.engine.resultcollector.ResultCollector import scala.language.higherKinds diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/variables/GlobalVariablesPreparer.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/variables/GlobalVariablesPreparer.scala index 1317cfd715c..205238f84d8 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/variables/GlobalVariablesPreparer.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/variables/GlobalVariablesPreparer.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.engine.variables +import pl.touk.nussknacker.engine.api.{JobData, MetaData, VariableConstants} import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.typed.TypedGlobalVariable import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.api.{JobData, MetaData, VariableConstants} import pl.touk.nussknacker.engine.definition.component.dynamic.DynamicComponentDefinitionWithImplementation import pl.touk.nussknacker.engine.definition.component.methodbased.MethodBasedComponentDefinitionWithImplementation import pl.touk.nussknacker.engine.definition.globalvariables.{ diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/variables/MetaVariables.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/variables/MetaVariables.scala index a2cede66c3d..55e8b8822c4 100644 --- a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/variables/MetaVariables.scala +++ b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/variables/MetaVariables.scala @@ -1,9 +1,10 @@ package pl.touk.nussknacker.engine.variables +import pl.touk.nussknacker.engine.api.{Hidden, JobData, MetaData} import pl.touk.nussknacker.engine.api.typed.TypedMap import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypedObjectTypingResult, TypingResult} -import pl.touk.nussknacker.engine.api.{Hidden, JobData, MetaData} import pl.touk.nussknacker.engine.definition.globalvariables.ObjectWithType + import scala.jdk.CollectionConverters._ final case class MetaVariables(processName: String, scenarioLabels: java.util.List[String], properties: TypedMap) diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/InterpreterSpec.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/InterpreterSpec.scala index b41507da7d5..d149b142706 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/InterpreterSpec.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/InterpreterSpec.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, ValidatedNel} +import cats.data.Validated.{Invalid, Valid} import cats.effect.IO import cats.effect.unsafe.IORuntime import org.scalatest.funsuite.AnyFunSuite @@ -12,6 +12,7 @@ import org.springframework.expression.spel.standard.SpelExpression import pl.touk.nussknacker.engine.InterpreterSpec._ import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.component.{ComponentDefinition, DesignerWideComponentId, UnboundedStreamComponent} +import pl.touk.nussknacker.engine.api.context.{ContextTransformation, ProcessCompilationError, ValidationContext} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.InvalidFragment import pl.touk.nussknacker.engine.api.context.transformation.{ DefinedEagerParameter, @@ -19,7 +20,6 @@ import pl.touk.nussknacker.engine.api.context.transformation.{ NodeDependencyValue, SingleInputDynamicComponent } -import pl.touk.nussknacker.engine.api.context.{ContextTransformation, ProcessCompilationError, ValidationContext} import pl.touk.nussknacker.engine.api.definition.{AdditionalVariable => _, _} import pl.touk.nussknacker.engine.api.dict.embedded.EmbeddedDictDefinition import pl.touk.nussknacker.engine.api.exception.NuExceptionInfo @@ -31,8 +31,8 @@ import pl.touk.nussknacker.engine.api.test.InvocationCollectors.ServiceInvocatio import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult} import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} +import pl.touk.nussknacker.engine.canonicalgraph.{canonicalnode, CanonicalProcess} import pl.touk.nussknacker.engine.canonicalgraph.canonicalnode.FlatNode -import pl.touk.nussknacker.engine.canonicalgraph.{CanonicalProcess, canonicalnode} import pl.touk.nussknacker.engine.compile._ import pl.touk.nussknacker.engine.compiledgraph.part.{CustomNodePart, ProcessPart, SinkPart} import pl.touk.nussknacker.engine.definition.component.Components @@ -42,8 +42,8 @@ import pl.touk.nussknacker.engine.dict.SimpleDictRegistry import pl.touk.nussknacker.engine.graph.evaluatedparam.{Parameter => NodeParameter} import pl.touk.nussknacker.engine.graph.expression._ import pl.touk.nussknacker.engine.graph.fragment.FragmentRef -import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.node._ +import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.sink.SinkRef import pl.touk.nussknacker.engine.graph.variable.Field import pl.touk.nussknacker.engine.modelconfig.ComponentsUiConfig @@ -51,11 +51,11 @@ import pl.touk.nussknacker.engine.resultcollector.ProductionServiceInvocationCol import pl.touk.nussknacker.engine.spel.SpelExpressionRepr import pl.touk.nussknacker.engine.testcomponents.SpelTemplatePartsService import pl.touk.nussknacker.engine.testing.ModelDefinitionBuilder +import pl.touk.nussknacker.engine.util.{LoggingListener, SynchronousExecutionContextAndIORuntime} import pl.touk.nussknacker.engine.util.service.{ EagerServiceWithStaticParametersAndReturnType, EnricherContextTransformation } -import pl.touk.nussknacker.engine.util.{LoggingListener, SynchronousExecutionContextAndIORuntime} import java.util.{Collections, Optional} import javax.annotation.Nullable diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/CustomNodeValidationSpec.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/CustomNodeValidationSpec.scala index 49189f66db5..9bdcce66be8 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/CustomNodeValidationSpec.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/CustomNodeValidationSpec.scala @@ -1,10 +1,12 @@ package pl.touk.nussknacker.engine.compile -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, Validated} +import cats.data.Validated.{Invalid, Valid} import org.scalatest.OptionValues import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.CustomProcessValidatorLoader +import pl.touk.nussknacker.engine.api.{JobData, ProcessVersion} import pl.touk.nussknacker.engine.api.component.{ComponentDefinition, DesignerWideComponentId} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.parameter.ParameterName @@ -14,17 +16,15 @@ import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.compile.validationHelpers._ import pl.touk.nussknacker.engine.definition.component.{ComponentDefinitionWithImplementation, Components} +import pl.touk.nussknacker.engine.definition.component.Components.ComponentDefinitionExtractionMode import pl.touk.nussknacker.engine.definition.model.{ModelDefinition, ModelDefinitionWithClasses} import pl.touk.nussknacker.engine.dict.SimpleDictRegistry import pl.touk.nussknacker.engine.expression.PositionRange import pl.touk.nussknacker.engine.modelconfig.ComponentsUiConfig import pl.touk.nussknacker.engine.spel.SpelExpressionTypingInfo +import pl.touk.nussknacker.engine.spel.SpelExtension._ import pl.touk.nussknacker.engine.testing.ModelDefinitionBuilder import pl.touk.nussknacker.engine.variables.MetaVariables -import pl.touk.nussknacker.engine.CustomProcessValidatorLoader -import pl.touk.nussknacker.engine.api.{JobData, ProcessVersion} -import pl.touk.nussknacker.engine.definition.component.Components.ComponentDefinitionExtractionMode -import pl.touk.nussknacker.engine.spel.SpelExtension._ import scala.collection.Set diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/FragmentResolverSpec.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/FragmentResolverSpec.scala index 6c82bbf56cd..e1ca69151c1 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/FragmentResolverSpec.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/FragmentResolverSpec.scala @@ -1,23 +1,23 @@ package pl.touk.nussknacker.engine.compile -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, ValidatedNel} +import cats.data.Validated.{Invalid, Valid} import org.scalatest.Inside import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.{FragmentSpecificData, MetaData} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.parameter.ParameterName -import pl.touk.nussknacker.engine.api.{FragmentSpecificData, MetaData} -import pl.touk.nussknacker.engine.build.GraphBuilder.Creator import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} +import pl.touk.nussknacker.engine.build.GraphBuilder.Creator +import pl.touk.nussknacker.engine.canonicalgraph.{canonicalnode, CanonicalProcess} import pl.touk.nussknacker.engine.canonicalgraph.canonicalnode.{FlatNode, Fragment} -import pl.touk.nussknacker.engine.canonicalgraph.{CanonicalProcess, canonicalnode} import pl.touk.nussknacker.engine.graph.evaluatedparam.{Parameter => NodeParameter} import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.graph.fragment.FragmentRef -import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.node._ +import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.sink.SinkRef class FragmentResolverSpec extends AnyFunSuite with Matchers with Inside { diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/GenericTransformationValidationSpec.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/GenericTransformationValidationSpec.scala index c83f796f566..a14696a71d4 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/GenericTransformationValidationSpec.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/GenericTransformationValidationSpec.scala @@ -1,10 +1,11 @@ package pl.touk.nussknacker.engine.compile -import cats.data.Validated.Invalid import cats.data.{NonEmptyList, Validated} +import cats.data.Validated.Invalid +import org.scalatest.{Inside, OptionValues} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{Inside, OptionValues} +import pl.touk.nussknacker.engine.CustomProcessValidatorLoader import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.component.{ComponentDefinition, DesignerWideComponentId} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.{ @@ -16,22 +17,19 @@ import pl.touk.nussknacker.engine.api.definition.{DualParameterEditor, Parameter import pl.touk.nussknacker.engine.api.editor.DualEditorMode import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process._ -import pl.touk.nussknacker.engine.api.typed.typing.Typed.typedListWithElementValues import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult, Unknown} +import pl.touk.nussknacker.engine.api.typed.typing.Typed.typedListWithElementValues import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.compile.validationHelpers._ import pl.touk.nussknacker.engine.definition.component.{ComponentDefinitionWithImplementation, Components} +import pl.touk.nussknacker.engine.definition.component.Components.ComponentDefinitionExtractionMode import pl.touk.nussknacker.engine.definition.component.parameter.editor.ParameterTypeEditorDeterminer import pl.touk.nussknacker.engine.definition.model.{ModelDefinition, ModelDefinitionWithClasses} import pl.touk.nussknacker.engine.dict.SimpleDictRegistry import pl.touk.nussknacker.engine.modelconfig.ComponentsUiConfig import pl.touk.nussknacker.engine.testing.ModelDefinitionBuilder -import pl.touk.nussknacker.engine.CustomProcessValidatorLoader -import pl.touk.nussknacker.engine.api.typed.typing.Typed.typedListWithElementValues -import pl.touk.nussknacker.engine.definition.component.Components.ComponentDefinitionExtractionMode -import scala.jdk.CollectionConverters._ import scala.jdk.CollectionConverters._ class GenericTransformationValidationSpec extends AnyFunSuite with Matchers with OptionValues with Inside { diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/IdValidatorTest.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/IdValidatorTest.scala index a27275989b0..e39a2236ce4 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/IdValidatorTest.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/IdValidatorTest.scala @@ -3,7 +3,7 @@ package pl.touk.nussknacker.engine.compile import cats.data.Validated import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.prop.TableDrivenPropertyChecks.{Table, forAll} +import org.scalatest.prop.TableDrivenPropertyChecks.{forAll, Table} import org.scalatest.prop.TableFor2 import pl.touk.nussknacker.engine.api.context.ProcessCompilationError import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/NodeDataValidatorSpec.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/NodeDataValidatorSpec.scala index ce849d21765..674a1260915 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/NodeDataValidatorSpec.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/NodeDataValidatorSpec.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.compile -import com.typesafe.config.ConfigValueFactory.{fromAnyRef, fromIterable} import com.typesafe.config.{Config, ConfigFactory} +import com.typesafe.config.ConfigValueFactory.{fromAnyRef, fromIterable} import org.scalatest.Inside import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers @@ -13,8 +13,8 @@ import pl.touk.nussknacker.engine.api.component.{ DesignerWideComponentId, ParameterAdditionalUIConfig } -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext} +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.dict.embedded.EmbeddedDictDefinition import pl.touk.nussknacker.engine.api.editor.DualEditorMode @@ -29,13 +29,13 @@ import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypedObjectTypingResult, Unknown} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.canonicalgraph.canonicalnode.FlatNode -import pl.touk.nussknacker.engine.compile.nodecompilation.NodeDataValidator.OutgoingEdge import pl.touk.nussknacker.engine.compile.nodecompilation.{ NodeDataValidator, ValidationNotPerformed, ValidationPerformed, ValidationResponse } +import pl.touk.nussknacker.engine.compile.nodecompilation.NodeDataValidator.OutgoingEdge import pl.touk.nussknacker.engine.compile.validationHelpers._ import pl.touk.nussknacker.engine.definition.component.parameter.validator.ValidationExpressionParameterValidator import pl.touk.nussknacker.engine.graph.EdgeType.{FragmentOutput, NextSwitch} @@ -43,8 +43,8 @@ import pl.touk.nussknacker.engine.graph.evaluatedparam.{Parameter => NodeParamet import pl.touk.nussknacker.engine.graph.expression.{Expression, NodeExpressionId} import pl.touk.nussknacker.engine.graph.fragment.FragmentRef import pl.touk.nussknacker.engine.graph.node -import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.node._ +import pl.touk.nussknacker.engine.graph.node.FragmentInputDefinition.{FragmentClazzRef, FragmentParameter} import pl.touk.nussknacker.engine.graph.service.ServiceRef import pl.touk.nussknacker.engine.graph.sink.SinkRef import pl.touk.nussknacker.engine.graph.source.SourceRef diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/ProcessValidatorSpec.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/ProcessValidatorSpec.scala index c12845564a0..930cf37c038 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/ProcessValidatorSpec.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/ProcessValidatorSpec.scala @@ -1,17 +1,17 @@ package pl.touk.nussknacker.engine.compile -import cats.data.Validated.{Invalid, Valid} import cats.data._ +import cats.data.Validated.{Invalid, Valid} import cats.instances.string._ +import org.scalatest.{Inside, OptionValues} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks.forAll -import org.scalatest.{Inside, OptionValues} import pl.touk.nussknacker.engine.CustomProcessValidatorLoader import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.component.ComponentType -import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.context._ +import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._ import pl.touk.nussknacker.engine.api.context.transformation.{DefinedEagerParameter, DefinedSingleParameter} import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.parameter.ParameterName @@ -32,8 +32,8 @@ import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.graph.expression.NodeExpressionId._ import pl.touk.nussknacker.engine.graph.node._ import pl.touk.nussknacker.engine.graph.source.SourceRef -import pl.touk.nussknacker.engine.spel.SpelExtension._ import pl.touk.nussknacker.engine.spel.SpelExpressionTypingInfo +import pl.touk.nussknacker.engine.spel.SpelExtension._ import pl.touk.nussknacker.engine.testing.ModelDefinitionBuilder import pl.touk.nussknacker.engine.util.service.{EagerServiceWithStaticParameters, EnricherContextTransformation} import pl.touk.nussknacker.engine.util.typing.TypingUtils diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/nodecompilation/FragmentParameterValidatorTest.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/nodecompilation/FragmentParameterValidatorTest.scala index 50b4a3e5ee7..920185aa97f 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/nodecompilation/FragmentParameterValidatorTest.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/nodecompilation/FragmentParameterValidatorTest.scala @@ -1,6 +1,6 @@ package pl.touk.nussknacker.engine.compile.nodecompilation -import cats.data.Validated.{Valid, invalidNel} +import cats.data.Validated.{invalidNel, Valid} import org.scalatest.Inspectors.forAll import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/nodecompilation/LazyParameterSpec.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/nodecompilation/LazyParameterSpec.scala index e6f7923e0b1..83570efcc39 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/nodecompilation/LazyParameterSpec.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/nodecompilation/LazyParameterSpec.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.compile.nodecompilation import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import pl.touk.nussknacker.engine.api.LazyParameter.CustomLazyParameter import pl.touk.nussknacker.engine.api._ +import pl.touk.nussknacker.engine.api.LazyParameter.CustomLazyParameter import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.Typed diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/validationHelpers.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/validationHelpers.scala index 7658f52e403..d00f846e051 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/validationHelpers.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/validationHelpers.scala @@ -6,9 +6,9 @@ import io.circe.Json import pl.touk.nussknacker.engine.api import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.component.UnboundedStreamComponent +import pl.touk.nussknacker.engine.api.context.{ContextTransformation, JoinContextTransformation, ValidationContext} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.{CustomNodeError, FatalUnknownError} import pl.touk.nussknacker.engine.api.context.transformation._ -import pl.touk.nussknacker.engine.api.context.{ContextTransformation, JoinContextTransformation, ValidationContext} import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process._ diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/clazz/ClassDefinitionDiscoverySpec.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/clazz/ClassDefinitionDiscoverySpec.scala index 3a7bbf7d014..382e8bdfec5 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/clazz/ClassDefinitionDiscoverySpec.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/clazz/ClassDefinitionDiscoverySpec.scala @@ -7,18 +7,18 @@ import org.scalatest.OptionValues import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks._ +import pl.touk.nussknacker.engine.api.{Context, Documentation, Hidden, HideToString, ParamName} import pl.touk.nussknacker.engine.api.generics._ +import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.api.process.PropertyFromGetterExtractionStrategy.{ AddPropertyNextToGetter, DoNothing, ReplaceGetterWithProperty } -import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.api.typed.supertype.CommonSupertypeFinder import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.{Typed, _} -import pl.touk.nussknacker.engine.api.{Context, Documentation, Hidden, HideToString, ParamName} -import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionTestUtils.{DefaultExtractor, createDiscovery} +import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionTestUtils.{createDiscovery, DefaultExtractor} import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.ArgumentTypeError import pl.touk.nussknacker.engine.spel.SpelExpressionRepr import pl.touk.nussknacker.test.ValidatedValuesDetailedMessage diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/ComponentFromProvidersExtractorTest.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/ComponentFromProvidersExtractorTest.scala index 02ffc84752d..01bf0975cc4 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/ComponentFromProvidersExtractorTest.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/ComponentFromProvidersExtractorTest.scala @@ -6,9 +6,9 @@ import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.semver4j.Semver import pl.touk.nussknacker.engine.ConfigWithUnresolvedVersion +import pl.touk.nussknacker.engine.api.{MethodToInvoke, Service} import pl.touk.nussknacker.engine.api.component._ import pl.touk.nussknacker.engine.api.process.{ProcessObjectDependencies, Sink, SinkFactory} -import pl.touk.nussknacker.engine.api.{MethodToInvoke, Service} import pl.touk.nussknacker.engine.definition.component.ComponentFromProvidersExtractorTest.largeMajorVersion import pl.touk.nussknacker.engine.definition.component.Components.ComponentDefinitionExtractionMode import pl.touk.nussknacker.engine.modelconfig.{ComponentsUiConfig, DefaultModelConfigLoader} diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/parameter/defaults/EditorPossibleValuesBasedDefaultValueDeterminerTest.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/parameter/defaults/EditorPossibleValuesBasedDefaultValueDeterminerTest.scala index e6fea012eae..ca7e2574499 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/parameter/defaults/EditorPossibleValuesBasedDefaultValueDeterminerTest.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/parameter/defaults/EditorPossibleValuesBasedDefaultValueDeterminerTest.scala @@ -2,9 +2,9 @@ package pl.touk.nussknacker.engine.definition.component.parameter.defaults import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.component.ParameterConfig import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.editor.DualEditorMode -import pl.touk.nussknacker.engine.api.component.ParameterConfig import pl.touk.nussknacker.engine.api.typed.typing.Unknown import pl.touk.nussknacker.engine.definition.component.parameter.ParameterData import pl.touk.nussknacker.engine.graph.expression.Expression diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/parameter/editor/EditorExtractorTest.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/parameter/editor/EditorExtractorTest.scala index c03c0f75c66..932e258aeb3 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/parameter/editor/EditorExtractorTest.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/parameter/editor/EditorExtractorTest.scala @@ -1,18 +1,18 @@ package pl.touk.nussknacker.engine.definition.component.parameter.editor -import java.time.temporal.ChronoUnit -import java.time.{Duration, LocalDate, LocalDateTime, LocalTime, Period} import com.cronutils.model.Cron import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.engine.api.LazyParameter +import pl.touk.nussknacker.engine.api.component.ParameterConfig import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.editor._ -import pl.touk.nussknacker.engine.api.component.ParameterConfig import pl.touk.nussknacker.engine.api.typed.typing.Typed import pl.touk.nussknacker.engine.definition.clazz.JavaSampleEnum import pl.touk.nussknacker.engine.definition.component.parameter.ParameterData +import java.time.{Duration, LocalDate, LocalDateTime, LocalTime, Period} +import java.time.temporal.ChronoUnit import scala.reflect.ClassTag class EditorExtractorTest extends AnyFunSuite with Matchers { diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidationExpressionParameterValidatorTest.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidationExpressionParameterValidatorTest.scala index 889724fab7d..aa0eb1b7ad0 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidationExpressionParameterValidatorTest.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidationExpressionParameterValidatorTest.scala @@ -4,8 +4,8 @@ import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks import org.springframework.expression.spel.standard.SpelExpressionParser -import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api._ +import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionTestUtils import pl.touk.nussknacker.engine.definition.component.parameter.validator.TestSpelExpression.expressionConfig import pl.touk.nussknacker.engine.definition.globalvariables.ExpressionConfigDefinition diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidatorsExtractorTest.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidatorsExtractorTest.scala index 6397da9b3f0..984ea821bb7 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidatorsExtractorTest.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/component/parameter/validator/ValidatorsExtractorTest.scala @@ -1,19 +1,20 @@ package pl.touk.nussknacker.engine.definition.component.parameter.validator -import java.time.LocalDate -import java.util.Optional -import javax.annotation.Nullable -import javax.validation.constraints.{Max, Min, NotBlank} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.component.ParameterConfig import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.editor.DualEditorMode -import pl.touk.nussknacker.engine.api.component.ParameterConfig import pl.touk.nussknacker.engine.api.validation.CompileTimeEvaluableValue import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionExtractor import pl.touk.nussknacker.engine.definition.component.parameter.{OptionalDeterminer, ParameterData} import pl.touk.nussknacker.engine.definition.component.parameter.editor.EditorExtractor +import java.time.LocalDate +import java.util.Optional +import javax.annotation.Nullable +import javax.validation.constraints.{Max, Min, NotBlank} + class ValidatorsExtractorTest extends AnyFunSuite with Matchers { private val notAnnotatedParam = getFirstParam("notAnnotated", classOf[String]) diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/test/ModelDataTestInfoProviderSpec.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/test/ModelDataTestInfoProviderSpec.scala index ecde780fbac..f819faa7ac7 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/test/ModelDataTestInfoProviderSpec.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/definition/test/ModelDataTestInfoProviderSpec.scala @@ -7,11 +7,11 @@ import org.scalatest.OptionValues import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks +import pl.touk.nussknacker.engine.api.{process, CirceUtil, MetaData, Params, ProcessVersion, StreamMetaData} import pl.touk.nussknacker.engine.api.component.ComponentDefinition import pl.touk.nussknacker.engine.api.context.transformation.NodeDependencyValue import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.api.test.{ScenarioTestJsonRecord, TestData, TestRecord, TestRecordParser} -import pl.touk.nussknacker.engine.api.{CirceUtil, MetaData, Params, ProcessVersion, StreamMetaData, process} import pl.touk.nussknacker.engine.build.{GraphBuilder, ScenarioBuilder} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.compile.validationHelpers.{ diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/MethodReferenceTyperSpec.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/MethodReferenceTyperSpec.scala index 62fbc1f9ad6..b491c769b58 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/MethodReferenceTyperSpec.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/MethodReferenceTyperSpec.scala @@ -5,8 +5,8 @@ import cats.implicits.catsSyntaxValidatedId import org.scalatest.Inside.inside import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import pl.touk.nussknacker.engine.api.generics.GenericFunctionTypingError.OtherError import pl.touk.nussknacker.engine.api.generics._ +import pl.touk.nussknacker.engine.api.generics.GenericFunctionTypingError.OtherError import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult} import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionTestUtils import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.ArgumentTypeError diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/SpelConversionServiceOverrideSpec.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/SpelConversionServiceOverrideSpec.scala index 4fceda3e5fd..9110f632142 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/SpelConversionServiceOverrideSpec.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/SpelConversionServiceOverrideSpec.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.spel -import cats.data.Validated.Invalid import cats.data.{NonEmptyList, Validated, ValidatedNel} +import cats.data.Validated.Invalid import cats.effect.IO import cats.effect.unsafe.IORuntime import com.typesafe.config.ConfigFactory diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/SpelExpressionGenSpec.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/SpelExpressionGenSpec.scala index 6fe07642d4a..0ac95e672e5 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/SpelExpressionGenSpec.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/SpelExpressionGenSpec.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.engine.spel import cats.data.Validated.Valid import cats.data.ValidatedNel import com.typesafe.scalalogging.LazyLogging -import org.scalacheck.Arbitrary._ import org.scalacheck.{Arbitrary, Gen} +import org.scalacheck.Arbitrary._ import org.scalatest.Inside import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/SpelExpressionSpec.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/SpelExpressionSpec.scala index bdf1386044c..5343351d741 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/SpelExpressionSpec.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/SpelExpressionSpec.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.spel -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, Validated, ValidatedNel} +import cats.data.Validated.{Invalid, Valid} import cats.implicits.catsSyntaxValidatedId import org.apache.avro.Schema import org.apache.avro.generic.GenericData @@ -14,9 +14,10 @@ import org.scalatest.prop.TableDrivenPropertyChecks._ import org.scalatest.time.SpanSugar.convertIntToGrainOfTime import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks import org.springframework.util.{NumberUtils, StringUtils} +import pl.touk.nussknacker.engine.api.{Context, Hidden, NodeId, SpelExpressionExcludeList, TemplateEvaluationResult} import pl.touk.nussknacker.engine.api.context.ValidationContext -import pl.touk.nussknacker.engine.api.dict.embedded.EmbeddedDictDefinition import pl.touk.nussknacker.engine.api.dict.{DictDefinition, DictInstance} +import pl.touk.nussknacker.engine.api.dict.embedded.EmbeddedDictDefinition import pl.touk.nussknacker.engine.api.generics.{ ExpressionParseError, GenericFunctionTypingError, @@ -25,12 +26,16 @@ import pl.touk.nussknacker.engine.api.generics.{ } import pl.touk.nussknacker.engine.api.process.ExpressionConfig._ import pl.touk.nussknacker.engine.api.typed.TypedMap -import pl.touk.nussknacker.engine.api.typed.typing.Typed.typedListWithElementValues import pl.touk.nussknacker.engine.api.typed.typing.{Typed, _} -import pl.touk.nussknacker.engine.api.{Context, Hidden, NodeId, SpelExpressionExcludeList, TemplateEvaluationResult} +import pl.touk.nussknacker.engine.api.typed.typing.Typed.typedListWithElementValues import pl.touk.nussknacker.engine.definition.clazz.{ClassDefinitionSet, ClassDefinitionTestUtils, JavaClassWithVarargs} import pl.touk.nussknacker.engine.dict.SimpleDictRegistry import pl.touk.nussknacker.engine.expression.parse.{CompiledExpression, TypedExpression} +import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.{ + ArgumentTypeError, + ExpressionTypeError, + GenericFunctionError +} import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.IllegalOperationError.{ IllegalInvocationError, IllegalProjectionSelectionError, @@ -45,11 +50,6 @@ import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.MissingObjectErr } import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.OperatorError._ import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.UnsupportedOperationError.ArrayConstructorError -import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.{ - ArgumentTypeError, - ExpressionTypeError, - GenericFunctionError -} import pl.touk.nussknacker.engine.spel.SpelExpressionParser.{Flavour, Standard} import pl.touk.nussknacker.engine.testing.ModelDefinitionBuilder import pl.touk.nussknacker.springframework.util.BigDecimalScaleEnsurer @@ -66,11 +66,11 @@ import java.lang.{ } import java.math.{BigDecimal => JBigDecimal, BigInteger => JBigInteger} import java.nio.charset.{Charset, StandardCharsets} -import java.time.chrono.{ChronoLocalDate, ChronoLocalDateTime} import java.time.{LocalDate, LocalDateTime, LocalTime, ZoneId, ZoneOffset} +import java.time.chrono.{ChronoLocalDate, ChronoLocalDateTime} import java.util -import java.util.concurrent.Executors import java.util.{Collections, Currency, List => JList, Locale, Map => JMap, Optional, UUID} +import java.util.concurrent.Executors import scala.annotation.varargs import scala.concurrent.{Await, ExecutionContext, Future, Promise} import scala.jdk.CollectionConverters._ diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/TyperSpec.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/TyperSpec.scala index 6dfce03a143..ebc20dd04b6 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/TyperSpec.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/TyperSpec.scala @@ -1,15 +1,15 @@ package pl.touk.nussknacker.engine.spel -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, ValidatedNel} +import cats.data.Validated.{Invalid, Valid} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.springframework.expression.common.TemplateParserContext import org.springframework.expression.spel.standard import pl.touk.nussknacker.engine.api.context.ValidationContext import pl.touk.nussknacker.engine.api.generics.ExpressionParseError -import pl.touk.nussknacker.engine.api.typed.typing.Typed.typedListWithElementValues import pl.touk.nussknacker.engine.api.typed.typing._ +import pl.touk.nussknacker.engine.api.typed.typing.Typed.typedListWithElementValues import pl.touk.nussknacker.engine.definition.clazz.ClassDefinitionTestUtils import pl.touk.nussknacker.engine.dict.{KeysDictTyper, SimpleDictRegistry} import pl.touk.nussknacker.engine.expression.PositionRange diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/testcomponents/SpelTemplatePartsService.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/testcomponents/SpelTemplatePartsService.scala index 675889bd025..77c028c08a7 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/testcomponents/SpelTemplatePartsService.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/testcomponents/SpelTemplatePartsService.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.engine.testcomponents -import pl.touk.nussknacker.engine.api.TemplateRenderedPart.{RenderedLiteral, RenderedSubExpression} import pl.touk.nussknacker.engine.api._ +import pl.touk.nussknacker.engine.api.TemplateRenderedPart.{RenderedLiteral, RenderedSubExpression} +import pl.touk.nussknacker.engine.api.context.{OutputVar, ValidationContext} import pl.touk.nussknacker.engine.api.context.transformation.{ DefinedLazyParameter, NodeDependencyValue, SingleInputDynamicComponent } -import pl.touk.nussknacker.engine.api.context.{OutputVar, ValidationContext} import pl.touk.nussknacker.engine.api.definition.{ NodeDependency, OutputVariableNameDependency, diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/variables/GlobalVariablesPreparerTest.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/variables/GlobalVariablesPreparerTest.scala index f446a52fd52..4001c05d550 100644 --- a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/variables/GlobalVariablesPreparerTest.scala +++ b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/variables/GlobalVariablesPreparerTest.scala @@ -2,9 +2,9 @@ package pl.touk.nussknacker.engine.variables import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult} -import pl.touk.nussknacker.engine.api.typed.{TypedGlobalVariable, typing} import pl.touk.nussknacker.engine.api.{JobData, MetaData, ProcessVersion, StreamMetaData} +import pl.touk.nussknacker.engine.api.typed.{typing, TypedGlobalVariable} +import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult} import pl.touk.nussknacker.engine.definition.globalvariables.GlobalVariableDefinitionWithImplementation class GlobalVariablesPreparerTest extends AnyFunSuite with Matchers { diff --git a/security/src/it/scala/pl/touk/nussknacker/ui/security/oauth2/GenericOidcServiceSpec.scala b/security/src/it/scala/pl/touk/nussknacker/ui/security/oauth2/GenericOidcServiceSpec.scala index dec9c71c92d..a535ff88c25 100644 --- a/security/src/it/scala/pl/touk/nussknacker/ui/security/oauth2/GenericOidcServiceSpec.scala +++ b/security/src/it/scala/pl/touk/nussknacker/ui/security/oauth2/GenericOidcServiceSpec.scala @@ -14,8 +14,8 @@ import pl.touk.nussknacker.ui.security.oidc.{ OidcService, OidcUserInfo } -import sttp.client3.asynchttpclient.future.AsyncHttpClientFutureBackend import sttp.client3.{SttpBackend, _} +import sttp.client3.asynchttpclient.future.AsyncHttpClientFutureBackend import java.net.URI import scala.concurrent.Future diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/CertificatesAndKeys.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/CertificatesAndKeys.scala index e5f4d3d8c4a..fffc95297d9 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/CertificatesAndKeys.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/CertificatesAndKeys.scala @@ -2,9 +2,9 @@ package pl.touk.nussknacker.ui.security import java.io.ByteArrayInputStream import java.nio.charset.Charset +import java.security.{KeyFactory, PublicKey} import java.security.cert.CertificateFactory import java.security.spec.X509EncodedKeySpec -import java.security.{KeyFactory, PublicKey} import java.util.Base64 object CertificatesAndKeys { diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/api/AuthManager.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/api/AuthManager.scala index 41f5ccd30bb..2d94376a4ce 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/api/AuthManager.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/api/AuthManager.scala @@ -10,13 +10,13 @@ import akka.http.scaladsl.server.{ Route } import akka.http.scaladsl.server.Directives.{complete, handleRejections, optionalHeaderValueByName, provide, reject} +import pl.touk.nussknacker.security.{AuthCredentials, ImpersonatedUserIdentity} import pl.touk.nussknacker.security.AuthCredentials.{ ImpersonatedAuthCredentials, NoCredentialsProvided, PassedAuthCredentials } -import pl.touk.nussknacker.security.{AuthCredentials, ImpersonatedUserIdentity} -import pl.touk.nussknacker.ui.security.api.AuthManager.{ImpersonationConsideringInputEndpoint, impersonateHeaderName} +import pl.touk.nussknacker.ui.security.api.AuthManager.{impersonateHeaderName, ImpersonationConsideringInputEndpoint} import pl.touk.nussknacker.ui.security.api.CreationError.ImpersonationNotAllowed import pl.touk.nussknacker.ui.security.api.SecurityError._ import sttp.tapir._ diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/api/AuthenticationConfiguration.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/api/AuthenticationConfiguration.scala index 4a0121a0aab..e11ddef398e 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/api/AuthenticationConfiguration.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/api/AuthenticationConfiguration.scala @@ -1,15 +1,16 @@ package pl.touk.nussknacker.ui.security.api -import java.net.URI import com.typesafe.config.Config +import net.ceedubs.ficus.readers.ArbitraryTypeReader._ +import net.ceedubs.ficus.readers.EnumerationReader._ import pl.touk.nussknacker.engine.util.config.ConfigFactoryExt -import pl.touk.nussknacker.ui.security.api.AuthenticationConfiguration.{ConfigUser, getRules, usersConfigurationPath} -import GlobalPermission.GlobalPermission +import pl.touk.nussknacker.engine.util.config.CustomFicusInstances._ import pl.touk.nussknacker.security.Permission.Permission +import pl.touk.nussknacker.ui.security.api.AuthenticationConfiguration.{getRules, usersConfigurationPath, ConfigUser} -import net.ceedubs.ficus.readers.EnumerationReader._ -import net.ceedubs.ficus.readers.ArbitraryTypeReader._ -import pl.touk.nussknacker.engine.util.config.CustomFicusInstances._ +import java.net.URI + +import GlobalPermission.GlobalPermission trait AuthenticationConfiguration { def name: String diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/api/LoggedUser.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/api/LoggedUser.scala index 96361e1f48b..6e0e31a76d3 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/api/LoggedUser.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/api/LoggedUser.scala @@ -1,11 +1,12 @@ package pl.touk.nussknacker.ui.security.api -import pl.touk.nussknacker.ui.security.api.AuthenticationConfiguration.ConfigRule -import GlobalPermission.GlobalPermission import pl.touk.nussknacker.security.Permission import pl.touk.nussknacker.security.Permission.Permission +import pl.touk.nussknacker.ui.security.api.AuthenticationConfiguration.ConfigRule import pl.touk.nussknacker.ui.security.api.CreationError.ImpersonationNotAllowed +import GlobalPermission.GlobalPermission + sealed trait LoggedUser { val id: String val username: String diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/basicauth/BasicAuthenticationConfiguration.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/basicauth/BasicAuthenticationConfiguration.scala index 99f4403ba05..fc09beb4330 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/basicauth/BasicAuthenticationConfiguration.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/basicauth/BasicAuthenticationConfiguration.scala @@ -25,9 +25,10 @@ case class BasicAuthenticationConfiguration( object BasicAuthenticationConfiguration { - import AuthenticationConfiguration._ - import pl.touk.nussknacker.engine.util.config.CustomFicusInstances._ import net.ceedubs.ficus.readers.ArbitraryTypeReader._ + import pl.touk.nussknacker.engine.util.config.CustomFicusInstances._ + + import AuthenticationConfiguration._ val name: String = "BasicAuth" diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/basicauth/BasicAuthenticationResources.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/basicauth/BasicAuthenticationResources.scala index 6e4d417f867..2573babea7f 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/basicauth/BasicAuthenticationResources.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/basicauth/BasicAuthenticationResources.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.ui.security.basicauth import akka.http.scaladsl.server.directives.{AuthenticationDirective, SecurityDirectives} import pl.touk.nussknacker.security.AuthCredentials.PassedAuthCredentials -import pl.touk.nussknacker.ui.security.api.AuthenticationResources.defaultRealm import pl.touk.nussknacker.ui.security.api._ +import pl.touk.nussknacker.ui.security.api.AuthenticationResources.defaultRealm import sttp.model.headers.WWWAuthenticateChallenge import sttp.tapir._ diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/basicauth/BasicHttpAuthenticator.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/basicauth/BasicHttpAuthenticator.scala index ce821346235..7370ac8be5d 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/basicauth/BasicHttpAuthenticator.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/basicauth/BasicHttpAuthenticator.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.ui.security.basicauth import akka.http.scaladsl.model.headers.BasicHttpCredentials -import akka.http.scaladsl.server.directives.Credentials.Provided import akka.http.scaladsl.server.directives.{Credentials, SecurityDirectives} +import akka.http.scaladsl.server.directives.Credentials.Provided import at.favre.lib.crypto.bcrypt.BCrypt import pl.touk.nussknacker.engine.util.cache.DefaultCache import pl.touk.nussknacker.security.AuthCredentials.PassedAuthCredentials diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/dummy/DummyAuthenticationConfiguration.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/dummy/DummyAuthenticationConfiguration.scala index 3f4714af1e7..a0998192522 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/dummy/DummyAuthenticationConfiguration.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/dummy/DummyAuthenticationConfiguration.scala @@ -7,10 +7,11 @@ import java.net.URI object DummyAuthenticationConfiguration { - import AuthenticationConfiguration._ import net.ceedubs.ficus.readers.ArbitraryTypeReader._ import pl.touk.nussknacker.engine.util.config.CustomFicusInstances._ + import AuthenticationConfiguration._ + def create(config: Config): DummyAuthenticationConfiguration = config.as[DummyAuthenticationConfiguration](authenticationConfigPath) } diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/dummy/DummyAuthenticationResources.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/dummy/DummyAuthenticationResources.scala index be545ab8da0..14330f8403a 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/dummy/DummyAuthenticationResources.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/dummy/DummyAuthenticationResources.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.ui.security.dummy import akka.http.scaladsl.model.headers.HttpChallenge +import akka.http.scaladsl.server.{AuthenticationFailedRejection, Directive1} import akka.http.scaladsl.server.AuthenticationFailedRejection.CredentialsMissing import akka.http.scaladsl.server.directives.AuthenticationDirective -import akka.http.scaladsl.server.{AuthenticationFailedRejection, Directive1} import pl.touk.nussknacker.security.AuthCredentials.PassedAuthCredentials import pl.touk.nussknacker.ui.security.api.{ AuthenticatedUser, diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/AuthenticationStrategy.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/AuthenticationStrategy.scala index 340e8cf4232..96e933b6f5c 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/AuthenticationStrategy.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/AuthenticationStrategy.scala @@ -1,6 +1,7 @@ package pl.touk.nussknacker.ui.security.oauth2 import pl.touk.nussknacker.ui.security.api.AuthenticatedUser + import scala.concurrent.{ExecutionContext, Future} trait AuthenticationStrategy[ProfileResponse] { diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/BaseOAuth2Service.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/BaseOAuth2Service.scala index c6600c7d644..f53345b7c9a 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/BaseOAuth2Service.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/BaseOAuth2Service.scala @@ -8,8 +8,8 @@ import pl.touk.nussknacker.ui.security.oauth2.OAuth2ErrorHandler.{OAuth2AccessTo import sttp.client3.SttpBackend import java.time.Instant -import scala.concurrent.duration.FiniteDuration import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.duration.FiniteDuration class BaseOAuth2Service[ UserInfoData, diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/CachingOAuth2Service.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/CachingOAuth2Service.scala index dc98830db9e..862fa1c5726 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/CachingOAuth2Service.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/CachingOAuth2Service.scala @@ -6,8 +6,8 @@ import pl.touk.nussknacker.engine.util.cache.{CacheConfig, DefaultCache, ExpiryC import java.time.{Duration, Instant} import java.util.concurrent.TimeUnit -import scala.concurrent.duration.{Deadline, FiniteDuration} import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.duration.{Deadline, FiniteDuration} import scala.util.{Failure, Success, Try} class CachingOAuth2Service[ diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2AuthenticationResources.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2AuthenticationResources.scala index 6463181d186..3ea3ba6bbb7 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2AuthenticationResources.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2AuthenticationResources.scala @@ -1,23 +1,23 @@ package pl.touk.nussknacker.ui.security.oauth2 import akka.http.scaladsl.marshalling.ToResponseMarshallable -import akka.http.scaladsl.model.StatusCodes.NotFound import akka.http.scaladsl.model._ -import akka.http.scaladsl.model.headers.{HttpCookie, `Set-Cookie`} -import akka.http.scaladsl.server.directives.{AuthenticationDirective, SecurityDirectives} +import akka.http.scaladsl.model.StatusCodes.NotFound +import akka.http.scaladsl.model.headers.{`Set-Cookie`, HttpCookie} import akka.http.scaladsl.server.{Directives, Route} +import akka.http.scaladsl.server.directives.{AuthenticationDirective, SecurityDirectives} import com.typesafe.scalalogging.LazyLogging import io.circe.Encoder import io.circe.syntax.EncoderOps import pl.touk.nussknacker.security.AuthCredentials.PassedAuthCredentials import pl.touk.nussknacker.ui.security.CertificatesAndKeys -import pl.touk.nussknacker.ui.security.api.AuthenticationResources.defaultRealm import pl.touk.nussknacker.ui.security.api._ +import pl.touk.nussknacker.ui.security.api.AuthenticationResources.defaultRealm import sttp.client3.SttpBackend import sttp.model.HeaderNames import sttp.model.headers.{AuthenticationScheme, WWWAuthenticateChallenge} -import sttp.tapir.EndpointInput.AuthType import sttp.tapir._ +import sttp.tapir.EndpointInput.AuthType import scala.collection.immutable.ListMap import scala.concurrent.{ExecutionContext, Future} diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2Authenticator.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2Authenticator.scala index cb8a5e41a8b..b5d1cb8d875 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2Authenticator.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2Authenticator.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.ui.security.oauth2 -import akka.http.scaladsl.server.directives.Credentials.Provided import akka.http.scaladsl.server.directives.{Credentials, SecurityDirectives} +import akka.http.scaladsl.server.directives.Credentials.Provided import cats.data.NonEmptyList import com.typesafe.scalalogging.LazyLogging import io.circe.Json diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ClientApi.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ClientApi.scala index 8496fa456c8..8a573245547 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ClientApi.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ClientApi.scala @@ -9,8 +9,8 @@ import pl.touk.nussknacker.ui.security.oauth2.OAuth2ErrorHandler.{ OAuth2CompoundException, OAuth2ServerError } +import sttp.client3.{basicRequest, Response, ResponseException, SttpBackend} import sttp.client3.circe._ -import sttp.client3.{Response, ResponseException, SttpBackend, basicRequest} import sttp.model.{MediaType, Uri} import scala.concurrent.{ExecutionContext, Future} diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2Configuration.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2Configuration.scala index d9efe1c0e30..8602922cba6 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2Configuration.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2Configuration.scala @@ -4,8 +4,8 @@ import com.typesafe.config.Config import net.ceedubs.ficus.readers.ValueReader import pl.touk.nussknacker.engine.util.config.FicusReaders.forDecoder import pl.touk.nussknacker.ui.security.CertificatesAndKeys -import pl.touk.nussknacker.ui.security.api.AuthenticationConfiguration.ConfigUser import pl.touk.nussknacker.ui.security.api.{AuthenticationConfiguration, FrontendStrategySettings} +import pl.touk.nussknacker.ui.security.api.AuthenticationConfiguration.ConfigUser import pl.touk.nussknacker.ui.security.oauth2.ProfileFormat.ProfileFormat import pl.touk.nussknacker.ui.security.oauth2.UsernameClaim.UsernameClaim import sttp.model.{HeaderNames, MediaType, Uri} @@ -67,12 +67,13 @@ final case class OAuth2Configuration( object OAuth2Configuration { - import AuthenticationConfiguration._ - import JwtConfiguration.jwtConfigurationVR import net.ceedubs.ficus.readers.ArbitraryTypeReader._ import net.ceedubs.ficus.readers.EnumerationReader._ import pl.touk.nussknacker.engine.util.config.CustomFicusInstances._ + import AuthenticationConfiguration._ + import JwtConfiguration.jwtConfigurationVR + private implicit val valueReader: ValueReader[FrontendStrategySettings] = forDecoder val name = "OAuth2" diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ServiceFactory.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ServiceFactory.scala index c78cc82e704..409705f5f0d 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ServiceFactory.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ServiceFactory.scala @@ -4,8 +4,8 @@ import pl.touk.nussknacker.ui.security.api.AuthenticatedUser import sttp.client3.SttpBackend import java.time.Instant -import scala.concurrent.duration.FiniteDuration import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.duration.FiniteDuration trait OAuth2AuthorizationData { val accessToken: String diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/GenericOidcService.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/GenericOidcService.scala index 2160b91cf38..ec3ab67dca9 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/GenericOidcService.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/GenericOidcService.scala @@ -6,8 +6,8 @@ import io.circe.generic.extras.{Configuration, ConfiguredJsonCodec, JsonKey} import pl.touk.nussknacker.ui.security.oauth2._ import sttp.client3.SttpBackend -import scala.concurrent.duration.FiniteDuration import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.duration.FiniteDuration trait OidcAuthorizationData extends OAuth2AuthorizationData { val idToken: Option[String] diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/OidcAuthenticationConfiguration.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/OidcAuthenticationConfiguration.scala index 9193bd6847c..b6ea1645e17 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/OidcAuthenticationConfiguration.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/OidcAuthenticationConfiguration.scala @@ -5,9 +5,9 @@ import net.ceedubs.ficus.readers.ValueReader import pl.touk.nussknacker.engine.util.config.FicusReaders.forDecoder import pl.touk.nussknacker.engine.util.config.URIExtensions import pl.touk.nussknacker.ui.security.api.{AuthenticationConfiguration, FrontendStrategySettings} +import pl.touk.nussknacker.ui.security.oauth2.{JwtConfiguration, OAuth2Configuration, TokenCookieConfig} import pl.touk.nussknacker.ui.security.oauth2.ProfileFormat.OIDC import pl.touk.nussknacker.ui.security.oauth2.UsernameClaim.UsernameClaim -import pl.touk.nussknacker.ui.security.oauth2.{JwtConfiguration, OAuth2Configuration, TokenCookieConfig} import sttp.client3.SttpBackend import sttp.model.MediaType diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/OidcDiscovery.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/OidcDiscovery.scala index 4f60c1180e7..853ee4f067e 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/OidcDiscovery.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/OidcDiscovery.scala @@ -2,13 +2,13 @@ package pl.touk.nussknacker.ui.security.oidc import com.typesafe.scalalogging.LazyLogging import io.circe.generic.extras.{Configuration, ConfiguredJsonCodec, JsonKey} +import sttp.client3.{basicRequest, SttpBackend, UriContext} import sttp.client3.circe.asJson -import sttp.client3.{SttpBackend, UriContext, basicRequest} import sttp.model.MediaType import java.net.URI -import scala.concurrent.duration.{Duration, SECONDS} import scala.concurrent.{Await, ExecutionContext, Future} +import scala.concurrent.duration.{Duration, SECONDS} import scala.util.Try object OidcDiscovery extends LazyLogging { diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/OidcProfileAuthentication.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/OidcProfileAuthentication.scala index 521c9ecbd3f..334cbfc67ac 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/OidcProfileAuthentication.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/OidcProfileAuthentication.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.ui.security.oidc -import io.circe.generic.extras.semiauto.deriveConfiguredDecoder -import io.circe.generic.extras.{Configuration, ConfiguredJsonCodec, JsonKey} import io.circe.{Decoder, Json} +import io.circe.generic.extras.{Configuration, ConfiguredJsonCodec, JsonKey} +import io.circe.generic.extras.semiauto.deriveConfiguredDecoder import pl.touk.nussknacker.ui.security.api.AuthenticatedUser import pl.touk.nussknacker.ui.security.oauth2._ diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/OidcService.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/OidcService.scala index b7e5ad772bc..6bd47935c32 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/OidcService.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/oidc/OidcService.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.ui.security.oidc import com.auth0.jwk.{JwkProvider, JwkProviderBuilder} import io.circe.Decoder import pdi.jwt.JwtAlgorithm -import pl.touk.nussknacker.ui.security.oauth2.jwt.JwtValidator import pl.touk.nussknacker.ui.security.oauth2.{IntrospectedAccessTokenData, OAuth2ClientApi} +import pl.touk.nussknacker.ui.security.oauth2.jwt.JwtValidator import pl.touk.nussknacker.ui.security.oidc.OidcService.createJwtValidator import sttp.client3.SttpBackend diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/ssl/HttpsConnectionContextFactory.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/ssl/HttpsConnectionContextFactory.scala index 7943f664510..89c0a65e405 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/ssl/HttpsConnectionContextFactory.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/ssl/HttpsConnectionContextFactory.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.ui.security.ssl -import java.security.{KeyStore, SecureRandom} - import akka.http.scaladsl.{ConnectionContext, HttpsConnectionContext} + +import java.security.{KeyStore, SecureRandom} import javax.net.ssl.{KeyManagerFactory, SSLContext, TrustManagerFactory} object HttpsConnectionContextFactory { diff --git a/security/src/main/scala/pl/touk/nussknacker/ui/security/ssl/SslConfigParser.scala b/security/src/main/scala/pl/touk/nussknacker/ui/security/ssl/SslConfigParser.scala index fe1d8e3f55a..d5c382aaf24 100644 --- a/security/src/main/scala/pl/touk/nussknacker/ui/security/ssl/SslConfigParser.scala +++ b/security/src/main/scala/pl/touk/nussknacker/ui/security/ssl/SslConfigParser.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.ui.security.ssl -import java.io.File - import com.typesafe.config.Config +import java.io.File + object SslConfigParser { private val SslPath = "ssl" diff --git a/security/src/test/scala/pl/touk/nussknacker/ui/security/api/AuthenticationConfigurationSpec.scala b/security/src/test/scala/pl/touk/nussknacker/ui/security/api/AuthenticationConfigurationSpec.scala index 3d2c6c5d8a7..8a1b218ccda 100644 --- a/security/src/test/scala/pl/touk/nussknacker/ui/security/api/AuthenticationConfigurationSpec.scala +++ b/security/src/test/scala/pl/touk/nussknacker/ui/security/api/AuthenticationConfigurationSpec.scala @@ -2,6 +2,7 @@ package pl.touk.nussknacker.ui.security.api import akka.http.scaladsl.testkit.ScalatestRouteTest import com.typesafe.config.ConfigFactory +import com.typesafe.config.ConfigValueFactory.fromAnyRef import org.scalatest.OptionValues import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers @@ -9,7 +10,6 @@ import pl.touk.nussknacker.engine.util.ResourceLoader import pl.touk.nussknacker.engine.util.cache.CacheConfig import pl.touk.nussknacker.ui.security.basicauth.BasicAuthenticationConfiguration import pl.touk.nussknacker.ui.security.oauth2.OAuth2Configuration -import com.typesafe.config.ConfigValueFactory.fromAnyRef import scala.concurrent.duration._ diff --git a/security/src/test/scala/pl/touk/nussknacker/ui/security/api/LoggedUserTest.scala b/security/src/test/scala/pl/touk/nussknacker/ui/security/api/LoggedUserTest.scala index aef7982c73a..153932424a1 100644 --- a/security/src/test/scala/pl/touk/nussknacker/ui/security/api/LoggedUserTest.scala +++ b/security/src/test/scala/pl/touk/nussknacker/ui/security/api/LoggedUserTest.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.ui.security.api import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.prop.TableDrivenPropertyChecks._ import org.scalatest.prop.{TableFor2, TableFor3, TableFor4} +import org.scalatest.prop.TableDrivenPropertyChecks._ import pl.touk.nussknacker.ui.security.api.AuthenticationConfiguration.ConfigRule import pl.touk.nussknacker.ui.security.api.CreationError.ImpersonationNotAllowed diff --git a/security/src/test/scala/pl/touk/nussknacker/ui/security/api/RulesSetSpec.scala b/security/src/test/scala/pl/touk/nussknacker/ui/security/api/RulesSetSpec.scala index 12e850d70c4..d37a5c9a751 100644 --- a/security/src/test/scala/pl/touk/nussknacker/ui/security/api/RulesSetSpec.scala +++ b/security/src/test/scala/pl/touk/nussknacker/ui/security/api/RulesSetSpec.scala @@ -1,12 +1,13 @@ package pl.touk.nussknacker.ui.security.api -import org.scalatest.prop.TableDrivenPropertyChecks import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import pl.touk.nussknacker.ui.security.api.AuthenticationConfiguration.ConfigRule -import GlobalPermission.GlobalPermission +import org.scalatest.prop.TableDrivenPropertyChecks import pl.touk.nussknacker.security.Permission import pl.touk.nussknacker.security.Permission.Permission +import pl.touk.nussknacker.ui.security.api.AuthenticationConfiguration.ConfigRule + +import GlobalPermission.GlobalPermission class RulesSetSpec extends AnyFunSuite with Matchers with TableDrivenPropertyChecks { val emptyRule = ConfigRule(role = "") diff --git a/security/src/test/scala/pl/touk/nussknacker/ui/security/api/SecurityApiSpec.scala b/security/src/test/scala/pl/touk/nussknacker/ui/security/api/SecurityApiSpec.scala index 2c0b10d78a8..5de7a19fe3a 100644 --- a/security/src/test/scala/pl/touk/nussknacker/ui/security/api/SecurityApiSpec.scala +++ b/security/src/test/scala/pl/touk/nussknacker/ui/security/api/SecurityApiSpec.scala @@ -1,19 +1,19 @@ package pl.touk.nussknacker.ui.security.api -import java.nio.charset.StandardCharsets import akka.actor.ActorSystem import akka.http.scaladsl.model.StatusCodes import akka.http.scaladsl.model.headers._ +import akka.http.scaladsl.server.{AuthenticationFailedRejection, Directive1, Route} import akka.http.scaladsl.server.AuthenticationFailedRejection.CredentialsRejected import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.directives.BasicDirectives.{extractExecutionContext, provide} import akka.http.scaladsl.server.directives.{AuthenticationDirective, Credentials} +import akka.http.scaladsl.server.directives.BasicDirectives.{extractExecutionContext, provide} import akka.http.scaladsl.server.directives.FutureDirectives.onSuccess import akka.http.scaladsl.server.directives.RouteDirectives.reject -import akka.http.scaladsl.server.{AuthenticationFailedRejection, Directive1, Route} import akka.http.scaladsl.testkit.ScalatestRouteTest import org.scalatest.matchers.should.Matchers +import java.nio.charset.StandardCharsets import scala.concurrent.{ExecutionContext, Future} class SecurityApiSpec extends org.scalatest.flatspec.AnyFlatSpec with Matchers with ScalatestRouteTest { diff --git a/security/src/test/scala/pl/touk/nussknacker/ui/security/http/RecordingSttpBackend.scala b/security/src/test/scala/pl/touk/nussknacker/ui/security/http/RecordingSttpBackend.scala index 68cb33eb52e..710393ec3d7 100644 --- a/security/src/test/scala/pl/touk/nussknacker/ui/security/http/RecordingSttpBackend.scala +++ b/security/src/test/scala/pl/touk/nussknacker/ui/security/http/RecordingSttpBackend.scala @@ -1,12 +1,12 @@ package pl.touk.nussknacker.ui.security.http -import scala.language.higherKinds import sttp.capabilities.Effect import sttp.client3.{DelegateSttpBackend, Request, Response, SttpBackend} import sttp.monad.syntax._ import java.util.concurrent.atomic.AtomicReference import java.util.function.UnaryOperator +import scala.language.higherKinds import scala.util.{Failure, Success, Try} // This is taken from sttp3, extends original with 'clear()' method diff --git a/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/CachingOAuth2ServiceSpec.scala b/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/CachingOAuth2ServiceSpec.scala index 73726b7ce7a..b5fd7ec5f3f 100644 --- a/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/CachingOAuth2ServiceSpec.scala +++ b/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/CachingOAuth2ServiceSpec.scala @@ -2,9 +2,9 @@ package pl.touk.nussknacker.ui.security.oauth2 import com.github.benmanes.caffeine.cache.Ticker import org.scalatest.concurrent.ScalaFutures -import org.scalatest.time.{Millis, Seconds, Span} import org.scalatest.funspec.AnyFunSpec import org.scalatest.matchers.should.Matchers +import org.scalatest.time.{Millis, Seconds, Span} import pdi.jwt.{JwtAlgorithm, JwtCirce, JwtClaim} import pl.touk.nussknacker.ui.security.oidc.{DefaultOidcAuthorizationData, OidcUserInfo} diff --git a/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/ExampleOAuth2ServiceFactory.scala b/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/ExampleOAuth2ServiceFactory.scala index ed3b1a25ba6..80d575c0d1e 100644 --- a/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/ExampleOAuth2ServiceFactory.scala +++ b/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/ExampleOAuth2ServiceFactory.scala @@ -8,8 +8,8 @@ import pl.touk.nussknacker.ui.security.oauth2.ExampleOAuth2ServiceFactory.{TestA import sttp.client3.SttpBackend import java.net.URI -import scala.concurrent.duration.FiniteDuration import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.duration.FiniteDuration class ExampleOAuth2Service(clientApi: OAuth2ClientApi[TestProfileResponse, TestAccessTokenResponse])( implicit ec: ExecutionContext diff --git a/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/ExampleOAuth2ServiceFactorySpec.scala b/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/ExampleOAuth2ServiceFactorySpec.scala index 4bd5fbe53e4..383d840a2dc 100644 --- a/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/ExampleOAuth2ServiceFactorySpec.scala +++ b/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/ExampleOAuth2ServiceFactorySpec.scala @@ -15,8 +15,8 @@ import sttp.client3.testing.SttpBackendStub import sttp.model.{StatusCode, Uri} import java.net.URI -import scala.concurrent.duration.{FiniteDuration, SECONDS} import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.duration.{FiniteDuration, SECONDS} class ExampleOAuth2ServiceFactorySpec extends AnyFlatSpec with Matchers with PatientScalaFutures with Suite { diff --git a/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/JwtOAuth2ServiceSpec.scala b/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/JwtOAuth2ServiceSpec.scala index 5904def9158..e8e2393b1c3 100644 --- a/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/JwtOAuth2ServiceSpec.scala +++ b/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/JwtOAuth2ServiceSpec.scala @@ -2,9 +2,9 @@ package pl.touk.nussknacker.ui.security.oauth2 import com.typesafe.config.ConfigFactory import io.circe.Decoder +import org.scalatest.concurrent.ScalaFutures import org.scalatest.funspec.AnyFunSpec import org.scalatest.matchers.should.Matchers -import org.scalatest.concurrent.ScalaFutures import org.scalatest.time.{Millis, Seconds, Span} import pdi.jwt.{JwtAlgorithm, JwtCirce, JwtClaim} import pl.touk.nussknacker.ui.security.http.RecordingSttpBackend diff --git a/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2AuthenticationResourcesSpec.scala b/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2AuthenticationResourcesSpec.scala index ff8d0de1ec5..a273e47efe7 100644 --- a/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2AuthenticationResourcesSpec.scala +++ b/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2AuthenticationResourcesSpec.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.ui.security.oauth2 import akka.http.scaladsl.model.StatusCodes -import akka.http.scaladsl.model.headers.{HttpCookie, `Set-Cookie`} +import akka.http.scaladsl.model.headers.{`Set-Cookie`, HttpCookie} import akka.http.scaladsl.testkit.ScalatestRouteTest import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport import io.circe.Json diff --git a/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ClientApiSpec.scala b/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ClientApiSpec.scala index de206518063..e2e72246448 100644 --- a/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ClientApiSpec.scala +++ b/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ClientApiSpec.scala @@ -1,15 +1,15 @@ package pl.touk.nussknacker.ui.security.oauth2 -import org.scalatest.Inside.inside import org.scalatest.{BeforeAndAfter, Suite} +import org.scalatest.Inside.inside +import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.test.PatientScalaFutures import pl.touk.nussknacker.ui.security.http.RecordingSttpBackend +import pl.touk.nussknacker.ui.security.oidc.DefaultOidcAuthorizationData import sttp.client3.StringBody import sttp.client3.testing.SttpBackendStub import sttp.model.{Header, HeaderNames, MediaType, Uri} -import org.scalatest.flatspec.AnyFlatSpec -import pl.touk.nussknacker.ui.security.oidc.DefaultOidcAuthorizationData import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future diff --git a/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ServiceProviderSpec.scala b/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ServiceProviderSpec.scala index 2492428209e..45f8f52b33a 100644 --- a/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ServiceProviderSpec.scala +++ b/security/src/test/scala/pl/touk/nussknacker/ui/security/oauth2/OAuth2ServiceProviderSpec.scala @@ -4,11 +4,11 @@ import org.asynchttpclient.DefaultAsyncHttpClientConfig import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers import pl.touk.nussknacker.ui.security.api.LoggedUser -import sttp.client3.asynchttpclient.future.AsyncHttpClientFutureBackend import sttp.client3.SttpBackend +import sttp.client3.asynchttpclient.future.AsyncHttpClientFutureBackend -import scala.concurrent.Future import scala.concurrent.ExecutionContext.Implicits.global +import scala.concurrent.Future class OAuth2ServiceProviderSpec extends AnyFlatSpec with Matchers { implicit val backend: SttpBackend[Future, Any] = diff --git a/security/src/test/scala/pl/touk/nussknacker/ui/security/oidc/OidcProfileAuthenticationTest.scala b/security/src/test/scala/pl/touk/nussknacker/ui/security/oidc/OidcProfileAuthenticationTest.scala index 6ab1f279a4c..466d8a833ca 100644 --- a/security/src/test/scala/pl/touk/nussknacker/ui/security/oidc/OidcProfileAuthenticationTest.scala +++ b/security/src/test/scala/pl/touk/nussknacker/ui/security/oidc/OidcProfileAuthenticationTest.scala @@ -4,8 +4,8 @@ import com.typesafe.config.ConfigFactory import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks -import pl.touk.nussknacker.ui.security.api.AuthenticatedUser import pl.touk.nussknacker.test.PatientScalaFutures +import pl.touk.nussknacker.ui.security.api.AuthenticatedUser import pl.touk.nussknacker.ui.security.oauth2.{IntrospectedAccessTokenData, OAuth2Configuration, UsernameClaim} import java.util.UUID diff --git a/security/src/test/scala/pl/touk/nussknacker/ui/security/oidc/OidcServiceSpec.scala b/security/src/test/scala/pl/touk/nussknacker/ui/security/oidc/OidcServiceSpec.scala index 17db5343379..235464d8f6d 100644 --- a/security/src/test/scala/pl/touk/nussknacker/ui/security/oidc/OidcServiceSpec.scala +++ b/security/src/test/scala/pl/touk/nussknacker/ui/security/oidc/OidcServiceSpec.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.ui.security.oidc import cats.data.Validated.Invalid +import org.scalatest.{Inside, OptionValues} import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import org.scalatest.{Inside, OptionValues} import pdi.jwt._ import pl.touk.nussknacker.test.EitherValuesDetailedMessage import pl.touk.nussknacker.ui.security.oauth2.OAuth2ErrorHandler.{ diff --git a/utils/components-testkit/src/main/scala/pl/touk/nussknacker/engine/util/test/TestScenarioRunner.scala b/utils/components-testkit/src/main/scala/pl/touk/nussknacker/engine/util/test/TestScenarioRunner.scala index a5eaf3a2e02..2509e5aad7d 100644 --- a/utils/components-testkit/src/main/scala/pl/touk/nussknacker/engine/util/test/TestScenarioRunner.scala +++ b/utils/components-testkit/src/main/scala/pl/touk/nussknacker/engine/util/test/TestScenarioRunner.scala @@ -7,12 +7,12 @@ import pl.touk.nussknacker.engine.api.process.ComponentUseCase import pl.touk.nussknacker.engine.api.process.ComponentUseCase.{EngineRuntime, TestRuntime} import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess import pl.touk.nussknacker.engine.resultcollector.{ProductionServiceInvocationCollector, ResultCollector} -import pl.touk.nussknacker.engine.testmode.TestProcess.ExceptionResult import pl.touk.nussknacker.engine.testmode.{ ResultsCollectingListener, ResultsCollectingListenerHolder, TestServiceInvocationCollector } +import pl.touk.nussknacker.engine.testmode.TestProcess.ExceptionResult import pl.touk.nussknacker.engine.util.test.TestScenarioRunner.RunnerListResult import scala.reflect.ClassTag diff --git a/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/parameters/SchemaBasedParameter.scala b/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/parameters/SchemaBasedParameter.scala index a87ff6c47f8..12beba84c98 100644 --- a/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/parameters/SchemaBasedParameter.scala +++ b/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/parameters/SchemaBasedParameter.scala @@ -1,10 +1,10 @@ package pl.touk.nussknacker.engine.util.parameters import cats.data.{NonEmptyList, ValidatedNel} +import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.context.ProcessCompilationError import pl.touk.nussknacker.engine.api.context.transformation.BaseDefinedParameter import pl.touk.nussknacker.engine.api.definition.Parameter -import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.util.output.OutputValidatorErrorsConverter import pl.touk.nussknacker.engine.util.parameters.SchemaBasedParameter.RecordFieldName diff --git a/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/parameters/TypingResultValidator.scala b/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/parameters/TypingResultValidator.scala index 0055588d5a1..57e377a939f 100644 --- a/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/parameters/TypingResultValidator.scala +++ b/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/parameters/TypingResultValidator.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.util.parameters -import pl.touk.nussknacker.engine.util.output.OutputValidatorError -import pl.touk.nussknacker.engine.api.typed.typing.TypingResult import cats.data.{Validated, ValidatedNel} +import pl.touk.nussknacker.engine.api.typed.typing.TypingResult +import pl.touk.nussknacker.engine.util.output.OutputValidatorError trait TypingResultValidator { def validate(typingResult: TypingResult): ValidatedNel[OutputValidatorError, Unit] diff --git a/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/service/EagerServiceWithStaticParameters.scala b/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/service/EagerServiceWithStaticParameters.scala index 675e829cc14..fe099bcb704 100644 --- a/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/service/EagerServiceWithStaticParameters.scala +++ b/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/service/EagerServiceWithStaticParameters.scala @@ -2,25 +2,25 @@ package pl.touk.nussknacker.engine.util.service import cats.data.Validated.Valid import cats.data.ValidatedNel +import pl.touk.nussknacker.engine.api._ +import pl.touk.nussknacker.engine.api.NodeId +import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext} import pl.touk.nussknacker.engine.api.context.transformation.{ DefinedSingleParameter, NodeDependencyValue, SingleInputDynamicComponent, WithStaticParameters } -import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext} import pl.touk.nussknacker.engine.api.definition.{ NodeDependency, OutputVariableNameDependency, Parameter, TypedNodeDependency } +import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.ComponentUseCase import pl.touk.nussknacker.engine.api.test.InvocationCollectors import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult, Unknown} -import pl.touk.nussknacker.engine.api._ -import pl.touk.nussknacker.engine.api.NodeId -import pl.touk.nussknacker.engine.api.parameter.ParameterName import scala.concurrent.{ExecutionContext, Future} import scala.runtime.BoxedUnit diff --git a/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/service/EnricherContextTransformation.scala b/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/service/EnricherContextTransformation.scala index 326a2df4be7..a037f469d77 100644 --- a/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/service/EnricherContextTransformation.scala +++ b/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/service/EnricherContextTransformation.scala @@ -1,11 +1,11 @@ package pl.touk.nussknacker.engine.util.service -import cats.data.Validated.Valid import cats.data.{NonEmptyList, Validated} +import cats.data.Validated.Valid +import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.ServiceInvoker import pl.touk.nussknacker.engine.api.context.{ContextTransformation, OutputVar, ProcessCompilationError} import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.api.NodeId /* Helper for defining enrichers where return type depends on parameter values diff --git a/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/service/TimeMeasuringService.scala b/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/service/TimeMeasuringService.scala index e2a914d9447..a2b02dfd7f3 100644 --- a/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/service/TimeMeasuringService.scala +++ b/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/service/TimeMeasuringService.scala @@ -7,8 +7,8 @@ import pl.touk.nussknacker.engine.api.runtimecontext.EngineRuntimeContext import pl.touk.nussknacker.engine.util.SafeLazyValues import pl.touk.nussknacker.engine.util.metrics.MetricIdentifier -import scala.concurrent.duration.{Duration, DurationInt} import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.duration.{Duration, DurationInt} import scala.util.{Failure, Success, Try} trait TimeMeasuringService extends Lifecycle { self: Service => diff --git a/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/sinkvalue/SinkValue.scala b/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/sinkvalue/SinkValue.scala index 5868b74d1dd..2ff6c96bb60 100644 --- a/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/sinkvalue/SinkValue.scala +++ b/utils/components-utils/src/main/scala/pl/touk/nussknacker/engine/util/sinkvalue/SinkValue.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.engine.util.sinkvalue import pl.touk.nussknacker.engine.api.{LazyParameter, Params} +import pl.touk.nussknacker.engine.util.parameters.{SchemaBasedRecordParameter, SingleSchemaBasedParameter} import pl.touk.nussknacker.engine.util.parameters.SchemaBasedParameter import pl.touk.nussknacker.engine.util.sinkvalue.SinkValueData._ -import pl.touk.nussknacker.engine.util.parameters.{SchemaBasedRecordParameter, SingleSchemaBasedParameter} import scala.util.Try diff --git a/utils/default-helpers/src/main/scala/pl/touk/nussknacker/engine/util/functions/collection.scala b/utils/default-helpers/src/main/scala/pl/touk/nussknacker/engine/util/functions/collection.scala index 6db68509cd1..80456a40ce6 100644 --- a/utils/default-helpers/src/main/scala/pl/touk/nussknacker/engine/util/functions/collection.scala +++ b/utils/default-helpers/src/main/scala/pl/touk/nussknacker/engine/util/functions/collection.scala @@ -3,6 +3,7 @@ package pl.touk.nussknacker.engine.util.functions import cats.data.ValidatedNel import cats.implicits._ import org.springframework.util.{NumberUtils => SpringNumberUtils} +import pl.touk.nussknacker.engine.api.{Documentation, HideToString, ParamName} import pl.touk.nussknacker.engine.api.generics.{GenericFunctionTypingError, GenericType, TypingFunction} import pl.touk.nussknacker.engine.api.typed.supertype.NumberTypesPromotionStrategy.ForLargeNumbersOperation import pl.touk.nussknacker.engine.api.typed.typing @@ -15,7 +16,6 @@ import pl.touk.nussknacker.engine.api.typed.typing.{ TypingResult, Unknown } -import pl.touk.nussknacker.engine.api.{Documentation, HideToString, ParamName} import java.util.{Collections, Objects} import scala.annotation.{tailrec, varargs} diff --git a/utils/default-helpers/src/main/scala/pl/touk/nussknacker/engine/util/functions/conversion.scala b/utils/default-helpers/src/main/scala/pl/touk/nussknacker/engine/util/functions/conversion.scala index de8998f4cc9..0275bdcc94a 100644 --- a/utils/default-helpers/src/main/scala/pl/touk/nussknacker/engine/util/functions/conversion.scala +++ b/utils/default-helpers/src/main/scala/pl/touk/nussknacker/engine/util/functions/conversion.scala @@ -1,9 +1,9 @@ package pl.touk.nussknacker.engine.util.functions import com.github.ghik.silencer.silent +import pl.touk.nussknacker.engine.api.{Documentation, HideToString, ParamName} import pl.touk.nussknacker.engine.api.generics.GenericType import pl.touk.nussknacker.engine.api.json.FromJsonDecoder -import pl.touk.nussknacker.engine.api.{Documentation, HideToString, ParamName} import pl.touk.nussknacker.engine.util.functions.NumericUtils.ToNumberTypingFunction import pl.touk.nussknacker.engine.util.json.ToJsonEncoder diff --git a/utils/default-helpers/src/main/scala/pl/touk/nussknacker/engine/util/functions/numeric.scala b/utils/default-helpers/src/main/scala/pl/touk/nussknacker/engine/util/functions/numeric.scala index 057a0d8692e..97b5eafb989 100644 --- a/utils/default-helpers/src/main/scala/pl/touk/nussknacker/engine/util/functions/numeric.scala +++ b/utils/default-helpers/src/main/scala/pl/touk/nussknacker/engine/util/functions/numeric.scala @@ -2,6 +2,7 @@ package pl.touk.nussknacker.engine.util.functions import cats.data.{NonEmptyList, ValidatedNel} import cats.implicits.catsSyntaxValidatedId +import pl.touk.nussknacker.engine.api.{Documentation, HideToString, ParamName} import pl.touk.nussknacker.engine.api.generics.{ GenericFunctionTypingError, GenericType, @@ -12,7 +13,6 @@ import pl.touk.nussknacker.engine.api.generics.{ import pl.touk.nussknacker.engine.api.typed.supertype.NumberTypesPromotionStrategy import pl.touk.nussknacker.engine.api.typed.typing import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{Documentation, HideToString, ParamName} import pl.touk.nussknacker.engine.util.MathUtils import pl.touk.nussknacker.engine.util.functions.NumericUtils.{ LargeNumberOperatorTypingFunction, diff --git a/utils/default-helpers/src/test/scala/pl/touk/nussknacker/engine/util/functions/BaseSpelSpec.scala b/utils/default-helpers/src/test/scala/pl/touk/nussknacker/engine/util/functions/BaseSpelSpec.scala index 8f23f0c655e..eef2bbf5e82 100644 --- a/utils/default-helpers/src/test/scala/pl/touk/nussknacker/engine/util/functions/BaseSpelSpec.scala +++ b/utils/default-helpers/src/test/scala/pl/touk/nussknacker/engine/util/functions/BaseSpelSpec.scala @@ -13,7 +13,7 @@ import pl.touk.nussknacker.engine.testing.ModelDefinitionBuilder import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap import java.text.ParseException -import java.time.{Clock, ZoneOffset, ZonedDateTime} +import java.time.{Clock, ZonedDateTime, ZoneOffset} import java.util.Locale import scala.reflect.runtime.universe._ diff --git a/utils/default-helpers/src/test/scala/pl/touk/nussknacker/engine/util/functions/ConversionUtilsSpec.scala b/utils/default-helpers/src/test/scala/pl/touk/nussknacker/engine/util/functions/ConversionUtilsSpec.scala index b4c9f4ce5ff..057cf958980 100644 --- a/utils/default-helpers/src/test/scala/pl/touk/nussknacker/engine/util/functions/ConversionUtilsSpec.scala +++ b/utils/default-helpers/src/test/scala/pl/touk/nussknacker/engine/util/functions/ConversionUtilsSpec.scala @@ -5,6 +5,7 @@ import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks._ import pl.touk.nussknacker.engine.spel.SpelExpressionEvaluationException + import java.math.{BigDecimal => JBigDecimal} import java.util.{List => JList} import java.util.{Map => JMap} diff --git a/utils/default-helpers/src/test/scala/pl/touk/nussknacker/engine/util/functions/DateFormatUtilsSpelSpec.scala b/utils/default-helpers/src/test/scala/pl/touk/nussknacker/engine/util/functions/DateFormatUtilsSpelSpec.scala index 43a6acdcbf5..f3998167eee 100644 --- a/utils/default-helpers/src/test/scala/pl/touk/nussknacker/engine/util/functions/DateFormatUtilsSpelSpec.scala +++ b/utils/default-helpers/src/test/scala/pl/touk/nussknacker/engine/util/functions/DateFormatUtilsSpelSpec.scala @@ -3,7 +3,7 @@ package pl.touk.nussknacker.engine.util.functions import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import java.time.{Instant, LocalDate, LocalDateTime, LocalTime, OffsetDateTime, ZoneId, ZoneOffset, ZonedDateTime} +import java.time.{Instant, LocalDate, LocalDateTime, LocalTime, OffsetDateTime, ZonedDateTime, ZoneId, ZoneOffset} import scala.reflect.runtime.universe._ class DateFormatUtilsSpelSpec extends AnyFunSuite with BaseSpelSpec with Matchers { diff --git a/utils/default-helpers/src/test/scala/pl/touk/nussknacker/engine/util/functions/NumericUtilsSpec.scala b/utils/default-helpers/src/test/scala/pl/touk/nussknacker/engine/util/functions/NumericUtilsSpec.scala index cd10e6987a1..394538aa06c 100644 --- a/utils/default-helpers/src/test/scala/pl/touk/nussknacker/engine/util/functions/NumericUtilsSpec.scala +++ b/utils/default-helpers/src/test/scala/pl/touk/nussknacker/engine/util/functions/NumericUtilsSpec.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.util.functions +import cats.implicits._ import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import cats.implicits._ class NumericUtilsSpec extends AnyFunSuite with BaseSpelSpec with Matchers { diff --git a/utils/flink-components-testkit/src/main/scala/pl/touk/nussknacker/engine/flink/util/test/FlinkTestScenarioRunner.scala b/utils/flink-components-testkit/src/main/scala/pl/touk/nussknacker/engine/flink/util/test/FlinkTestScenarioRunner.scala index f61752ef28a..65523d90979 100644 --- a/utils/flink-components-testkit/src/main/scala/pl/touk/nussknacker/engine/flink/util/test/FlinkTestScenarioRunner.scala +++ b/utils/flink-components-testkit/src/main/scala/pl/touk/nussknacker/engine/flink/util/test/FlinkTestScenarioRunner.scala @@ -2,7 +2,7 @@ package pl.touk.nussknacker.engine.flink.util.test import com.typesafe.config.{Config, ConfigValueFactory} import org.apache.flink.api.connector.source.Boundedness -import org.scalatest.concurrent.ScalaFutures.{PatienceConfig, convertScalaFuture, scaled} +import org.scalatest.concurrent.ScalaFutures.{convertScalaFuture, scaled, PatienceConfig} import org.scalatest.time.{Millis, Seconds, Span} import pl.touk.nussknacker.defaultmodel.DefaultConfigCreator import pl.touk.nussknacker.engine.api.ProcessVersion @@ -21,14 +21,14 @@ import pl.touk.nussknacker.engine.flink.util.test.TestResultSinkFactory.Output import pl.touk.nussknacker.engine.flink.util.test.testComponents._ import pl.touk.nussknacker.engine.flink.util.transformer.FlinkBaseComponentProvider import pl.touk.nussknacker.engine.graph.node +import pl.touk.nussknacker.engine.process.{ExecutionConfigPreparer, FlinkJobConfig} import pl.touk.nussknacker.engine.process.FlinkJobConfig.ExecutionMode.ExecutionMode import pl.touk.nussknacker.engine.process.registrar.FlinkProcessRegistrar -import pl.touk.nussknacker.engine.process.{ExecutionConfigPreparer, FlinkJobConfig} import pl.touk.nussknacker.engine.testing.LocalModelData import pl.touk.nussknacker.engine.testmode.TestRunId +import pl.touk.nussknacker.engine.util.test._ import pl.touk.nussknacker.engine.util.test.TestScenarioCollectorHandler.TestScenarioCollectorHandler import pl.touk.nussknacker.engine.util.test.TestScenarioRunner.{RunnerListResult, RunnerResultUnit} -import pl.touk.nussknacker.engine.util.test._ import scala.concurrent.duration.DurationInt import scala.reflect.ClassTag diff --git a/utils/http-utils/src/main/scala/pl/touk/nussknacker/http/backend/SttpJson.scala b/utils/http-utils/src/main/scala/pl/touk/nussknacker/http/backend/SttpJson.scala index ea19671a61e..e848fe564d6 100644 --- a/utils/http-utils/src/main/scala/pl/touk/nussknacker/http/backend/SttpJson.scala +++ b/utils/http-utils/src/main/scala/pl/touk/nussknacker/http/backend/SttpJson.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.http.backend import io.circe.{Decoder, Error} +import sttp.client3.{asString, HttpError, Response, ResponseAs, ResponseException} import sttp.client3.circe.deserializeJson -import sttp.client3.{HttpError, Response, ResponseAs, ResponseException, asString} import sttp.model.StatusCode import sttp.monad.MonadError diff --git a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/JsonDefaultExpressionDeterminer.scala b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/JsonDefaultExpressionDeterminer.scala index 50e0798b5e9..8daac433531 100644 --- a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/JsonDefaultExpressionDeterminer.scala +++ b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/JsonDefaultExpressionDeterminer.scala @@ -11,8 +11,8 @@ import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.graph.expression.Expression import pl.touk.nussknacker.engine.json.JsonDefaultExpressionDeterminer.{InvalidValue, NullNotAllowed, TypeNotSupported} -import scala.reflect.ClassTag import scala.language.implicitConversions +import scala.reflect.ClassTag object JsonDefaultExpressionDeterminer { diff --git a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/JsonSchemaBasedParameter.scala b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/JsonSchemaBasedParameter.scala index edbeda5e807..c24fb56656a 100644 --- a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/JsonSchemaBasedParameter.scala +++ b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/JsonSchemaBasedParameter.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.json -import cats.data.Validated.Valid import cats.data.{NonEmptyList, Validated, ValidatedNel} +import cats.data.Validated.Valid import org.everit.json.schema.{ObjectSchema, Schema} import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.context.ProcessCompilationError diff --git a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/SwaggerBasedJsonSchemaTypeDefinitionExtractor.scala b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/SwaggerBasedJsonSchemaTypeDefinitionExtractor.scala index 550da1ae0c4..6610728e72a 100644 --- a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/SwaggerBasedJsonSchemaTypeDefinitionExtractor.scala +++ b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/SwaggerBasedJsonSchemaTypeDefinitionExtractor.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.json -import com.fasterxml.jackson.databind.node.ObjectNode import com.fasterxml.jackson.databind.ObjectMapper +import com.fasterxml.jackson.databind.node.ObjectNode import io.swagger.v3.oas.models.media import io.swagger.v3.parser.ObjectMapperFactory import org.everit.json.schema._ diff --git a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/encode/JsonSchemaOutputValidator.scala b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/encode/JsonSchemaOutputValidator.scala index d15d678e89a..18202df91ec 100644 --- a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/encode/JsonSchemaOutputValidator.scala +++ b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/encode/JsonSchemaOutputValidator.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.json.encode -import cats.data.Validated.condNel import cats.data.{NonEmptyList, Validated, ValidatedNel} +import cats.data.Validated.condNel import cats.implicits._ import com.typesafe.scalalogging.LazyLogging import org.apache.commons.lang3.ClassUtils @@ -57,10 +57,10 @@ object JsonSchemaOutputValidator { // root schema is a container for eventual ref schemas - in particular it can be the same schema as outputSchema class JsonSchemaOutputValidator(validationMode: ValidationMode) extends LazyLogging { - import JsonSchemaOutputValidator._ - import scala.jdk.CollectionConverters._ + import JsonSchemaOutputValidator._ + private val valid = Validated.Valid(()) /** diff --git a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/encode/JsonSchemaOutputValidatorPrinter.scala b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/encode/JsonSchemaOutputValidatorPrinter.scala index faba1f552f5..4da2b102836 100644 --- a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/encode/JsonSchemaOutputValidatorPrinter.scala +++ b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/encode/JsonSchemaOutputValidatorPrinter.scala @@ -9,9 +9,10 @@ import scala.jdk.CollectionConverters._ class JsonSchemaOutputValidatorPrinter(parentSchema: Schema) { - import OutputValidatorErrorsMessageFormatter._ import pl.touk.nussknacker.engine.util.json.JsonSchemaImplicits._ + import OutputValidatorErrorsMessageFormatter._ + private implicit class ListTypesPrinter(list: List[String]) { def printType: String = list.mkString(TypesSeparator) } diff --git a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/encode/ToJsonSchemaBasedEncoder.scala b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/encode/ToJsonSchemaBasedEncoder.scala index 0a1428ff3ea..a65476d228b 100644 --- a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/encode/ToJsonSchemaBasedEncoder.scala +++ b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/encode/ToJsonSchemaBasedEncoder.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.json.encode -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, Validated} +import cats.data.Validated.{Invalid, Valid} import cats.implicits.toTraverseOps import io.circe.Json import org.everit.json.schema._ diff --git a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/swagger/SwaggerTyped.scala b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/swagger/SwaggerTyped.scala index 6d91c2c2cb0..e2402e4931f 100644 --- a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/swagger/SwaggerTyped.scala +++ b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/swagger/SwaggerTyped.scala @@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.node.{ArrayNode, ObjectNode} import io.circe.{Decoder, Encoder, Json} import io.circe.generic.JsonCodec import io.swagger.v3.oas.models.media.{ArraySchema, MapSchema, ObjectSchema, Schema} +import pl.touk.nussknacker.engine.api.json.FromJsonDecoder.jsonToAny import pl.touk.nussknacker.engine.api.typed.typing._ import pl.touk.nussknacker.engine.json.swagger.parser.{PropertyName, SwaggerRefSchemas} import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap -import pl.touk.nussknacker.engine.api.json.FromJsonDecoder.jsonToAny import pl.touk.nussknacker.engine.util.json.ToJsonEncoder import java.time.{LocalDate, LocalTime, ZonedDateTime} diff --git a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/swagger/decode/FromJsonSchemaBasedDecoder.scala b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/swagger/decode/FromJsonSchemaBasedDecoder.scala index cfe524b9b21..3b4eae5f291 100644 --- a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/swagger/decode/FromJsonSchemaBasedDecoder.scala +++ b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/swagger/decode/FromJsonSchemaBasedDecoder.scala @@ -5,8 +5,8 @@ import pl.touk.nussknacker.engine.api.json.FromJsonDecoder import pl.touk.nussknacker.engine.api.typed.TypedMap import pl.touk.nussknacker.engine.json.swagger._ -import java.time.format.DateTimeFormatter import java.time.{LocalDate, OffsetTime, ZonedDateTime} +import java.time.format.DateTimeFormatter import scala.util.Try // TODO: Validated diff --git a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/util/json/JsonSchemaUtils.scala b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/util/json/JsonSchemaUtils.scala index dde4612d895..402579b38e0 100644 --- a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/util/json/JsonSchemaUtils.scala +++ b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/util/json/JsonSchemaUtils.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.util.json -import io.circe.Json._ import io.circe.{Json, JsonObject} +import io.circe.Json._ import org.json.{JSONArray, JSONObject, JSONTokener} import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap diff --git a/utils/json-utils/src/test/scala/pl/touk/nussknacker/engine/json/SwaggerBasedJsonSchemaTypeDefinitionExtractorTest.scala b/utils/json-utils/src/test/scala/pl/touk/nussknacker/engine/json/SwaggerBasedJsonSchemaTypeDefinitionExtractorTest.scala index a9aaa197edf..48b7293af2d 100644 --- a/utils/json-utils/src/test/scala/pl/touk/nussknacker/engine/json/SwaggerBasedJsonSchemaTypeDefinitionExtractorTest.scala +++ b/utils/json-utils/src/test/scala/pl/touk/nussknacker/engine/json/SwaggerBasedJsonSchemaTypeDefinitionExtractorTest.scala @@ -7,8 +7,8 @@ import org.scalatest.matchers.should.Matchers.convertToAnyShouldWrapper import org.scalatest.prop.TableDrivenPropertyChecks import pl.touk.nussknacker.engine.api.typed.TypedMap import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypedObjectTypingResult, TypingResult, Unknown} -import pl.touk.nussknacker.engine.json.swagger.decode.FromJsonSchemaBasedDecoder import pl.touk.nussknacker.engine.json.swagger._ +import pl.touk.nussknacker.engine.json.swagger.decode.FromJsonSchemaBasedDecoder class SwaggerBasedJsonSchemaTypeDefinitionExtractorTest extends AnyFunSuite with TableDrivenPropertyChecks { diff --git a/utils/json-utils/src/test/scala/pl/touk/nussknacker/engine/json/encode/JsonSchemaOutputValidatorTest.scala b/utils/json-utils/src/test/scala/pl/touk/nussknacker/engine/json/encode/JsonSchemaOutputValidatorTest.scala index f5a1bad46fe..e61894374a4 100644 --- a/utils/json-utils/src/test/scala/pl/touk/nussknacker/engine/json/encode/JsonSchemaOutputValidatorTest.scala +++ b/utils/json-utils/src/test/scala/pl/touk/nussknacker/engine/json/encode/JsonSchemaOutputValidatorTest.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.engine.json.encode import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.prop.TableDrivenPropertyChecks -import pl.touk.nussknacker.engine.api.typed.typing.Typed._ import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypedObjectTypingResult, TypingResult, Unknown} +import pl.touk.nussknacker.engine.api.typed.typing.Typed._ import pl.touk.nussknacker.engine.api.validation.ValidationMode import pl.touk.nussknacker.engine.json.JsonSchemaBuilder diff --git a/utils/json-utils/src/test/scala/pl/touk/nussknacker/engine/json/encode/ToJsonSchemaBasedEncoderTest.scala b/utils/json-utils/src/test/scala/pl/touk/nussknacker/engine/json/encode/ToJsonSchemaBasedEncoderTest.scala index 7f8f2786bf0..23141e3121e 100644 --- a/utils/json-utils/src/test/scala/pl/touk/nussknacker/engine/json/encode/ToJsonSchemaBasedEncoderTest.scala +++ b/utils/json-utils/src/test/scala/pl/touk/nussknacker/engine/json/encode/ToJsonSchemaBasedEncoderTest.scala @@ -3,7 +3,7 @@ package pl.touk.nussknacker.engine.json.encode import cats.data.NonEmptyList import cats.data.Validated.{Invalid, Valid} import io.circe.Json -import io.circe.Json.{Null, obj} +import io.circe.Json.{obj, Null} import org.everit.json.schema._ import org.scalatest.Inside.inside import org.scalatest.LoneElement._ @@ -13,11 +13,11 @@ import org.scalatest.matchers.should.Matchers._ import org.scalatest.prop.TableDrivenPropertyChecks._ import pl.touk.nussknacker.engine.api.validation.ValidationMode import pl.touk.nussknacker.engine.json.JsonSchemaBuilder -import pl.touk.nussknacker.test.ProcessUtils.convertToAnyShouldWrapper import pl.touk.nussknacker.test.{EitherValuesDetailedMessage, ValidatedValuesDetailedMessage} +import pl.touk.nussknacker.test.ProcessUtils.convertToAnyShouldWrapper -import java.time.format.DateTimeFormatter import java.time.{LocalDate, OffsetTime, ZonedDateTime} +import java.time.format.DateTimeFormatter import java.util.Collections class ToJsonSchemaBasedEncoderTest diff --git a/utils/json-utils/src/test/scala/pl/touk/nussknacker/engine/json/swagger/decode/FromJsonSchemaBasedDecoderTest.scala b/utils/json-utils/src/test/scala/pl/touk/nussknacker/engine/json/swagger/decode/FromJsonSchemaBasedDecoderTest.scala index 6f7ae4301f0..3f704ed6e59 100644 --- a/utils/json-utils/src/test/scala/pl/touk/nussknacker/engine/json/swagger/decode/FromJsonSchemaBasedDecoderTest.scala +++ b/utils/json-utils/src/test/scala/pl/touk/nussknacker/engine/json/swagger/decode/FromJsonSchemaBasedDecoderTest.scala @@ -8,8 +8,8 @@ import pl.touk.nussknacker.engine.api.typed.TypedMap import pl.touk.nussknacker.engine.json.swagger._ import pl.touk.nussknacker.engine.json.swagger.decode.FromJsonSchemaBasedDecoder.JsonToObjectError +import java.time.{LocalDate, OffsetTime, ZonedDateTime, ZoneOffset} import java.time.format.DateTimeFormatter -import java.time.{LocalDate, OffsetTime, ZoneOffset, ZonedDateTime} class FromJsonSchemaBasedDecoderTest extends AnyFunSuite with Matchers { diff --git a/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/consumerrecord/ConsumerRecordDeserializationSchemaFactory.scala b/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/consumerrecord/ConsumerRecordDeserializationSchemaFactory.scala index d2cf4776338..49633396d75 100644 --- a/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/consumerrecord/ConsumerRecordDeserializationSchemaFactory.scala +++ b/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/consumerrecord/ConsumerRecordDeserializationSchemaFactory.scala @@ -4,8 +4,8 @@ import cats.data.NonEmptyList import org.apache.kafka.clients.consumer.ConsumerRecord import org.apache.kafka.common.serialization.Deserializer import pl.touk.nussknacker.engine.api.process.TopicName +import pl.touk.nussknacker.engine.kafka.{serialization, KafkaConfig} import pl.touk.nussknacker.engine.kafka.serialization.{KafkaDeserializationSchema, KafkaDeserializationSchemaFactory} -import pl.touk.nussknacker.engine.kafka.{KafkaConfig, serialization} /** * Produces deserialization schema that describes how to turn the Kafka raw [[org.apache.kafka.clients.consumer.ConsumerRecord]] diff --git a/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/consumerrecord/ConsumerRecordToJsonFormatterFactory.scala b/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/consumerrecord/ConsumerRecordToJsonFormatterFactory.scala index 983aca975eb..1e73ed77ff1 100644 --- a/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/consumerrecord/ConsumerRecordToJsonFormatterFactory.scala +++ b/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/consumerrecord/ConsumerRecordToJsonFormatterFactory.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.engine.kafka.consumerrecord -import io.circe.generic.extras.semiauto.{deriveConfiguredDecoder, deriveConfiguredEncoder} import io.circe.{Decoder, Encoder} +import io.circe.generic.extras.semiauto.{deriveConfiguredDecoder, deriveConfiguredEncoder} import org.apache.kafka.clients.consumer.ConsumerRecord import pl.touk.nussknacker.engine.api.CirceUtil import pl.touk.nussknacker.engine.api.process.TopicName import pl.touk.nussknacker.engine.api.test.TestRecord -import pl.touk.nussknacker.engine.kafka.serialization.KafkaDeserializationSchema import pl.touk.nussknacker.engine.kafka.{KafkaConfig, RecordFormatter, RecordFormatterFactory} +import pl.touk.nussknacker.engine.kafka.serialization.KafkaDeserializationSchema import java.nio.charset.StandardCharsets import scala.reflect.ClassTag diff --git a/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/consumerrecord/SerializableConsumerRecord.scala b/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/consumerrecord/SerializableConsumerRecord.scala index 8a6d6f93081..096fae44427 100644 --- a/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/consumerrecord/SerializableConsumerRecord.scala +++ b/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/consumerrecord/SerializableConsumerRecord.scala @@ -4,9 +4,9 @@ import org.apache.kafka.clients.consumer.ConsumerRecord import org.apache.kafka.common.record.TimestampType import pl.touk.nussknacker.engine.api.process.TopicName import pl.touk.nussknacker.engine.kafka.KafkaRecordUtils +import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap import java.util.Optional -import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap /** * Wrapper for ConsumerRecord fields used for test data serialization, eg. json serialization. diff --git a/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/sink/KafkaSinkFactory.scala b/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/sink/KafkaSinkFactory.scala index 7f38a45d340..477b1771377 100644 --- a/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/sink/KafkaSinkFactory.scala +++ b/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/sink/KafkaSinkFactory.scala @@ -1,15 +1,15 @@ package pl.touk.nussknacker.engine.kafka.sink import cats.data.NonEmptyList +import pl.touk.nussknacker.engine.api.{LazyParameter, MetaData, MethodToInvoke, ParamName} import pl.touk.nussknacker.engine.api.editor.{DualEditor, DualEditorMode, SimpleEditor, SimpleEditorType} import pl.touk.nussknacker.engine.api.process.{ProcessObjectDependencies, Sink, SinkFactory, TopicName} -import pl.touk.nussknacker.engine.api.{LazyParameter, MetaData, MethodToInvoke, ParamName} +import pl.touk.nussknacker.engine.kafka.{serialization, KafkaComponentsUtils, KafkaConfig, PreparedKafkaTopic} import pl.touk.nussknacker.engine.kafka.serialization.{ FixedKafkaSerializationSchemaFactory, KafkaSerializationSchema, KafkaSerializationSchemaFactory } -import pl.touk.nussknacker.engine.kafka.{KafkaComponentsUtils, KafkaConfig, PreparedKafkaTopic, serialization} import javax.validation.constraints.NotBlank diff --git a/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/KafkaContextInitializer.scala b/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/KafkaContextInitializer.scala index b2860e10899..10a1c2d9052 100644 --- a/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/KafkaContextInitializer.scala +++ b/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/KafkaContextInitializer.scala @@ -2,6 +2,8 @@ package pl.touk.nussknacker.engine.kafka.source import cats.data.ValidatedNel import org.apache.kafka.clients.consumer.ConsumerRecord +import pl.touk.nussknacker.engine.api.{Context, VariableConstants} +import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext} import pl.touk.nussknacker.engine.api.process.{ BasicContextInitializer, @@ -10,8 +12,6 @@ import pl.touk.nussknacker.engine.api.process.{ } import pl.touk.nussknacker.engine.api.runtimecontext.ContextIdGenerator import pl.touk.nussknacker.engine.api.typed.typing.TypingResult -import pl.touk.nussknacker.engine.api.{Context, VariableConstants} -import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.kafka.KafkaRecordUtils import java.util diff --git a/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/KafkaSourceFactory.scala b/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/KafkaSourceFactory.scala index 78a39572c4d..370bcc260a9 100644 --- a/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/KafkaSourceFactory.scala +++ b/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/KafkaSourceFactory.scala @@ -4,18 +4,18 @@ import cats.data.NonEmptyList import io.circe.Json import org.apache.kafka.clients.consumer.ConsumerRecord import org.apache.kafka.common.record.TimestampType +import pl.touk.nussknacker.engine.api.{MetaData, NodeId, Params} import pl.touk.nussknacker.engine.api.component.UnboundedStreamComponent -import pl.touk.nussknacker.engine.api.context.transformation._ import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext} +import pl.touk.nussknacker.engine.api.context.transformation._ import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.namespaces.NamingStrategy import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.engine.api.test.TestRecord import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult, Unknown} -import pl.touk.nussknacker.engine.api.{MetaData, NodeId, Params} -import pl.touk.nussknacker.engine.kafka.KafkaFactory.TopicParamName import pl.touk.nussknacker.engine.kafka._ +import pl.touk.nussknacker.engine.kafka.KafkaFactory.TopicParamName import pl.touk.nussknacker.engine.kafka.serialization.{KafkaDeserializationSchema, KafkaDeserializationSchemaFactory} import pl.touk.nussknacker.engine.kafka.source.KafkaSourceFactory._ import pl.touk.nussknacker.engine.kafka.validator.WithCachedTopicsExistenceValidator diff --git a/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/delayed/DelayedKafkaSourceFactory.scala b/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/delayed/DelayedKafkaSourceFactory.scala index 3cca0d5a854..814a7348b3a 100644 --- a/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/delayed/DelayedKafkaSourceFactory.scala +++ b/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/delayed/DelayedKafkaSourceFactory.scala @@ -1,12 +1,12 @@ package pl.touk.nussknacker.engine.kafka.source.delayed +import pl.touk.nussknacker.engine.api.{NodeId, Params} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.editor.DualEditorMode import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.typed.typing.{TypedObjectTypingResult, TypingResult} -import pl.touk.nussknacker.engine.api.{NodeId, Params} import pl.touk.nussknacker.engine.util.TimestampUtils object DelayedKafkaSourceFactory { diff --git a/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/validator/CachedTopicsExistenceValidator.scala b/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/validator/CachedTopicsExistenceValidator.scala index 2c7b5836ff3..2606abc8e73 100644 --- a/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/validator/CachedTopicsExistenceValidator.scala +++ b/utils/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/validator/CachedTopicsExistenceValidator.scala @@ -6,9 +6,9 @@ import com.typesafe.scalalogging.LazyLogging import org.apache.kafka.clients.admin.{Admin, DescribeClusterOptions, DescribeConfigsOptions, ListTopicsOptions} import org.apache.kafka.common.config.ConfigResource import pl.touk.nussknacker.engine.api.process.TopicName +import pl.touk.nussknacker.engine.kafka.{KafkaConfig, KafkaUtils, UnspecializedTopicName} import pl.touk.nussknacker.engine.kafka.UnspecializedTopicName.ToUnspecializedTopicName import pl.touk.nussknacker.engine.kafka.validator.TopicsExistenceValidator.TopicValidationType -import pl.touk.nussknacker.engine.kafka.{KafkaConfig, KafkaUtils, UnspecializedTopicName} import pl.touk.nussknacker.engine.util.cache.SingleValueCache import scala.jdk.CollectionConverters._ diff --git a/utils/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/InputMetaToJsonSpec.scala b/utils/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/InputMetaToJsonSpec.scala index 2aa2972163b..9ea082ae6ba 100644 --- a/utils/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/InputMetaToJsonSpec.scala +++ b/utils/kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/source/InputMetaToJsonSpec.scala @@ -4,9 +4,9 @@ import io.circe.Json import io.circe.Json._ import io.circe.generic.JsonCodec import org.apache.kafka.common.record.TimestampType -import org.scalatest.prop.TableDrivenPropertyChecks import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import org.scalatest.prop.TableDrivenPropertyChecks import pl.touk.nussknacker.engine.api.DisplayJsonWithEncoder import pl.touk.nussknacker.engine.util.json.ToJsonEncoder diff --git a/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/ConsumerRecordHelper.scala b/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/ConsumerRecordHelper.scala index 400dbd01e5d..e59e1bf9667 100644 --- a/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/ConsumerRecordHelper.scala +++ b/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/ConsumerRecordHelper.scala @@ -4,7 +4,7 @@ import io.circe.{Decoder, Encoder} import pl.touk.nussknacker.engine.api.CirceUtil import java.nio.charset.StandardCharsets -import scala.reflect.{ClassTag, classTag} +import scala.reflect.{classTag, ClassTag} object ConsumerRecordHelper { diff --git a/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/EmbeddedKafkaServerWithDependencies.scala b/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/EmbeddedKafkaServerWithDependencies.scala index d61137ef86d..dcf9cd9c3e4 100644 --- a/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/EmbeddedKafkaServerWithDependencies.scala +++ b/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/EmbeddedKafkaServerWithDependencies.scala @@ -8,9 +8,9 @@ import org.apache.commons.io.FileUtils import org.apache.commons.io.output.NullOutputStream import org.apache.kafka.clients.consumer.{Consumer, ConsumerConfig} import org.apache.kafka.clients.producer.KafkaProducer +import org.apache.kafka.common.{IsolationLevel, Uuid} import org.apache.kafka.common.serialization.{ByteArrayDeserializer, ByteArraySerializer, StringSerializer} import org.apache.kafka.common.utils.Time -import org.apache.kafka.common.{IsolationLevel, Uuid} import org.apache.kafka.server.common.MetadataVersion import org.apache.zookeeper.server.{NIOServerCnxnFactory, ZooKeeperServer} diff --git a/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/KafkaClient.scala b/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/KafkaClient.scala index 63889dacfd0..7e448aa97a2 100644 --- a/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/KafkaClient.scala +++ b/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/KafkaClient.scala @@ -11,11 +11,11 @@ import org.apache.kafka.common.header.Headers import java.time.Duration import java.util import java.util.{Collections, UUID} -import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.{Await, Future, Promise} +import scala.concurrent.ExecutionContext.Implicits.global +import scala.concurrent.duration._ import scala.jdk.CollectionConverters._ import scala.util.{Failure, Success, Try} -import scala.concurrent.duration._ class KafkaClient(kafkaAddress: String, id: String) extends LazyLogging { diff --git a/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/KafkaSpec.scala b/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/KafkaSpec.scala index c6a013a7efd..60f3b02483e 100644 --- a/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/KafkaSpec.scala +++ b/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/KafkaSpec.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.kafka -import com.typesafe.config.ConfigValueFactory.fromAnyRef import com.typesafe.config.Config +import com.typesafe.config.ConfigValueFactory.fromAnyRef import org.scalatest.{BeforeAndAfterAll, Suite} import pl.touk.nussknacker.test.{AvailablePortFinder, KafkaConfigProperties, WithConfig} diff --git a/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/RichKafkaConsumer.scala b/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/RichKafkaConsumer.scala index a1cda3fb5cf..0fdd42eeabc 100644 --- a/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/RichKafkaConsumer.scala +++ b/utils/kafka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/RichKafkaConsumer.scala @@ -14,10 +14,10 @@ import scala.reflect.ClassTag class RichKafkaConsumer[K, M](consumer: Consumer[K, M]) extends LazyLogging { - import RichKafkaConsumer._ - import scala.jdk.CollectionConverters._ + import RichKafkaConsumer._ + def consumeWithJson[V: Decoder: ClassTag]( topic: String, secondsToWait: Int = DefaultSecondsToWait diff --git a/utils/kafka-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/KafkaRecordUtils.scala b/utils/kafka-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/KafkaRecordUtils.scala index b2879710915..ff67863b882 100644 --- a/utils/kafka-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/KafkaRecordUtils.scala +++ b/utils/kafka-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/KafkaRecordUtils.scala @@ -1,10 +1,9 @@ package pl.touk.nussknacker.engine.kafka -import java.nio.charset.{Charset, StandardCharsets} - import org.apache.kafka.common.header.Headers import org.apache.kafka.common.header.internals.RecordHeaders +import java.nio.charset.{Charset, StandardCharsets} import scala.jdk.CollectionConverters._ object KafkaRecordUtils { diff --git a/utils/kafka-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/KafkaUtils.scala b/utils/kafka-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/KafkaUtils.scala index 38cb622e5b8..56ac75cc348 100644 --- a/utils/kafka-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/KafkaUtils.scala +++ b/utils/kafka-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/KafkaUtils.scala @@ -5,19 +5,19 @@ import org.apache.kafka.clients.KafkaClient import org.apache.kafka.clients.admin.{Admin, AdminClient} import org.apache.kafka.clients.consumer.{ConsumerConfig, ConsumerRecord, KafkaConsumer} import org.apache.kafka.clients.producer.{Callback, Producer, ProducerRecord, RecordMetadata} -import org.apache.kafka.common.serialization.{ByteArrayDeserializer, ByteArraySerializer} import org.apache.kafka.common.{IsolationLevel, TopicPartition} +import org.apache.kafka.common.serialization.{ByteArrayDeserializer, ByteArraySerializer} import pl.touk.nussknacker.engine.api.process.TopicName import pl.touk.nussknacker.engine.util.ThreadUtils import java.time -import java.util.concurrent.TimeUnit import java.util.{Collections, Properties} +import java.util.concurrent.TimeUnit import scala.collection.mutable.ArrayBuffer -import scala.concurrent.duration.Duration import scala.concurrent.{Await, Future, Promise} -import scala.util.Using.Releasable +import scala.concurrent.duration.Duration import scala.util.{Failure, Success, Using} +import scala.util.Using.Releasable object KafkaUtils extends KafkaUtils diff --git a/utils/kafka-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaErrorTopicInitializer.scala b/utils/kafka-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaErrorTopicInitializer.scala index fefd33fd32b..9561ccf070a 100644 --- a/utils/kafka-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaErrorTopicInitializer.scala +++ b/utils/kafka-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaErrorTopicInitializer.scala @@ -4,9 +4,9 @@ import com.typesafe.scalalogging.LazyLogging import org.apache.kafka.clients.admin.{DescribeTopicsOptions, ListTopicsOptions, NewTopic} import pl.touk.nussknacker.engine.kafka.{KafkaConfig, KafkaUtils} +import java.{lang, util} import java.util.{Collections, Optional} import java.util.concurrent.TimeUnit -import java.{lang, util} import scala.jdk.CollectionConverters._ import scala.util.control.NonFatal diff --git a/utils/kafka-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaJsonExceptionSerializationSchemaSpec.scala b/utils/kafka-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaJsonExceptionSerializationSchemaSpec.scala index 5e9b932e71b..634e11f0bd6 100644 --- a/utils/kafka-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaJsonExceptionSerializationSchemaSpec.scala +++ b/utils/kafka-utils/src/test/scala/pl/touk/nussknacker/engine/kafka/exception/KafkaJsonExceptionSerializationSchemaSpec.scala @@ -6,8 +6,8 @@ import io.circe.syntax.EncoderOps import org.scalatest.EitherValues import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import pl.touk.nussknacker.engine.api.exception.{NonTransientException, NuExceptionInfo} import pl.touk.nussknacker.engine.api.{Context, MetaData, StreamMetaData} +import pl.touk.nussknacker.engine.api.exception.{NonTransientException, NuExceptionInfo} import java.nio.charset.StandardCharsets import java.time.Instant diff --git a/utils/lite-components-testkit/src/main/scala/pl/touk/nussknacker/engine/lite/util/test/LiteKafkaTestScenarioRunner.scala b/utils/lite-components-testkit/src/main/scala/pl/touk/nussknacker/engine/lite/util/test/LiteKafkaTestScenarioRunner.scala index eda0506d450..0cc59f2bdab 100644 --- a/utils/lite-components-testkit/src/main/scala/pl/touk/nussknacker/engine/lite/util/test/LiteKafkaTestScenarioRunner.scala +++ b/utils/lite-components-testkit/src/main/scala/pl/touk/nussknacker/engine/lite/util/test/LiteKafkaTestScenarioRunner.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.lite.util.test -import com.typesafe.config.ConfigValueFactory.fromAnyRef import com.typesafe.config.{Config, ConfigFactory, ConfigValueFactory} +import com.typesafe.config.ConfigValueFactory.fromAnyRef import io.confluent.kafka.schemaregistry.avro.AvroSchema import io.confluent.kafka.serializers.NonRecordContainer import org.apache.avro.Schema @@ -19,6 +19,12 @@ import pl.touk.nussknacker.engine.kafka.{KafkaConfig, UnspecializedTopicName} import pl.touk.nussknacker.engine.lite.components.LiteKafkaComponentProvider import pl.touk.nussknacker.engine.lite.util.test.confluent.{AzureKafkaAvroElementSerde, ConfluentKafkaAvroElementSerde} import pl.touk.nussknacker.engine.schemedkafka.AvroUtils +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ + SchemaId, + SchemaIdFromMessageExtractor, + SchemaRegistryClientFactoryWithRegistration, + SchemaRegistryClientWithRegistration +} import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.AzureSchemaRegistryClient import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.ConfluentUtils import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.client.{ @@ -26,14 +32,8 @@ import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.client.{ MockSchemaRegistryClient } import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.MockSchemaRegistryClientFactory -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ - SchemaId, - SchemaIdFromMessageExtractor, - SchemaRegistryClientFactoryWithRegistration, - SchemaRegistryClientWithRegistration -} -import pl.touk.nussknacker.engine.util.test.TestScenarioRunner.RunnerListResult import pl.touk.nussknacker.engine.util.test.{TestScenarioRunner, TestScenarioRunnerBuilder} +import pl.touk.nussknacker.engine.util.test.TestScenarioRunner.RunnerListResult import pl.touk.nussknacker.test.KafkaConfigProperties import java.nio.charset.StandardCharsets diff --git a/utils/lite-components-testkit/src/main/scala/pl/touk/nussknacker/engine/lite/util/test/LiteTestScenarioRunner.scala b/utils/lite-components-testkit/src/main/scala/pl/touk/nussknacker/engine/lite/util/test/LiteTestScenarioRunner.scala index 2520793f732..96bd02fa55e 100644 --- a/utils/lite-components-testkit/src/main/scala/pl/touk/nussknacker/engine/lite/util/test/LiteTestScenarioRunner.scala +++ b/utils/lite-components-testkit/src/main/scala/pl/touk/nussknacker/engine/lite/util/test/LiteTestScenarioRunner.scala @@ -16,8 +16,8 @@ import pl.touk.nussknacker.engine.lite.api.utils.sources.BaseLiteSource import pl.touk.nussknacker.engine.lite.components.LiteBaseComponentProvider import pl.touk.nussknacker.engine.lite.util.test.SynchronousLiteInterpreter.SynchronousResult import pl.touk.nussknacker.engine.testmode.TestProcess.ExceptionResult -import pl.touk.nussknacker.engine.util.test.TestScenarioRunner.RunnerListResult import pl.touk.nussknacker.engine.util.test._ +import pl.touk.nussknacker.engine.util.test.TestScenarioRunner.RunnerListResult import scala.reflect.ClassTag diff --git a/utils/lite-components-testkit/src/main/scala/pl/touk/nussknacker/engine/lite/util/test/SynchronousLiteInterpreter.scala b/utils/lite-components-testkit/src/main/scala/pl/touk/nussknacker/engine/lite/util/test/SynchronousLiteInterpreter.scala index fcd94382f42..061cdcfe15b 100644 --- a/utils/lite-components-testkit/src/main/scala/pl/touk/nussknacker/engine/lite/util/test/SynchronousLiteInterpreter.scala +++ b/utils/lite-components-testkit/src/main/scala/pl/touk/nussknacker/engine/lite/util/test/SynchronousLiteInterpreter.scala @@ -18,8 +18,8 @@ import pl.touk.nussknacker.engine.lite.capabilities.FixedCapabilityTransformer import pl.touk.nussknacker.engine.util.SynchronousExecutionContextAndIORuntime import pl.touk.nussknacker.engine.util.test.TestScenarioCollectorHandler -import scala.concurrent.duration._ import scala.concurrent.{Await, ExecutionContext, Future} +import scala.concurrent.duration._ import scala.language.higherKinds /* diff --git a/utils/lite-components-testkit/src/main/scala/pl/touk/nussknacker/engine/lite/util/test/confluent/AzureKafkaAvroElementSerde.scala b/utils/lite-components-testkit/src/main/scala/pl/touk/nussknacker/engine/lite/util/test/confluent/AzureKafkaAvroElementSerde.scala index dbd28e1f9c7..c6dc74bcb71 100644 --- a/utils/lite-components-testkit/src/main/scala/pl/touk/nussknacker/engine/lite/util/test/confluent/AzureKafkaAvroElementSerde.scala +++ b/utils/lite-components-testkit/src/main/scala/pl/touk/nussknacker/engine/lite/util/test/confluent/AzureKafkaAvroElementSerde.scala @@ -4,9 +4,9 @@ import org.apache.avro.generic.GenericContainer import org.apache.kafka.common.header.Headers import pl.touk.nussknacker.engine.lite.util.test.KafkaAvroElementSerde import pl.touk.nussknacker.engine.schemedkafka.AvroUtils +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{SchemaId, SchemaIdFromMessageExtractor} import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.AzureUtils import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.schemaid.SchemaIdFromAzureHeader -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{SchemaId, SchemaIdFromMessageExtractor} object AzureKafkaAvroElementSerde extends KafkaAvroElementSerde { diff --git a/utils/lite-components-testkit/src/test/scala/pl/touk/nussknacker/engine/lite/util/test/LiteTestScenarioRunnerSpec.scala b/utils/lite-components-testkit/src/test/scala/pl/touk/nussknacker/engine/lite/util/test/LiteTestScenarioRunnerSpec.scala index 1819d8aaadc..2dc9f25d904 100644 --- a/utils/lite-components-testkit/src/test/scala/pl/touk/nussknacker/engine/lite/util/test/LiteTestScenarioRunnerSpec.scala +++ b/utils/lite-components-testkit/src/test/scala/pl/touk/nussknacker/engine/lite/util/test/LiteTestScenarioRunnerSpec.scala @@ -4,12 +4,12 @@ import com.typesafe.config.ConfigFactory import org.scalatest.Inside import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, Service} import pl.touk.nussknacker.engine.api.component.ComponentDefinition import pl.touk.nussknacker.engine.api.process.ComponentUseCase.EngineRuntime -import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, Service} import pl.touk.nussknacker.engine.build.ScenarioBuilder -import pl.touk.nussknacker.engine.spel.SpelExtension._ import pl.touk.nussknacker.engine.spel.SpelExpressionEvaluationException +import pl.touk.nussknacker.engine.spel.SpelExtension._ import pl.touk.nussknacker.engine.util.functions.DateUtils import pl.touk.nussknacker.engine.util.test.{RunResult, TestScenarioRunner} import pl.touk.nussknacker.test.ValidatedValuesDetailedMessage diff --git a/utils/lite-components-testkit/src/test/scala/pl/touk/nussknacker/engine/lite/util/test/RequestResponseTestScenarioRunnerSpec.scala b/utils/lite-components-testkit/src/test/scala/pl/touk/nussknacker/engine/lite/util/test/RequestResponseTestScenarioRunnerSpec.scala index 03515c99f99..b59e3e8e037 100644 --- a/utils/lite-components-testkit/src/test/scala/pl/touk/nussknacker/engine/lite/util/test/RequestResponseTestScenarioRunnerSpec.scala +++ b/utils/lite-components-testkit/src/test/scala/pl/touk/nussknacker/engine/lite/util/test/RequestResponseTestScenarioRunnerSpec.scala @@ -4,8 +4,8 @@ import akka.http.scaladsl.model.{HttpMethods, HttpRequest} import io.circe.syntax.EncoderOps import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers -import pl.touk.nussknacker.engine.api.component.{ComponentDefinition, ComponentId, ComponentType, NodeComponentInfo} import pl.touk.nussknacker.engine.api.{MethodToInvoke, ParamName, Service} +import pl.touk.nussknacker.engine.api.component.{ComponentDefinition, ComponentId, ComponentType, NodeComponentInfo} import pl.touk.nussknacker.engine.build.ScenarioBuilder import pl.touk.nussknacker.engine.lite.util.test.RequestResponseTestScenarioRunner._ import pl.touk.nussknacker.engine.spel.SpelExtension._ diff --git a/utils/lite-components-testkit/src/test/scala/pl/touk/nussknacker/engine/lite/util/test/TestService.scala b/utils/lite-components-testkit/src/test/scala/pl/touk/nussknacker/engine/lite/util/test/TestService.scala index d917a1ad590..ccb9e7274f8 100644 --- a/utils/lite-components-testkit/src/test/scala/pl/touk/nussknacker/engine/lite/util/test/TestService.scala +++ b/utils/lite-components-testkit/src/test/scala/pl/touk/nussknacker/engine/lite/util/test/TestService.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.lite.util.test +import pl.touk.nussknacker.engine.api._ import pl.touk.nussknacker.engine.api.process.ComponentUseCase import pl.touk.nussknacker.engine.api.test.InvocationCollectors.ServiceInvocationCollector -import pl.touk.nussknacker.engine.api._ import scala.concurrent.{ExecutionContext, Future} diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/AvroDefaultExpressionDeterminer.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/AvroDefaultExpressionDeterminer.scala index 230aa83946e..471e51a3b0f 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/AvroDefaultExpressionDeterminer.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/AvroDefaultExpressionDeterminer.scala @@ -34,9 +34,11 @@ object AvroDefaultExpressionDeterminer { * @param handleNotSupported when true values of not supported types are returned as valid None, otherwise invalid TypeNotSupported is returned */ class AvroDefaultExpressionDeterminer(handleNotSupported: Boolean) { - import AvroDefaultExpressionDeterminer._ + import scala.jdk.CollectionConverters._ + import AvroDefaultExpressionDeterminer._ + private val validatedNullExpression: ValidatedNel[AvroDefaultToSpELExpressionError, Option[Expression]] = Valid(Some(asSpelExpression("null"))) diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/AvroUtils.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/AvroUtils.scala index 1e2a1fc4b8d..9a8bd4776e3 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/AvroUtils.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/AvroUtils.scala @@ -19,7 +19,7 @@ import pl.touk.nussknacker.engine.util.ResourceLoader import java.io.{ByteArrayOutputStream, OutputStream} import java.nio.ByteBuffer import java.util -import scala.reflect.{ClassTag, classTag} +import scala.reflect.{classTag, ClassTag} import scala.util.Using object AvroUtils extends LazyLogging { diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaUniversalComponentTransformer.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaUniversalComponentTransformer.scala index 9da6f208136..da99a4b1791 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaUniversalComponentTransformer.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/KafkaUniversalComponentTransformer.scala @@ -2,22 +2,22 @@ package pl.touk.nussknacker.engine.schemedkafka import cats.data.Validated.{Invalid, Valid} import cats.data.Writer +import pl.touk.nussknacker.engine.api.{NodeId, Params} import pl.touk.nussknacker.engine.api.component.Component import pl.touk.nussknacker.engine.api.context.ProcessCompilationError import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError import pl.touk.nussknacker.engine.api.context.transformation.{DefinedEagerParameter, SingleInputDynamicComponent} -import pl.touk.nussknacker.engine.api.definition.FixedExpressionValue.nullFixedValue import pl.touk.nussknacker.engine.api.definition._ +import pl.touk.nussknacker.engine.api.definition.FixedExpressionValue.nullFixedValue import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.{ProcessObjectDependencies, TopicName} import pl.touk.nussknacker.engine.api.validation.ValidationMode -import pl.touk.nussknacker.engine.api.{NodeId, Params} -import pl.touk.nussknacker.engine.kafka.validator.WithCachedTopicsExistenceValidator import pl.touk.nussknacker.engine.kafka.{KafkaComponentsUtils, KafkaConfig, PreparedKafkaTopic, UnspecializedTopicName} -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry._ -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.UniversalSchemaSupportDispatcher import pl.touk.nussknacker.engine.kafka.UnspecializedTopicName._ import pl.touk.nussknacker.engine.kafka.validator.TopicsExistenceValidator.TopicValidationType +import pl.touk.nussknacker.engine.kafka.validator.WithCachedTopicsExistenceValidator +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry._ +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.UniversalSchemaSupportDispatcher object KafkaUniversalComponentTransformer { final val schemaVersionParamName = ParameterName("Schema version") diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/encode/AvroSchemaOutputValidator.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/encode/AvroSchemaOutputValidator.scala index 38106336172..75b70017ea9 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/encode/AvroSchemaOutputValidator.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/encode/AvroSchemaOutputValidator.scala @@ -1,12 +1,12 @@ package pl.touk.nussknacker.engine.schemedkafka.encode -import cats.data.Validated.{Invalid, condNel} import cats.data.{NonEmptyList, Validated, ValidatedNel} +import cats.data.Validated.{condNel, Invalid} import cats.implicits._ import com.typesafe.scalalogging.LazyLogging +import org.apache.avro.{LogicalTypes, Schema} import org.apache.avro.Schema.Type import org.apache.avro.generic.GenericData.{EnumSymbol, Fixed} -import org.apache.avro.{LogicalTypes, Schema} import org.apache.commons.lang3.ClassUtils import pl.touk.nussknacker.engine.api.typed.typing._ import pl.touk.nussknacker.engine.api.validation.ValidationMode diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/encode/AvroSchemaOutputValidatorPrinter.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/encode/AvroSchemaOutputValidatorPrinter.scala index 0a20c466638..c852f2e9066 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/encode/AvroSchemaOutputValidatorPrinter.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/encode/AvroSchemaOutputValidatorPrinter.scala @@ -8,10 +8,11 @@ import scala.jdk.CollectionConverters._ object AvroSchemaOutputValidatorPrinter { - import OutputValidatorErrorsMessageFormatter._ import cats._ import implicits._ + import OutputValidatorErrorsMessageFormatter._ + private implicit class ListTypesPrinter(list: List[String]) { def printType: String = list.mkString(TypesSeparator) } diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/encode/AvroToJsonSchemaBasedEncoderCustomisation.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/encode/AvroToJsonSchemaBasedEncoderCustomisation.scala index 652c0569e0d..94f0bfbe785 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/encode/AvroToJsonSchemaBasedEncoderCustomisation.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/encode/AvroToJsonSchemaBasedEncoderCustomisation.scala @@ -2,6 +2,7 @@ package pl.touk.nussknacker.engine.schemedkafka.encode import org.everit.json.schema.Schema import pl.touk.nussknacker.engine.util.json.{EncodeInput, EncodeOutput, ToJsonSchemaBasedEncoderCustomisation} + import scala.jdk.CollectionConverters._ class AvroToJsonSchemaBasedEncoderCustomisation extends ToJsonSchemaBasedEncoderCustomisation { diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/encode/ToAvroSchemaBasedEncoder.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/encode/ToAvroSchemaBasedEncoder.scala index d9dd5e2ebce..fcc9cb49399 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/encode/ToAvroSchemaBasedEncoder.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/encode/ToAvroSchemaBasedEncoder.scala @@ -1,21 +1,21 @@ package pl.touk.nussknacker.engine.schemedkafka.encode -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, ValidatedNel} +import cats.data.Validated.{Invalid, Valid} import cats.implicits._ import io.confluent.kafka.serializers.NonRecordContainer -import org.apache.avro.generic.GenericData.{EnumSymbol, Fixed} +import org.apache.avro.{AvroRuntimeException, LogicalTypes, Schema} import org.apache.avro.generic.{GenericContainer, GenericData} +import org.apache.avro.generic.GenericData.{EnumSymbol, Fixed} import org.apache.avro.util.Utf8 -import org.apache.avro.{AvroRuntimeException, LogicalTypes, Schema} import pl.touk.nussknacker.engine.api.validation.ValidationMode -import pl.touk.nussknacker.engine.schemedkafka.schema.{AvroSchemaEvolution, DefaultAvroSchemaEvolution} import pl.touk.nussknacker.engine.schemedkafka.{AvroUtils, LogicalTypesGenericRecordBuilder} +import pl.touk.nussknacker.engine.schemedkafka.schema.{AvroSchemaEvolution, DefaultAvroSchemaEvolution} import java.nio.ByteBuffer import java.nio.charset.StandardCharsets -import java.time.chrono.ChronoZonedDateTime import java.time.{Instant, LocalDate, LocalTime, OffsetDateTime} +import java.time.chrono.ChronoZonedDateTime import java.util import java.util.UUID import scala.collection.compat.immutable.LazyList diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schema/AvroSchemaBasedParameter.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schema/AvroSchemaBasedParameter.scala index db4a3df7221..62cbabfb6af 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schema/AvroSchemaBasedParameter.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schema/AvroSchemaBasedParameter.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.schemedkafka.schema -import cats.data.Validated.{Invalid, Valid} import cats.data.{NonEmptyList, ValidatedNel} +import cats.data.Validated.{Invalid, Valid} import org.apache.avro.Schema import pl.touk.nussknacker.engine.api.NodeId import pl.touk.nussknacker.engine.api.context.ProcessCompilationError diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/AzureSchemaRegistryClientFactory.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/AzureSchemaRegistryClientFactory.scala index 41e847c9835..6c93fcd4672 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/AzureSchemaRegistryClientFactory.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/AzureSchemaRegistryClientFactory.scala @@ -4,16 +4,16 @@ import cats.data.Validated import cats.data.Validated.{Invalid, Valid} import com.azure.core.exception.ResourceNotFoundException import com.azure.core.util.{Context, FluxUtil} +import com.azure.data.schemaregistry.{SchemaRegistryClientBuilder, SchemaRegistryVersion} import com.azure.data.schemaregistry.implementation.models.SchemasGetByIdResponse import com.azure.data.schemaregistry.models.{SchemaFormat, SchemaProperties, SchemaRegistrySchema} -import com.azure.data.schemaregistry.{SchemaRegistryClientBuilder, SchemaRegistryVersion} import io.confluent.kafka.schemaregistry.ParsedSchema import io.confluent.kafka.schemaregistry.avro.AvroSchema import org.apache.avro.Schema import org.apache.commons.io.IOUtils import pl.touk.nussknacker.engine.kafka._ -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.internal._ import pl.touk.nussknacker.engine.schemedkafka.schemaregistry._ +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.internal._ import reactor.core.publisher.Mono import java.nio.charset.StandardCharsets diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/SchemaNameTopicMatchStrategy.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/SchemaNameTopicMatchStrategy.scala index 7eaa7fd2102..a971dfcfdf4 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/SchemaNameTopicMatchStrategy.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/SchemaNameTopicMatchStrategy.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure import pl.touk.nussknacker.engine.kafka.UnspecializedTopicName import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.SchemaNameTopicMatchStrategy.{ - FullSchemaNameDecomposed, - toSchemaNamingConvention + toSchemaNamingConvention, + FullSchemaNameDecomposed } // TODO: It probable should be configurable: e.g would be nice to have possibility to define static topic -> schemaName map in config diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/internal/AzureHttpPipelineFactory.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/internal/AzureHttpPipelineFactory.scala index 392f31d2dd4..ce0fdbe3fd2 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/internal/AzureHttpPipelineFactory.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/internal/AzureHttpPipelineFactory.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.internal import com.azure.core.credential.TokenCredential -import com.azure.core.http.policy._ import com.azure.core.http.{HttpPipeline, HttpPipelineBuilder} +import com.azure.core.http.policy._ import com.azure.core.util.{Configuration, CoreUtils} import java.time.temporal.ChronoUnit diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/internal/AzureTokenCredentialFactory.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/internal/AzureTokenCredentialFactory.scala index ccff430fcea..79998a7147f 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/internal/AzureTokenCredentialFactory.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/internal/AzureTokenCredentialFactory.scala @@ -4,6 +4,7 @@ import com.azure.core.credential.TokenCredential import com.azure.core.util.{Configuration, ConfigurationPropertyBuilder} import com.azure.identity.{ChainedTokenCredentialBuilder, ClientSecretCredentialBuilder, DefaultAzureCredentialBuilder} import com.typesafe.scalalogging.LazyLogging + import scala.jdk.CollectionConverters._ // This class create credential chain that in the first place uses properties from configuration diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/internal/EnhancedSchemasImpl.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/internal/EnhancedSchemasImpl.scala index c0f3918c76f..322296020d0 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/internal/EnhancedSchemasImpl.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/internal/EnhancedSchemasImpl.scala @@ -6,7 +6,7 @@ import com.azure.core.http.rest.{Response, RestProxy} import com.azure.core.util.Context import com.azure.core.util.serializer.SerializerAdapter import com.azure.data.schemaregistry.implementation.models.{ErrorException, SchemasGetByIdResponse} -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.internal.model.{SchemaVersions, Schemas} +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.internal.model.{Schemas, SchemaVersions} import reactor.core.publisher.Mono class EnhancedSchemasImpl( diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/schemaid/SchemaIdFromAzureHeader.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/schemaid/SchemaIdFromAzureHeader.scala index 0f74b37ee94..6c9b27e8f53 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/schemaid/SchemaIdFromAzureHeader.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/schemaid/SchemaIdFromAzureHeader.scala @@ -1,11 +1,11 @@ package pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.schemaid -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.AzureUtils import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ GetSchemaIdArgs, SchemaIdFromMessageExtractor, SchemaIdWithPositionedBuffer } +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.AzureUtils import java.nio.ByteBuffer diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/serialization/AzureAvroSerializerFactory.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/serialization/AzureAvroSerializerFactory.scala index ad2ca2bb12e..091b1000b2c 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/serialization/AzureAvroSerializerFactory.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/serialization/AzureAvroSerializerFactory.scala @@ -9,8 +9,8 @@ import pl.touk.nussknacker.engine.kafka.KafkaConfig import pl.touk.nussknacker.engine.kafka.serialization.DelegatingKafkaSerializer import pl.touk.nussknacker.engine.schemedkafka.schema.DefaultAvroSchemaEvolution import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.SchemaId -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.internal.AzureConfigurationFactory import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.{AzureSchemaRegistryClient, AzureUtils} +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.internal.AzureConfigurationFactory import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.client.DefaultConfluentSchemaRegistryClient import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.serialization.jsonpayload.ConfluentJsonPayloadKafkaSerializer diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/client/CachedConfluentSchemaRegistryClient.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/client/CachedConfluentSchemaRegistryClient.scala index 056d030e9ac..9e69c1f0620 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/client/CachedConfluentSchemaRegistryClient.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/client/CachedConfluentSchemaRegistryClient.scala @@ -4,8 +4,8 @@ import cats.data.Validated import com.typesafe.scalalogging.LazyLogging import io.confluent.kafka.schemaregistry.client.{SchemaRegistryClient => CSchemaRegistryClient} import pl.touk.nussknacker.engine.kafka.UnspecializedTopicName -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.ConfluentUtils import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{SchemaId, SchemaRegistryError, SchemaWithMetadata} +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.ConfluentUtils import scala.jdk.CollectionConverters._ diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/client/ConfluentSchemaRegistryClient.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/client/ConfluentSchemaRegistryClient.scala index 4f9bed95b15..e1c8477c83a 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/client/ConfluentSchemaRegistryClient.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/client/ConfluentSchemaRegistryClient.scala @@ -3,14 +3,14 @@ package pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.client import cats.data.Validated import cats.data.Validated.{invalid, valid} import com.typesafe.scalalogging.LazyLogging +import io.confluent.kafka.schemaregistry.{ParsedSchema, SchemaProvider} import io.confluent.kafka.schemaregistry.avro.AvroSchemaProvider -import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException import io.confluent.kafka.schemaregistry.client.{ CachedSchemaRegistryClient => CCachedSchemaRegistryClient, SchemaRegistryClient => CSchemaRegistryClient } +import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException import io.confluent.kafka.schemaregistry.json.JsonSchemaProvider -import io.confluent.kafka.schemaregistry.{ParsedSchema, SchemaProvider} import io.confluent.kafka.serializers.KafkaAvroDeserializerConfig import pl.touk.nussknacker.engine.kafka.{SchemaRegistryClientKafkaConfig, UnspecializedTopicName} import pl.touk.nussknacker.engine.schemedkafka.schemaregistry._ diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/client/MockSchemaRegistryClient.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/client/MockSchemaRegistryClient.scala index 0059f58cb9f..41558ca9c43 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/client/MockSchemaRegistryClient.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/client/MockSchemaRegistryClient.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.client import com.typesafe.scalalogging.LazyLogging -import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException import io.confluent.kafka.schemaregistry.client.{MockSchemaRegistryClient => CMockSchemaRegistryClient, SchemaMetadata} +import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException import java.util diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/schemaid/SchemaIdFromNuHeadersPotentiallyShiftingConfluentPayload.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/schemaid/SchemaIdFromNuHeadersPotentiallyShiftingConfluentPayload.scala index e0605def64c..d757edb66f2 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/schemaid/SchemaIdFromNuHeadersPotentiallyShiftingConfluentPayload.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/schemaid/SchemaIdFromNuHeadersPotentiallyShiftingConfluentPayload.scala @@ -8,12 +8,13 @@ import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ SchemaIdWithPositionedBuffer } import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.ConfluentUtils -import SchemaIdFromNuHeadersPotentiallyShiftingConfluentPayload._ import java.nio.ByteBuffer import java.nio.charset.StandardCharsets import scala.util.Try +import SchemaIdFromNuHeadersPotentiallyShiftingConfluentPayload._ + object SchemaIdFromNuHeadersPotentiallyShiftingConfluentPayload { val ValueSchemaIdHeaderName = "value.schemaId" diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/serialization/jsonpayload/JsonPayloadToAvroConverter.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/serialization/jsonpayload/JsonPayloadToAvroConverter.scala index f47b4534e79..f7d0e4cdfdc 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/serialization/jsonpayload/JsonPayloadToAvroConverter.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/confluent/serialization/jsonpayload/JsonPayloadToAvroConverter.scala @@ -1,21 +1,21 @@ package pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.serialization.jsonpayload import io.circe.Decoder +import org.apache.avro.{AvroRuntimeException, LogicalTypes, Schema} import org.apache.avro.Conversions.UUIDConversion import org.apache.avro.data.RecordBuilderBase import org.apache.avro.generic.{GenericData, GenericRecord} -import org.apache.avro.{AvroRuntimeException, LogicalTypes, Schema} import pl.touk.nussknacker.engine.schemedkafka.LogicalTypesGenericRecordBuilder -import tech.allegro.schema.json2avro.converter.types._ import tech.allegro.schema.json2avro.converter.{ CompositeJsonToAvroReader, JsonAvroConverter, PathsPrinter, UnknownFieldListener } +import tech.allegro.schema.json2avro.converter.types._ -import java.time.format.DateTimeFormatter import java.time.{Instant, LocalDate, LocalTime} +import java.time.format.DateTimeFormatter import java.util import java.util.concurrent.TimeUnit import scala.jdk.CollectionConverters._ diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/formatter/AbstractSchemaBasedRecordFormatter.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/formatter/AbstractSchemaBasedRecordFormatter.scala index b07f04ad79c..338fdfa7ce1 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/formatter/AbstractSchemaBasedRecordFormatter.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/formatter/AbstractSchemaBasedRecordFormatter.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.engine.schemedkafka.schemaregistry.formatter -import io.circe.generic.extras.semiauto.{deriveConfiguredDecoder, deriveConfiguredEncoder} import io.circe.{Decoder, Encoder, Json} +import io.circe.generic.extras.semiauto.{deriveConfiguredDecoder, deriveConfiguredEncoder} import io.confluent.kafka.schemaregistry.ParsedSchema import org.apache.kafka.clients.consumer.ConsumerRecord import pl.touk.nussknacker.engine.api.process.TopicName import pl.touk.nussknacker.engine.api.test.TestRecord +import pl.touk.nussknacker.engine.kafka.{serialization, KafkaConfig, RecordFormatter} import pl.touk.nussknacker.engine.kafka.consumerrecord.SerializableConsumerRecord -import pl.touk.nussknacker.engine.kafka.{KafkaConfig, RecordFormatter, serialization} import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ ContentTypes, ContentTypesSchemas, @@ -23,9 +23,10 @@ import scala.reflect.ClassTag abstract class AbstractSchemaBasedRecordFormatter[K: ClassTag, V: ClassTag] extends RecordFormatter { - import SchemaBasedSerializableConsumerRecord._ import pl.touk.nussknacker.engine.api.CirceUtil._ + import SchemaBasedSerializableConsumerRecord._ + protected def kafkaConfig: KafkaConfig protected def schemaRegistryClient: SchemaRegistryClient diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/formatter/AvroToJsonFormatterFactory.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/formatter/AvroToJsonFormatterFactory.scala index f388da2c207..438f3f0e899 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/formatter/AvroToJsonFormatterFactory.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/formatter/AvroToJsonFormatterFactory.scala @@ -4,11 +4,11 @@ import io.circe.Json import io.confluent.kafka.schemaregistry.ParsedSchema import org.apache.kafka.clients.consumer.ConsumerRecord import pl.touk.nussknacker.engine.api.process.TopicName +import pl.touk.nussknacker.engine.kafka.{serialization, KafkaConfig, RecordFormatter, RecordFormatterFactory} import pl.touk.nussknacker.engine.kafka.serialization.KafkaDeserializationSchema -import pl.touk.nussknacker.engine.kafka.{KafkaConfig, RecordFormatter, RecordFormatterFactory, serialization} import pl.touk.nussknacker.engine.schemedkafka.AvroUtils -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.serialization.SchemaRegistryBasedSerializerFactory import pl.touk.nussknacker.engine.schemedkafka.schemaregistry._ +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.serialization.SchemaRegistryBasedSerializerFactory import scala.reflect.ClassTag diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/universal/UniversalKafkaDeserializer.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/universal/UniversalKafkaDeserializer.scala index 1be087293f4..09a406f442d 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/universal/UniversalKafkaDeserializer.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/universal/UniversalKafkaDeserializer.scala @@ -6,7 +6,6 @@ import org.apache.kafka.common.header.Headers import org.apache.kafka.common.serialization.Deserializer import pl.touk.nussknacker.engine.kafka.KafkaConfig import pl.touk.nussknacker.engine.schemedkafka.RuntimeSchemaData -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.serialization.SchemaRegistryBasedDeserializerFactory import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ ChainedSchemaIdFromMessageExtractor, ContentTypes, @@ -16,6 +15,7 @@ import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ SchemaWithMetadata, StringSchemaId } +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.serialization.SchemaRegistryBasedDeserializerFactory import scala.reflect.ClassTag diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/universal/UniversalSchemaBasedSerdeProvider.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/universal/UniversalSchemaBasedSerdeProvider.scala index dfb0f530d80..bd00d2c0be7 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/universal/UniversalSchemaBasedSerdeProvider.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/universal/UniversalSchemaBasedSerdeProvider.scala @@ -1,5 +1,11 @@ package pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ + ChainedSchemaIdFromMessageExtractor, + SchemaBasedSerdeProvider, + SchemaRegistryClient, + SchemaRegistryClientFactory +} import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.AzureSchemaRegistryClient import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.schemaid.SchemaIdFromAzureHeader import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.client.ConfluentSchemaRegistryClient @@ -11,12 +17,6 @@ import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.serialization.{ KafkaSchemaRegistryBasedKeyValueDeserializationSchemaFactory, KafkaSchemaRegistryBasedValueSerializationSchemaFactory } -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ - ChainedSchemaIdFromMessageExtractor, - SchemaBasedSerdeProvider, - SchemaRegistryClient, - SchemaRegistryClientFactory -} object UniversalSchemaBasedSerdeProvider { diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/universal/UniversalSchemaRegistryClientFactory.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/universal/UniversalSchemaRegistryClientFactory.scala index e534296f7d5..b47cf24501b 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/universal/UniversalSchemaRegistryClientFactory.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/universal/UniversalSchemaRegistryClientFactory.scala @@ -1,13 +1,13 @@ package pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal import pl.touk.nussknacker.engine.kafka.{KafkaUtils, SchemaRegistryClientKafkaConfig} -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.AzureSchemaRegistryClientFactory -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.client.CachedConfluentSchemaRegistryClientFactory import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ EmptySchemaRegistry, SchemaRegistryClient, SchemaRegistryClientFactory } +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure.AzureSchemaRegistryClientFactory +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.client.CachedConfluentSchemaRegistryClientFactory object UniversalSchemaRegistryClientFactory extends UniversalSchemaRegistryClientFactory diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/universal/UniversalToJsonFormatterFactory.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/universal/UniversalToJsonFormatterFactory.scala index a7770a02634..502044c314e 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/universal/UniversalToJsonFormatterFactory.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/universal/UniversalToJsonFormatterFactory.scala @@ -5,14 +5,14 @@ import io.confluent.kafka.schemaregistry.ParsedSchema import org.apache.kafka.clients.consumer.ConsumerRecord import pl.touk.nussknacker.engine.api.process.TopicName import pl.touk.nussknacker.engine.kafka._ -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.formatter.AbstractSchemaBasedRecordFormatter -import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.json.KafkaJsonKeyValueDeserializationSchemaFactory import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ SchemaId, SchemaIdFromMessageExtractor, SchemaRegistryClient, SchemaRegistryClientFactory } +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.formatter.AbstractSchemaBasedRecordFormatter +import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.json.KafkaJsonKeyValueDeserializationSchemaFactory import scala.reflect.ClassTag diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/serialization/KafkaSchemaBasedDeserializationSchemaFactory.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/serialization/KafkaSchemaBasedDeserializationSchemaFactory.scala index 9886cad94b5..8de7c119cf7 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/serialization/KafkaSchemaBasedDeserializationSchemaFactory.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/serialization/KafkaSchemaBasedDeserializationSchemaFactory.scala @@ -2,9 +2,9 @@ package pl.touk.nussknacker.engine.schemedkafka.serialization import io.confluent.kafka.schemaregistry.ParsedSchema import org.apache.kafka.clients.consumer.ConsumerRecord -import pl.touk.nussknacker.engine.schemedkafka.RuntimeSchemaData import pl.touk.nussknacker.engine.kafka.KafkaConfig import pl.touk.nussknacker.engine.kafka.serialization.KafkaDeserializationSchema +import pl.touk.nussknacker.engine.schemedkafka.RuntimeSchemaData import scala.reflect.ClassTag diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/serialization/KafkaSchemaBasedKeyValueDeserializationSchemaFactory.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/serialization/KafkaSchemaBasedKeyValueDeserializationSchemaFactory.scala index fc6ee285886..11509f76502 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/serialization/KafkaSchemaBasedKeyValueDeserializationSchemaFactory.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/serialization/KafkaSchemaBasedKeyValueDeserializationSchemaFactory.scala @@ -3,10 +3,10 @@ package pl.touk.nussknacker.engine.schemedkafka.serialization import io.confluent.kafka.schemaregistry.ParsedSchema import org.apache.kafka.clients.consumer.ConsumerRecord import org.apache.kafka.common.serialization.{Deserializer, StringDeserializer} -import pl.touk.nussknacker.engine.schemedkafka.RuntimeSchemaData import pl.touk.nussknacker.engine.kafka.KafkaConfig import pl.touk.nussknacker.engine.kafka.consumerrecord.ConsumerRecordKafkaDeserializationSchema import pl.touk.nussknacker.engine.kafka.serialization.KafkaDeserializationSchema +import pl.touk.nussknacker.engine.schemedkafka.RuntimeSchemaData import scala.reflect.ClassTag diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/serialization/KafkaSchemaBasedKeyValueSerializationSchemaFactory.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/serialization/KafkaSchemaBasedKeyValueSerializationSchemaFactory.scala index 2a5e5967d2a..bd0741a5ec4 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/serialization/KafkaSchemaBasedKeyValueSerializationSchemaFactory.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/serialization/KafkaSchemaBasedKeyValueSerializationSchemaFactory.scala @@ -5,8 +5,8 @@ import org.apache.kafka.clients.producer.ProducerRecord import org.apache.kafka.common.header.internals.RecordHeaders import org.apache.kafka.common.serialization.Serializer import pl.touk.nussknacker.engine.api.process.TopicName +import pl.touk.nussknacker.engine.kafka.{serialization, KafkaConfig} import pl.touk.nussknacker.engine.kafka.serialization.{CharSequenceSerializer, KafkaProducerHelper} -import pl.touk.nussknacker.engine.kafka.{KafkaConfig, serialization} import pl.touk.nussknacker.engine.schemedkafka.RuntimeSchemaData import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.schemaid.SchemaIdFromNuHeadersPotentiallyShiftingConfluentPayload.ValueSchemaIdHeaderName import pl.touk.nussknacker.engine.util.KeyedValue diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/serialization/KafkaSchemaBasedSerializationSchemaFactory.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/serialization/KafkaSchemaBasedSerializationSchemaFactory.scala index 2821da0d7a5..65094cee2ec 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/serialization/KafkaSchemaBasedSerializationSchemaFactory.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/serialization/KafkaSchemaBasedSerializationSchemaFactory.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.schemedkafka.serialization import io.confluent.kafka.schemaregistry.ParsedSchema import pl.touk.nussknacker.engine.api.process.TopicName +import pl.touk.nussknacker.engine.kafka.{serialization, KafkaConfig} import pl.touk.nussknacker.engine.schemedkafka.RuntimeSchemaData -import pl.touk.nussknacker.engine.kafka.{KafkaConfig, serialization} import pl.touk.nussknacker.engine.util.KeyedValue /** diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/sink/UniversalKafkaSinkFactory.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/sink/UniversalKafkaSinkFactory.scala index ed4fe4a79f5..bd34a540781 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/sink/UniversalKafkaSinkFactory.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/sink/UniversalKafkaSinkFactory.scala @@ -3,6 +3,7 @@ package pl.touk.nussknacker.engine.schemedkafka.sink import cats.data.NonEmptyList import io.confluent.kafka.schemaregistry.ParsedSchema import org.apache.flink.formats.avro.typeutils.NkSerializableParsedSchema +import pl.touk.nussknacker.engine.api.{LazyParameter, MetaData, NodeId, Params} import pl.touk.nussknacker.engine.api.component.Component.AllowedProcessingModes import pl.touk.nussknacker.engine.api.component.ProcessingMode import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError @@ -16,8 +17,12 @@ import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.{ProcessObjectDependencies, Sink, SinkFactory, TopicName} import pl.touk.nussknacker.engine.api.validation.ValidationMode -import pl.touk.nussknacker.engine.api.{LazyParameter, MetaData, NodeId, Params} import pl.touk.nussknacker.engine.graph.expression.Expression +import pl.touk.nussknacker.engine.schemedkafka.{ + KafkaUniversalComponentTransformer, + RuntimeSchemaData, + SchemaDeterminerErrorHandler +} import pl.touk.nussknacker.engine.schemedkafka.KafkaUniversalComponentTransformer._ import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ ContentTypes, @@ -26,11 +31,6 @@ import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{ SchemaRegistryClientFactory } import pl.touk.nussknacker.engine.schemedkafka.sink.UniversalKafkaSinkFactory.TransformationState -import pl.touk.nussknacker.engine.schemedkafka.{ - KafkaUniversalComponentTransformer, - RuntimeSchemaData, - SchemaDeterminerErrorHandler -} import pl.touk.nussknacker.engine.util.parameters.SchemaBasedParameter import pl.touk.nussknacker.engine.util.sinkvalue.SinkValue diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/sink/UniversalKafkaSinkImplFactory.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/sink/UniversalKafkaSinkImplFactory.scala index 3a469529f11..d21f33c773c 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/sink/UniversalKafkaSinkImplFactory.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/sink/UniversalKafkaSinkImplFactory.scala @@ -4,9 +4,9 @@ import io.confluent.kafka.schemaregistry.ParsedSchema import pl.touk.nussknacker.engine.api.LazyParameter import pl.touk.nussknacker.engine.api.process.{Sink, TopicName} import pl.touk.nussknacker.engine.api.validation.ValidationMode -import pl.touk.nussknacker.engine.schemedkafka.RuntimeSchemaData -import pl.touk.nussknacker.engine.kafka.serialization.KafkaSerializationSchema import pl.touk.nussknacker.engine.kafka.{KafkaConfig, PreparedKafkaTopic} +import pl.touk.nussknacker.engine.kafka.serialization.KafkaSerializationSchema +import pl.touk.nussknacker.engine.schemedkafka.RuntimeSchemaData import pl.touk.nussknacker.engine.util.KeyedValue trait UniversalKafkaSinkImplFactory { diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/source/UniversalKafkaSourceFactory.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/source/UniversalKafkaSourceFactory.scala index 70800fe3676..1a6bb60fc38 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/source/UniversalKafkaSourceFactory.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/source/UniversalKafkaSourceFactory.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.engine.schemedkafka.source -import cats.data.Validated.Valid import cats.data.{NonEmptyList, Validated} +import cats.data.Validated.Valid import io.circe.Json import io.circe.syntax._ import io.confluent.kafka.schemaregistry.ParsedSchema @@ -9,10 +9,11 @@ import org.apache.avro.generic.GenericRecord import org.apache.flink.formats.avro.typeutils.NkSerializableParsedSchema import org.apache.kafka.clients.consumer.ConsumerRecord import org.apache.kafka.common.record.TimestampType +import pl.touk.nussknacker.engine.api.{MetaData, NodeId, Params} import pl.touk.nussknacker.engine.api.component.UnboundedStreamComponent +import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext} import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.CustomNodeError import pl.touk.nussknacker.engine.api.context.transformation.{DefinedEagerParameter, NodeDependencyValue} -import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext} import pl.touk.nussknacker.engine.api.definition._ import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.process.{ @@ -24,17 +25,16 @@ import pl.touk.nussknacker.engine.api.process.{ } import pl.touk.nussknacker.engine.api.test.TestRecord import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypedClass, TypingResult, Unknown} -import pl.touk.nussknacker.engine.api.{MetaData, NodeId, Params} -import pl.touk.nussknacker.engine.kafka.consumerrecord.SerializableConsumerRecord import pl.touk.nussknacker.engine.kafka.PreparedKafkaTopic -import pl.touk.nussknacker.engine.kafka.source.KafkaSourceFactory.{KafkaSourceImplFactory, KafkaTestParametersInfo} +import pl.touk.nussknacker.engine.kafka.consumerrecord.SerializableConsumerRecord import pl.touk.nussknacker.engine.kafka.source._ +import pl.touk.nussknacker.engine.kafka.source.KafkaSourceFactory.{KafkaSourceImplFactory, KafkaTestParametersInfo} +import pl.touk.nussknacker.engine.schemedkafka.{KafkaUniversalComponentTransformer, RuntimeSchemaData} import pl.touk.nussknacker.engine.schemedkafka.KafkaUniversalComponentTransformer.schemaVersionParamName import pl.touk.nussknacker.engine.schemedkafka.schemaregistry._ import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.formatter.SchemaBasedSerializableConsumerRecord import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.UniversalSchemaSupport import pl.touk.nussknacker.engine.schemedkafka.source.UniversalKafkaSourceFactory._ -import pl.touk.nussknacker.engine.schemedkafka.{KafkaUniversalComponentTransformer, RuntimeSchemaData} /** * This is universal kafka source - it will handle both avro and json diff --git a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/typed/AvroSchemaTypeDefinitionExtractor.scala b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/typed/AvroSchemaTypeDefinitionExtractor.scala index 94075faef90..8fd0a4b72f5 100644 --- a/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/typed/AvroSchemaTypeDefinitionExtractor.scala +++ b/utils/schemed-kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/schemedkafka/typed/AvroSchemaTypeDefinitionExtractor.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.schemedkafka.typed -import org.apache.avro.generic.GenericData.EnumSymbol -import org.apache.avro.generic.{GenericData, GenericRecord} import org.apache.avro.{LogicalTypes, Schema} +import org.apache.avro.generic.{GenericData, GenericRecord} +import org.apache.avro.generic.GenericData.EnumSymbol import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypedClass, TypedNull, TypingResult} import java.nio.ByteBuffer diff --git a/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/helpers/KafkaWithSchemaRegistryOperations.scala b/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/helpers/KafkaWithSchemaRegistryOperations.scala index b1031539c8c..f588d6e31e8 100644 --- a/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/helpers/KafkaWithSchemaRegistryOperations.scala +++ b/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/helpers/KafkaWithSchemaRegistryOperations.scala @@ -12,8 +12,8 @@ import org.scalatest.concurrent.{Eventually, ScalaFutures} import org.scalatest.matchers.should.Matchers import org.scalatest.time.{Millis, Seconds, Span} import pl.touk.nussknacker.engine.api.process.TopicName +import pl.touk.nussknacker.engine.kafka.{serialization, KafkaClient, KafkaRecordUtils, UnspecializedTopicName} import pl.touk.nussknacker.engine.kafka.UnspecializedTopicName.ToUnspecializedTopicName -import pl.touk.nussknacker.engine.kafka.{KafkaClient, KafkaRecordUtils, UnspecializedTopicName, serialization} import pl.touk.nussknacker.engine.schemedkafka.schema.DefaultAvroSchemaEvolution import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.ConfluentUtils import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.serialization.AbstractConfluentKafkaAvroSerializer diff --git a/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/helpers/SimpleKafkaAvroDeserializer.scala b/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/helpers/SimpleKafkaAvroDeserializer.scala index fbc8f2caa0e..132a54ebbfb 100644 --- a/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/helpers/SimpleKafkaAvroDeserializer.scala +++ b/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/helpers/SimpleKafkaAvroDeserializer.scala @@ -5,11 +5,11 @@ import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientExcept import org.apache.avro.io.DecoderFactory import org.apache.kafka.common.errors.SerializationException import org.apache.kafka.common.serialization.Deserializer +import pl.touk.nussknacker.engine.schemedkafka.{AvroUtils, RuntimeSchemaData} import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.SchemaId import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.confluent.ConfluentUtils import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.serialization.GenericRecordSchemaIdSerializationSupport import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.AvroPayloadDeserializer -import pl.touk.nussknacker.engine.schemedkafka.{AvroUtils, RuntimeSchemaData} import java.io.IOException import java.nio.ByteBuffer diff --git a/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/AzureTestsFromFileIntegrationTest.scala b/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/AzureTestsFromFileIntegrationTest.scala index 337d69f71fe..e01b3de03a0 100644 --- a/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/AzureTestsFromFileIntegrationTest.scala +++ b/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/schemaregistry/azure/AzureTestsFromFileIntegrationTest.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.schemedkafka.schemaregistry.azure import com.typesafe.scalalogging.LazyLogging import io.confluent.kafka.schemaregistry.avro.AvroSchema -import org.apache.avro.generic.{GenericRecord, GenericRecordBuilder} import org.apache.avro.{Schema, SchemaBuilder} +import org.apache.avro.generic.{GenericRecord, GenericRecordBuilder} import org.apache.kafka.clients.consumer.ConsumerRecord import org.apache.kafka.common.header.Header import org.apache.kafka.common.header.internals.RecordHeaders @@ -13,8 +13,8 @@ import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import org.scalatest.tags.Network import pl.touk.nussknacker.engine.api.process.TopicName -import pl.touk.nussknacker.engine.kafka.UnspecializedTopicName.ToUnspecializedTopicName import pl.touk.nussknacker.engine.kafka.{KafkaConfig, UnspecializedTopicName} +import pl.touk.nussknacker.engine.kafka.UnspecializedTopicName.ToUnspecializedTopicName import pl.touk.nussknacker.engine.schemedkafka.AvroUtils import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.SchemaId import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.universal.{ diff --git a/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/AvroSinkValueTest.scala b/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/AvroSinkValueTest.scala index e7233a878d9..88de9d32606 100644 --- a/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/AvroSinkValueTest.scala +++ b/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/AvroSinkValueTest.scala @@ -3,9 +3,9 @@ package pl.touk.nussknacker.engine.schemedkafka.sink.flink import org.apache.avro.SchemaBuilder import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers +import pl.touk.nussknacker.engine.api.{LazyParameter, NodeId, Params} import pl.touk.nussknacker.engine.api.parameter.ParameterName import pl.touk.nussknacker.engine.api.typed.typing.Typed -import pl.touk.nussknacker.engine.api.{LazyParameter, NodeId, Params} import pl.touk.nussknacker.engine.schemedkafka.KafkaUniversalComponentTransformer.sinkValueParamName import pl.touk.nussknacker.engine.schemedkafka.schema.AvroSchemaBasedParameter import pl.touk.nussknacker.engine.util.sinkvalue.SinkValue diff --git a/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/BasePatientScalaFutures.scala b/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/BasePatientScalaFutures.scala index 1c11f841b7c..61d0c5c5746 100644 --- a/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/BasePatientScalaFutures.scala +++ b/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/BasePatientScalaFutures.scala @@ -1,7 +1,7 @@ package pl.touk.nussknacker.test -import org.scalatest.concurrent.PatienceConfiguration.Timeout import org.scalatest.concurrent.{Eventually, ScalaFutures} +import org.scalatest.concurrent.PatienceConfiguration.Timeout import org.scalatest.exceptions.TestFailedException import scala.concurrent.Future diff --git a/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/NuScalaTestAssertions.scala b/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/NuScalaTestAssertions.scala index 166c944d322..c0c3f67fbfe 100644 --- a/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/NuScalaTestAssertions.scala +++ b/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/NuScalaTestAssertions.scala @@ -3,8 +3,8 @@ package pl.touk.nussknacker.test import com.networknt.schema.{InputFormat, JsonSchema} import io.circe.Json import org.scalactic.source -import org.scalatest.matchers.{MatchResult, Matcher} import org.scalatest.{Assertion, Assertions} +import org.scalatest.matchers.{Matcher, MatchResult} import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag diff --git a/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/ProcessUtils.scala b/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/ProcessUtils.scala index 07b31103999..71b1867ab1a 100644 --- a/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/ProcessUtils.scala +++ b/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/ProcessUtils.scala @@ -5,8 +5,8 @@ import org.apache.commons.io.IOUtils import org.scalatest.Assertion import org.scalatest.matchers.should.Matchers +import scala.concurrent.{blocking, Future} import scala.concurrent.ExecutionContext.Implicits.global -import scala.concurrent.{Future, blocking} import scala.util.control.NonFatal object ProcessUtils extends LazyLogging with Matchers with VeryPatientScalaFutures { diff --git a/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/TestHttpClient.scala b/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/TestHttpClient.scala index a0eb8cdd3ef..625cb166a08 100644 --- a/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/TestHttpClient.scala +++ b/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/TestHttpClient.scala @@ -1,11 +1,12 @@ package pl.touk.nussknacker.test import cats.effect.{IO, Resource} +import cats.effect.unsafe.implicits.global import org.scalatest.{BeforeAndAfterAll, Suite} +import sttp.client3.{HttpClientSyncBackend, Identity, SttpBackend} import sttp.client3.logging.LoggingBackend import sttp.client3.logging.slf4j._ -import sttp.client3.{HttpClientSyncBackend, Identity, SttpBackend} -import cats.effect.unsafe.implicits.global + import java.net.http.HttpClient import javax.net.ssl.SSLContext diff --git a/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/UniquePortProvider.scala b/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/UniquePortProvider.scala index 2a4ecb3d4a0..cccd114f748 100644 --- a/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/UniquePortProvider.scala +++ b/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/UniquePortProvider.scala @@ -1,9 +1,7 @@ package pl.touk.nussknacker.test -import java.util.concurrent.atomic.AtomicInteger - import java.net.ServerSocket - +import java.util.concurrent.atomic.AtomicInteger import scala.annotation.tailrec import scala.util.{Failure, Success, Try} diff --git a/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/WithSttpTestUtils.scala b/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/WithSttpTestUtils.scala index cc2ec0dde82..adcbc1239a5 100644 --- a/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/WithSttpTestUtils.scala +++ b/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/WithSttpTestUtils.scala @@ -1,6 +1,6 @@ package pl.touk.nussknacker.test -import io.circe.{ACursor, Json, parser} +import io.circe.{parser, ACursor, Json} import pl.touk.nussknacker.test.WithSttpTestUtils.ResponseOps import scala.language.implicitConversions diff --git a/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/containers/LogLevelConfigurableScalaLoggingConsumer.scala b/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/containers/LogLevelConfigurableScalaLoggingConsumer.scala index c25394ae6be..d293c1659a9 100644 --- a/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/containers/LogLevelConfigurableScalaLoggingConsumer.scala +++ b/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/containers/LogLevelConfigurableScalaLoggingConsumer.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.test.containers import com.typesafe.scalalogging.LazyLogging -import org.testcontainers.containers.output.OutputFrame.OutputType import org.testcontainers.containers.output.{BaseConsumer, OutputFrame} +import org.testcontainers.containers.output.OutputFrame.OutputType import pl.touk.nussknacker.test.containers.LogLevelConfigurableScalaLoggingConsumer.LoggerLevel class LogLevelConfigurableScalaLoggingConsumer(stdoutLogLevel: LoggerLevel, stderrLogLevel: LoggerLevel) diff --git a/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/installationexample/DockerBasedNuInstallationExampleEnvironment.scala b/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/installationexample/DockerBasedNuInstallationExampleEnvironment.scala index 321ffb0791d..0165ff7cc41 100644 --- a/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/installationexample/DockerBasedNuInstallationExampleEnvironment.scala +++ b/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/installationexample/DockerBasedNuInstallationExampleEnvironment.scala @@ -16,7 +16,7 @@ import org.testcontainers.utility.LogUtils import pl.touk.nussknacker.test.MiscUtils._ import pl.touk.nussknacker.test.WithTestHttpClientCreator import pl.touk.nussknacker.test.containers.ContainerExt.toContainerExt -import pl.touk.nussknacker.test.installationexample.DockerBasedInstallationExampleNuEnvironment.{JSON, slf4jLogger} +import pl.touk.nussknacker.test.installationexample.DockerBasedInstallationExampleNuEnvironment.{slf4jLogger, JSON} import sttp.client3._ import sttp.model.MediaType import ujson.Value diff --git a/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/LoggingListener.scala b/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/LoggingListener.scala index 5c96c78fb0f..ef1280bb19f 100644 --- a/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/LoggingListener.scala +++ b/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/LoggingListener.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.util import org.slf4j.Logger -import pl.touk.nussknacker.engine.api.exception.NuExceptionInfo import pl.touk.nussknacker.engine.api.{Context, MetaData, ProcessListener} +import pl.touk.nussknacker.engine.api.exception.NuExceptionInfo import java.util.concurrent.ConcurrentHashMap import scala.util.Try diff --git a/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/exception/ExceptionRateMeter.scala b/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/exception/ExceptionRateMeter.scala index 654e1880673..c538d5c1196 100644 --- a/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/exception/ExceptionRateMeter.scala +++ b/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/exception/ExceptionRateMeter.scala @@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.util.exception import cats.data.NonEmptyList import pl.touk.nussknacker.engine.api.exception.NuExceptionInfo -import pl.touk.nussknacker.engine.util.metrics.common.naming.nodeIdTag import pl.touk.nussknacker.engine.util.metrics.{MetricIdentifier, MetricsProviderForScenario, RateMeter} +import pl.touk.nussknacker.engine.util.metrics.common.naming.nodeIdTag class ExceptionRateMeter(metricsProvider: MetricsProviderForScenario) { diff --git a/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/loader/ScalaServiceLoader.scala b/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/loader/ScalaServiceLoader.scala index 3a1fb180fea..aa9648368a9 100644 --- a/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/loader/ScalaServiceLoader.scala +++ b/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/loader/ScalaServiceLoader.scala @@ -7,7 +7,7 @@ import pl.touk.nussknacker.engine.util.multiplicity.{Empty, Many, Multiplicity, import java.net.URLClassLoader import java.util.ServiceLoader -import scala.reflect.{ClassTag, classTag} +import scala.reflect.{classTag, ClassTag} object ScalaServiceLoader extends LazyLogging { import scala.jdk.CollectionConverters._ diff --git a/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/metrics/common/EndCountingListener.scala b/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/metrics/common/EndCountingListener.scala index 6594adb45ea..60af785e91c 100644 --- a/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/metrics/common/EndCountingListener.scala +++ b/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/metrics/common/EndCountingListener.scala @@ -1,11 +1,11 @@ package pl.touk.nussknacker.engine.util.metrics.common import cats.data.NonEmptyList -import pl.touk.nussknacker.engine.api.runtimecontext.EngineRuntimeContext import pl.touk.nussknacker.engine.api.{Context, EmptyProcessListener, MetaData} +import pl.touk.nussknacker.engine.api.runtimecontext.EngineRuntimeContext import pl.touk.nussknacker.engine.graph.node.{DeadEndingData, EndingNodeData, NodeData} -import pl.touk.nussknacker.engine.util.metrics.common.naming.nodeIdTag import pl.touk.nussknacker.engine.util.metrics.{MetricIdentifier, RateMeter, WithMetrics} +import pl.touk.nussknacker.engine.util.metrics.common.naming.nodeIdTag private[engine] class EndCountingListener(allNodes: Iterable[NodeData]) extends EmptyProcessListener with WithMetrics { diff --git a/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/metrics/common/NodeCountingListener.scala b/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/metrics/common/NodeCountingListener.scala index c1ba69418e4..7c2e4b7ed36 100644 --- a/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/metrics/common/NodeCountingListener.scala +++ b/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/metrics/common/NodeCountingListener.scala @@ -1,10 +1,10 @@ package pl.touk.nussknacker.engine.util.metrics.common import cats.data.NonEmptyList -import pl.touk.nussknacker.engine.api.runtimecontext.EngineRuntimeContext import pl.touk.nussknacker.engine.api.{Context, EmptyProcessListener, MetaData} -import pl.touk.nussknacker.engine.util.metrics.common.naming.nodeIdTag +import pl.touk.nussknacker.engine.api.runtimecontext.EngineRuntimeContext import pl.touk.nussknacker.engine.util.metrics.{Counter, MetricIdentifier, WithMetrics} +import pl.touk.nussknacker.engine.util.metrics.common.naming.nodeIdTag private[engine] class NodeCountingListener(nodeIds: Iterable[String]) extends EmptyProcessListener with WithMetrics { diff --git a/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/metrics/common/OneSourceMetrics.scala b/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/metrics/common/OneSourceMetrics.scala index b6c0a58cc30..fac7e5aaea4 100644 --- a/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/metrics/common/OneSourceMetrics.scala +++ b/utils/utils-internal/src/main/scala/pl/touk/nussknacker/engine/util/metrics/common/OneSourceMetrics.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.util.metrics.common import cats.data.NonEmptyList -import pl.touk.nussknacker.engine.util.metrics.common.naming.nodeIdTag import pl.touk.nussknacker.engine.util.metrics._ +import pl.touk.nussknacker.engine.util.metrics.common.naming.nodeIdTag import java.time.Clock import java.util.concurrent.atomic.AtomicLong diff --git a/utils/utils-internal/src/test/scala/pl/touk/nussknacker/engine/util/loader/ScalaServiceLoaderSpec.scala b/utils/utils-internal/src/test/scala/pl/touk/nussknacker/engine/util/loader/ScalaServiceLoaderSpec.scala index 3935293fa2e..145c64d641a 100644 --- a/utils/utils-internal/src/test/scala/pl/touk/nussknacker/engine/util/loader/ScalaServiceLoaderSpec.scala +++ b/utils/utils-internal/src/test/scala/pl/touk/nussknacker/engine/util/loader/ScalaServiceLoaderSpec.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.util.loader -import org.scalatest.prop.{TableDrivenPropertyChecks, TableFor3} import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers +import org.scalatest.prop.{TableDrivenPropertyChecks, TableFor3} import java.net.{URL, URLClassLoader} import java.nio.file.Files diff --git a/utils/utils/src/main/scala/pl/touk/nussknacker/engine/util/TimestampUtils.scala b/utils/utils/src/main/scala/pl/touk/nussknacker/engine/util/TimestampUtils.scala index 199d6fee854..77b7685b20e 100644 --- a/utils/utils/src/main/scala/pl/touk/nussknacker/engine/util/TimestampUtils.scala +++ b/utils/utils/src/main/scala/pl/touk/nussknacker/engine/util/TimestampUtils.scala @@ -1,8 +1,9 @@ package pl.touk.nussknacker.engine.util -import java.time.{Instant, OffsetDateTime, ZonedDateTime} import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypingResult} +import java.time.{Instant, OffsetDateTime, ZonedDateTime} + object TimestampUtils { val supportedTimestampTypes: Set[TypingResult] = Set( diff --git a/utils/utils/src/main/scala/pl/touk/nussknacker/engine/util/cache/Cache.scala b/utils/utils/src/main/scala/pl/touk/nussknacker/engine/util/cache/Cache.scala index 5823fd59672..1448d4ec909 100644 --- a/utils/utils/src/main/scala/pl/touk/nussknacker/engine/util/cache/Cache.scala +++ b/utils/utils/src/main/scala/pl/touk/nussknacker/engine/util/cache/Cache.scala @@ -1,8 +1,8 @@ package pl.touk.nussknacker.engine.util.cache import scala.concurrent.{ExecutionContext, Future} -import scala.concurrent.duration.Duration.{Inf, Undefined} import scala.concurrent.duration.{Deadline, Duration, FiniteDuration} +import scala.concurrent.duration.Duration.{Inf, Undefined} trait Cache[K, V] { def getOrCreate(key: K)(value: => V): V diff --git a/utils/utils/src/main/scala/pl/touk/nussknacker/engine/util/config/CustomFicusInstances.scala b/utils/utils/src/main/scala/pl/touk/nussknacker/engine/util/config/CustomFicusInstances.scala index 71ad6708113..17e83dea5c6 100644 --- a/utils/utils/src/main/scala/pl/touk/nussknacker/engine/util/config/CustomFicusInstances.scala +++ b/utils/utils/src/main/scala/pl/touk/nussknacker/engine/util/config/CustomFicusInstances.scala @@ -1,10 +1,10 @@ package pl.touk.nussknacker.engine.util.config -import java.net.URL import com.typesafe.config.Config import net.ceedubs.ficus.{FicusConfig, SimpleFicusConfig} import net.ceedubs.ficus.readers._ +import java.net.URL import java.util.UUID import scala.language.implicitConversions diff --git a/utils/utils/src/main/scala/pl/touk/nussknacker/engine/util/json/ToJsonEncoder.scala b/utils/utils/src/main/scala/pl/touk/nussknacker/engine/util/json/ToJsonEncoder.scala index 649c777e593..17ac7883dd7 100644 --- a/utils/utils/src/main/scala/pl/touk/nussknacker/engine/util/json/ToJsonEncoder.scala +++ b/utils/utils/src/main/scala/pl/touk/nussknacker/engine/util/json/ToJsonEncoder.scala @@ -1,12 +1,12 @@ package pl.touk.nussknacker.engine.util.json +import io.circe.{Encoder, Json} import io.circe.Encoder.encodeZonedDateTimeWithFormatter +import io.circe.Json._ +import pl.touk.nussknacker.engine.api.DisplayJson import java.time.{Instant, LocalDate, LocalDateTime, LocalTime, OffsetDateTime, ZonedDateTime} import java.time.format.DateTimeFormatter -import io.circe.{Encoder, Json} -import io.circe.Json._ -import pl.touk.nussknacker.engine.api.DisplayJson import java.util.ServiceLoader import java.util.UUID import scala.jdk.CollectionConverters._ diff --git a/utils/utils/src/test/scala/pl/touk/nussknacker/engine/util/config/CustomFicusInstancesSpec.scala b/utils/utils/src/test/scala/pl/touk/nussknacker/engine/util/config/CustomFicusInstancesSpec.scala index 1180cf4f3fc..69089df167a 100644 --- a/utils/utils/src/test/scala/pl/touk/nussknacker/engine/util/config/CustomFicusInstancesSpec.scala +++ b/utils/utils/src/test/scala/pl/touk/nussknacker/engine/util/config/CustomFicusInstancesSpec.scala @@ -1,16 +1,17 @@ package pl.touk.nussknacker.engine.util.config -import com.typesafe.config.ConfigValueFactory.fromAnyRef import com.typesafe.config.ConfigFactory +import com.typesafe.config.ConfigValueFactory.fromAnyRef import net.ceedubs.ficus.readers.ArbitraryTypeReader._ import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import CustomFicusInstances._ import java.io.File import java.net.URL import java.util.UUID +import CustomFicusInstances._ + class CustomFicusInstancesSpec extends AnyFlatSpec with Matchers { it should "decode URL using custom decoder" in { From 556572d3552c71c07cb533307ffebf8387a122c9 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Thu, 27 Feb 2025 11:39:16 +0100 Subject: [PATCH 5/5] Update .git-blame-ignore-revs --- .git-blame-ignore-revs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index aea69b763ad..54bf3a41ace 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -5,4 +5,6 @@ aa98eeaa8b65b95938e414a2519f97009f958bb4 # formatting build.sbt file d033fb2a21f7309b7f360e897697766c1e856137 # formatting new lines -11d64bd79eaa7c6436278fe168ecdee5866bf9fc \ No newline at end of file +11d64bd79eaa7c6436278fe168ecdee5866bf9fc +# update scalafmt, add import formatting +9d6fc55d8702a89a3c38b90e6737afcbcd271174