Post attachmentUri dynamic

Author: pun-ky

resource/src/main/kotlin/com/neva/javarel/resource/impl/UrlResource.kt resource/src/main/kotlin/com/neva/javarel/resource/impl/BundleResource.kt

@@ -9,14 +9,14 @@ import java.io.IOException
 import java.io.InputStream
 import java.net.URL
 
-class UrlResource(override val resolver: ResourceResolver, override val descriptor: ResourceDescriptor, private val url: URL) : AdaptableResource() {
+class BundleResource(override val resolver: ResourceResolver, override val descriptor: ResourceDescriptor, private val url: URL) : AdaptableResource() {
 
     override val input: InputStream
         get() {
             try {
                 return url.openStream()
             } catch (e: IOException) {
-                throw ResourceException("Cannot read resource content using URL: '$url'")
+                throw ResourceException("Cannot read bundle resource input using URL: '$url'")
             }
         }
 }

storage/database/src/main/kotlin/com/neva/javarel/storage/database/api/DatabaseAdmin.kt

@@ -4,6 +4,11 @@ import javax.persistence.EntityManager
 
 interface DatabaseAdmin {
 
+    /**
+     * Name of default connection
+     */
+    val connectionDefault : String
+
     /**
      * Select default database
      */

storage/database/src/main/kotlin/com/neva/javarel/storage/database/impl/MultiDatabaseAdmin.kt

@@ -64,11 +64,11 @@ class MultiDatabaseAdmin : DatabaseAdmin, BundleWatcher {
         this.props = props
     }
 
-    private val nameDefault: String
+    override val connectionDefault: String
         get() = props[NAME_DEFAULT_PROP] as String
 
     override fun database(): Database {
-        return database(nameDefault)
+        return database(connectionDefault)
     }
 
     @Synchronized

storage/repository/src/main/kotlin/com/neva/javarel/storage/repository/api/RepositoryAdmin.kt

@@ -2,6 +2,11 @@ package com.neva.javarel.storage.repository.api
 
 interface RepositoryAdmin {
 
+    /**
+     * Name of default connection
+     */
+    val connectionDefault: String
+
     /**
      * Select default repository
      */

storage/repository/src/main/kotlin/com/neva/javarel/storage/repository/api/RepositoryFileResource.kt

@@ -0,0 +1,30 @@
+package com.neva.javarel.storage.repository.api
+
+import com.mongodb.gridfs.GridFSDBFile
+import com.neva.javarel.resource.api.AdaptableResource
+import com.neva.javarel.resource.api.ResourceDescriptor
+import com.neva.javarel.resource.api.ResourceResolver
+import com.neva.javarel.storage.repository.impl.RepositoryFileResourceProvider
+import org.bson.types.ObjectId
+import java.io.InputStream
+
+class RepositoryFileResource(
+        val file: GridFSDBFile,
+        override val descriptor: ResourceDescriptor,
+        override val resolver: ResourceResolver
+) : AdaptableResource() {
+
+    companion object {
+        fun uri(connection: String, fileStore: String, fileId: ObjectId): String {
+            return uri(connection, fileStore, fileId.toHexString())
+        }
+
+        fun uri(connection: String, fileStore: String, fileId: String): String {
+            return "${RepositoryFileResourceProvider.PROTOCOL}://$connection/$fileStore/$fileId"
+        }
+    }
+
+    override val input: InputStream
+        get() = file.inputStream
+
+}

storage/repository/src/main/kotlin/com/neva/javarel/storage/repository/api/repository/DomainRepository.kt

@@ -1,11 +1,30 @@
 package com.neva.javarel.storage.repository.api.repository
 
 import com.neva.javarel.storage.repository.api.Repository
+import org.mongodb.morphia.Key
 import kotlin.reflect.KClass
 
 abstract class DomainRepository<T : Any>(protected val base: Repository, protected val domainClass: KClass<T>) {
 
     val all: List<T>
-        get() = base.dataStore.createQuery(domainClass.java).asList()
+        get() {
+            val entities = base.dataStore.createQuery(domainClass.java).asList()
+
+            entities.forEach { lookup(it) }
+
+            return entities
+        }
+
+    fun save(entity: T): Key<T> {
+        val result = base.dataStore.save(entity)
+
+        lookup(entity)
+
+        return result
+    }
+
+    open protected fun lookup(entity: T) {
+        // load file related data into entities...
+    }
 
 }

storage/repository/src/main/kotlin/com/neva/javarel/storage/repository/impl/MultiRepositoryAdmin.kt

@@ -49,11 +49,11 @@ class MultiRepositoryAdmin : RepositoryAdmin, BundleWatcher {
         this.props = props
     }
 
-    private val nameDefault: String
+    override val connectionDefault: String
         get() = props[NAME_DEFAULT_PROP] as String
 
     override fun repository(): Repository {
-        return repository(nameDefault)
+        return repository(connectionDefault)
     }
 
     override fun repository(connectionName: String): Repository {

storage/repository/src/main/kotlin/com/neva/javarel/storage/repository/impl/RepositoryFileResource.kt

@@ -1,10 +1,12 @@
 package com.neva.javarel.storage.repository.impl
 
+import com.mongodb.gridfs.GridFS
 import com.neva.javarel.resource.api.Resource
 import com.neva.javarel.resource.api.ResourceDescriptor
 import com.neva.javarel.resource.api.ResourceProvider
 import com.neva.javarel.resource.api.ResourceResolver
 import com.neva.javarel.storage.repository.api.RepositoryAdmin
+import com.neva.javarel.storage.repository.api.RepositoryFileResource
 import org.apache.felix.scr.annotations.Component
 import org.apache.felix.scr.annotations.Reference
 import org.apache.felix.scr.annotations.Service
@@ -26,17 +28,33 @@ class RepositoryFileResourceProvider : ResourceProvider {
     }
 
     override fun provide(resolver: ResourceResolver, descriptor: ResourceDescriptor): Resource? {
+        var result: Resource? = null
+
         val file = repoAdmin.repository(getConnectionName(descriptor))
                 .fileStore(getFileStore(descriptor))
                 .findOne(ObjectId(getFileId(descriptor)))
+        if (file != null) {
+            result = RepositoryFileResource(file, descriptor, resolver)
+        }
 
-        return RepositoryFileResource(file, descriptor, resolver)
+        return result
     }
 
-    private fun getConnectionName(descriptor: ResourceDescriptor) = descriptor.parts[0]
+    private fun getConnectionName(descriptor: ResourceDescriptor) = when (descriptor.parts.size) {
+        3 -> descriptor.parts[0]
+        else -> repoAdmin.connectionDefault
+    }
 
-    private fun getFileStore(descriptor: ResourceDescriptor) = descriptor.parts[1]
+    private fun getFileStore(descriptor: ResourceDescriptor) = when (descriptor.parts.size) {
+        3 -> descriptor.parts[1]
+        2 -> descriptor.parts[0]
+        else -> GridFS.DEFAULT_BUCKET
+    }
 
-    private fun getFileId(descriptor: ResourceDescriptor) = descriptor.parts[2]
+    private fun getFileId(descriptor: ResourceDescriptor) = when (descriptor.parts.size) {
+        3 -> descriptor.parts[2]
+        2 -> descriptor.parts[1]
+        else -> descriptor.parts[0]
+    }
 
 }