allegro#1569 | Changed default value of schema.repository.deleteSchem…

…aPathSuffix to empty string. This has been done to make requests to default Confluent schema registry match its delete url.

docs/docs/configuration/schema-repository.md

@@ -37,13 +37,13 @@ Option                                   | Description
 
 ### Management
 
-Option                                   | Description                                                        | Default value
----------------------------------------- | ------------------------------------------------------------------ | -------------
-schema.repository.serverUrl              | URL of a repository                                                | `http://localhost:8888/`
-schema.repository.validationEnabled      | Allows to use validation API in schema repository                  | `false`
-schema.repository.connectionTimeoutMillis| Connection timeout used in http client (specified in milliseconds) | 1000
-schema.repository.socketTimeoutMillis    | Read socket timeout used in http client (specified in milliseconds)| 3000
-schema.repository.deleteSchemaPathSuffix | A suffix of the URL to delete all schema versions: `/subjects/{subject}/{deleteSchemaPathSuffix}| `versions`
-schema.repository.subjectSuffixEnabled   | Add `-value` suffix to every subject name                          | `false`
-schema.repository.subjectNamespaceEnabled| Add `kafka.defaultNamespace` property value as a prefix to every subject name | `false`
+Option                                   | Description                                                                                        | Default value
+---------------------------------------- |----------------------------------------------------------------------------------------------------| -------------
+schema.repository.serverUrl              | URL of a repository                                                                                | `http://localhost:8888/`
+schema.repository.validationEnabled      | Allows to use validation API in schema repository                                                  | `false`
+schema.repository.connectionTimeoutMillis| Connection timeout used in http client (specified in milliseconds)                                 | 1000
+schema.repository.socketTimeoutMillis    | Read socket timeout used in http client (specified in milliseconds)                                | 3000
+schema.repository.deleteSchemaPathSuffix | A suffix of the URL to delete all schema versions: `/subjects/{subject}/{deleteSchemaPathSuffix}`  | `""`
+schema.repository.subjectSuffixEnabled   | Add `-value` suffix to every subject name                                                          | `false`
+schema.repository.subjectNamespaceEnabled| Add `kafka.defaultNamespace` property value as a prefix to every subject name                      | `false`
 

hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SchemaRepositoryProperties.java

@@ -12,7 +12,7 @@ public class SchemaRepositoryProperties {
     private int connectionTimeoutMillis = 1000;
 
     private int socketTimeoutMillis = 3000;
-    private String deleteSchemaPathSuffix = "versions";
+    private String deleteSchemaPathSuffix = "";
 
     private boolean subjectSuffixEnabled = false;
 

hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryRawSchemaClient.java

@@ -30,7 +30,7 @@
 
 /**
  * This implementation of RawSchemaClient is compatible with Confluent Schema Registry API
- * except for the deleteAllSchemaVersions and validation endpoint which are not fully supported by the Confluent project.
+ * except for the validation endpoint which is not fully supported by the Confluent project.
  */
 public class SchemaRegistryRawSchemaClient implements RawSchemaClient {
 
@@ -48,7 +48,7 @@ public class SchemaRegistryRawSchemaClient implements RawSchemaClient {
     public SchemaRegistryRawSchemaClient(SchemaRepositoryInstanceResolver schemaRepositoryInstanceResolver,
                                          ObjectMapper objectMapper,
                                          SubjectNamingStrategy subjectNamingStrategy) {
-        this(schemaRepositoryInstanceResolver, objectMapper, false, "versions", subjectNamingStrategy);
+        this(schemaRepositoryInstanceResolver, objectMapper, false, "", subjectNamingStrategy);
     }
 
     public SchemaRegistryRawSchemaClient(SchemaRepositoryInstanceResolver schemaRepositoryInstanceResolver,

hermes-schema/src/test/groovy/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryRawSchemaClientTest.groovy

@@ -244,13 +244,13 @@ class SchemaRegistryRawSchemaClientTest extends Specification {
 
     def "should delete all schema versions"() {
         given:
-        wireMock.stubFor(WireMock.delete(versionsUrl(topicName, subjectNamingStrategy)).willReturn(okResponse()))
+        wireMock.stubFor(WireMock.delete(deleteUrl(topicName, subjectNamingStrategy)).willReturn(okResponse()))
 
         when:
         client.deleteAllSchemaVersions(topicName)
 
         then:
-        wireMock.verify(1, deleteRequestedFor(versionsUrl(topicName, subjectNamingStrategy)))
+        wireMock.verify(1, deleteRequestedFor(deleteUrl(topicName, subjectNamingStrategy)))
 
         where:
         client << clients
@@ -409,6 +409,10 @@ class SchemaRegistryRawSchemaClientTest extends Specification {
         urlEqualTo("/subjects/${subjectNamingStrategy.apply(topic)}/versions")
     }
 
+    private UrlPattern deleteUrl(TopicName topic, SubjectNamingStrategy subjectNamingStrategy) {
+        urlEqualTo("/subjects/${subjectNamingStrategy.apply(topic)}")
+    }
+
     private UrlPattern schemaVersionUrl(TopicName topic, int version, SubjectNamingStrategy subjectNamingStrategy) {
         urlEqualTo("/subjects/${subjectNamingStrategy.apply(topic)}/versions/$version")
     }