From 9070c200cfc8e221154f63d5695185de9f7f5dcf Mon Sep 17 00:00:00 2001
From: Ernesto Ocampo <ernoc@google.com>
Date: Mon, 27 Jan 2025 16:08:55 +0000
Subject: [PATCH] Remove ExtensionRegistry from Java SDK (OakClientSession and
 OakServerSession).

It is not supported in Android (not present in lite proto) and it is not
needed (messages parsed don't have extensions).

Change-Id: Ic26432ffe440a7de89ce735e56448bb75042a145
---
 java/src/main/java/com/google/oak/session/BUILD            | 1 -
 .../main/java/com/google/oak/session/OakClientSession.java | 7 ++-----
 .../main/java/com/google/oak/session/OakServerSession.java | 7 ++-----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/java/src/main/java/com/google/oak/session/BUILD b/java/src/main/java/com/google/oak/session/BUILD
index 96bf745734..a37acf4145 100644
--- a/java/src/main/java/com/google/oak/session/BUILD
+++ b/java/src/main/java/com/google/oak/session/BUILD
@@ -59,7 +59,6 @@ android_library(
         "//java/src/main/java/com/google/oak/session/jni:oak_client_session_jni",
         "//proto/session:session_java_proto",
         "@com_google_protobuf//:protobuf_javalite",
-        "@com_google_protobuf//java/core",
     ],
 )
 
diff --git a/java/src/main/java/com/google/oak/session/OakClientSession.java b/java/src/main/java/com/google/oak/session/OakClientSession.java
index 6262b02437..722b171cfa 100644
--- a/java/src/main/java/com/google/oak/session/OakClientSession.java
+++ b/java/src/main/java/com/google/oak/session/OakClientSession.java
@@ -19,7 +19,6 @@
 import com.google.oak.session.v1.PlaintextMessage;
 import com.google.oak.session.v1.SessionRequest;
 import com.google.oak.session.v1.SessionResponse;
-import com.google.protobuf.ExtensionRegistry;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Optional;
 
@@ -47,8 +46,7 @@ public Optional<SessionRequest> getOutgoingMessage() {
       return Optional.empty();
     }
     try {
-      return Optional.of(
-          SessionRequest.parseFrom(serializedMessage, ExtensionRegistry.getEmptyRegistry()));
+      return Optional.of(SessionRequest.parseFrom(serializedMessage));
     } catch (InvalidProtocolBufferException e) {
       throw new OakSessionException("Couldn't parse the proto from the native session", e);
     }
@@ -64,8 +62,7 @@ public Optional<PlaintextMessage> read() {
       return Optional.empty();
     }
     try {
-      return Optional.of(
-          PlaintextMessage.parseFrom(serializedMessage, ExtensionRegistry.getEmptyRegistry()));
+      return Optional.of(PlaintextMessage.parseFrom(serializedMessage));
     } catch (InvalidProtocolBufferException e) {
       throw new OakSessionException("Couldn't parse the proto from the native session", e);
     }
diff --git a/java/src/main/java/com/google/oak/session/OakServerSession.java b/java/src/main/java/com/google/oak/session/OakServerSession.java
index 3caa506626..2bb62b31cb 100644
--- a/java/src/main/java/com/google/oak/session/OakServerSession.java
+++ b/java/src/main/java/com/google/oak/session/OakServerSession.java
@@ -19,7 +19,6 @@
 import com.google.oak.session.v1.PlaintextMessage;
 import com.google.oak.session.v1.SessionRequest;
 import com.google.oak.session.v1.SessionResponse;
-import com.google.protobuf.ExtensionRegistry;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Optional;
 
@@ -47,8 +46,7 @@ public Optional<SessionResponse> getOutgoingMessage() {
       return Optional.empty();
     }
     try {
-      return Optional.of(
-          SessionResponse.parseFrom(serializedMessage, ExtensionRegistry.getEmptyRegistry()));
+      return Optional.of(SessionResponse.parseFrom(serializedMessage));
     } catch (InvalidProtocolBufferException e) {
       throw new OakSessionException("Couldn't parse the proto from the native session", e);
     }
@@ -64,8 +62,7 @@ public Optional<PlaintextMessage> read() {
       return Optional.empty();
     }
     try {
-      return Optional.of(
-          PlaintextMessage.parseFrom(serializedMessage, ExtensionRegistry.getEmptyRegistry()));
+      return Optional.of(PlaintextMessage.parseFrom(serializedMessage));
     } catch (InvalidProtocolBufferException e) {
       throw new OakSessionException("Couldn't parse the proto from the native session", e);
     }