Updated to Kotlin M11

kotlin-nosql-mongodb/kotlin-nosql-mongodb.iml

@@ -21,8 +21,6 @@
     <orderEntry type="library" exported="" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="Gradle: org.mongodb:mongo-java-driver:3.0.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: org.mongodb:bson:3.0.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: org.mongodb:mongo-java-driver-core:3.0.0-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.spek:spek:0.1-SNAPSHOT" level="project" />

kotlin-nosql-mongodb/src/main/kotlin/kotlinx/nosql/mongodb/MongoDB.kt

@@ -39,9 +39,9 @@ class MongoDB(seeds: Array<ServerAddress> = array(ServerAddress()), val database
               schemas: Array<out AbstractSchema>, action: SchemaGenerationAction<MongoDBSession> = Validate()) : Database<MongoDBSession>(schemas, action) {
     val seeds = seeds
     val db = MongoClient(seeds.toList(), credentials.toList(), options).getDB(database)!!
-    var session = MongoDBSession(db);
+    var session = MongoDBSession(db)
 
-    {
+    init {
         initialize()
     }
 

kotlin-nosql-mongodb/src/main/kotlin/kotlinx/nosql/mongodb/MongoDBSession.kt

@@ -32,7 +32,7 @@ class MongoDBSession(val db: DB) : Session, DocumentSchemaOperations, TableSchem
     val dbVersion : String
     val searchOperatorSupported: Boolean
 
-    {
+    init {
         val results = db.command("buildInfo")
         dbVersion = results!!.get("version")!!.toString()
         val versions = dbVersion.split('.')
@@ -454,7 +454,7 @@ class MongoDBSession(val db: DB) : Session, DocumentSchemaOperations, TableSchem
             var instance: Any? = null
             val discriminatorValue = doc.get(schema.discriminator.column.name)
             for (discriminator in kotlinx.nosql.DocumentSchema.tableDiscriminators.get(schema.schemaName)!!) {
-                if (discriminator.value.equals(discriminatorValue)) {
+                if (discriminator.value!!.equals(discriminatorValue)) {
                     instance = newInstance(kotlinx.nosql.DocumentSchema.discriminatorClasses.get(discriminator)!!)
                     s = kotlinx.nosql.DocumentSchema.discriminatorSchemas.get(discriminator)!!
                     break

kotlin-nosql-mongodb/src/test/kotlin/kotlinx/nosql/mongodb/test/MongoDBSpek.kt

@@ -3,6 +3,7 @@ package kotlinx.nosql.mongodb.test
 import kotlin.test.assertEquals
 import kotlinx.nosql.*
 import kotlinx.nosql.mongodb.*
+import kotlinx.nosql.mongodb.DocumentSchema
 import org.joda.time.LocalDate
 import org.jetbrains.spek.api.Spek
 import kotlin.test.assertTrue
@@ -46,7 +47,7 @@ class MongoDBSpek : Spek() {
             val pctSavings = integer<T>("pct_savings")
         }
 
-        {
+        init {
             ensureIndex(text = array(title, description))
             ensureIndex(name = "asinIndex", unique = true, ascending = array(asin))
         }
@@ -118,7 +119,7 @@ class MongoDBSpek : Spek() {
     class Track(val title: String, val duration: Int) {
     }
 
-    {
+    init {
         given("a polymorhpic schema") {
             var artistId: Id<String, Artists>? = null
             var artistId2: Id<String, Artists>? = null

kotlin-nosql-redis/src/main/kotlin/kotlinx/nosql/redis/Redis.kt

@@ -11,11 +11,11 @@ import kotlinx.nosql.Session
 class Redis(val password: String = "", schemas: Array<out AbstractSchema>,
               action: SchemaGenerationAction<RedisSession> = Validate()) :
         Database<RedisSession>(schemas, action) {
-    val jedis: Jedis = Jedis("localhost");
-    var session = RedisSession(jedis);
+    val jedis: Jedis = Jedis("localhost")
+    var session = RedisSession(jedis)
 
 
-    {
+    init {
         if (password != "") {
             jedis.auth(password)
         }

kotlin-nosql-redis/src/main/kotlin/kotlinx/nosql/redis/RedisSession.kt

@@ -42,7 +42,7 @@ class RedisSession(val jedis: Jedis) : Session, KeyValueSchemaOperations, KeyVal
             var instance: Any? = null
             val discriminatorValue = reader(this.discriminator.column)
             for (discriminator in kotlinx.nosql.DocumentSchema.tableDiscriminators.get(this.schemaName)!!) {
-                if (discriminator.value.equals(discriminatorValue)) {
+                if (discriminator.value!!.equals(discriminatorValue)) {
                     instance = newInstance(kotlinx.nosql.DocumentSchema.discriminatorClasses.get(discriminator)!!)
                     break
                 }
@@ -58,7 +58,7 @@ class RedisSession(val jedis: Jedis) : Session, KeyValueSchemaOperations, KeyVal
         if (this.discriminator != null) {
             val discriminatorValue = reader(this.discriminator.column)
             for (discriminator in kotlinx.nosql.DocumentSchema.tableDiscriminators.get(this.schemaName)!!) {
-                if (discriminator.value.equals(discriminatorValue)) {
+                if (discriminator.value!!.equals(discriminatorValue)) {
                     s = kotlinx.nosql.DocumentSchema.discriminatorSchemas.get(discriminator)!!
                     break
                 }
@@ -164,7 +164,7 @@ class RedisSession(val jedis: Jedis) : Session, KeyValueSchemaOperations, KeyVal
             var instance: Any? = null
             val discriminatorValue = map.get(schema.discriminator.column.name)
             for (discriminator in kotlinx.nosql.DocumentSchema.tableDiscriminators.get(schema.schemaName)!!) {
-                if (discriminator.value.equals(discriminatorValue)) {
+                if (discriminator.value!!.equals(discriminatorValue)) {
                     instance = newInstance(kotlinx.nosql.DocumentSchema.discriminatorClasses.get(discriminator)!!)
                     s = kotlinx.nosql.DocumentSchema.discriminatorSchemas.get(discriminator)!!
                     break

kotlin-nosql-redis/src/test/kotlin/kotlinx/nosql/redis/test/RedisSpek.kt

@@ -37,7 +37,7 @@ class RedisSpek : Spek() {
     data class Post(val id: Id<Int, Posts>, val body: String) {
     }
 
-    {
+    init {
         given("a key value schema") {
             val redis = Redis(schemas = array(Global, Users, Posts), action = CreateDrop())
 

src/main/kotlin/kotlinx/nosql/AbstractSchema.kt

@@ -16,7 +16,7 @@ abstract class AbstractSchema(val schemaName: String) {
     // val columns = ArrayList<AbstractColumn<*, *, *>>()
 
     // TODO TODO TODO
-    class object {
+    companion object {
         val threadLocale = ThreadLocal<AbstractSchema>()
 
         fun <T: AbstractSchema> current(): T {

src/main/kotlin/kotlinx/nosql/Database.kt

@@ -36,7 +36,7 @@ abstract class Database<S: Session>(val schemas: Array<out AbstractSchema>, val
             if (action is Create) {
                 action.onCreate()
             } else if (action is CreateDrop) {
-                action.onCreate();
+                action.onCreate()
             }
         }
     }
@@ -54,7 +54,7 @@ abstract class Database<S: Session>(val schemas: Array<out AbstractSchema>, val
         }
     }
 
-    class object {
+    companion object {
         val fullColumnNames = ConcurrentHashMap<AbstractColumn<*, *, *>, String>()
     }
 }

src/main/kotlin/kotlinx/nosql/DocumentSchema.kt

@@ -3,9 +3,9 @@ package kotlinx.nosql
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.ConcurrentHashMap
 
-abstract class DocumentSchema<I, out D>(name: String, val valueClass: Class<D>, primaryKey: AbstractColumn<I,
+abstract class DocumentSchema<I, D>(name: String, val valueClass: Class<D>, primaryKey: AbstractColumn<I,
         out DocumentSchema<I, D>, I>, val discriminator: Discriminator<out Any, out DocumentSchema<I, D>>? = null) : TableSchema<I>(name, primaryKey) {
-    {
+    init {
         if (discriminator != null) {
             val emptyDiscriminators = CopyOnWriteArrayList<Discriminator<*, *>>()
             val discriminators = tableDiscriminators.putIfAbsent(name, emptyDiscriminators)
@@ -20,7 +20,7 @@ abstract class DocumentSchema<I, out D>(name: String, val valueClass: Class<D>,
         }
     }
 
-    class object {
+    companion object {
         val tableDiscriminators = ConcurrentHashMap<String, MutableList<Discriminator<*, *>>>()
         val discriminatorClasses = ConcurrentHashMap<Discriminator<*, *>, Class<*>>()
         val discriminatorSchemaClasses = ConcurrentHashMap<Discriminator<*, *>, Class<*>>()

src/main/kotlin/kotlinx/nosql/PrimaryKey.kt

@@ -1,7 +1,7 @@
 package kotlinx.nosql
 
 open class PrimaryKey<I>(val name: String, val javaClass: Class<I>, val columnType: ColumnType) {
-    class object {
+    companion object {
         fun string(name: String) = PrimaryKey<String>(name, javaClass<String>(), ColumnType.STRING)
         fun integer(name: String) = PrimaryKey<Int>(name, javaClass<Int>(), ColumnType.INTEGER)
     }

src/main/kotlin/kotlinx/nosql/Session.kt

@@ -23,7 +23,7 @@ trait Session {
 
     internal fun <T> removeAll(schema: AbstractSchema, column: AbstractColumn<Collection<T>, *, *>, removeOp: Query, op: Query): Int
 
-    class object {
+    companion object {
         val threadLocale = ThreadLocal<Session>()
 
         fun <T> current(): T {

src/main/kotlin/kotlinx/nosql/TableSchemaProjectionQueryWrapper.kt

@@ -15,7 +15,7 @@ class TableSchemaProjectionQueryWrapper<T : TableSchema<P>, P, V>(val params: Ta
         return this
     }
 
-    class object {
+    companion object {
         val threadLocal = ThreadLocal<TableSchemaProjectionQueryWrapper<out TableSchema<*>, *, *>>()
 
         fun get(): TableSchemaProjectionQueryWrapper<out TableSchema<*>, *, *> {

src/main/kotlin/kotlinx/nosql/util/SchemaUtils.kt

@@ -15,7 +15,7 @@ fun getAllFields(_type: Class<in Any>, condition: (Field) -> Boolean = { f -> tr
         if (condition(field)) fields.add(field)
     }
     if (_type.getSuperclass() != null) {
-        getAllFields(_type.getSuperclass()!!, condition, fields);
+        getAllFields(_type.getSuperclass()!!, condition, fields)
     }
     return fields
 }
@@ -26,7 +26,7 @@ fun getAllFieldsMap(_type: Class<in Any>, condition: (Field) -> Boolean = { f ->
         if (condition(field)) fields.put(field.getName()!!.toLowerCase(), field)
     }
     if (_type.getSuperclass() != null) {
-        getAllFieldsMap(_type.getSuperclass()!!, condition, fields);
+        getAllFieldsMap(_type.getSuperclass()!!, condition, fields)
     }
     return fields
 }