Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ScalaJS Compilation by Removing JVM-specific java.util.Objects References in PathCodecPlatformSpecific #3155

Merged
merged 3 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package zio.http.codec

import java.util.Objects

trait PathCodecPlatformSpecific {
private[codec] def parseLong(s: CharSequence, beginIndex: Int, endIndex: Int, radix: Int): Long = {
Objects.requireNonNull(s)
Objects.checkFromToIndex(beginIndex, endIndex, s.length)
require(s != null, "CharSequence cannot be null")
checkFromToIndex(beginIndex, endIndex, s.length)

if (radix < Character.MIN_RADIX)
throw new NumberFormatException("radix " + radix + " less than Character.MIN_RADIX")
if (radix > Character.MAX_RADIX)
Expand Down Expand Up @@ -42,8 +41,9 @@ trait PathCodecPlatformSpecific {
}

private[codec] def parseInt(s: CharSequence, beginIndex: Int, endIndex: Int, radix: Int): Int = {
Objects.requireNonNull(s)
Objects.checkFromToIndex(beginIndex, endIndex, s.length)
require(s != null, "CharSequence cannot be null")
checkFromToIndex(beginIndex, endIndex, s.length)

if (radix < Character.MIN_RADIX)
throw new NumberFormatException("radix " + radix + " less than Character.MIN_RADIX")
if (radix > Character.MAX_RADIX)
Expand Down Expand Up @@ -88,4 +88,10 @@ trait PathCodecPlatformSpecific {
"For input string: \"" + s + "\"" + (if (radix == 10) ""
else " under radix " + radix),
)

private def checkFromToIndex(from: Int, to: Int, length: Int): Unit = {
if (from < 0 || to > length || from > to) {
throw new IndexOutOfBoundsException(s"Range [$from, $to) out of bounds for length $length")
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package zio.http.codec

import zio._
import zio.test.Assertion._
import zio.test._

object PathCodecPlatformSpecificSpec extends ZIOSpecDefault {

def spec = suite("PathCodecJSPlatformSpecificSpec")(
test("parseInt should correctly parse a valid integer from a CharSequence") {
val charSequence = "12345"
val result = new PathCodecPlatformSpecific {}.parseInt(charSequence, 0, charSequence.length, 10)
assert(result)(equalTo(12345))
},
test("parseInt should throw an error for an invalid radix") {
val charSequence = "12345"
val result = ZIO.attempt {
new PathCodecPlatformSpecific {}.parseInt(charSequence, 0, charSequence.length, Character.MAX_RADIX + 1)
}.either
assertZIO(result)(isLeft(hasMessage(containsString("radix"))))
},
test("parseLong should correctly parse a valid long from a CharSequence") {
val charSequence = "123456789012345"
val result = new PathCodecPlatformSpecific {}.parseLong(charSequence, 0, charSequence.length, 10)
assert(result)(equalTo(123456789012345L))
},
test("parseLong should throw an error for an invalid input") {
val charSequence = "invalid123"
val result = ZIO.attempt {
new PathCodecPlatformSpecific {}.parseLong(charSequence, 0, charSequence.length, 10)
}.either
assertZIO(result)(isLeft(hasMessage(containsString("Error at index"))))
},
)
}
Loading