lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

EclipseLink JpaConfiguration to depend on TenantResolver (#2242)

Browse Source 
minimize dependencies

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2025-01-27 15:42:22 +02:00
committed by GitHub
parent e3c41eb0b2
commit 5cc4372981
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hawkbit-repository/hawkbit-repository-jpa-eclipselink/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaConfiguration.java
View File

@@ -34,14 +34,14 @@ import org.springframework.transaction.jta.JtaTransactionManager;
@Configuration @Configuration
public class JpaConfiguration extends JpaBaseConfiguration { public class JpaConfiguration extends JpaBaseConfiguration {
private final TenantAware tenantAware; private final TenantAware.TenantResolver tenantResolver;
protected JpaConfiguration( protected JpaConfiguration(
final DataSource dataSource, final JpaProperties properties, final DataSource dataSource, final JpaProperties properties,
final ObjectProvider<JtaTransactionManager> jtaTransactionManagerProvider, final ObjectProvider<JtaTransactionManager> jtaTransactionManagerProvider,
final TenantAware tenantAware) { final TenantAware.TenantResolver tenantResolver) {
super(dataSource, properties, jtaTransactionManagerProvider); super(dataSource, properties, jtaTransactionManagerProvider);
this.tenantAware = tenantAware; this.tenantResolver = tenantResolver;
} }
/** /**
@@ -53,7 +53,7 @@ public class JpaConfiguration extends JpaBaseConfiguration {
@Override @Override
@Bean @Bean
public PlatformTransactionManager transactionManager(final ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers) { public PlatformTransactionManager transactionManager(final ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers) {
return new MultiTenantJpaTransactionManager(tenantAware); return new MultiTenantJpaTransactionManager(tenantResolver);
} }
@Override @Override

8
hawkbit-repository/hawkbit-repository-jpa-eclipselink/src/main/java/org/eclipse/hawkbit/repository/jpa/MultiTenantJpaTransactionManager.java
View File

@@ -38,7 +38,7 @@ class MultiTenantJpaTransactionManager extends JpaTransactionManager {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private transient TenantAware tenantAware; private transient TenantAware.TenantResolver tenantResolver;
private static final Class<?> JPA_TARGET; private static final Class<?> JPA_TARGET;
@@ -52,8 +52,8 @@ class MultiTenantJpaTransactionManager extends JpaTransactionManager {
} }
} }
MultiTenantJpaTransactionManager(final TenantAware tenantAware) { MultiTenantJpaTransactionManager(final TenantAware.TenantResolver tenantResolver) {
this.tenantAware = tenantAware; this.tenantResolver = tenantResolver;
} }
private static final EntityPropertyChangeListener ENTITY_PROPERTY_CHANGE_LISTENER = new EntityPropertyChangeListener(); private static final EntityPropertyChangeListener ENTITY_PROPERTY_CHANGE_LISTENER = new EntityPropertyChangeListener();
@@ -78,7 +78,7 @@ class MultiTenantJpaTransactionManager extends JpaTransactionManager {
} }
} }
final String currentTenant = tenantAware.getCurrentTenant(); final String currentTenant = tenantResolver.resolveTenant();
if (currentTenant == null) { if (currentTenant == null) {
cleanupTenant(em); cleanupTenant(em);
} else { } else {