Skip to content

Commit

Permalink
perf($POM): update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnnymillergh
johnnymillergh committed May 12, 2022
1 parent 8dcd0d5 commit 8cc6e16
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
10 changes: 5 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
<!--
Don't use alpine or slim version, to prevent following exception
java.lang.UnsatisfiedLinkError: /opt/java/openjdk/lib/libfontmanager.so: libfreetype.so.6: cannot open shared object file: No such file or directory
https://hub.docker.com/_/eclipse-temurin?tab=tags&page=1&name=17.0.2_8-jre
https://hub.docker.com/_/eclipse-temurin?tab=tags&page=1&name=17.0.3_7-jre
-->
<temurin.tag>17.0.2_8-jre</temurin.tag>
<temurin.tag>17.0.3_7-jre</temurin.tag>
<jib-maven-plugin.version>3.2.0</jib-maven-plugin.version>
<jib-spring-boot-extension-maven.version>0.1.0</jib-spring-boot-extension-maven.version>
<maven-pmd-plugin.version>3.15.0</maven-pmd-plugin.version>
Expand All @@ -62,12 +62,12 @@
<hutool-all.version>5.7.22</hutool-all.version>
<guava.version>31.1-jre</guava.version>
<springdoc-openapi-ui.version>1.6.6</springdoc-openapi-ui.version>
<jjwt.version>0.11.2</jjwt.version>
<jjwt.version>0.11.5</jjwt.version>
<java-faker.version>1.0.2</java-faker.version>
<easyexcel.version>2.2.6</easyexcel.version>
<poi.version>5.2.2</poi.version>
<logstash-logback-encoder.version>7.1.1</logstash-logback-encoder.version>
<minio.version>8.3.8</minio.version>
<minio.version>8.3.9</minio.version>
<okhttp.version>4.8.1</okhttp.version>
<apache-tika.version>2.3.0</apache-tika.version>
<mapstruct.version>1.4.2.Final</mapstruct.version>
Expand All @@ -91,7 +91,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.6</version>
<version>2.6.7</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand Down
2 changes: 1 addition & 1 deletion ...d-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/helper/HttpApiScanHelper.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
24 changes: 12 additions & 12 deletions ...er/src/main/java/com/jmsoftware/maf/springcloudstarter/poi/AbstractExcelDataController.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ abstract class AbstractExcelDataController<T> {
private val log = logger()
}

protected val beanList: ThreadLocal<List<T>?> = ThreadLocal.withInitial { null }
protected val workbook: ThreadLocal<Workbook?> = ThreadLocal.withInitial<Workbook?> { null }
protected val excelFilePath: ThreadLocal<String?> = ThreadLocal.withInitial<String?> { null }
protected val exceptionOccurred: ThreadLocal<Boolean> = ThreadLocal.withInitial { false }
protected val errorMessageList: ThreadLocal<MutableList<String>> = ThreadLocal.withInitial { mutableListOf() }
protected val returnMessageList: ThreadLocal<MutableList<String>> = ThreadLocal.withInitial { mutableListOf() }
private val beanList: ThreadLocal<List<T>?> = ThreadLocal.withInitial { null }
private val workbook: ThreadLocal<Workbook?> = ThreadLocal.withInitial<Workbook?> { null }
private val excelFilePath: ThreadLocal<String?> = ThreadLocal.withInitial<String?> { null }
private val exceptionOccurred: ThreadLocal<Boolean?> = ThreadLocal.withInitial { false }
private val errorMessageList: ThreadLocal<MutableList<String>?> = ThreadLocal.withInitial { null }
private val returnMessageList: ThreadLocal<MutableList<String>?> = ThreadLocal.withInitial { null }

/**
* `fileName` stores the name to upload the workbook when exception occurred
Expand All @@ -55,15 +55,15 @@ abstract class AbstractExcelDataController<T> {
* | Excel Column Name | excelColumnName |
* | Title Name | titleName |
*/
protected val importingFieldAliasMap: MutableMap<String, String> = Maps.newLinkedHashMap()
private val importingFieldAliasMap: MutableMap<String, String> = Maps.newLinkedHashMap()

/**
* | Key | Value |
* | --------------- | ----------------- |
* | excelColumnName | Excel Column Name |
* | titleName | Title Name |
*/
protected val exportingFieldAliasMap: MutableMap<String, String> = Maps.newLinkedHashMap()
private val exportingFieldAliasMap: MutableMap<String, String> = Maps.newLinkedHashMap()

@Resource
protected lateinit var excelImportConfigurationProperties: ExcelImportConfigurationProperties
Expand All @@ -85,7 +85,7 @@ abstract class AbstractExcelDataController<T> {
* 2. Register bind handler methods
* 3. Register handler methods
*/
protected fun AbstractExcelDataController() {
init{
initContext()
}

Expand Down Expand Up @@ -281,7 +281,7 @@ abstract class AbstractExcelDataController<T> {
}

private fun handlePreviousException() {
if (exceptionOccurred.get()) {
if (exceptionOccurred.get() == true) {
onExceptionOccurred()
uploadWorkbook()
}
Expand Down Expand Up @@ -413,7 +413,7 @@ abstract class AbstractExcelDataController<T> {
* @param errorInfo the error info
*/
protected open fun setErrorMessage(errorInfo: String) {
errorMessageList.get().add(errorInfo)
errorMessageList.get()?.add(errorInfo)
setReturnMessageList(errorInfo)
}

Expand All @@ -423,7 +423,7 @@ abstract class AbstractExcelDataController<T> {
* @param message the message
*/
protected open fun setReturnMessageList(message: String) {
returnMessageList.get().add(message)
returnMessageList.get()?.add(message)
}

/**
Expand Down