Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change Artemis to use recorder injection #20722

Merged
merged 1 commit into from
Oct 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
import io.quarkus.artemis.core.runtime.ArtemisCoreRecorder;
import io.quarkus.artemis.core.runtime.ArtemisRuntimeConfig;
import io.quarkus.deployment.Feature;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
Expand Down Expand Up @@ -104,15 +103,15 @@ void load(BuildProducer<FeatureBuildItem> feature, Optional<ArtemisJmsBuildItem>

@Record(ExecutionTime.RUNTIME_INIT)
@BuildStep
ArtemisCoreConfiguredBuildItem configure(ArtemisCoreRecorder recorder, ArtemisRuntimeConfig runtimeConfig,
ArtemisCoreConfiguredBuildItem configure(ArtemisCoreRecorder recorder,
BuildProducer<SyntheticBeanBuildItem> syntheticBeanProducer, Optional<ArtemisJmsBuildItem> artemisJms) {

if (artemisJms.isPresent()) {
return null;
}

SyntheticBeanBuildItem serverLocator = SyntheticBeanBuildItem.configure(ServerLocator.class)
.supplier(recorder.getServerLocatorSupplier(runtimeConfig))
.supplier(recorder.getServerLocatorSupplier())
.scope(ApplicationScoped.class)
.defaultBean()
.unremovable()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@
@Recorder
public class ArtemisCoreRecorder {

public Supplier<ServerLocator> getServerLocatorSupplier(ArtemisRuntimeConfig config) {
final ArtemisRuntimeConfig config;

public ArtemisCoreRecorder(ArtemisRuntimeConfig config) {
this.config = config;
}

public Supplier<ServerLocator> getServerLocatorSupplier() {
return new Supplier<ServerLocator>() {
@Override
public ServerLocator get() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
import io.quarkus.artemis.core.deployment.ArtemisBuildTimeConfig;
import io.quarkus.artemis.core.deployment.ArtemisJmsBuildItem;
import io.quarkus.artemis.core.runtime.ArtemisRuntimeConfig;
import io.quarkus.artemis.jms.runtime.ArtemisJmsRecorder;
import io.quarkus.deployment.Feature;
import io.quarkus.deployment.annotations.BuildProducer;
Expand Down Expand Up @@ -34,11 +33,11 @@ HealthBuildItem health(ArtemisBuildTimeConfig buildConfig) {

@Record(ExecutionTime.RUNTIME_INIT)
@BuildStep
ArtemisJmsConfiguredBuildItem configure(ArtemisJmsRecorder recorder, ArtemisRuntimeConfig runtimeConfig,
ArtemisJmsConfiguredBuildItem configure(ArtemisJmsRecorder recorder,
BuildProducer<SyntheticBeanBuildItem> syntheticBeanProducer) {

SyntheticBeanBuildItem connectionFactory = SyntheticBeanBuildItem.configure(ConnectionFactory.class)
.supplier(recorder.getConnectionFactorySupplier(runtimeConfig))
.supplier(recorder.getConnectionFactorySupplier())
.scope(ApplicationScoped.class)
.defaultBean()
.unremovable()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@
@Recorder
public class ArtemisJmsRecorder {

public Supplier<ConnectionFactory> getConnectionFactorySupplier(ArtemisRuntimeConfig config) {
final ArtemisRuntimeConfig config;

public ArtemisJmsRecorder(ArtemisRuntimeConfig config) {
this.config = config;
}

public Supplier<ConnectionFactory> getConnectionFactorySupplier() {
return new Supplier<ConnectionFactory>() {
@Override
public ConnectionFactory get() {
Expand Down