[camel] branch master updated: CAMEL-13178: rename language terser to hl7terser

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated: CAMEL-13178: rename language terser to hl7terser

davsclaus-2
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new f9c4961  CAMEL-13178: rename language terser to hl7terser
f9c4961 is described below

commit f9c4961e41db43c9a1453a346f938911afbcbfd2
Author: Claus Ibsen <[hidden email]>
AuthorDate: Tue Feb 12 11:02:40 2019 +0100

    CAMEL-13178: rename language terser to hl7terser
---
 .../camel-hl7/src/main/docs/hl7-dataformat.adoc    |   4 +-
 .../src/main/docs/hl7terser-language.adoc          |   5 +-
 .../TerserLanguageAutoConfiguration.java           | 117 ---------------------
 .../springboot/TerserLanguageConfiguration.java    |  52 ---------
 .../additional-spring-configuration-metadata.json  |   2 +-
 .../src/main/resources/META-INF/spring.factories   |   1 -
 6 files changed, 5 insertions(+), 176 deletions(-)

diff --git a/components/camel-hl7/src/main/docs/hl7-dataformat.adoc b/components/camel-hl7/src/main/docs/hl7-dataformat.adoc
index 2a14aa3..4c8e20b 100644
--- a/components/camel-hl7/src/main/docs/hl7-dataformat.adoc
+++ b/components/camel-hl7/src/main/docs/hl7-dataformat.adoc
@@ -228,7 +228,7 @@ The HL7 dataformat supports 2 options, which are listed below.
 === Spring Boot Auto-Configuration
 
 
-The component supports 5 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
@@ -238,8 +238,6 @@ The component supports 5 options, which are listed below.
 | *camel.dataformat.hl7.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
 | *camel.dataformat.hl7.enabled* | Enable hl7 dataformat | true | Boolean
 | *camel.dataformat.hl7.validate* | Whether to validate the HL7 message Is by default true. | true | Boolean
-| *camel.language.terser.enabled* | Enable terser language | true | Boolean
-| *camel.language.terser.trim* | Whether to trim the value to remove leading and trailing whitespaces and line breaks | true | Boolean
 |===
 // spring-boot-auto-configure options: END
 
diff --git a/components/camel-hl7/src/main/docs/hl7terser-language.adoc b/components/camel-hl7/src/main/docs/hl7terser-language.adoc
index 5e955ab..69a237c 100644
--- a/components/camel-hl7/src/main/docs/hl7terser-language.adoc
+++ b/components/camel-hl7/src/main/docs/hl7terser-language.adoc
@@ -1,6 +1,8 @@
 [[hl7terser-language]]
 == HL7 Terser Language
 *Available as of Camel version 2.11*
+*Available as of Camel version 2.11*
+
 
 
 http://hl7api.sourceforge.net[HAPI] provides a
@@ -130,5 +132,4 @@ import ca.uhn.hl7v2.validation.impl.DefaultValidation;
 
       // acknowledgement
       .transform(ack())
