You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by oa...@apache.org on 2020/02/05 09:57:17 UTC
[camel] branch master updated: Remove unnecessary
EnrichedComponentModel class
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 21149cf Remove unnecessary EnrichedComponentModel class
new d251c38 Merge branch 'master' of github.com:apache/camel
21149cf is described below
commit 21149cff270d792ee8b5fbcd65dae1d345fe7f26
Author: Omar Al-Safi <om...@gmail.com>
AuthorDate: Wed Feb 5 10:55:43 2020 +0100
Remove unnecessary EnrichedComponentModel class
---
.../camel/maven/packaging/ComponentDslMojo.java | 17 +++----
.../camel/maven/packaging/dsl/DslHelper.java | 3 +-
.../ComponentDslBuilderFactoryGenerator.java | 9 ++--
.../ComponentDslInnerBuilderGenerator.java | 8 +--
.../ComponentDslInnerImplBuilderGenerator.java | 6 +--
.../ComponentsBuilderFactoryGenerator.java | 7 +--
.../component/ComponentsDslMetadataRegistry.java | 26 +++++-----
.../dsl/component/EnrichedComponentModel.java | 58 ----------------------
.../ComponentDslBuilderFactoryGeneratorTest.java | 2 +-
.../ComponentDslInnerBuilderGeneratorTest.java | 2 +-
.../ComponentDslInnerImplBuilderGeneratorTest.java | 2 +-
.../ComponentsBuilderFactoryGeneratorTest.java | 2 +-
.../ComponentsDslMetadataRegistryTest.java | 2 +-
13 files changed, 43 insertions(+), 101 deletions(-)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
index 4d28503..b19533c 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
@@ -34,7 +34,6 @@ import java.util.stream.Collectors;
import org.apache.camel.maven.packaging.dsl.component.ComponentDslBuilderFactoryGenerator;
import org.apache.camel.maven.packaging.dsl.component.ComponentsBuilderFactoryGenerator;
import org.apache.camel.maven.packaging.dsl.component.ComponentsDslMetadataRegistry;
-import org.apache.camel.maven.packaging.dsl.component.EnrichedComponentModel;
import org.apache.camel.tooling.model.ComponentModel;
import org.apache.camel.tooling.model.JsonMapper;
import org.apache.camel.tooling.util.PackageHelper;
@@ -177,21 +176,21 @@ public class ComponentDslMojo extends AbstractGeneratorMojo {
List<ComponentModel> compModels = grModels.get(componentClass);
for(ComponentModel model: compModels) {
// if more than one, we have a component class with multiple components aliases
- createComponentDsl(new EnrichedComponentModel(model, compModels.size() > 1));
+ createComponentDsl(model);
}
}
}
}
- private void createComponentDsl(final EnrichedComponentModel model) throws MojoExecutionException, MojoFailureException {
+ private void createComponentDsl(final ComponentModel model) throws MojoExecutionException, MojoFailureException {
// Create components DSL factories
final ComponentDslBuilderFactoryGenerator componentDslBuilderFactoryGenerator = syncAndGenerateSpecificComponentsBuilderFactories(model);
// Update components metadata
final ComponentsDslMetadataRegistry componentsDslMetadataRegistry = syncAndUpdateComponentsMetadataRegistry(model, componentDslBuilderFactoryGenerator.getGeneratedClassName());
- final Set<EnrichedComponentModel> componentCachedModels = new TreeSet<>(
- Comparator.comparing(EnrichedComponentModel::getScheme)
+ final Set<ComponentModel> componentCachedModels = new TreeSet<>(
+ Comparator.comparing(ComponentModel::getScheme)
);
componentCachedModels.addAll(componentsDslMetadataRegistry.getComponentCacheFromMemory().values());
@@ -202,7 +201,7 @@ public class ComponentDslMojo extends AbstractGeneratorMojo {
syncPomFile(componentDslPom, componentsDslMetadataRegistry.getComponentCacheFromMemory());
}
- private ComponentDslBuilderFactoryGenerator syncAndGenerateSpecificComponentsBuilderFactories(final EnrichedComponentModel componentModel) throws MojoFailureException {
+ private ComponentDslBuilderFactoryGenerator syncAndGenerateSpecificComponentsBuilderFactories(final ComponentModel componentModel) throws MojoFailureException {
final ComponentDslBuilderFactoryGenerator componentDslBuilderFactoryGenerator = ComponentDslBuilderFactoryGenerator.generateClass(componentModel, projectClassLoader, componentsDslPackageName);
writeSourceIfChanged(componentDslBuilderFactoryGenerator.printClassAsString(), componentsDslFactoriesPackageName.replace('.', '/'), componentDslBuilderFactoryGenerator.getGeneratedClassName() + ".java", sourcesOutputDir);
@@ -211,7 +210,7 @@ public class ComponentDslMojo extends AbstractGeneratorMojo {
return componentDslBuilderFactoryGenerator;
}
- private ComponentsDslMetadataRegistry syncAndUpdateComponentsMetadataRegistry(final EnrichedComponentModel componentModel, final String className) {
+ private ComponentsDslMetadataRegistry syncAndUpdateComponentsMetadataRegistry(final ComponentModel componentModel, final String className) {
final ComponentsDslMetadataRegistry componentsDslMetadataRegistry = new ComponentsDslMetadataRegistry(sourcesOutputDir.toPath().resolve(componentsDslFactoriesPackageName.replace('.', '/')).toFile(), componentsMetadata);
componentsDslMetadataRegistry.addComponentToMetadataAndSyncMetadataFile(componentModel, className);
@@ -220,14 +219,14 @@ public class ComponentDslMojo extends AbstractGeneratorMojo {
return componentsDslMetadataRegistry;
}
- private void syncAndGenerateComponentsBuilderFactories(final Set<EnrichedComponentModel> componentCachedModels) throws MojoFailureException {
+ private void syncAndGenerateComponentsBuilderFactories(final Set<ComponentModel> componentCachedModels) throws MojoFailureException {
final ComponentsBuilderFactoryGenerator componentsBuilderFactoryGenerator = ComponentsBuilderFactoryGenerator.generateClass(componentCachedModels, projectClassLoader, componentsDslPackageName);
writeSourceIfChanged(componentsBuilderFactoryGenerator.printClassAsString(), componentsDslPackageName.replace('.', '/'), componentsBuilderFactoryGenerator.getGeneratedClassName() + ".java", sourcesOutputDir);
getLog().info("Regenerate " + componentsBuilderFactoryGenerator.getGeneratedClassName());
}
- private void syncPomFile(final File pomFile, final Map<String, EnrichedComponentModel> componentsModels) throws MojoExecutionException {
+ private void syncPomFile(final File pomFile, final Map<String, ComponentModel> componentsModels) throws MojoExecutionException {
final String startMainComponentImportMarker = "<!-- START: camel components import -->";
final String endMainComponentImportMarker = "<!-- END: camel components import -->";
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java
index 3634949..149f5f7 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java
@@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.camel.maven.packaging.dsl.component.EnrichedComponentModel;
import org.apache.camel.tooling.model.ComponentModel;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.CaseUtils;
@@ -109,7 +108,7 @@ public final class DslHelper {
return desc;
}
- public static String generateComponentBuilderClassName(final EnrichedComponentModel componentModel, final String suffix) {
+ public static String generateComponentBuilderClassName(final ComponentModel componentModel, final String suffix) {
return StringUtils.capitalize(toCamelCaseLower(componentModel.getScheme()))
+ "Component" + suffix;
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
index 4a7b215..55f72dc 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
@@ -22,6 +22,7 @@ import javax.annotation.Generated;
import org.apache.camel.maven.packaging.ComponentDslMojo;
import org.apache.camel.maven.packaging.dsl.DslHelper;
+import org.apache.camel.tooling.model.ComponentModel;
import org.apache.camel.tooling.util.srcgen.JavaClass;
import org.apache.camel.tooling.util.srcgen.Method;
@@ -31,13 +32,13 @@ import org.apache.camel.tooling.util.srcgen.Method;
public final class ComponentDslBuilderFactoryGenerator {
private static final String BUILDER_FACTORY_SUFFIX = "BuilderFactory";
- private final EnrichedComponentModel componentModel;
+ private final ComponentModel componentModel;
private final String packageName;
private JavaClass javaClass;
private ComponentDslInnerBuilderGenerator componentDslInnerBuilderGenerator;
private ComponentDslInnerImplBuilderGenerator componentDslInnerImplBuilderGenerator;
- private ComponentDslBuilderFactoryGenerator(final EnrichedComponentModel componentModel, final ClassLoader classLoader, final String packageName) {
+ private ComponentDslBuilderFactoryGenerator(final ComponentModel componentModel, final ClassLoader classLoader, final String packageName) {
this.componentModel = componentModel;
this.packageName = packageName;
@@ -46,14 +47,14 @@ public final class ComponentDslBuilderFactoryGenerator {
generateJavaClass();
}
- public static ComponentDslBuilderFactoryGenerator generateClass(final EnrichedComponentModel componentModel, final ClassLoader classLoader, final String componentDslPackageName) {
+ public static ComponentDslBuilderFactoryGenerator generateClass(final ComponentModel componentModel, final ClassLoader classLoader, final String componentDslPackageName) {
Objects.requireNonNull(componentModel);
Objects.requireNonNull(classLoader);
return new ComponentDslBuilderFactoryGenerator(componentModel, classLoader, componentDslPackageName);
}
- public static String getExpectedGeneratedClassName(final EnrichedComponentModel componentModel) {
+ public static String getExpectedGeneratedClassName(final ComponentModel componentModel) {
return DslHelper.generateComponentBuilderClassName(componentModel, BUILDER_FACTORY_SUFFIX);
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGenerator.java
index 1fdad90..39b9e52 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGenerator.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGenerator.java
@@ -30,20 +30,20 @@ public final class ComponentDslInnerBuilderGenerator {
private static final String BUILDER_SUFFIX = "Builder";
private final JavaClass javaClass;
- private final EnrichedComponentModel componentModel;
+ private final ComponentModel componentModel;
- private ComponentDslInnerBuilderGenerator(final JavaClass javaClass, final EnrichedComponentModel componentModel) {
+ private ComponentDslInnerBuilderGenerator(final JavaClass javaClass, final ComponentModel componentModel) {
this.javaClass = javaClass;
this.componentModel = componentModel;
// generate class
generateJavaClass();
}
- public static ComponentDslInnerBuilderGenerator generateClass(final JavaClass javaClass, final EnrichedComponentModel componentModel) {
+ public static ComponentDslInnerBuilderGenerator generateClass(final JavaClass javaClass, final ComponentModel componentModel) {
return new ComponentDslInnerBuilderGenerator(javaClass, componentModel);
}
- public static String getExpectedGeneratedInterfaceName(final EnrichedComponentModel componentModel) {
+ public static String getExpectedGeneratedInterfaceName(final ComponentModel componentModel) {
return DslHelper.generateComponentBuilderClassName(componentModel, BUILDER_SUFFIX);
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGenerator.java
index 7f8c324..a968603 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGenerator.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGenerator.java
@@ -29,10 +29,10 @@ public final class ComponentDslInnerImplBuilderGenerator {
private final JavaClass javaClass;
- private final EnrichedComponentModel componentModel;
+ private final ComponentModel componentModel;
private final String classBuilderName;
- private ComponentDslInnerImplBuilderGenerator(final JavaClass javaClass, final EnrichedComponentModel componentModel, final String interfaceBuilderName) {
+ private ComponentDslInnerImplBuilderGenerator(final JavaClass javaClass, final ComponentModel componentModel, final String interfaceBuilderName) {
this.javaClass = javaClass;
this.componentModel = componentModel;
this.classBuilderName = interfaceBuilderName;
@@ -40,7 +40,7 @@ public final class ComponentDslInnerImplBuilderGenerator {
generateJavaClass();
}
- public static ComponentDslInnerImplBuilderGenerator generateClass(final JavaClass javaClass, final EnrichedComponentModel componentModel, final String classBuilderName) {
+ public static ComponentDslInnerImplBuilderGenerator generateClass(final JavaClass javaClass, final ComponentModel componentModel, final String classBuilderName) {
return new ComponentDslInnerImplBuilderGenerator(javaClass, componentModel, classBuilderName);
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java
index 4b50fee..5d663b0 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java
@@ -24,6 +24,7 @@ import javax.annotation.Generated;
import org.apache.camel.maven.packaging.AbstractGeneratorMojo;
import org.apache.camel.maven.packaging.ComponentDslMojo;
import org.apache.camel.maven.packaging.dsl.DslHelper;
+import org.apache.camel.tooling.model.ComponentModel;
import org.apache.camel.tooling.util.srcgen.JavaClass;
import org.apache.camel.tooling.util.srcgen.Method;
@@ -35,10 +36,10 @@ public final class ComponentsBuilderFactoryGenerator {
private static final String CLASS_NAME = "ComponentsBuilderFactory";
private final String packageName;
- private final Set<EnrichedComponentModel> componentModels;
+ private final Set<ComponentModel> componentModels;
private JavaClass javaClass;
- private ComponentsBuilderFactoryGenerator(final Set<EnrichedComponentModel> componentModels, final ClassLoader classLoader, final String packageName) {
+ private ComponentsBuilderFactoryGenerator(final Set<ComponentModel> componentModels, final ClassLoader classLoader, final String packageName) {
this.componentModels = componentModels;
this.packageName = packageName;
@@ -47,7 +48,7 @@ public final class ComponentsBuilderFactoryGenerator {
generateJavaClass();
}
- public static ComponentsBuilderFactoryGenerator generateClass(final Set<EnrichedComponentModel> componentModels, final ClassLoader classLoader, final String packageName) {
+ public static ComponentsBuilderFactoryGenerator generateClass(final Set<ComponentModel> componentModels, final ClassLoader classLoader, final String packageName) {
Objects.requireNonNull(componentModels);
Objects.requireNonNull(classLoader);
Objects.requireNonNull(packageName);
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 82ba88d..8e1efd2 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
@@ -27,6 +27,7 @@ import java.util.TreeSet;
import java.util.stream.Collectors;
import org.apache.camel.maven.packaging.dsl.DslHelper;
+import org.apache.camel.tooling.model.ComponentModel;
import org.apache.camel.tooling.model.JsonMapper;
import org.apache.camel.tooling.util.FileUtil;
import org.apache.camel.tooling.util.Strings;
@@ -39,7 +40,7 @@ import static org.apache.camel.tooling.util.PackageHelper.loadText;
*/
public class ComponentsDslMetadataRegistry {
- private Map<String, EnrichedComponentModel> componentsCache;
+ private Map<String, ComponentModel> componentsCache;
private Set<String> componentsDslFactories;
private File metadataFile;
@@ -50,16 +51,16 @@ public class ComponentsDslMetadataRegistry {
this.metadataFile = metadataFile;
}
- private Map<String, EnrichedComponentModel> loadMetadataFileIntoMap(final File metadataFile) {
+ private Map<String, ComponentModel> loadMetadataFileIntoMap(final File metadataFile) {
String json = loadJson(metadataFile);
- JsonObject obj = JsonMapper.deserialize(json);
- Map<String, EnrichedComponentModel> models = new TreeMap<>();
- obj.forEach((k, v) -> models.put(k, loadModel((JsonObject) v)));
+ JsonObject jsonObject = JsonMapper.deserialize(json);
+ Map<String, ComponentModel> models = new TreeMap<>();
+ jsonObject.forEach((jsonKey, jsonValue) -> models.put(jsonKey, loadModel((JsonObject) jsonValue)));
return models;
}
- private EnrichedComponentModel loadModel(JsonObject json) {
- EnrichedComponentModel model = new EnrichedComponentModel();
+ private ComponentModel loadModel(JsonObject json) {
+ final ComponentModel model = new ComponentModel();
JsonMapper.parseComponentModel(json, model);
return model;
}
@@ -70,7 +71,7 @@ public class ComponentsDslMetadataRegistry {
.collect(Collectors.toCollection(TreeSet::new));
}
- public void addComponentToMetadataAndSyncMetadataFile(final EnrichedComponentModel componentModel, final String key) {
+ public void addComponentToMetadataAndSyncMetadataFile(final ComponentModel componentModel, final String key) {
// put the component into the cache
componentsCache.put(key, new ModifiedComponentModel(componentModel));
@@ -97,7 +98,7 @@ public class ComponentsDslMetadataRegistry {
private void writeCacheIntoMetadataFile() {
JsonObject json = new JsonObject();
- componentsCache.forEach((k, v) -> json.put(k, JsonMapper.asJsonObject(v).get("component")));
+ componentsCache.forEach((componentKey, componentModel) -> json.put(componentKey, JsonMapper.asJsonObject(componentModel).get("component")));
final String jsonText = JsonMapper.serialize(json);
try {
FileUtil.updateFile(metadataFile.toPath(), jsonText);
@@ -106,7 +107,7 @@ public class ComponentsDslMetadataRegistry {
}
}
- public Map<String, EnrichedComponentModel> getComponentCacheFromMemory() {
+ public Map<String, ComponentModel> getComponentCacheFromMemory() {
return componentsCache;
}
@@ -118,8 +119,8 @@ public class ComponentsDslMetadataRegistry {
}
}
- private static class ModifiedComponentModel extends EnrichedComponentModel {
- public ModifiedComponentModel(final EnrichedComponentModel componentModel) {
+ private static class ModifiedComponentModel extends ComponentModel {
+ public ModifiedComponentModel(final ComponentModel componentModel) {
name = componentModel.getName();
title = componentModel.getTitle();
description = componentModel.getDescription();
@@ -141,7 +142,6 @@ public class ComponentsDslMetadataRegistry {
groupId = componentModel.getGroupId();
artifactId = componentModel.getArtifactId();
version = componentModel.getVersion();
- isAlias = componentModel.isAlias();
}
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/EnrichedComponentModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/EnrichedComponentModel.java
deleted file mode 100644
index cb9ee9c..0000000
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/EnrichedComponentModel.java
+++ /dev/null
@@ -1,58 +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.maven.packaging.dsl.component;
-
-import org.apache.camel.tooling.model.ComponentModel;
-
-public class EnrichedComponentModel extends ComponentModel {
- protected boolean isAlias;
-
- public EnrichedComponentModel() {
- }
-
- public EnrichedComponentModel(final ComponentModel componentModel, final boolean isAlias) {
- 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();
- options.addAll(componentModel.getComponentOptions());
- endpointOptions.addAll(componentModel.getEndpointOptions());
-
- this.isAlias = isAlias;
- }
-
- public boolean isAlias() {
- return isAlias;
- }
-}
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGeneratorTest.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGeneratorTest.java
index 9201e90..3b9da9d 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGeneratorTest.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGeneratorTest.java
@@ -33,7 +33,7 @@ class ComponentDslBuilderFactoryGeneratorTest {
@Test
public void testIfCreateJavaClassCorrectly() throws IOException {
final String json = PackageHelper.loadText(new File(Objects.requireNonNull(getClass().getClassLoader().getResource("json/test_component.json")).getFile()));
- final EnrichedComponentModel componentModel = new EnrichedComponentModel(JsonMapper.generateComponentModel(json), false);
+ final ComponentModel componentModel = JsonMapper.generateComponentModel(json);
final ComponentDslBuilderFactoryGenerator componentDslBuilderFactoryGenerator = ComponentDslBuilderFactoryGenerator.generateClass(componentModel, getClass().getClassLoader(), "org.apache.camel.builder.component");
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGeneratorTest.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGeneratorTest.java
index 03f36d0..aadad3c 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGeneratorTest.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGeneratorTest.java
@@ -35,7 +35,7 @@ class ComponentDslInnerBuilderGeneratorTest {
@Test
public void testIfCreatesAllPropertiesCorrectly() throws IOException {
final String json = PackageHelper.loadText(new File(Objects.requireNonNull(getClass().getClassLoader().getResource("json/test_component.json")).getFile()));
- final EnrichedComponentModel componentModel = new EnrichedComponentModel(JsonMapper.generateComponentModel(json), false);
+ final ComponentModel componentModel = JsonMapper.generateComponentModel(json);
final JavaClass javaClass = new JavaClass();
javaClass.setName("TestClass");
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGeneratorTest.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGeneratorTest.java
index 84e38c6..63d1ced 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGeneratorTest.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGeneratorTest.java
@@ -35,7 +35,7 @@ class ComponentDslInnerImplBuilderGeneratorTest {
@Test
public void testIfCreatesImplClassCorrectly() throws IOException {
final String json = PackageHelper.loadText(new File(Objects.requireNonNull(getClass().getClassLoader().getResource("json/test_component.json")).getFile()));
- final EnrichedComponentModel componentModel = new EnrichedComponentModel(JsonMapper.generateComponentModel(json), false);
+ final ComponentModel componentModel = JsonMapper.generateComponentModel(json);
final JavaClass javaClass = new JavaClass();
javaClass.setName("TestClass");
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGeneratorTest.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGeneratorTest.java
index ea459fc..bb0445b 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGeneratorTest.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGeneratorTest.java
@@ -35,7 +35,7 @@ class ComponentsBuilderFactoryGeneratorTest {
@Test
public void testIfCreatesClassCorrectly() throws IOException {
final String json = PackageHelper.loadText(new File(Objects.requireNonNull(getClass().getClassLoader().getResource("json/test_component.json")).getFile()));
- final EnrichedComponentModel componentModel = new EnrichedComponentModel(JsonMapper.generateComponentModel(json), false);
+ final ComponentModel componentModel = JsonMapper.generateComponentModel(json);
final ComponentsBuilderFactoryGenerator componentsBuilderFactoryGenerator = ComponentsBuilderFactoryGenerator.generateClass(new HashSet<>(Collections.singletonList(componentModel)),
getClass().getClassLoader(),
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistryTest.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistryTest.java
index d3273d7..2f346e8 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistryTest.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistryTest.java
@@ -41,7 +41,7 @@ class ComponentsDslMetadataRegistryTest {
final File classesDir = FileSystems.getDefault().getPath(".").resolve("src/test/java/org/apache/camel/maven/packaging/dsl/component").toFile();
- final EnrichedComponentModel componentModel = new EnrichedComponentModel(JsonMapper.generateComponentModel(json), false);
+ final ComponentModel componentModel = JsonMapper.generateComponentModel(json);
final ComponentsDslMetadataRegistry componentsDslMetadataRegistry = new ComponentsDslMetadataRegistry(classesDir, metadata);
// check for size