Skip to content

Commit 89204f0

Browse files
fix(client)!: don't generate default variant field/method names with underscores (#328)
1 parent 73e294d commit 89204f0

12 files changed

Lines changed: 275 additions & 275 deletions

lithic-java-core/src/main/kotlin/com/lithic/api/models/AuthRuleMigrateV1ToV2Response.kt

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ private constructor(
850850
class Value
851851
private constructor(
852852
private val string: String? = null,
853-
private val double_: Double? = null,
853+
private val number: Double? = null,
854854
private val strings: List<String>? = null,
855855
private val _json: JsonValue? = null,
856856
) {
@@ -860,19 +860,19 @@ private constructor(
860860
/** A regex string, to be used with `MATCHES` or `DOES_NOT_MATCH` */
861861
fun string(): Optional<String> = Optional.ofNullable(string)
862862
/** A number, to be used with `IS_GREATER_THAN` or `IS_LESS_THAN` */
863-
fun double_(): Optional<Double> = Optional.ofNullable(double_)
863+
fun number(): Optional<Double> = Optional.ofNullable(number)
864864
/** An array of strings, to be used with `IS_ONE_OF` or `IS_NOT_ONE_OF` */
865865
fun strings(): Optional<List<String>> = Optional.ofNullable(strings)
866866

867867
fun isString(): Boolean = string != null
868868

869-
fun isDouble(): Boolean = double_ != null
869+
fun isNumber(): Boolean = number != null
870870

871871
fun isStrings(): Boolean = strings != null
872872

873873
fun asString(): String = string.getOrThrow("string")
874874

875-
fun asDouble(): Double = double_.getOrThrow("double_")
875+
fun asNumber(): Double = number.getOrThrow("number")
876876

877877
fun asStrings(): List<String> = strings.getOrThrow("strings")
878878

@@ -881,15 +881,15 @@ private constructor(
881881
fun <T> accept(visitor: Visitor<T>): T {
882882
return when {
883883
string != null -> visitor.visitString(string)
884-
double_ != null -> visitor.visitDouble(double_)
884+
number != null -> visitor.visitNumber(number)
885885
strings != null -> visitor.visitStrings(strings)
886886
else -> visitor.unknown(_json)
887887
}
888888
}
889889

890890
fun validate(): Value = apply {
891891
if (!validated) {
892-
if (string == null && double_ == null && strings == null) {
892+
if (string == null && number == null && strings == null) {
893893
throw LithicInvalidDataException("Unknown Value: $_json")
894894
}
895895
validated = true
@@ -901,17 +901,17 @@ private constructor(
901901
return true
902902
}
903903

904-
return /* spotless:off */ other is Value && this.string == other.string && this.double_ == other.double_ && this.strings == other.strings /* spotless:on */
904+
return /* spotless:off */ other is Value && this.string == other.string && this.number == other.number && this.strings == other.strings /* spotless:on */
905905
}
906906

907907
override fun hashCode(): Int {
908-
return /* spotless:off */ Objects.hash(string, double_, strings) /* spotless:on */
908+
return /* spotless:off */ Objects.hash(string, number, strings) /* spotless:on */
909909
}
910910

911911
override fun toString(): String {
912912
return when {
913913
string != null -> "Value{string=$string}"
914-
double_ != null -> "Value{double_=$double_}"
914+
number != null -> "Value{number=$number}"
915915
strings != null -> "Value{strings=$strings}"
916916
_json != null -> "Value{_unknown=$_json}"
917917
else -> throw IllegalStateException("Invalid Value")
@@ -922,7 +922,7 @@ private constructor(
922922

923923
@JvmStatic fun ofString(string: String) = Value(string = string)
924924

925-
@JvmStatic fun ofDouble(double_: Double) = Value(double_ = double_)
925+
@JvmStatic fun ofNumber(number: Double) = Value(number = number)
926926

927927
@JvmStatic
928928
fun ofStrings(strings: List<String>) = Value(strings = strings)
@@ -932,7 +932,7 @@ private constructor(
932932

933933
fun visitString(string: String): T
934934

935-
fun visitDouble(double_: Double): T
935+
fun visitNumber(number: Double): T
936936

937937
fun visitStrings(strings: List<String>): T
938938

@@ -949,7 +949,7 @@ private constructor(
949949
return Value(string = it, _json = json)
950950
}
951951
tryDeserialize(node, jacksonTypeRef<Double>())?.let {
952-
return Value(double_ = it, _json = json)
952+
return Value(number = it, _json = json)
953953
}
954954
tryDeserialize(node, jacksonTypeRef<List<String>>())?.let {
955955
return Value(strings = it, _json = json)
@@ -968,7 +968,7 @@ private constructor(
968968
) {
969969
when {
970970
value.string != null -> generator.writeObject(value.string)
971-
value.double_ != null -> generator.writeObject(value.double_)
971+
value.number != null -> generator.writeObject(value.number)
972972
value.strings != null -> generator.writeObject(value.strings)
973973
value._json != null -> generator.writeObject(value._json)
974974
else -> throw IllegalStateException("Invalid Value")
@@ -1658,7 +1658,7 @@ private constructor(
16581658
class Value
16591659
private constructor(
16601660
private val string: String? = null,
1661-
private val double_: Double? = null,
1661+
private val number: Double? = null,
16621662
private val strings: List<String>? = null,
16631663
private val _json: JsonValue? = null,
16641664
) {
@@ -1668,19 +1668,19 @@ private constructor(
16681668
/** A regex string, to be used with `MATCHES` or `DOES_NOT_MATCH` */
16691669
fun string(): Optional<String> = Optional.ofNullable(string)
16701670
/** A number, to be used with `IS_GREATER_THAN` or `IS_LESS_THAN` */
1671-
fun double_(): Optional<Double> = Optional.ofNullable(double_)
1671+
fun number(): Optional<Double> = Optional.ofNullable(number)
16721672
/** An array of strings, to be used with `IS_ONE_OF` or `IS_NOT_ONE_OF` */
16731673
fun strings(): Optional<List<String>> = Optional.ofNullable(strings)
16741674

16751675
fun isString(): Boolean = string != null
16761676

1677-
fun isDouble(): Boolean = double_ != null
1677+
fun isNumber(): Boolean = number != null
16781678

16791679
fun isStrings(): Boolean = strings != null
16801680

16811681
fun asString(): String = string.getOrThrow("string")
16821682

1683-
fun asDouble(): Double = double_.getOrThrow("double_")
1683+
fun asNumber(): Double = number.getOrThrow("number")
16841684

16851685
fun asStrings(): List<String> = strings.getOrThrow("strings")
16861686

@@ -1689,15 +1689,15 @@ private constructor(
16891689
fun <T> accept(visitor: Visitor<T>): T {
16901690
return when {
16911691
string != null -> visitor.visitString(string)
1692-
double_ != null -> visitor.visitDouble(double_)
1692+
number != null -> visitor.visitNumber(number)
16931693
strings != null -> visitor.visitStrings(strings)
16941694
else -> visitor.unknown(_json)
16951695
}
16961696
}
16971697

16981698
fun validate(): Value = apply {
16991699
if (!validated) {
1700-
if (string == null && double_ == null && strings == null) {
1700+
if (string == null && number == null && strings == null) {
17011701
throw LithicInvalidDataException("Unknown Value: $_json")
17021702
}
17031703
validated = true
@@ -1709,17 +1709,17 @@ private constructor(
17091709
return true
17101710
}
17111711

1712-
return /* spotless:off */ other is Value && this.string == other.string && this.double_ == other.double_ && this.strings == other.strings /* spotless:on */
1712+
return /* spotless:off */ other is Value && this.string == other.string && this.number == other.number && this.strings == other.strings /* spotless:on */
17131713
}
17141714

17151715
override fun hashCode(): Int {
1716-
return /* spotless:off */ Objects.hash(string, double_, strings) /* spotless:on */
1716+
return /* spotless:off */ Objects.hash(string, number, strings) /* spotless:on */
17171717
}
17181718

17191719
override fun toString(): String {
17201720
return when {
17211721
string != null -> "Value{string=$string}"
1722-
double_ != null -> "Value{double_=$double_}"
1722+
number != null -> "Value{number=$number}"
17231723
strings != null -> "Value{strings=$strings}"
17241724
_json != null -> "Value{_unknown=$_json}"
17251725
else -> throw IllegalStateException("Invalid Value")
@@ -1730,7 +1730,7 @@ private constructor(
17301730

17311731
@JvmStatic fun ofString(string: String) = Value(string = string)
17321732

1733-
@JvmStatic fun ofDouble(double_: Double) = Value(double_ = double_)
1733+
@JvmStatic fun ofNumber(number: Double) = Value(number = number)
17341734

17351735
@JvmStatic
17361736
fun ofStrings(strings: List<String>) = Value(strings = strings)
@@ -1740,7 +1740,7 @@ private constructor(
17401740

17411741
fun visitString(string: String): T
17421742

1743-
fun visitDouble(double_: Double): T
1743+
fun visitNumber(number: Double): T
17441744

17451745
fun visitStrings(strings: List<String>): T
17461746

@@ -1757,7 +1757,7 @@ private constructor(
17571757
return Value(string = it, _json = json)
17581758
}
17591759
tryDeserialize(node, jacksonTypeRef<Double>())?.let {
1760-
return Value(double_ = it, _json = json)
1760+
return Value(number = it, _json = json)
17611761
}
17621762
tryDeserialize(node, jacksonTypeRef<List<String>>())?.let {
17631763
return Value(strings = it, _json = json)
@@ -1776,7 +1776,7 @@ private constructor(
17761776
) {
17771777
when {
17781778
value.string != null -> generator.writeObject(value.string)
1779-
value.double_ != null -> generator.writeObject(value.double_)
1779+
value.number != null -> generator.writeObject(value.number)
17801780
value.strings != null -> generator.writeObject(value.strings)
17811781
value._json != null -> generator.writeObject(value._json)
17821782
else -> throw IllegalStateException("Invalid Value")

0 commit comments

Comments
 (0)