* Upgrade spring boot2 libraries

* Align with the micro services architect
* Fox kotlin spring integration issues

Author: hainguyen

mycollab-app-community/src/main/config/mycollab.properties.ftl

@@ -1,5 +1,5 @@
 #=====================================================
-# You can visit link https://community.mycollab.com/configuration/
+# You can visit link http://community.mycollab.com/configuration/
 # to get all configuration fieldBuilder and their meanings
 #=====================================================
 

mycollab-app-community/src/main/docker/app.yml

@@ -1,14 +1,14 @@
 version: '3.1'
 services:
     hlsoft-mysql:
-        image: mysql:latest
+        image: mysql:8.0.11
         restart: always
         hostname: mysql
         command: mysqld --default-authentication-plugin=mysql_native_password
         ports:
             - "3306:3306"
         environment:
-            MYSQL_ROOT_PASSWORD: esofthead321
+            MYSQL_ROOT_PASSWORD: mycollab123
             MYSQL_DATABASE: mycollab
     hlsoft-app:
         image: mycollab/mycollab

mycollab-caching/src/main/java/com/mycollab/cache/service/impl/InfinispanCacheService.kt

@@ -30,12 +30,12 @@ import org.springframework.stereotype.Service
  * @since 5.1.4
  */
 @Service
