Merge pull request #18 from l-jonas/de-hardcode-database-implementation

De-hardcode database implementation

Author: Nutomic

bep/src/main/kotlin/net/syncthing/java/bep/IndexBrowser.kt

@@ -129,7 +129,7 @@ class IndexBrowser internal constructor(private val indexRepository: IndexReposi
 
     fun listFiles(path: String = currentPath): List<FileInfo> {
         logger.debug("doListFiles for path = '{}' BEGIN", path)
-        val list = indexRepository.findNotDeletedFilesByFolderAndParent(folder, path)
+        val list = ArrayList(indexRepository.findNotDeletedFilesByFolderAndParent(folder, path))
         logger.debug("doListFiles for path = '{}' : {} records loaded)", path, list.size)
         if (includeParentInList && (!PathUtils.isRoot(path) || allowParentInRoot)) {
             list.add(0, PARENT_FILE_INFO)

client-cli/build.gradle

@@ -0,0 +1,14 @@
+apply plugin: 'application'
+mainClassName = 'net.syncthing.java.client.cli.Main'
+
+dependencies {
+    compile project(':syncthing-java')
+    compile project(':repository')
+    compile "commons-cli:commons-cli:1.4"
+}
+
+run {
+    if (project.hasProperty('args')) {
+        args project.args.split('\\s+')
+    }
+}

client/src/main/kotlin/net/syncthing/java/client/Main.kt client-cli/src/main/kotlin/net/syncthing/java/client/cli/Main.kt

@@ -11,12 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.syncthing.java.client
+package net.syncthing.java.client.cli
 
 import net.syncthing.java.core.beans.DeviceId
 import net.syncthing.java.core.beans.DeviceInfo
 import net.syncthing.java.core.beans.FileInfo
 import net.syncthing.java.core.configuration.Configuration
+import net.syncthing.java.repository.repo.SqlRepository
+import net.syncthing.java.client.SyncthingClient
 import org.apache.commons.cli.*
 import org.apache.commons.io.FileUtils
 import org.slf4j.LoggerFactory
@@ -41,7 +43,9 @@ class Main(private val commandLine: CommandLine) {
             val configuration = if (cmd.hasOption("C")) Configuration(File(cmd.getOptionValue("C")))
             else                                        Configuration()
 
-            SyncthingClient(configuration).use { syncthingClient ->
+            val repository = SqlRepository(configuration.databaseFolder)
+
+            SyncthingClient(configuration, repository, repository).use { syncthingClient ->
                 val main = Main(cmd)
                 cmd.options.forEach { main.handleOption(it, configuration, syncthingClient) }
             }

client/build.gradle

@@ -1,16 +1,5 @@
-apply plugin: 'application'
-mainClassName = 'net.syncthing.java.client.Main'
-
 dependencies {
     compile project(':core')
     compile project(':bep')
-    compile project(':repository')
     compile project(':discovery')
-    compile "commons-cli:commons-cli:1.4"
-}
-
-run {
-    if (project.hasProperty('args')) {
-        args project.args.split('\\s+')
-    }
 }

client/src/main/kotlin/net/syncthing/java/client/SyncthingClient.kt

@@ -21,10 +21,11 @@ import net.syncthing.java.core.beans.DeviceAddress
 import net.syncthing.java.core.beans.DeviceId
 import net.syncthing.java.core.beans.DeviceInfo
 import net.syncthing.java.core.configuration.Configuration
+import net.syncthing.java.core.interfaces.IndexRepository
+import net.syncthing.java.core.interfaces.TempRepository
 import net.syncthing.java.core.security.KeystoreHandler
 import net.syncthing.java.core.utils.awaitTerminationSafe
 import net.syncthing.java.discovery.DiscoveryHandler
-import net.syncthing.java.repository.repo.SqlRepository
 import org.slf4j.LoggerFactory
 import java.io.Closeable
 import java.io.IOException
@@ -35,11 +36,14 @@ import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.collections.ArrayList
 
-class SyncthingClient(private val configuration: Configuration) : Closeable {
+class SyncthingClient(
+        private val configuration: Configuration,
+        private val repository: IndexRepository,
+        private val tempRepository: TempRepository
+) : Closeable {
 
     private val logger = LoggerFactory.getLogger(javaClass)
     val discoveryHandler: DiscoveryHandler
-    private val sqlRepository = SqlRepository(configuration.databaseFolder)
     val indexHandler: IndexHandler
     private val connections = Collections.synchronizedSet(createConnectionsSet())
     private val connectByDeviceIdLocks = Collections.synchronizedMap(HashMap<DeviceId, Object>())
@@ -49,7 +53,7 @@ class SyncthingClient(private val configuration: Configuration) : Closeable {
     private fun createConnectionsSet() = TreeSet<ConnectionHandler>(compareBy { it.address.score })
 
     init {
-        indexHandler = IndexHandler(configuration, sqlRepository, sqlRepository)
+        indexHandler = IndexHandler(configuration, repository, tempRepository)
         discoveryHandler = DiscoveryHandler(configuration)
         connectDevicesScheduler.scheduleAtFixedRate(this::updateIndexFromPeers, 0, 15, TimeUnit.SECONDS)
     }
@@ -219,7 +223,8 @@ class SyncthingClient(private val configuration: Configuration) : Closeable {
         // Create copy of list, because it will be modified by handleConnectionClosedEvent(), causing ConcurrentModificationException.
         ArrayList(connections).forEach{it.close()}
         indexHandler.close()
-        sqlRepository.close()
+        repository.close()
+        tempRepository.close()
         assert(onConnectionChangedListeners.isEmpty())
     }
 

core/src/main/kotlin/net/syncthing/java/core/interfaces/IndexRepository.kt

@@ -14,9 +14,10 @@
 package net.syncthing.java.core.interfaces
 
 import net.syncthing.java.core.beans.*
+import java.io.Closeable
 import java.util.*
 
-interface IndexRepository {
+interface IndexRepository: Closeable {
 
     fun setOnFolderStatsUpdatedListener(listener: ((IndexRepository.FolderStatsUpdatedEvent) -> Unit)?)
 
@@ -36,7 +37,7 @@ interface IndexRepository {
 
     fun updateFileInfo(fileInfo: FileInfo, fileBlocks: FileBlocks?)
 
-    fun findNotDeletedFilesByFolderAndParent(folder: String, parentPath: String): MutableList<FileInfo>
+    fun findNotDeletedFilesByFolderAndParent(folder: String, parentPath: String): List<FileInfo>
 
     fun clearIndex()
 

core/src/main/kotlin/net/syncthing/java/core/interfaces/TempRepository.kt

@@ -13,7 +13,9 @@
  */
 package net.syncthing.java.core.interfaces
 
-interface TempRepository {
+import java.io.Closeable
+
+interface TempRepository: Closeable {
 
     fun pushTempData(data: ByteArray): String
 

discovery/build.gradle

@@ -3,7 +3,6 @@ mainClassName = 'net.syncthing.java.discovery.Main'
 
 dependencies {
     compile project(':core')
-    compile project(':repository')
     compile "commons-cli:commons-cli:1.4"
 }
 

settings.gradle

@@ -6,6 +6,7 @@ include ':bep'
 include ':client'
 include ':repository'
 include ':discovery'
+include ':client-cli'
 
 // Also call this syncthing-java so it can be easily used from syncthing-lite.
-project(':client').name = 'syncthing-java'
+project(':client').name = 'syncthing-java'