From ea90722c3361b49b7539d7fd516fcd7373141268 Mon Sep 17 00:00:00 2001 From: Andrus Adamchik Date: Sun, 26 Nov 2023 10:42:16 -0500 Subject: [PATCH] "BuiltModule" got renamed to "ModuleCrate" --- .../beanvalidation/JerseyBeanValidationModuleProvider.java | 6 +++--- .../JerseyClientInstrumentedModuleProvider.java | 6 +++--- .../bootique/jersey/client/JerseyClientModuleProvider.java | 6 +++--- .../io/bootique/jersey/jackson/JerseyJacksonModule.java | 6 +++--- .../jersey/beanvalidation/JerseyBeanValidationModule.java | 6 +++--- .../client/instrumented/JerseyClientInstrumentedModule.java | 6 +++--- .../jersey/client/jetty/JerseyClientJettyModule.java | 6 +++--- .../java/io/bootique/jersey/client/JerseyClientModule.java | 6 +++--- .../io/bootique/jersey/jackson/JerseyJacksonModule.java | 6 +++--- .../src/main/java/io/bootique/jersey/JerseyModule.java | 6 +++--- .../main/java/io/bootique/jersey/JerseyModuleProvider.java | 6 +++--- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/bootique-jersey-beanvalidation/src/main/java/io/bootique/jersey/beanvalidation/JerseyBeanValidationModuleProvider.java b/bootique-jersey-beanvalidation/src/main/java/io/bootique/jersey/beanvalidation/JerseyBeanValidationModuleProvider.java index 110d1c3..1c8b707 100644 --- a/bootique-jersey-beanvalidation/src/main/java/io/bootique/jersey/beanvalidation/JerseyBeanValidationModuleProvider.java +++ b/bootique-jersey-beanvalidation/src/main/java/io/bootique/jersey/beanvalidation/JerseyBeanValidationModuleProvider.java @@ -19,7 +19,7 @@ package io.bootique.jersey.beanvalidation; import io.bootique.BQModuleProvider; -import io.bootique.bootstrap.BuiltModule; +import io.bootique.ModuleCrate; /** * @since 2.0 @@ -29,8 +29,8 @@ public class JerseyBeanValidationModuleProvider implements BQModuleProvider { @Override - public BuiltModule buildModule() { - return BuiltModule.of(new JerseyBeanValidationModule()) + public ModuleCrate moduleCrate() { + return ModuleCrate.of(new JerseyBeanValidationModule()) .provider(this) .description("Deprecated, can be replaced with 'bootique-jersey-jakarta-beanvalidation'.") .build(); diff --git a/bootique-jersey-client-instrumented/src/main/java/io/bootique/jersey/client/instrumented/JerseyClientInstrumentedModuleProvider.java b/bootique-jersey-client-instrumented/src/main/java/io/bootique/jersey/client/instrumented/JerseyClientInstrumentedModuleProvider.java index 93eee21..ed962fb 100644 --- a/bootique-jersey-client-instrumented/src/main/java/io/bootique/jersey/client/instrumented/JerseyClientInstrumentedModuleProvider.java +++ b/bootique-jersey-client-instrumented/src/main/java/io/bootique/jersey/client/instrumented/JerseyClientInstrumentedModuleProvider.java @@ -20,7 +20,7 @@ package io.bootique.jersey.client.instrumented; import io.bootique.BQModuleProvider; -import io.bootique.bootstrap.BuiltModule; +import io.bootique.ModuleCrate; import io.bootique.jersey.client.JerseyClientModule; import io.bootique.jersey.client.JerseyClientModuleProvider; import io.bootique.metrics.MetricsModule; @@ -37,8 +37,8 @@ public class JerseyClientInstrumentedModuleProvider implements BQModuleProvider { @Override - public BuiltModule buildModule() { - return BuiltModule.of(new JerseyClientInstrumentedModule()) + public ModuleCrate moduleCrate() { + return ModuleCrate.of(new JerseyClientInstrumentedModule()) .provider(this) .description("Deprecated, can be replaced with 'bootique-jersey-jakarta-client-instrumented'.") .overrides(JerseyClientModule.class) diff --git a/bootique-jersey-client/src/main/java/io/bootique/jersey/client/JerseyClientModuleProvider.java b/bootique-jersey-client/src/main/java/io/bootique/jersey/client/JerseyClientModuleProvider.java index 7de4f6b..66a9c4e 100644 --- a/bootique-jersey-client/src/main/java/io/bootique/jersey/client/JerseyClientModuleProvider.java +++ b/bootique-jersey-client/src/main/java/io/bootique/jersey/client/JerseyClientModuleProvider.java @@ -20,7 +20,7 @@ package io.bootique.jersey.client; import io.bootique.BQModuleProvider; -import io.bootique.bootstrap.BuiltModule; +import io.bootique.ModuleCrate; /** * @deprecated The users are encouraged to switch to the Jakarta-based flavor @@ -29,8 +29,8 @@ public class JerseyClientModuleProvider implements BQModuleProvider { @Override - public BuiltModule buildModule() { - return BuiltModule.of(new JerseyClientModule()) + public ModuleCrate moduleCrate() { + return ModuleCrate.of(new JerseyClientModule()) .provider(this) .description("Deprecated, can be replaced with 'bootique-jersey-jakarta-client'.") .config("jerseyclient", HttpClientFactoryFactory.class) diff --git a/bootique-jersey-jackson/src/main/java/io/bootique/jersey/jackson/JerseyJacksonModule.java b/bootique-jersey-jackson/src/main/java/io/bootique/jersey/jackson/JerseyJacksonModule.java index b52fcbd..ead8be3 100644 --- a/bootique-jersey-jackson/src/main/java/io/bootique/jersey/jackson/JerseyJacksonModule.java +++ b/bootique-jersey-jackson/src/main/java/io/bootique/jersey/jackson/JerseyJacksonModule.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.JsonSerializer; import io.bootique.BQModuleProvider; import io.bootique.ConfigModule; -import io.bootique.bootstrap.BuiltModule; +import io.bootique.ModuleCrate; import io.bootique.config.ConfigurationFactory; import io.bootique.di.Binder; import io.bootique.di.Provides; @@ -42,8 +42,8 @@ public static JerseyJacksonModuleExtender extend(Binder binder) { } @Override - public BuiltModule buildModule() { - return BuiltModule.of(this) + public ModuleCrate moduleCrate() { + return ModuleCrate.of(this) .provider(this) .description("Deprecated, can be replaced with 'bootique-jersey-jakarta-jackson'.") .config(configPrefix, JerseyJacksonFactory.class) diff --git a/bootique-jersey-jakarta-beanvalidation/src/main/java/io/bootique/jersey/beanvalidation/JerseyBeanValidationModule.java b/bootique-jersey-jakarta-beanvalidation/src/main/java/io/bootique/jersey/beanvalidation/JerseyBeanValidationModule.java index d09f959..91654a5 100644 --- a/bootique-jersey-jakarta-beanvalidation/src/main/java/io/bootique/jersey/beanvalidation/JerseyBeanValidationModule.java +++ b/bootique-jersey-jakarta-beanvalidation/src/main/java/io/bootique/jersey/beanvalidation/JerseyBeanValidationModule.java @@ -19,7 +19,7 @@ package io.bootique.jersey.beanvalidation; import io.bootique.BQModuleProvider; -import io.bootique.bootstrap.BuiltModule; +import io.bootique.ModuleCrate; import io.bootique.di.BQModule; import io.bootique.di.Binder; @@ -33,8 +33,8 @@ public static JerseyBeanValidationModuleExtender extend(Binder binder) { } @Override - public BuiltModule buildModule() { - return BuiltModule.of(this) + public ModuleCrate moduleCrate() { + return ModuleCrate.of(this) .provider(this) .description("Integrates bean validation to Jersey") .build(); diff --git a/bootique-jersey-jakarta-client-instrumented/src/main/java/io/bootique/jersey/client/instrumented/JerseyClientInstrumentedModule.java b/bootique-jersey-jakarta-client-instrumented/src/main/java/io/bootique/jersey/client/instrumented/JerseyClientInstrumentedModule.java index 028fd37..79d358c 100644 --- a/bootique-jersey-jakarta-client-instrumented/src/main/java/io/bootique/jersey/client/instrumented/JerseyClientInstrumentedModule.java +++ b/bootique-jersey-jakarta-client-instrumented/src/main/java/io/bootique/jersey/client/instrumented/JerseyClientInstrumentedModule.java @@ -21,7 +21,7 @@ import com.codahale.metrics.MetricRegistry; import io.bootique.BQModuleProvider; -import io.bootique.bootstrap.BuiltModule; +import io.bootique.ModuleCrate; import io.bootique.config.ConfigurationFactory; import io.bootique.di.BQModule; import io.bootique.di.Binder; @@ -45,8 +45,8 @@ public class JerseyClientInstrumentedModule implements BQModule, BQModuleProvide public static final MetricNaming METRIC_NAMING = MetricNaming.forModule(JerseyClientInstrumentedModule.class); @Override - public BuiltModule buildModule() { - return BuiltModule.of(this) + public ModuleCrate moduleCrate() { + return ModuleCrate.of(this) .description("Integrates metrics and extra logging in Jersey HTTP client") .overrides(JerseyClientModule.class) .build(); diff --git a/bootique-jersey-jakarta-client-jetty/src/main/java/io/bootique/jersey/client/jetty/JerseyClientJettyModule.java b/bootique-jersey-jakarta-client-jetty/src/main/java/io/bootique/jersey/client/jetty/JerseyClientJettyModule.java index d72e301..3c84585 100644 --- a/bootique-jersey-jakarta-client-jetty/src/main/java/io/bootique/jersey/client/jetty/JerseyClientJettyModule.java +++ b/bootique-jersey-jakarta-client-jetty/src/main/java/io/bootique/jersey/client/jetty/JerseyClientJettyModule.java @@ -20,7 +20,7 @@ import io.bootique.BQCoreModule; import io.bootique.BQModuleProvider; -import io.bootique.bootstrap.BuiltModule; +import io.bootique.ModuleCrate; import io.bootique.di.BQModule; import io.bootique.di.Binder; import io.bootique.jersey.client.JerseyClientModule; @@ -33,8 +33,8 @@ public class JerseyClientJettyModule implements BQModule, BQModuleProvider { private static final Logger LOGGER = LoggerFactory.getLogger(JerseyClientJettyModule.class); @Override - public BuiltModule buildModule() { - return BuiltModule.of(this) + public ModuleCrate moduleCrate() { + return ModuleCrate.of(this) .description("Integrates Jetty transport for Jersey HTTP client") .build(); } diff --git a/bootique-jersey-jakarta-client/src/main/java/io/bootique/jersey/client/JerseyClientModule.java b/bootique-jersey-jakarta-client/src/main/java/io/bootique/jersey/client/JerseyClientModule.java index 4ff13e8..820ba80 100644 --- a/bootique-jersey-jakarta-client/src/main/java/io/bootique/jersey/client/JerseyClientModule.java +++ b/bootique-jersey-jakarta-client/src/main/java/io/bootique/jersey/client/JerseyClientModule.java @@ -20,7 +20,7 @@ package io.bootique.jersey.client; import io.bootique.BQModuleProvider; -import io.bootique.bootstrap.BuiltModule; +import io.bootique.ModuleCrate; import io.bootique.config.ConfigurationFactory; import io.bootique.di.*; import jakarta.ws.rs.core.Feature; @@ -46,8 +46,8 @@ public static JerseyClientModuleExtender extend(Binder binder) { } @Override - public BuiltModule buildModule() { - return BuiltModule.of(this) + public ModuleCrate moduleCrate() { + return ModuleCrate.of(this) .description("Integrates Jersey JAX-RS HTTP client.") .config(CONFIG_PREFIX, HttpClientFactoryFactory.class) .build(); diff --git a/bootique-jersey-jakarta-jackson/src/main/java/io/bootique/jersey/jackson/JerseyJacksonModule.java b/bootique-jersey-jakarta-jackson/src/main/java/io/bootique/jersey/jackson/JerseyJacksonModule.java index 792d81c..b759903 100644 --- a/bootique-jersey-jakarta-jackson/src/main/java/io/bootique/jersey/jackson/JerseyJacksonModule.java +++ b/bootique-jersey-jakarta-jackson/src/main/java/io/bootique/jersey/jackson/JerseyJacksonModule.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.JsonSerializer; import io.bootique.BQModuleProvider; -import io.bootique.bootstrap.BuiltModule; +import io.bootique.ModuleCrate; import io.bootique.config.ConfigurationFactory; import io.bootique.di.BQModule; import io.bootique.di.Binder; @@ -42,8 +42,8 @@ public static JerseyJacksonModuleExtender extend(Binder binder) { } @Override - public BuiltModule buildModule() { - return BuiltModule.of(this) + public ModuleCrate moduleCrate() { + return ModuleCrate.of(this) .provider(this) .description("Integrates Jackson JSON serializers to Jersey JAX-RS engine") .config(CONFIG_PREFIX, JerseyJacksonFactory.class) diff --git a/bootique-jersey-jakarta/src/main/java/io/bootique/jersey/JerseyModule.java b/bootique-jersey-jakarta/src/main/java/io/bootique/jersey/JerseyModule.java index 32352bb..085e5b5 100644 --- a/bootique-jersey-jakarta/src/main/java/io/bootique/jersey/JerseyModule.java +++ b/bootique-jersey-jakarta/src/main/java/io/bootique/jersey/JerseyModule.java @@ -20,7 +20,7 @@ package io.bootique.jersey; import io.bootique.BQModuleProvider; -import io.bootique.bootstrap.BuiltModule; +import io.bootique.ModuleCrate; import io.bootique.config.ConfigurationFactory; import io.bootique.di.*; import io.bootique.jersey.jaxrs.*; @@ -64,8 +64,8 @@ public static JerseyModuleExtender extend(Binder binder) { } @Override - public BuiltModule buildModule() { - return BuiltModule.of(this) + public ModuleCrate moduleCrate() { + return ModuleCrate.of(this) .provider(this) .description("Integrates Jersey JAX-RS HTTP server") .config(CONFIG_PREFIX, JerseyServletFactory.class) diff --git a/bootique-jersey/src/main/java/io/bootique/jersey/JerseyModuleProvider.java b/bootique-jersey/src/main/java/io/bootique/jersey/JerseyModuleProvider.java index f0e4d74..90b14d2 100644 --- a/bootique-jersey/src/main/java/io/bootique/jersey/JerseyModuleProvider.java +++ b/bootique-jersey/src/main/java/io/bootique/jersey/JerseyModuleProvider.java @@ -20,7 +20,7 @@ package io.bootique.jersey; import io.bootique.BQModuleProvider; -import io.bootique.bootstrap.BuiltModule; +import io.bootique.ModuleCrate; import io.bootique.jetty.JettyModuleProvider; import java.util.Collection; @@ -34,8 +34,8 @@ public class JerseyModuleProvider implements BQModuleProvider { @Override - public BuiltModule buildModule() { - return BuiltModule.of(new JerseyModule()) + public ModuleCrate moduleCrate() { + return ModuleCrate.of(new JerseyModule()) .provider(this) .description("Deprecated, can be replaced with 'bootique-jersey-jakarta'.") .config("jersey", JerseyServletFactory.class)