This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git
commit def8a1fd8a2e97371db708ed5ba1887b7c4482a2 Author: Jacob Barrett <jbarr...@pivotal.io> AuthorDate: Thu May 20 14:58:12 2021 -0700 GEODE-6588: Cleanup ServerSideHandshakeImpl --- .../src/main/java/org/apache/geode/internal/cache/tier/Encryptor.java | 3 +++ .../java/org/apache/geode/internal/cache/tier/ServerSideHandshake.java | 1 + .../geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java | 1 + 3 files changed, 5 insertions(+) diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Encryptor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Encryptor.java index 75daf52..8c8c60a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Encryptor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Encryptor.java @@ -19,8 +19,11 @@ package org.apache.geode.internal.cache.tier; * * @deprecated this feature should be removed in Geode 2.0 */ +@Deprecated public interface Encryptor { + @Deprecated byte[] encryptBytes(byte[] bytes) throws Exception; + @Deprecated byte[] decryptBytes(byte[] bytes) throws Exception; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ServerSideHandshake.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ServerSideHandshake.java index 024b747..ddfaca9 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ServerSideHandshake.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ServerSideHandshake.java @@ -42,6 +42,7 @@ public interface ServerSideHandshake { void setClientReadTimeout(int clientReadTimeout); + @Deprecated Encryptor getEncryptor(); void handshakeWithClient(OutputStream out, InputStream in, byte endpointType, int queueSize, diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java index 9c44b8e..177a3e4 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java @@ -190,6 +190,7 @@ public class ServerSideHandshakeImpl extends Handshake implements ServerSideHand } @Override + @Deprecated public Encryptor getEncryptor() { return encryptor; }