-@Profile("production")
+@Profile("program")
 class InfinispanCacheService(private val instance: EmbeddedCacheManager) : CacheService {
 
     override fun putValue(group: String, key: String, value: Any) {
         val cache = getCache(group)
-        cache.put(key, value)
+        cache[key] = value
     }
 
     private fun getCache(group: String): BasicCache<String, Any> {

mycollab-caching/src/main/java/com/mycollab/cache/spring/CacheConfiguration.kt

@@ -24,11 +24,11 @@ import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Profile
 
 @Configuration
-@Profile("production")
-open class CacheConfiguration {
+@Profile("program")
+class CacheConfiguration {
 
     @Bean
-    open fun cacheConfigurer(): InfinispanCacheConfigurer {
+    fun cacheConfigurer(): InfinispanCacheConfigurer {
         return InfinispanCacheConfigurer {
             val ispnConfig = ConfigurationBuilder()
                     .clustering()

mycollab-caching/src/main/java/com/mycollab/concurrent/DistributionLockUtil.kt

@@ -35,16 +35,13 @@ object DistributionLockUtil {
 
     private val map = Collections.synchronizedMap(ReferenceMap(AbstractReferenceMap.WEAK, AbstractReferenceMap.WEAK))
 
-    @JvmStatic fun getLock(lockName: String): Lock {
-        return try {
-            val lockService = AppContextUtil.getSpringBean(DistributionLockService::class.java)
-            val lock = lockService.getLock(lockName)
-            lock ?: getStaticDefaultLock(lockName)
-        } catch (e: Exception) {
-            LOG.warn("Can not get lock service", e)
-            getStaticDefaultLock(lockName)
-        }
-
+    @JvmStatic fun getLock(lockName: String): Lock = try {
+        val lockService = AppContextUtil.getSpringBean(DistributionLockService::class.java)
+        val lock = lockService.getLock(lockName)
+        lock ?: getStaticDefaultLock(lockName)
+    } catch (e: Exception) {
+        LOG.warn("Can not get lock service")
+        getStaticDefaultLock(lockName)
     }
 
     @JvmStatic fun removeLock(lockName: String) {
@@ -57,7 +54,7 @@ object DistributionLockUtil {
             when (lock) {
                 null -> {
                     lock = ReentrantLock()
-                    map.put(lockName, lock)
+                    map[lockName] = lock
                 }
             }
             return lock!!

mycollab-client-api/src/main/kotlin/com/mycollab/module/project/rest/ProjectController.kt

@@ -23,7 +23,7 @@ class ProjectController {
     @Autowired
     private lateinit var projectService: ProjectService
 
-    @RequestMapping(method = arrayOf(RequestMethod.GET))
+    @RequestMapping(method = [(RequestMethod.GET)])
     fun list(@PathVariable accountId: Int,
              @RequestParam(value = "offset", required = false, defaultValue = "0") offset: Int?,
              @RequestParam(value = "limit", required = false) limit: Int?): List<*> {

mycollab-config/pom.xml

@@ -29,5 +29,11 @@
             <artifactId>jasypt</artifactId>
             <version>1.9.2</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker-gae</artifactId>
+            <version>2.3.28</version>
+        </dependency>
     </dependencies>
 </project>

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

@@ -25,14 +25,16 @@ import org.springframework.stereotype.Component
  * @since 5.5.0
  */
 @Component
-@Profile("production", "test")
+@Profile("program", "test")
 @ConfigurationProperties(prefix = "app")
-open class ApplicationConfiguration(var description: String? = "", var facebookUrl: String? = "",
+open class ApplicationConfiguration(var siteName: String = "MyCollab", var description: String? = "", var facebookUrl: String? = "",
                                var twitterUrl: String? = "", var googleUrl: String? = "",
-                               var linkedinUrl: String? = "") {
+                               var linkedinUrl: String? = "", var notifyEmail: String) {
 
-    fun defaultUrls(): MutableMap<String, String> =
-            mutableMapOf<String, String>("facebook_url" to (facebookUrl ?: ""),
+    constructor(): this("", "", "", "", "", "", "")
+
+    fun defaultUrls() =
+            mutableMapOf("facebook_url" to (facebookUrl ?: ""),
                     "google_url" to (googleUrl ?: ""),
                     "linkedin_url" to (linkedinUrl ?: ""),
                     "twitter_url" to (twitterUrl ?: ""))

mycollab-config/src/main/java/com/mycollab/configuration/ApplicationProperties.java

@@ -40,14 +40,6 @@ public class ApplicationProperties {
 
     private static Properties properties;
 
-    public static final String DB_USERNAME = "db.username";
-    public static final String DB_PASSWORD = "db.password";
-    public static final String DB_DRIVER_CLASS = "db.driverClassName";
-    public static final String DB_URL = "db.url";
-
-    public static final String CDN_URL = "cdn.url";
-    public static final String APP_URL = "app.url";
-
     public static final String MAIL_SMTPHOST = "mail.smtphost";
     public static final String MAIL_PORT = "mail.port";
     public static final String MAIL_USERNAME = "mail.username";
@@ -56,11 +48,6 @@ public class ApplicationProperties {
     public static final String MAIL_IS_SSL = "mail.isSSL";
     public static final String MAIL_NOTIFY = "mail.notify";
 
-    public static final String ERROR_SENDTO = "error.sendTo";
-
-    public static final String SITE_NAME = "site.name";
-    public static final String SERVER_ADDRESS = "server.address";
-
     public static final String DROPBOX_AUTH_LINK = "dropbox.callbackUrl";
 
     public static final String BI_ENDECRYPT_PASSWORD = "endecryptPassword";

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

@@ -14,29 +14,18 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/**
- * mycollab-config - Parent pom providing dependency and plugin management for applications
-built with Maven
- * Copyright © 2017 MyCollab (support@mycollab.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
 package com.mycollab.configuration
 
+import org.springframework.boot.context.properties.ConfigurationProperties
+import org.springframework.context.annotation.Profile
+import org.springframework.stereotype.Component
+
 /**
  * @author MyCollab Ltd
  * @since 6.0.0
  */
-class DatabaseConfiguration(var driverClass: String, var url: String,
-                            var user: String, var password: String)
+@Profile("program")
+@Component
+@ConfigurationProperties(prefix = "spring.datasource")
+class DatabaseConfiguration(var driverClassName: String = "", var url: String = "",
+                            var username: String = "", var password: String = "")