raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

remove $ from class name (#492)

Browse source 
* remove $ from class name

* mima check

Update binary-compatibility-checks.yml
This commit is contained in:
PJ Fanning 2023-07-18 08:32:08 +01:00 • committed by GitHub
parent fbac70e9dd
commit b542f99277
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
remote/src/main/mima-filters/1.0.x.backwards.excludes/pducodec.backwards.excludes Normal file
View file

@ -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")

2
remote/src/main/scala/org/apache/pekko/remote/Endpoint.scala
View file

@ -535,7 +535,7 @@ private[remote] class ReliableDeliverySupervisor(
refuseUid,
transport = transport,
settings = settings,
PekkoPduProtobufCodec$,
PekkoPduProtobufCodec,
receiveBuffers = receiveBuffers,
reliableDeliverySupervisor = Some(self)))
.withDeploy(Deploy.local),

6
remote/src/main/scala/org/apache/pekko/remote/Remoting.scala
View file

@ -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),

2
remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala
View file

@ -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 = {

4
remote/src/main/scala/org/apache/pekko/remote/transport/PekkoProtocolTransport.scala
View file

@ -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))

2
remote/src/main/scala/org/apache/pekko/remote/transport/ThrottlerTransportAdapter.scala
View file

@ -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
}

6
remote/src/test/scala/org/apache/pekko/remote/classic/RemotingSpec.scala
View file

@ -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)

4
remote/src/test/scala/org/apache/pekko/remote/classic/transport/GenericTransportSpec.scala
View file

@ -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))

2
remote/src/test/scala/org/apache/pekko/remote/classic/transport/PekkoProtocolSpec.scala
View file

@ -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