Minor changes

Author: hainguyen

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

@@ -23,7 +23,7 @@ package com.mycollab.core
  * @author MyCollab Ltd.
  * @since 1.0
  */
-class MyCollabException : RuntimeException {
+open 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
  */
-class SecureAccessException : MyCollabException {
+open 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
  */
-class UserInvalidInputException : MyCollabException {
+open 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
  */
-class ValuedBean: Serializable {
+open class ValuedBean: Serializable {
 
     @JsonIgnore
     @NotBindable

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

@@ -20,16 +20,16 @@ package com.mycollab.db.arguments
  * @author MyCollab Ltd
  * @since 6.0.0
  */
-class NumberSearchField constructor(operation: String, var value: Int?, var compareOperator: String) : SearchField(operation) {
+open 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)
 
     companion object {
-        @JvmField val EQUAL = "="
-        @JvmField val NOT_EQUAL = "<>"
-        @JvmField val LESS_THAN = "<"
-        @JvmField val GREATER = ">"
+        const val EQUAL = "="
+        const val NOT_EQUAL = "<>"
+        const val LESS_THAN = "<"
+        const val GREATER = ">"
 
         @JvmStatic fun equal(value: Int) = NumberSearchField(SearchField.AND, value, EQUAL)
 

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

@@ -24,7 +24,7 @@ import java.io.Serializable
  * @author MyCollab Ltd.
  * @since 1.0
  */
-class SearchField : Serializable {
+open class SearchField : Serializable {
 
     var operation = AND
 
@@ -34,17 +34,13 @@ class SearchField : Serializable {
         this.operation = operation
     }
 
-    override fun toString(): String {
-        return BeanUtility.printBeanObj(this)
-    }
+    override fun toString(): String = BeanUtility.printBeanObj(this)
 
     companion object {
         private const val serialVersionUID = 1L
 
-        @JvmField
-        val OR = "OR"
+        const val OR = "OR"
 
-        @JvmField
-        val AND = "AND"
+        const val AND = "AND"
     }
 }

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

@@ -20,8 +20,8 @@ package com.mycollab.db.arguments
  * @author MyCollab Ltd
  * @since 6.0.0
  */
-class SearchRequest(var currentPage: Int, var numberOfItems: Int) {
+open class SearchRequest(var currentPage: Int, var numberOfItems: Int) {
     companion object {
-        @JvmField val DEFAULT_NUMBER_SEARCH_ITEMS = 25
+        const val DEFAULT_NUMBER_SEARCH_ITEMS = 25
     }
 }

mycollab-dao/src/main/java/com/mycollab/db/query/BooleanParam.kt

@@ -16,8 +16,7 @@ class BooleanParam(id: String, table: String, column: String) : ColumnParam(id,
             }
 
     companion object {
-        @JvmField
-        val IS = "is"
+        const val IS = "is"
 
         @JvmField
         val OPTIONS = arrayOf(IS)

mycollab-dao/src/main/java/com/mycollab/db/query/ColumnParam.kt

@@ -20,4 +20,4 @@ package com.mycollab.db.query
  * @author MyCollab Ltd.
  * @since 4.0
  */
-class ColumnParam(id: String, var table: String, var column: String) : Param(id)
+open class ColumnParam(id: String, var table: String, var column: String) : Param(id)

mycollab-dao/src/main/java/com/mycollab/security/BooleanPermissionFlag.kt

@@ -26,26 +26,26 @@ import com.mycollab.common.i18n.SecurityI18nEnum
  */
 class BooleanPermissionFlag : PermissionFlag() {
     companion object {
-        @JvmField val TRUE = 128
+        const val TRUE = 128
 
-        @JvmField val FALSE = 129
+        const val FALSE = 129
 
         /**
          * Check whether `flag` is true permission
          *
          * @param flag
          * @return
          */
-        fun beTrue(flag: Int?): Boolean = flag == TRUE
+        fun beTrue(flag: Int?) = flag == TRUE
 
         /**
          * Check whether `flag` is false permission
          *
          * @param flag
          * @return
          */
-        fun beFalse(flag: Int?): Boolean = flag == FALSE
+        fun beFalse(flag: Int?) = flag == FALSE
 
-        fun toKey(flag: Int?): SecurityI18nEnum = if (flag == TRUE) SecurityI18nEnum.YES else SecurityI18nEnum.NO
+        fun toKey(flag: Int?) = if (flag == TRUE) SecurityI18nEnum.YES else SecurityI18nEnum.NO
     }
 }