This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit bd62a49e83b3062a81ad2eb7a053e9a8c06a89a8
Author: Luca Burgazzoli <lburgazz...@gmail.com>
AuthorDate: Mon Mar 8 12:36:50 2021 +0100
dsl: remove support for the old route definition loader
---
.../core/deployment/CamelContextProcessor.java | 3 ---
.../quarkus/core/deployment/CamelProcessor.java | 9 +------
.../spi/CamelRoutesLoaderBuildItems.java | 15 -----------
.../camel/quarkus/core/CamelContextRecorder.java | 3 ---
.../apache/camel/quarkus/core/CamelRecorder.java | 5 ----
.../camel/quarkus/core/FastCamelContext.java | 9 +++----
.../xml/io/deployment/XmlIoProcessor.java | 10 --------
.../quarkus/component/xml/io/XmlIoRecorder.java | 30 ----------------------
.../camel/quarkus/main/CoreMainXmlIoTest.java | 4 +--
.../camel/quarkus/main/CoreMainXmlJaxbTest.java | 4 +--
10 files changed, 9 insertions(+), 83 deletions(-)
diff --git
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextProcessor.java
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextProcessor.java
index ba6822a..8ca5dba 100644
---
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextProcessor.java
+++
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextProcessor.java
@@ -37,7 +37,6 @@ import
org.apache.camel.quarkus.core.deployment.spi.CamelModelJAXBContextFactory
import
org.apache.camel.quarkus.core.deployment.spi.CamelModelToXMLDumperBuildItem;
import org.apache.camel.quarkus.core.deployment.spi.CamelRegistryBuildItem;
import
org.apache.camel.quarkus.core.deployment.spi.CamelRoutesBuilderClassBuildItem;
-import
org.apache.camel.quarkus.core.deployment.spi.CamelRoutesLoaderBuildItems;
import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBuildItem;
import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeTaskBuildItem;
import
org.apache.camel.quarkus.core.deployment.spi.CamelStartupStepRecorderBuildItem;
@@ -72,7 +71,6 @@ public class CamelContextProcessor {
CamelRegistryBuildItem registry,
CamelTypeConverterRegistryBuildItem typeConverterRegistry,
CamelModelJAXBContextFactoryBuildItem modelJAXBContextFactory,
- CamelRoutesLoaderBuildItems.Xml xmlLoader,
CamelModelToXMLDumperBuildItem modelDumper,
CamelFactoryFinderResolverBuildItem factoryFinderResolver,
List<CamelContextCustomizerBuildItem> customizers,
@@ -83,7 +81,6 @@ public class CamelContextProcessor {
registry.getRegistry(),
typeConverterRegistry.getRegistry(),
modelJAXBContextFactory.getContextFactory(),
- xmlLoader.getLoader(),
modelDumper.getValue(),
factoryFinderResolver.getFactoryFinderResolver(),
startupStepRecorder.getValue(),
diff --git
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
index fa257da..e37c200 100644
---
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
+++
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
@@ -52,7 +52,6 @@ import
org.apache.camel.quarkus.core.deployment.spi.CamelFactoryFinderResolverBu
import
org.apache.camel.quarkus.core.deployment.spi.CamelModelJAXBContextFactoryBuildItem;
import
org.apache.camel.quarkus.core.deployment.spi.CamelModelToXMLDumperBuildItem;
import
org.apache.camel.quarkus.core.deployment.spi.CamelRoutesBuilderClassBuildItem;
-import
org.apache.camel.quarkus.core.deployment.spi.CamelRoutesLoaderBuildItems;
import org.apache.camel.quarkus.core.deployment.spi.CamelServiceBuildItem;
import org.apache.camel.quarkus.core.deployment.spi.CamelServiceDestination;
import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilter;
@@ -151,6 +150,7 @@ class CamelProcessor {
true,
"META-INF/services/org/apache/camel/*",
"META-INF/services/org/apache/camel/routes-loader/*",
+ "META-INF/services/org/apache/camel/resource-resolver/*",
"META-INF/services/org/apache/camel/invoke-on-header/*",
"META-INF/services/org/apache/camel/management/*",
"META-INF/services/org/apache/camel/model/*",
@@ -269,13 +269,6 @@ class CamelProcessor {
@Overridable
@BuildStep
@Record(value = ExecutionTime.STATIC_INIT, optional = true)
- public CamelRoutesLoaderBuildItems.Xml createXMLRoutesLoader(CamelRecorder
recorder) {
- return new
CamelRoutesLoaderBuildItems.Xml(recorder.newDisabledXMLRoutesDefinitionLoader());
- }
-
- @Overridable
- @BuildStep
- @Record(value = ExecutionTime.STATIC_INIT, optional = true)
public CamelModelToXMLDumperBuildItem createModelToXMLDumper(CamelRecorder
recorder) {
return new
CamelModelToXMLDumperBuildItem(recorder.newDisabledModelToXMLDumper());
}
diff --git
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRoutesLoaderBuildItems.java
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRoutesLoaderBuildItems.java
index 898fe1e..71cee44 100644
---
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRoutesLoaderBuildItems.java
+++
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRoutesLoaderBuildItems.java
@@ -19,7 +19,6 @@ package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.SimpleBuildItem;
import io.quarkus.runtime.RuntimeValue;
import org.apache.camel.quarkus.core.RegistryRoutesLoader;
-import org.apache.camel.spi.XMLRoutesDefinitionLoader;
public final class CamelRoutesLoaderBuildItems {
private CamelRoutesLoaderBuildItems() {
@@ -40,18 +39,4 @@ public final class CamelRoutesLoaderBuildItems {
}
}
- /**
- * Holds the {@link XMLRoutesDefinitionLoader} instance.
- */
- public static final class Xml extends SimpleBuildItem {
- private final RuntimeValue<XMLRoutesDefinitionLoader> value;
-
- public Xml(RuntimeValue<XMLRoutesDefinitionLoader> value) {
- this.value = value;
- }
-
- public RuntimeValue<XMLRoutesDefinitionLoader> getLoader() {
- return value;
- }
- }
}
diff --git
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
index 247b6b1..c73e8f7 100644
---
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
+++
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
@@ -31,7 +31,6 @@ import org.apache.camel.spi.ModelToXMLDumper;
import org.apache.camel.spi.Registry;
import org.apache.camel.spi.StartupStepRecorder;
import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.spi.XMLRoutesDefinitionLoader;
@Recorder
public class CamelContextRecorder {
@@ -39,7 +38,6 @@ public class CamelContextRecorder {
RuntimeValue<Registry> registry,
RuntimeValue<TypeConverterRegistry> typeConverterRegistry,
RuntimeValue<ModelJAXBContextFactory> contextFactory,
- RuntimeValue<XMLRoutesDefinitionLoader> xmlLoader,
RuntimeValue<ModelToXMLDumper> xmlModelDumper,
RuntimeValue<FactoryFinderResolver> factoryFinderResolver,
RuntimeValue<StartupStepRecorder> startupStepRecorder,
@@ -50,7 +48,6 @@ public class CamelContextRecorder {
FastCamelContext context = new FastCamelContext(
factoryFinderResolver.getValue(),
version,
- xmlLoader.getValue(),
xmlModelDumper.getValue());
context.setDefaultExtension(RuntimeCamelCatalog.class, () -> new
CamelRuntimeCatalog(config.runtimeCatalog));
diff --git
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
index f8830a7..d4997d4 100644
---
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
+++
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
@@ -32,7 +32,6 @@ import org.apache.camel.spi.Registry;
import org.apache.camel.spi.StartupStepRecorder;
import org.apache.camel.spi.TypeConverterLoader;
import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.spi.XMLRoutesDefinitionLoader;
import org.apache.camel.support.startup.DefaultStartupStepRecorder;
@Recorder
@@ -97,10 +96,6 @@ public class CamelRecorder {
return new RuntimeValue<>(new DisabledModelJAXBContextFactory());
}
- public RuntimeValue<XMLRoutesDefinitionLoader>
newDisabledXMLRoutesDefinitionLoader() {
- return new RuntimeValue<>(new DisabledXMLRoutesDefinitionLoader());
- }
-
public RuntimeValue<ModelToXMLDumper> newDisabledModelToXMLDumper() {
return new RuntimeValue<>(new DisabledModelToXMLDumper());
}
diff --git
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
index a035c07..61908a8 100644
---
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
+++
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
@@ -64,6 +64,7 @@ import org.apache.camel.impl.engine.DefaultNodeIdFactory;
import org.apache.camel.impl.engine.DefaultPackageScanClassResolver;
import org.apache.camel.impl.engine.DefaultPackageScanResourceResolver;
import org.apache.camel.impl.engine.DefaultReactiveExecutor;
+import org.apache.camel.impl.engine.DefaultResourceLoader;
import org.apache.camel.impl.engine.DefaultRouteController;
import org.apache.camel.impl.engine.DefaultRouteFactory;
import org.apache.camel.impl.engine.DefaultRoutesLoader;
@@ -142,6 +143,7 @@ import org.apache.camel.spi.ProcessorFactory;
import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.spi.ReactiveExecutor;
import org.apache.camel.spi.Registry;
+import org.apache.camel.spi.ResourceLoader;
import org.apache.camel.spi.RestBindingJaxbDataFormatFactory;
import org.apache.camel.spi.RestRegistryFactory;
import org.apache.camel.spi.RouteController;
@@ -167,16 +169,13 @@ import org.apache.camel.util.ObjectHelper;
public class FastCamelContext extends AbstractCamelContext implements
CatalogCamelContext, ModelCamelContext {
private final String version;
- private final XMLRoutesDefinitionLoader xmlLoader;
private final ModelToXMLDumper modelDumper;
private Model model;
- public FastCamelContext(FactoryFinderResolver factoryFinderResolver,
String version, XMLRoutesDefinitionLoader xmlLoader,
- ModelToXMLDumper modelDumper) {
+ public FastCamelContext(FactoryFinderResolver factoryFinderResolver,
String version, ModelToXMLDumper modelDumper) {
super(false);
this.version = version;
- this.xmlLoader = xmlLoader;
this.modelDumper = modelDumper;
this.model = new FastModel(this);
@@ -418,7 +417,7 @@ public class FastCamelContext extends AbstractCamelContext
implements CatalogCam
@Override
protected XMLRoutesDefinitionLoader createXMLRoutesDefinitionLoader() {
- return xmlLoader;
+ return new DisabledXMLRoutesDefinitionLoader();
}
@Override
diff --git
a/extensions-core/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java
b/extensions-core/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java
index 6c63686..2c22dbe 100644
---
a/extensions-core/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java
+++
b/extensions-core/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java
@@ -17,12 +17,8 @@
package org.apache.camel.quarkus.component.xml.io.deployment;
import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.CapabilityBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import org.apache.camel.quarkus.component.xml.io.XmlIoRecorder;
-import
org.apache.camel.quarkus.core.deployment.spi.CamelRoutesLoaderBuildItems;
import org.apache.camel.quarkus.support.common.CamelCapabilities;
class XmlIoProcessor {
@@ -37,10 +33,4 @@ class XmlIoProcessor {
CapabilityBuildItem capability() {
return new CapabilityBuildItem(CamelCapabilities.XML);
}
-
- @BuildStep
- @Record(value = ExecutionTime.STATIC_INIT, optional = true)
- CamelRoutesLoaderBuildItems.Xml xmlLoader(XmlIoRecorder recorder) {
- return new
CamelRoutesLoaderBuildItems.Xml(recorder.newIoXMLRoutesDefinitionLoader());
- }
}
diff --git
a/extensions-core/xml-io/runtime/src/main/java/org/apache/camel/quarkus/component/xml/io/XmlIoRecorder.java
b/extensions-core/xml-io/runtime/src/main/java/org/apache/camel/quarkus/component/xml/io/XmlIoRecorder.java
deleted file mode 100644
index 7eeb5e6..0000000
---
a/extensions-core/xml-io/runtime/src/main/java/org/apache/camel/quarkus/component/xml/io/XmlIoRecorder.java
+++ /dev/null
@@ -1,30 +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.quarkus.component.xml.io;
-
-import io.quarkus.runtime.RuntimeValue;
-import io.quarkus.runtime.annotations.Recorder;
-import org.apache.camel.spi.XMLRoutesDefinitionLoader;
-import org.apache.camel.xml.in.ModelParserXMLRoutesDefinitionLoader;
-
-@Recorder
-public class XmlIoRecorder {
-
- public RuntimeValue<XMLRoutesDefinitionLoader>
newIoXMLRoutesDefinitionLoader() {
- return new RuntimeValue<>(new ModelParserXMLRoutesDefinitionLoader());
- }
-}
diff --git
a/integration-tests/main-xml-io/src/test/java/org/apache/camel/quarkus/main/CoreMainXmlIoTest.java
b/integration-tests/main-xml-io/src/test/java/org/apache/camel/quarkus/main/CoreMainXmlIoTest.java
index b731df8..1956ad0 100644
---
a/integration-tests/main-xml-io/src/test/java/org/apache/camel/quarkus/main/CoreMainXmlIoTest.java
+++
b/integration-tests/main-xml-io/src/test/java/org/apache/camel/quarkus/main/CoreMainXmlIoTest.java
@@ -27,7 +27,7 @@ import io.restassured.path.json.JsonPath;
import org.apache.camel.dsl.xml.io.XmlRoutesBuilderLoader;
import org.apache.camel.quarkus.core.DisabledModelJAXBContextFactory;
import org.apache.camel.quarkus.core.DisabledModelToXMLDumper;
-import org.apache.camel.xml.in.ModelParserXMLRoutesDefinitionLoader;
+import org.apache.camel.quarkus.core.DisabledXMLRoutesDefinitionLoader;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -50,7 +50,7 @@ public class CoreMainXmlIoTest {
assertThat(p.getString("xml-model-factory")).isEqualTo(DisabledModelJAXBContextFactory.class.getName());
assertThat(p.getString("xml-routes-definitions-loader"))
-
.isEqualTo(ModelParserXMLRoutesDefinitionLoader.class.getName());
+ .isEqualTo(DisabledXMLRoutesDefinitionLoader.class.getName());
assertThat(p.getString("xml-routes-builder-loader"))
.isEqualTo(XmlRoutesBuilderLoader.class.getName());
diff --git
a/integration-tests/main-xml-jaxb/src/test/java/org/apache/camel/quarkus/main/CoreMainXmlJaxbTest.java
b/integration-tests/main-xml-jaxb/src/test/java/org/apache/camel/quarkus/main/CoreMainXmlJaxbTest.java
index fc9f0f3..3db41ed 100644
---
a/integration-tests/main-xml-jaxb/src/test/java/org/apache/camel/quarkus/main/CoreMainXmlJaxbTest.java
+++
b/integration-tests/main-xml-jaxb/src/test/java/org/apache/camel/quarkus/main/CoreMainXmlJaxbTest.java
@@ -24,7 +24,7 @@ import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
import org.apache.camel.dsl.xml.io.XmlRoutesBuilderLoader;
-import org.apache.camel.xml.in.ModelParserXMLRoutesDefinitionLoader;
+import org.apache.camel.quarkus.core.DisabledXMLRoutesDefinitionLoader;
import org.apache.camel.xml.jaxb.DefaultModelJAXBContextFactory;
import org.apache.camel.xml.jaxb.JaxbModelToXMLDumper;
import org.junit.jupiter.api.Test;
@@ -48,7 +48,7 @@ public class CoreMainXmlJaxbTest {
assertThat(p.getString("xml-model-factory")).isEqualTo(DefaultModelJAXBContextFactory.class.getName());
assertThat(p.getString("xml-routes-definitions-loader"))
-
.isEqualTo(ModelParserXMLRoutesDefinitionLoader.class.getName());
+ .isEqualTo(DisabledXMLRoutesDefinitionLoader.class.getName());
assertThat(p.getString("xml-routes-builder-loader"))
.isEqualTo(XmlRoutesBuilderLoader.class.getName());
