code review

closes gh-2402

Signed-off-by: Emanuel Trandafir <emanueltrandafir1993@gmail.com>

Author: etrandafir93

spring-cloud-contract-verifier/pom.xml

@@ -5,6 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<properties>
 		<javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
+		<avro.version>1.12.1</avro.version>
 	</properties>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
@@ -275,6 +276,11 @@
 			<artifactId>spock-junit4</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.spockframework</groupId>
+			<artifactId>spock-spring</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-resttestclient</artifactId>
@@ -283,13 +289,13 @@
 		<dependency>
 			<groupId>org.apache.avro</groupId>
 			<artifactId>avro</artifactId>
-			<version>1.12.1</version>
+			<version>${avro.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.avro</groupId>
 			<artifactId>avro</artifactId>
-			<version>1.12.1</version>
+			<version>${avro.version}</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/internal/ContractVerifierObjectMapper.java

@@ -16,27 +16,24 @@
 
 package org.springframework.cloud.contract.verifier.messaging.internal;
 
-import org.springframework.util.ClassUtils;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
 import tools.jackson.databind.json.JsonMapper;
 
 /**
  * Wrapper over {@link JsonMapper} that won't try to parse String but will directly return
  * it.
+ *
  * @author Marcin Grzejszczak
  */
 public class ContractVerifierObjectMapper {
 
 	private final JsonMapper objectMapper;
 
-	public ContractVerifierObjectMapper() {
-		this(new JsonMapper());
+	public ContractVerifierObjectMapper(JsonMapper objectMapper) {
+		this.objectMapper = objectMapper;
 	}
 
-	public ContractVerifierObjectMapper(JsonMapper mapper) {
-		this.objectMapper = usesAvro() ? ignoreAvroFields(mapper) : mapper;
+	public ContractVerifierObjectMapper() {
+		this.objectMapper = new JsonMapper();
 	}
 
 	public String writeValueAsString(Object payload) {
@@ -59,23 +56,4 @@ else if (payload instanceof byte[]) {
 		return this.objectMapper.writeValueAsBytes(payload);
 	}
 
-	private static boolean usesAvro() {
-		return ClassUtils.isPresent("org.apache.avro.specific.SpecificRecordBase", null);
-	}
-
-	private static JsonMapper ignoreAvroFields(JsonMapper mapper) {
-		try {
-			return mapper.rebuild().addMixIn(
-					ClassUtils.forName("org.apache.avro.specific.SpecificRecordBase",
-							null), IgnoreAvroMixin.class).build();
-		}
-		catch (ClassNotFoundException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	@JsonIgnoreProperties({ "schema", "specificData", "classSchema", "conversion" })
-	interface IgnoreAvroMixin {
-	}
-
 }

spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierAutoConfiguration.java

@@ -19,12 +19,15 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.jspecify.annotations.Nullable;
 import tools.jackson.databind.json.JsonMapper;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.cloud.contract.verifier.converter.YamlContract;
 import org.springframework.cloud.contract.verifier.messaging.MessageVerifierReceiver;
 import org.springframework.cloud.contract.verifier.messaging.MessageVerifierSender;
@@ -89,12 +92,27 @@ public ContractVerifierMessaging<Object> contractVerifierMessaging() {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public ContractVerifierObjectMapper contractVerifierObjectMapper(ObjectProvider<JsonMapper> jsonMapper) {
-		JsonMapper mapper = jsonMapper.getIfAvailable();
-		if (mapper != null) {
-			return new ContractVerifierObjectMapper(mapper);
-		}
-		return new ContractVerifierObjectMapper();
+	@ConditionalOnMissingClass("org.apache.avro.specific.SpecificRecordBase")
+	public ContractVerifierObjectMapper contractVerifierObjectMapper(
+			ObjectProvider<JsonMapper> jsonMapper) {
+		JsonMapper mapper = jsonMapper.getIfAvailable(JsonMapper::new);
+		return new ContractVerifierObjectMapper(mapper);
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	@ConditionalOnClass(name = "org.apache.avro.specific.SpecificRecordBase")
+	public ContractVerifierObjectMapper avroContractVerifierObjectMapper(
+			ObjectProvider<JsonMapper> jsonMapper) throws ClassNotFoundException {
+		JsonMapper mapper = jsonMapper.getIfAvailable(JsonMapper::new).rebuild()
+				.addMixIn(Class.forName("org.apache.avro.specific.SpecificRecordBase"),
+						IgnoreAvroMixin.class).build();
+		return new ContractVerifierObjectMapper(mapper);
+	}
+
+	@JsonIgnoreProperties({ "schema", "specificData", "classSchema", "conversion" })
+	interface IgnoreAvroMixin {
+
 	}
 
 }

spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/messaging/internal/ContractVerifierObjectMapperAvroSpec.groovy

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2013-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.contract.verifier.messaging.internal
+
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierAutoConfiguration
+import org.springframework.test.context.ContextConfiguration
+import spock.lang.Specification
+
+@ContextConfiguration(classes = [NoOpContractVerifierAutoConfiguration])
+class ContractVerifierObjectMapperAvroSpec extends Specification {
+
+	@Autowired
+	ContractVerifierObjectMapper mapper
+
+	def "should convert an Avro-generated object into a json representation"() {
+		given:
+			FooAvro input = FooAvro.newBuilder().setFooAvro("barAvro").build()
+		when:
+			String result = mapper.writeValueAsString(input)
+		then:
+			result == '{"fooAvro":"barAvro"}'
+	}
+}

spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/messaging/internal/ContractVerifierObjectMapperSpec.groovy

@@ -32,15 +32,6 @@ class ContractVerifierObjectMapperSpec extends Specification {
 			result == '''{"foo":"bar"}'''
 	}
 
-	def "should convert an Avro-generated object into a json representation"() {
-		given:
-			FooAvro input = FooAvro.newBuilder().setFooAvro("barAvro").build()
-		when:
-			String result = mapper.writeValueAsString(input)
-		then:
-			result == '''{"fooAvro":"barAvro"}'''
-	}
-
 	def "should convert bytes into a json representation"() {
 		given:
 			String input = '''{"foo":"bar"}'''

spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/messaging/internal/FooAvro.java

@@ -338,14 +338,4 @@ public void customDecode(org.apache.avro.io.ResolvingDecoder in)
 			}
 		}
 	}
-}
-
-
-
-
-
-
-
-
-
-
+}