Merge pull request #160 from exoego/widening

cquiroz · web-flow · commit 9ad5406aed54 · 2020-03-06T11:32:15.000Z
Fix implicit numeric widening
diff --git a/core/shared/src/main/scala/org/threeten/bp/chrono/HijrahChronology.scala b/core/shared/src/main/scala/org/threeten/bp/chrono/HijrahChronology.scala
@@ -295,7 +295,7 @@ final class HijrahChronology private () extends Chronology with Serializable {
       if (resolverStyle ne ResolverStyle.LENIENT) {
         PROLEPTIC_MONTH.checkValidValue(prolepticMonth)
       }
-      updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1)
+      updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1L)
       updateResolveMap(fieldValues, YEAR, Math.floorDiv(prolepticMonth, 12))
     }
     val yoeLong: java.lang.Long = fieldValues.remove(YEAR_OF_ERA)
diff --git a/core/shared/src/main/scala/org/threeten/bp/chrono/IsoChronology.scala b/core/shared/src/main/scala/org/threeten/bp/chrono/IsoChronology.scala
@@ -308,7 +308,7 @@ final class IsoChronology private () extends Chronology with Serializable {
     if (prolepticMonth != null) {
       if (resolverStyle ne ResolverStyle.LENIENT)
         PROLEPTIC_MONTH.checkValidValue(prolepticMonth)
-      updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1)
+      updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1L)
       updateResolveMap(fieldValues, YEAR, Math.floorDiv(prolepticMonth, 12))
     }
     val yoeLong: java.lang.Long = fieldValues.remove(YEAR_OF_ERA)
diff --git a/core/shared/src/main/scala/org/threeten/bp/chrono/JapaneseChronology.scala b/core/shared/src/main/scala/org/threeten/bp/chrono/JapaneseChronology.scala
@@ -342,7 +342,7 @@ final class JapaneseChronology private () extends Chronology with Serializable {
     if (prolepticMonth != null) {
       if (resolverStyle ne ResolverStyle.LENIENT)
         PROLEPTIC_MONTH.checkValidValue(prolepticMonth)
-      updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1)
+      updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1L)
       updateResolveMap(fieldValues, YEAR, Math.floorDiv(prolepticMonth, 12))
     }
     val eraLong: java.lang.Long = fieldValues.get(ERA)
diff --git a/core/shared/src/main/scala/org/threeten/bp/chrono/MinguoChronology.scala b/core/shared/src/main/scala/org/threeten/bp/chrono/MinguoChronology.scala
@@ -223,7 +223,7 @@ final class MinguoChronology private () extends Chronology with Serializable {
     if (prolepticMonth != null) {
       if (resolverStyle ne ResolverStyle.LENIENT)
         PROLEPTIC_MONTH.checkValidValue(prolepticMonth)
-      updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1)
+      updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1L)
       updateResolveMap(fieldValues, YEAR, Math.floorDiv(prolepticMonth, 12))
     }
     val yoeLong: java.lang.Long = fieldValues.remove(YEAR_OF_ERA)
diff --git a/core/shared/src/main/scala/org/threeten/bp/chrono/ThaiBuddhistChronology.scala b/core/shared/src/main/scala/org/threeten/bp/chrono/ThaiBuddhistChronology.scala
@@ -256,7 +256,7 @@ final class ThaiBuddhistChronology private () extends Chronology with Serializab
     if (prolepticMonth != null) {
       if (resolverStyle ne ResolverStyle.LENIENT)
         PROLEPTIC_MONTH.checkValidValue(prolepticMonth)
-      updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1)
+      updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1L)
       updateResolveMap(fieldValues, YEAR, Math.floorDiv(prolepticMonth, 12))
     }
     val yoeLong: java.lang.Long = fieldValues.remove(YEAR_OF_ERA)
