feat: remove uneccessary changes

RIPE-NCC · Dec 10, 2024 · 135e28b · 135e28b
1 parent 5f35735
commit 135e28b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/whois-commons/src/main/java/net/ripe/db/whois/common/TransactionConfiguration.java b/whois-commons/src/main/java/net/ripe/db/whois/common/TransactionConfiguration.java
@@ -73,5 +73,4 @@ public TransactionManager transactionManagerNrtmUpdate(@Qualifier("nrtmMasterDat
     public TransactionManager transactionManagerNrtmReadOnly(@Qualifier("nrtmSlaveDataSource") final DataSource dataSource) {
         return new DataSourceTransactionManager(dataSource);
     }
-
 }
diff --git a/...ent/src/main/java/net/ripe/db/nrtm4/client/config/NrtmClientDataSourceConfigurations.java b/...ent/src/main/java/net/ripe/db/nrtm4/client/config/NrtmClientDataSourceConfigurations.java
@@ -16,28 +16,28 @@
 @Configuration
 public class NrtmClientDataSourceConfigurations {
 
-    @Bean(name = "nrtmClientMasterInfoSource")
+    @Bean
     public ComboPooledDataSource nrtmClientMasterInfoSource(@Value("${nrtm.client.info.database.url}") final String jdbcUrl,
                                                             @Value("${nrtm.client.info.database.username}") final String jdbcUser,
                                                             @Value("${nrtm.client.info.database.password}") final String jdbcPass) throws PropertyVetoException {
         return createDataSource(DRIVER_CLASS_NAME, jdbcUrl, jdbcUser, jdbcPass);
     }
 
-    @Bean(name = "nrtmClientSlaveInfoSource")
+    @Bean
     public ComboPooledDataSource nrtmClientSlaveInfoSource(@Value("${nrtm.client.info.slave.database.url}") final String jdbcUrl,
                                                            @Value("${nrtm.client.info.slave.database.username}") final String jdbcUser,
                                                            @Value("${nrtm.client.info.slave.database.password}") final String jdbcPass) throws PropertyVetoException {
         return createDataSource(DRIVER_CLASS_NAME, jdbcUrl, jdbcUser, jdbcPass);
     }
 
-    @Bean(name = "nrtmClientMasterDataSource")
+    @Bean
     public ComboPooledDataSource nrtmClientMasterDataSource(@Value("${nrtm.client.database.url}") final String jdbcUrl,
                                                             @Value("${nrtm.client.database.username}") final String jdbcUser,
                                                             @Value("${nrtm.client.database.password}") final String jdbcPass) throws PropertyVetoException {
         return createDataSource(DRIVER_CLASS_NAME, jdbcUrl, jdbcUser, jdbcPass);
     }
 
-    @Bean(name = "nrtmClientSlaveDataSource")
+    @Bean
     public ComboPooledDataSource nrtmClientSlaveDataSource(@Value("${nrtm.client.slave.database.url}") final String jdbcUrl,
                                                            @Value("${nrtm.client.slave.database.username}") final String jdbcUser,
                                                            @Value("${nrtm.client.slave.database.password}") final String jdbcPass) throws PropertyVetoException {

diff --git a/whois-nrtm4-client/src/main/java/net/ripe/db/nrtm4/client/importer/DeltaMirrorImporter.java b/whois-nrtm4-client/src/main/java/net/ripe/db/nrtm4/client/importer/DeltaMirrorImporter.java
@@ -15,7 +15,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.BufferedReader;

diff --git a/whois-nrtm4-client/src/main/java/net/ripe/db/nrtm4/client/importer/MirrorImporter.java b/whois-nrtm4-client/src/main/java/net/ripe/db/nrtm4/client/importer/MirrorImporter.java
-Original file line number
+Diff line change
@@ Expand Up @@
         public TransactionManager transactionManagerNrtmReadOnly(@Qualifier("nrtmSlaveDataSource") final DataSource dataSource) {
             return new DataSourceTransactionManager(dataSource);
         }
     }