You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/12/21 19:10:14 UTC
(camel) branch main updated: (chores) catalog: remove string literal duplications
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new ff7d68d51f8 (chores) catalog: remove string literal duplications
ff7d68d51f8 is described below
commit ff7d68d51f8078f89be6ab1c977bf2eabc0c7c71
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Dec 21 15:06:45 2023 -0300
(chores) catalog: remove string literal duplications
---
.../catalog/CamelCatalogJSonSchemaResolver.java | 13 ++++----
.../apache/camel/catalog/DefaultCamelCatalog.java | 38 +++++++++++++---------
.../org/apache/camel/maven/RouteCoverageMojo.java | 7 ++--
.../apache/camel/parser/RouteBuilderParser.java | 8 +++--
.../decorators/ElasticsearchSegmentDecorator.java | 2 +-
5 files changed, 39 insertions(+), 29 deletions(-)
diff --git a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalogJSonSchemaResolver.java b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalogJSonSchemaResolver.java
index 0c74e10fd22..b9c25c0c8f8 100644
--- a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalogJSonSchemaResolver.java
+++ b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalogJSonSchemaResolver.java
@@ -29,6 +29,7 @@ import org.apache.camel.catalog.impl.CatalogHelper;
public class CamelCatalogJSonSchemaResolver implements JSonSchemaResolver {
private static final String MODEL_DIR = "org/apache/camel/catalog/models";
+ public static final String EXTENSION = ".json";
private final CamelCatalog camelCatalog;
private ClassLoader classLoader;
@@ -57,7 +58,7 @@ public class CamelCatalogJSonSchemaResolver implements JSonSchemaResolver {
@Override
public String getComponentJSonSchema(String name) {
- final String file = camelCatalog.getRuntimeProvider().getComponentJSonSchemaDirectory() + "/" + name + ".json";
+ final String file = camelCatalog.getRuntimeProvider().getComponentJSonSchemaDirectory() + "/" + name + EXTENSION;
final String fromVersionManager = loadResourceFromVersionManager(file);
if (fromVersionManager != null) {
@@ -77,7 +78,7 @@ public class CamelCatalogJSonSchemaResolver implements JSonSchemaResolver {
@Override
public String getDataFormatJSonSchema(String name) {
- final String file = camelCatalog.getRuntimeProvider().getDataFormatJSonSchemaDirectory() + "/" + name + ".json";
+ final String file = camelCatalog.getRuntimeProvider().getDataFormatJSonSchemaDirectory() + "/" + name + EXTENSION;
final String fromVersionManager = loadResourceFromVersionManager(file);
if (fromVersionManager != null) {
@@ -102,14 +103,14 @@ public class CamelCatalogJSonSchemaResolver implements JSonSchemaResolver {
name = "bean";
}
- final String file = camelCatalog.getRuntimeProvider().getLanguageJSonSchemaDirectory() + "/" + name + ".json";
+ final String file = camelCatalog.getRuntimeProvider().getLanguageJSonSchemaDirectory() + "/" + name + EXTENSION;
return loadResourceFromVersionManager(file);
}
@Override
public String getModelJSonSchema(String name) {
- final String file = MODEL_DIR + "/" + name + ".json";
+ final String file = MODEL_DIR + "/" + name + EXTENSION;
return loadResourceFromVersionManager(file);
}
@@ -123,7 +124,7 @@ public class CamelCatalogJSonSchemaResolver implements JSonSchemaResolver {
@Override
public String getOtherJSonSchema(String name) {
- final String file = camelCatalog.getRuntimeProvider().getOtherJSonSchemaDirectory() + "/" + name + ".json";
+ final String file = camelCatalog.getRuntimeProvider().getOtherJSonSchemaDirectory() + "/" + name + EXTENSION;
return loadResourceFromVersionManager(file);
}
@@ -132,7 +133,7 @@ public class CamelCatalogJSonSchemaResolver implements JSonSchemaResolver {
if (className != null) {
String packageName = className.substring(0, className.lastIndexOf('.'));
packageName = packageName.replace('.', '/');
- final String path = packageName + "/" + fileName + ".json";
+ final String path = packageName + "/" + fileName + EXTENSION;
return loadResourceFromVersionManager(path);
}
diff --git a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index eb4d8e24048..81fea9dd310 100644
--- a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -57,6 +57,12 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
private static final String SCHEMAS_XML = "org/apache/camel/catalog/schemas";
private static final String MAIN_DIR = "org/apache/camel/catalog/main";
private static final String BASE_RESOURCE_DIR = "org/apache/camel/catalog";
+ public static final String FIND_COMPONENT_NAMES = "findComponentNames";
+ public static final String LIST_COMPONENTS_AS_JSON = "listComponentsAsJson";
+ public static final String FIND_DATA_FORMAT_NAMES = "findDataFormatNames";
+ public static final String LIST_DATA_FORMATS_AS_JSON = "listDataFormatsAsJson";
+ public static final String FIND_LANGUAGE_NAMES = "findLanguageNames";
+ public static final String LIST_LANGUAGES_AS_JSON = "listLanguagesAsJson";
private final VersionHelper version = new VersionHelper();
@@ -102,12 +108,12 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
// inject CamelCatalog to the provider
this.runtimeProvider.setCamelCatalog(this);
// invalidate the cache
- cache.remove("findComponentNames");
- cache.remove("listComponentsAsJson");
- cache.remove("findDataFormatNames");
- cache.remove("listDataFormatsAsJson");
- cache.remove("findLanguageNames");
- cache.remove("listLanguagesAsJson");
+ cache.remove(FIND_COMPONENT_NAMES);
+ cache.remove(LIST_COMPONENTS_AS_JSON);
+ cache.remove(FIND_DATA_FORMAT_NAMES);
+ cache.remove(LIST_DATA_FORMATS_AS_JSON);
+ cache.remove(FIND_LANGUAGE_NAMES);
+ cache.remove(LIST_LANGUAGES_AS_JSON);
}
@Override
@@ -134,9 +140,9 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
public void addComponent(String name, String className) {
extraComponents.put(name, className);
// invalidate the cache
- cache.remove("findComponentNames");
+ cache.remove(FIND_COMPONENT_NAMES);
cache.remove("findComponentLabels");
- cache.remove("listComponentsAsJson");
+ cache.remove(LIST_COMPONENTS_AS_JSON);
}
@Override
@@ -151,9 +157,9 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
public void addDataFormat(String name, String className) {
extraDataFormats.put(name, className);
// invalidate the cache
- cache.remove("findDataFormatNames");
+ cache.remove(FIND_DATA_FORMAT_NAMES);
cache.remove("findDataFormatLabels");
- cache.remove("listDataFormatsAsJson");
+ cache.remove(LIST_DATA_FORMATS_AS_JSON);
}
@Override
@@ -198,7 +204,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
@Override
public List<String> findComponentNames() {
- return cache("findComponentNames", () -> Stream.of(runtimeProvider.findComponentNames(), extraComponents.keySet())
+ return cache(FIND_COMPONENT_NAMES, () -> Stream.of(runtimeProvider.findComponentNames(), extraComponents.keySet())
.flatMap(Collection::stream)
.sorted()
.toList());
@@ -206,7 +212,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
@Override
public List<String> findDataFormatNames() {
- return cache("findDataFormatNames", () -> Stream.of(runtimeProvider.findDataFormatNames(), extraDataFormats.keySet())
+ return cache(FIND_DATA_FORMAT_NAMES, () -> Stream.of(runtimeProvider.findDataFormatNames(), extraDataFormats.keySet())
.flatMap(Collection::stream)
.sorted()
.toList());
@@ -214,7 +220,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
@Override
public List<String> findLanguageNames() {
- return cache("findLanguageNames", runtimeProvider::findLanguageNames);
+ return cache(FIND_LANGUAGE_NAMES, runtimeProvider::findLanguageNames);
}
@Override
@@ -398,7 +404,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
@Override
public String listComponentsAsJson() {
- return cache("listComponentsAsJson", () -> JsonMapper.serialize(findComponentNames().stream()
+ return cache(LIST_COMPONENTS_AS_JSON, () -> JsonMapper.serialize(findComponentNames().stream()
.map(this::componentJSonSchema)
.map(JsonMapper::deserialize)
.map(o -> o.get("component"))
@@ -407,7 +413,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
@Override
public String listDataFormatsAsJson() {
- return cache("listDataFormatsAsJson", () -> JsonMapper.serialize(findDataFormatNames().stream()
+ return cache(LIST_DATA_FORMATS_AS_JSON, () -> JsonMapper.serialize(findDataFormatNames().stream()
.map(this::dataFormatJSonSchema)
.map(JsonMapper::deserialize)
.map(o -> o.get("dataformat"))
@@ -416,7 +422,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
@Override
public String listLanguagesAsJson() {
- return cache("listLanguagesAsJson", () -> JsonMapper.serialize(findLanguageNames().stream()
+ return cache(LIST_LANGUAGES_AS_JSON, () -> JsonMapper.serialize(findLanguageNames().stream()
.map(this::languageJSonSchema)
.map(JsonMapper::deserialize)
.map(o -> o.get("language"))
diff --git a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
index ac73690d4c3..fc3af32c3c2 100644
--- a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
+++ b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
@@ -76,6 +76,7 @@ import static org.apache.camel.catalog.common.CatalogHelper.stripRootPath;
@Mojo(name = "route-coverage", threadSafe = true)
public class RouteCoverageMojo extends AbstractExecMojo {
+ public static final String DESTINATION_DIR = "/target/camel-route-coverage";
/**
* The maven project.
*/
@@ -259,7 +260,7 @@ public class RouteCoverageMojo extends AbstractExecMojo {
throws MojoExecutionException {
try {
List<CoverageData> coverageData = RouteCoverageHelper
- .parseDumpRouteCoverageByRouteId(project.getBasedir() + "/target/camel-route-coverage", routeId);
+ .parseDumpRouteCoverageByRouteId(project.getBasedir() + DESTINATION_DIR, routeId);
if (coverageData.isEmpty()) {
getLog().warn("No route coverage data found for route: " + routeId
+ ". Make sure to enable route coverage in your unit tests and assign unique route ids to your routes. Also remember to run unit tests first.");
@@ -297,7 +298,7 @@ public class RouteCoverageMojo extends AbstractExecMojo {
// grab dump data for the route
try {
Map<String, List<CoverageData>> datas = RouteCoverageHelper
- .parseDumpRouteCoverageByClassAndTestMethod(project.getBasedir() + "/target/camel-route-coverage");
+ .parseDumpRouteCoverageByClassAndTestMethod(project.getBasedir() + DESTINATION_DIR);
if (datas.isEmpty()) {
getLog().warn("No route coverage data found"
+ ". Make sure to enable route coverage in your unit tests. Also remember to run unit tests first.");
@@ -356,7 +357,7 @@ public class RouteCoverageMojo extends AbstractExecMojo {
CoverageResultsProcessor processor = new CoverageResultsProcessor();
processor.writeCSS(cssPath);
processor.writeJS(jsPath);
- File xmlPath = new File(project.getBasedir() + "/target/camel-route-coverage");
+ File xmlPath = new File(project.getBasedir() + DESTINATION_DIR);
String out = processor.generateReport(project, xmlPath, htmlPath);
getLog().info(out);
} catch (Exception e) {
diff --git a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java
index 0fad0239fcc..bd26528d924 100644
--- a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java
+++ b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java
@@ -47,6 +47,8 @@ import org.jboss.forge.roaster.model.source.MethodSource;
*/
public final class RouteBuilderParser {
+ public static final String METHOD_NAME = "configure";
+
private RouteBuilderParser() {
}
@@ -286,7 +288,7 @@ public final class RouteBuilderParser {
CamelSimpleExpressionDetails detail = new CamelSimpleExpressionDetails();
detail.setFileName(fileName);
detail.setClassName(clazz.getQualifiedName());
- detail.setMethodName("configure");
+ detail.setMethodName(METHOD_NAME);
int line = findLineNumber(clazz.toUnformattedString(), result.getPosition());
if (line > -1) {
detail.setLineNumber(Integer.toString(line));
@@ -343,7 +345,7 @@ public final class RouteBuilderParser {
CamelCSimpleExpressionDetails detail = new CamelCSimpleExpressionDetails();
detail.setFileName(fileName);
detail.setClassName(clazz.getQualifiedName());
- detail.setMethodName("configure");
+ detail.setMethodName(METHOD_NAME);
int line = findLineNumber(clazz.toUnformattedString(), result.getPosition());
if (line > -1) {
detail.setLineNumber(Integer.toString(line));
@@ -390,7 +392,7 @@ public final class RouteBuilderParser {
CamelRouteDetails detail = new CamelRouteDetails();
detail.setFileName(fileName);
detail.setClassName(clazz.getQualifiedName());
- detail.setMethodName("configure");
+ detail.setMethodName(METHOD_NAME);
int line = findLineNumber(clazz.toUnformattedString(), result.getPosition());
if (line > -1) {
detail.setLineNumber(Integer.toString(line));
diff --git a/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/ElasticsearchSegmentDecorator.java b/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/ElasticsearchSegmentDecorator.java
index c73e702deae..382c61926d8 100644
--- a/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/ElasticsearchSegmentDecorator.java
+++ b/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/ElasticsearchSegmentDecorator.java
@@ -29,7 +29,7 @@ public class ElasticsearchSegmentDecorator extends AbstractSegmentDecorator {
@Override
public String getComponent() {
- return "elasticsearch";
+ return ELASTICSARCH_DB_TYPE;
}
@Override