diff --git a/pom.xml b/pom.xml index ab099bd9..100776db 100644 --- a/pom.xml +++ b/pom.xml @@ -43,9 +43,9 @@ - 17.0.2_8-jre + 17.0.3_7-jre 3.2.0 0.1.0 3.15.0 @@ -62,12 +62,12 @@ 5.7.22 31.1-jre 1.6.6 - 0.11.2 + 0.11.5 1.0.2 2.2.6 5.2.2 7.1.1 - 8.3.8 + 8.3.9 4.8.1 2.3.0 1.4.2.Final @@ -91,7 +91,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/helper/HttpApiScanHelper.kt b/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/helper/HttpApiScanHelper.kt index 824ee101..aaf8f228 100644 --- a/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/helper/HttpApiScanHelper.kt +++ b/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/helper/HttpApiScanHelper.kt @@ -19,7 +19,7 @@ class HttpApiScanHelper( private val requestMappingHandlerMapping: RequestMappingHandlerMapping ) { companion object { - private var EXCLUDED_PACKAGE: String + private val EXCLUDED_PACKAGE: String private val log = logger() init { diff --git a/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/poi/AbstractExcelDataController.kt b/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/poi/AbstractExcelDataController.kt index 9d7177d5..5875aa96 100644 --- a/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/poi/AbstractExcelDataController.kt +++ b/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/poi/AbstractExcelDataController.kt @@ -37,12 +37,12 @@ abstract class AbstractExcelDataController { private val log = logger() } - protected val beanList: ThreadLocal?> = ThreadLocal.withInitial { null } - protected val workbook: ThreadLocal = ThreadLocal.withInitial { null } - protected val excelFilePath: ThreadLocal = ThreadLocal.withInitial { null } - protected val exceptionOccurred: ThreadLocal = ThreadLocal.withInitial { false } - protected val errorMessageList: ThreadLocal> = ThreadLocal.withInitial { mutableListOf() } - protected val returnMessageList: ThreadLocal> = ThreadLocal.withInitial { mutableListOf() } + private val beanList: ThreadLocal?> = ThreadLocal.withInitial { null } + private val workbook: ThreadLocal = ThreadLocal.withInitial { null } + private val excelFilePath: ThreadLocal = ThreadLocal.withInitial { null } + private val exceptionOccurred: ThreadLocal = ThreadLocal.withInitial { false } + private val errorMessageList: ThreadLocal?> = ThreadLocal.withInitial { null } + private val returnMessageList: ThreadLocal?> = ThreadLocal.withInitial { null } /** * `fileName` stores the name to upload the workbook when exception occurred @@ -55,7 +55,7 @@ abstract class AbstractExcelDataController { * | Excel Column Name | excelColumnName | * | Title Name | titleName | */ - protected val importingFieldAliasMap: MutableMap = Maps.newLinkedHashMap() + private val importingFieldAliasMap: MutableMap = Maps.newLinkedHashMap() /** * | Key | Value | @@ -63,7 +63,7 @@ abstract class AbstractExcelDataController { * | excelColumnName | Excel Column Name | * | titleName | Title Name | */ - protected val exportingFieldAliasMap: MutableMap = Maps.newLinkedHashMap() + private val exportingFieldAliasMap: MutableMap = Maps.newLinkedHashMap() @Resource protected lateinit var excelImportConfigurationProperties: ExcelImportConfigurationProperties @@ -85,7 +85,7 @@ abstract class AbstractExcelDataController { * 2. Register bind handler methods * 3. Register handler methods */ - protected fun AbstractExcelDataController() { + init{ initContext() } @@ -281,7 +281,7 @@ abstract class AbstractExcelDataController { } private fun handlePreviousException() { - if (exceptionOccurred.get()) { + if (exceptionOccurred.get() == true) { onExceptionOccurred() uploadWorkbook() } @@ -413,7 +413,7 @@ abstract class AbstractExcelDataController { * @param errorInfo the error info */ protected open fun setErrorMessage(errorInfo: String) { - errorMessageList.get().add(errorInfo) + errorMessageList.get()?.add(errorInfo) setReturnMessageList(errorInfo) } @@ -423,7 +423,7 @@ abstract class AbstractExcelDataController { * @param message the message */ protected open fun setReturnMessageList(message: String) { - returnMessageList.get().add(message) + returnMessageList.get()?.add(message) } /**