Merge branch '7.5.x' into 7.6.x by rayokota

confluentinc · Feb 5, 2024 · f6513e9 · f6513e9
2 parents ae90040 + 3dacb0d
commit f6513e9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/core/src/main/java/io/confluent/kafka/schemaregistry/rest/filters/ContextFilter.java b/core/src/main/java/io/confluent/kafka/schemaregistry/rest/filters/ContextFilter.java
@@ -108,7 +108,6 @@ ContextAndPath modifyUriPath(String path) {
 
       boolean isRootConfigOrMode = isRootConfigOrMode(isFirst, uriPathStr);
       if (uriPathStr.equals("subjects")
-          || uriPathStr.equals("keks")
           || uriPathStr.equals("deks")
           || isRootConfigOrMode) {
         subjectPathFound = true;

diff --git a/core/src/test/java/io/confluent/kafka/schemaregistry/rest/filters/ContextFilterTest.java b/core/src/test/java/io/confluent/kafka/schemaregistry/rest/filters/ContextFilterTest.java
@@ -186,8 +186,8 @@ public void testModeUriWithoutSubjectDefaultContext() {
   public void testKekPartOfUri() {
     String path = "/contexts/.test-ctx/dek-registry/v1/keks/test-kek";
     Assert.assertEquals(
-        "Dek must be prefixed",
-        "/dek-registry/v1/keks/:.test-ctx:test-kek/",
+        "Kek must not be prefixed",
+        "/dek-registry/v1/keks/test-kek/",
         contextFilter.modifyUri(UriBuilder.fromPath(path), path, new MultivaluedHashMap<>()).getPath()
     );
   }
@@ -197,7 +197,7 @@ public void testDekPartOfUri() {
     String path = "/contexts/.test-ctx/dek-registry/v1/keks/test-kek/deks/test-subject";
     Assert.assertEquals(
         "Dek must be prefixed",
-        "/dek-registry/v1/keks/:.test-ctx:test-kek/deks/:.test-ctx:test-subject/",
+        "/dek-registry/v1/keks/test-kek/deks/:.test-ctx:test-subject/",
         contextFilter.modifyUri(UriBuilder.fromPath(path), path, new MultivaluedHashMap<>()).getPath()
     );
   }