From b542f99277ecf4e255d8ca7a87ac34343e303c95 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 18 Jul 2023 08:32:08 +0100 Subject: [PATCH] remove $ from class name (#492) * remove $ from class name * mima check Update binary-compatibility-checks.yml --- .../pducodec.backwards.excludes | 12 ++++++++++++ .../scala/org/apache/pekko/remote/Endpoint.scala | 2 +- .../scala/org/apache/pekko/remote/Remoting.scala | 6 +++--- .../pekko/remote/transport/PekkoPduCodec.scala | 2 +- .../remote/transport/PekkoProtocolTransport.scala | 4 ++-- .../remote/transport/ThrottlerTransportAdapter.scala | 2 +- .../apache/pekko/remote/classic/RemotingSpec.scala | 6 +++--- .../classic/transport/GenericTransportSpec.scala | 4 ++-- .../remote/classic/transport/PekkoProtocolSpec.scala | 2 +- 9 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 remote/src/main/mima-filters/1.0.x.backwards.excludes/pducodec.backwards.excludes diff --git a/remote/src/main/mima-filters/1.0.x.backwards.excludes/pducodec.backwards.excludes b/remote/src/main/mima-filters/1.0.x.backwards.excludes/pducodec.backwards.excludes new file mode 100644 index 0000000000..1f719a63a5 --- /dev/null +++ b/remote/src/main/mima-filters/1.0.x.backwards.excludes/pducodec.backwards.excludes @@ -0,0 +1,12 @@ +# rename PekkoPduProtobufCodec$ - https://github.com/apache/incubator-pekko/issues/491 +ProblemFilters.exclude[StaticVirtualMemberProblem]("org.apache.pekko.remote.transport.PekkoPduProtobufCodec.decodeMessage") +ProblemFilters.exclude[StaticVirtualMemberProblem]("org.apache.pekko.remote.transport.PekkoPduProtobufCodec.decodePdu") +ProblemFilters.exclude[StaticVirtualMemberProblem]("org.apache.pekko.remote.transport.PekkoPduProtobufCodec.constructHeartbeat") +ProblemFilters.exclude[StaticVirtualMemberProblem]("org.apache.pekko.remote.transport.PekkoPduProtobufCodec.constructDisassociate") +ProblemFilters.exclude[StaticVirtualMemberProblem]("org.apache.pekko.remote.transport.PekkoPduProtobufCodec.constructAssociate") +ProblemFilters.exclude[StaticVirtualMemberProblem]("org.apache.pekko.remote.transport.PekkoPduProtobufCodec.constructPayload") +ProblemFilters.exclude[StaticVirtualMemberProblem]("org.apache.pekko.remote.transport.PekkoPduProtobufCodec.constructPureAck") +ProblemFilters.exclude[StaticVirtualMemberProblem]("org.apache.pekko.remote.transport.PekkoPduProtobufCodec.constructMessage$default$5") +ProblemFilters.exclude[StaticVirtualMemberProblem]("org.apache.pekko.remote.transport.PekkoPduProtobufCodec.constructMessage$default$6") +ProblemFilters.exclude[StaticVirtualMemberProblem]("org.apache.pekko.remote.transport.PekkoPduProtobufCodec.constructMessage") +ProblemFilters.exclude[StaticVirtualMemberProblem]("org.apache.pekko.remote.transport.PekkoPduProtobufCodec.encodePdu") diff --git a/remote/src/main/scala/org/apache/pekko/remote/Endpoint.scala b/remote/src/main/scala/org/apache/pekko/remote/Endpoint.scala index 91114faf55..ffcbef77ca 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/Endpoint.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/Endpoint.scala @@ -535,7 +535,7 @@ private[remote] class ReliableDeliverySupervisor( refuseUid, transport = transport, settings = settings, - PekkoPduProtobufCodec$, + PekkoPduProtobufCodec, receiveBuffers = receiveBuffers, reliableDeliverySupervisor = Some(self))) .withDeploy(Deploy.local), diff --git a/remote/src/main/scala/org/apache/pekko/remote/Remoting.scala b/remote/src/main/scala/org/apache/pekko/remote/Remoting.scala index fa64ddad60..8581247114 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/Remoting.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/Remoting.scala @@ -934,7 +934,7 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) // The chain at this point: // PekkoProtocolTransport <- Adapter <- ... <- Adapter <- Driver new PekkoProtocolTransport(wrappedTransport, context.system, new PekkoProtocolSettings(conf), - PekkoPduProtobufCodec$) + PekkoPduProtobufCodec) } // Collect all transports, listen addresses and listener promises in one future @@ -989,7 +989,7 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) refuseUid, transport, endpointSettings, - PekkoPduProtobufCodec$, + PekkoPduProtobufCodec, receiveBuffers)) .withDeploy(Deploy.local), "reliableEndpointWriter-" + AddressUrlEncoder(remoteAddress) + "-" + endpointId.next())) @@ -1005,7 +1005,7 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) refuseUid, transport, endpointSettings, - PekkoPduProtobufCodec$, + PekkoPduProtobufCodec, receiveBuffers, reliableDeliverySupervisor = None)) .withDeploy(Deploy.local), diff --git a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala index 071c177d42..d203c6bbb0 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala @@ -128,7 +128,7 @@ private[remote] trait PekkoPduCodec { * INTERNAL API */ @nowarn("msg=deprecated") -private[remote] object PekkoPduProtobufCodec$ extends PekkoPduCodec { +private[remote] object PekkoPduProtobufCodec extends PekkoPduCodec { import PekkoPduCodec._ private def ackBuilder(ack: Ack): AcknowledgementInfo.Builder = { diff --git a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoProtocolTransport.scala b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoProtocolTransport.scala index d90e51614c..902faf6578 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoProtocolTransport.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoProtocolTransport.scala @@ -177,7 +177,7 @@ private[transport] class PekkoProtocolManager( handle, stateActorAssociationHandler, stateActorSettings, - PekkoPduProtobufCodec$, + PekkoPduProtobufCodec, failureDetector)), actorNameFor(handle.remoteAddress)) @@ -210,7 +210,7 @@ private[transport] class PekkoProtocolManager( statusPromise, stateActorWrappedTransport, stateActorSettings, - PekkoPduProtobufCodec$, + PekkoPduProtobufCodec, failureDetector, refuseUid)), actorNameFor(remoteAddress)) diff --git a/remote/src/main/scala/org/apache/pekko/remote/transport/ThrottlerTransportAdapter.scala b/remote/src/main/scala/org/apache/pekko/remote/transport/ThrottlerTransportAdapter.scala index 2d69da49de..e22822e490 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/transport/ThrottlerTransportAdapter.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/transport/ThrottlerTransportAdapter.scala @@ -574,7 +574,7 @@ private[transport] class ThrottledAssociation( // This method captures ASSOCIATE packets and extracts the origin address private def peekOrigin(b: ByteString): Option[Address] = { try { - PekkoPduProtobufCodec$.decodePdu(b) match { + PekkoPduProtobufCodec.decodePdu(b) match { case Associate(info) => Some(info.origin) case _ => None } diff --git a/remote/src/test/scala/org/apache/pekko/remote/classic/RemotingSpec.scala b/remote/src/test/scala/org/apache/pekko/remote/classic/RemotingSpec.scala index c87ec4bcd7..20b3b8190d 100644 --- a/remote/src/test/scala/org/apache/pekko/remote/classic/RemotingSpec.scala +++ b/remote/src/test/scala/org/apache/pekko/remote/classic/RemotingSpec.scala @@ -667,8 +667,8 @@ class RemotingSpec extends PekkoSpec(RemotingSpec.cfg) with ImplicitSender with } val handshakePacket = - PekkoPduProtobufCodec$.constructAssociate(HandshakeInfo(rawRemoteAddress, uid = 0)) - val brokenPacket = PekkoPduProtobufCodec$.constructPayload(ByteString(0, 1, 2, 3, 4, 5, 6)) + PekkoPduProtobufCodec.constructAssociate(HandshakeInfo(rawRemoteAddress, uid = 0)) + val brokenPacket = PekkoPduProtobufCodec.constructPayload(ByteString(0, 1, 2, 3, 4, 5, 6)) // Finish the inbound handshake so now it is handed up to Remoting inboundHandle.write(handshakePacket) @@ -749,7 +749,7 @@ class RemotingSpec extends PekkoSpec(RemotingSpec.cfg) with ImplicitSender with } val handshakePacket = - PekkoPduProtobufCodec$.constructAssociate(HandshakeInfo(rawRemoteAddress, uid = remoteUID)) + PekkoPduProtobufCodec.constructAssociate(HandshakeInfo(rawRemoteAddress, uid = remoteUID)) // Finish the inbound handshake so now it is handed up to Remoting inboundHandle.write(handshakePacket) diff --git a/remote/src/test/scala/org/apache/pekko/remote/classic/transport/GenericTransportSpec.scala b/remote/src/test/scala/org/apache/pekko/remote/classic/transport/GenericTransportSpec.scala index bdfa79d1a3..e16f82fdce 100644 --- a/remote/src/test/scala/org/apache/pekko/remote/classic/transport/GenericTransportSpec.scala +++ b/remote/src/test/scala/org/apache/pekko/remote/classic/transport/GenericTransportSpec.scala @@ -57,7 +57,7 @@ abstract class GenericTransportSpec(withAkkaProtocol: Boolean = false) transport, system, new PekkoProtocolSettings(provider.remoteSettings.config), - PekkoPduProtobufCodec$) + PekkoPduProtobufCodec) } else transport def newTransportA(registry: AssociationRegistry): Transport = @@ -137,7 +137,7 @@ abstract class GenericTransportSpec(withAkkaProtocol: Boolean = false) handleB.readHandlerPromise.success(ActorHandleEventListener(self)) val payload = ByteString("PDU") - val pdu = if (withAkkaProtocol) PekkoPduProtobufCodec$.constructPayload(payload) else payload + val pdu = if (withAkkaProtocol) PekkoPduProtobufCodec.constructPayload(payload) else payload awaitCond(registry.existsAssociation(addressATest, addressBTest)) diff --git a/remote/src/test/scala/org/apache/pekko/remote/classic/transport/PekkoProtocolSpec.scala b/remote/src/test/scala/org/apache/pekko/remote/classic/transport/PekkoProtocolSpec.scala index 13dfb96d10..6f24e12aaf 100644 --- a/remote/src/test/scala/org/apache/pekko/remote/classic/transport/PekkoProtocolSpec.scala +++ b/remote/src/test/scala/org/apache/pekko/remote/classic/transport/PekkoProtocolSpec.scala @@ -88,7 +88,7 @@ class PekkoProtocolSpec extends PekkoSpec("""pekko.actor.provider = remote """) val remoteAddress = Address("test", "testsystem2", "testhost2", 1234) val remoteAkkaAddress = Address("pekko.test", "testsystem2", "testhost2", 1234) - val codec = PekkoPduProtobufCodec$ + val codec = PekkoPduProtobufCodec val testMsg = WireFormats.SerializedMessage.newBuilder().setSerializerId(0).setMessage(PByteString.copyFromUtf8("foo")).build