* Align with the new micro service architect of the cloud edition

* Update the dependencies
* Update Kotlin syntax with the new Kotlin Spring support

Author: hainguyen

mycollab-config/src/main/java/com/mycollab/configuration/ApplicationConfiguration.kt

@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component
 @Component
 @Profile("program", "test")
 @ConfigurationProperties(prefix = "app")
-open class ApplicationConfiguration(var siteName: String = "MyCollab", var description: String? = "", var facebookUrl: String? = "",
+class ApplicationConfiguration(var siteName: String = "MyCollab", var description: String? = "", var facebookUrl: String? = "",
                                var twitterUrl: String? = "", var googleUrl: String? = "",
                                var linkedinUrl: String? = "", var notifyEmail: String) {
 

mycollab-config/src/main/java/com/mycollab/configuration/EmailConfiguration.kt

@@ -30,7 +30,7 @@ import org.springframework.stereotype.Component
 @Component
 @Profile("program")
 @ConfigurationProperties(prefix = "mail")
-open class EmailConfiguration(var smtphost: String?, var username: String?,
+class EmailConfiguration(var smtphost: String?, var username: String?,
                               var password: String?, var port: Int,
                               var startTls: Boolean = false, var ssl: Boolean = false,
                               var notifyEmail: String) : ValuedBean() {

mycollab-config/src/main/java/com/mycollab/configuration/ServerConfiguration.kt

@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component
 @Component
 @Profile("program")
 @ConfigurationProperties(prefix = "server")
-open class ServerConfiguration(var storageSystem: String = STORAGE_FILE, var port: Int? = 8080,
+class ServerConfiguration(var storageSystem: String = STORAGE_FILE, var port: Int? = 8080,
                                var address: String?,
                                var apiUrl: String, var pullMethod: String?, var siteUrl: String,
                                var resourceDownloadUrl: String, var cdnUrl: String) {

mycollab-core/src/main/java/com/mycollab/core/MyCollabException.kt

@@ -23,7 +23,7 @@ package com.mycollab.core
  * @author MyCollab Ltd.
  * @since 1.0
  */
-open class MyCollabException : RuntimeException {
+class MyCollabException : RuntimeException {
 
     constructor(message: String) : super(message) {}
 

mycollab-core/src/main/java/com/mycollab/core/SecureAccessException.kt

@@ -20,7 +20,7 @@ package com.mycollab.core
  * @author MyCollab Ltd
  * @since 5.1.3
  */
-open class SecureAccessException : MyCollabException {
+class SecureAccessException : MyCollabException {
     constructor() : super("")
 
     constructor(message: String) : super(message) {}

mycollab-core/src/main/java/com/mycollab/core/UserInvalidInputException.kt

@@ -24,7 +24,7 @@ package com.mycollab.core
  * @author MyCollab Ltd.
  * @since 1.0
  */
-open class UserInvalidInputException : MyCollabException {
+class UserInvalidInputException : MyCollabException {
 
     constructor(message: String) : super(message)
 

mycollab-core/src/main/java/com/mycollab/core/arguments/ValuedBean.kt

@@ -25,7 +25,7 @@ import java.io.Serializable
  * @author MyCollab Ltd.
  * @since 1.0
  */
-open class ValuedBean: Serializable {
+class ValuedBean: Serializable {
 
     @JsonIgnore
     @NotBindable

mycollab-core/src/main/java/com/mycollab/logging/ExceptionFilter.kt

@@ -56,8 +56,7 @@ class ExceptionFilter : Filter<ILoggingEvent>() {
             arrayOf()
         }
 
-        private fun isInstanceInBlackList(cls: Class<*>, throwable: Throwable): Boolean {
-            return cls.isInstance(throwable) || throwable.cause != null && isInstanceInBlackList(cls, throwable.cause as Throwable)
-        }
+        private fun isInstanceInBlackList(cls: Class<*>, throwable: Throwable): Boolean =
+                cls.isInstance(throwable) || throwable.cause != null && isInstanceInBlackList(cls, throwable.cause as Throwable)
     }
 }

mycollab-dao/pom.xml

@@ -18,13 +18,13 @@
             <artifactId>mybatis</artifactId>
             <version>3.4.6</version>
         </dependency>
-
+<!--
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>1.3.2</version>
         </dependency>
-
+-->
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis-spring</artifactId>

mycollab-dao/src/main/java/com/mycollab/db/arguments/NumberSearchField.kt

@@ -20,7 +20,7 @@ package com.mycollab.db.arguments
  * @author MyCollab Ltd
  * @since 6.0.0
  */
-open class NumberSearchField constructor(operation: String, var value: Int?, var compareOperator: String) : SearchField(operation) {
+class NumberSearchField constructor(operation: String, var value: Int?, var compareOperator: String) : SearchField(operation) {
     constructor(value: Int) : this(SearchField.AND, value, NumberSearchField.EQUAL)
 
     constructor(value: Int, compareOperator: String) : this(SearchField.AND, value, compareOperator)