#212 removed AbstractDao

kagemomiji · Jan 2, 2024 · c521d89 · c521d89
1 parent 7ee1110
commit c521d89
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 372 deletions.
diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/AbstractDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/AbstractDao.java
diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/DatabaseDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/DatabaseDao.java
@@ -3,16 +3,21 @@
 import org.airsonic.player.util.LambdaUtils.ThrowingBiFunction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
 
 import java.nio.file.Path;
 import java.sql.Connection;
 import java.util.function.Consumer;
 
 @Repository
-public class DatabaseDao extends AbstractDao {
+public class DatabaseDao {
     private static final Logger LOG = LoggerFactory.getLogger(DatabaseDao.class);
 
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
     public boolean exportDB(Path tempWorkingDir, ThrowingBiFunction<Path, Connection, Boolean, Exception> exportFunction) throws Exception {
         try (Connection con = jdbcTemplate.getDataSource().getConnection()) {
             return exportFunction.apply(tempWorkingDir, con);

diff --git a/airsonic-main/src/test/java/org/airsonic/player/TestCaseUtils.java b/airsonic-main/src/test/java/org/airsonic/player/TestCaseUtils.java
@@ -3,11 +3,9 @@
 import com.google.common.io.MoreFiles;
 import com.google.common.io.RecursiveDeleteOption;
 import org.airsonic.player.controller.JAXBWriter;
-import org.airsonic.player.dao.AbstractDao;
 import org.airsonic.player.service.MediaScannerService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.test.context.TestConfiguration;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -76,9 +74,4 @@ public static void execScan(MediaScannerService mediaScannerService) {
         waitForScanFinish(mediaScannerService);
     }
 
-    @TestConfiguration
-    public static class TestDao extends AbstractDao {
-
-    }
-
 }