This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 73faf80b629697d05dc3b08e28c6631ca14ee271 Author: Croway <[email protected]> AuthorDate: Thu Oct 19 17:47:28 2023 +0200 Align generated folder structure to Camel one --- .../transformer/aws2-s3-application-cloudevents | 0 .../{datatype => }/transformer/application-cloudevents-json | 0 .../{datatype => }/transformer/http-application-cloudevents | 0 .../apache/camel/impl/engine/DefaultTransformerResolver.java | 4 ++-- .../{datatype => }/transformer/application-octet-stream | 0 .../org/apache/camel/{datatype => }/transformer/text-plain | 0 .../camel/impl/engine/DefaultTransformerRegistryTest.java | 2 +- .../camel/impl/engine/DefaultTransformerResolverTest.java | 2 +- .../processor/transformer/StringDataTypeTransformerTest.java | 2 +- .../org/apache/camel/{datatype => }/transformer/foo-json | 0 .../org/apache/camel/{datatype => }/transformer/lowercase | 0 .../org/apache/camel/{datatype => }/transformer/uppercase | 0 .../org/apache/camel/maven/packaging/SpiGeneratorMojo.java | 12 +++--------- 13 files changed, 8 insertions(+), 14 deletions(-) diff --git a/components/camel-aws/camel-aws2-s3/src/generated/resources/META-INF/services/org/apache/camel/datatype/transformer/aws2-s3-application-cloudevents b/components/camel-aws/camel-aws2-s3/src/generated/resources/META-INF/services/org/apache/camel/transformer/aws2-s3-application-cloudevents similarity index 100% rename from components/camel-aws/camel-aws2-s3/src/generated/resources/META-INF/services/org/apache/camel/datatype/transformer/aws2-s3-application-cloudevents rename to components/camel-aws/camel-aws2-s3/src/generated/resources/META-INF/services/org/apache/camel/transformer/aws2-s3-application-cloudevents diff --git a/components/camel-cloudevents/src/generated/resources/META-INF/services/org/apache/camel/datatype/transformer/application-cloudevents-json b/components/camel-cloudevents/src/generated/resources/META-INF/services/org/apache/camel/transformer/application-cloudevents-json similarity index 100% rename from components/camel-cloudevents/src/generated/resources/META-INF/services/org/apache/camel/datatype/transformer/application-cloudevents-json rename to components/camel-cloudevents/src/generated/resources/META-INF/services/org/apache/camel/transformer/application-cloudevents-json diff --git a/components/camel-cloudevents/src/generated/resources/META-INF/services/org/apache/camel/datatype/transformer/http-application-cloudevents b/components/camel-cloudevents/src/generated/resources/META-INF/services/org/apache/camel/transformer/http-application-cloudevents similarity index 100% rename from components/camel-cloudevents/src/generated/resources/META-INF/services/org/apache/camel/datatype/transformer/http-application-cloudevents rename to components/camel-cloudevents/src/generated/resources/META-INF/services/org/apache/camel/transformer/http-application-cloudevents diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTransformerResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTransformerResolver.java index 6099e79ca31..28939133adf 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTransformerResolver.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTransformerResolver.java @@ -30,11 +30,11 @@ import org.slf4j.LoggerFactory; /** * The default implementation of {@link org.apache.camel.spi.TransformerResolver} which tries to find components by * using the URI scheme prefix and searching for a file of the URI scheme name in the - * <b>META-INF/services/org/apache/camel/datatype/transformer/</b> directory on the classpath. + * <b>META-INF/services/org/apache/camel/transformer/</b> directory on the classpath. */ public class DefaultTransformerResolver implements TransformerResolver<TransformerKey> { - public static final String DATA_TYPE_TRANSFORMER_RESOURCE_PATH = "META-INF/services/org/apache/camel/datatype/transformer/"; + public static final String DATA_TYPE_TRANSFORMER_RESOURCE_PATH = "META-INF/services/org/apache/camel/transformer/"; private static final Logger LOG = LoggerFactory.getLogger(DefaultTransformerResolver.class); diff --git a/core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/datatype/transformer/application-octet-stream b/core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/transformer/application-octet-stream similarity index 100% rename from core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/datatype/transformer/application-octet-stream rename to core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/transformer/application-octet-stream diff --git a/core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/datatype/transformer/text-plain b/core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/transformer/text-plain similarity index 100% rename from core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/datatype/transformer/text-plain rename to core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/transformer/text-plain diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultTransformerRegistryTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultTransformerRegistryTest.java index a7de0a24a40..7cdecd343cc 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultTransformerRegistryTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultTransformerRegistryTest.java @@ -30,7 +30,7 @@ class DefaultTransformerRegistryTest { @Test public void shouldLookupDefaultDataTypeConverters() throws Exception { - Transformer transformer = dataTypeRegistry.resolveTransformer(new TransformerKey("plain-text")); + Transformer transformer = dataTypeRegistry.resolveTransformer(new TransformerKey("text-plain")); Assertions.assertNotNull(transformer); Assertions.assertEquals(StringDataTypeTransformer.class, transformer.getClass()); transformer = dataTypeRegistry.resolveTransformer(new TransformerKey("application-octet-stream")); diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultTransformerResolverTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultTransformerResolverTest.java index b7b17d9d354..1f62d78b2d1 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultTransformerResolverTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultTransformerResolverTest.java @@ -51,7 +51,7 @@ class DefaultTransformerResolverTest { @Test public void shouldResolveDataTypeTransformers() throws Exception { - Transformer transformer = resolver.resolve(new TransformerKey("plain-text"), camelContext); + Transformer transformer = resolver.resolve(new TransformerKey("text-plain"), camelContext); Assertions.assertNotNull(transformer); Assertions.assertEquals(StringDataTypeTransformer.class, transformer.getClass()); diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/transformer/StringDataTypeTransformerTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/transformer/StringDataTypeTransformerTest.java index 25b70416c06..76f44f16681 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/transformer/StringDataTypeTransformerTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/transformer/StringDataTypeTransformerTest.java @@ -76,7 +76,7 @@ public class StringDataTypeTransformerTest { @Test public void shouldLookupDataType() throws Exception { DefaultTransformerRegistry dataTypeRegistry = new DefaultTransformerRegistry(camelContext); - Transformer transformer = dataTypeRegistry.resolveTransformer(new TransformerKey("plain-text")); + Transformer transformer = dataTypeRegistry.resolveTransformer(new TransformerKey("text-plain")); Assertions.assertNotNull(transformer); } diff --git a/core/camel-core/src/test/resources/META-INF/services/org/apache/camel/datatype/transformer/foo-json b/core/camel-core/src/test/resources/META-INF/services/org/apache/camel/transformer/foo-json similarity index 100% rename from core/camel-core/src/test/resources/META-INF/services/org/apache/camel/datatype/transformer/foo-json rename to core/camel-core/src/test/resources/META-INF/services/org/apache/camel/transformer/foo-json diff --git a/core/camel-core/src/test/resources/META-INF/services/org/apache/camel/datatype/transformer/lowercase b/core/camel-core/src/test/resources/META-INF/services/org/apache/camel/transformer/lowercase similarity index 100% rename from core/camel-core/src/test/resources/META-INF/services/org/apache/camel/datatype/transformer/lowercase rename to core/camel-core/src/test/resources/META-INF/services/org/apache/camel/transformer/lowercase diff --git a/core/camel-core/src/test/resources/META-INF/services/org/apache/camel/datatype/transformer/uppercase b/core/camel-core/src/test/resources/META-INF/services/org/apache/camel/transformer/uppercase similarity index 100% rename from core/camel-core/src/test/resources/META-INF/services/org/apache/camel/datatype/transformer/uppercase rename to core/camel-core/src/test/resources/META-INF/services/org/apache/camel/transformer/uppercase diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java index 085f09204b4..75be1f2a493 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java @@ -145,17 +145,13 @@ public class SpiGeneratorMojo extends AbstractGeneratorMojo { pvals = annotation.value().asString(); } for (String pval : pvals.split(",")) { + pval = sanitizeFileName(pval); StringBuilder sb = new StringBuilder(); sb.append("# ").append(GENERATED_MSG).append(NL).append("class=").append(className).append(NL); if (ServiceFactory.JDK_SERVICE.equals(sfa.value().asString())) { updateResource(resourcesOutputDir.toPath(), "META-INF/services/org/apache/camel/" + pval, sb.toString()); - } else if ("transformer".equals(sfa.value().asString())) { - pval = cleanUpValue(pval); - updateResource(resourcesOutputDir.toPath(), - "META-INF/services/org/apache/camel/datatype/" + sfa.value().asString() + "/" + pval, - sb.toString()); } else { updateResource(resourcesOutputDir.toPath(), "META-INF/services/org/apache/camel/" + sfa.value().asString() + "/" + pval, @@ -166,10 +162,8 @@ public class SpiGeneratorMojo extends AbstractGeneratorMojo { } } - private String cleanUpValue(String pval) { - return pval - .replace(":", "-") - .replace("+", "-"); + private String sanitizeFileName(String fileName) { + return fileName.replaceAll("[^A-Za-z0-9-]", "-"); } private boolean isLocal(String className) {
