Skip to content

Add a few reflection registration for Narayana #5149

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 3, 2019
Merged

Add a few reflection registration for Narayana #5149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57cc355
Move TransactionIntegration to the runtime package
gsmet Nov 3, 2019
287d5e3
Add a couple of reflection registration to NarayanaJtaProcessor
gsmet Nov 3, 2019
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
2 changes: 1 addition & 1 deletion extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

import io.agroal.api.AgroalDataSource;
import io.quarkus.agroal.DataSource;
import io.quarkus.agroal.TransactionIntegration;
import io.quarkus.agroal.runtime.AbstractDataSourceProducer;
import io.quarkus.agroal.runtime.AgroalBuildTimeConfig;
import io.quarkus.agroal.runtime.AgroalRecorder;
import io.quarkus.agroal.runtime.AgroalRuntimeConfig;
import io.quarkus.agroal.runtime.DataSourceBuildTimeConfig;
import io.quarkus.agroal.runtime.TransactionIntegration;
import io.quarkus.arc.deployment.BeanContainerListenerBuildItem;
import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
Expand Down
6 changes: 3 additions & 3 deletions ...ns/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/AbstractDataSourceProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ public AgroalDataSource createDataSource(String dataSourceName,

//TODO should we do such checks at build time only? All these are currently defined at build - but it could change
//depending on if and how we could do Driver auto-detection.
final io.quarkus.agroal.TransactionIntegration transactionIntegration = dataSourceBuildTimeConfig.transactions;
if (transactionIntegration == io.quarkus.agroal.TransactionIntegration.XA) {
final io.quarkus.agroal.runtime.TransactionIntegration transactionIntegration = dataSourceBuildTimeConfig.transactions;
if (transactionIntegration == io.quarkus.agroal.runtime.TransactionIntegration.XA) {
if (!XADataSource.class.isAssignableFrom(driver)) {
throw new RuntimeException("Driver is not an XA dataSource and XA has been configured");
}
Expand All @@ -111,7 +111,7 @@ public AgroalDataSource createDataSource(String dataSourceName,
dataSourceRuntimeConfig.transactionIsolationLevel.get());
}

if (transactionIntegration != io.quarkus.agroal.TransactionIntegration.DISABLED) {
if (transactionIntegration != io.quarkus.agroal.runtime.TransactionIntegration.DISABLED) {
TransactionIntegration txIntegration = new NarayanaTransactionIntegration(transactionManager,
transactionSynchronizationRegistry);
poolConfiguration.transactionIntegration(txIntegration);
Expand Down
1 change: 0 additions & 1 deletion ...ons/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceBuildTimeConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.util.Optional;

import io.quarkus.agroal.TransactionIntegration;
import io.quarkus.runtime.annotations.ConfigGroup;
import io.quarkus.runtime.annotations.ConfigItem;

Expand Down
2 changes: 1 addition & 1 deletion ...uarkus/agroal/TransactionIntegration.java → ...groal/runtime/TransactionIntegration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.agroal;
package io.quarkus.agroal.runtime;

public enum TransactionIntegration {

Expand Down
6 changes: 5 additions & 1 deletion ...jta/deployment/src/main/java/io/quarkus/narayana/jta/deployment/NarayanaJtaProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@

import javax.transaction.TransactionScoped;

import com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean;
import com.arjuna.ats.internal.arjuna.coordinator.CheckedActionFactoryImple;
import com.arjuna.ats.internal.arjuna.objectstore.ShadowNoFileLockStore;
import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple;
import com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple;
Expand Down Expand Up @@ -64,7 +66,9 @@ public void build(NarayanaJtaRecorder recorder,
UserTransactionImple.class.getName(),
CheckedActionFactoryImple.class.getName(),
TransactionManagerImple.class.getName(),
TransactionSynchronizationRegistryImple.class.getName()));
TransactionSynchronizationRegistryImple.class.getName(),
ObjectStoreEnvironmentBean.class.getName(),
ShadowNoFileLockStore.class.getName()));

AdditionalBeanBuildItem.Builder builder = AdditionalBeanBuildItem.builder();
builder.addBeanClass(TransactionalInterceptorSupports.class);
Expand Down