KAFKA-10675 fix after review

Author: Iskuskov

connect/api/src/main/java/org/apache/kafka/connect/data/ConnectSchema.java

@@ -231,9 +231,15 @@ public static void validateValue(String name, Schema schema, Object value) {
         }
 
         if (!foundMatch) {
-            throw new DataException(String.format("Invalid Java object for %s: %s for field: \"%s\"",
-                buildSchemaInfo(schema), value.getClass(), name)
-            );
+            StringBuilder exceptionMessage = new StringBuilder("Invalid Java object for schema");
+            if (schema.name() != null) {
+                exceptionMessage.append(" \"").append(schema.name()).append("\"");
+            }
+            exceptionMessage.append(" with type ").append(schema.type()).append(": ").append(value.getClass());
+            if (name != null) {
+                exceptionMessage.append(" for field: \"").append(name).append("\"");
+            }
+            throw new DataException(exceptionMessage.toString());
         }
 
         switch (schema.type()) {
@@ -265,15 +271,6 @@ private static List<Class<?>> expectedClassesFor(Schema schema) {
         return expectedClasses;
     }
 
-    private static String buildSchemaInfo(Schema schema) {
-        StringBuilder schemaInfo = new StringBuilder("schema");
-        if (schema.name() != null) {
-            schemaInfo.append(" \"").append(schema.name()).append("\"");
-        }
-        schemaInfo.append(" with type ").append(schema.type());
-        return schemaInfo.toString();
-    }
-
     /**
      * Validate that the value can be used for this schema, i.e. that its type matches the schema type and optional
      * requirements. Throws a DataException if the value is invalid.

connect/api/src/test/java/org/apache/kafka/connect/data/StructTest.java

@@ -318,14 +318,17 @@ public void testValidateFieldWithInvalidValueType() {
             Schema.INT8_SCHEMA, new Object()));
         assertEquals("Invalid Java object for schema with type INT8: class java.lang.Object for field: \"field\"",
             e.getMessage());
+
+        e = assertThrows(DataException.class, () -> ConnectSchema.validateValue(Schema.INT8_SCHEMA, new Object()));
+        assertEquals("Invalid Java object for schema with type INT8: class java.lang.Object", e.getMessage());
     }
 
     @Test
     public void testValidateFieldWithInvalidValueMismatchTimestamp() {
         String fieldName = "field";
         long longValue = 1000L;
 
-        // Does not throw​
+        // Does not throw
         ConnectSchema.validateValue(fieldName, Schema.INT64_SCHEMA, longValue);
 
         Exception e = assertThrows(DataException.class, () -> ConnectSchema.validateValue(fieldName,