Skip to content

Commit f37ac11

Browse files
committed
Updates per Detekt
1 parent dccf148 commit f37ac11

File tree

6 files changed

+17
-28
lines changed

6 files changed

+17
-28
lines changed

src/test/kotlin/examples/kotlin/mybatis3/canonical/AddressRecord.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2016-2019 the original author or authors.
2+
* Copyright 2016-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonDynamicSqlSupport.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2016-2019 the original author or authors.
2+
* Copyright 2016-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonWithAddressMapper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2016-2019 the original author or authors.
2+
* Copyright 2016-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/test/kotlin/examples/kotlin/mybatis3/joins/Domain.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2016-2019 the original author or authors.
2+
* Copyright 2016-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/test/kotlin/examples/kotlin/spring/canonical/AddressRecord.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2016-2019 the original author or authors.
2+
* Copyright 2016-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/test/kotlin/examples/kotlin/spring/canonical/CanonicalSpringKotlinTest.kt

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder
3434
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType
3535
import java.util.*
3636

37-
@Suppress("LargeClass", "LongMethod")
37+
@Suppress("LargeClass", "LongMethod", "MaxLineLength")
3838
class CanonicalSpringKotlinTest {
3939
private lateinit var template: NamedParameterJdbcTemplate
4040

@@ -258,8 +258,7 @@ class CanonicalSpringKotlinTest {
258258
set(addressId).toValue(1)
259259
}
260260

261-
val expected = "insert into Person (id, first_name, last_name, birth_date," +
262-
" employed, occupation, address_id)" +
261+
val expected = "insert into Person (id, first_name, last_name, birth_date, employed, occupation, address_id)" +
263262
" values (:p1, :p2, :p3, :p4, :p5, :p6, :p7)"
264263

265264
assertThat(insertStatement.insertStatement).isEqualTo(expected)
@@ -460,18 +459,15 @@ class CanonicalSpringKotlinTest {
460459
}
461460
}
462461

463-
val expected = "select id as A_ID, first_name, last_name, birth_date, " +
464-
"employed, occupation, address_id " +
462+
val expected = "select id as A_ID, first_name, last_name, birth_date, employed, occupation, address_id " +
465463
"from Person " +
466464
"where id = :p1 " +
467465
"union " +
468-
"select id as A_ID, first_name, last_name, birth_date, " +
469-
"employed, occupation, address_id " +
466+
"select id as A_ID, first_name, last_name, birth_date, employed, occupation, address_id " +
470467
"from Person " +
471468
"where id = :p2 " +
472469
"union " +
473-
"select p.id as A_ID, p.first_name, p.last_name, p.birth_date, " +
474-
"p.employed, p.occupation, p.address_id " +
470+
"select p.id as A_ID, p.first_name, p.last_name, p.birth_date, p.employed, p.occupation, p.address_id " +
475471
"from Person p " +
476472
"where p.id = :p3"
477473

@@ -536,18 +532,15 @@ class CanonicalSpringKotlinTest {
536532
}
537533
}
538534

539-
val expected = "select id as A_ID, first_name, last_name, birth_date, " +
540-
"employed, occupation, address_id " +
535+
val expected = "select id as A_ID, first_name, last_name, birth_date, employed, occupation, address_id " +
541536
"from Person " +
542537
"where id = :p1 " +
543538
"union " +
544-
"select id as A_ID, first_name, last_name, birth_date, " +
545-
"employed, occupation, address_id " +
539+
"select id as A_ID, first_name, last_name, birth_date, employed, occupation, address_id " +
546540
"from Person " +
547541
"where id = :p2 " +
548542
"union " +
549-
"select distinct p.id as A_ID, p.first_name, p.last_name, p.birth_date, " +
550-
"p.employed, p.occupation, p.address_id " +
543+
"select distinct p.id as A_ID, p.first_name, p.last_name, p.birth_date, p.employed, p.occupation, p.address_id " +
551544
"from Person p " +
552545
"where p.id = :p3"
553546

@@ -613,18 +606,15 @@ class CanonicalSpringKotlinTest {
613606
orderBy(sortColumn("A_ID"))
614607
}
615608

616-
val expected = "select id as A_ID, first_name, last_name, birth_date, " +
617-
"employed, occupation, address_id " +
609+
val expected = "select id as A_ID, first_name, last_name, birth_date, employed, occupation, address_id " +
618610
"from Person " +
619611
"where id = :p1 " +
620612
"union " +
621-
"select id as A_ID, first_name, last_name, birth_date, " +
622-
"employed, occupation, address_id " +
613+
"select id as A_ID, first_name, last_name, birth_date, employed, occupation, address_id " +
623614
"from Person " +
624615
"where id = :p2 " +
625616
"union all " +
626-
"select distinct p.id as A_ID, p.first_name, p.last_name, p.birth_date, " +
627-
"p.employed, p.occupation, p.address_id " +
617+
"select distinct p.id as A_ID, p.first_name, p.last_name, p.birth_date, p.employed, p.occupation, p.address_id " +
628618
"from Person p " +
629619
"order by A_ID"
630620

@@ -737,8 +727,7 @@ class CanonicalSpringKotlinTest {
737727
limit(3)
738728
}
739729

740-
val expected = "select id as A_ID, first_name, last_name, birth_date," +
741-
" employed, occupation, address_id" +
730+
val expected = "select id as A_ID, first_name, last_name, birth_date, employed, occupation, address_id" +
742731
" from Person" +
743732
" where id < :p1" +
744733
" and (id < :p2" +

0 commit comments

Comments
 (0)