From 9624a68d530aae1da6a77dafef1417f52a381369 Mon Sep 17 00:00:00 2001
From: Robert Yokota <rayokota@gmail.com>
Date: Fri, 20 Sep 2024 16:42:48 -0700
Subject: [PATCH] DGS-17857 Return subject in SchemaMetadata response (#65)

---
 .../kafka/schemaregistry/client/SchemaMetadata.java         | 6 ++++++
 .../schemaregistry/protobuf/rest/RestApiSerializerTest.java | 1 +
 2 files changed, 7 insertions(+)

diff --git a/client/src/main/java/io/confluent/kafka/schemaregistry/client/SchemaMetadata.java b/client/src/main/java/io/confluent/kafka/schemaregistry/client/SchemaMetadata.java
index 5f9b7408591..db11ba4b424 100644
--- a/client/src/main/java/io/confluent/kafka/schemaregistry/client/SchemaMetadata.java
+++ b/client/src/main/java/io/confluent/kafka/schemaregistry/client/SchemaMetadata.java
@@ -27,6 +27,7 @@
 
 public class SchemaMetadata {
 
+  private String subject;
   private int id;
   private int version;
   private String schemaType;
@@ -56,6 +57,7 @@ public SchemaMetadata(int id,
   }
 
   public SchemaMetadata(Schema schema) {
+    this.subject = schema.getSubject();
     this.id = schema.getId();
     this.version = schema.getVersion();
     this.schemaType = schema.getSchemaType();
@@ -65,6 +67,10 @@ public SchemaMetadata(Schema schema) {
     this.ruleSet = schema.getRuleSet();
   }
 
+  public String getSubject() {
+    return subject;
+  }
+
   public int getId() {
     return id;
   }
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/schemaregistry/protobuf/rest/RestApiSerializerTest.java b/protobuf-serializer/src/test/java/io/confluent/kafka/schemaregistry/protobuf/rest/RestApiSerializerTest.java
index 3da0296ad15..a2d5f0ae3c3 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/schemaregistry/protobuf/rest/RestApiSerializerTest.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/schemaregistry/protobuf/rest/RestApiSerializerTest.java
@@ -579,6 +579,7 @@ private static void checkNormalization(SchemaRegistryClient schemaRegistry, Stri
     Collection<String> subjects = schemaRegistry.getAllSubjects();
     for (String subject : subjects) {
       SchemaMetadata metadata = schemaRegistry.getLatestSchemaMetadata(subject);
+      assertEquals(metadata.getSubject(), subject);
       Optional<ParsedSchema> schema = schemaRegistry.parseSchema(new Schema(subject, metadata));
       ProtobufSchema proto = (ProtobufSchema) schema.get();
       GenericDescriptor d = proto.toSpecificDescriptor(