Add jackson integration test - minor cleanup

apache · Sep 27, 2024 · 32729d0 · 32729d0
1 parent 1bd8206
commit 32729d0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...es/camel-jackson/src/main/java/org/apache/karaf/camel/test/CamelJacksonRouteSupplier.java b/...es/camel-jackson/src/main/java/org/apache/karaf/camel/test/CamelJacksonRouteSupplier.java
@@ -16,6 +16,7 @@
 package org.apache.karaf.camel.test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.model.RouteDefinition;
@@ -26,7 +27,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 
 @Component(
         name = "karaf-camel-jackson-test",
@@ -86,7 +87,7 @@ protected void configureProducer(RouteBuilder builder, RouteDefinition producerR
                 .process(ex -> {
                     MyData data = ex.getIn().getBody(MyData.class);
                     assertEquals(JSON_SAMPLE_NAME, data.getName());
-                    assertEquals(null, data.getNikname());
+                    assertNull(data.getNikname());
                     assertEquals(JSON_SAMPLE_AGE, data.getAge());
                 })
                 .log("Will marshal: ${body}")
@@ -95,10 +96,10 @@ protected void configureProducer(RouteBuilder builder, RouteDefinition producerR
                 .process(ex -> {
                     String data = ex.getIn().getBody(String.class);
 
-                    ObjectMapper objectMapper = new ObjectMapper();
-                    JsonNode jsonNode = objectMapper.readTree(data);
+                    JsonMapper jsonMapper = new JsonMapper();
+                    JsonNode jsonNode = jsonMapper.readTree(data);
                     assertEquals(JSON_SAMPLE_NAME, jsonNode.get("name").asText());
-                    assertEquals(null, jsonNode.get("nikname"));
+                    assertNull(jsonNode.get("nikname"));
                     assertEquals(JSON_SAMPLE_AGE, jsonNode.get("age").asInt());
                 }).toF("mock:%s", getResultMockName());
     }

diff --git a/...n/resources/archetype-resources/src/main/java/test/Camel__featureName__RouteSupplier.java b/...n/resources/archetype-resources/src/main/java/test/Camel__featureName__RouteSupplier.java
@@ -27,7 +27,7 @@
 @Component(
         name = "karaf-camel-${featureNameLower}-test",
         immediate = true,
-        service = CamelRouteSupplier.class
+        service = Camel${featureName}RouteSupplier.class
 )
 public class Camel${featureName}RouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier {