From 198a5704d5b010e1f8e0847156514d1ba495e64e Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@verizonmedia.com>
Date: Mon, 6 May 2019 16:22:04 +0200
Subject: Rename 'securityContext' to 'getSecurityContext'. Add default
 implementation

---
 jrt/src/com/yahoo/jrt/Connection.java           | 2 +-
 jrt/src/com/yahoo/jrt/CryptoSocket.java         | 4 +++-
 jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java | 2 +-
 jrt/src/com/yahoo/jrt/NullCryptoSocket.java     | 2 --
 jrt/src/com/yahoo/jrt/TlsCryptoSocket.java      | 2 +-
 jrt/src/com/yahoo/jrt/XorCryptoSocket.java      | 4 ----
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/jrt/src/com/yahoo/jrt/Connection.java b/jrt/src/com/yahoo/jrt/Connection.java
index f6d9989324d..e6772f94bb8 100644
--- a/jrt/src/com/yahoo/jrt/Connection.java
+++ b/jrt/src/com/yahoo/jrt/Connection.java
@@ -443,7 +443,7 @@ class Connection extends Target {
     @Override
     public Optional<SecurityContext> getSecurityContext() {
         return Optional.ofNullable(socket)
-                .flatMap(CryptoSocket::securityContext);
+                .flatMap(CryptoSocket::getSecurityContext);
     }
 
     public boolean isClient() {
diff --git a/jrt/src/com/yahoo/jrt/CryptoSocket.java b/jrt/src/com/yahoo/jrt/CryptoSocket.java
index 59f4d0e6650..e0489dec7a3 100644
--- a/jrt/src/com/yahoo/jrt/CryptoSocket.java
+++ b/jrt/src/com/yahoo/jrt/CryptoSocket.java
@@ -99,5 +99,7 @@ public interface CryptoSocket {
      * Returns the security context for the current connection (given handshake completed),
      * or empty if the current connection is not secure.
      */
-    public Optional<SecurityContext> securityContext();
+    default public Optional<SecurityContext> getSecurityContext() {
+        return Optional.empty();
+    }
 }
diff --git a/jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java b/jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java
index 99d47399436..5c4510665e7 100644
--- a/jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java
+++ b/jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java
@@ -129,5 +129,5 @@ public class MaybeTlsCryptoSocket implements CryptoSocket {
     @Override public int drain(ByteBuffer dst) throws IOException { return socket.drain(dst); }
     @Override public int write(ByteBuffer src) throws IOException { return socket.write(src); }
     @Override public FlushResult flush() throws IOException { return socket.flush(); }
-    @Override public Optional<SecurityContext> securityContext() { return Optional.ofNullable(socket).flatMap(CryptoSocket::securityContext); }
+    @Override public Optional<SecurityContext> getSecurityContext() { return Optional.ofNullable(socket).flatMap(CryptoSocket::getSecurityContext); }
 }
diff --git a/jrt/src/com/yahoo/jrt/NullCryptoSocket.java b/jrt/src/com/yahoo/jrt/NullCryptoSocket.java
index 6124d4918a3..83359bb65a5 100644
--- a/jrt/src/com/yahoo/jrt/NullCryptoSocket.java
+++ b/jrt/src/com/yahoo/jrt/NullCryptoSocket.java
@@ -5,7 +5,6 @@ package com.yahoo.jrt;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
-import java.util.Optional;
 
 
 /**
@@ -31,5 +30,4 @@ public class NullCryptoSocket implements CryptoSocket {
     @Override public int drain(ByteBuffer dst) throws IOException { return 0; }
     @Override public int write(ByteBuffer src) throws IOException { return channel.write(src); }
     @Override public FlushResult flush() throws IOException { return FlushResult.DONE; }
-    @Override public Optional<SecurityContext> securityContext() { return Optional.empty(); }
 }
diff --git a/jrt/src/com/yahoo/jrt/TlsCryptoSocket.java b/jrt/src/com/yahoo/jrt/TlsCryptoSocket.java
index e9f72ee12e0..6bc70ca12f0 100644
--- a/jrt/src/com/yahoo/jrt/TlsCryptoSocket.java
+++ b/jrt/src/com/yahoo/jrt/TlsCryptoSocket.java
@@ -218,7 +218,7 @@ public class TlsCryptoSocket implements CryptoSocket {
     }
 
     @Override
-    public Optional<SecurityContext> securityContext() {
+    public Optional<SecurityContext> getSecurityContext() {
         try {
             if (handshakeState != HandshakeState.COMPLETED) {
                 return Optional.empty();
diff --git a/jrt/src/com/yahoo/jrt/XorCryptoSocket.java b/jrt/src/com/yahoo/jrt/XorCryptoSocket.java
index fecb6ac54a3..55f7b18c661 100644
--- a/jrt/src/com/yahoo/jrt/XorCryptoSocket.java
+++ b/jrt/src/com/yahoo/jrt/XorCryptoSocket.java
@@ -6,7 +6,6 @@ import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
 import java.security.SecureRandom;
 import java.util.ArrayDeque;
-import java.util.Optional;
 import java.util.Queue;
 
 /**
@@ -121,7 +120,4 @@ public class XorCryptoSocket implements CryptoSocket {
         }
     }
 
-    @Override public Optional<SecurityContext> securityContext() {
-        return Optional.empty();
-    }
 }
-- 
cgit v1.2.3