TouchInstinct
/
Backend-common
305
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

review fixes

This commit is contained in:
Alexander Buntakov 2021-06-07 19:50:54 +03:00
parent 823e0320d6
commit 9fae47fc86
11 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
logger-spring/src/main/kotlin/ru/touchin/logger/spring/aspects/LogAspect.kt
View File

@ -25,7 +25,7 @@ class LogAspect(
fun logInvocation(pjp: ProceedingJoinPoint, autoLoggingAnnotation: AutoLogging): Any? {
val duration = LogDuration()
val actionResult = runCatching { pjp.proceed() }
val actionResult = runCatching(pjp::proceed)
try {
val method = pjp.method()
@ -85,7 +85,8 @@ class LogAspect(
return emptyList()
}
val returnValue = result.getOrNull() ?: return emptyList()
val returnValue = result.getOrNull()
?: return emptyList()
return logValueFieldSerializer.invoke(
LogValueField (

2
logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/LogValueFieldSerializerImpl.kt
View File

@ -62,7 +62,7 @@ class LogValueFieldSerializerImpl(
}
override operator fun invoke(field: LogValueField): List<LogDataItem> {
return expand(field).mapNotNull(::serialize)
return expand(field).mapNotNull(this::serialize)
}
companion object {

12
logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/BooleanLogValueResolverImpl.kt
View File

@ -11,14 +11,14 @@ import ru.touchin.logger.spring.serializers.resolvers.dto.ResolvedValue
class BooleanLogValueResolverImpl : LogValueResolver<Boolean> {
override operator fun invoke(value: Any): ResolvedValue<Boolean>? {
if (value is Boolean) {
return ResolvedValue(
value = value,
typeName = "boolean"
)
if (value !is Boolean) {
return null
}
return null
return ResolvedValue(
value = value,
typeName = "boolean"
)
}
}

12
logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/DateLogValueResolverImpl.kt
View File

@ -12,14 +12,14 @@ import java.time.temporal.Temporal
class DateLogValueResolverImpl : LogValueResolver<String> {
override fun invoke(value: Any): ResolvedValue<String>? {
if (value is Temporal) {
return ResolvedValue(
value = value.toString(),
typeName = "date",
)
if (value !is Temporal) {
return null
}
return null
return ResolvedValue(
value = value.toString(),
typeName = "date",
)
}
}

10
logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/FileLogValueResolverImpl.kt
View File

@ -12,13 +12,13 @@ import java.io.File
class FileLogValueResolverImpl : LogValueResolver<String> {
override operator fun invoke(value: Any): ResolvedValue<String>? {
if (value is File) {
return ResolvedValue(
value = value.toString(),
)
if (value !is File) {
return null
}
return null
return ResolvedValue(
value = value.toString(),
)
}
}

6
logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/FunctionLogValueResolverImpl.kt
View File

@ -11,11 +11,11 @@ import ru.touchin.logger.spring.serializers.resolvers.dto.ResolvedValue
class FunctionLogValueResolverImpl : LogValueResolver<String> {
override operator fun invoke(value: Any): ResolvedValue<String>? {
if (value is Function<*>) {
return ResolvedValue.SKIP_VALUE
if (value !is Function<*>) {
return null
}
return null
return ResolvedValue.SKIP_VALUE
}
}

12
logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/NumberLogValueResolverImpl.kt
View File

@ -11,14 +11,14 @@ import ru.touchin.logger.spring.serializers.resolvers.dto.ResolvedValue
class NumberLogValueResolverImpl : LogValueResolver<Number> {
override operator fun invoke(value: Any): ResolvedValue<Number>? {
if (value is Number) {
return ResolvedValue(
value = value,
typeName = "number"
)
if (value !is Number) {
return null
}
return null
return ResolvedValue(
value = value,
typeName = "number"
)
}
}

10
logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/StringLogValueResolverImpl.kt
View File

@ -11,12 +11,12 @@ import ru.touchin.logger.spring.serializers.resolvers.dto.ResolvedValue
class StringLogValueResolverImpl : LogValueResolver<String> {
override fun invoke(value: Any): ResolvedValue<String>? {
if (value is String) {
return ResolvedValue(
value = value
)
if (value !is String) {
return null
}
return null
return ResolvedValue(
value = value
)
}
}

10
logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/UUIDLogValueResolverImpl.kt
View File

@ -12,13 +12,13 @@ import java.util.*
class UUIDLogValueResolverImpl : LogValueResolver<String> {
override operator fun invoke(value: Any): ResolvedValue<String>? {
if (value is UUID) {
return ResolvedValue(
value = value.toString(),
)
if (value !is UUID) {
return null
}
return null
return ResolvedValue(
value = value.toString(),
)
}
}

6
logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/UnitLogValueResolverImpl.kt
View File

@ -11,11 +11,11 @@ import ru.touchin.logger.spring.serializers.resolvers.dto.ResolvedValue
class UnitLogValueResolverImpl : LogValueResolver<String> {
override operator fun invoke(value: Any): ResolvedValue<String>? {
if (value is Unit) {
return ResolvedValue.SKIP_VALUE
if (value !is Unit) {
return null
}
return null
return ResolvedValue.SKIP_VALUE
}
}

10
logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/UrlLogValueResolverImpl.kt
View File

@ -13,13 +13,13 @@ import java.net.URL
class UrlLogValueResolverImpl : LogValueResolver<String> {
override operator fun invoke(value: Any): ResolvedValue<String>? {
if (value is URL || value is URI) {
return ResolvedValue(
value = value.toString(),
)
if (value !is URL && value !is URI) {
return null
}
return null
return ResolvedValue(
value = value.toString(),
)
}
}