From 193af0d985bcdb8f45bc7fe6defdd06ec5969f48 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Mon, 26 Sep 2022 14:37:13 +0200 Subject: [PATCH] Revert "[jOOQ/jOOQ#12934] Add jOOQ-kotlin extension methods to help ignore nullability when mapping" --- .../main/kotlin/org/jooq/kotlin/Extensions.kt | 242 ------------------ 1 file changed, 242 deletions(-) diff --git a/jOOQ-kotlin/src/main/kotlin/org/jooq/kotlin/Extensions.kt b/jOOQ-kotlin/src/main/kotlin/org/jooq/kotlin/Extensions.kt index 8ba390b1d8..7699b6ccd5 100644 --- a/jOOQ-kotlin/src/main/kotlin/org/jooq/kotlin/Extensions.kt +++ b/jOOQ-kotlin/src/main/kotlin/org/jooq/kotlin/Extensions.kt @@ -81,94 +81,6 @@ fun > Result.intoSet(): Set = collect(Records.intoSet()) // [jooq-tools] START [mapping] -fun ignoreNulls(f: Function1): Function1 = Function1 { t1: T1? -> f.apply(t1!!) } - -fun ignoreNulls(f: Function2): Function2 = Function2 { t1: T1?, t2: T2? -> f.apply(t1!!, t2!!) } - -fun ignoreNulls(f: Function3): Function3 = Function3 { t1: T1?, t2: T2?, t3: T3? -> f.apply(t1!!, t2!!, t3!!) } - -fun ignoreNulls(f: Function4): Function4 = Function4 { t1: T1?, t2: T2?, t3: T3?, t4: T4? -> f.apply(t1!!, t2!!, t3!!, t4!!) } - -fun ignoreNulls(f: Function5): Function5 = Function5 { t1: T1?, t2: T2?, t3: T3?, t4: T4?, t5: T5? -> f.apply(t1!!, t2!!, t3!!, t4!!, t5!!) } - -fun ignoreNulls(f: Function6): Function6 = Function6 { t1: T1?, t2: T2?, t3: T3?, t4: T4?, t5: T5?, t6: T6? -> f.apply(t1!!, t2!!, t3!!, t4!!, t5!!, t6!!) } - -fun ignoreNulls(f: Function7): Function7 = Function7 { t1: T1?, t2: T2?, t3: T3?, t4: T4?, t5: T5?, t6: T6?, t7: T7? -> f.apply(t1!!, t2!!, t3!!, t4!!, t5!!, t6!!, t7!!) } - -fun ignoreNulls(f: Function8): Function8 = Function8 { t1: T1?, t2: T2?, t3: T3?, t4: T4?, t5: T5?, t6: T6?, t7: T7?, t8: T8? -> f.apply(t1!!, t2!!, t3!!, t4!!, t5!!, t6!!, t7!!, t8!!) } - -fun ignoreNulls(f: Function9): Function9 = Function9 { t1: T1?, t2: T2?, t3: T3?, t4: T4?, t5: T5?, t6: T6?, t7: T7?, t8: T8?, t9: T9? -> f.apply(t1!!, t2!!, t3!!, t4!!, t5!!, t6!!, t7!!, t8!!, t9!!) } - -fun ignoreNulls(f: Function10): Function10 = Function10 { t1: T1?, t2: T2?, t3: T3?, t4: T4?, t5: T5?, t6: T6?, t7: T7?, t8: T8?, t9: T9?, t10: T10? -> f.apply(t1!!, t2!!, t3!!, t4!!, t5!!, t6!!, t7!!, t8!!, t9!!, t10!!) } - -fun ignoreNulls(f: Function11): Function11 = Function11 { t1: T1?, t2: T2?, t3: T3?, t4: T4?, t5: T5?, t6: T6?, t7: T7?, t8: T8?, t9: T9?, t10: T10?, t11: T11? -> f.apply(t1!!, t2!!, t3!!, t4!!, t5!!, t6!!, t7!!, t8!!, t9!!, t10!!, t11!!) } - -fun ignoreNulls(f: Function12): Function12 = Function12 { t1: T1?, t2: T2?, t3: T3?, t4: T4?, t5: T5?, t6: T6?, t7: T7?, t8: T8?, t9: T9?, t10: T10?, t11: T11?, t12: T12? -> f.apply(t1!!, t2!!, t3!!, t4!!, t5!!, t6!!, t7!!, t8!!, t9!!, t10!!, t11!!, t12!!) } - -fun ignoreNulls(f: Function13): Function13 = Function13 { t1: T1?, t2: T2?, t3: T3?, t4: T4?, t5: T5?, t6: T6?, t7: T7?, t8: T8?, t9: T9?, t10: T10?, t11: T11?, t12: T12?, t13: T13? -> f.apply(t1!!, t2!!, t3!!, t4!!, t5!!, t6!!, t7!!, t8!!, t9!!, t10!!, t11!!, t12!!, t13!!) } - -fun ignoreNulls(f: Function14): Function14 = Function14 { t1: T1?, t2: T2?, t3: T3?, t4: T4?, t5: T5?, t6: T6?, t7: T7?, t8: T8?, t9: T9?, t10: T10?, t11: T11?, t12: T12?, t13: T13?, t14: T14? -> f.apply(t1!!, t2!!, t3!!, t4!!, t5!!, t6!!, t7!!, t8!!, t9!!, t10!!, t11!!, t12!!, t13!!, t14!!) } - -fun ignoreNulls(f: Function15): Function15 = Function15 { t1: T1?, t2: T2?, t3: T3?, t4: T4?, t5: T5?, t6: T6?, t7: T7?, t8: T8?, t9: T9?, t10: T10?, t11: T11?, t12: T12?, t13: T13?, t14: T14?, t15: T15? -> f.apply(t1!!, t2!!, t3!!, t4!!, t5!!, t6!!, t7!!, t8!!, t9!!, t10!!, t11!!, t12!!, t13!!, t14!!, t15!!) } - -fun ignoreNulls(f: Function16): Function16 = Function16 { t1: T1?, t2: T2?, t3: T3?, t4: T4?, t5: T5?, t6: T6?, t7: T7?, t8: T8?, t9: T9?, t10: T10?, t11: T11?, t12: T12?, t13: T13?, t14: T14?, t15: T15?, t16: T16? -> f.apply(t1!!, t2!!, t3!!, t4!!, t5!!, t6!!, t7!!, t8!!, t9!!, t10!!, t11!!, t12!!, t13!!, t14!!, t15!!, t16!!) } - -fun ignoreNulls(f: Function17): Function17 = Function17 { t1: T1?, t2: T2?, t3: T3?, t4: T4?, t5: T5?, t6: T6?, t7: T7?, t8: T8?, t9: T9?, t10: T10?, t11: T11?, t12: T12?, t13: T13?, t14: T14?, t15: T15?, t16: T16?, t17: T17? -> f.apply(t1!!, t2!!, t3!!, t4!!, t5!!, t6!!, t7!!, t8!!, t9!!, t10!!, t11!!, t12!!, t13!!, t14!!, t15!!, t16!!, t17!!) } - -fun ignoreNulls(f: Function18): Function18 = Function18 { t1: T1?, t2: T2?, t3: T3?, t4: T4?, t5: T5?, t6: T6?, t7: T7?, t8: T8?, t9: T9?, t10: T10?, t11: T11?, t12: T12?, t13: T13?, t14: T14?, t15: T15?, t16: T16?, t17: T17?, t18: T18? -> f.apply(t1!!, t2!!, t3!!, t4!!, t5!!, t6!!, t7!!, t8!!, t9!!, t10!!, t11!!, t12!!, t13!!, t14!!, t15!!, t16!!, t17!!, t18!!) } - -fun ignoreNulls(f: Function19): Function19 = Function19 { t1: T1?, t2: T2?, t3: T3?, t4: T4?, t5: T5?, t6: T6?, t7: T7?, t8: T8?, t9: T9?, t10: T10?, t11: T11?, t12: T12?, t13: T13?, t14: T14?, t15: T15?, t16: T16?, t17: T17?, t18: T18?, t19: T19? -> f.apply(t1!!, t2!!, t3!!, t4!!, t5!!, t6!!, t7!!, t8!!, t9!!, t10!!, t11!!, t12!!, t13!!, t14!!, t15!!, t16!!, t17!!, t18!!, t19!!) } - -fun ignoreNulls(f: Function20): Function20 = Function20 { t1: T1?, t2: T2?, t3: T3?, t4: T4?, t5: T5?, t6: T6?, t7: T7?, t8: T8?, t9: T9?, t10: T10?, t11: T11?, t12: T12?, t13: T13?, t14: T14?, t15: T15?, t16: T16?, t17: T17?, t18: T18?, t19: T19?, t20: T20? -> f.apply(t1!!, t2!!, t3!!, t4!!, t5!!, t6!!, t7!!, t8!!, t9!!, t10!!, t11!!, t12!!, t13!!, t14!!, t15!!, t16!!, t17!!, t18!!, t19!!, t20!!) } - -fun ignoreNulls(f: Function21): Function21 = Function21 { t1: T1?, t2: T2?, t3: T3?, t4: T4?, t5: T5?, t6: T6?, t7: T7?, t8: T8?, t9: T9?, t10: T10?, t11: T11?, t12: T12?, t13: T13?, t14: T14?, t15: T15?, t16: T16?, t17: T17?, t18: T18?, t19: T19?, t20: T20?, t21: T21? -> f.apply(t1!!, t2!!, t3!!, t4!!, t5!!, t6!!, t7!!, t8!!, t9!!, t10!!, t11!!, t12!!, t13!!, t14!!, t15!!, t16!!, t17!!, t18!!, t19!!, t20!!, t21!!) } - -fun ignoreNulls(f: Function22): Function22 = Function22 { t1: T1?, t2: T2?, t3: T3?, t4: T4?, t5: T5?, t6: T6?, t7: T7?, t8: T8?, t9: T9?, t10: T10?, t11: T11?, t12: T12?, t13: T13?, t14: T14?, t15: T15?, t16: T16?, t17: T17?, t18: T18?, t19: T19?, t20: T20?, t21: T21?, t22: T22? -> f.apply(t1!!, t2!!, t3!!, t4!!, t5!!, t6!!, t7!!, t8!!, t9!!, t10!!, t11!!, t12!!, t13!!, t14!!, t15!!, t16!!, t17!!, t18!!, t19!!, t20!!, t21!!, t22!!) } - -fun mappingIgnoreNulls(f: Function1): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function2): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function3): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function4): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function5): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function6): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function7): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function8): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function9): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function10): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function11): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function12): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function13): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function14): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function15): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function16): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function17): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function18): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function19): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function20): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function21): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - -fun mappingIgnoreNulls(f: Function22): RecordMapper, E> = Records.mapping(ignoreNulls(f)) - @JvmName("mappingRecord") fun Field>.mapping(f: Function1): Field = convertFrom { Records.mapping(f).apply(it) } @@ -235,72 +147,6 @@ fun Field>.mapping(f: Function22): Field = convertFrom { Records.mapping(f).apply(it) } -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function1): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function2): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function3): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function4): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function5): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function6): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function7): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function8): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function9): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function10): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function11): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function12): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function13): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function14): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function15): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function16): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function17): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function18): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function19): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function20): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function21): Field = mapping(ignoreNulls(f)) - -@JvmName("mappingRecordIgnoreNulls") -fun Field>.mappingIgnoreNulls(f: Function22): Field = mapping(ignoreNulls(f)) - fun Field>>.mapping(f: Function1): Field> = convertFrom { it.map(Records.mapping(f)) } fun Field>>.mapping(f: Function2): Field> = convertFrom { it.map(Records.mapping(f)) } @@ -345,94 +191,6 @@ fun Field>>.mapping(f: Function22): Field> = convertFrom { it.map(Records.mapping(f)) } -fun Field>>.mappingIgnoreNulls(f: Function1): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function2): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function3): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function4): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function5): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function6): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function7): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function8): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function9): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function10): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function11): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function12): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function13): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function14): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function15): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function16): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function17): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function18): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function19): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function20): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function21): Field> = mapping(ignoreNulls(f)) - -fun Field>>.mappingIgnoreNulls(f: Function22): Field> = mapping(ignoreNulls(f)) - -fun Row1.mappingIgnoreNulls(f: Function1): SelectField = mapping(ignoreNulls(f)) - -fun Row2.mappingIgnoreNulls(f: Function2): SelectField = mapping(ignoreNulls(f)) - -fun Row3.mappingIgnoreNulls(f: Function3): SelectField = mapping(ignoreNulls(f)) - -fun Row4.mappingIgnoreNulls(f: Function4): SelectField = mapping(ignoreNulls(f)) - -fun Row5.mappingIgnoreNulls(f: Function5): SelectField = mapping(ignoreNulls(f)) - -fun Row6.mappingIgnoreNulls(f: Function6): SelectField = mapping(ignoreNulls(f)) - -fun Row7.mappingIgnoreNulls(f: Function7): SelectField = mapping(ignoreNulls(f)) - -fun Row8.mappingIgnoreNulls(f: Function8): SelectField = mapping(ignoreNulls(f)) - -fun Row9.mappingIgnoreNulls(f: Function9): SelectField = mapping(ignoreNulls(f)) - -fun Row10.mappingIgnoreNulls(f: Function10): SelectField = mapping(ignoreNulls(f)) - -fun Row11.mappingIgnoreNulls(f: Function11): SelectField = mapping(ignoreNulls(f)) - -fun Row12.mappingIgnoreNulls(f: Function12): SelectField = mapping(ignoreNulls(f)) - -fun Row13.mappingIgnoreNulls(f: Function13): SelectField = mapping(ignoreNulls(f)) - -fun Row14.mappingIgnoreNulls(f: Function14): SelectField = mapping(ignoreNulls(f)) - -fun Row15.mappingIgnoreNulls(f: Function15): SelectField = mapping(ignoreNulls(f)) - -fun Row16.mappingIgnoreNulls(f: Function16): SelectField = mapping(ignoreNulls(f)) - -fun Row17.mappingIgnoreNulls(f: Function17): SelectField = mapping(ignoreNulls(f)) - -fun Row18.mappingIgnoreNulls(f: Function18): SelectField = mapping(ignoreNulls(f)) - -fun Row19.mappingIgnoreNulls(f: Function19): SelectField = mapping(ignoreNulls(f)) - -fun Row20.mappingIgnoreNulls(f: Function20): SelectField = mapping(ignoreNulls(f)) - -fun Row21.mappingIgnoreNulls(f: Function21): SelectField = mapping(ignoreNulls(f)) - -fun Row22.mappingIgnoreNulls(f: Function22): SelectField = mapping(ignoreNulls(f)) - // [jooq-tools] END [mapping] // ----------------------------------------------------------------------------