Update fromKeyStoreFile to take a Path and improve error message from fromKeyStoreResource

Author: mpilquist

build.sbt

@@ -355,7 +355,13 @@ ThisBuild / mimaBinaryIssueFilters ++= Seq(
     "fs2.io.net.DatagramSocketOption.multicastInterface"
   ),
   ProblemFilters.exclude[ReversedMissingMethodProblem]("fs2.io.net.Network.dns"),
-  ProblemFilters.exclude[ReversedMissingMethodProblem]("fs2.io.net.Network.interfaces")
+  ProblemFilters.exclude[ReversedMissingMethodProblem]("fs2.io.net.Network.interfaces"),
+  ProblemFilters.exclude[InheritedNewAbstractMethodProblem](
+    "fs2.io.net.tls.TLSContext#Builder.fromKeyStoreFile"
+  ),
+  ProblemFilters.exclude[InheritedNewAbstractMethodProblem](
+    "fs2.io.net.tls.TLSContext#Builder.fs2$io$net$tls$TLSContextCompanionPlatform$BuilderPlatform$$$outer"
+  )
 )
 
 lazy val root = tlCrossRootProject

io/jvm/src/main/scala/fs2/io/net/tls/TLSContextPlatform.scala

@@ -40,7 +40,9 @@ import cats.syntax.all._
 import com.comcast.ip4s.{IpAddress, SocketAddress}
 
 import java.util.function.BiFunction
-import java.nio.file.Path
+import java.nio.file.{Path => JPath}
+
+import fs2.io.file.Path
 
 private[tls] trait TLSContextPlatform[F[_]] {
 
@@ -104,6 +106,14 @@ private[tls] trait TLSContextCompanionPlatform { self: TLSContext.type =>
     def insecure: F[TLSContext[F]]
 
     /** Creates a `TLSContext` from the specified key store file. */
+    @deprecated("Use overload that takes an fs2.io.file.Path instead", "3.13.0")
+    def fromKeyStoreFile(
+        file: JPath,
+        storePassword: Array[Char],
+        keyPassword: Array[Char]
+    ): F[TLSContext[F]] =
+      fromKeyStoreFile(Path.fromNioPath(file), storePassword, keyPassword)
+
     def fromKeyStoreFile(
         file: Path,
         storePassword: Array[Char],
@@ -275,7 +285,7 @@ private[tls] trait TLSContextCompanionPlatform { self: TLSContext.type =>
           storePassword: Array[Char],
           keyPassword: Array[Char]
       ): F[TLSContext[F]] = {
-        val load = Async[F].blocking(new FileInputStream(file.toFile): InputStream)
+        val load = Async[F].blocking(new FileInputStream(file.toNioPath.toFile): InputStream)
         val stream = Resource.make(load)(s => Async[F].blocking(s.close))
         fromKeyStoreStream(stream, storePassword, keyPassword)
       }
@@ -285,7 +295,11 @@ private[tls] trait TLSContextCompanionPlatform { self: TLSContext.type =>
           storePassword: Array[Char],
           keyPassword: Array[Char]
       ): F[TLSContext[F]] = {
-        val load = Async[F].blocking(getClass.getClassLoader.getResourceAsStream(resource))
+        val load = Async[F].blocking {
+          val s = getClass.getClassLoader.getResourceAsStream(resource)
+          if (s eq null) throw new IOException(s"Classpath resource not found [$resource]")
+          else s
+        }
         val stream = Resource.make(load)(s => Async[F].blocking(s.close))
         fromKeyStoreStream(stream, storePassword, keyPassword)
       }

io/jvm/src/test/scala/fs2/io/net/tls/TLSSocketSuite.scala

@@ -32,9 +32,12 @@ import cats.effect.{IO, Resource}
 import cats.syntax.all._
 
 import com.comcast.ip4s._
+import java.io.FileNotFoundException
 import java.security.Security
 import javax.net.ssl.SSLHandshakeException
 
+import fs2.io.file.Path
+
 class TLSSocketSuite extends TLSSuite {
   val size = 8192
 
@@ -217,4 +220,18 @@ class TLSSocketSuite extends TLSSuite {
         .assertEquals(msg)
     }
   }
+
+  group("TLSContextBuilder") {
+    test("fromKeyStoreResource - not found") {
+      Network[IO].tlsContext
+        .fromKeyStoreResource("does-not-exist.jks", Array.empty, Array.empty)
+        .intercept[IOException]
+    }
+
+    test("fromKeyStoreFile - not found") {
+      Network[IO].tlsContext
+        .fromKeyStoreFile(Path("does-not-exist.jks"), Array.empty, Array.empty)
+        .intercept[FileNotFoundException]
+    }
+  }
 }