-----
-
+----
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/TerserLanguageAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/TerserLanguageAutoConfiguration.java
deleted file mode 100644
index 50fd520..0000000
--- a/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/TerserLanguageAutoConfiguration.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * 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.hl7.springboot;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.component.hl7.TerserLanguage;
-import org.apache.camel.spi.HasId;
-import org.apache.camel.spi.LanguageCustomizer;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.LanguageConfigurationProperties;
-import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
-import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
-import org.apache.camel.spring.boot.util.GroupCondition;
-import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.apache.camel.support.IntrospectionSupport;
-import org.apache.camel.util.ObjectHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
-@Configuration
-@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
-        TerserLanguageAutoConfiguration.GroupConditions.class})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
-@EnableConfigurationProperties({LanguageConfigurationProperties.class,
-        TerserLanguageConfiguration.class})
-public class TerserLanguageAutoConfiguration {
-
-    private static final Logger LOGGER = LoggerFactory
-            .getLogger(TerserLanguageAutoConfiguration.class);
-    @Autowired
-    private ApplicationContext applicationContext;
-    @Autowired
-    private CamelContext camelContext;
-    @Autowired
-    private TerserLanguageConfiguration configuration;
-    @Autowired(required = false)
-    private List<LanguageCustomizer<TerserLanguage>> customizers;
-
-    static class GroupConditions extends GroupCondition {
-        public GroupConditions() {
-            super("camel.component", "camel.component.hl7terser");
-        }
-    }
-
-    @Bean(name = "hl7terser-language")
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    @ConditionalOnMissingBean(TerserLanguage.class)
-    public TerserLanguage configureTerserLanguage() throws Exception {
-        TerserLanguage language = new TerserLanguage();
-        if (CamelContextAware.class.isAssignableFrom(TerserLanguage.class)) {
-            CamelContextAware contextAware = CamelContextAware.class
-                    .cast(language);
-            if (contextAware != null) {
-                contextAware.setCamelContext(camelContext);
-            }
-        }
-        Map<String, Object> parameters = new HashMap<>();
-        IntrospectionSupport.getProperties(configuration, parameters, null,
-                false);
-        CamelPropertiesHelper.setCamelProperties(camelContext, language,
-                parameters, false);
-        if (ObjectHelper.isNotEmpty(customizers)) {
-            for (LanguageCustomizer<TerserLanguage> customizer : customizers) {
-                boolean useCustomizer = (customizer instanceof HasId)
-                        ? HierarchicalPropertiesEvaluator.evaluate(
-                                applicationContext.getEnvironment(),
-                                "camel.language.customizer",
-                                "camel.language.hl7terser.customizer",
-                                ((HasId) customizer).getId())
-                        : HierarchicalPropertiesEvaluator.evaluate(
-                                applicationContext.getEnvironment(),
-                                "camel.language.customizer",
-                                "camel.language.hl7terser.customizer");
-                if (useCustomizer) {
-                    LOGGER.debug("Configure language {}, with customizer {}",
-                            language, customizer);
-                    customizer.customize(language);
-                }
-            }
-        }
-        return language;
-    }
-}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/TerserLanguageConfiguration.java b/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/TerserLanguageConfiguration.java
deleted file mode 100644
index eeba1d0..0000000
--- a/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/TerserLanguageConfiguration.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * 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.hl7.springboot;
-
-import javax.annotation.Generated;
-import org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * To use HL7 terser scripts in Camel expressions or predicates.
- *
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.language.hl7terser")
-public class TerserLanguageConfiguration
-        extends
-            LanguageConfigurationPropertiesCommon {
-
-    /**
-     * Whether to enable auto configuration of the hl7terser language. This is
-     * enabled by default.
-     */
-    private Boolean enabled;
-    /**
-     * Whether to trim the value to remove leading and trailing whitespaces and
-     * line breaks
-     */
-    private Boolean trim = true;
-
-    public Boolean getTrim() {
-        return trim;
-    }
-
-    public void setTrim(Boolean trim) {
-        this.trim = trim;
-    }
-}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 5df4da3..9366023 100644
--- a/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -8,7 +8,7 @@
     },
     {
       "defaultValue": true,
-      "name": "camel.language.terser.enabled",
+      "name": "camel.language.hl7terser.enabled",
       "description": "Enable terser language",
       "type": "java.lang.Boolean"
     }
diff --git a/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/resources/META-INF/spring.factories
index 4be87f5..c739577 100644
--- a/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/resources/META-INF/spring.factories
@@ -15,7 +15,6 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.hl7.springboot.TerserLanguageAutoConfiguration,\
 org.apache.camel.component.hl7.springboot.HL7DataFormatAutoConfiguration,\
 org.apache.camel.component.hl7.springboot.Hl7TerserLanguageAutoConfiguration