You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/03/23 13:43:00 UTC
[camel-spring-boot] branch camel-spring-boot-3.x updated: CAMEL-19181: camel-mapstructor - Trigger creating mapstruct component without a component is in use in Camel routes as the component can be used for type converters only. (#798)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-spring-boot-3.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/camel-spring-boot-3.x by this push:
new b035225d8e7 CAMEL-19181: camel-mapstructor - Trigger creating mapstruct component without a component is in use in Camel routes as the component can be used for type converters only. (#798)
b035225d8e7 is described below
commit b035225d8e7577d865ad3e69d2c93b7c6693b0d4
Author: Luigi De Masi <55...@users.noreply.github.com>
AuthorDate: Thu Mar 23 14:42:14 2023 +0100
CAMEL-19181: camel-mapstructor - Trigger creating mapstruct component without a component is in use in Camel routes as the component can be used for type converters only. (#798)
---
.../MapstructMappingAutoConfiguration.java | 71 ++++++++++++++++++++++
.../src/main/resources/META-INF/spring.factories | 4 +-
2 files changed, 73 insertions(+), 2 deletions(-)
diff --git a/components-starter/camel-mapstruct-starter/src/main/java/org/apache/camel/component/mapstruct/springboot/MapstructMappingAutoConfiguration.java b/components-starter/camel-mapstruct-starter/src/main/java/org/apache/camel/component/mapstruct/springboot/MapstructMappingAutoConfiguration.java
new file mode 100644
index 00000000000..dd7d8a7e502
--- /dev/null
+++ b/components-starter/camel-mapstruct-starter/src/main/java/org/apache/camel/component/mapstruct/springboot/MapstructMappingAutoConfiguration.java
@@ -0,0 +1,71 @@
+/*
+ * 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.component.mapstruct.springboot;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ExtendedStartupListener;
+import org.apache.camel.spi.CamelContextCustomizer;
+import org.apache.camel.spring.boot.CamelAutoConfiguration;
+import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
+import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration(proxyBeanMethods = false)
+@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
+@EnableConfigurationProperties({ComponentConfigurationProperties.class,MapstructComponentConfiguration.class})
+@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.mapstruct"})
+@ConditionalOnProperty(prefix = "camel.component.mapstruct", name = "enabled", havingValue = "true", matchIfMissing = true)
+@AutoConfigureAfter({CamelAutoConfiguration.class, MapstructComponentAutoConfiguration.class})
+public class MapstructMappingAutoConfiguration {
+
+ @Bean
+ CamelContextCustomizer registerMapstructComponent(CamelContext context) throws Exception {
+ context.addStartupListener(new ExtendedStartupListener() {
+ @Override
+ public void onCamelContextStarting(CamelContext context, boolean alreadyStarted) throws Exception {
+ // we want mapstruct to be automatically created and initialize via spring boot auto-configuation
+ // so we need to force this via camel context, and do this without causing circular dependency creation
+ // problems with spring boot
+ if (context.hasComponent("mapstruct") == null) {
+ context.getComponent("mapstruct");
+ }
+ }
+
+ @Override
+ public void onCamelContextStarted(CamelContext context, boolean alreadyStarted) throws Exception {
+ // noop
+ }
+
+ @Override
+ public void onCamelContextFullyStarted(CamelContext context, boolean alreadyStarted) throws Exception {
+ // noop
+ }
+ });
+ return new CamelContextCustomizer() {
+ @Override
+ public void configure(CamelContext camelContext) {
+ // empty not in use
+ }
+ };
+ }
+}
\ No newline at end of file
diff --git a/components-starter/camel-mapstruct-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-mapstruct-starter/src/main/resources/META-INF/spring.factories
index ef96953f075..1cb42553bb0 100644
--- a/components-starter/camel-mapstruct-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-mapstruct-starter/src/main/resources/META-INF/spring.factories
@@ -17,5 +17,5 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.mapstruct.springboot.MapstructComponentConverter,\
-org.apache.camel.component.mapstruct.springboot.MapstructComponentAutoConfiguration
-
+org.apache.camel.component.mapstruct.springboot.MapstructComponentAutoConfiguration,\
+org.apache.camel.component.mapstruct.springboot.MapstructMappingAutoConfiguration
\ No newline at end of file