update »ktfmt« to 0.54

Author: agebhar1

pom.xml

@@ -21,9 +21,9 @@
 	<inceptionYear>2019</inceptionYear>
 
 	<properties>
-		<ktfmt.version>0.41</ktfmt.version>
+		<ktfmt.version>0.54</ktfmt.version>
 		<mockk.version>1.13.16</mockk.version>
-		<spotless.version>2.32.0</spotless.version>
+		<spotless.version>2.44.3</spotless.version>
 	</properties>
 
 	<dependencyManagement>

src/main/kotlin/com/github/agebhar1/prototypes/xml/transform/DataURLResolver.kt

@@ -30,10 +30,10 @@ class DataURLResolver : URIResolver {
   private val serializer = DataUrlSerializer()
 
   override fun resolve(href: String?, base: String?): Source? =
-    href?.let {
-      val dataUrl = serializer.unserialize(it)
-      StreamSource(
-        StringReader(
-          String(dataUrl.data, Charset.forName(dataUrl.headers?.get("charset") ?: "UTF-8"))))
-    }
+      href?.let {
+        val dataUrl = serializer.unserialize(it)
+        StreamSource(
+            StringReader(
+                String(dataUrl.data, Charset.forName(dataUrl.headers?.get("charset") ?: "UTF-8"))))
+      }
 }

src/main/kotlin/com/github/agebhar1/prototypes/xml/transform/DataURLResolverPresetTransformerFactory.kt

@@ -23,12 +23,12 @@ import javax.xml.transform.Templates
 import javax.xml.transform.TransformerFactory
 
 class DataURLResolverPresetTransformerFactory :
