Skip to content

Fix some deprecation warn messages #3704

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.

Sign up for GitHub

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

Open
danicheg wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −23
Open

Fix some deprecation warn messages #3704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions io/jvm/src/main/scala/fs2/io/net/NetworkPlatform.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ private[net] trait NetworkPlatform[F[_]] {
* @param threadFactory factory used to create fixed threads
*/
@deprecated(
"3.13.0",
"Explicitly managed socket groups are no longer supported; use connect and bind operations on Network instead"
"Explicitly managed socket groups are no longer supported; use connect and bind operations on Network instead",
"3.13.0"
)
def socketGroup(
threadCount: Int = 1,
Expand All @@ -65,8 +65,8 @@ private[net] trait NetworkPlatform[F[_]] {
* @param threadFactory factory used to create selector thread
*/
@deprecated(
"3.13.0",
"Explicitly managed socket groups are no longer supported; use bindDatagramSocket operation on Network instead"
"Explicitly managed socket groups are no longer supported; use bindDatagramSocket operation on Network instead",
"3.13.0"
)
def datagramSocketGroup(
threadFactory: ThreadFactory = ThreadFactories.named("fs2-udp", true)
Expand Down
4 changes: 2 additions & 2 deletions io/jvm/src/main/scala/fs2/io/net/tls/DTLSSocket.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ object DTLSSocket {
override def address = socket.address

@deprecated(
"3.13.0",
"Use address instead, which returns GenSocketAddress instead of F[SocketAddress[IpAddress]]. If ip and port are needed, call .asIpUnsafe"
"Use address instead, which returns GenSocketAddress instead of F[SocketAddress[IpAddress]]. If ip and port are needed, call .asIpUnsafe",
"3.13.0"
)
override def localAddress: F[SocketAddress[IpAddress]] = socket.localAddress

Expand Down
6 changes: 3 additions & 3 deletions io/jvm/src/main/scala/fs2/io/net/tls/TLSSocketPlatform.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ private[tls] trait TLSSocketCompanionPlatform { self: TLSSocket.type =>
def endOfInput: F[Unit] =
socket.endOfInput

@deprecated("3.13.0", "Use address instead")
@deprecated("Use address instead", "3.13.0")
def localAddress: F[SocketAddress[IpAddress]] =
socket.localAddress

@deprecated("3.13.0", "Use peerAddress instead")
@deprecated("Use peerAddress instead", "3.13.0")
def remoteAddress: F[SocketAddress[IpAddress]] =
socket.remoteAddress

Expand Down Expand Up @@ -120,7 +120,7 @@ private[tls] trait TLSSocketCompanionPlatform { self: TLSSocket.type =>
def applicationProtocol: F[String] =
engine.applicationProtocol

@deprecated("3.13.0", "No replacement; sockets are open until they are finalized")
@deprecated("No replacement; sockets are open until they are finalized", "3.13.0")
def isOpen: F[Boolean] = socket.isOpen
}
}
6 changes: 3 additions & 3 deletions io/native/src/main/scala/fs2/io/net/tls/TLSSocketPlatform.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ private[tls] trait TLSSocketCompanionPlatform { self: TLSSocket.type =>
def endOfInput: F[Unit] =
socket.endOfInput

@deprecated("3.13.0", "Use address instead")
@deprecated("Use address instead", "3.13.0")
def localAddress: F[SocketAddress[IpAddress]] =
socket.localAddress

@deprecated("3.13.0", "Use peerAddress instead")
@deprecated("Use peerAddress instead", "3.13.0")
def remoteAddress: F[SocketAddress[IpAddress]] =
socket.remoteAddress

Expand All @@ -112,7 +112,7 @@ private[tls] trait TLSSocketCompanionPlatform { self: TLSSocket.type =>

def applicationProtocol: F[String] = connection.applicationProtocol

@deprecated("3.13.0", "No replacement; sockets are open until they are finalized")
@deprecated("No replacement; sockets are open until they are finalized", "3.13.0")
def isOpen: F[Boolean] = socket.isOpen
}
}
4 changes: 2 additions & 2 deletions io/shared/src/main/scala/fs2/io/net/DatagramSocket.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ trait DatagramSocket[F[_]] extends DatagramSocketPlatform[F] {

/** Returns the local address of this udp socket. */
@deprecated(
"3.13.0",
"Use address instead, which returns GenSocketAddress instead of F[SocketAddress[IpAddress]]. If ip and port are needed, call .asIpUnsafe"
"Use address instead, which returns GenSocketAddress instead of F[SocketAddress[IpAddress]]. If ip and port are needed, call .asIpUnsafe",
"3.13.0"
)
def localAddress: F[SocketAddress[IpAddress]]

Expand Down
2 changes: 1 addition & 1 deletion io/shared/src/main/scala/fs2/io/net/DatagramSocketGroup.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ trait DatagramSocketGroup[F[_]] {
* @param options socket options to apply to the underlying socket
* @param protocolFamily protocol family to use when opening the supporting `DatagramChannel`
*/
@deprecated("3.13.0", "Use Network[F].bindDatagramSocket instead")
@deprecated("Use Network[F].bindDatagramSocket instead", "3.13.0")
def openDatagramSocket(
address: Option[Host] = None,
port: Option[Port] = None,
Expand Down
10 changes: 5 additions & 5 deletions io/shared/src/main/scala/fs2/io/net/Socket.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,18 @@ trait Socket[F[_]] extends SocketInfo[F] {

// Deprecated members

@deprecated("3.13.0", "No replacement; sockets are open until they are finalized")
@deprecated("No replacement; sockets are open until they are finalized", "3.13.0")
def isOpen: F[Boolean]

@deprecated(
"3.13.0",
"Use address instead, which returns GenSocketAddress instead of F[SocketAddress[IpAddress]]. If ip and port are needed, call .asIpUnsafe"
"Use address instead, which returns GenSocketAddress instead of F[SocketAddress[IpAddress]]. If ip and port are needed, call .asIpUnsafe",
"3.13.0"
)
def localAddress: F[SocketAddress[IpAddress]]

@deprecated(
"3.13.0",
"Use peerAddress instead, which returns GenSocketAddress instead of F[SocketAddress[IpAddress]]. If ip and port are needed, call .asIpUnsafe"
"Use peerAddress instead, which returns GenSocketAddress instead of F[SocketAddress[IpAddress]]. If ip and port are needed, call .asIpUnsafe",
"3.13.0"
)
def remoteAddress: F[SocketAddress[IpAddress]]
}
Expand Down
6 changes: 3 additions & 3 deletions io/shared/src/main/scala/fs2/io/net/SocketGroup.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ trait SocketGroup[F[_]] {
* @param to address of remote server
* @param options socket options to apply to the underlying socket
*/
@deprecated("3.13.0", "Use Network[F].connect instead")
@deprecated("Use Network[F].connect instead", "3.13.0")
def client(
to: SocketAddress[Host],
options: List[SocketOption] = List.empty
Expand All @@ -54,7 +54,7 @@ trait SocketGroup[F[_]] {
* @param port port to bind
* @param options socket options to apply to the underlying socket
*/
@deprecated("3.13.0", "Use Network[F].bindAndAccept instead")
@deprecated("Use Network[F].bindAndAccept instead", "3.13.0")
def server(
address: Option[Host] = None,
port: Option[Port] = None,
Expand All @@ -65,7 +65,7 @@ trait SocketGroup[F[_]] {
*
* Make sure to handle errors in the client socket Streams.
*/
@deprecated("3.13.0", "Use Network[F].bind instead")
@deprecated("Use Network[F].bind instead", "3.13.0")
def serverResource(
address: Option[Host] = None,
port: Option[Port] = None,
Expand Down