Skip to content
This repository was archived by the owner on Jan 20, 2023. It is now read-only.

Commit 73bb13e

Browse files
author
wrongwrong
committed
フォーマッティング
1 parent b64700a commit 73bb13e

File tree

5 files changed

+32
-12
lines changed

5 files changed

+32
-12
lines changed

src/main/kotlin/com/mapk/kmapper/BoundKMapper.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,15 @@ class BoundKMapper<S : Any, D : Any> private constructor(
1919
parameterNameConverter: ((String) -> String)?
2020
) {
2121
constructor(function: KFunction<D>, src: KClass<S>, parameterNameConverter: ((String) -> String)? = null) : this(
22-
KFunctionForCall(function, parameterNameConverter), src, parameterNameConverter
22+
KFunctionForCall(function, parameterNameConverter),
23+
src,
24+
parameterNameConverter
2325
)
2426

2527
constructor(clazz: KClass<D>, src: KClass<S>, parameterNameConverter: ((String) -> String)? = null) : this(
26-
clazz.toKConstructor(parameterNameConverter), src, parameterNameConverter
28+
clazz.toKConstructor(parameterNameConverter),
29+
src,
30+
parameterNameConverter
2731
)
2832

2933
private val parameters: List<BoundParameterForMap<S>>

src/main/kotlin/com/mapk/kmapper/BoundParameterForMap.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,15 @@ internal sealed class BoundParameterForMap<S> {
100100
paramClazz == String::class -> ToString(param.name, propertyGetter)
101101
// SrcがMapやPairならKMapperを使わないとマップできない
102102
propertyClazz.isSubclassOf(Map::class) || propertyClazz.isSubclassOf(Pair::class) -> UseKMapper(
103-
param.name, propertyGetter, KMapper(paramClazz, parameterNameConverter)
103+
param.name,
104+
propertyGetter,
105+
KMapper(paramClazz, parameterNameConverter)
104106
)
105107
// 何にも当てはまらなければBoundKMapperでマップを試みる
106108
else -> UseBoundKMapper(
107-
param.name, propertyGetter, BoundKMapper(paramClazz, propertyClazz, parameterNameConverter)
109+
param.name,
110+
propertyGetter,
111+
BoundKMapper(paramClazz, propertyClazz, parameterNameConverter)
108112
)
109113
}
110114
}

src/main/kotlin/com/mapk/kmapper/KMapper.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ class KMapper<T : Any> private constructor(
1919
parameterNameConverter: ((String) -> String)?
2020
) {
2121
constructor(function: KFunction<T>, parameterNameConverter: ((String) -> String)? = null) : this(
22-
KFunctionForCall(function, parameterNameConverter), parameterNameConverter
22+
KFunctionForCall(function, parameterNameConverter),
23+
parameterNameConverter
2324
)
2425

2526
constructor(clazz: KClass<T>, parameterNameConverter: ((String) -> String)? = null) : this(
26-
clazz.toKConstructor(parameterNameConverter), parameterNameConverter
27+
clazz.toKConstructor(parameterNameConverter),
28+
parameterNameConverter
2729
)
2830

2931
private val parameterMap: Map<String, ParameterForMap<*>> = function.requiredParameters.associate {

src/main/kotlin/com/mapk/kmapper/PlainKMapper.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@ class PlainKMapper<T : Any> private constructor(
1717
parameterNameConverter: ((String) -> String)?
1818
) {
1919
constructor(function: KFunction<T>, parameterNameConverter: ((String) -> String)? = null) : this(
20-
KFunctionForCall(function, parameterNameConverter), parameterNameConverter
20+
KFunctionForCall(function, parameterNameConverter),
21+
parameterNameConverter
2122
)
2223

2324
constructor(clazz: KClass<T>, parameterNameConverter: ((String) -> String)? = null) : this(
24-
clazz.toKConstructor(parameterNameConverter), parameterNameConverter
25+
clazz.toKConstructor(parameterNameConverter),
26+
parameterNameConverter
2527
)
2628

2729
private val parameterMap: Map<String, PlainParameterForMap<*>> = function.requiredParameters.associate {

src/test/kotlin/com/mapk/kmapper/BoundParameterForMapTest.kt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ class BoundParameterForMapTest {
4646
fun makeTwiceOrNull(int: Int?) = int?.let { it * 2 }
4747

4848
private val parameter = BoundParameterForMap.UseConverter<IntSrc>(
49-
"", IntSrc::class.memberProperties.single().javaGetter!!, this::makeTwiceOrNull
49+
"",
50+
IntSrc::class.memberProperties.single().javaGetter!!,
51+
this::makeTwiceOrNull
5052
)
5153

5254
@Test
@@ -67,7 +69,9 @@ class BoundParameterForMapTest {
6769
@DisplayName("UseKMapperのテスト")
6870
inner class UseKMapperTest {
6971
private val parameter = BoundParameterForMap.UseKMapper<ObjectSrc>(
70-
"", ObjectSrc::class.memberProperties.single().javaGetter!!, KMapper(::ObjectDst)
72+
"",
73+
ObjectSrc::class.memberProperties.single().javaGetter!!,
74+
KMapper(::ObjectDst)
7175
)
7276

7377
@Test
@@ -88,7 +92,9 @@ class BoundParameterForMapTest {
8892
@DisplayName("UseBoundKMapperのテスト")
8993
inner class UseBoundKMapperTest {
9094
private val parameter = BoundParameterForMap.UseBoundKMapper<ObjectSrc, InnerSrc>(
91-
"", ObjectSrc::class.memberProperties.single().javaGetter!!, BoundKMapper(::ObjectDst, InnerSrc::class)
95+
"",
96+
ObjectSrc::class.memberProperties.single().javaGetter!!,
97+
BoundKMapper(::ObjectDst, InnerSrc::class)
9298
)
9399

94100
@Test
@@ -109,7 +115,9 @@ class BoundParameterForMapTest {
109115
@DisplayName("ToEnumのテスト")
110116
inner class ToEnumTest {
111117
private val parameter = BoundParameterForMap.ToEnum<StringSrc>(
112-
"", StringSrc::class.memberProperties.single().javaGetter!!, JvmLanguage::class.java
118+
"",
119+
StringSrc::class.memberProperties.single().javaGetter!!,
120+
JvmLanguage::class.java
113121
)
114122

115123
@Test

0 commit comments

Comments
 (0)