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 dae05206704 CAMEL-20062: fix the split package warning in Camel Quarkus
dae05206704 is described below
commit dae0520670493fc8a1a271dcb6b7d9e523ec93a2
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Mon Nov 6 11:27:11 2023 +0100
CAMEL-20062: fix the split package warning in Camel Quarkus
---
.../component/vertx/common/CamelVertxCommonBulkConverterLoader.java | 2 +-
.../src/main/java/org/apache/camel/spi/TypeConverterRegistry.java | 1 -
.../main/java/org/apache/camel/{converter => spi}/TypeConvertible.java | 2 +-
.../java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java | 2 +-
.../main/java/org/apache/camel/impl/converter/ConverterStatistics.java | 2 +-
.../java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java | 2 +-
.../main/java/org/apache/camel/impl/converter/TypeResolverHelper.java | 2 +-
.../test/java/org/apache/camel/impl/CustomBulkTypeConvertersTest.java | 2 +-
.../apache/camel/converter/stream/StreamCacheBulkConverterLoader.java | 2 +-
.../apache/camel/converter/jaxp/CamelXmlJaxpBulkConverterLoader.java | 2 +-
.../apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java | 2 +-
11 files changed, 10 insertions(+), 11 deletions(-)
diff --git
a/components/camel-vertx/camel-vertx-common/src/generated/java/org/apache/camel/component/vertx/common/CamelVertxCommonBulkConverterLoader.java
b/components/camel-vertx/camel-vertx-common/src/generated/java/org/apache/camel/component/vertx/common/CamelVertxCommonBulkConverterLoader.java
index 5fac5f40cb1..6c19cde8a8a 100644
---
a/components/camel-vertx/camel-vertx-common/src/generated/java/org/apache/camel/component/vertx/common/CamelVertxCommonBulkConverterLoader.java
+++
b/components/camel-vertx/camel-vertx-common/src/generated/java/org/apache/camel/component/vertx/common/CamelVertxCommonBulkConverterLoader.java
@@ -9,7 +9,7 @@ import org.apache.camel.Ordered;
import org.apache.camel.TypeConversionException;
import org.apache.camel.TypeConverterLoaderException;
import org.apache.camel.TypeConverter;
-import org.apache.camel.converter.TypeConvertible;
+import org.apache.camel.spi.TypeConvertible;
import org.apache.camel.spi.BulkTypeConverters;
import org.apache.camel.spi.TypeConverterLoader;
import org.apache.camel.spi.TypeConverterRegistry;
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
b/core/camel-api/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
index ea51bfc0ca8..dba59e4d347 100644
---
a/core/camel-api/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
+++
b/core/camel-api/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
@@ -21,7 +21,6 @@ import org.apache.camel.LoggingLevel;
import org.apache.camel.StaticService;
import org.apache.camel.TypeConverter;
import org.apache.camel.TypeConverterExists;
-import org.apache.camel.converter.TypeConvertible;
/**
* Registry for type converters.
diff --git
a/core/camel-api/src/main/java/org/apache/camel/converter/TypeConvertible.java
b/core/camel-api/src/main/java/org/apache/camel/spi/TypeConvertible.java
similarity index 99%
rename from
core/camel-api/src/main/java/org/apache/camel/converter/TypeConvertible.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/TypeConvertible.java
index 833fd5a3dd7..d179a630280 100644
---
a/core/camel-api/src/main/java/org/apache/camel/converter/TypeConvertible.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/TypeConvertible.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.converter;
+package org.apache.camel.spi;
import java.util.Objects;
diff --git
a/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java
b/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java
index f1a6f3ce1f7..ed59bef03e0 100644
---
a/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java
+++
b/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java
@@ -9,7 +9,7 @@ import org.apache.camel.Ordered;
import org.apache.camel.TypeConversionException;
import org.apache.camel.TypeConverterLoaderException;
import org.apache.camel.TypeConverter;
-import org.apache.camel.converter.TypeConvertible;
+import org.apache.camel.spi.TypeConvertible;
import org.apache.camel.spi.BulkTypeConverters;
import org.apache.camel.spi.TypeConverterLoader;
import org.apache.camel.spi.TypeConverterRegistry;
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/ConverterStatistics.java
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/ConverterStatistics.java
index 8bee3d9199f..83726e62638 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/ConverterStatistics.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/ConverterStatistics.java
@@ -21,7 +21,7 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.TypeConverter;
-import org.apache.camel.converter.TypeConvertible;
+import org.apache.camel.spi.TypeConvertible;
import org.apache.camel.spi.TypeConverterRegistry;
/**
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java
index 2d67b971f4c..b536d9cb644 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java
@@ -33,7 +33,7 @@ import org.apache.camel.TypeConverter;
import org.apache.camel.TypeConverterExists;
import org.apache.camel.TypeConverterExistsException;
import org.apache.camel.converter.ObjectConverter;
-import org.apache.camel.converter.TypeConvertible;
+import org.apache.camel.spi.TypeConvertible;
import org.apache.camel.spi.BulkTypeConverters;
import org.apache.camel.spi.CamelLogger;
import org.apache.camel.spi.Injector;
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeResolverHelper.java
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeResolverHelper.java
index 73c2d655543..fa0fd19171d 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeResolverHelper.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeResolverHelper.java
@@ -20,7 +20,7 @@ package org.apache.camel.impl.converter;
import java.util.Map;
import org.apache.camel.TypeConverter;
-import org.apache.camel.converter.TypeConvertible;
+import org.apache.camel.spi.TypeConvertible;
/**
* Helper methods for resolving the type conversions. This is an internal API
and not meant for public usages.
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/CustomBulkTypeConvertersTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/CustomBulkTypeConvertersTest.java
index 5ce2b24b252..d884a95572e 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/CustomBulkTypeConvertersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/CustomBulkTypeConvertersTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.TypeConversionException;
import org.apache.camel.TypeConverter;
-import org.apache.camel.converter.TypeConvertible;
+import org.apache.camel.spi.TypeConvertible;
import org.apache.camel.spi.BulkTypeConverters;
import org.junit.jupiter.api.Test;
diff --git
a/core/camel-support/src/generated/java/org/apache/camel/converter/stream/StreamCacheBulkConverterLoader.java
b/core/camel-support/src/generated/java/org/apache/camel/converter/stream/StreamCacheBulkConverterLoader.java
index ebc49489f68..6db9dd1a005 100644
---
a/core/camel-support/src/generated/java/org/apache/camel/converter/stream/StreamCacheBulkConverterLoader.java
+++
b/core/camel-support/src/generated/java/org/apache/camel/converter/stream/StreamCacheBulkConverterLoader.java
@@ -9,7 +9,7 @@ import org.apache.camel.Ordered;
import org.apache.camel.TypeConversionException;
import org.apache.camel.TypeConverterLoaderException;
import org.apache.camel.TypeConverter;
-import org.apache.camel.converter.TypeConvertible;
+import org.apache.camel.spi.TypeConvertible;
import org.apache.camel.spi.BulkTypeConverters;
import org.apache.camel.spi.TypeConverterLoader;
import org.apache.camel.spi.TypeConverterRegistry;
diff --git
a/core/camel-xml-jaxp/src/generated/java/org/apache/camel/converter/jaxp/CamelXmlJaxpBulkConverterLoader.java
b/core/camel-xml-jaxp/src/generated/java/org/apache/camel/converter/jaxp/CamelXmlJaxpBulkConverterLoader.java
index c802bf26e54..0d66697aed4 100644
---
a/core/camel-xml-jaxp/src/generated/java/org/apache/camel/converter/jaxp/CamelXmlJaxpBulkConverterLoader.java
+++
b/core/camel-xml-jaxp/src/generated/java/org/apache/camel/converter/jaxp/CamelXmlJaxpBulkConverterLoader.java
@@ -9,7 +9,7 @@ import org.apache.camel.Ordered;
import org.apache.camel.TypeConversionException;
import org.apache.camel.TypeConverterLoaderException;
import org.apache.camel.TypeConverter;
-import org.apache.camel.converter.TypeConvertible;
+import org.apache.camel.spi.TypeConvertible;
import org.apache.camel.spi.BulkTypeConverters;
import org.apache.camel.spi.TypeConverterLoader;
import org.apache.camel.spi.TypeConverterRegistry;
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
index 8ef0b6c9009..aa0a306e49c 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
@@ -186,7 +186,7 @@ public class TypeConverterLoaderGeneratorMojo extends
AbstractGeneratorMojo {
writer.append("import org.apache.camel.TypeConversionException;\n");
writer.append("import
org.apache.camel.TypeConverterLoaderException;\n");
writer.append("import org.apache.camel.TypeConverter;\n");
- writer.append("import org.apache.camel.converter.TypeConvertible;\n");
+ writer.append("import org.apache.camel.spi.TypeConvertible;\n");
writer.append("import org.apache.camel.spi.BulkTypeConverters;\n");
writer.append("import org.apache.camel.spi.TypeConverterLoader;\n");
writer.append("import org.apache.camel.spi.TypeConverterRegistry;\n");
