Skip to content

Commit

Permalink
Restore binary compatibility for AbstractReadOnlyTcpConfig impls (#…
Browse files Browse the repository at this point in the history
…2896)

Motivation:

japicmp.sh flagged it like that:
Comparing binary compatibility of servicetalk-tcp-netty-internal-0.42.43-SNAPSHOT.jar against servicetalk-tcp-netty-internal-0.42.42.jar
***! MODIFIED CLASS: PUBLIC FINAL io.servicetalk.tcp.netty.internal.ReadOnlyTcpClientConfig  (not serializable)
        ===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
        ===  UNCHANGED SUPERCLASS: io.servicetalk.tcp.netty.internal.AbstractReadOnlyTcpConfig (<- io.servicetalk.tcp.netty.internal.AbstractReadOnlyTcpConfig)
        ---! REMOVED METHOD: PUBLIC(-) SYNTHETIC(-) BRIDGE(-) io.servicetalk.transport.api.SslConfig sslConfig()
***! MODIFIED CLASS: PUBLIC FINAL io.servicetalk.tcp.netty.internal.ReadOnlyTcpServerConfig  (not serializable)
        ===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
        ===  UNCHANGED SUPERCLASS: io.servicetalk.tcp.netty.internal.AbstractReadOnlyTcpConfig (<- io.servicetalk.tcp.netty.internal.AbstractReadOnlyTcpConfig)
        ---! REMOVED METHOD: PUBLIC(-) SYNTHETIC(-) BRIDGE(-) io.servicetalk.transport.api.SslConfig sslConfig()
  • Loading branch information
idelpivnitskiy authored Apr 17, 2024
1 parent cc2cdfa commit f0a2c65
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import io.servicetalk.logging.api.UserDataLoggerConfig;
import io.servicetalk.transport.api.ServiceTalkSocketOptions;
import io.servicetalk.transport.api.SslConfig;
import io.servicetalk.transport.netty.internal.FlushStrategy;

import io.netty.channel.ChannelOption;
Expand Down Expand Up @@ -104,4 +105,12 @@ public final UserDataLoggerConfig wireLoggerConfig() {
*/
@Nullable
public abstract SslContext sslContext();

/**
* Get the {@link SslConfig}.
*
* @return the {@link SslConfig}, or {@code null} if SSL/TLS is not configured.
*/
@Nullable
public abstract SslConfig sslConfig();
}
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public String preferredAlpnProtocol() {
* @return the {@link ClientSslConfig}, or {@code null} if SSL/TLS is not configured.
*/
@Nullable
@Override
public ClientSslConfig sslConfig() {
return sslConfig;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ public TransportObserver transportObserver() {
* @return the {@link ServerSslConfig}, or {@code null} if SSL/TLS is not configured.
*/
@Nullable
@Override
public ServerSslConfig sslConfig() {
return sslConfig;
}
Expand Down

0 comments on commit f0a2c65

Please sign in to comment.