diff --git a/core/shared/src/main/scala/org/threeten/bp/format/DateTimeBuilder.scala b/core/shared/src/main/scala/org/threeten/bp/format/DateTimeBuilder.scala
@@ -438,7 +438,7 @@ final class DateTimeBuilder() extends TemporalAccessor with Cloneable {
           }
         } else {
           val excessDays: Int = Math.toIntExact(Math.floorDiv(hodVal, 24L))
-          hodVal = Math.floorMod(hodVal, 24)
+          hodVal = Math.floorMod(hodVal, 24L)
           addObject(LocalTime.of(hodVal.toInt, 0))
           this.excessDays = Period.ofDays(excessDays)
         }

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ final class HijrahChronology private () extends Chronology with Serializable {`
`295`	`295`	`if (resolverStyle ne ResolverStyle.LENIENT) {`
`296`	`296`	`PROLEPTIC_MONTH.checkValidValue(prolepticMonth)`
`297`	`297`	`}`
`298`		`- updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1)`
	`298`	`+ updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1L)`
`299`	`299`	`updateResolveMap(fieldValues, YEAR, Math.floorDiv(prolepticMonth, 12))`
`300`	`300`	`}`
`301`	`301`	`val yoeLong: java.lang.Long = fieldValues.remove(YEAR_OF_ERA)`
Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ final class IsoChronology private () extends Chronology with Serializable {`
`308`	`308`	`if (prolepticMonth != null) {`
`309`	`309`	`if (resolverStyle ne ResolverStyle.LENIENT)`
`310`	`310`	`PROLEPTIC_MONTH.checkValidValue(prolepticMonth)`
`311`		`- updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1)`
	`311`	`+ updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1L)`
`312`	`312`	`updateResolveMap(fieldValues, YEAR, Math.floorDiv(prolepticMonth, 12))`
`313`	`313`	`}`
`314`	`314`	`val yoeLong: java.lang.Long = fieldValues.remove(YEAR_OF_ERA)`
Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ final class JapaneseChronology private () extends Chronology with Serializable {`
`342`	`342`	`if (prolepticMonth != null) {`
`343`	`343`	`if (resolverStyle ne ResolverStyle.LENIENT)`
`344`	`344`	`PROLEPTIC_MONTH.checkValidValue(prolepticMonth)`
`345`		`- updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1)`
	`345`	`+ updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1L)`
`346`	`346`	`updateResolveMap(fieldValues, YEAR, Math.floorDiv(prolepticMonth, 12))`
`347`	`347`	`}`
`348`	`348`	`val eraLong: java.lang.Long = fieldValues.get(ERA)`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ final class MinguoChronology private () extends Chronology with Serializable {`
`223`	`223`	`if (prolepticMonth != null) {`
`224`	`224`	`if (resolverStyle ne ResolverStyle.LENIENT)`
`225`	`225`	`PROLEPTIC_MONTH.checkValidValue(prolepticMonth)`
`226`		`- updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1)`
	`226`	`+ updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1L)`
`227`	`227`	`updateResolveMap(fieldValues, YEAR, Math.floorDiv(prolepticMonth, 12))`
`228`	`228`	`}`
`229`	`229`	`val yoeLong: java.lang.Long = fieldValues.remove(YEAR_OF_ERA)`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ final class ThaiBuddhistChronology private () extends Chronology with Serializab`
`256`	`256`	`if (prolepticMonth != null) {`
`257`	`257`	`if (resolverStyle ne ResolverStyle.LENIENT)`
`258`	`258`	`PROLEPTIC_MONTH.checkValidValue(prolepticMonth)`
`259`		`- updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1)`
	`259`	`+ updateResolveMap(fieldValues, MONTH_OF_YEAR, Math.floorMod(prolepticMonth, 12) + 1L)`
`260`	`260`	`updateResolveMap(fieldValues, YEAR, Math.floorDiv(prolepticMonth, 12))`
`261`	`261`	`}`
`262`	`262`	`val yoeLong: java.lang.Long = fieldValues.remove(YEAR_OF_ERA)`
Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ final class DateTimeBuilder() extends TemporalAccessor with Cloneable {`
`438`	`438`	`}`
`439`	`439`	`} else {`
`440`	`440`	`val excessDays: Int = Math.toIntExact(Math.floorDiv(hodVal, 24L))`
`441`		`- hodVal = Math.floorMod(hodVal, 24)`
	`441`	`+ hodVal = Math.floorMod(hodVal, 24L)`
`442`	`442`	`addObject(LocalTime.of(hodVal.toInt, 0))`
`443`	`443`	`this.excessDays = Period.ofDays(excessDays)`
`444`	`444`	`}`