Update scalafmt, enable import grouping

.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 = ascii,
+  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 {

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]

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:

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,

benchmarks/src/test/scala/pl/touk/nussknacker/engine/benchmarks/serialization/avro/AvroSamples.scala

@@ -2,8 +2,8 @@ package pl.touk.nussknacker.engine.benchmarks.serialization.avro
 
 import org.apache.avro.Schema
 import org.apache.avro.generic.GenericData
-import pl.touk.nussknacker.engine.schemedkafka.{AvroUtils, LogicalTypesGenericRecordBuilder}
 import pl.touk.nussknacker.engine.schemedkafka.schemaregistry.{GenericRecordWithSchemaId, SchemaId}
+import pl.touk.nussknacker.engine.schemedkafka.{AvroUtils, LogicalTypesGenericRecordBuilder}
 
 object AvroSamples {
 

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 {
 

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

common-api/src/main/scala/pl/touk/nussknacker/engine/api/MetaData.scala

@@ -4,8 +4,8 @@ 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)
 

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 {

common-api/src/main/scala/pl/touk/nussknacker/engine/graph/expression/Expression.scala

@@ -1,8 +1,8 @@
 package pl.touk.nussknacker.engine.graph.expression
 
-import io.circe.{Decoder, Encoder}
 import io.circe.generic.JsonCodec
 import io.circe.syntax.EncoderOps
+import io.circe.{Decoder, Encoder}
 import pl.touk.nussknacker.engine.graph.expression.Expression.Language
 import pl.touk.nussknacker.engine.graph.expression.Expression.Language.{
   DictKeyWithLabel,

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 {
 

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

components-api/src/main/scala/pl/touk/nussknacker/engine/api/context/ValidationContext.scala

@@ -3,12 +3,12 @@ package pl.touk.nussknacker.engine.api.context
 import cats.data.Validated.{Invalid, Valid}
 import cats.data._
 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 {

components-api/src/main/scala/pl/touk/nussknacker/engine/api/context/transformation/DynamicComponent.scala

@@ -2,13 +2,13 @@ package pl.touk.nussknacker.engine.api.context.transformation
 
 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.definition.{NodeDependency, Parameter}
 import pl.touk.nussknacker.engine.api.parameter.ParameterName
 import pl.touk.nussknacker.engine.api.typed.typing.{TypingResult, Unknown}
+import pl.touk.nussknacker.engine.api.{NodeId, Params}
 
 /*
   This trait provided most generic way of defining Node. In particular, implementations can dynamically define parameter list

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.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.

components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/ValueDecoder.scala

@@ -6,8 +6,8 @@ import pl.touk.nussknacker.engine.api.json.FromJsonDecoder
 import pl.touk.nussknacker.engine.api.typed.typing._
 
 import java.math.BigInteger
-import java.time.{Duration, LocalDate, LocalDateTime, LocalTime, Period}
 import java.time.format.DateTimeFormatter
+import java.time.{Duration, LocalDate, LocalDateTime, LocalTime, Period}
 import scala.jdk.CollectionConverters._
 
 object ValueDecoder {

components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/ValueEncoder.scala

@@ -6,8 +6,8 @@ import io.circe.Json
 import io.circe.Json.{fromBigDecimal, fromBigInt, fromBoolean, fromDouble, fromFloat, fromInt, fromLong, fromString}
 
 import java.math.BigInteger
-import java.time.{Duration, LocalDate, LocalDateTime, LocalTime, Period}
 import java.time.format.DateTimeFormatter
+import java.time.{Duration, LocalDate, LocalDateTime, LocalTime, Period}
 import scala.jdk.CollectionConverters._
 
 object ValueEncoder {

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
 
 /**

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.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.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 pl.touk.nussknacker.engine.api.{CustomStreamTransformer, NodeId, Params}
 
+import java.util.Optional
 import scala.jdk.CollectionConverters._
 
 trait JavaDynamicComponent[T, VC, PAR, ST] {

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
 

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 {

components-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/TypingResultErrorMessagesSpec.scala

@@ -1,10 +1,10 @@
 package pl.touk.nussknacker.engine.api.typed
 
-import cats.implicits._
 import cats.data.NonEmptyList
-import org.scalatest.{Inside, OptionValues}
+import cats.implicits._
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
+import org.scalatest.{Inside, OptionValues}
 import pl.touk.nussknacker.engine.api.typed.AssignabilityDeterminer.isAssignableLoose
 import pl.touk.nussknacker.engine.api.typed.typing._
 

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] =

components/openapi/src/main/scala/pl/touk/nussknacker/openapi/extractor/HandleResponse.scala

@@ -1,10 +1,11 @@
 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 java.util.Collections
+
 object HandleResponse {
 
   def apply(res: Option[Json], responseType: SwaggerTyped): AnyRef = res match {

components/openapi/src/main/scala/pl/touk/nussknacker/openapi/parser/ParseToSwaggerService.scala

@@ -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,

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}

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") {

components/openapi/src/test/scala/pl/touk/nussknacker/openapi/extractor/ServiceRequestTest.scala

@@ -1,16 +1,16 @@
 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}
 import pl.touk.nussknacker.openapi.extractor.ServiceRequest.SwaggerRequestType
 import pl.touk.nussknacker.openapi.parser.SwaggerParser
+import pl.touk.nussknacker.openapi.{OpenAPIServicesConfig, SingleBodyParameter}
 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 {