[camel] branch master updated: CAMEL-14876: Fix race condition in the metadata.json due to unnecessary component model

[oalsafi]

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

oalsafi 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 ad118a5  CAMEL-14876: Fix race condition in the metadata.json due to 
unnecessary component model
     new 90c85ee  Merge pull request #3738 from omarsmak/CAMEL-14876
ad118a5 is described below

commit ad118a59bd76c1bb08df76b9cf8586546e6ba932
Author: Omar Al-Safi <omars...@gmail.com>
AuthorDate: Tue Apr 14 16:53:37 2020 +0200

    CAMEL-14876: Fix race condition in the metadata.json due to unnecessary 
component model
---
 .../src/generated/resources/metadata.json          |  1 +
 .../component/ComponentsDslMetadataRegistry.java   | 29 +---------------------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json 
b/core/camel-componentdsl/src/generated/resources/metadata.json
index 5b2695b..c03a8a0 100644
--- a/core/camel-componentdsl/src/generated/resources/metadata.json
+++ b/core/camel-componentdsl/src/generated/resources/metadata.json
@@ -7621,6 +7621,7 @@
     "lenientProperties": false,
     "javaType": "org.apache.camel.component.zookeeper.ZooKeeperComponent",
     "firstVersion": "2.9.0",
+    "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-zookeeper",
     "version": "3.3.0-SNAPSHOT"
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistry.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistry.java
index 36980e1..8971262 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistry.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistry.java
@@ -78,7 +78,7 @@ public class ComponentsDslMetadataRegistry {
 
     public boolean addComponentToMetadataAndSyncMetadataFile(final 
ComponentModel componentModel, final String key) {
         // put the component into the cache
-        componentsCache.put(key, new ModifiedComponentModel(componentModel));
+        componentsCache.put(key, componentModel);
 
         return syncMetadataFile();
     }
@@ -123,31 +123,4 @@ public class ComponentsDslMetadataRegistry {
             throw new IOError(e);
         }
     }
-
-    private static class ModifiedComponentModel extends ComponentModel {
-        public ModifiedComponentModel(final ComponentModel componentModel) {
-            name = componentModel.getName();
-            title = componentModel.getTitle();
-            description = componentModel.getDescription();
-            firstVersion = componentModel.getFirstVersion();
-            javaType = componentModel.getJavaType();
-            label = componentModel.getLabel();
-            deprecated = componentModel.isDeprecated();
-            deprecationNote = componentModel.getDeprecationNote();
-            scheme = componentModel.getScheme();
-            extendsScheme = componentModel.getExtendsScheme();
-            alternativeSchemes = componentModel.getAlternativeSchemes();
-            syntax = componentModel.getSyntax();
-            alternativeSyntax = componentModel.getAlternativeSyntax();
-            async = componentModel.isAsync();
-            consumerOnly = componentModel.isConsumerOnly();
-            producerOnly = componentModel.isProducerOnly();
-            lenientProperties = componentModel.isLenientProperties();
-            verifiers = componentModel.getVerifiers();
-            groupId = componentModel.getGroupId();
-            artifactId = componentModel.getArtifactId();
-            version = componentModel.getVersion();
-        }
-    }
-
 }