FatttSnake/oxygen-api
1
0
Fork 0
Code Pull Requests Activity

Optimize regex

Browse Source
This commit is contained in:
Fat Snake
2023-12-14 18:27:05 +08:00
parent c059f85f62
commit 9ede33e005
2 changed files with 8 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/kotlin/top/fatweb/api/util/ApiVersionCondition.kt
View File

@@ -2,7 +2,6 @@ package top.fatweb.api.util
import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletRequest
import org.springframework.web.servlet.mvc.condition.RequestCondition import org.springframework.web.servlet.mvc.condition.RequestCondition
import java.util.regex.Pattern
/** /**
* Api version condition * Api version condition
@@ -11,15 +10,13 @@ import java.util.regex.Pattern
* @since 1.0.0 * @since 1.0.0
*/ */
class ApiVersionCondition(private val apiVersion: Int) : RequestCondition<ApiVersionCondition> { class ApiVersionCondition(private val apiVersion: Int) : RequestCondition<ApiVersionCondition> {
private val versionPrefixPattern: Pattern = Pattern.compile(".*v(\\d+).*") private val versionPrefixRegex = Regex(".*v(\\d+).*")
override fun combine(other: ApiVersionCondition): ApiVersionCondition = ApiVersionCondition(other.apiVersion) override fun combine(other: ApiVersionCondition): ApiVersionCondition = ApiVersionCondition(other.apiVersion)
override fun getMatchingCondition(request: HttpServletRequest): ApiVersionCondition? { override fun getMatchingCondition(request: HttpServletRequest): ApiVersionCondition? {
val matcher = versionPrefixPattern.matcher(request.requestURI) versionPrefixRegex.matchAt(request.requestURI, 0)?.let {
if (matcher.find()) { if (it.groupValues[1].toInt() >= this.apiVersion) {
val version = matcher.group(1).toInt()
if (version >= this.apiVersion) {
return this return this
} }
} }

25
src/main/kotlin/top/fatweb/api/util/StrUtil.kt
View File

@@ -1,7 +1,6 @@
package top.fatweb.api.util package top.fatweb.api.util
import java.security.MessageDigest import java.security.MessageDigest
import java.util.regex.Pattern
/** /**
* String util * String util
@@ -22,16 +21,7 @@ object StrUtil {
fun upperToUnderLetter(str: String?): String { fun upperToUnderLetter(str: String?): String {
str ?: let { return "" } str ?: let { return "" }
val matcher = Pattern.compile("([A-Z])").matcher(str) return Regex("[A-Z]").replace(str) { matchResult -> "_${matchResult.value.lowercase()}" }
val stringBuilder = StringBuilder()
while (matcher.find()) {
matcher.appendReplacement(stringBuilder, "_" + matcher.group().lowercase())
}
matcher.appendTail(stringBuilder)
return stringBuilder.toString()
} }
/** /**
@@ -45,16 +35,7 @@ object StrUtil {
fun underToUpperLetter(str: String?): String { fun underToUpperLetter(str: String?): String {
str ?: let { return "" } str ?: let { return "" }
val matcher = Pattern.compile("(_)([a-z])").matcher(str) return Regex("_[a-z]").replace(str) { matchResult -> matchResult.value.removePrefix("_").uppercase() }
val stringBuilder = StringBuilder()
while (matcher.find()) {
matcher.appendReplacement(stringBuilder, matcher.group().replace("_", "").uppercase())
}
matcher.appendTail(stringBuilder)
return stringBuilder.toString()
} }
/** /**
@@ -92,7 +73,7 @@ object StrUtil {
if (b < 0x10) { if (b < 0x10) {
str = "0$str" str = "0$str"
} }
hex.append(str.substring(str.length -2)) hex.append(str.substring(str.length - 2))
} }
return hex.toString() return hex.toString()
} }