ppalaga commented on a change in pull request #2790: URL: https://github.com/apache/camel-quarkus/pull/2790#discussion_r652093733
########## File path: extensions/jackson/deployment/src/test/java/org/apache/camel/quarkus/component/jackson/JacksonTypeConverterSimpleTest.java ########## @@ -0,0 +1,97 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 + * + * http://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.apache.camel.quarkus.component.jackson; + +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import io.quarkus.test.QuarkusUnitTest; +import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.ExchangePattern; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.jackson.JacksonConstants; +import org.apache.camel.support.DefaultExchange; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.Asset; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +public class JacksonTypeConverterSimpleTest { + @RegisterExtension + static final QuarkusUnitTest CONFIG = new QuarkusUnitTest() + .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .addClass(Routes.class) + .addClass(Order.class) + .addAsResource(applicationProperties(), "application.properties")); + private static CamelContext context; + + @Test + public void jacksonConversionSimple() throws Exception { + context.getGlobalOptions().put(JacksonConstants.ENABLE_TYPE_CONVERTER, "true"); + Exchange exchange = new DefaultExchange(context); + + Map<String, String> map = new HashMap<>(); + Object convertedObject = context.getTypeConverter().convertTo(String.class, exchange, map); + // will do a toString which is an empty map + assertEquals(map.toString(), convertedObject); + + convertedObject = context.getTypeConverter().convertTo(Long.class, exchange, + new HashMap<String, String>()); + assertNull(convertedObject); + + convertedObject = context.getTypeConverter().convertTo(long.class, exchange, + new HashMap<String, String>()); + assertNull(convertedObject); + + convertedObject = context.getTypeConverter().convertTo(ExchangePattern.class, exchange, "InOnly"); + assertEquals(ExchangePattern.InOnly, convertedObject); + } + + public static final class Routes extends RouteBuilder { + @Override + public void configure() { + this.getContext().getGlobalOptions().put(JacksonConstants.ENABLE_TYPE_CONVERTER, "true"); + context = this.getContext(); + } + } + + public static final Asset applicationProperties() { + Writer writer = new StringWriter(); + + Properties props = new Properties(); + props.setProperty("camel.context.name", + "camel-quarkus-integration-tests-dataformats-json-jackson-type-converter-simple"); Review comment: Same as above: do we need `applicationProperties()` at all? ########## File path: extensions/jackson/deployment/src/test/java/org/apache/camel/quarkus/component/jackson/JacksonTypeConverterSimpleTest.java ########## @@ -0,0 +1,97 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 + * + * http://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.apache.camel.quarkus.component.jackson; + +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import io.quarkus.test.QuarkusUnitTest; +import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.ExchangePattern; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.jackson.JacksonConstants; +import org.apache.camel.support.DefaultExchange; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.Asset; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +public class JacksonTypeConverterSimpleTest { + @RegisterExtension + static final QuarkusUnitTest CONFIG = new QuarkusUnitTest() + .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .addClass(Routes.class) + .addClass(Order.class) + .addAsResource(applicationProperties(), "application.properties")); + private static CamelContext context; + + @Test + public void jacksonConversionSimple() throws Exception { + context.getGlobalOptions().put(JacksonConstants.ENABLE_TYPE_CONVERTER, "true"); Review comment: This line is redundant given that so the same in `Routes.configure()` below, isn't it? ########## File path: integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/jackson/json/JacksonJsonResource.java ########## @@ -493,32 +490,19 @@ public void jacksonUnmarshalListJackson(String body) throws Exception { @GET public void jacksonConversionPojo(String body) throws Exception { synchronized (context) { - context.getGlobalOptions().put(JacksonConstants.ENABLE_TYPE_CONVERTER, "true"); - context.getGlobalOptions().put(JacksonConstants.TYPE_CONVERTER_TO_POJO, "true"); - Order order = new Order(); order.setAmount(1); order.setCustomerName("Acme"); order.setPartName("Camel"); - String json = (String) producerTemplate.requestBody("direct:jackson-conversion-pojo-test", order); - assertEquals("{\"id\":0,\"partName\":\"Camel\",\"amount\":1,\"customerName\":\"Acme\"}", json); + //context.getGlobalOptions().put(JacksonConstants.ENABLE_TYPE_CONVERTER, "true"); + //context.getGlobalOptions().put(JacksonConstants.TYPE_CONVERTER_TO_POJO, "true"); - context.getGlobalOptions().put(JacksonConstants.TYPE_CONVERTER_MODULE_CLASS_NAMES, - JaxbAnnotationModule.class.getName()); + //context.getGlobalOptions().put(JacksonConstants.TYPE_CONVERTER_MODULE_CLASS_NAMES, + // JaxbAnnotationModule.class.getName()); Review comment: ```suggestion ``` ########## File path: extensions/jackson/deployment/src/test/java/org/apache/camel/quarkus/component/jackson/JacksonTypeConverterPojoTest.java ########## @@ -0,0 +1,83 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 + * + * http://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.apache.camel.quarkus.component.jackson; + +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.util.Properties; + +import io.quarkus.test.QuarkusUnitTest; +import org.apache.camel.ProducerTemplate; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.jackson.JacksonConstants; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.Asset; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class JacksonTypeConverterPojoTest { + @RegisterExtension + static final QuarkusUnitTest CONFIG = new QuarkusUnitTest() + .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .addClass(Routes.class) + .addClass(Order.class) + .addAsResource(applicationProperties(), "application.properties")); + private static ProducerTemplate producerTemplate; + + @Test + public void jacksonConversionPojo() throws Exception { + Order order = new Order(); + order.setAmount(1); + order.setCustomerName("Acme"); + order.setPartName("Camel"); + + String json = (String) producerTemplate.requestBody("direct:jackson-conversion-pojo", order); + assertEquals("{\"id\":0,\"partName\":\"Camel\",\"amount\":1,\"customerName\":\"Acme\"}", json); + + } + + public static final class Routes extends RouteBuilder { + @Override + public void configure() { + this.getContext().getGlobalOptions().put(JacksonConstants.ENABLE_TYPE_CONVERTER, "true"); + this.getContext().getGlobalOptions().put(JacksonConstants.TYPE_CONVERTER_TO_POJO, "true"); + from("direct:jackson-conversion-pojo").convertBodyTo(String.class); + producerTemplate = this.getContext().createProducerTemplate(); + } + } + + public static final Asset applicationProperties() { + Writer writer = new StringWriter(); + + Properties props = new Properties(); + props.setProperty("camel.context.name", + "camel-quarkus-integration-tests-dataformats-json-jackson-type-converter-pojo"); Review comment: Is there any practical reason to set the context name? If not, we could save 15 lines of code removing the whole `applicationProperties()` method. ########## File path: integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/jackson/json/JacksonJsonResource.java ########## @@ -493,32 +490,19 @@ public void jacksonUnmarshalListJackson(String body) throws Exception { @GET public void jacksonConversionPojo(String body) throws Exception { synchronized (context) { - context.getGlobalOptions().put(JacksonConstants.ENABLE_TYPE_CONVERTER, "true"); - context.getGlobalOptions().put(JacksonConstants.TYPE_CONVERTER_TO_POJO, "true"); - Order order = new Order(); order.setAmount(1); order.setCustomerName("Acme"); order.setPartName("Camel"); - String json = (String) producerTemplate.requestBody("direct:jackson-conversion-pojo-test", order); - assertEquals("{\"id\":0,\"partName\":\"Camel\",\"amount\":1,\"customerName\":\"Acme\"}", json); + //context.getGlobalOptions().put(JacksonConstants.ENABLE_TYPE_CONVERTER, "true"); + //context.getGlobalOptions().put(JacksonConstants.TYPE_CONVERTER_TO_POJO, "true"); Review comment: ```suggestion ``` ########## File path: extensions/jacksonxml/deployment/src/test/java/org/apache/camel/quarkus/component/jacksonxml/deployment/JacksonxmlTypeConverterTest.java ########## @@ -0,0 +1,92 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 + * + * http://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.apache.camel.quarkus.component.jacksonxml.deployment; + +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import io.quarkus.test.QuarkusUnitTest; +import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.jacksonxml.JacksonXMLConstants; +import org.apache.camel.support.DefaultExchange; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.Asset; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +public class JacksonxmlTypeConverterTest { + @RegisterExtension + static final QuarkusUnitTest CONFIG = new QuarkusUnitTest() + .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .addClass(Routes.class) + .addClass(TestPojo.class) + .addAsResource(applicationProperties(), "application.properties")); + private static CamelContext context; + + @Test + public void jacksonxmlConversion() throws Exception { + Exchange exchange = new DefaultExchange(context); + context.getGlobalOptions().put(JacksonXMLConstants.ENABLE_TYPE_CONVERTER, "true"); Review comment: Redundant line because we do the same in Route.configure() below? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
