Simplify error message when subject name strategy is not respected

Author: Zoe Drey

src/main/java/com/michelin/ns4kafka/model/schema/SubjectNameStrategy.java

@@ -26,6 +26,7 @@ public enum SubjectNameStrategy {
     TOPIC_RECORD_NAME("io.confluent.kafka.serializers.subject.TopicRecordNameStrategy"),
     RECORD_NAME("io.confluent.kafka.serializers.subject.RecordNameStrategy");
 
+    private final String strategyPrefix = "io.confluent.kafka.serializers.subject";
     private final String value;
 
     SubjectNameStrategy(String value) {
@@ -61,10 +62,14 @@ public String toExpectedFormat() {
      * @param strategyRealValue
      * @return SubjectNameStrategy enum value from given confluent's strategy value
      */
-    public static SubjectNameStrategy getFromConfigValue(final String strategyRealValue) {
+    public static SubjectNameStrategy fromConfigValue(final String strategyRealValue) {
         return Arrays.stream(values())
                 .filter(s -> s.value.equals(strategyRealValue))
                 .findFirst()
                 .orElseThrow();
     }
+
+    public String toShortName() {
+        return value.substring(strategyPrefix.length() + 1);
+    }
 }

src/main/java/com/michelin/ns4kafka/util/FormatErrorUtils.java

@@ -740,16 +740,14 @@ public static String invalidSchemaSuffix(String invalidNameValue) {
      */
     public static String invalidSchemaSubjectName(String subjectName, List<SubjectNameStrategy> strategies) {
         String strategiesString =
-                strategies.stream().map(SubjectNameStrategy::toString).collect(Collectors.joining(", "));
+                strategies.stream().map(SubjectNameStrategy::toShortName).collect(Collectors.joining(" or "));
         String formatsString =
-                strategies.stream().map(SubjectNameStrategy::toExpectedFormat).collect(Collectors.joining(", "));
+                strategies.stream().map(SubjectNameStrategy::toExpectedFormat).collect(Collectors.joining(" or "));
         return String.format(
                 INVALID_FIELD,
                 subjectName,
                 FIELD_NAME,
-                String.format(
-                        "value must follow one of these strategies: %s with format: %s",
-                        strategiesString, formatsString));
+                String.format("value must follow %s with format %s", strategiesString, formatsString));
     }
 
     /**

src/main/java/com/michelin/ns4kafka/validation/TopicValidator.java

@@ -109,7 +109,7 @@ public List<SubjectNameStrategy> getValidSubjectNameStrategies() {
                         ResourceValidator.ValidString.in(SubjectNameStrategy.DEFAULT.toString()));
         if (value instanceof ResourceValidator.ValidString validString) {
             return new ArrayList<>(validString.getValidStrings().stream()
-                    .map(SubjectNameStrategy::getFromConfigValue)
+                    .map(SubjectNameStrategy::fromConfigValue)
                     .toList());
         }
         return new ArrayList<>(List.of(SubjectNameStrategy.DEFAULT));

src/test/java/com/michelin/ns4kafka/service/SchemaServiceTest.java

@@ -34,7 +34,6 @@
 import com.michelin.ns4kafka.service.client.schema.entities.SchemaCompatibilityCheckResponse;
 import com.michelin.ns4kafka.service.client.schema.entities.SchemaCompatibilityResponse;
 import com.michelin.ns4kafka.service.client.schema.entities.SchemaResponse;
-import com.michelin.ns4kafka.util.FormatErrorUtils;
 import com.michelin.ns4kafka.validation.TopicValidator;
 import java.util.Arrays;
 import java.util.Collections;
@@ -479,13 +478,14 @@ void shouldNotValidateSchema() {
         when(schemaRegistryClient.getSubject(namespace.getMetadata().getCluster(), "header-value", "1"))
                 .thenReturn(Mono.empty());
 
+        String errorSubjectNameStrategy = "Invalid value \"wrongSubjectName\" for field \"name\": "
+                + "value must follow TopicNameStrategy with format {topic}-{key|value}.";
+        String errorHeaderValueForReferences = "Invalid value \"header-value\" for field \"references\": "
+                + "subject header-value version 1 not found.";
         StepVerifier.create(schemaService.validateSchema(namespace, schema))
                 .consumeNextWith(errors -> {
-                    assertTrue(errors.contains(FormatErrorUtils.invalidSchemaSubjectName(
-                            "wrongSubjectName",
-                            namespace.getSpec().getTopicValidator().getValidSubjectNameStrategies())));
-                    assertTrue(errors.contains("Invalid value \"header-value\" for field \"references\": "
-                            + "subject header-value version 1 not found."));
+                    assertTrue(errors.contains(errorSubjectNameStrategy));
+                    assertTrue(errors.contains(errorHeaderValueForReferences));
                 })
                 .verifyComplete();
     }