Upgrade to the latest Avro dependency (#4990)

* Upgrade the latest Avro dependency

* Fix issue in Avro content validator after Avro library upgrade

* Fix broken tests after upgrading Avro dep

* Code formatting

Author: EricWittmann

app/src/test/java/io/apicurio/registry/noprofile/ccompat/rest/v7/ConfluentClientTest.java

@@ -38,8 +38,8 @@
 import io.confluent.kafka.serializers.protobuf.KafkaProtobufSerializerConfig;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
+import org.apache.avro.AvroTypeException;
 import org.apache.avro.Schema;
-import org.apache.avro.SchemaParseException;
 import org.apache.avro.generic.GenericData;
 import org.apache.kafka.connect.data.SchemaAndValue;
 import org.apache.kafka.connect.data.Struct;
@@ -536,8 +536,8 @@ public void testRegisterInvalidSchemaBadType() throws Exception {
 
         try {
             new org.apache.avro.Schema.Parser().parse(badSchemaString);
-            fail("Parsing invalid schema string should fail with SchemaParseException");
-        } catch (SchemaParseException ignored) {
+            fail("Parsing invalid schema string should fail with AvroTypeException");
+        } catch (AvroTypeException ignored) {
         }
 
         try {

app/src/test/java/io/apicurio/registry/noprofile/serde/AvroSerdeTest.java

@@ -141,7 +141,7 @@ record = deserializer.deserialize(topic, bytes);
     @Test
     public void testAvro() throws Exception {
         testAvroAutoRegisterIdInBody(RecordIdStrategy.class, () -> {
-            return restClient.groups().byGroupId("test-group-avro").artifacts().byArtifactId("myrecord3")
+            return restClient.groups().byGroupId("test_group_avro").artifacts().byArtifactId("myrecord3")
                     .versions().byVersionExpression("branch=latest").get();
         });
     }
@@ -150,7 +150,7 @@ public void testAvro() throws Exception {
     public void testAvroQualifiedRecordIdStrategy() throws Exception {
         testAvroAutoRegisterIdInBody(QualifiedRecordIdStrategy.class, () -> {
             return restClient.groups().byGroupId(GroupId.DEFAULT.getRawGroupIdWithDefaultString()).artifacts()
-                    .byArtifactId("test-group-avro.myrecord3").versions().byVersionExpression("branch=latest")
+                    .byArtifactId("test_group_avro.myrecord3").versions().byVersionExpression("branch=latest")
                     .get();
         });
     }
@@ -159,7 +159,7 @@ private void testAvroAutoRegisterIdInBody(
             Class<? extends ArtifactReferenceResolverStrategy<?, ?>> strategy,
             Supplier<VersionMetaData> artifactFinder) throws Exception {
         Schema schema = new Schema.Parser().parse(
-                "{\"type\":\"record\",\"name\":\"myrecord3\",\"namespace\":\"test-group-avro\",\"fields\":[{\"name\":\"bar\",\"type\":\"string\"}]}");
+                "{\"type\":\"record\",\"name\":\"myrecord3\",\"namespace\":\"test_group_avro\",\"fields\":[{\"name\":\"bar\",\"type\":\"string\"}]}");
         try (
             AvroKafkaSerializer<GenericData.Record> serializer = new AvroKafkaSerializer<GenericData.Record>(
                     restClient);

integration-tests/src/test/java/io/apicurio/tests/converters/RegistryConverterIT.java

@@ -52,8 +52,8 @@ public void cleanArtifacts() throws Exception {
 
     @Test
     public void testConfiguration() throws Exception {
-        String groupId = TestUtils.generateGroupId();
-        String topic = TestUtils.generateArtifactId();
+        String groupId = "ns_" + TestUtils.generateGroupId().replace("-", "_");
+        String topic = "topic-" + TestUtils.generateArtifactId().replace("-", "_");
         String recordName = "myrecord4";
         AvroGenericRecordSchemaFactory schemaFactory = new AvroGenericRecordSchemaFactory(groupId, recordName,
                 List.of("bar"));
@@ -108,7 +108,7 @@ public void testAvroIntDefaultValue() throws Exception {
             Struct struct = new Struct(sc);
             struct.put("int16Test", (short) 3);
 
-            String subject = TestUtils.generateArtifactId();
+            String subject = "subj_" + TestUtils.generateArtifactId().replace("-", "_");
 
             byte[] bytes = converter.fromConnectData(subject, sc, struct);
 
@@ -153,7 +153,7 @@ public void testAvroBytesDefaultValue() throws Exception {
 
             struct.put("bytesTest", "testingBytes".getBytes());
 
-            String subject = TestUtils.generateArtifactId();
+            String subject = "subj_" + TestUtils.generateArtifactId().replace("-", "_");
 
             byte[] bytes = converter.fromConnectData(subject, sc, struct);
 
@@ -187,7 +187,7 @@ public void testAvro() throws Exception {
             Struct struct = new Struct(sc);
             struct.put("bar", "somebar");
 
-            String subject = TestUtils.generateArtifactId();
+            String subject = "subj_" + TestUtils.generateArtifactId().replace("-", "_");
 
             byte[] bytes = converter.fromConnectData(subject, sc, struct);
 
@@ -242,7 +242,7 @@ public void testConnectStruct() throws Exception {
             envelopeStruct.put("ts_ms", 1638362438000L); // Replace with the actual timestamp
             envelopeStruct.put("transaction", buildTransactionStruct());
 
-            String subject = TestUtils.generateArtifactId();
+            String subject = "subj_" + TestUtils.generateArtifactId().replace("-", "_");
 
             byte[] bytes = converter.fromConnectData(subject, envelopeSchema, envelopeStruct);
 

integration-tests/src/test/java/io/apicurio/tests/serdes/apicurio/AvroSerdeIT.java

@@ -273,7 +273,7 @@ void evolveSchemaTest(boolean reuseClients) throws Exception {
         String topicName = TestUtils.generateTopic();
         kafkaCluster.createTopic(topicName, 1, 1);
 
-        String recordNamespace = TestUtils.generateGroupId();
+        String recordNamespace = TestUtils.generateAvroNS();
         String recordName = TestUtils.generateSubject();
         String schemaKey = "key1";
         AvroGenericRecordSchemaFactory avroSchema = new AvroGenericRecordSchemaFactory(recordNamespace,
@@ -683,7 +683,7 @@ void testFirstRequestFailsRateLimited() throws Exception {
 
         mock.start();
         try {
-            String topicName = TestUtils.generateSubject();
+            String topicName = TestUtils.generateTopic();
             kafkaCluster.createTopic(topicName, 1, 1);
 
             AvroGenericRecordSchemaFactory avroSchema = new AvroGenericRecordSchemaFactory("mygroup",

integration-tests/src/test/java/io/apicurio/tests/smokeTests/apicurio/ArtifactsIT.java

@@ -165,7 +165,7 @@ void createAndUpdateArtifact() throws Exception {
     @Test
     void createAndDeleteMultipleArtifacts() throws Exception {
         LOGGER.info("Creating some artifacts...");
-        String groupId = TestUtils.generateGroupId();
+        String groupId = TestUtils.generateAvroNS();
 
         List<VersionMetaData> artifacts = IntStream.range(0, 10).mapToObj(i -> {
             String artifactId = TestUtils.generateSubject();

integration-tests/src/test/java/io/apicurio/tests/smokeTests/confluent/RulesResourceConfluentIT.java

@@ -39,7 +39,7 @@ void compatibilityGlobalRules() throws Exception {
 
         ParsedSchema schema = new AvroSchema(first);
 
-        String schemeSubject = TestUtils.generateArtifactId();
+        String schemeSubject = TestUtils.generateSubject();
         int schemaId = createArtifactViaConfluentClient(schema, schemeSubject);
 
         confluentService.getSchemaById(schemaId);

pom.xml

@@ -138,7 +138,7 @@
     <jandex.version>3.1.8</jandex.version>
 
     <!-- Schema types -->
-    <avro.version>1.11.3</avro.version>
+    <avro.version>1.12.0</avro.version>
     <json-schema-validator.version>1.5.1</json-schema-validator.version>
     <wire-schema.version>4.9.9</wire-schema.version>
     <okhttp.version>4.12.0</okhttp.version>

schema-util/avro/src/main/java/io/apicurio/registry/rules/compatibility/AvroCompatibilityChecker.java

@@ -3,7 +3,6 @@
 import com.google.common.collect.ImmutableSet;
 import io.apicurio.registry.content.TypedContent;
 import io.apicurio.registry.rules.UnprocessableSchemaException;
-import org.apache.avro.AvroRuntimeException;
 import org.apache.avro.Schema;
 import org.apache.avro.SchemaCompatibility;
 import org.apache.avro.SchemaCompatibility.Incompatibility;
@@ -43,7 +42,7 @@ protected Set<Incompatibility> isBackwardsCompatibleWith(String existing, String
                     throw new IllegalStateException(
                             "Got illegal compatibility result: " + result.getCompatibility());
             }
-        } catch (AvroRuntimeException ex) {
+        } catch (Exception ex) {
             throw new UnprocessableSchemaException(
                     "Could not execute compatibility rule on invalid Avro schema", ex);
         }

schema-util/avro/src/main/java/io/apicurio/registry/rules/validity/AvroContentValidator.java

@@ -6,6 +6,7 @@
 import io.apicurio.registry.rules.RuleViolationException;
 import io.apicurio.registry.rules.integrity.IntegrityLevel;
 import io.apicurio.registry.types.RuleType;
+import org.apache.avro.AvroTypeException;
 import org.apache.avro.Schema;
 
 import java.util.Collections;
@@ -72,15 +73,17 @@ public void validateReferences(TypedContent content, List<ArtifactReference> ref
                 }
             });
             parser.parse(content.getContent().content());
-        } catch (Exception e) {
-            // This is terrible, but I don't know how else to detect if the reason for the parse failure
+        } catch (AvroTypeException e) {
+            // This isn't great, but I don't know how else to detect if the reason for the parse failure
             // is because of a missing defined type or some OTHER parse exception.
-            if (e.getMessage().contains("is not a defined name")) {
+            if (e.getMessage().startsWith("Undefined schema")) {
                 RuleViolation violation = new RuleViolation("Missing reference detected.", e.getMessage());
                 throw new RuleViolationException("Missing reference detected in Avro artifact.",
                         RuleType.INTEGRITY, IntegrityLevel.ALL_REFS_MAPPED.name(),
                         Collections.singleton(violation));
             }
+        } catch (Exception e) {
+            // Ignore other errors
         }
     }
 

utils/maven-plugin/src/main/java/io/apicurio/registry/maven/AvroDirectoryParser.java

@@ -5,6 +5,7 @@
 import io.apicurio.registry.rest.client.RegistryClient;
 import io.apicurio.registry.rest.client.models.ArtifactReference;
 import io.apicurio.registry.types.ContentTypes;
+import org.apache.avro.AvroTypeException;
 import org.apache.avro.Schema;
 import org.apache.avro.SchemaParseException;
 import org.slf4j.Logger;
@@ -111,7 +112,7 @@ private ParsedDirectoryWrapper<Schema> parseDirectory(File directory, File rootS
                     processed.put(schema.getFullName(), schema);
                     schemaContents.put(schema.getFullName(), typedSchemaContent);
                     fileParsed = true;
-                } catch (SchemaParseException ex) {
+                } catch (SchemaParseException | AvroTypeException ex) {
                     log.warn(
                             "Error processing Avro schema with name {}. This usually means that the references are not ready yet to parse it",
                             typeToAdd.getName());

utils/tests/src/main/java/io/apicurio/registry/utils/tests/TestUtils.java

@@ -254,7 +254,7 @@ public static String generateTopic() {
     }
 
     public static String generateTopic(String prefix) {
-        return prefix + UUID.randomUUID().toString();
+        return prefix + UUID.randomUUID().toString().replace("-", "_");
     }
 
     public static String generateSubject() {
@@ -269,6 +269,14 @@ public static String generateGroupId() {
         return UUID.randomUUID().toString();
     }
 
+    public static String generateAvroName() {
+        return "n_" + generateArtifactId().replace("-", "_");
+    }
+
+    public static String generateAvroNS() {
+        return "ns_" + generateArtifactId().replace("-", "_");
+    }
+
     public static CreateArtifact clientCreateArtifact(String artifactId, String artifactType, String content,
             String contentType) {
         CreateArtifact createArtifact = new CreateArtifact();