From 135e28ba1ba85c1cc006099f719bbcd3f1f1722f Mon Sep 17 00:00:00 2001
From: mherran <mherran@ripe.net>
Date: Tue, 10 Dec 2024 09:31:03 +0100
Subject: [PATCH] feat: remove uneccessary changes

---
 .../ripe/db/whois/common/TransactionConfiguration.java    | 1 -
 .../client/config/NrtmClientDataSourceConfigurations.java | 8 ++++----
 .../db/nrtm4/client/importer/DeltaMirrorImporter.java     | 1 -
 .../net/ripe/db/nrtm4/client/importer/MirrorImporter.java | 8 --------
 4 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100644 whois-nrtm4-client/src/main/java/net/ripe/db/nrtm4/client/importer/MirrorImporter.java

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
index e10df807a9..f310418b3d 100644
--- 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/whois-nrtm4-client/src/main/java/net/ripe/db/nrtm4/client/config/NrtmClientDataSourceConfigurations.java b/whois-nrtm4-client/src/main/java/net/ripe/db/nrtm4/client/config/NrtmClientDataSourceConfigurations.java
index 8e9a7830bd..152304bdff 100644
--- a/whois-nrtm4-client/src/main/java/net/ripe/db/nrtm4/client/config/NrtmClientDataSourceConfigurations.java
+++ b/whois-nrtm4-client/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
index c0038cc932..b35ce3d478 100644
--- 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
deleted file mode 100644
index 5379ca9d50..0000000000
--- a/whois-nrtm4-client/src/main/java/net/ripe/db/nrtm4/client/importer/MirrorImporter.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package net.ripe.db.nrtm4.client.importer;
-
-import net.ripe.db.nrtm4.client.client.UpdateNotificationFileResponse;
-
-public interface MirrorImporter {
-
-    void doImport(final String source, final UpdateNotificationFileResponse updateNotificationFile);
-}