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.

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

support scala3 for amqp connector #154

Merged
merged 1 commit into from
Jun 11, 2023
Merged

support scala3 for amqp connector #154

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
54 changes: 30 additions & 24 deletions amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/AmqpConnectionProvider.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,12 +375,14 @@ final class AmqpCachedConnectionProvider private (val provider: AmqpConnectionPr
def withAutomaticRelease(automaticRelease: Boolean): AmqpCachedConnectionProvider =
copy(automaticRelease = automaticRelease)

override def get: Connection = getRecursive(provider)

@tailrec
override def get: Connection = state.get match {
private def getRecursive(amqpConnectionProvider: AmqpConnectionProvider): Connection = state.get match {
case Empty =>
if (state.compareAndSet(Empty, Connecting)) {
try {
val connection = provider.get
val connection = amqpConnectionProvider.get
if (!state.compareAndSet(Connecting, Connected(connection, 1)))
throw new ConcurrentModificationException(
"Unexpected concurrent modification while creating the connection.")
Expand All @@ -391,34 +393,38 @@ final class AmqpCachedConnectionProvider private (val provider: AmqpConnectionPr
state.compareAndSet(Connecting, Empty)
throw e
}
} else get
case Connecting => get
} else getRecursive(amqpConnectionProvider)
case Connecting => getRecursive(amqpConnectionProvider)
case c @ Connected(connection, clients) =>
if (state.compareAndSet(c, Connected(connection, clients + 1))) connection
else get
case Closing => get
else getRecursive(amqpConnectionProvider)
case Closing => getRecursive(amqpConnectionProvider)
}

override def release(connection: Connection): Unit = releaseRecursive(provider, connection)

@tailrec
override def release(connection: Connection): Unit = state.get match {
case Empty => throw new IllegalStateException("There is no connection to release.")
case Connecting => release(connection)
case c @ Connected(cachedConnection, clients) =>
if (cachedConnection != connection)
throw new IllegalArgumentException("Can't release a connection that's not owned by this provider")

if (clients == 1 || !automaticRelease) {
if (state.compareAndSet(c, Closing)) {
provider.release(connection)
if (!state.compareAndSet(Closing, Empty))
throw new ConcurrentModificationException(
"Unexpected concurrent modification while closing the connection.")
private def releaseRecursive(amqpConnectionProvider: AmqpConnectionProvider, connection: Connection): Unit =
state.get match {
case Empty => throw new IllegalStateException("There is no connection to release.")
case Connecting => releaseRecursive(amqpConnectionProvider, connection)
case c @ Connected(cachedConnection, clients) =>
if (cachedConnection != connection)
throw new IllegalArgumentException("Can't release a connection that's not owned by this provider")

if (clients == 1 || !automaticRelease) {
if (state.compareAndSet(c, Closing)) {
amqpConnectionProvider.release(connection)
if (!state.compareAndSet(Closing, Empty))
throw new ConcurrentModificationException(
"Unexpected concurrent modification while closing the connection.")
}
} else {
if (!state.compareAndSet(c, Connected(cachedConnection, clients - 1)))
releaseRecursive(amqpConnectionProvider, connection)
}
} else {
if (!state.compareAndSet(c, Connected(cachedConnection, clients - 1))) release(connection)
}
case Closing => release(connection)
}
case Closing => releaseRecursive(amqpConnectionProvider, connection)
}

private def copy(automaticRelease: Boolean): AmqpCachedConnectionProvider =
new AmqpCachedConnectionProvider(provider, automaticRelease)
Expand Down
1 change: 0 additions & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ object Dependencies {
"com.fasterxml.jackson.core" % "jackson-databind" % JacksonDatabindVersion)

val Amqp = Seq(
crossScalaVersions -= Scala3,
libraryDependencies ++= Seq(
"com.rabbitmq" % "amqp-client" % "5.14.2" // APLv2
) ++ Mockito)
Expand Down