This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 2fa67951c6663f38b229f041b2355cffc705956b
Author: aldettinger <aldettin...@gmail.com>
AuthorDate: Mon Feb 13 17:21:32 2023 +0100
xml-io: Remove the use of XMLRoutesDefinitionLoader deprecated class #4564
---
.../core/DisabledXMLRoutesDefinitionLoader.java | 39 ----------------------
.../camel/quarkus/core/FastCamelContext.java | 6 ----
.../camel/quarkus/main/CoreMainXmlIoResource.java | 2 +-
.../camel/quarkus/main/CoreMainXmlIoTest.java | 3 --
.../quarkus/main/CoreMainXmlJaxbResource.java | 1 -
.../camel/quarkus/main/CoreMainXmlJaxbTest.java | 3 --
.../camel/quarkus/main/CoreMainResource.java | 2 --
.../apache/camel/quarkus/main/CoreMainTest.java | 3 --
8 files changed, 1 insertion(+), 58 deletions(-)
diff --git
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java
deleted file mode 100644
index 155549cc8b..0000000000
---
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java
+++ /dev/null
@@ -1,39 +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.core;
-
-import java.io.InputStream;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.XMLRoutesDefinitionLoader;
-
-public class DisabledXMLRoutesDefinitionLoader implements
XMLRoutesDefinitionLoader {
- @Override
- public Object loadRoutesDefinition(CamelContext context, InputStream
inputStream) throws Exception {
- throw new UnsupportedOperationException("Please add a dependency to
camel-quarkus-xml-io-dsl");
- }
-
- @Override
- public Object loadRouteTemplatesDefinition(CamelContext context,
InputStream inputStream) throws Exception {
- throw new UnsupportedOperationException("Please add a dependency to
camel-quarkus-xml-io-dsl");
- }
-
- @Override
- public Object loadRestsDefinition(CamelContext context, InputStream
inputStream) throws Exception {
- throw new UnsupportedOperationException("Please add a dependency to
camel-quarkus-xml-io-dsl");
- }
-}
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 91302bf64d..53a0547167 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
@@ -46,7 +46,6 @@ import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.spi.Registry;
import org.apache.camel.spi.ShutdownStrategy;
import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.spi.XMLRoutesDefinitionLoader;
import org.apache.camel.util.IOHelper;
public class FastCamelContext extends DefaultCamelContext implements
CatalogCamelContext, ModelCamelContext {
@@ -154,11 +153,6 @@ public class FastCamelContext extends DefaultCamelContext
implements CatalogCame
return pc;
}
- @Override
- protected XMLRoutesDefinitionLoader createXMLRoutesDefinitionLoader() {
- return new DisabledXMLRoutesDefinitionLoader();
- }
-
@Override
protected ModelToXMLDumper createModelToXMLDumper() {
return modelDumper;
diff --git
a/integration-tests/main-xml-io/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlIoResource.java
b/integration-tests/main-xml-io/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlIoResource.java
index 5446e0648e..51cb960d23 100644
---
a/integration-tests/main-xml-io/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlIoResource.java
+++
b/integration-tests/main-xml-io/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlIoResource.java
@@ -73,7 +73,7 @@ public class CoreMainXmlIoResource {
main.getCamelContext().getRoutes().forEach(route ->
routes.add(route.getId()));
return Json.createObjectBuilder()
- .add("xml-routes-definitions-loader",
camelContext.getXMLRoutesDefinitionLoader().getClass().getName())
+ .add("xml-routes-definitions-loader",
camelContext.getRoutesLoader().getClass().getName())
.add("xml-routes-builder-loader",
camelContext.getBootstrapFactoryFinder(RoutesBuilderLoader.FACTORY_PATH)
.findClass(XmlRoutesBuilderLoader.EXTENSION).get().getName())
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 e3fa0cb339..d5817b722c 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,6 @@ 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.quarkus.core.DisabledXMLRoutesDefinitionLoader;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
@@ -50,8 +49,6 @@ public class CoreMainXmlIoTest {
assertThat(p.getString("xml-model-dumper")).isEqualTo(DisabledModelToXMLDumper.class.getName());
assertThat(p.getString("xml-model-factory")).isEqualTo(DisabledModelJAXBContextFactory.class.getName());
- assertThat(p.getString("xml-routes-definitions-loader"))
- .isEqualTo(DisabledXMLRoutesDefinitionLoader.class.getName());
assertThat(p.getString("xml-routes-builder-loader"))
.isEqualTo(XmlRoutesBuilderLoader.class.getName());
diff --git
a/integration-tests/main-xml-jaxb/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlJaxbResource.java
b/integration-tests/main-xml-jaxb/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlJaxbResource.java
index a710b46cfe..1aace8265a 100644
---
a/integration-tests/main-xml-jaxb/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlJaxbResource.java
+++
b/integration-tests/main-xml-jaxb/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlJaxbResource.java
@@ -59,7 +59,6 @@ public class CoreMainXmlJaxbResource {
main.getCamelContext().getRoutes().forEach(route ->
routes.add(route.getId()));
return Json.createObjectBuilder()
- .add("xml-routes-definitions-loader",
camelContext.getXMLRoutesDefinitionLoader().getClass().getName())
.add("xml-routes-builder-loader",
camelContext.getBootstrapFactoryFinder(RoutesBuilderLoader.FACTORY_PATH)
.findClass(XmlRoutesBuilderLoader.EXTENSION).get().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 89170e52b0..ebf67c77f5 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
@@ -28,7 +28,6 @@ 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.quarkus.core.DisabledXMLRoutesDefinitionLoader;
import org.apache.camel.xml.jaxb.DefaultModelJAXBContextFactory;
import org.apache.camel.xml.jaxb.JaxbModelToXMLDumper;
import org.junit.jupiter.api.Test;
@@ -53,8 +52,6 @@ public class CoreMainXmlJaxbTest {
assertThat(p.getString("xml-model-dumper")).isEqualTo(JaxbModelToXMLDumper.class.getName());
assertThat(p.getString("xml-model-factory")).isEqualTo(DefaultModelJAXBContextFactory.class.getName());
- assertThat(p.getString("xml-routes-definitions-loader"))
- .isEqualTo(DisabledXMLRoutesDefinitionLoader.class.getName());
assertThat(p.getString("xml-routes-builder-loader"))
.isEqualTo(XmlRoutesBuilderLoader.class.getName());
diff --git
a/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java
b/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java
index 3c7c97b9d3..d10e717c06 100644
---
a/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java
+++
b/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java
@@ -114,7 +114,6 @@ public class CoreMainResource {
if (main.getRoutesCollector() instanceof CamelMainRoutesCollector) {
CamelMainRoutesCollector crc = (CamelMainRoutesCollector)
main.getRoutesCollector();
collector.add("type-registry",
crc.getRegistryRoutesLoader().getClass().getName());
- collector.add("type-xml",
camelContext.getXMLRoutesDefinitionLoader().getClass().getName());
}
JsonObjectBuilder dataformatsInRegistry = Json.createObjectBuilder();
@@ -138,7 +137,6 @@ public class CoreMainResource {
}
return Json.createObjectBuilder()
- .add("xml-loader",
camelContext.getXMLRoutesDefinitionLoader().getClass().getName())
.add("xml-model-dumper",
camelContext.getModelToXMLDumper().getClass().getName())
.add("routes-collector", collector)
.add("listeners", listeners)
diff --git
a/integration-tests/main/src/test/java/org/apache/camel/quarkus/main/CoreMainTest.java
b/integration-tests/main/src/test/java/org/apache/camel/quarkus/main/CoreMainTest.java
index c27441a553..2000319f6e 100644
---
a/integration-tests/main/src/test/java/org/apache/camel/quarkus/main/CoreMainTest.java
+++
b/integration-tests/main/src/test/java/org/apache/camel/quarkus/main/CoreMainTest.java
@@ -27,7 +27,6 @@ import io.restassured.http.ContentType;
import io.restassured.path.json.JsonPath;
import io.restassured.response.Response;
import org.apache.camel.quarkus.core.DisabledModelToXMLDumper;
-import org.apache.camel.quarkus.core.DisabledXMLRoutesDefinitionLoader;
import org.apache.camel.quarkus.core.RegistryRoutesLoaders;
import org.apache.camel.quarkus.it.support.mainlistener.CustomMainListener;
import org.apache.camel.reactive.vertx.VertXReactiveExecutor;
@@ -78,12 +77,10 @@ public class CoreMainTest {
.body()
.jsonPath();
-
assertThat(p.getString("xml-loader")).isEqualTo(DisabledXMLRoutesDefinitionLoader.class.getName());
assertThat(p.getString("xml-model-dumper")).isEqualTo(DisabledModelToXMLDumper.class.getName());
assertThat(p.getString("routes-collector.type")).isEqualTo(CamelMainRoutesCollector.class.getName());
assertThat(p.getString("routes-collector.type-registry")).isEqualTo(RegistryRoutesLoaders.Default.class.getName());
-
assertThat(p.getString("routes-collector.type-xml")).isEqualTo(DisabledXMLRoutesDefinitionLoader.class.getName());
assertThat(p.getList("listeners", String.class))
.containsAnyOf(CamelMainEventBridge.class.getName(),
CustomMainListener.class.getName());
