From 1f2bc27479a38dd4e048dd8f797f73ec5cdee2a4 Mon Sep 17 00:00:00 2001 From: Erik Christensen <40830816+erikc5000@users.noreply.github.com> Date: Wed, 1 Nov 2023 20:35:30 -0400 Subject: [PATCH] Replace Enum.values() with entries (#364) --- .../codegen/descriptions/TemporalUnitDescription.kt | 2 +- .../codegen/generators/ConstantsGenerator.kt | 4 ++-- .../codegen/generators/DateConversionsGenerator.kt | 4 ++-- .../codegen/generators/DatePropertiesGenerator.kt | 2 +- .../codegen/generators/IntervalOperatorsGenerator.kt | 2 +- .../codegen/generators/IntervalPropertiesGenerator.kt | 6 +++--- .../codegen/generators/TemporalUnitGenerator.kt | 10 +++++----- .../kotlin/io/islandtime/codegen/generators/Utility.kt | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tools/code-generator/src/main/kotlin/io/islandtime/codegen/descriptions/TemporalUnitDescription.kt b/tools/code-generator/src/main/kotlin/io/islandtime/codegen/descriptions/TemporalUnitDescription.kt index f73e3c320..f75fa8d53 100644 --- a/tools/code-generator/src/main/kotlin/io/islandtime/codegen/descriptions/TemporalUnitDescription.kt +++ b/tools/code-generator/src/main/kotlin/io/islandtime/codegen/descriptions/TemporalUnitDescription.kt @@ -105,7 +105,7 @@ data class TemporalUnitConversion( val (smallerUnit, largerUnit) = orderedFromSmallerToLargerUnit() (smallerUnit.ordinal until largerUnit.ordinal) - .map { TemporalUnitDescription.values()[it].conversionFactor.toLong() } + .map { TemporalUnitDescription.entries[it].conversionFactor.toLong() } .fold(1L) { total, factor -> Math.multiplyExact(total, factor) } } diff --git a/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/ConstantsGenerator.kt b/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/ConstantsGenerator.kt index 2f4637597..254a1d806 100644 --- a/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/ConstantsGenerator.kt +++ b/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/ConstantsGenerator.kt @@ -20,9 +20,9 @@ private fun buildConstantsFile() = file( fileName = "_Constants", jvmName = "ConstantsKt" ) { - TemporalUnitDescription.values() + TemporalUnitDescription.entries .flatMap { firstUnit -> - TemporalUnitDescription.values() + TemporalUnitDescription.entries .filter { secondUnit -> secondUnit > firstUnit } .map { secondUnit -> firstUnit per secondUnit } .filter { conversion -> conversion.isSupportedAndNecessary() } diff --git a/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/DateConversionsGenerator.kt b/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/DateConversionsGenerator.kt index b3f439704..0eb413fc3 100644 --- a/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/DateConversionsGenerator.kt +++ b/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/DateConversionsGenerator.kt @@ -18,8 +18,8 @@ private fun buildDateConversionsFile() = file( fileName = "_Conversions", jvmName = "DateTimesKt" ) { - DateTimeDescription.values().forEach { receiverClass -> - DateTimeDescription.values() + DateTimeDescription.entries.forEach { receiverClass -> + DateTimeDescription.entries .filter { otherClass -> receiverClass.convertsDirectlyTo(otherClass) } .forEach { otherClass -> buildConversionFunction(from = receiverClass, to = otherClass) } } diff --git a/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/DatePropertiesGenerator.kt b/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/DatePropertiesGenerator.kt index d13855efa..a877403aa 100644 --- a/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/DatePropertiesGenerator.kt +++ b/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/DatePropertiesGenerator.kt @@ -19,7 +19,7 @@ private fun buildDatePropertiesFile() = file( fileName = "_DateProperties", jvmName = "DateTimesKt" ) { - DateTimeDescription.values() + DateTimeDescription.entries .filter { it.isDateBased && it.smallestUnit <= DAYS } .forEach { buildDatePropertiesForClass(it) } } diff --git a/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/IntervalOperatorsGenerator.kt b/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/IntervalOperatorsGenerator.kt index 1f5dbab15..4a9fb823e 100644 --- a/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/IntervalOperatorsGenerator.kt +++ b/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/IntervalOperatorsGenerator.kt @@ -19,7 +19,7 @@ private fun buildOperatorsFile() = file( fileName = "_Operators", jvmName = "RangesKt" ) { - IntervalDescription.values().forEach { buildOperatorsForClass(it) } + IntervalDescription.entries.forEach { buildOperatorsForClass(it) } } private fun FileBuilder.buildOperatorsForClass(receiverClass: IntervalDescription) { diff --git a/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/IntervalPropertiesGenerator.kt b/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/IntervalPropertiesGenerator.kt index 86225c01c..403f4346d 100644 --- a/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/IntervalPropertiesGenerator.kt +++ b/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/IntervalPropertiesGenerator.kt @@ -20,12 +20,12 @@ private fun buildPropertiesFile() = file( fileName = "_Properties", jvmName = "RangesKt" ) { - IntervalDescription.values().forEach { buildPropertiesForClass(it) } + IntervalDescription.entries.forEach { buildPropertiesForClass(it) } buildPropertiesForTimePoint() } private fun FileBuilder.buildPropertiesForClass(receiverClass: IntervalDescription) { - TemporalUnitDescription.values() + TemporalUnitDescription.entries .filter { unit -> unit >= receiverClass.elementDescription.smallestUnit && ((unit.isDateBased && receiverClass.isDateBased) || !receiverClass.isTimePointInterval) @@ -48,7 +48,7 @@ private fun FileBuilder.buildPropertiesForClass(receiverClass: IntervalDescripti } private fun FileBuilder.buildPropertiesForTimePoint() { - TemporalUnitDescription.values() + TemporalUnitDescription.entries .filter { it.isTimeBased && !it.isDateBased } .forEach { unit -> buildLengthProperty( diff --git a/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/TemporalUnitGenerator.kt b/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/TemporalUnitGenerator.kt index c1f10351a..e263b0893 100644 --- a/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/TemporalUnitGenerator.kt +++ b/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/TemporalUnitGenerator.kt @@ -386,11 +386,11 @@ private fun CodeBlockBuilder.buildWholeToStringCodeBlock(description: TemporalUn } fun ClassBuilder.buildPlusAndMinusOperatorFunctions(description: TemporalUnitDescription) = - TemporalUnitDescription.values() + TemporalUnitDescription.entries .map { description per it } .filter { it.isSupported() } .forEach { conversion -> - PlusOrMinusOperator.values().forEach { operator -> + PlusOrMinusOperator.entries.forEach { operator -> buildPlusOrMinusOperatorFunction(conversion, operator, description) } } @@ -490,7 +490,7 @@ private fun ClassBuilder.buildRemFunction(scalarPrimitive: KClass<*>, descriptio } private fun ClassBuilder.buildUnitConversionProperties(description: TemporalUnitDescription) { - TemporalUnitDescription.values() + TemporalUnitDescription.entries .map { otherUnit -> description per otherUnit } .filter { conversion -> conversion.isSupportedAndNecessary() } .forEach { conversion -> @@ -577,10 +577,10 @@ private fun ClassBuilder.buildInSmallerUnitConversionProperties( } private fun ClassBuilder.buildToComponentValuesFunctions(thisUnit: TemporalUnitDescription) { - TemporalUnitDescription.values() + TemporalUnitDescription.entries .filter { it > thisUnit && thisUnit.per(it).isSupported() } .map { biggestUnit -> - val allComponentUnits = TemporalUnitDescription.values() + val allComponentUnits = TemporalUnitDescription.entries .filter { it in thisUnit..biggestUnit } .sortedDescending() diff --git a/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/Utility.kt b/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/Utility.kt index 84aaa8e7a..703dfcbac 100644 --- a/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/Utility.kt +++ b/tools/code-generator/src/main/kotlin/io/islandtime/codegen/generators/Utility.kt @@ -5,9 +5,9 @@ import io.islandtime.codegen.measures internal val TemporalUnitDescription.className get() = measures(pluralName) -internal val TemporalUnitDescription.nextBiggest get() = TemporalUnitDescription.values()[this.ordinal + 1] +internal val TemporalUnitDescription.nextBiggest get() = TemporalUnitDescription.entries[this.ordinal + 1] -internal val TemporalUnitDescription.nextSmallest get() = TemporalUnitDescription.values()[this.ordinal - 1] +internal val TemporalUnitDescription.nextSmallest get() = TemporalUnitDescription.entries[this.ordinal - 1] internal val TemporalUnitDescription.nextSmallestOrNull get() = if (this == TemporalUnitDescription.NANOSECONDS) null else nextSmallest