Repository -> Store, introduced repository with oak deps

Author: pun-ky

framework/build.gradle

@@ -26,6 +26,7 @@ dependencies {
     osgiBundle project(':presentation:view:pebble')
     osgiBundle project(':presentation:view:handlebars')
     osgiBundle project(':storage:database')
+    osgiBundle project(':storage:store')
     osgiBundle project(':storage:repository')
     osgiBundle project(':processing:scheduler')
     osgiBundle project(':security:auth')

framework/src/main/kotlin/com/neva/javarel/framework/api/rest/Controller.kt

@@ -7,7 +7,7 @@ import com.neva.javarel.presentation.view.api.View
 import com.neva.javarel.resource.api.ResourceResolver
 import com.neva.javarel.security.auth.api.Guard
 import com.neva.javarel.storage.database.api.DatabaseAdmin
-import com.neva.javarel.storage.repository.api.RepositoryAdmin
+import com.neva.javarel.storage.store.api.StoreAdmin
 import javax.inject.Inject
 
 abstract class Controller {
@@ -19,7 +19,7 @@ abstract class Controller {
     protected lateinit var dbAdmin: DatabaseAdmin
 
     @Osgi
-    protected lateinit var repoAdmin: RepositoryAdmin
+    protected lateinit var storeAdmin: StoreAdmin
 
     @Osgi
     protected lateinit var urlGenerator: UrlGenerator

settings.gradle

@@ -10,5 +10,6 @@ include ':presentation:view:handlebars'
 include ':processing:scheduler'
 include ':security:auth'
 include ':storage:database'
+include ':storage:store'
 include ':storage:repository'
 include ':framework'

storage/database/build.gradle

@@ -2,7 +2,7 @@ buildscript {
     apply from: rootProject.file('buildscript.gradle'), to: buildscript
 }
 
-description = 'Javarel :: Storage Database (JPA)'
+description = 'Javarel :: Storage Database'
 
 apply plugin: 'kotlin'
 apply plugin: 'maven-publish'

storage/repository/build.gradle

@@ -2,7 +2,7 @@ buildscript {
     apply from: rootProject.file('buildscript.gradle'), to: buildscript
 }
 
-description = 'Javarel :: Storage Repository (Morphia)'
+description = 'Javarel :: Storage Repository'
 
 apply plugin: 'kotlin'
 apply plugin: 'maven-publish'
@@ -20,8 +20,5 @@ dependencies {
     compile project(':foundation')
     compile project(':resource')
 
-    osgiBundle 'org.mongodb.morphia:morphia:1.2.1', { transitive = false }
-    osgiBundle group: 'org.apache.servicemix.bundles', name: 'org.apache.servicemix.bundles.cglib', version: '3.2.4_1'
-    osgiBundle group: 'com.thoughtworks.proxytoys', name: 'proxytoys', version: '1.0', { transitive = false }
-    osgiBundle group: 'org.mongodb', name: 'mongo-java-driver', version: '3.3.0', { transitive = false }
+    // ...
 }

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

@@ -0,0 +1,27 @@
+buildscript {
+    apply from: rootProject.file('buildscript.gradle'), to: buildscript
+}
+
+description = 'Javarel :: Storage Store (noSQL)'
+
+apply plugin: 'kotlin'
+apply plugin: 'maven-publish'
+apply plugin: 'neva.osgi-module'
+apply plugin: 'neva.scr'
+
+jar {
+    manifest {
+        name project.description
+        instruction 'Export-Package', "com.neva.javarel.storage.store.api.*;version=${project.version}"
+    }
+}
+
+dependencies {
+    compile project(':foundation')
+    compile project(':resource')
+
+    osgiBundle 'org.mongodb.morphia:morphia:1.2.1', { transitive = false }
+    osgiBundle group: 'org.apache.servicemix.bundles', name: 'org.apache.servicemix.bundles.cglib', version: '3.2.4_1'
+    osgiBundle group: 'com.thoughtworks.proxytoys', name: 'proxytoys', version: '1.0', { transitive = false }
+    osgiBundle group: 'org.mongodb', name: 'mongo-java-driver', version: '3.3.0', { transitive = false }
+}

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

@@ -1,12 +1,12 @@
-package com.neva.javarel.storage.repository.api
+package com.neva.javarel.storage.store.api
 
 import com.mongodb.DB
 import com.mongodb.gridfs.GridFS
 import org.mongodb.morphia.Datastore
 
-interface Repository {
+interface Store {
 
-    val connection: RepositoryConnection
+    val connection: StoreConnection
 
     val db: DB
 

storage/store/build.gradle

@@ -0,0 +1,30 @@
+package com.neva.javarel.storage.store.api
+
+interface StoreAdmin {
+
+    /**
+     * Name of default connection
+     */
+    val connectionDefault: String
+
+    /**
+     * Select default store
+     */
+    fun store(): Store
+
+    /**
+     * Select one of available stores using connection name
+     */
+    fun store(connectionName: String): Store
+
+    /**
+     * Available store connections
+     */
+    val connections: Set<StoreConnection>
+
+    /**
+     * Connected stores
+     */
+    val connectedStores: Set<Store>
+
+}

storage/repository/src/main/kotlin/com/neva/javarel/storage/repository/api/Repository.kt storage/store/src/main/kotlin/com/neva/javarel/storage/store/api/Store.kt

@@ -1,8 +1,8 @@
-package com.neva.javarel.storage.repository.api
+package com.neva.javarel.storage.store.api
 
 import com.mongodb.MongoClient
 
-interface RepositoryConnection {
+interface StoreConnection {
 
     val name : String
 

storage/store/src/main/kotlin/com/neva/javarel/storage/store/api/StoreAdmin.kt

@@ -1,6 +1,6 @@
-package com.neva.javarel.storage.repository.api
+package com.neva.javarel.storage.store.api
 
-open class RepositoryException : Exception {
+open class StoreException : Exception {
 
     constructor(message: String) : super(message)
 

storage/repository/src/main/kotlin/com/neva/javarel/storage/repository/api/RepositoryConnection.kt storage/store/src/main/kotlin/com/neva/javarel/storage/store/api/StoreConnection.kt

@@ -1,21 +1,21 @@
-package com.neva.javarel.storage.repository.api
+package com.neva.javarel.storage.store.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 com.neva.javarel.storage.store.impl.StoreFileResourceProvider
 import java.io.InputStream
 
-class RepositoryFileResource(
+class StoreFileResource(
         val file: GridFSDBFile,
         override val descriptor: ResourceDescriptor,
         override val resolver: ResourceResolver
 ) : AdaptableResource() {
 
     companion object {
         fun uri(connection: String, fileStore: String, fileId: String): String {
-            return "${RepositoryFileResourceProvider.PROTOCOL}://$connection/$fileStore/$fileId"
+            return "${StoreFileResourceProvider.PROTOCOL}://$connection/$fileStore/$fileId"
         }
     }
 

storage/repository/src/main/kotlin/com/neva/javarel/storage/repository/api/RepositoryException.kt storage/store/src/main/kotlin/com/neva/javarel/storage/store/api/StoreException.kt

@@ -0,0 +1,49 @@
+package com.neva.javarel.storage.store.api.store
+
+import com.neva.javarel.storage.store.api.Store
+import org.bson.types.ObjectId
+import org.mongodb.morphia.Key
+import org.mongodb.morphia.query.Query
+import kotlin.reflect.KClass
+
+abstract class DomainStore<T : Any>(protected val base: Store, protected val domainClass: KClass<T>) {
+
+    val all: List<T>
+        get() = fetchQuery(createQuery())
+
+    fun save(entity: T): Key<T> {
+        val result = base.dataStore.save(entity)
+
+        init(entity)
+
+        return result
+    }
+
+    protected fun createQuery() = base.dataStore.createQuery(domainClass.java)
+
+    protected fun fetchQuery(query: Query<T>): List<T> {
+        val entities = query.asList()
+
+        entities.forEach { init(it) }
+
+        return entities
+    }
+
+    open protected fun init(entity: T) {
+        // use file storage to post construct entity
+    }
+
+    fun find(id: String): T? {
+        val entity = base.dataStore.get<T, ObjectId>(domainClass.java, ObjectId(id))
+        if (entity != null) {
+            init(entity)
+        }
+
+        return entity
+    }
+
+    fun delete(entity: T) {
+        base.dataStore.delete(entity)
+    }
+
+}