-  DelegatingTransformerFactory(TransformerFactory.newInstance()) {
+    DelegatingTransformerFactory(TransformerFactory.newInstance()) {
 
   init {
     uriResolver = DataURLResolver()
   }
 
   override fun newTemplates(source: Source?): Templates? =
-    Jdk8URIResolverFixProxyTemplates(delegate.newTemplates(source), uriResolver)
+      Jdk8URIResolverFixProxyTemplates(delegate.newTemplates(source), uriResolver)
 }

src/main/kotlin/com/github/agebhar1/prototypes/xml/transform/DelegatingTransformerFactory.kt

@@ -26,7 +26,7 @@ import javax.xml.transform.TransformerFactory
 import javax.xml.transform.URIResolver
 
 open class DelegatingTransformerFactory(protected val delegate: TransformerFactory) :
-  TransformerFactory() {
+    TransformerFactory() {
 
   override fun newTransformer(): Transformer? = delegate.newTransformer()
 
@@ -35,10 +35,10 @@ open class DelegatingTransformerFactory(protected val delegate: TransformerFacto
   override fun newTemplates(source: Source?): Templates? = delegate.newTemplates(source)
 
   override fun getAssociatedStylesheet(
-    source: Source?,
-    media: String?,
-    title: String?,
-    charset: String?
+      source: Source?,
+      media: String?,
+      title: String?,
+      charset: String?
   ): Source? = delegate.getAssociatedStylesheet(source, media, title, charset)
 
   override fun setURIResolver(resolver: URIResolver?) {

src/main/kotlin/com/github/agebhar1/prototypes/xml/transform/Jdk8URIResolverFixProxyTemplates.kt

@@ -23,14 +23,14 @@ import javax.xml.transform.Transformer
 import javax.xml.transform.URIResolver
 
 class Jdk8URIResolverFixProxyTemplates(
-  private val delegate: Templates,
-  private val resolver: URIResolver?
+    private val delegate: Templates,
+    private val resolver: URIResolver?
 ) : Templates by delegate {
 
   override fun newTransformer(): Transformer? =
-    delegate.newTransformer().apply {
-      if (uriResolver == null) {
-        uriResolver = resolver
+      delegate.newTransformer().apply {
+        if (uriResolver == null) {
+          uriResolver = resolver
+        }
       }
-    }
 }

src/test/kotlin/com/github/agebhar1/prototypes/FlowTests.kt

@@ -46,46 +46,46 @@ class FlowTests {
 
   @Test
   fun `data URL should be resolved on XML transformation`(
-    @Autowired input: DirectChannel,
-    @Autowired output: QueueChannel
+      @Autowired input: DirectChannel,
+      @Autowired output: QueueChannel
   ) {
 
     val serializer = DataUrlSerializer()
 
     input.send(
-      MessageBuilder.withPayload(
-          """
+        MessageBuilder.withPayload(
+                """
           <?xml version="1.0" encoding="UTF-8"?>
           <document/>
           """
-            .replaceIndent())
-        .setHeader(
-          "data",
-          serializer.serialize(
-            DataUrlBuilder()
-              .setMimeType("application/xml")
-              .setHeader("charset", "UTF-8")
-              .setEncoding(DataUrlEncoding.BASE64)
-              .setData(
-                """
+                    .replaceIndent())
+            .setHeader(
+                "data",
+                serializer.serialize(
+                    DataUrlBuilder()
+                        .setMimeType("application/xml")
+                        .setHeader("charset", "UTF-8")
+                        .setEncoding(DataUrlEncoding.BASE64)
+                        .setData(
+                            """
 							<nodes>
 								<node rank="0">
 									<node rank="0"/>
 								</node>
 								<node rank="1"/>
 							</nodes>
 							"""
-                  .replaceIndent()
-                  .toByteArray())
-              .build()))
-        .build())
+                                .replaceIndent()
+                                .toByteArray())
+                        .build()))
+            .build())
 
     val message = output.receive()
 
     assertThat(
-      message?.payload,
-      isIdenticalTo(
-          """
+        message?.payload,
+        isIdenticalTo(
+                """
 				<?xml version="1.0" encoding="UTF-8"?>
 				<document>
 					<node rank="0">
@@ -94,8 +94,8 @@ class FlowTests {
 					<node rank="1"/>
 				</document>
 				"""
-            .replaceIndent())
-        .normalizeWhitespace())
+                    .replaceIndent())
+            .normalizeWhitespace())
   }
 
   @TestConfiguration
@@ -108,12 +108,12 @@ class FlowTests {
 
     @Bean
     fun flow(@Value("classpath:xslt/stylesheet.xsl") resource: Resource) =
-      integrationFlow("xml.input") {
-        transform(
-          XsltPayloadTransformer(
-              resource, DataURLResolverPresetTransformerFactory::class.java.canonicalName)
-            .apply { setXsltParamHeaders("data") })
-        channel("xml.output")
-      }
+        integrationFlow("xml.input") {
+          transform(
+              XsltPayloadTransformer(
+                      resource, DataURLResolverPresetTransformerFactory::class.java.canonicalName)
+                  .apply { setXsltParamHeaders("data") })
+          channel("xml.output")
+        }
   }
 }

src/test/kotlin/com/github/agebhar1/prototypes/xml/transform/DataURLResolverPresetTransformerFactoryTests.kt

@@ -34,7 +34,7 @@ class DataURLResolverPresetTransformerFactoryTests {
   @Test
   fun `newTemplate(Source) should return a instance of Jdk8URIResolverFixProxyTemplates`() {
     assertThat(instance.newTemplates(AnySource))
-      .isInstanceOf(Jdk8URIResolverFixProxyTemplates::class.java)
+        .isInstanceOf(Jdk8URIResolverFixProxyTemplates::class.java)
   }
 
   companion object {

src/test/kotlin/com/github/agebhar1/prototypes/xml/transform/DataURLResolverTests.kt

@@ -43,14 +43,14 @@ class DataURLResolverTests {
   @Test
   fun `resolve non data URL should throw MalformedURLException`() {
     val exception =
-      assertThrows<MalformedURLException> { resolver.resolve("https://github.com/", null) }
+        assertThrows<MalformedURLException> { resolver.resolve("https://github.com/", null) }
     assertThat(exception).hasMessage("Wrong protocol")
   }
 
   /**
    * RFC 2397
-   *
    * 3. Syntax
+   *
    * ```
    * 		dataurl    := "data:" [ mediatype ] [ ";base64" ] "," data
    * 		mediatype  := [ type "/" subtype ] *( ";" parameter )
@@ -61,9 +61,9 @@ class DataURLResolverTests {
   @Test
   fun `resolve data URL with invalid 'encoding' should throw MalformedURLException`() {
     val exception =
-      assertThrows<MalformedURLException> {
-        resolver.resolve("data:plain/text;base32,JBSWY3DPEBFW65DMNFXAU===", null)
-      }
+        assertThrows<MalformedURLException> {
+          resolver.resolve("data:plain/text;base32,JBSWY3DPEBFW65DMNFXAU===", null)
+        }
     assertThat(exception).hasMessage("Unknown encoding \"base32\"")
   }
 
@@ -76,11 +76,11 @@ class DataURLResolverTests {
   @Test
   fun `resolve data URL with Base64 decoded data should return a StreamSource with encoded data`() {
     val actual =
-      resolver
-        .resolve(
-          "data:plain/text;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPGRvY3VtZW50Lz4K",
-          null)
-        .asString()
+        resolver
+            .resolve(
+                "data:plain/text;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPGRvY3VtZW50Lz4K",
+                null)
+            .asString()
     assertThat(actual).isEqualTo("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<document/>\n")
   }
 
@@ -91,10 +91,10 @@ class DataURLResolverTests {
   }
 
   private fun Source?.asString(): String? =
-    this?.let {
-      when (it) {
-        is StreamSource -> it.reader.readText()
-        else -> null
+      this?.let {
+        when (it) {
+          is StreamSource -> it.reader.readText()
+          else -> null
+        }
       }
-    }
 }