feat($Kotlin): support Kotlin 1.6.10 with Java 17

support Kotlin 1.6.10 with Java 17

BREAKING CHANGE: support Kotlin 1.6.10 with Java 17

auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/permission/service/PermissionService.java → auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/permission/service/PermissionService.kt

@@ -1,32 +1,33 @@
-package com.jmsoftware.maf.authcenter.permission.service;
+package com.jmsoftware.maf.authcenter.permission.service
 
-import com.jmsoftware.maf.authcenter.permission.response.GetServicesInfoResponse;
-import com.jmsoftware.maf.common.domain.authcenter.permission.GetPermissionListByRoleIdListPayload;
-import com.jmsoftware.maf.common.domain.authcenter.permission.GetPermissionListByRoleIdListResponse;
-import org.springframework.validation.annotation.Validated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import com.jmsoftware.maf.authcenter.permission.response.GetServicesInfoResponse
+import com.jmsoftware.maf.common.domain.authcenter.permission.GetPermissionListByRoleIdListPayload
+import com.jmsoftware.maf.common.domain.authcenter.permission.GetPermissionListByRoleIdListResponse
+import org.springframework.validation.annotation.Validated
+import javax.validation.Valid
+import javax.validation.constraints.NotNull
 
 /**
  * Description: PermissionServiceImpl, change description here.
  *
  * @author Johnny Miller (鍾俊), e-mail: johnnysviva@outlook.com, date: 2/18/2022 11:22 PM
  **/
 @Validated
-public interface PermissionService {
+interface PermissionService {
     /**
      * Gets permission list by role id list.
      *
      * @param payload the payload
      * @return the permission list by role id list
      */
-    GetPermissionListByRoleIdListResponse getPermissionListByRoleIdList(@Valid @NotNull GetPermissionListByRoleIdListPayload payload);
+    fun getPermissionListByRoleIdList(
+            payload: @Valid @NotNull GetPermissionListByRoleIdListPayload
+    ): GetPermissionListByRoleIdListResponse
 
     /**
      * Gets services info.
      *
      * @return the services info
      */
-    GetServicesInfoResponse getServicesInfo();
+    fun getServicesInfo(): GetServicesInfoResponse
 }

auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/permission/service/impl/PermissionServiceImpl.kt

@@ -0,0 +1,108 @@
+@file:Suppress("HttpUrlsUsage")
+
+package com.jmsoftware.maf.authcenter.permission.service.impl
+
+import cn.hutool.core.collection.CollUtil
+import cn.hutool.core.text.CharSequenceUtil.format
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.google.common.collect.Lists
+import com.jmsoftware.maf.authcenter.permission.configuration.PermissionConfiguration
+import com.jmsoftware.maf.authcenter.permission.converter.PermissionMapStructMapper
+import com.jmsoftware.maf.authcenter.permission.persistence.Permission
+import com.jmsoftware.maf.authcenter.permission.response.GetServicesInfoResponse
+import com.jmsoftware.maf.authcenter.permission.response.GetServicesInfoResponse.ServiceInfo
+import com.jmsoftware.maf.authcenter.permission.service.PermissionDomainService
+import com.jmsoftware.maf.authcenter.permission.service.PermissionService
+import com.jmsoftware.maf.authcenter.role.service.RoleDomainService
+import com.jmsoftware.maf.common.bean.ResponseBodyBean
+import com.jmsoftware.maf.common.domain.authcenter.permission.GetPermissionListByRoleIdListPayload
+import com.jmsoftware.maf.common.domain.authcenter.permission.GetPermissionListByRoleIdListResponse
+import com.jmsoftware.maf.common.domain.authcenter.permission.PermissionType
+import com.jmsoftware.maf.common.domain.springbootstarter.HttpApiResourcesResponse
+import com.jmsoftware.maf.springcloudstarter.function.Slf4j.lazyDebug
+import org.slf4j.LoggerFactory
+import org.springframework.cloud.client.discovery.DiscoveryClient
+import org.springframework.stereotype.Service
+import org.springframework.web.client.RestTemplate
+import java.util.*
+import javax.validation.Valid
+import javax.validation.constraints.NotNull
+
+/**
+ * # PermissionServiceImpl
+ *
+ * Change description here.
+ *
+ * @author Johnny Miller (鍾俊), e-mail: johnnysviva@outlook.com, date: 2/18/2022 11:37 PM
+ */
+@Service
+class PermissionServiceImpl(
+        private val permissionDomainService: PermissionDomainService,
+        private val roleDomainService: RoleDomainService,
+        private val discoveryClient: DiscoveryClient,
+        private val restTemplate: RestTemplate,
+        private val permissionConfiguration: PermissionConfiguration,
+        private val objectMapper: ObjectMapper,
+) : PermissionService {
+    companion object {
+        private val log = LoggerFactory.getLogger(this::class.java)
+    }
+
+    override fun getPermissionListByRoleIdList(
+            payload: @Valid @NotNull GetPermissionListByRoleIdListPayload
+    ): GetPermissionListByRoleIdListResponse {
+        val adminRole = roleDomainService.checkAdmin(payload.roleIdList)
+        val response = GetPermissionListByRoleIdListResponse()
+        response.permissionList = Lists.newArrayList()
+        if (adminRole) {
+            log.warn("Admin role checked. The role can access any resources")
+            val permission = GetPermissionListByRoleIdListResponse.Permission()
+            permission.url = "/**"
+            permission.type = PermissionType.BUTTON.type
+            permission.permissionExpression = "admin-permission"
+            permission.method = "*"
+            response.permissionList.add(permission)
+            return response
+        }
+        val permissionList = permissionDomainService.getPermissionListByRoleIdList(
+                payload.roleIdList, payload.permissionTypeList)
+        response.permissionList = permissionList
+                .stream()
+                .map { permission: Permission -> PermissionMapStructMapper.INSTANCE.of(permission) }
+                .toList()
+        return response
+    }
+
+    override fun getServicesInfo(): GetServicesInfoResponse {
+        val serviceIdList = discoveryClient.services
+        log.info("Getting service info from Service ID list: {}", serviceIdList)
+        val response = GetServicesInfoResponse()
+        log.info("Ignored service ID: {}", permissionConfiguration.ignoredServiceIds)
+        response.list = serviceIdList.stream()
+                .filter { serviceId: String ->
+                    !CollUtil.contains(
+                            permissionConfiguration.ignoredServiceIds,
+                            serviceId
+                    )
+                }
+                .parallel()
+                .map { serviceId: String ->
+                    val responseBodyBean = restTemplate.getForObject(
+                            format("http://{}/http-api-resources", serviceId), ResponseBodyBean::class.java,
+                    )!!
+                    val httpApiResourcesResponse = objectMapper.convertValue(
+                            Objects.requireNonNull(responseBodyBean).data,
+                            HttpApiResourcesResponse::class.java
+                    )
+                    val serviceInfo = ServiceInfo()
+                    serviceInfo.serviceId = serviceId
+                    serviceInfo.httpApiResources = httpApiResourcesResponse
+                    lazyDebug(log) { format("Added serviceInfo: {}", serviceInfo) }
+                    serviceInfo
+                }.toList()
+        if (CollUtil.isEmpty(response.list)) {
+            log.warn("Got am empty ServiceInfo list")
+        }
+        return response
+    }
+}