Method signature cleanup

This commit is contained in:
nathan 2019-01-27 16:42:01 +01:00
parent 273523fc96
commit debd0716cd
6 changed files with 8 additions and 14 deletions

View File

@ -1040,6 +1040,6 @@ class ConnectionImpl extends ChannelInboundHandlerAdapter implements Connection_
*/
Object fixupRmi(final Object message) {
// "local RMI" objects have to be modified, this part does that
return rmiSupport.fixupRmi(this, message);
return rmiSupport.fixupRmi(message);
}
}

View File

@ -42,7 +42,7 @@ class ConnectionNoOpSupport implements ConnectionRmiSupport {
}
public
Object fixupRmi(final ConnectionImpl connection, final Object message) {
Object fixupRmi(final Object message) {
return message;
}

View File

@ -82,8 +82,6 @@ class ConnectionRmiImplSupport implements ConnectionRmiSupport {
abstract void registration(final ConnectionImpl connection, final RmiRegistration message);
abstract Object normalMessages(final Object message);
public
void close() {
// proxy listeners are cleared in the removeAll() call (which happens BEFORE close)
@ -393,10 +391,4 @@ class ConnectionRmiImplSupport implements ConnectionRmiSupport {
return remoteObject;
}
public
Object fixupRmi(final ConnectionImpl connection, final Object message) {
// "local RMI" objects have to be modified, this part does that
return normalMessages(message);
}
}

View File

@ -195,7 +195,7 @@ class ConnectionRmiLocalSupport extends ConnectionRmiImplSupport {
@SuppressWarnings("unchecked")
@Override
public
Object normalMessages(final Object message) {
Object fixupRmi(final Object message) {
// else, this was "just a local message"
// because we NORMALLY pass around just the object (there is no serialization going on...) we have to explicitly check to see

View File

@ -84,9 +84,8 @@ class ConnectionRmiNetworkSupport extends ConnectionRmiImplSupport {
}
}
@Override
public
Object normalMessages(final Object message) {
Object fixupRmi(final Object message) {
return message;
}
}

View File

@ -28,7 +28,10 @@ interface ConnectionRmiSupport {
boolean manage(final ConnectionImpl connection, final Object message);
Object fixupRmi(final ConnectionImpl connection, final Object message);
/**
* "local RMI" objects have to be modified, this part does that
*/
Object fixupRmi(final Object message);
<T> int getRegisteredId(final T object);