From 81119ea0f5e944a96fe79715cd87c4fa93c9376b Mon Sep 17 00:00:00 2001 From: Andrus Adamchik Date: Sat, 25 Nov 2023 13:17:42 -0500 Subject: [PATCH] refactoring: combining Module and Provider for non-deprecated modules --- .../main/java/io/bootique/cxf/CxfModule.java | 18 ++++--- .../io/bootique/cxf/CxfModuleProvider.java | 15 ------ .../services/io.bootique.BQModuleProvider | 2 +- .../java/io/bootique/cxf/CxfModuleTest.java | 14 +++++ .../java/io/bootique/cxf/CxfJaxrsModule.java | 40 ++++++++++---- .../bootique/cxf/CxfJaxrsModuleProvider.java | 52 ------------------- .../services/io.bootique.BQModuleProvider | 2 +- ...viderTest.java => CxfJaxrsModuleTest.java} | 6 +-- .../cxf/jaxws/CxfJaxwsClientModule.java | 35 ++++++++++--- .../jaxws/CxfJaxwsClientModuleProvider.java | 26 ---------- .../services/io.bootique.BQModuleProvider | 2 +- ...derIT.java => CxfJaxwsClientModuleIT.java} | 6 +-- .../cxf/jaxws/CxfJaxwsServerModule.java | 37 ++++++++++--- .../jaxws/CxfJaxwsServerModuleProvider.java | 31 ----------- .../services/io.bootique.BQModuleProvider | 2 +- .../cxf/jaxws/CxfJaxwsServerModuleIT.java | 21 ++++++-- .../jaxws/CxfJaxwsServerModuleProviderIT.java | 29 ----------- 17 files changed, 140 insertions(+), 198 deletions(-) delete mode 100644 bootique-cxf-core/src/main/java/io/bootique/cxf/CxfModuleProvider.java create mode 100644 bootique-cxf-core/src/test/java/io/bootique/cxf/CxfModuleTest.java delete mode 100644 bootique-cxf-jaxrs/src/main/java/io/bootique/cxf/CxfJaxrsModuleProvider.java rename bootique-cxf-jaxrs/src/test/java/io/bootique/cxf/{CxfJaxrsModuleProviderTest.java => CxfJaxrsModuleTest.java} (83%) delete mode 100644 bootique-cxf-jaxws-client/src/main/java/io/bootique/cxf/jaxws/CxfJaxwsClientModuleProvider.java rename bootique-cxf-jaxws-client/src/test/java/io/bootique/cxf/jaxws/{CxfJaxwsClientModuleProviderIT.java => CxfJaxwsClientModuleIT.java} (83%) delete mode 100644 bootique-cxf-jaxws-server/src/main/java/io/bootique/cxf/jaxws/CxfJaxwsServerModuleProvider.java delete mode 100644 bootique-cxf-jaxws-server/src/test/java/io/bootique/cxf/jaxws/CxfJaxwsServerModuleProviderIT.java diff --git a/bootique-cxf-core/src/main/java/io/bootique/cxf/CxfModule.java b/bootique-cxf-core/src/main/java/io/bootique/cxf/CxfModule.java index 09b5d3d..3631113 100644 --- a/bootique-cxf-core/src/main/java/io/bootique/cxf/CxfModule.java +++ b/bootique-cxf-core/src/main/java/io/bootique/cxf/CxfModule.java @@ -1,13 +1,11 @@ package io.bootique.cxf; -import io.bootique.ConfigModule; +import io.bootique.BQModuleProvider; +import io.bootique.bootstrap.BuiltModule; import io.bootique.cxf.conf.BQBeanLocator; import io.bootique.cxf.conf.BqConfigurer; import io.bootique.cxf.conf.CustomConfigurer; -import io.bootique.di.Binder; -import io.bootique.di.Injector; -import io.bootique.di.Provides; -import io.bootique.di.TypeLiteral; +import io.bootique.di.*; import org.apache.cxf.Bus; import org.apache.cxf.configuration.ConfiguredBeanLocator; import org.apache.cxf.configuration.Configurer; @@ -17,12 +15,20 @@ import java.util.List; import java.util.Map; -public class CxfModule extends ConfigModule { +public class CxfModule implements BQModule, BQModuleProvider { public static CxfModuleExtender extend(Binder binder) { return new CxfModuleExtender(binder); } + @Override + public BuiltModule buildModule() { + return BuiltModule.of(this) + .provider(this) + .description("Integrates Apache CXF core") + .build(); + } + @Override public void configure(Binder binder) { CxfModule.extend(binder).initAllExtensions(); diff --git a/bootique-cxf-core/src/main/java/io/bootique/cxf/CxfModuleProvider.java b/bootique-cxf-core/src/main/java/io/bootique/cxf/CxfModuleProvider.java deleted file mode 100644 index 1469ced..0000000 --- a/bootique-cxf-core/src/main/java/io/bootique/cxf/CxfModuleProvider.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.bootique.cxf; - -import io.bootique.BQModuleProvider; -import io.bootique.bootstrap.BuiltModule; - -public class CxfModuleProvider implements BQModuleProvider { - - @Override - public BuiltModule buildModule() { - return BuiltModule.of(new CxfModule()) - .provider(this) - .description("Integrates Apache CXF core") - .build(); - } -} diff --git a/bootique-cxf-core/src/main/resources/META-INF/services/io.bootique.BQModuleProvider b/bootique-cxf-core/src/main/resources/META-INF/services/io.bootique.BQModuleProvider index 19a39cd..5abe4f2 100644 --- a/bootique-cxf-core/src/main/resources/META-INF/services/io.bootique.BQModuleProvider +++ b/bootique-cxf-core/src/main/resources/META-INF/services/io.bootique.BQModuleProvider @@ -1 +1 @@ -io.bootique.cxf.CxfModuleProvider \ No newline at end of file +io.bootique.cxf.CxfModule \ No newline at end of file diff --git a/bootique-cxf-core/src/test/java/io/bootique/cxf/CxfModuleTest.java b/bootique-cxf-core/src/test/java/io/bootique/cxf/CxfModuleTest.java new file mode 100644 index 0000000..7d8f1d0 --- /dev/null +++ b/bootique-cxf-core/src/test/java/io/bootique/cxf/CxfModuleTest.java @@ -0,0 +1,14 @@ +package io.bootique.cxf; + +import io.bootique.junit5.BQModuleProviderChecker; +import io.bootique.junit5.BQTest; +import org.junit.jupiter.api.Test; + +@BQTest +public class CxfModuleTest { + + @Test + public void testAutoLoading() { + BQModuleProviderChecker.testAutoLoadable(CxfModule.class); + } +} diff --git a/bootique-cxf-jaxrs/src/main/java/io/bootique/cxf/CxfJaxrsModule.java b/bootique-cxf-jaxrs/src/main/java/io/bootique/cxf/CxfJaxrsModule.java index fc77b54..b4d65a7 100644 --- a/bootique-cxf-jaxrs/src/main/java/io/bootique/cxf/CxfJaxrsModule.java +++ b/bootique-cxf-jaxrs/src/main/java/io/bootique/cxf/CxfJaxrsModule.java @@ -19,16 +19,15 @@ package io.bootique.cxf; -import io.bootique.ConfigModule; +import io.bootique.BQModuleProvider; +import io.bootique.bootstrap.BuiltModule; import io.bootique.config.ConfigurationFactory; import io.bootique.cxf.annotations.CxfFeature; import io.bootique.cxf.annotations.CxfResource; import io.bootique.cxf.annotations.CxfServlet; -import io.bootique.di.Binder; -import io.bootique.di.Key; -import io.bootique.di.Provides; -import io.bootique.di.TypeLiteral; +import io.bootique.di.*; import io.bootique.jetty.JettyModule; +import io.bootique.jetty.JettyModuleProvider; import io.bootique.jetty.MappedServlet; import org.apache.cxf.Bus; import org.apache.cxf.feature.Feature; @@ -38,17 +37,18 @@ import javax.inject.Singleton; import javax.servlet.Servlet; import javax.ws.rs.core.Application; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; +import java.util.*; + +import static java.util.Arrays.asList; /** * CXF module. * * @author Ruslan Ibragimov */ -public class CxfJaxrsModule extends ConfigModule { +public class CxfJaxrsModule implements BQModule, BQModuleProvider { + + private static final String CONFIG_PREFIX = "cxfjaxrs"; /** * Returns an instance of {@link CxfJaxrsModuleExtender} used by downstream modules to load custom extensions of @@ -61,6 +61,24 @@ public static CxfJaxrsModuleExtender extend(Binder binder) { return new CxfJaxrsModuleExtender(binder); } + @Override + public BuiltModule buildModule() { + return BuiltModule.of(this) + .provider(this) + .description("Integrates Apache CXF JAX-RS engine") + .config(CONFIG_PREFIX, CxfJaxrsModuleConfig.class) + .build(); + } + + @Override + @Deprecated(since = "3.0", forRemoval = true) + public Collection dependencies() { + return asList( + new JettyModuleProvider(), + new CxfModule() + ); + } + @Override public void configure(Binder binder) { CxfJaxrsModule.extend(binder).initAllExtensions(); @@ -85,7 +103,7 @@ private MappedServlet createCxfServlet(CxfJaxrsModuleConfig config, App @Singleton @Provides private CxfJaxrsModuleConfig createCxfFactory(ConfigurationFactory configFactory) { - return config(CxfJaxrsModuleConfig.class, configFactory); + return configFactory.config(CxfJaxrsModuleConfig.class, CONFIG_PREFIX); } @Singleton diff --git a/bootique-cxf-jaxrs/src/main/java/io/bootique/cxf/CxfJaxrsModuleProvider.java b/bootique-cxf-jaxrs/src/main/java/io/bootique/cxf/CxfJaxrsModuleProvider.java deleted file mode 100644 index eccf086..0000000 --- a/bootique-cxf-jaxrs/src/main/java/io/bootique/cxf/CxfJaxrsModuleProvider.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to ObjectStyle LLC under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ObjectStyle LLC 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 io.bootique.cxf; - -import io.bootique.BQModuleProvider; -import io.bootique.bootstrap.BuiltModule; -import io.bootique.jetty.JettyModuleProvider; - -import java.util.Collection; - -import static java.util.Arrays.asList; - -/** - * Standard {@link BQModuleProvider} for {@link CxfJaxrsModule}. - */ -public class CxfJaxrsModuleProvider implements BQModuleProvider { - - @Override - public BuiltModule buildModule() { - return BuiltModule.of(new CxfJaxrsModule()) - .provider(this) - .description("Integrates Apache CXF JAX-RS engine") - .config("cxf", CxfJaxrsModuleConfig.class) - .build(); - } - - @Override - @Deprecated(since = "3.0", forRemoval = true) - public Collection dependencies() { - return asList( - new JettyModuleProvider(), - new CxfModuleProvider() - ); - } -} diff --git a/bootique-cxf-jaxrs/src/main/resources/META-INF/services/io.bootique.BQModuleProvider b/bootique-cxf-jaxrs/src/main/resources/META-INF/services/io.bootique.BQModuleProvider index 5a39ca6..346dcd0 100644 --- a/bootique-cxf-jaxrs/src/main/resources/META-INF/services/io.bootique.BQModuleProvider +++ b/bootique-cxf-jaxrs/src/main/resources/META-INF/services/io.bootique.BQModuleProvider @@ -1 +1 @@ -io.bootique.cxf.CxfJaxrsModuleProvider +io.bootique.cxf.CxfJaxrsModule diff --git a/bootique-cxf-jaxrs/src/test/java/io/bootique/cxf/CxfJaxrsModuleProviderTest.java b/bootique-cxf-jaxrs/src/test/java/io/bootique/cxf/CxfJaxrsModuleTest.java similarity index 83% rename from bootique-cxf-jaxrs/src/test/java/io/bootique/cxf/CxfJaxrsModuleProviderTest.java rename to bootique-cxf-jaxrs/src/test/java/io/bootique/cxf/CxfJaxrsModuleTest.java index 4ff8a93..7262d45 100644 --- a/bootique-cxf-jaxrs/src/test/java/io/bootique/cxf/CxfJaxrsModuleProviderTest.java +++ b/bootique-cxf-jaxrs/src/test/java/io/bootique/cxf/CxfJaxrsModuleTest.java @@ -23,16 +23,16 @@ import io.bootique.junit5.BQModuleProviderChecker; import org.junit.jupiter.api.Test; -public class CxfJaxrsModuleProviderTest { +public class CxfJaxrsModuleTest { @Test public void autoLoadable() { - BQModuleProviderChecker.testAutoLoadable(CxfJaxrsModuleProvider.class); + BQModuleProviderChecker.testAutoLoadable(CxfJaxrsModule.class); } @Test public void metadata() { - BQModuleProviderChecker.testMetadata(CxfJaxrsModuleProvider.class); + BQModuleProviderChecker.testMetadata(CxfJaxrsModule.class); } } diff --git a/bootique-cxf-jaxws-client/src/main/java/io/bootique/cxf/jaxws/CxfJaxwsClientModule.java b/bootique-cxf-jaxws-client/src/main/java/io/bootique/cxf/jaxws/CxfJaxwsClientModule.java index 21fbfd0..ec94012 100644 --- a/bootique-cxf-jaxws-client/src/main/java/io/bootique/cxf/jaxws/CxfJaxwsClientModule.java +++ b/bootique-cxf-jaxws-client/src/main/java/io/bootique/cxf/jaxws/CxfJaxwsClientModule.java @@ -1,12 +1,14 @@ package io.bootique.cxf.jaxws; -import io.bootique.ConfigModule; +import io.bootique.BQModuleProvider; +import io.bootique.bootstrap.BuiltModule; import io.bootique.config.ConfigurationFactory; import io.bootique.cxf.CxfModule; import io.bootique.cxf.jaxws.annotation.CxfInterceptorsClientIn; import io.bootique.cxf.jaxws.annotation.CxfInterceptorsClientInFault; import io.bootique.cxf.jaxws.annotation.CxfInterceptorsClientOut; import io.bootique.cxf.jaxws.annotation.CxfInterceptorsClientOutFault; +import io.bootique.di.BQModule; import io.bootique.di.Binder; import io.bootique.di.Provides; import org.apache.cxf.interceptor.Interceptor; @@ -16,16 +18,35 @@ import javax.inject.Singleton; import java.net.URL; +import java.util.Collection; import java.util.Collections; import java.util.Map; import java.util.Set; -public class CxfJaxwsClientModule extends ConfigModule { +public class CxfJaxwsClientModule implements BQModule, BQModuleProvider { + + private static final String CONFIG_PREFIX = "cxfjaxwsclient"; public static CxfJaxwsClientModuleExtender extend(Binder binder) { return new CxfJaxwsClientModuleExtender(binder); } + @Override + public BuiltModule buildModule() { + return BuiltModule.of(this) + .provider(this) + .description("Integrates Apache CXF JAX-WS client") + .config(CONFIG_PREFIX, CxfJaxwsClientConfiguration.class) + .build(); + } + + @Override + @Deprecated(since = "3.0", forRemoval = true) + public Collection dependencies() { + return Collections.singletonList(new CxfModule()); + } + + @Override public void configure(Binder binder) { CxfJaxwsClientModule.extend(binder).initAllExtensions(); @@ -36,10 +57,10 @@ public void configure(Binder binder) { @Provides @Singleton public JaxWsProxyFactoryConfigurer provideProxyFactoryConfigurer( - @CxfInterceptorsClientIn Set> inInterceptors, - @CxfInterceptorsClientOut Set> outInterceptors, - @CxfInterceptorsClientInFault Set> inFaultInterceptors, - @CxfInterceptorsClientOutFault Set> outFaultInterceptors + @CxfInterceptorsClientIn Set> inInterceptors, + @CxfInterceptorsClientOut Set> outInterceptors, + @CxfInterceptorsClientInFault Set> inFaultInterceptors, + @CxfInterceptorsClientOutFault Set> outFaultInterceptors ) { return new JaxWsProxyFactoryConfigurer( inInterceptors, @@ -52,7 +73,7 @@ public JaxWsProxyFactoryConfigurer provideProxyFactoryConfigurer( @Provides @Singleton public CxfJaxwsClientConfiguration provideConfiguration(ConfigurationFactory configurationFactory) { - return config(CxfJaxwsClientConfiguration.class, configurationFactory); + return configurationFactory.config(CxfJaxwsClientConfiguration.class, CONFIG_PREFIX); } @Provides diff --git a/bootique-cxf-jaxws-client/src/main/java/io/bootique/cxf/jaxws/CxfJaxwsClientModuleProvider.java b/bootique-cxf-jaxws-client/src/main/java/io/bootique/cxf/jaxws/CxfJaxwsClientModuleProvider.java deleted file mode 100644 index 45fbd3c..0000000 --- a/bootique-cxf-jaxws-client/src/main/java/io/bootique/cxf/jaxws/CxfJaxwsClientModuleProvider.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.bootique.cxf.jaxws; - -import io.bootique.BQModuleProvider; -import io.bootique.bootstrap.BuiltModule; -import io.bootique.cxf.CxfModuleProvider; - -import java.util.Collection; -import java.util.Collections; - -public class CxfJaxwsClientModuleProvider implements BQModuleProvider { - - @Override - public BuiltModule buildModule() { - return BuiltModule.of(new CxfJaxwsClientModule()) - .provider(this) - .description("Integrates Apache CXF JAX-WS client") - .config("cxfjaxwsclient", CxfJaxwsClientConfiguration.class) - .build(); - } - - @Override - @Deprecated(since = "3.0", forRemoval = true) - public Collection dependencies() { - return Collections.singletonList(new CxfModuleProvider()); - } -} diff --git a/bootique-cxf-jaxws-client/src/main/resources/META-INF/services/io.bootique.BQModuleProvider b/bootique-cxf-jaxws-client/src/main/resources/META-INF/services/io.bootique.BQModuleProvider index 71fef57..79aa664 100644 --- a/bootique-cxf-jaxws-client/src/main/resources/META-INF/services/io.bootique.BQModuleProvider +++ b/bootique-cxf-jaxws-client/src/main/resources/META-INF/services/io.bootique.BQModuleProvider @@ -1 +1 @@ -io.bootique.cxf.jaxws.CxfJaxwsClientModuleProvider \ No newline at end of file +io.bootique.cxf.jaxws.CxfJaxwsClientModule \ No newline at end of file diff --git a/bootique-cxf-jaxws-client/src/test/java/io/bootique/cxf/jaxws/CxfJaxwsClientModuleProviderIT.java b/bootique-cxf-jaxws-client/src/test/java/io/bootique/cxf/jaxws/CxfJaxwsClientModuleIT.java similarity index 83% rename from bootique-cxf-jaxws-client/src/test/java/io/bootique/cxf/jaxws/CxfJaxwsClientModuleProviderIT.java rename to bootique-cxf-jaxws-client/src/test/java/io/bootique/cxf/jaxws/CxfJaxwsClientModuleIT.java index 136b8e2..e0745a4 100644 --- a/bootique-cxf-jaxws-client/src/test/java/io/bootique/cxf/jaxws/CxfJaxwsClientModuleProviderIT.java +++ b/bootique-cxf-jaxws-client/src/test/java/io/bootique/cxf/jaxws/CxfJaxwsClientModuleIT.java @@ -6,19 +6,19 @@ import org.junit.jupiter.api.Test; @BQTest -public class CxfJaxwsClientModuleProviderIT { +public class CxfJaxwsClientModuleIT { @BQTestTool final BQTestFactory testFactory = new BQTestFactory(); @Test public void autoLoadable() { - BQModuleProviderChecker.testAutoLoadable(CxfJaxwsClientModuleProvider.class); + BQModuleProviderChecker.testAutoLoadable(CxfJaxwsClientModule.class); } @Test public void moduleDeclaresDependencies() { - final BQRuntime bqRuntime = testFactory.app().moduleProvider(new CxfJaxwsClientModuleProvider()).createRuntime(); + final BQRuntime bqRuntime = testFactory.app().moduleProvider(new CxfJaxwsClientModule()).createRuntime(); BQRuntimeChecker.testModulesLoaded(bqRuntime, CxfModule.class, CxfJaxwsClientModule.class diff --git a/bootique-cxf-jaxws-server/src/main/java/io/bootique/cxf/jaxws/CxfJaxwsServerModule.java b/bootique-cxf-jaxws-server/src/main/java/io/bootique/cxf/jaxws/CxfJaxwsServerModule.java index 78bc4de..ad51bb7 100644 --- a/bootique-cxf-jaxws-server/src/main/java/io/bootique/cxf/jaxws/CxfJaxwsServerModule.java +++ b/bootique-cxf-jaxws-server/src/main/java/io/bootique/cxf/jaxws/CxfJaxwsServerModule.java @@ -1,17 +1,16 @@ package io.bootique.cxf.jaxws; -import io.bootique.ConfigModule; +import io.bootique.BQModuleProvider; +import io.bootique.bootstrap.BuiltModule; import io.bootique.config.ConfigurationFactory; import io.bootique.cxf.CxfModule; import io.bootique.cxf.jaxws.annotation.CxfInterceptorsServerIn; import io.bootique.cxf.jaxws.annotation.CxfInterceptorsServerInFault; import io.bootique.cxf.jaxws.annotation.CxfInterceptorsServerOut; import io.bootique.cxf.jaxws.annotation.CxfInterceptorsServerOutFault; -import io.bootique.di.Binder; -import io.bootique.di.Injector; -import io.bootique.di.Provides; -import io.bootique.di.TypeLiteral; +import io.bootique.di.*; import io.bootique.jetty.JettyModule; +import io.bootique.jetty.JettyModuleProvider; import io.bootique.jetty.MappedServlet; import org.apache.cxf.Bus; import org.apache.cxf.interceptor.Interceptor; @@ -21,14 +20,37 @@ import javax.inject.Singleton; import javax.xml.ws.Endpoint; +import java.util.Collection; import java.util.Set; -public class CxfJaxwsServerModule extends ConfigModule { +import static java.util.Arrays.asList; + +public class CxfJaxwsServerModule implements BQModule, BQModuleProvider { + + private static final String CONFIG_PREFIX = "cxfjaxwsserver"; public static CxfJaxwsServerModuleExtender extend(Binder binder) { return new CxfJaxwsServerModuleExtender(binder); } + @Override + public BuiltModule buildModule() { + return BuiltModule.of(this) + .provider(this) + .description("Integrates Apache CXF JAX-WS server engine") + .config(CONFIG_PREFIX, CxfJaxwsServletFactory.class) + .build(); + } + + @Override + @Deprecated(since = "3.0", forRemoval = true) + public Collection dependencies() { + return asList( + new JettyModuleProvider(), + new CxfModule() + ); + } + @Override public void configure(Binder binder) { @@ -43,8 +65,7 @@ public void configure(Binder binder) { public MappedServlet provideServlet(Set endpoints, Bus bus, ConfigurationFactory configFactory) { // TODO the sole purpose of endpoints here is to add them to the BQ dependency graph. Need a better way to achieve that. - - return config(CxfJaxwsServletFactory.class, configFactory).createCxfServlet(bus); + return configFactory.config(CxfJaxwsServletFactory.class, CONFIG_PREFIX).createCxfServlet(bus); } @Provides diff --git a/bootique-cxf-jaxws-server/src/main/java/io/bootique/cxf/jaxws/CxfJaxwsServerModuleProvider.java b/bootique-cxf-jaxws-server/src/main/java/io/bootique/cxf/jaxws/CxfJaxwsServerModuleProvider.java deleted file mode 100644 index ff05587..0000000 --- a/bootique-cxf-jaxws-server/src/main/java/io/bootique/cxf/jaxws/CxfJaxwsServerModuleProvider.java +++ /dev/null @@ -1,31 +0,0 @@ -package io.bootique.cxf.jaxws; - -import io.bootique.BQModuleProvider; -import io.bootique.bootstrap.BuiltModule; -import io.bootique.cxf.CxfModuleProvider; -import io.bootique.jetty.JettyModuleProvider; - -import java.util.Collection; - -import static java.util.Arrays.asList; - -public class CxfJaxwsServerModuleProvider implements BQModuleProvider { - - @Override - public BuiltModule buildModule() { - return BuiltModule.of(new CxfJaxwsServerModule()) - .provider(this) - .description("Integrates Apache CXF JAX-WS server engine") - .config("cxfjaxwsserver", CxfJaxwsServletFactory.class) - .build(); - } - - @Override - @Deprecated(since = "3.0", forRemoval = true) - public Collection dependencies() { - return asList( - new JettyModuleProvider(), - new CxfModuleProvider() - ); - } -} diff --git a/bootique-cxf-jaxws-server/src/main/resources/META-INF/services/io.bootique.BQModuleProvider b/bootique-cxf-jaxws-server/src/main/resources/META-INF/services/io.bootique.BQModuleProvider index 2932716..59ffb84 100644 --- a/bootique-cxf-jaxws-server/src/main/resources/META-INF/services/io.bootique.BQModuleProvider +++ b/bootique-cxf-jaxws-server/src/main/resources/META-INF/services/io.bootique.BQModuleProvider @@ -1 +1 @@ -io.bootique.cxf.jaxws.CxfJaxwsServerModuleProvider \ No newline at end of file +io.bootique.cxf.jaxws.CxfJaxwsServerModule \ No newline at end of file diff --git a/bootique-cxf-jaxws-server/src/test/java/io/bootique/cxf/jaxws/CxfJaxwsServerModuleIT.java b/bootique-cxf-jaxws-server/src/test/java/io/bootique/cxf/jaxws/CxfJaxwsServerModuleIT.java index 7e85d36..3f009bc 100644 --- a/bootique-cxf-jaxws-server/src/test/java/io/bootique/cxf/jaxws/CxfJaxwsServerModuleIT.java +++ b/bootique-cxf-jaxws-server/src/test/java/io/bootique/cxf/jaxws/CxfJaxwsServerModuleIT.java @@ -1,11 +1,11 @@ package io.bootique.cxf.jaxws; import io.bootique.BQRuntime; +import io.bootique.cxf.CxfModule; import io.bootique.di.Key; import io.bootique.di.TypeLiteral; -import io.bootique.junit5.BQTest; -import io.bootique.junit5.BQTestFactory; -import io.bootique.junit5.BQTestTool; +import io.bootique.jetty.JettyModule; +import io.bootique.junit5.*; import org.apache.cxf.Bus; import org.apache.cxf.jaxws.EndpointImpl; import org.junit.jupiter.api.Test; @@ -58,6 +58,21 @@ public Endpoint get() { } } + @Test + public void autoLoadable() { + BQModuleProviderChecker.testAutoLoadable(CxfJaxwsServerModule.class); + } + + @Test + public void moduleDeclaresDependencies() { + final BQRuntime bqRuntime = testFactory.app().moduleProvider(new CxfJaxwsServerModule()).createRuntime(); + BQRuntimeChecker.testModulesLoaded(bqRuntime, + JettyModule.class, + CxfModule.class, + CxfJaxwsServerModule.class + ); + } + @Test public void provideEndpointsFromDifferentModules() { BQRuntime runtime = testFactory.app() diff --git a/bootique-cxf-jaxws-server/src/test/java/io/bootique/cxf/jaxws/CxfJaxwsServerModuleProviderIT.java b/bootique-cxf-jaxws-server/src/test/java/io/bootique/cxf/jaxws/CxfJaxwsServerModuleProviderIT.java deleted file mode 100644 index 6b74050..0000000 --- a/bootique-cxf-jaxws-server/src/test/java/io/bootique/cxf/jaxws/CxfJaxwsServerModuleProviderIT.java +++ /dev/null @@ -1,29 +0,0 @@ -package io.bootique.cxf.jaxws; - -import io.bootique.BQRuntime; -import io.bootique.cxf.CxfModule; -import io.bootique.jetty.JettyModule; -import io.bootique.junit5.*; -import org.junit.jupiter.api.Test; - -@BQTest -public class CxfJaxwsServerModuleProviderIT { - - @BQTestTool - final BQTestFactory testFactory = new BQTestFactory(); - - @Test - public void autoLoadable() { - BQModuleProviderChecker.testAutoLoadable(CxfJaxwsServerModuleProvider.class); - } - - @Test - public void moduleDeclaresDependencies() { - final BQRuntime bqRuntime = testFactory.app().moduleProvider(new CxfJaxwsServerModuleProvider()).createRuntime(); - BQRuntimeChecker.testModulesLoaded(bqRuntime, - JettyModule.class, - CxfModule.class, - CxfJaxwsServerModule.class - ); - } -}