From d949d13304906d96a5b8ea93465c9b8d9a8b029c Mon Sep 17 00:00:00 2001 From: Alexander Yevsyukov Date: Wed, 25 Jun 2025 14:02:38 +0100 Subject: [PATCH] Rename Flogger classes to Jvm --- .../backend/jul/AbstractJulBackend.java | 2 +- .../backend/jul/AbstractJulRecord.java | 12 +- .../spine/logging/backend/jul/JulRecord.java | 6 +- .../spine/logging/backend/jul/JulBackend.kt | 6 +- .../logging/backend/jul/JulBackendFactory.kt | 4 +- .../logging/backend/jul/JulRecordSpec.kt | 18 +-- .../backend/jul/given/FakeJulRecord.kt | 12 +- .../backend/jul/given/JulBackendTestEnv.kt | 2 +- .../backend/log4j2/Log4j2BackendFactory.java | 4 +- .../backend/log4j2/Log4j2LogEventUtil.java | 34 +++--- .../backend/log4j2/Log4j2LoggerBackend.java | 4 +- .../logging/backend/log4j2/ValueQueue.java | 6 +- ....spine.logging.jvm.backend.BackendFactory} | 0 .../log4j2/Log4j2BackendFactorySpec.kt | 2 +- .../backend/log4j2/Log4j2LoggerBackendSpec.kt | 16 +-- .../backend/log4j2/Log4j2ScopedLoggingSpec.kt | 14 +-- .../logging/backend/probe/CaptureLogData.kt | 2 +- .../backend/probe/DynamicBackendFactory.kt | 4 +- .../probe/DynamicBackendFactoryService.kt | 4 +- .../backend/probe/MemoizingBackendFactory.kt | 2 +- .../probe/MemoizingLoggerBackendFactory.kt | 2 +- .../backend/probe/TypedBackendFactory.kt | 2 +- .../dependency/lib/{Flogger.kt => Jvm.kt} | 2 +- .../logging/context/grpc/GrpcContextData.java | 12 +- .../context/grpc/GrpcContextDataProvider.java | 12 +- .../grpc/GrpcScopedLoggingContext.java | 16 +-- .../logging/context/grpc/package-info.java | 2 +- ...e.logging.jvm.context.ContextDataProvider} | 0 .../grpc/GrpcContextDataProviderSpec.kt | 4 +- .../logging/context/std/StdContextData.kt | 10 +- .../context/std/StdContextDataProvider.kt | 14 +-- ...e.logging.jvm.context.ContextDataProvider} | 0 .../context/std/StdContextDataProviderSpec.kt | 4 +- flogger/README.md | 2 +- .../{flogger => jvm}/AbstractLogger.java | 16 +-- .../{flogger => jvm}/CountingRateLimiter.java | 8 +- .../{flogger => jvm}/DurationRateLimiter.java | 14 +-- .../{flogger => jvm}/FluentLogger2.java | 16 +-- .../FloggerApi.java => jvm/JvmApi.java} | 38 +++---- .../JvmLogSite.java} | 24 ++-- .../JvmLogSites.java} | 32 +++--- .../JvmMetadataKey.java} | 28 ++--- .../logging/{flogger => jvm}/LazyArg.java | 2 +- .../logging/{flogger => jvm}/LazyArgs.java | 4 +- .../logging/{flogger => jvm}/LogContext.java | 104 +++++++++--------- .../LogPerBucketingStrategy.java | 8 +- .../logging/{flogger => jvm}/LogSiteKey.java | 4 +- .../logging/{flogger => jvm}/LogSiteMap.java | 6 +- .../{flogger => jvm}/LogSiteStackTrace.java | 2 +- .../{flogger => jvm}/LoggingScope.java | 8 +- .../LoggingScopeProvider.java | 2 +- .../{flogger => jvm}/RateLimitStatus.java | 4 +- .../{flogger => jvm}/SamplingRateLimiter.java | 6 +- .../SpecializedLogSiteKey.java | 4 +- .../{flogger => jvm}/StackBasedLogSite.java | 12 +- .../logging/{flogger => jvm}/StackSize.java | 8 +- .../backend/BackendFactory.java | 4 +- .../backend/BaseMessageFormatter.java | 14 +-- .../{flogger => jvm}/backend/Clock.java | 4 +- .../{flogger => jvm}/backend/FormatChar.java | 2 +- .../backend/FormatOptions.java | 6 +- .../{flogger => jvm}/backend/FormatType.java | 2 +- .../backend/KeyValueFormatter.java | 4 +- .../{flogger => jvm}/backend/LogData.java | 6 +- .../backend/LogMessageFormatter.java | 2 +- .../backend/LoggerBackend.java | 6 +- .../backend/LoggingException.java | 2 +- .../backend/MessageUtils.java | 16 +-- .../{flogger => jvm}/backend/Metadata.java | 16 +-- .../backend/MetadataHandler.java | 58 +++++----- .../backend/MetadataKeyValueHandlers.java | 18 +-- .../backend/MetadataProcessor.java | 72 ++++++------ .../{flogger => jvm}/backend/Platform.java | 18 +-- .../backend/SimpleMessageFormatter.java | 22 ++-- .../backend/TemplateContext.java | 6 +- .../backend/package-info.java | 2 +- .../context/ContextDataProvider.java | 10 +- .../context/ContextMetadata.java | 32 +++--- .../{flogger => jvm}/context/LogLevelMap.java | 4 +- .../context/NoOpContextDataProvider.java | 12 +- .../{flogger => jvm}/context/ScopeType.java | 8 +- .../context/ScopedLoggingContext.java | 20 ++-- .../context/ScopedLoggingContexts.java | 10 +- .../{flogger => jvm}/context/SegmentTrie.java | 4 +- .../{flogger => jvm}/context/Tags.java | 8 +- .../context/package-info.java | 2 +- .../{flogger => jvm}/package-info.java | 2 +- .../parameter/BraceStyleParameter.java | 8 +- .../parameter/DateTimeFormat.java | 2 +- .../parameter/DateTimeParameter.java | 4 +- .../{flogger => jvm}/parameter/Parameter.java | 4 +- .../parameter/ParameterVisitor.java | 6 +- .../parameter/SimpleParameter.java | 8 +- .../parameter/package-info.java | 2 +- .../parser/BraceStyleMessageParser.java | 2 +- .../DefaultBraceStyleMessageParser.java | 4 +- .../parser/DefaultPrintfMessageParser.java | 20 ++-- .../parser/MessageBuilder.java | 8 +- .../parser/MessageParser.java | 4 +- .../parser/ParseException.java | 2 +- .../parser/PrintfMessageParser.java | 2 +- .../{flogger => jvm}/parser/package-info.java | 2 +- .../logging/{flogger => jvm}/util/Checks.java | 2 +- .../{flogger => jvm}/util/RecursionDepth.java | 2 +- .../util/StaticMethodCaller.java | 2 +- .../{flogger => jvm}/util/package-info.java | 2 +- .../JvmMetadataKeys.kt} | 14 +-- .../{flogger => jvm}/AbstractLoggerSpec.kt | 10 +- .../CountingRateLimiterSpec.kt | 12 +- .../DurationRateLimiterSpec.kt | 16 +-- .../{flogger => jvm}/FluentLogger2Spec.kt | 22 ++-- .../JvmLogSitesSpec.kt} | 24 ++-- .../JvmMetadataKeySpec.kt} | 30 ++--- .../{flogger => jvm}/LogContextSpec.kt | 50 ++++----- .../LogPerBucketingStrategySpec.kt | 2 +- .../{flogger => jvm}/LogSiteMapSpec.kt | 8 +- .../{flogger => jvm}/LogSiteStackTraceSpec.kt | 2 +- .../{flogger => jvm}/LoggingScopeSpec.kt | 4 +- .../{flogger => jvm}/RateLimitStatusSpec.kt | 14 +-- .../SamplingRateLimiterSpec.kt | 16 +-- .../SpecializedLogSiteKeySpec.kt | 4 +- .../{flogger => jvm}/StackBasedLogSiteSpec.kt | 4 +- .../backend/BaseMessageFormatterSpec.kt | 6 +- .../backend/FormatCharSpec.kt | 26 ++--- .../backend/FormatOptionsSpec.kt | 26 ++--- .../backend/FormatTypeSpec.kt | 12 +- .../backend/KeyValueFormatterSpec.kt | 2 +- .../backend/LightweightProcessorSpec.kt | 2 +- .../backend/MessageUtilsSpec.kt | 24 ++-- .../backend/MetadataHandlerSpec.kt | 20 ++-- .../backend/MetadataKeyValueHandlersSpec.kt | 16 +-- .../backend/MetadataProcessorSpec.kt | 20 ++-- .../backend/SimpleMessageFormatterSpec.kt | 14 +-- .../backend/SimpleProcessorSpec.kt | 2 +- .../backend/given/FakeLogData.kt | 30 ++--- .../backend/given/FakeMetadata.kt | 14 +-- .../backend/given/MemoizingLoggerBackend.kt | 6 +- .../backend/given/MetadataAssertions.kt | 18 +-- .../AbstractContextDataProviderSpec.kt | 26 ++--- .../context/ContextMetadataSpec.kt | 16 +-- .../context/LogLevelMapSpec.kt | 4 +- .../context/ScopedLoggingContextSpec.kt | 6 +- .../context/SegmentTrieSpec.kt | 4 +- .../{flogger => jvm}/context/TagsSpec.kt | 2 +- .../{flogger => jvm}/given/BackendTestEnv.kt | 2 +- .../given/ConfigurableLogger.kt | 16 +-- .../{flogger => jvm}/given/FakeLogSite.kt | 8 +- .../given/FormattingBackend.kt | 6 +- .../given/LogDataAssertions.kt | 4 +- .../given/MemoizingKvHandler.kt | 6 +- .../parameter/ParameterSpec.kt | 4 +- .../parameter/SimpleParameterSpec.kt | 18 +-- .../parser/BraceStyleMessageParserSpec.kt | 10 +- .../DefaultBraceStyleMessageParserSpec.kt | 14 +-- .../parser/DefaultPrintfMessageParserSpec.kt | 8 +- .../parser/PrintfMessageParserSpec.kt | 10 +- .../parser/given/ParserTestEnv.kt | 22 ++-- .../generator/PlatformProviderGenerator.java | 12 +- .../kotlin/io/spine/logging/JvmLogger.kt | 16 +-- .../kotlin/io/spine/logging/JvmMetadataKey.kt | 2 +- .../kotlin/io/spine/logging/LogSiteLookup.kt | 12 +- .../kotlin/io/spine/logging/LoggingFactory.kt | 4 +- .../logging/context/LoggingContextFactory.kt | 6 +- .../backend/system/DefaultPlatform.java | 12 +- .../system/StackBasedCallerFinder.java | 12 +- .../logging/backend/system/SystemClock.java | 2 +- .../backend/system/DefaultPlatformSpec.kt | 4 +- .../system/given/DefaultPlatformTestEnv.kt | 16 +-- .../backend/system/given/JavaServices.kt | 10 +- .../src/test/kotlin/LogLevelMapITest.kt | 2 +- .../src/test/kotlin/LogLevelMapITest.kt | 2 +- 171 files changed, 916 insertions(+), 916 deletions(-) rename backends/log4j2-backend/src/main/resources/META-INF/services/{io.spine.logging.flogger.backend.BackendFactory => io.spine.logging.jvm.backend.BackendFactory} (100%) rename buildSrc/src/main/kotlin/io/spine/dependency/lib/{Flogger.kt => Jvm.kt} (99%) rename contexts/grpc-context/src/main/resources/META-INF/services/{io.spine.logging.flogger.context.ContextDataProvider => io.spine.logging.jvm.context.ContextDataProvider} (100%) rename contexts/std-context/src/main/resources/META-INF/services/{io.spine.logging.flogger.context.ContextDataProvider => io.spine.logging.jvm.context.ContextDataProvider} (100%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/AbstractLogger.java (95%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/CountingRateLimiter.java (95%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/DurationRateLimiter.java (94%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/FluentLogger2.java (92%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger/FloggerApi.java => jvm/JvmApi.java} (97%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger/FloggerLogSite.java => jvm/JvmLogSite.java} (93%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger/FloggerLogSites.java => jvm/JvmLogSites.java} (85%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger/FloggerMetadataKey.java => jvm/JvmMetadataKey.java} (94%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/LazyArg.java (98%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/LazyArgs.java (97%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/LogContext.java (94%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/LogPerBucketingStrategy.java (97%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/LogSiteKey.java (96%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/LogSiteMap.java (97%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/LogSiteStackTrace.java (98%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/LoggingScope.java (96%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/LoggingScopeProvider.java (98%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/RateLimitStatus.java (99%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/SamplingRateLimiter.java (96%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/SpecializedLogSiteKey.java (96%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/StackBasedLogSite.java (89%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/StackSize.java (93%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/BackendFactory.java (97%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/BaseMessageFormatter.java (95%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/Clock.java (96%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/FormatChar.java (99%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/FormatOptions.java (99%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/FormatType.java (99%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/KeyValueFormatter.java (98%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/LogData.java (97%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/LogMessageFormatter.java (98%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/LoggerBackend.java (97%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/LoggingException.java (98%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/MessageUtils.java (95%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/Metadata.java (90%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/MetadataHandler.java (84%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/MetadataKeyValueHandlers.java (87%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/MetadataProcessor.java (88%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/Platform.java (96%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/SimpleMessageFormatter.java (92%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/TemplateContext.java (94%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/backend/package-info.java (97%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/context/ContextDataProvider.java (96%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/context/ContextMetadata.java (88%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/context/LogLevelMap.java (98%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/context/NoOpContextDataProvider.java (93%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/context/ScopeType.java (94%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/context/ScopedLoggingContext.java (97%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/context/ScopedLoggingContexts.java (96%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/context/SegmentTrie.java (99%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/context/Tags.java (99%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/context/package-info.java (97%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/package-info.java (97%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/parameter/BraceStyleParameter.java (95%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/parameter/DateTimeFormat.java (99%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/parameter/DateTimeParameter.java (96%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/parameter/Parameter.java (97%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/parameter/ParameterVisitor.java (96%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/parameter/SimpleParameter.java (95%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/parameter/package-info.java (97%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/parser/BraceStyleMessageParser.java (99%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/parser/DefaultBraceStyleMessageParser.java (96%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/parser/DefaultPrintfMessageParser.java (89%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/parser/MessageBuilder.java (96%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/parser/MessageParser.java (96%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/parser/ParseException.java (99%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/parser/PrintfMessageParser.java (99%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/parser/package-info.java (97%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/util/Checks.java (98%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/util/RecursionDepth.java (98%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/util/StaticMethodCaller.java (99%) rename flogger/middleware/src/main/java/io/spine/logging/{flogger => jvm}/util/package-info.java (97%) rename flogger/middleware/src/main/kotlin/io/spine/logging/{flogger/FloggerMetadataKeys.kt => jvm/JvmMetadataKeys.kt} (82%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/AbstractLoggerSpec.kt (96%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/CountingRateLimiterSpec.kt (93%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/DurationRateLimiterSpec.kt (93%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/FluentLogger2Spec.kt (84%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger/FloggerLogSitesSpec.kt => jvm/JvmLogSitesSpec.kt} (82%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger/FloggerMetadataKeySpec.kt => jvm/JvmMetadataKeySpec.kt} (90%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/LogContextSpec.kt (96%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/LogPerBucketingStrategySpec.kt (99%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/LogSiteMapSpec.kt (96%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/LogSiteStackTraceSpec.kt (98%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/LoggingScopeSpec.kt (95%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/RateLimitStatusSpec.kt (93%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/SamplingRateLimiterSpec.kt (90%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/SpecializedLogSiteKeySpec.kt (97%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/StackBasedLogSiteSpec.kt (97%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/backend/BaseMessageFormatterSpec.kt (98%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/backend/FormatCharSpec.kt (85%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/backend/FormatOptionsSpec.kt (92%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/backend/FormatTypeSpec.kt (92%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/backend/KeyValueFormatterSpec.kt (99%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/backend/LightweightProcessorSpec.kt (97%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/backend/MessageUtilsSpec.kt (88%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/backend/MetadataHandlerSpec.kt (91%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/backend/MetadataKeyValueHandlersSpec.kt (87%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/backend/MetadataProcessorSpec.kt (93%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/backend/SimpleMessageFormatterSpec.kt (95%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/backend/SimpleProcessorSpec.kt (97%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/backend/given/FakeLogData.kt (85%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/backend/given/FakeMetadata.kt (82%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/backend/given/MemoizingLoggerBackend.kt (94%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/backend/given/MetadataAssertions.kt (82%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/context/AbstractContextDataProviderSpec.kt (95%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/context/ContextMetadataSpec.kt (91%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/context/LogLevelMapSpec.kt (97%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/context/ScopedLoggingContextSpec.kt (93%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/context/SegmentTrieSpec.kt (98%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/context/TagsSpec.kt (99%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/given/BackendTestEnv.kt (97%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/given/ConfigurableLogger.kt (88%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/given/FakeLogSite.kt (94%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/given/FormattingBackend.kt (95%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/given/LogDataAssertions.kt (96%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/given/MemoizingKvHandler.kt (89%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/parameter/ParameterSpec.kt (96%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/parameter/SimpleParameterSpec.kt (88%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/parser/BraceStyleMessageParserSpec.kt (95%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/parser/DefaultBraceStyleMessageParserSpec.kt (88%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/parser/DefaultPrintfMessageParserSpec.kt (93%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/parser/PrintfMessageParserSpec.kt (95%) rename flogger/middleware/src/test/kotlin/io/spine/logging/{flogger => jvm}/parser/given/ParserTestEnv.kt (90%) diff --git a/backends/jul-backend/src/main/java/io/spine/logging/backend/jul/AbstractJulBackend.java b/backends/jul-backend/src/main/java/io/spine/logging/backend/jul/AbstractJulBackend.java index c39bc2b53..663f80ef4 100644 --- a/backends/jul-backend/src/main/java/io/spine/logging/backend/jul/AbstractJulBackend.java +++ b/backends/jul-backend/src/main/java/io/spine/logging/backend/jul/AbstractJulBackend.java @@ -26,7 +26,7 @@ package io.spine.logging.backend.jul; -import io.spine.logging.flogger.backend.LoggerBackend; +import io.spine.logging.jvm.backend.LoggerBackend; import java.util.logging.Filter; import java.util.logging.Handler; diff --git a/backends/jul-backend/src/main/java/io/spine/logging/backend/jul/AbstractJulRecord.java b/backends/jul-backend/src/main/java/io/spine/logging/backend/jul/AbstractJulRecord.java index b4925f101..504766a2b 100644 --- a/backends/jul-backend/src/main/java/io/spine/logging/backend/jul/AbstractJulRecord.java +++ b/backends/jul-backend/src/main/java/io/spine/logging/backend/jul/AbstractJulRecord.java @@ -26,12 +26,12 @@ package io.spine.logging.backend.jul; -import io.spine.logging.flogger.backend.LogData; -import io.spine.logging.flogger.backend.LogMessageFormatter; -import io.spine.logging.flogger.backend.MessageUtils; -import io.spine.logging.flogger.backend.Metadata; -import io.spine.logging.flogger.backend.MetadataProcessor; -import io.spine.logging.flogger.backend.SimpleMessageFormatter; +import io.spine.logging.jvm.backend.LogData; +import io.spine.logging.jvm.backend.LogMessageFormatter; +import io.spine.logging.jvm.backend.MessageUtils; +import io.spine.logging.jvm.backend.Metadata; +import io.spine.logging.jvm.backend.MetadataProcessor; +import io.spine.logging.jvm.backend.SimpleMessageFormatter; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Arrays; diff --git a/backends/jul-backend/src/main/java/io/spine/logging/backend/jul/JulRecord.java b/backends/jul-backend/src/main/java/io/spine/logging/backend/jul/JulRecord.java index 1a72a597b..80c169b60 100644 --- a/backends/jul-backend/src/main/java/io/spine/logging/backend/jul/JulRecord.java +++ b/backends/jul-backend/src/main/java/io/spine/logging/backend/jul/JulRecord.java @@ -26,9 +26,9 @@ package io.spine.logging.backend.jul; -import io.spine.logging.flogger.LogContext; -import io.spine.logging.flogger.backend.LogData; -import io.spine.logging.flogger.backend.Metadata; +import io.spine.logging.jvm.LogContext; +import io.spine.logging.jvm.backend.LogData; +import io.spine.logging.jvm.backend.Metadata; import java.util.logging.LogRecord; diff --git a/backends/jul-backend/src/main/kotlin/io/spine/logging/backend/jul/JulBackend.kt b/backends/jul-backend/src/main/kotlin/io/spine/logging/backend/jul/JulBackend.kt index 33aa8afeb..e7383e071 100644 --- a/backends/jul-backend/src/main/kotlin/io/spine/logging/backend/jul/JulBackend.kt +++ b/backends/jul-backend/src/main/kotlin/io/spine/logging/backend/jul/JulBackend.kt @@ -26,9 +26,9 @@ package io.spine.logging.backend.jul -import io.spine.logging.flogger.backend.LogData -import io.spine.logging.flogger.backend.LoggerBackend -import io.spine.logging.flogger.backend.Platform +import io.spine.logging.jvm.backend.LogData +import io.spine.logging.jvm.backend.LoggerBackend +import io.spine.logging.jvm.backend.Platform import java.util.logging.Handler import java.util.logging.Level import java.util.logging.LogRecord diff --git a/backends/jul-backend/src/main/kotlin/io/spine/logging/backend/jul/JulBackendFactory.kt b/backends/jul-backend/src/main/kotlin/io/spine/logging/backend/jul/JulBackendFactory.kt index 2d37ba6f3..b1c0879e5 100644 --- a/backends/jul-backend/src/main/kotlin/io/spine/logging/backend/jul/JulBackendFactory.kt +++ b/backends/jul-backend/src/main/kotlin/io/spine/logging/backend/jul/JulBackendFactory.kt @@ -26,8 +26,8 @@ package io.spine.logging.backend.jul -import io.spine.logging.flogger.backend.BackendFactory -import io.spine.logging.flogger.backend.LoggerBackend +import io.spine.logging.jvm.backend.BackendFactory +import io.spine.logging.jvm.backend.LoggerBackend /** * A [BackendFactory] producing [LoggerBackend] which supports publishing diff --git a/backends/jul-backend/src/test/kotlin/io/spine/logging/backend/jul/JulRecordSpec.kt b/backends/jul-backend/src/test/kotlin/io/spine/logging/backend/jul/JulRecordSpec.kt index b3b402706..fb84982a3 100644 --- a/backends/jul-backend/src/test/kotlin/io/spine/logging/backend/jul/JulRecordSpec.kt +++ b/backends/jul-backend/src/test/kotlin/io/spine/logging/backend/jul/JulRecordSpec.kt @@ -35,14 +35,14 @@ import io.kotest.matchers.string.shouldContain import io.kotest.matchers.string.shouldEndWith import io.kotest.matchers.string.shouldNotContain import io.kotest.matchers.types.shouldBeSameInstanceAs -import io.spine.logging.flogger.FloggerMetadataKey -import io.spine.logging.flogger.LogContext.Key -import io.spine.logging.flogger.backend.Metadata -import io.spine.logging.flogger.backend.given.FakeLogData -import io.spine.logging.flogger.backend.given.FakeMetadata -import io.spine.logging.flogger.context.Tags -import io.spine.logging.flogger.parser.ParseException -import io.spine.logging.flogger.singleKey +import io.spine.logging.jvm.JvmMetadataKey +import io.spine.logging.jvm.LogContext.Key +import io.spine.logging.jvm.backend.Metadata +import io.spine.logging.jvm.backend.given.FakeLogData +import io.spine.logging.jvm.backend.given.FakeMetadata +import io.spine.logging.jvm.context.Tags +import io.spine.logging.jvm.parser.ParseException +import io.spine.logging.jvm.singleKey import java.time.Instant.ofEpochMilli import java.util.concurrent.TimeUnit.NANOSECONDS import java.util.logging.Level @@ -62,7 +62,7 @@ internal class JulRecordSpec { private val INT_KEY = singleKey("int") private val STR_KEY = singleKey("str") private val PATH_KEY = - object : FloggerMetadataKey("path", String::class.java, true) { + object : JvmMetadataKey("path", String::class.java, true) { override fun emitRepeated(values: Iterator, out: KeyValueHandler) { val joined = values.asSequence().joinToString("/") out.handle(label, joined) diff --git a/backends/jul-backend/src/test/kotlin/io/spine/logging/backend/jul/given/FakeJulRecord.kt b/backends/jul-backend/src/test/kotlin/io/spine/logging/backend/jul/given/FakeJulRecord.kt index 7ad0da10b..a1a6d936f 100644 --- a/backends/jul-backend/src/test/kotlin/io/spine/logging/backend/jul/given/FakeJulRecord.kt +++ b/backends/jul-backend/src/test/kotlin/io/spine/logging/backend/jul/given/FakeJulRecord.kt @@ -27,12 +27,12 @@ package io.spine.logging.backend.jul.given import io.spine.logging.backend.jul.AbstractJulRecord -import io.spine.logging.flogger.backend.LogData -import io.spine.logging.flogger.backend.LogMessageFormatter -import io.spine.logging.flogger.backend.Metadata -import io.spine.logging.flogger.backend.MetadataProcessor -import io.spine.logging.flogger.backend.SimpleMessageFormatter -import io.spine.logging.flogger.backend.given.FakeLogData +import io.spine.logging.jvm.backend.LogData +import io.spine.logging.jvm.backend.LogMessageFormatter +import io.spine.logging.jvm.backend.Metadata +import io.spine.logging.jvm.backend.MetadataProcessor +import io.spine.logging.jvm.backend.SimpleMessageFormatter +import io.spine.logging.jvm.backend.given.FakeLogData /** * An instantiatable [AbstractJulRecord]. diff --git a/backends/jul-backend/src/test/kotlin/io/spine/logging/backend/jul/given/JulBackendTestEnv.kt b/backends/jul-backend/src/test/kotlin/io/spine/logging/backend/jul/given/JulBackendTestEnv.kt index fe5a3a58d..4f03a7f37 100644 --- a/backends/jul-backend/src/test/kotlin/io/spine/logging/backend/jul/given/JulBackendTestEnv.kt +++ b/backends/jul-backend/src/test/kotlin/io/spine/logging/backend/jul/given/JulBackendTestEnv.kt @@ -28,7 +28,7 @@ package io.spine.logging.backend.jul.given import io.spine.logging.backend.jul.AbstractJulBackend import io.spine.logging.backend.jul.given.MemoizingJulBackend.ForcingLogger -import io.spine.logging.flogger.backend.LogData +import io.spine.logging.jvm.backend.LogData import java.util.logging.Handler import java.util.logging.Level import java.util.logging.LogRecord diff --git a/backends/log4j2-backend/src/main/java/io/spine/logging/backend/log4j2/Log4j2BackendFactory.java b/backends/log4j2-backend/src/main/java/io/spine/logging/backend/log4j2/Log4j2BackendFactory.java index b0adb3918..f7b3f3fae 100644 --- a/backends/log4j2-backend/src/main/java/io/spine/logging/backend/log4j2/Log4j2BackendFactory.java +++ b/backends/log4j2-backend/src/main/java/io/spine/logging/backend/log4j2/Log4j2BackendFactory.java @@ -26,8 +26,8 @@ package io.spine.logging.backend.log4j2; -import io.spine.logging.flogger.backend.LoggerBackend; -import io.spine.logging.flogger.backend.BackendFactory; +import io.spine.logging.jvm.backend.LoggerBackend; +import io.spine.logging.jvm.backend.BackendFactory; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.Logger; diff --git a/backends/log4j2-backend/src/main/java/io/spine/logging/backend/log4j2/Log4j2LogEventUtil.java b/backends/log4j2-backend/src/main/java/io/spine/logging/backend/log4j2/Log4j2LogEventUtil.java index fa1e55a13..0994a02ee 100644 --- a/backends/log4j2-backend/src/main/java/io/spine/logging/backend/log4j2/Log4j2LogEventUtil.java +++ b/backends/log4j2-backend/src/main/java/io/spine/logging/backend/log4j2/Log4j2LogEventUtil.java @@ -26,23 +26,23 @@ package io.spine.logging.backend.log4j2; -import static io.spine.logging.flogger.backend.MetadataProcessor.forScopeAndLogSite; +import static io.spine.logging.jvm.backend.MetadataProcessor.forScopeAndLogSite; import static java.util.concurrent.TimeUnit.NANOSECONDS; import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.logging.Level.WARNING; -import io.spine.logging.flogger.LogContext; -import io.spine.logging.flogger.FloggerLogSite; -import io.spine.logging.flogger.FloggerMetadataKey; -import io.spine.logging.flogger.backend.BaseMessageFormatter; -import io.spine.logging.flogger.backend.LogData; -import io.spine.logging.flogger.backend.MessageUtils; -import io.spine.logging.flogger.backend.Metadata; -import io.spine.logging.flogger.backend.MetadataHandler; -import io.spine.logging.flogger.backend.Platform; -import io.spine.logging.flogger.backend.SimpleMessageFormatter; -import io.spine.logging.flogger.context.ScopedLoggingContext; -import io.spine.logging.flogger.context.Tags; +import io.spine.logging.jvm.LogContext; +import io.spine.logging.jvm.JvmLogSite; +import io.spine.logging.jvm.JvmMetadataKey; +import io.spine.logging.jvm.backend.BaseMessageFormatter; +import io.spine.logging.jvm.backend.LogData; +import io.spine.logging.jvm.backend.MessageUtils; +import io.spine.logging.jvm.backend.Metadata; +import io.spine.logging.jvm.backend.MetadataHandler; +import io.spine.logging.jvm.backend.Platform; +import io.spine.logging.jvm.backend.SimpleMessageFormatter; +import io.spine.logging.jvm.context.ScopedLoggingContext; +import io.spine.logging.jvm.context.Tags; import java.util.logging.Level; import java.util.stream.Collectors; import java.util.stream.StreamSupport; @@ -111,7 +111,7 @@ private static LogEvent toLog4jLogEvent( org.apache.logging.log4j.Level level, Throwable thrown) { - FloggerLogSite logSite = logData.getLogSite(); + JvmLogSite logSite = logData.getLogSite(); StackTraceElement locationInfo = new StackTraceElement( logSite.getClassName(), @@ -205,11 +205,11 @@ private static void appendLogData(LogData data, StringBuilder out) { out.append("\n line number: ").append(data.getLogSite().getLineNumber()); } - private static final MetadataHandler HANDLER = + private static final MetadataHandler HANDLER = MetadataHandler.builder(Log4j2LogEventUtil::handleMetadata).build(); private static void handleMetadata( - FloggerMetadataKey key, Object value, FloggerMetadataKey.KeyValueHandler kvh) { + JvmMetadataKey key, Object value, JvmMetadataKey.KeyValueHandler kvh) { if (key.getClass().equals(LogContext.Key.TAGS.getClass())) { processTags(key, value, kvh); } else { @@ -225,7 +225,7 @@ private static void handleMetadata( } private static void processTags( - FloggerMetadataKey key, Object value, FloggerMetadataKey.KeyValueHandler kvh) { + JvmMetadataKey key, Object value, JvmMetadataKey.KeyValueHandler kvh) { ValueQueue valueQueue = ValueQueue.appendValueToNewQueue(value); // Unlike single metadata (which is usually formatted as a single value), tags are always // formatted as a list. diff --git a/backends/log4j2-backend/src/main/java/io/spine/logging/backend/log4j2/Log4j2LoggerBackend.java b/backends/log4j2-backend/src/main/java/io/spine/logging/backend/log4j2/Log4j2LoggerBackend.java index 6000e729b..1b3861376 100644 --- a/backends/log4j2-backend/src/main/java/io/spine/logging/backend/log4j2/Log4j2LoggerBackend.java +++ b/backends/log4j2-backend/src/main/java/io/spine/logging/backend/log4j2/Log4j2LoggerBackend.java @@ -26,8 +26,8 @@ package io.spine.logging.backend.log4j2; -import io.spine.logging.flogger.backend.LogData; -import io.spine.logging.flogger.backend.LoggerBackend; +import io.spine.logging.jvm.backend.LogData; +import io.spine.logging.jvm.backend.LoggerBackend; import org.apache.logging.log4j.core.Logger; import static io.spine.logging.backend.log4j2.Log4j2LogEventUtil.toLog4jLevel; diff --git a/backends/log4j2-backend/src/main/java/io/spine/logging/backend/log4j2/ValueQueue.java b/backends/log4j2-backend/src/main/java/io/spine/logging/backend/log4j2/ValueQueue.java index a40450f64..067c197a8 100644 --- a/backends/log4j2-backend/src/main/java/io/spine/logging/backend/log4j2/ValueQueue.java +++ b/backends/log4j2-backend/src/main/java/io/spine/logging/backend/log4j2/ValueQueue.java @@ -26,10 +26,10 @@ package io.spine.logging.backend.log4j2; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkNotNull; -import io.spine.logging.flogger.FloggerMetadataKey.KeyValueHandler; -import io.spine.logging.flogger.context.Tags; +import io.spine.logging.jvm.JvmMetadataKey.KeyValueHandler; +import io.spine.logging.jvm.context.Tags; import java.util.Iterator; import java.util.LinkedList; import java.util.List; diff --git a/backends/log4j2-backend/src/main/resources/META-INF/services/io.spine.logging.flogger.backend.BackendFactory b/backends/log4j2-backend/src/main/resources/META-INF/services/io.spine.logging.jvm.backend.BackendFactory similarity index 100% rename from backends/log4j2-backend/src/main/resources/META-INF/services/io.spine.logging.flogger.backend.BackendFactory rename to backends/log4j2-backend/src/main/resources/META-INF/services/io.spine.logging.jvm.backend.BackendFactory diff --git a/backends/log4j2-backend/src/test/kotlin/io/spine/logging/backend/log4j2/Log4j2BackendFactorySpec.kt b/backends/log4j2-backend/src/test/kotlin/io/spine/logging/backend/log4j2/Log4j2BackendFactorySpec.kt index bf6cb2cfa..fdc680947 100644 --- a/backends/log4j2-backend/src/test/kotlin/io/spine/logging/backend/log4j2/Log4j2BackendFactorySpec.kt +++ b/backends/log4j2-backend/src/test/kotlin/io/spine/logging/backend/log4j2/Log4j2BackendFactorySpec.kt @@ -26,7 +26,7 @@ package io.spine.logging.backend.log4j2 -import io.spine.logging.flogger.backend.BackendFactory +import io.spine.logging.jvm.backend.BackendFactory import io.kotest.matchers.collections.shouldHaveSize import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.types.shouldBeInstanceOf diff --git a/backends/log4j2-backend/src/test/kotlin/io/spine/logging/backend/log4j2/Log4j2LoggerBackendSpec.kt b/backends/log4j2-backend/src/test/kotlin/io/spine/logging/backend/log4j2/Log4j2LoggerBackendSpec.kt index 06a24bc66..7a2766c17 100644 --- a/backends/log4j2-backend/src/test/kotlin/io/spine/logging/backend/log4j2/Log4j2LoggerBackendSpec.kt +++ b/backends/log4j2-backend/src/test/kotlin/io/spine/logging/backend/log4j2/Log4j2LoggerBackendSpec.kt @@ -33,13 +33,13 @@ import io.kotest.matchers.shouldBe import io.kotest.matchers.string.shouldContain import io.kotest.matchers.types.shouldBeSameInstanceAs import io.spine.logging.backend.log4j2.given.MemoizingAppender -import io.spine.logging.flogger.FloggerLogSite -import io.spine.logging.flogger.LogContext.Key -import io.spine.logging.flogger.backend.given.FakeLogData -import io.spine.logging.flogger.given.FakeLogSite -import io.spine.logging.flogger.parser.ParseException -import io.spine.logging.flogger.repeatedKey -import io.spine.logging.flogger.singleKey +import io.spine.logging.jvm.JvmLogSite +import io.spine.logging.jvm.LogContext.Key +import io.spine.logging.jvm.backend.given.FakeLogData +import io.spine.logging.jvm.given.FakeLogSite +import io.spine.logging.jvm.parser.ParseException +import io.spine.logging.jvm.repeatedKey +import io.spine.logging.jvm.singleKey import java.util.concurrent.atomic.AtomicInteger import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.core.Appender @@ -175,7 +175,7 @@ internal class Log4j2LoggerBackendSpec { testLogSite(logSite) } - private fun testLogSite(logSite: FloggerLogSite) { + private fun testLogSite(logSite: JvmLogSite) { val data = FakeLogData("") .setLogSite(logSite) backend.log(data) diff --git a/backends/log4j2-backend/src/test/kotlin/io/spine/logging/backend/log4j2/Log4j2ScopedLoggingSpec.kt b/backends/log4j2-backend/src/test/kotlin/io/spine/logging/backend/log4j2/Log4j2ScopedLoggingSpec.kt index bad09f4e9..0349c6e62 100644 --- a/backends/log4j2-backend/src/test/kotlin/io/spine/logging/backend/log4j2/Log4j2ScopedLoggingSpec.kt +++ b/backends/log4j2-backend/src/test/kotlin/io/spine/logging/backend/log4j2/Log4j2ScopedLoggingSpec.kt @@ -29,12 +29,12 @@ package io.spine.logging.backend.log4j2 import io.kotest.matchers.collections.shouldHaveSize import io.kotest.matchers.shouldBe import io.spine.logging.backend.log4j2.given.MemoizingAppender -import io.spine.logging.flogger.LogContext.Key -import io.spine.logging.flogger.context.ContextDataProvider -import io.spine.logging.flogger.context.Tags -import io.spine.logging.flogger.given.ConfigurableLogger -import io.spine.logging.flogger.repeatedKey -import io.spine.logging.flogger.singleKey +import io.spine.logging.jvm.LogContext.Key +import io.spine.logging.jvm.context.ContextDataProvider +import io.spine.logging.jvm.context.Tags +import io.spine.logging.jvm.given.ConfigurableLogger +import io.spine.logging.jvm.repeatedKey +import io.spine.logging.jvm.singleKey import java.util.concurrent.atomic.AtomicInteger import org.apache.logging.log4j.Level import org.apache.logging.log4j.LogManager @@ -48,7 +48,7 @@ import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test /** - * Tests for interaction between [ScopedLoggingContext][io.spine.logging.flogger.context.ScopedLoggingContext] + * Tests for interaction between [ScopedLoggingContext][io.spine.logging.jvm.context.ScopedLoggingContext] * and [Log4j2LoggerBackend]. * * `ScopedLoggingContext` is abstract. To test it with Log4j backend, diff --git a/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/CaptureLogData.kt b/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/CaptureLogData.kt index 739caed5c..797fe09af 100644 --- a/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/CaptureLogData.kt +++ b/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/CaptureLogData.kt @@ -26,7 +26,7 @@ package io.spine.logging.backend.probe -import io.spine.logging.flogger.backend.LogData +import io.spine.logging.jvm.backend.LogData /** * Runs the given [action], capturing all log data that are passed diff --git a/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/DynamicBackendFactory.kt b/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/DynamicBackendFactory.kt index 84b7c336a..bcb7bfafe 100644 --- a/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/DynamicBackendFactory.kt +++ b/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/DynamicBackendFactory.kt @@ -26,8 +26,8 @@ package io.spine.logging.backend.probe -import io.spine.logging.flogger.backend.LoggerBackend -import io.spine.logging.flogger.backend.BackendFactory +import io.spine.logging.jvm.backend.LoggerBackend +import io.spine.logging.jvm.backend.BackendFactory import io.spine.logging.backend.jul.JulBackendFactory /** diff --git a/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/DynamicBackendFactoryService.kt b/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/DynamicBackendFactoryService.kt index f3bff6af5..9acbbb0fc 100644 --- a/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/DynamicBackendFactoryService.kt +++ b/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/DynamicBackendFactoryService.kt @@ -27,8 +27,8 @@ package io.spine.logging.backend.probe import com.google.auto.service.AutoService -import io.spine.logging.flogger.backend.LoggerBackend -import io.spine.logging.flogger.backend.BackendFactory +import io.spine.logging.jvm.backend.LoggerBackend +import io.spine.logging.jvm.backend.BackendFactory /** * Adapts [DynamicBackendFactory] to be used with Java's diff --git a/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/MemoizingBackendFactory.kt b/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/MemoizingBackendFactory.kt index a77742a1e..3a37abfbd 100644 --- a/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/MemoizingBackendFactory.kt +++ b/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/MemoizingBackendFactory.kt @@ -26,7 +26,7 @@ package io.spine.logging.backend.probe -import io.spine.logging.flogger.backend.LoggerBackend +import io.spine.logging.jvm.backend.LoggerBackend /** * A backend factory that stores the created instances of [LoggerBackend]. diff --git a/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/MemoizingLoggerBackendFactory.kt b/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/MemoizingLoggerBackendFactory.kt index f82050373..997d7709d 100644 --- a/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/MemoizingLoggerBackendFactory.kt +++ b/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/MemoizingLoggerBackendFactory.kt @@ -26,7 +26,7 @@ package io.spine.logging.backend.probe -import io.spine.logging.flogger.backend.given.MemoizingLoggerBackend +import io.spine.logging.jvm.backend.given.MemoizingLoggerBackend /** * A factory of [MemoizingLoggerBackend]. diff --git a/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/TypedBackendFactory.kt b/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/TypedBackendFactory.kt index 3f54b4978..6fed1542a 100644 --- a/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/TypedBackendFactory.kt +++ b/backends/probe-backend/src/main/kotlin/io/spine/logging/backend/probe/TypedBackendFactory.kt @@ -26,7 +26,7 @@ package io.spine.logging.backend.probe -import io.spine.logging.flogger.backend.LoggerBackend +import io.spine.logging.jvm.backend.LoggerBackend /** * A typed [BackendFactory][io.spine.logging.backend.system.BackendFactory]. diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/lib/Flogger.kt b/buildSrc/src/main/kotlin/io/spine/dependency/lib/Jvm.kt similarity index 99% rename from buildSrc/src/main/kotlin/io/spine/dependency/lib/Flogger.kt rename to buildSrc/src/main/kotlin/io/spine/dependency/lib/Jvm.kt index 769c90543..49396f5d7 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/lib/Flogger.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/lib/Jvm.kt @@ -29,7 +29,7 @@ package io.spine.dependency.lib // https://github.com/google/flogger @Deprecated("Please use Spine Logging library instead.") @Suppress("unused", "ConstPropertyName") -object Flogger { +object Jvm { internal const val version = "0.7.4" const val lib = "com.google.flogger:flogger:$version" diff --git a/contexts/grpc-context/src/main/java/io/spine/logging/context/grpc/GrpcContextData.java b/contexts/grpc-context/src/main/java/io/spine/logging/context/grpc/GrpcContextData.java index b476db326..bdacd3d47 100644 --- a/contexts/grpc-context/src/main/java/io/spine/logging/context/grpc/GrpcContextData.java +++ b/contexts/grpc-context/src/main/java/io/spine/logging/context/grpc/GrpcContextData.java @@ -26,12 +26,12 @@ package io.spine.logging.context.grpc; -import io.spine.logging.flogger.LoggingScope; -import io.spine.logging.flogger.context.ContextMetadata; -import io.spine.logging.flogger.context.LogLevelMap; -import io.spine.logging.flogger.context.ScopeType; -import io.spine.logging.flogger.context.ScopedLoggingContext.ScopeList; -import io.spine.logging.flogger.context.Tags; +import io.spine.logging.jvm.LoggingScope; +import io.spine.logging.jvm.context.ContextMetadata; +import io.spine.logging.jvm.context.LogLevelMap; +import io.spine.logging.jvm.context.ScopeType; +import io.spine.logging.jvm.context.ScopedLoggingContext.ScopeList; +import io.spine.logging.jvm.context.Tags; import java.util.concurrent.atomic.AtomicReference; import java.util.logging.Level; import org.jspecify.annotations.Nullable; diff --git a/contexts/grpc-context/src/main/java/io/spine/logging/context/grpc/GrpcContextDataProvider.java b/contexts/grpc-context/src/main/java/io/spine/logging/context/grpc/GrpcContextDataProvider.java index 242db3778..f328e4ba8 100644 --- a/contexts/grpc-context/src/main/java/io/spine/logging/context/grpc/GrpcContextDataProvider.java +++ b/contexts/grpc-context/src/main/java/io/spine/logging/context/grpc/GrpcContextDataProvider.java @@ -26,12 +26,12 @@ package io.spine.logging.context.grpc; -import io.spine.logging.flogger.LoggingScope; -import io.spine.logging.flogger.context.ContextDataProvider; -import io.spine.logging.flogger.context.ContextMetadata; -import io.spine.logging.flogger.context.ScopeType; -import io.spine.logging.flogger.context.ScopedLoggingContext; -import io.spine.logging.flogger.context.Tags; +import io.spine.logging.jvm.LoggingScope; +import io.spine.logging.jvm.context.ContextDataProvider; +import io.spine.logging.jvm.context.ContextMetadata; +import io.spine.logging.jvm.context.ScopeType; +import io.spine.logging.jvm.context.ScopedLoggingContext; +import io.spine.logging.jvm.context.Tags; import io.grpc.Context; import java.util.logging.Level; import org.jspecify.annotations.Nullable; diff --git a/contexts/grpc-context/src/main/java/io/spine/logging/context/grpc/GrpcScopedLoggingContext.java b/contexts/grpc-context/src/main/java/io/spine/logging/context/grpc/GrpcScopedLoggingContext.java index 5fc00bc81..1a27ac022 100644 --- a/contexts/grpc-context/src/main/java/io/spine/logging/context/grpc/GrpcScopedLoggingContext.java +++ b/contexts/grpc-context/src/main/java/io/spine/logging/context/grpc/GrpcScopedLoggingContext.java @@ -26,14 +26,14 @@ package io.spine.logging.context.grpc; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkNotNull; -import io.spine.logging.flogger.FloggerMetadataKey; -import io.spine.logging.flogger.context.ContextMetadata; -import io.spine.logging.flogger.context.LogLevelMap; -import io.spine.logging.flogger.context.ScopeType; -import io.spine.logging.flogger.context.ScopedLoggingContext; -import io.spine.logging.flogger.context.Tags; +import io.spine.logging.jvm.JvmMetadataKey; +import io.spine.logging.jvm.context.ContextMetadata; +import io.spine.logging.jvm.context.LogLevelMap; +import io.spine.logging.jvm.context.ScopeType; +import io.spine.logging.jvm.context.ScopedLoggingContext; +import io.spine.logging.jvm.context.Tags; import io.grpc.Context; import org.jspecify.annotations.Nullable; @@ -99,7 +99,7 @@ public boolean addTags(Tags tags) { } @Override - public boolean addMetadata(FloggerMetadataKey key, T value) { + public boolean addMetadata(JvmMetadataKey key, T value) { // Serves as the null pointer check, and we don't care much about the extra allocation in the // case where there's no context, because that should be very rare (and the singleton is small). ContextMetadata metadata = ContextMetadata.singleton(key, value); diff --git a/contexts/grpc-context/src/main/java/io/spine/logging/context/grpc/package-info.java b/contexts/grpc-context/src/main/java/io/spine/logging/context/grpc/package-info.java index 40aad02f8..42b335764 100644 --- a/contexts/grpc-context/src/main/java/io/spine/logging/context/grpc/package-info.java +++ b/contexts/grpc-context/src/main/java/io/spine/logging/context/grpc/package-info.java @@ -26,7 +26,7 @@ /** * Contains {@link io.grpc.Context gRPC}-based implementation of - * {@link io.spine.logging.flogger.context.ScopedLoggingContext ScopedLoggingContext}. + * {@link io.spine.logging.jvm.context.ScopedLoggingContext ScopedLoggingContext}. * * @see Original Java code of Google Flogger */ diff --git a/contexts/grpc-context/src/main/resources/META-INF/services/io.spine.logging.flogger.context.ContextDataProvider b/contexts/grpc-context/src/main/resources/META-INF/services/io.spine.logging.jvm.context.ContextDataProvider similarity index 100% rename from contexts/grpc-context/src/main/resources/META-INF/services/io.spine.logging.flogger.context.ContextDataProvider rename to contexts/grpc-context/src/main/resources/META-INF/services/io.spine.logging.jvm.context.ContextDataProvider diff --git a/contexts/grpc-context/src/test/kotlin/io/spine/logging/context/grpc/GrpcContextDataProviderSpec.kt b/contexts/grpc-context/src/test/kotlin/io/spine/logging/context/grpc/GrpcContextDataProviderSpec.kt index 0eae5dd6b..1faf3278c 100644 --- a/contexts/grpc-context/src/test/kotlin/io/spine/logging/context/grpc/GrpcContextDataProviderSpec.kt +++ b/contexts/grpc-context/src/test/kotlin/io/spine/logging/context/grpc/GrpcContextDataProviderSpec.kt @@ -29,8 +29,8 @@ package io.spine.logging.context.grpc import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.optional.shouldBePresent import io.kotest.matchers.types.shouldBeInstanceOf -import io.spine.logging.flogger.context.AbstractContextDataProviderSpec -import io.spine.logging.flogger.context.ContextDataProvider +import io.spine.logging.jvm.context.AbstractContextDataProviderSpec +import io.spine.logging.jvm.context.ContextDataProvider import java.util.* import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test diff --git a/contexts/std-context/src/main/kotlin/io/spine/logging/context/std/StdContextData.kt b/contexts/std-context/src/main/kotlin/io/spine/logging/context/std/StdContextData.kt index 6f6611345..b06b3bacd 100644 --- a/contexts/std-context/src/main/kotlin/io/spine/logging/context/std/StdContextData.kt +++ b/contexts/std-context/src/main/kotlin/io/spine/logging/context/std/StdContextData.kt @@ -29,11 +29,11 @@ package io.spine.logging.context.std import io.spine.logging.Level import io.spine.logging.compareTo import io.spine.logging.context.LogLevelMap -import io.spine.logging.flogger.LoggingScope -import io.spine.logging.flogger.context.ContextMetadata -import io.spine.logging.flogger.context.ScopeType -import io.spine.logging.flogger.context.ScopedLoggingContext.ScopeList -import io.spine.logging.flogger.context.Tags +import io.spine.logging.jvm.LoggingScope +import io.spine.logging.jvm.context.ContextMetadata +import io.spine.logging.jvm.context.ScopeType +import io.spine.logging.jvm.context.ScopedLoggingContext.ScopeList +import io.spine.logging.jvm.context.Tags /** * The data of a scoped logging context with merging capabilities when diff --git a/contexts/std-context/src/main/kotlin/io/spine/logging/context/std/StdContextDataProvider.kt b/contexts/std-context/src/main/kotlin/io/spine/logging/context/std/StdContextDataProvider.kt index aff4fda8b..44b8af444 100644 --- a/contexts/std-context/src/main/kotlin/io/spine/logging/context/std/StdContextDataProvider.kt +++ b/contexts/std-context/src/main/kotlin/io/spine/logging/context/std/StdContextDataProvider.kt @@ -27,13 +27,13 @@ package io.spine.logging.context.std import io.spine.logging.context.toMap -import io.spine.logging.flogger.LoggingScope -import io.spine.logging.flogger.backend.Metadata -import io.spine.logging.flogger.context.ContextDataProvider -import io.spine.logging.flogger.context.ScopeType -import io.spine.logging.flogger.context.ScopedLoggingContext -import io.spine.logging.flogger.context.ScopedLoggingContext.LoggingContextCloseable -import io.spine.logging.flogger.context.Tags +import io.spine.logging.jvm.LoggingScope +import io.spine.logging.jvm.backend.Metadata +import io.spine.logging.jvm.context.ContextDataProvider +import io.spine.logging.jvm.context.ScopeType +import io.spine.logging.jvm.context.ScopedLoggingContext +import io.spine.logging.jvm.context.ScopedLoggingContext.LoggingContextCloseable +import io.spine.logging.jvm.context.Tags import io.spine.logging.toJavaLogging import io.spine.logging.toLevel import java.util.logging.Level diff --git a/contexts/std-context/src/main/resources/META-INF/services/io.spine.logging.flogger.context.ContextDataProvider b/contexts/std-context/src/main/resources/META-INF/services/io.spine.logging.jvm.context.ContextDataProvider similarity index 100% rename from contexts/std-context/src/main/resources/META-INF/services/io.spine.logging.flogger.context.ContextDataProvider rename to contexts/std-context/src/main/resources/META-INF/services/io.spine.logging.jvm.context.ContextDataProvider diff --git a/contexts/std-context/src/test/kotlin/io/spine/logging/context/std/StdContextDataProviderSpec.kt b/contexts/std-context/src/test/kotlin/io/spine/logging/context/std/StdContextDataProviderSpec.kt index bdaf62ab9..d0ef8bc1c 100644 --- a/contexts/std-context/src/test/kotlin/io/spine/logging/context/std/StdContextDataProviderSpec.kt +++ b/contexts/std-context/src/test/kotlin/io/spine/logging/context/std/StdContextDataProviderSpec.kt @@ -29,8 +29,8 @@ package io.spine.logging.context.std import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.optional.shouldBePresent import io.kotest.matchers.types.shouldBeInstanceOf -import io.spine.logging.flogger.context.AbstractContextDataProviderSpec -import io.spine.logging.flogger.context.ContextDataProvider +import io.spine.logging.jvm.context.AbstractContextDataProviderSpec +import io.spine.logging.jvm.context.ContextDataProvider import java.util.* import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test diff --git a/flogger/README.md b/flogger/README.md index cc77a6095..093e36886 100644 --- a/flogger/README.md +++ b/flogger/README.md @@ -3,7 +3,7 @@ This directory contains Flogger [modules][flogger-github] built with Gradle. Original Flogger sources have been repackaged from `com.google.common.*` -to `io.spine.logging.flogger.*`. It prevents a runtime clash in situations +to `io.spine.logging.jvm.*`. It prevents a runtime clash in situations when a user has both `spine-logging` and `flogger` on the classpath. However, a user is not meant to use two logging libraries simultaneously. `flogger` may appear on the classpath as a transitive dependency. diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/AbstractLogger.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/AbstractLogger.java similarity index 95% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/AbstractLogger.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/AbstractLogger.java index aedfced67..02afd0655 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/AbstractLogger.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/AbstractLogger.java @@ -24,16 +24,16 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkNotNull; import static java.util.concurrent.TimeUnit.NANOSECONDS; -import io.spine.logging.flogger.backend.LogData; -import io.spine.logging.flogger.backend.LoggerBackend; -import io.spine.logging.flogger.backend.LoggingException; -import io.spine.logging.flogger.backend.MessageUtils; -import io.spine.logging.flogger.util.RecursionDepth; +import io.spine.logging.jvm.backend.LogData; +import io.spine.logging.jvm.backend.LoggerBackend; +import io.spine.logging.jvm.backend.LoggingException; +import io.spine.logging.jvm.backend.MessageUtils; +import io.spine.logging.jvm.util.RecursionDepth; import java.text.SimpleDateFormat; import java.util.Date; import java.util.logging.Level; @@ -47,7 +47,7 @@ * @see * Original Java code of Google Flogger */ -public abstract class AbstractLogger> { +public abstract class AbstractLogger> { /** * An upper bound on the depth of reentrant logging allowed by Flogger. Logger backends may choose * to react to reentrant logging sooner than this, but once this value is reached, a warning is diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/CountingRateLimiter.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/CountingRateLimiter.java similarity index 95% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/CountingRateLimiter.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/CountingRateLimiter.java index bb2159c1b..4a77931aa 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/CountingRateLimiter.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/CountingRateLimiter.java @@ -24,11 +24,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; -import static io.spine.logging.flogger.LogContext.Key.LOG_EVERY_N; +import static io.spine.logging.jvm.LogContext.Key.LOG_EVERY_N; -import io.spine.logging.flogger.backend.Metadata; +import io.spine.logging.jvm.backend.Metadata; import java.util.concurrent.atomic.AtomicLong; import org.jspecify.annotations.Nullable; @@ -83,7 +83,7 @@ static RateLimitStatus check(Metadata metadata, LogSiteKey logSiteKey) { /** * Increments the invocation count and returns true if it reached the specified rate limit count. * This is invoked during post-processing if a rate limiting count was set via {@link - * FloggerApi#every(int)}. + * JvmApi#every(int)}. */ // Visible for testing. RateLimitStatus incrementAndCheckLogCount(int rateLimitCount) { diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/DurationRateLimiter.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/DurationRateLimiter.java similarity index 94% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/DurationRateLimiter.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/DurationRateLimiter.java index 84a6d0934..da908d31f 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/DurationRateLimiter.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/DurationRateLimiter.java @@ -24,15 +24,15 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; -import static io.spine.logging.flogger.LogContext.Key.LOG_AT_MOST_EVERY; -import static io.spine.logging.flogger.util.Checks.checkArgument; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.LogContext.Key.LOG_AT_MOST_EVERY; +import static io.spine.logging.jvm.util.Checks.checkArgument; +import static io.spine.logging.jvm.util.Checks.checkNotNull; import static java.lang.Math.max; -import io.spine.logging.flogger.backend.LogData; -import io.spine.logging.flogger.backend.Metadata; +import io.spine.logging.jvm.backend.LogData; +import io.spine.logging.jvm.backend.Metadata; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import org.jspecify.annotations.Nullable; @@ -136,7 +136,7 @@ public boolean equals(Object obj) { /** * Checks whether the current time stamp is after the rate limiting period and if so, updates the * time stamp and returns true. This is invoked during post-processing if a rate limiting duration - * was set via {@link FloggerApi#atMostEvery(int, TimeUnit)}. + * was set via {@link JvmApi#atMostEvery(int, TimeUnit)}. */ // Visible for testing. RateLimitStatus checkLastTimestamp(long timestampNanos, RateLimitPeriod period) { diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/FluentLogger2.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/FluentLogger2.java similarity index 92% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/FluentLogger2.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/FluentLogger2.java index b5af7288d..086681da1 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/FluentLogger2.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/FluentLogger2.java @@ -24,17 +24,17 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; -import io.spine.logging.flogger.backend.LoggerBackend; -import io.spine.logging.flogger.backend.Platform; -import io.spine.logging.flogger.parser.DefaultPrintfMessageParser; -import io.spine.logging.flogger.parser.MessageParser; +import io.spine.logging.jvm.backend.LoggerBackend; +import io.spine.logging.jvm.backend.Platform; +import io.spine.logging.jvm.parser.DefaultPrintfMessageParser; +import io.spine.logging.jvm.parser.MessageParser; import java.util.logging.Level; /** - * The default implementation of {@link AbstractLogger} which returns the basic {@link FloggerApi} + * The default implementation of {@link AbstractLogger} which returns the basic {@link JvmApi} * and uses the default parser and system configured backend. *

* Note that when extending the logging API or specifying a new parser, you will need to create a @@ -57,13 +57,13 @@ public final class FluentLogger2 extends AbstractLogger { * a separate top-level API and LogContext is created, allowing it to be shared by other * implementations. */ - public interface Api extends FloggerApi {} + public interface Api extends JvmApi {} /** * The non-wildcard, fully specified, no-op API implementation. This is required to provide a * no-op implementation whose type is compatible with this logger's API. */ - private static final class NoOp extends FloggerApi.NoOp implements Api {} + private static final class NoOp extends JvmApi.NoOp implements Api {} // Singleton instance of the no-op API. This variable is purposefully declared as an instance of // the NoOp type instead of the Api type. This helps ProGuard optimization recognize the type of diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/FloggerApi.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/JvmApi.java similarity index 97% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/FloggerApi.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/JvmApi.java index 11faeab92..db8bdfb65 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/FloggerApi.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/JvmApi.java @@ -24,11 +24,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; import org.jspecify.annotations.Nullable; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkNotNull; import java.util.concurrent.TimeUnit; @@ -56,7 +56,7 @@ * Original Java code of Google Flogger */ @SuppressWarnings({"ClassWithTooManyMethods", "OverlyComplexClass"}) -public interface FloggerApi> { +public interface JvmApi> { /** * Associates a {@link Throwable} instance with the current log statement, to be interpreted as * the cause of this statement. @@ -265,15 +265,15 @@ public interface FloggerApi> { * Aggregates stateful logging with respect to a scoped context determined by the given scope * provider. * - *

When {@link io.spine.logging.flogger.context.ScopedLoggingContext ScopedLoggingContext} - * is used to create a context, it can be bound to a {@link io.spine.logging.flogger.context.ScopeType ScopeType}. + *

When {@link io.spine.logging.jvm.context.ScopedLoggingContext ScopedLoggingContext} + * is used to create a context, it can be bound to a {@link io.spine.logging.jvm.context.ScopeType ScopeType}. * For example: * *

{@code
    * ScopedLoggingContexts.newContext(REQUEST).run(() -> scopedMethod(x, y, z));
    * }
* - * where {@link io.spine.logging.flogger.context.ScopeType#REQUEST REQUEST} defines the scope + * where {@link io.spine.logging.jvm.context.ScopeType#REQUEST REQUEST} defines the scope * type for the context in which {@code scopedMethod()} is called. Within this context, the scope * associated with the {@code REQUEST} type can then be used to aggregate logging behavior: * @@ -281,7 +281,7 @@ public interface FloggerApi> { * logger.atInfo().atMostEvery(5, SECONDS).per(REQUEST).log("Some message..."); * } * - *

New scope types can be created for specific subtasks using {@link io.spine.logging.flogger.context.ScopeType#create ScopeType.create("")} + *

New scope types can be created for specific subtasks using {@link io.spine.logging.jvm.context.ScopeType#create ScopeType.create("")} * but it is recommended to use shared constants (such as {@code ScopeType.REQUEST}) wherever feasible to * avoid confusion. * @@ -329,7 +329,7 @@ public interface FloggerApi> { *

  • Key value pairs which are explicitly extracted from logs by tools. * * - *

    Metadata keys can support repeated values (see {@link FloggerMetadataKey#canRepeat()}), and if a + *

    Metadata keys can support repeated values (see {@link JvmMetadataKey#canRepeat()}), and if a * repeatable key is used multiple times in the same log statement, the effect is to collect all * the given values in order. If a non-repeatable key is passed multiple times, only the last * value is retained (though callers should not rely on this behavior and should simply avoid @@ -342,9 +342,9 @@ public interface FloggerApi> { * @param value a value to be associated with the key in this log statement. Null values are * allowed, but the effect is always a no-op * @throws NullPointerException if the given key is null - * @see FloggerMetadataKey + * @see JvmMetadataKey */ - API with(FloggerMetadataKey key, @Nullable T value); + API with(JvmMetadataKey key, @Nullable T value); /** * Sets a boolean metadata key constant to {@code true} for this log statement in a structured way @@ -363,9 +363,9 @@ public interface FloggerApi> { * * @param key the boolean metadata key (expected to be a static constant) * @throws NullPointerException if the given key is null - * @see FloggerMetadataKey + * @see JvmMetadataKey */ - API with(FloggerMetadataKey key); + API with(JvmMetadataKey key); /** * Sets the log site for the current log statement. Explicit log site injection is very rarely @@ -386,7 +386,7 @@ public interface FloggerApi> { * and then code can do: * *

    {@code
    -   * import static io.spine.logging.flogger.LogSites.logSite;
    +   * import static io.spine.logging.jvm.LogSites.logSite;
        * }
    * * and elsewhere: @@ -418,7 +418,7 @@ public interface FloggerApi> { * * @param logSite Log site which uniquely identifies any per-log statement resources. */ - API withInjectedLogSite(@Nullable FloggerLogSite logSite); + API withInjectedLogSite(@Nullable JvmLogSite logSite); /** * Internal method not for public use. This method is only intended for use by the logger @@ -815,19 +815,19 @@ void log( void log(String msg, double p1, double p2); /** - * An implementation of {@link FloggerApi} which does nothing and discards all parameters. + * An implementation of {@link JvmApi} which does nothing and discards all parameters. *

    * This class (or a subclass in the case of an extended API) should be returned whenever logging * is definitely disabled (e.g. when the log level is too low). */ - public static class NoOp> implements FloggerApi { + public static class NoOp> implements JvmApi { @SuppressWarnings("unchecked") protected final API noOp() { return (API) this; } @Override - public API withInjectedLogSite(FloggerLogSite logSite) { + public API withInjectedLogSite(JvmLogSite logSite) { return noOp(); } @@ -846,14 +846,14 @@ public final boolean isEnabled() { } @Override - public final API with(FloggerMetadataKey key, @Nullable T value) { + public final API with(JvmMetadataKey key, @Nullable T value) { // Identical to the check in LogContext for consistency. checkNotNull(key, "metadata key"); return noOp(); } @Override - public final API with(FloggerMetadataKey key) { + public final API with(JvmMetadataKey key) { // Do this inline rather than calling with(key, true) to keep no-op minimal. checkNotNull(key, "metadata key"); return noOp(); diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/FloggerLogSite.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/JvmLogSite.java similarity index 93% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/FloggerLogSite.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/JvmLogSite.java index e6a812470..2fd68850c 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/FloggerLogSite.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/JvmLogSite.java @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkNotNull; import org.jspecify.annotations.Nullable; @@ -50,14 +50,14 @@ * @see * Original Java code of Google Flogger */ -public abstract class FloggerLogSite implements LogSiteKey { +public abstract class JvmLogSite implements LogSiteKey { /** A value used for line numbers when the true information is not available. */ public static final int UNKNOWN_LINE = 0; /** * An singleton LogSite instance used to indicate that valid log site information cannot be * determined. This can be used to indicate that log site information is not available by - * injecting it via {@link FloggerApi#withInjectedLogSite} which will suppress any further + * injecting it via {@link JvmApi#withInjectedLogSite} which will suppress any further * log site analysis for that log statement. This is also returned if stack trace analysis * fails for any reason. *

    @@ -65,8 +65,8 @@ public abstract class FloggerLogSite implements LogSiteKey { * methods which rely on being able to look up site specific metadata will be disabled and * essentially become "no ops". */ - public static final FloggerLogSite INVALID = - new FloggerLogSite() { + public static final JvmLogSite INVALID = + new JvmLogSite() { @Override public String getClassName() { return ""; @@ -153,18 +153,18 @@ public final String toString() { * directly. */ @Deprecated - public static FloggerLogSite injectedLogSite( + public static JvmLogSite injectedLogSite( String internalClassName, String methodName, int encodedLineNumber, @Nullable String sourceFileName) { - return new InjectedFloggerLogSite(internalClassName, + return new InjectedJvmLogSite(internalClassName, methodName, encodedLineNumber, sourceFileName); } - private static final class InjectedFloggerLogSite extends FloggerLogSite { + private static final class InjectedJvmLogSite extends JvmLogSite { /** Internal (slash-separated) fully qualified class name (eg, "com/example/Foo$Bar"). */ private final String internalClassName; @@ -175,7 +175,7 @@ private static final class InjectedFloggerLogSite extends FloggerLogSite { @Nullable private final String sourceFileName; private int hashcode = 0; - private InjectedFloggerLogSite( + private InjectedJvmLogSite( String internalClassName, String methodName, int encodedLineNumber, @@ -214,8 +214,8 @@ public String getFileName() { @Override public boolean equals(Object obj) { - if (obj instanceof InjectedFloggerLogSite) { - InjectedFloggerLogSite other = (InjectedFloggerLogSite) obj; + if (obj instanceof InjectedJvmLogSite) { + InjectedJvmLogSite other = (InjectedJvmLogSite) obj; // Probably not worth optimizing for "this == obj" because all strings should be interned. return methodName.equals(other.methodName) && encodedLineNumber == other.encodedLineNumber diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/FloggerLogSites.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/JvmLogSites.java similarity index 85% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/FloggerLogSites.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/JvmLogSites.java index d519cde48..7e9b24480 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/FloggerLogSites.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/JvmLogSites.java @@ -24,26 +24,26 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; -import io.spine.logging.flogger.backend.Platform; +import io.spine.logging.jvm.backend.Platform; import org.jspecify.annotations.Nullable; /** * Helper class to generate log sites for the current line of code. This class is deliberately - * isolated (rather than having the method in {@link FloggerLogSite} itself) because manual log site + * isolated (rather than having the method in {@link JvmLogSite} itself) because manual log site * injection is rare and by isolating it into a separate class may help encourage users to think * carefully about the issue. * * @see * Original Java code of Google Flogger */ -public final class FloggerLogSites { +public final class JvmLogSites { /** * Returns a {@code LogSite} for the caller of the specified class. This can be used in - * conjunction with the {@link FloggerApi#withInjectedLogSite(FloggerLogSite)} method to implement + * conjunction with the {@link JvmApi#withInjectedLogSite(JvmLogSite)} method to implement * logging helper methods. In some platforms, log site determination may be unsupported, and in - * those cases this method will always return the {@link FloggerLogSite#INVALID} instance. + * those cases this method will always return the {@link JvmLogSite#INVALID} instance. *

    * For example (in {@code MyLoggingHelper}): *

    {@code
    @@ -82,18 +82,18 @@ public final class FloggerLogSites {
        * @param loggingApi the logging API to be identified as the source of log statements (this must
        *        appear somewhere on the stack above the point at which this method is called).
        * @return the log site of the caller of the specified logging API,
    -   *        or {@link FloggerLogSite#INVALID} if the logging API was not found.
    +   *        or {@link JvmLogSite#INVALID} if the logging API was not found.
        */
    -  public static FloggerLogSite callerOf(Class loggingApi) {
    +  public static JvmLogSite callerOf(Class loggingApi) {
         // Can't skip anything here since someone could pass in LogSite.class.
         return Platform.getCallerFinder().findLogSite(loggingApi, 0);
       }
     
       /**
        * Returns a {@code LogSite} for the current line of code. This can be used in conjunction with
    -   * the {@link FloggerApi#withInjectedLogSite(FloggerLogSite)} method to implement logging helper
    + * the {@link JvmApi#withInjectedLogSite(JvmLogSite)} method to implement logging helper
        * methods. In some platforms, log site determination may be unsupported, and in those cases this
    -   * method will always return the {@link FloggerLogSite#INVALID} instance.
    +   * method will always return the {@link JvmLogSite#INVALID} instance.
        * 

    * For example (in {@code MyLoggingHelper}): *

    {@code
    @@ -128,21 +128,21 @@ public static FloggerLogSite callerOf(Class loggingApi) {
        *
        * @return the log site of the caller of this method.
        */
    -  public static FloggerLogSite logSite() {
    +  public static JvmLogSite logSite() {
         // Don't call "callerOf()" to avoid making another stack entry.
    -    return Platform.getCallerFinder().findLogSite(FloggerLogSites.class, 0);
    +    return Platform.getCallerFinder().findLogSite(JvmLogSites.class, 0);
       }
     
       /**
        * Returns a new {@code LogSite} which reflects the information in the given {@link
    -   * StackTraceElement}, or {@link FloggerLogSite#INVALID} if given {@code null}.
    +   * StackTraceElement}, or {@link JvmLogSite#INVALID} if given {@code null}.
        *
        * 

    This method is useful when log site information is only available via an external API, * which returns {@link StackTraceElement}. */ - public static FloggerLogSite logSiteFrom(@Nullable StackTraceElement e) { - return e != null ? new StackBasedLogSite(e) : FloggerLogSite.INVALID; + public static JvmLogSite logSiteFrom(@Nullable StackTraceElement e) { + return e != null ? new StackBasedLogSite(e) : JvmLogSite.INVALID; } - private FloggerLogSites() {} + private JvmLogSites() {} } diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/FloggerMetadataKey.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/JvmMetadataKey.java similarity index 94% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/FloggerMetadataKey.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/JvmMetadataKey.java index 96a94190f..8050016c4 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/FloggerMetadataKey.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/JvmMetadataKey.java @@ -24,13 +24,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; -import static io.spine.logging.flogger.util.Checks.checkMetadataIdentifier; -import static io.spine.logging.flogger.util.Checks.checkNotNull; -import static io.spine.logging.flogger.util.Checks.checkState; +import static io.spine.logging.jvm.util.Checks.checkMetadataIdentifier; +import static io.spine.logging.jvm.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkState; -import io.spine.logging.flogger.backend.Platform; +import io.spine.logging.jvm.backend.Platform; import java.util.Iterator; /** @@ -60,7 +60,7 @@ * {@code equals()} (rather than '==') since this will be safe in cases where non-singleton keys * exist, and is just as fast if the keys are singletons. * - *

    It is strongly recommended that any public {@link FloggerMetadataKey} instances are defined + *

    It is strongly recommended that any public {@link JvmMetadataKey} instances are defined * as {@code public static final} fields in a top-level or nested class, which does no logging. * Ideally a separate class would be defined to hold only the keys, since this allows keys * to be loaded very early in the logging {@link Platform} lifecycle without risking any static @@ -94,7 +94,7 @@ * @see * Original Java code of Google Flogger */ -public class FloggerMetadataKey { +public class JvmMetadataKey { // High levels of reentrant logging could well be caused by custom metadata keys. This is set // lower than the total limit on reentrant logging because it's one of the more likely ways in // which unbounded reentrant logging could occur, but it's also easy to mitigate. @@ -104,7 +104,7 @@ public class FloggerMetadataKey { * Callback interface to handle additional contextual {@code Metadata} in log statements. This * interface is only intended to be implemented by logger backend classes as part of handling * metadata, and should not be used in any general application code, other than to implement the - * {@link FloggerMetadataKey#emit} method in this class. + * {@link JvmMetadataKey#emit} method in this class. */ public interface KeyValueHandler { /** Handle a single key/value a pair of contextual metadata for a log statement. */ @@ -127,8 +127,8 @@ public interface KeyValueHandler { * primitive class may lead to a runtime exception because metadata keys * are used with generics. */ - public static FloggerMetadataKey single(String label, Class clazz) { - return new FloggerMetadataKey<>(label, clazz, false, false); + public static JvmMetadataKey single(String label, Class clazz) { + return new JvmMetadataKey<>(label, clazz, false, false); } /** @@ -147,8 +147,8 @@ public static FloggerMetadataKey single(String label, Class * primitive class may lead to a runtime exception because metadata keys * are used with generics. */ - public static FloggerMetadataKey repeated(String label, Class clazz) { - return new FloggerMetadataKey<>(label, clazz, true, false); + public static JvmMetadataKey repeated(String label, Class clazz) { + return new JvmMetadataKey<>(label, clazz, true, false); } private final String label; @@ -162,13 +162,13 @@ public static FloggerMetadataKey repeated(String label, Class clazz) { * but occasionally it can be useful to create a specific subtype to control the formatting of * values or to have a family of related keys with a common parent type. */ - protected FloggerMetadataKey(String label, Class clazz, boolean canRepeat) { + protected JvmMetadataKey(String label, Class clazz, boolean canRepeat) { this(label, clazz, canRepeat, true); } // Private constructor to allow instances generated by static factory methods to be marked as // non-custom. - private FloggerMetadataKey(String label, Class clazz, + private JvmMetadataKey(String label, Class clazz, boolean canRepeat, boolean isCustom) { this.label = checkMetadataIdentifier(label); this.clazz = checkNotNull(clazz, "class"); diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/LazyArg.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/LazyArg.java similarity index 98% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/LazyArg.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/LazyArg.java index 9656ac916..9e59ddf42 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/LazyArg.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/LazyArg.java @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; import org.jspecify.annotations.Nullable; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/LazyArgs.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/LazyArgs.java similarity index 97% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/LazyArgs.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/LazyArgs.java index e15a50b72..8fac1aa5f 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/LazyArgs.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/LazyArgs.java @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkNotNull; /** * Static utility methods for lazy argument evaluation in Flogger. The {@link #lazy(LazyArg)} diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/LogContext.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/LogContext.java similarity index 94% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/LogContext.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/LogContext.java index 1721e1ab6..f4f7f326d 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/LogContext.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/LogContext.java @@ -24,15 +24,15 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; - -import io.spine.logging.flogger.DurationRateLimiter.RateLimitPeriod; -import io.spine.logging.flogger.backend.LogData; -import io.spine.logging.flogger.backend.Metadata; -import io.spine.logging.flogger.backend.Platform; -import io.spine.logging.flogger.backend.TemplateContext; -import io.spine.logging.flogger.context.Tags; -import io.spine.logging.flogger.parser.MessageParser; +package io.spine.logging.jvm; + +import io.spine.logging.jvm.DurationRateLimiter.RateLimitPeriod; +import io.spine.logging.jvm.backend.LogData; +import io.spine.logging.jvm.backend.Metadata; +import io.spine.logging.jvm.backend.Platform; +import io.spine.logging.jvm.backend.TemplateContext; +import io.spine.logging.jvm.context.Tags; +import io.spine.logging.jvm.parser.MessageParser; import org.jspecify.annotations.Nullable; import java.util.Arrays; @@ -42,15 +42,15 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Level; -import static io.spine.logging.flogger.FloggerLogSite.injectedLogSite; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.JvmLogSite.injectedLogSite; +import static io.spine.logging.jvm.util.Checks.checkNotNull; import static io.spine.reflect.CallerFinder.stackForCallerOf; import static java.util.concurrent.TimeUnit.NANOSECONDS; /** * The base context for a logging statement, which implements the base logging API. * - *

    This class is an implementation of the base {@link FloggerApi} interface and acts as a holder + *

    This class is an implementation of the base {@link JvmApi} interface and acts as a holder * for any state applied to the log statement during the fluent call sequence. The lifecycle of a * logging context is very short; it is created by a logger, usually in response to a call to the * {@link AbstractLogger#at(Level)} method, and normally lasts only as long as the log statement. @@ -66,8 +66,8 @@ * @see * Original Java code of Google Flogger */ -public abstract class LogContext, API extends FloggerApi> - implements FloggerApi, LogData { +public abstract class LogContext, API extends JvmApi> + implements JvmApi, LogData { /** * The predefined metadata keys used by the default logging API. Backend implementations can use @@ -78,38 +78,38 @@ public static final class Key { private Key() {} /** * The key associated with a {@link Throwable} cause to be associated with the log message. This - * value is set by {@link FloggerApi#withCause(Throwable)}. + * value is set by {@link JvmApi#withCause(Throwable)}. */ - public static final FloggerMetadataKey LOG_CAUSE = - FloggerMetadataKey.single("cause", Throwable.class); + public static final JvmMetadataKey LOG_CAUSE = + JvmMetadataKey.single("cause", Throwable.class); /** * The key associated with a rate limiting counter for "1-in-N" rate limiting. The value is set - * by {@link FloggerApi#every(int)}. + * by {@link JvmApi#every(int)}. */ - public static final FloggerMetadataKey LOG_EVERY_N = - FloggerMetadataKey.single("ratelimit_count", Integer.class); + public static final JvmMetadataKey LOG_EVERY_N = + JvmMetadataKey.single("ratelimit_count", Integer.class); /** * The key associated with a rate limiting counter for "1-in-N" randomly sampled rate limiting. - * The value is set by {@link FloggerApi#onAverageEvery(int)}. + * The value is set by {@link JvmApi#onAverageEvery(int)}. */ - public static final FloggerMetadataKey LOG_SAMPLE_EVERY_N = - FloggerMetadataKey.single("sampling_count", Integer.class); + public static final JvmMetadataKey LOG_SAMPLE_EVERY_N = + JvmMetadataKey.single("sampling_count", Integer.class); /** * The key associated with a rate limiting period for "at most once every N" rate limiting. The - * value is set by {@link FloggerApi#atMostEvery(int, TimeUnit)}. + * value is set by {@link JvmApi#atMostEvery(int, TimeUnit)}. */ - public static final FloggerMetadataKey LOG_AT_MOST_EVERY = - FloggerMetadataKey.single("ratelimit_period", RateLimitPeriod.class); + public static final JvmMetadataKey LOG_AT_MOST_EVERY = + JvmMetadataKey.single("ratelimit_period", RateLimitPeriod.class); /** * The key associated with a count of rate limited logs. This is only public so backends can * reference the key to control formatting. */ - public static final FloggerMetadataKey SKIPPED_LOG_COUNT = - FloggerMetadataKey.single("skipped", Integer.class); + public static final JvmMetadataKey SKIPPED_LOG_COUNT = + JvmMetadataKey.single("skipped", Integer.class); /** * The key associated with a sequence of log site "grouping keys". These serve to specialize the @@ -117,8 +117,8 @@ private Key() {} * by the {@code per()} methods and is only public so backends can reference the key to control * formatting. */ - public static final FloggerMetadataKey LOG_SITE_GROUPING_KEY = - new FloggerMetadataKey<>("group_by", Object.class, true) { + public static final JvmMetadataKey LOG_SITE_GROUPING_KEY = + new JvmMetadataKey<>("group_by", Object.class, true) { @Override public void emitRepeated(Iterator keys, KeyValueHandler out) { if (keys.hasNext()) { @@ -172,8 +172,8 @@ public void emitRepeated(Iterator keys, KeyValueHandler out) { * Thus it makes no sense to provide a public method to set this value programmatically for a * log statement. */ - public static final FloggerMetadataKey WAS_FORCED = - FloggerMetadataKey.single("forced", Boolean.class); + public static final JvmMetadataKey WAS_FORCED = + JvmMetadataKey.single("forced", Boolean.class); /** * The key associated with any injected {@link Tags}. @@ -187,8 +187,8 @@ public void emitRepeated(Iterator keys, KeyValueHandler out) { * normal log message arguments is always the preferred way to indicate unstrctured log data. * Users should never build new {@link Tags} instances just to pass them into a log statement. */ - public static final FloggerMetadataKey TAGS = - new FloggerMetadataKey<>("tags", Tags.class, false) { + public static final JvmMetadataKey TAGS = + new JvmMetadataKey<>("tags", Tags.class, false) { @Override public void emit(Tags tags, KeyValueHandler out) { for (Map.Entry> e : tags.asMap().entrySet()) { @@ -208,8 +208,8 @@ public void emit(Tags tags, KeyValueHandler out) { * Key associated with the metadata for specifying additional stack information with a log * statement. */ - public static final FloggerMetadataKey CONTEXT_STACK_SIZE = - FloggerMetadataKey.single("stack_size", StackSize.class); + public static final JvmMetadataKey CONTEXT_STACK_SIZE = + JvmMetadataKey.single("stack_size", StackSize.class); } static final class MutableMetadata extends Metadata { @@ -241,11 +241,11 @@ public int size() { } @Override - public FloggerMetadataKey getKey(int n) { + public JvmMetadataKey getKey(int n) { if (n >= keyValueCount) { throw new IndexOutOfBoundsException(); } - return (FloggerMetadataKey) keyValuePairs[2 * n]; + return (JvmMetadataKey) keyValuePairs[2 * n]; } @Override @@ -256,7 +256,7 @@ public Object getValue(int n) { return keyValuePairs[(2 * n) + 1]; } - private int indexOf(FloggerMetadataKey key) { + private int indexOf(JvmMetadataKey key) { for (var index = 0; index < keyValueCount; index++) { if (keyValuePairs[2 * index].equals(key)) { return index; @@ -267,7 +267,7 @@ private int indexOf(FloggerMetadataKey key) { @Override @Nullable - public T findValue(FloggerMetadataKey key) { + public T findValue(JvmMetadataKey key) { var index = indexOf(key); return index != -1 ? key.cast(keyValuePairs[(2 * index) + 1]) : null; } @@ -277,7 +277,7 @@ public T findValue(FloggerMetadataKey key) { * cannot be repeated, and there is already a value for the key in the metadata, then the * existing value is replaced, otherwise the value is added at the end of the metadata. */ - void addValue(FloggerMetadataKey key, T value) { + void addValue(JvmMetadataKey key, T value) { if (!key.canRepeat()) { var index = indexOf(key); if (index != -1) { @@ -298,7 +298,7 @@ void addValue(FloggerMetadataKey key, T value) { } /** Removes all key/value pairs for a given key. */ - void removeAllValues(FloggerMetadataKey key) { + void removeAllValues(JvmMetadataKey key) { var index = indexOf(key); if (index >= 0) { var dest = 2 * index; @@ -349,7 +349,7 @@ public String toString() { /** Additional metadata for this log statement (added via fluent API methods). */ private MutableMetadata metadata = null; /** The log site information for this log statement (set immediately prior to post-processing). */ - private FloggerLogSite logSite = null; + private JvmLogSite logSite = null; /** Rate limit status (only set if rate limiting occurs). */ private RateLimitStatus rateLimitStatus = null; /** The template context if formatting is required (set only after post-processing). */ @@ -435,7 +435,7 @@ public final String getLoggerName() { } @Override - public final FloggerLogSite getLogSite() { + public final JvmLogSite getLogSite() { if (logSite == null) { throw new IllegalStateException("cannot request log site information prior to postProcess()"); } @@ -492,7 +492,7 @@ public final Metadata getMetadata() { * @param key the metadata key (see {@link LogData}). * @param value the metadata value. */ - protected final void addMetadata(FloggerMetadataKey key, T value) { + protected final void addMetadata(JvmMetadataKey key, T value) { if (metadata == null) { metadata = new MutableMetadata(); } @@ -505,7 +505,7 @@ protected final void addMetadata(FloggerMetadataKey key, T value) { * * @param key the metadata key (see {@link LogData}). */ - protected final void removeMetadata(FloggerMetadataKey key) { + protected final void removeMetadata(JvmMetadataKey key) { if (metadata != null) { metadata.removeAllValues(key); } @@ -544,7 +544,7 @@ protected final void removeMetadata(FloggerMetadataKey key) { * {@link LogSiteMap}. This will correctly handle "specialized" log-site keys and remove the risk * of memory leaks due to retaining unused log site data indefinitely. * - *

    Note that the given {@code logSiteKey} can be more specific than the {@link FloggerLogSite} + *

    Note that the given {@code logSiteKey} can be more specific than the {@link JvmLogSite} * of a log statement (i.e. a single log statement can have multiple distinct versions of * its state). See {@link #per(Enum)} for more information. * @@ -686,7 +686,7 @@ private boolean shouldLog() { "logger backend must not return a null LogSite"); } LogSiteKey logSiteKey = null; - if (logSite != FloggerLogSite.INVALID) { + if (logSite != JvmLogSite.INVALID) { logSiteKey = logSite; // Log site keys are only modified when we have metadata in the log statement. if (metadata != null && metadata.size() > 0) { @@ -776,7 +776,7 @@ private void logImpl(String message, Object... args) { // ---- Log site injection (used by pre-processors and special cases) ---- @Override - public final API withInjectedLogSite(FloggerLogSite logSite) { + public final API withInjectedLogSite(JvmLogSite logSite) { // First call wins (since auto-injection will typically target the log() method at the end of // the chain and might not check for previous explicit injection). In particular it MUST be // allowed for a caller to specify the "INVALID" log site, and have that set the field here to @@ -810,7 +810,7 @@ public final boolean isEnabled() { } @Override - public final API with(FloggerMetadataKey key, @Nullable T value) { + public final API with(JvmMetadataKey key, @Nullable T value) { // Null keys are always bad (even if the value is also null). This is one of the few places // where the logger API will throw a runtime exception (and as such it's important to ensure // the NoOp implementation also does the check). The reasoning for this is that the metadata @@ -824,7 +824,7 @@ public final API with(FloggerMetadataKey key, @Nullable T value) { } @Override - public final API with(FloggerMetadataKey key) { + public final API with(JvmMetadataKey key) { return with(key, Boolean.TRUE); } @@ -868,7 +868,7 @@ public final API onAverageEvery(int n) { return everyImpl(Key.LOG_SAMPLE_EVERY_N, n, "sampling"); } - private API everyImpl(FloggerMetadataKey key, int n, String label) { + private API everyImpl(JvmMetadataKey key, int n, String label) { // See wasForced() for discussion as to why this occurs before argument checking. if (wasForced()) { return api(); diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/LogPerBucketingStrategy.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/LogPerBucketingStrategy.java similarity index 97% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/LogPerBucketingStrategy.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/LogPerBucketingStrategy.java index 02872c122..6f68edb69 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/LogPerBucketingStrategy.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/LogPerBucketingStrategy.java @@ -24,10 +24,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; -import static io.spine.logging.flogger.util.Checks.checkArgument; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkArgument; +import static io.spine.logging.jvm.util.Checks.checkNotNull; import java.util.HashMap; import org.jspecify.annotations.Nullable; @@ -226,7 +226,7 @@ protected LogPerBucketingStrategy(String name) { *

    Warning: If keys are not known to have natural singleton semantics * (e.g. {@code String}) then returning the given key instance is generally a bad idea. * Even if the set of key values is small, the set of distinct allocated instances passed to - * {@link FloggerApi#per(Object,LogPerBucketingStrategy)} can be unbounded, and that's what matters. + * {@link JvmApi#per(Object,LogPerBucketingStrategy)} can be unbounded, and that's what matters. * As such, it is always better to map keys to some singleton identifier or intern the keys in * some way. * diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/LogSiteKey.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/LogSiteKey.java similarity index 96% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/LogSiteKey.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/LogSiteKey.java index e2c94a36d..ac7807aa1 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/LogSiteKey.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/LogSiteKey.java @@ -24,11 +24,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; /** * A tagging interface to mark implementations that are suitable for use as a key for looking up - * per log site persistent state. Normally the class used is just {@link FloggerLogSite} but other, + * per log site persistent state. Normally the class used is just {@link JvmLogSite} but other, * more specific, keys can be used. There are no method requirements on this interface, * but the instance must have correct {@code equals()}, {@code hashCode()} and {@code toString()} * implementations and must be at least as unique as the associated {@code LogSite} (i.e., two keys diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/LogSiteMap.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/LogSiteMap.java similarity index 97% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/LogSiteMap.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/LogSiteMap.java index cbd3509a2..f252c84e6 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/LogSiteMap.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/LogSiteMap.java @@ -24,11 +24,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkNotNull; -import io.spine.logging.flogger.backend.Metadata; +import io.spine.logging.jvm.backend.Metadata; import java.util.concurrent.ConcurrentHashMap; /** diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/LogSiteStackTrace.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/LogSiteStackTrace.java similarity index 98% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/LogSiteStackTrace.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/LogSiteStackTrace.java index a4e41a47d..bbc293306 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/LogSiteStackTrace.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/LogSiteStackTrace.java @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; import org.jspecify.annotations.Nullable; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/LoggingScope.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/LoggingScope.java similarity index 96% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/LoggingScope.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/LoggingScope.java index 781c87bd7..e9bf41966 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/LoggingScope.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/LoggingScope.java @@ -24,11 +24,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkNotNull; -import io.spine.logging.flogger.backend.Metadata; +import io.spine.logging.jvm.backend.Metadata; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; import java.util.Queue; @@ -39,7 +39,7 @@ * stateful logging operations (e.g. rate limiting). * *

    Scopes are provided via the {@link LoggingScopeProvider} interface and found by looking for - * the current {@link io.spine.logging.flogger.context.ScopedLoggingContext ScopedLoggingContexts}. + * the current {@link io.spine.logging.jvm.context.ScopedLoggingContext ScopedLoggingContexts}. * *

    Stateful fluent logging APIs which need to look up per log site information (e.g. rate limit * state) should do so via a {@link LogSiteMap} using the {@link LogSiteKey} passed into the {@link diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/LoggingScopeProvider.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/LoggingScopeProvider.java similarity index 98% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/LoggingScopeProvider.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/LoggingScopeProvider.java index 1878604a6..e9c9b6e6a 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/LoggingScopeProvider.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/LoggingScopeProvider.java @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; import org.jspecify.annotations.Nullable; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/RateLimitStatus.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/RateLimitStatus.java similarity index 99% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/RateLimitStatus.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/RateLimitStatus.java index e787ff9dd..a5ed6db14 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/RateLimitStatus.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/RateLimitStatus.java @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; -import io.spine.logging.flogger.backend.Metadata; +import io.spine.logging.jvm.backend.Metadata; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import org.jspecify.annotations.Nullable; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/SamplingRateLimiter.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/SamplingRateLimiter.java similarity index 96% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/SamplingRateLimiter.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/SamplingRateLimiter.java index 75b28a6d8..944510f5f 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/SamplingRateLimiter.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/SamplingRateLimiter.java @@ -24,15 +24,15 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; -import io.spine.logging.flogger.backend.Metadata; +import io.spine.logging.jvm.backend.Metadata; import org.jspecify.annotations.Nullable; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; -import static io.spine.logging.flogger.LogContext.Key.LOG_SAMPLE_EVERY_N; +import static io.spine.logging.jvm.LogContext.Key.LOG_SAMPLE_EVERY_N; /** * Rate limiter to support {@code onAverageEvery(N)} functionality. diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/SpecializedLogSiteKey.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/SpecializedLogSiteKey.java similarity index 96% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/SpecializedLogSiteKey.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/SpecializedLogSiteKey.java index d35095c37..58e5292d9 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/SpecializedLogSiteKey.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/SpecializedLogSiteKey.java @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkNotNull; import org.jspecify.annotations.Nullable; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/StackBasedLogSite.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/StackBasedLogSite.java similarity index 89% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/StackBasedLogSite.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/StackBasedLogSite.java index 7501be161..f1592589f 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/StackBasedLogSite.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/StackBasedLogSite.java @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkNotNull; import static java.lang.Math.max; import org.jspecify.annotations.Nullable; @@ -44,13 +44,13 @@ * * *

    This class should not be used directly outside the core Flogger libraries. If you need to - * generate a {@link FloggerLogSite} from a {@link StackTraceElement}, use {@link - * FloggerLogSites#logSiteFrom(StackTraceElement) LogSites.logSiteFrom(myStackTaceElement)}. + * generate a {@link JvmLogSite} from a {@link StackTraceElement}, use {@link + * JvmLogSites#logSiteFrom(StackTraceElement) LogSites.logSiteFrom(myStackTaceElement)}. * * @see * Original Java code of Google Flogger */ -final class StackBasedLogSite extends FloggerLogSite { +final class StackBasedLogSite extends JvmLogSite { // StackTraceElement is unmodifiable once created. private final StackTraceElement stackElement; @@ -71,7 +71,7 @@ public String getMethodName() { @Override public int getLineNumber() { // Prohibit negative numbers (which can appear in stack trace elements) from being returned. - return max(stackElement.getLineNumber(), FloggerLogSite.UNKNOWN_LINE); + return max(stackElement.getLineNumber(), JvmLogSite.UNKNOWN_LINE); } @Override diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/StackSize.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/StackSize.java similarity index 93% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/StackSize.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/StackSize.java index 52079bee2..cdbb147c7 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/StackSize.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/StackSize.java @@ -24,10 +24,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger; +package io.spine.logging.jvm; /** - * Enum values to be passed into {@link FloggerApi#withStackTrace} to control + * Enum values to be passed into {@link JvmApi#withStackTrace} to control * the maximum number of stack trace elements created. * *

    Note that the precise value returned by {@link #getMaxDepth()} may change over time, @@ -46,8 +46,8 @@ public enum StackSize { *

    * Requesting a small stack trace for log statements which occur under normal circumstances is * acceptable, but may affect performance. Consider using - * {@link FloggerApi#withStackTrace(StackSize)} in conjunction with rate limiting methods, - * such as {@link FloggerApi#atMostEvery(int, java.util.concurrent.TimeUnit)}, to mitigate + * {@link JvmApi#withStackTrace(StackSize)} in conjunction with rate limiting methods, + * such as {@link JvmApi#atMostEvery(int, java.util.concurrent.TimeUnit)}, to mitigate * performance issues. *

    * The current maximum size of a {@code SMALL} stack trace is 10 elements, but this may change. diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/BackendFactory.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/BackendFactory.java similarity index 97% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/BackendFactory.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/BackendFactory.java index 78f946cc6..2d657469c 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/BackendFactory.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/BackendFactory.java @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; /** * An API to create logger backends for a given class name. This is implemented as an abstract class @@ -59,7 +59,7 @@ * the jar file containing the implementation. When creating an implementation of this class, you * can provide serivce metadata (and thereby allow users to get your implementation just by * including your jar file) by either manually including a {@code - * META-INF/services/io.spine.logging.flogger.backend.BackendFactory} file containing the + * META-INF/services/io.spine.logging.jvm.backend.BackendFactory} file containing the * name of your implementation class or by annotating your implementation class using * {@code @AutoService(BackendFactory.class)}. See the documentation of both {@link diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/BaseMessageFormatter.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/BaseMessageFormatter.java similarity index 95% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/BaseMessageFormatter.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/BaseMessageFormatter.java index 40de09a34..f65cef5ca 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/BaseMessageFormatter.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/BaseMessageFormatter.java @@ -24,15 +24,15 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; -import static io.spine.logging.flogger.backend.FormatOptions.FLAG_UPPER_CASE; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.backend.FormatOptions.FLAG_UPPER_CASE; +import static io.spine.logging.jvm.util.Checks.checkNotNull; -import io.spine.logging.flogger.parameter.DateTimeFormat; -import io.spine.logging.flogger.parameter.Parameter; -import io.spine.logging.flogger.parameter.ParameterVisitor; -import io.spine.logging.flogger.parser.MessageBuilder; +import io.spine.logging.jvm.parameter.DateTimeFormat; +import io.spine.logging.jvm.parameter.Parameter; +import io.spine.logging.jvm.parameter.ParameterVisitor; +import io.spine.logging.jvm.parser.MessageBuilder; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Calendar; import java.util.Date; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/Clock.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/Clock.java similarity index 96% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/Clock.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/Clock.java index e1c7e36a1..534ebb3ac 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/Clock.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/Clock.java @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; /** * A clock to return walltime timestamps for log statements. This is implemented as an abstract @@ -59,7 +59,7 @@ * the jar file containing the implementation. When creating an implementation of this class, you * can provide serivce metadata (and thereby allow users to get your implementation just by * including your jar file) by either manually including a {@code - * META-INF/services/io.spine.logging.flogger.backend.Clock} file containing the name of + * META-INF/services/io.spine.logging.jvm.backend.Clock} file containing the name of * your implementation class or by annotating your implementation class using {@code @AutoService(Clock.class)}. * See the documentation of both {@link java.util.ServiceLoader} and {@code DefaultPlatform} for diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/FormatChar.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/FormatChar.java similarity index 99% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/FormatChar.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/FormatChar.java index 666d9383e..67c473f21 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/FormatChar.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/FormatChar.java @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; /** * An enum representing the printf-like formatting characters that must be supported by all logging diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/FormatOptions.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/FormatOptions.java similarity index 99% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/FormatOptions.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/FormatOptions.java index 976b2ac88..138c827fe 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/FormatOptions.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/FormatOptions.java @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; -import io.spine.logging.flogger.parser.ParseException; +import io.spine.logging.jvm.parser.ParseException; import com.google.errorprone.annotations.CanIgnoreReturnValue; import org.jspecify.annotations.Nullable; @@ -388,7 +388,7 @@ static boolean checkFlagConsistency(int flags, boolean hasWidth) { *

    * Note that there is not requirement for options used internally in custom message parsers to be * validated, but any format options passed through the - * {@link io.spine.logging.flogger.parameter.ParameterVisitor ParameterVisitor} interface must + * {@link io.spine.logging.jvm.parameter.ParameterVisitor ParameterVisitor} interface must * be valid with respect to the associated {@link FormatChar} instance. * * @param formatChar the formatting rule to check these options against. diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/FormatType.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/FormatType.java similarity index 99% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/FormatType.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/FormatType.java index 070046a7c..3dfd89caa 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/FormatType.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/FormatType.java @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/KeyValueFormatter.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/KeyValueFormatter.java similarity index 98% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/KeyValueFormatter.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/KeyValueFormatter.java index d1f8c1b46..5537e1b44 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/KeyValueFormatter.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/KeyValueFormatter.java @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; -import io.spine.logging.flogger.FloggerMetadataKey.KeyValueHandler; +import io.spine.logging.jvm.JvmMetadataKey.KeyValueHandler; import java.util.Arrays; import java.util.HashSet; import java.util.Set; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/LogData.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/LogData.java similarity index 97% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/LogData.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/LogData.java index 1da9d3a26..7fbd8d9ad 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/LogData.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/LogData.java @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; -import io.spine.logging.flogger.FloggerLogSite; +import io.spine.logging.jvm.JvmLogSite; import java.util.logging.Level; /** @@ -66,7 +66,7 @@ public interface LogData { * * @throws IllegalStateException if called prior to the postProcess() method being called. */ - FloggerLogSite getLogSite(); + JvmLogSite getLogSite(); /** * Returns any additional metadata for this log statement. If no additional metadata is present, diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/LogMessageFormatter.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/LogMessageFormatter.java similarity index 98% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/LogMessageFormatter.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/LogMessageFormatter.java index e01bd27b1..15a8f59cd 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/LogMessageFormatter.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/LogMessageFormatter.java @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; import com.google.errorprone.annotations.CanIgnoreReturnValue; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/LoggerBackend.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/LoggerBackend.java similarity index 97% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/LoggerBackend.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/LoggerBackend.java index 7667ad015..c72daa731 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/LoggerBackend.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/LoggerBackend.java @@ -24,10 +24,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; -import io.spine.logging.flogger.AbstractLogger; -import io.spine.logging.flogger.parser.ParseException; +import io.spine.logging.jvm.AbstractLogger; +import io.spine.logging.jvm.parser.ParseException; import java.util.logging.Level; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/LoggingException.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/LoggingException.java similarity index 98% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/LoggingException.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/LoggingException.java index 689c5c7ac..acd55e57f 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/LoggingException.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/LoggingException.java @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; import org.jspecify.annotations.Nullable; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/MessageUtils.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/MessageUtils.java similarity index 95% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/MessageUtils.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/MessageUtils.java index 4c0aef23e..89a5ff801 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/MessageUtils.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/MessageUtils.java @@ -24,13 +24,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; -import static io.spine.logging.flogger.backend.FormatOptions.FLAG_LEFT_ALIGN; -import static io.spine.logging.flogger.backend.FormatOptions.FLAG_SHOW_ALT_FORM; -import static io.spine.logging.flogger.backend.FormatOptions.FLAG_UPPER_CASE; +import static io.spine.logging.jvm.backend.FormatOptions.FLAG_LEFT_ALIGN; +import static io.spine.logging.jvm.backend.FormatOptions.FLAG_SHOW_ALT_FORM; +import static io.spine.logging.jvm.backend.FormatOptions.FLAG_UPPER_CASE; -import io.spine.logging.flogger.FloggerLogSite; +import io.spine.logging.jvm.JvmLogSite; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.io.IOException; import java.math.BigInteger; @@ -62,13 +62,13 @@ private MessageUtils() {} /** * Appends log-site information in the default format, including a trailing space. * - * @param logSite the log site to be appended (ingored if {@link FloggerLogSite#INVALID}). + * @param logSite the log site to be appended (ingored if {@link JvmLogSite#INVALID}). * @param out the destination buffer. * @return whether the log-site was appended. */ @CanIgnoreReturnValue - public static boolean appendLogSite(FloggerLogSite logSite, StringBuilder out) { - if (logSite == FloggerLogSite.INVALID) { + public static boolean appendLogSite(JvmLogSite logSite, StringBuilder out) { + if (logSite == JvmLogSite.INVALID) { return false; } out.append(logSite.getClassName()) diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/Metadata.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/Metadata.java similarity index 90% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/Metadata.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/Metadata.java index 0bbf5bcf8..d140db0ca 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/Metadata.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/Metadata.java @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; -import io.spine.logging.flogger.FloggerMetadataKey; +import io.spine.logging.jvm.JvmMetadataKey; import org.jspecify.annotations.Nullable; /** @@ -34,7 +34,7 @@ * directly via methods in the fluent API, of as part of a scoped logging context. * *

    Metadata keys can be “single valued” or “repeating” based on - * {@link FloggerMetadataKey#canRepeat() MetadataKey.canRepeat()}, but it is permitted for + * {@link JvmMetadataKey#canRepeat() MetadataKey.canRepeat()}, but it is permitted for * a {@code Metadata} implementation to retain multiple single valued keys, and in that situation * the key at the largest index is the one that should be used. * @@ -43,7 +43,7 @@ * of the sequence of key/value pairs, and this is what results in the potential for multiple single * valued keys to exist. * - *

    If the value of a single valued key is required, the {@link #findValue(FloggerMetadataKey)} + *

    If the value of a single valued key is required, the {@link #findValue(JvmMetadataKey)} * method should be used to look it up. For all other metadata processing, a {@link MetadataProcessor} * should be created to ensure that scope and log site metadata can be merged correctly. * @@ -70,7 +70,7 @@ public int size() { } @Override - public FloggerMetadataKey getKey(int n) { + public JvmMetadataKey getKey(int n) { throw cannotReadFromEmpty(); } @@ -85,7 +85,7 @@ private static IndexOutOfBoundsException cannotReadFromEmpty() { @Override @Nullable - public T findValue(FloggerMetadataKey key) { + public T findValue(JvmMetadataKey key) { return null; } } @@ -99,7 +99,7 @@ public T findValue(FloggerMetadataKey key) { * @throws IndexOutOfBoundsException if either {@code n} is negative or {@code n} is greater * or equal to {@code getCount()}. */ - public abstract FloggerMetadataKey getKey(int n); + public abstract JvmMetadataKey getKey(int n); /** * Returns the non-null value for the Nth piece of metadata. @@ -116,5 +116,5 @@ public T findValue(FloggerMetadataKey key) { */ // TODO(dbeaumont): Make this throw an exception for repeated keys. @Nullable - public abstract T findValue(FloggerMetadataKey key); + public abstract T findValue(JvmMetadataKey key); } diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/MetadataHandler.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/MetadataHandler.java similarity index 84% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/MetadataHandler.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/MetadataHandler.java index ae5fb384b..c532ce0fe 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/MetadataHandler.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/MetadataHandler.java @@ -24,12 +24,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; -import static io.spine.logging.flogger.util.Checks.checkArgument; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkArgument; +import static io.spine.logging.jvm.util.Checks.checkNotNull; -import io.spine.logging.flogger.FloggerMetadataKey; +import io.spine.logging.jvm.JvmMetadataKey; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.HashMap; import java.util.Iterator; @@ -61,7 +61,7 @@ public abstract class MetadataHandler { * @param context an arbitrary context object supplied to the process method. * @param the key/value type. */ - protected abstract void handle(FloggerMetadataKey key, T value, C context); + protected abstract void handle(JvmMetadataKey key, T value, C context); /** * Handles values for a repeatable metadata key. The method is called for all repeatable keys @@ -74,7 +74,7 @@ public abstract class MetadataHandler { * @param context an arbitrary context object supplied to the process method. * @param the key/value type. */ - protected void handleRepeated(FloggerMetadataKey key, Iterator values, C context) { + protected void handleRepeated(JvmMetadataKey key, Iterator values, C context) { while (values.hasNext()) { handle(key, values.next(), context); } @@ -115,7 +115,7 @@ public interface ValueHandler { * @param value associated metadata value. * @param context an arbitrary context object supplied to the process method. */ - void handle(FloggerMetadataKey key, T value, C context); + void handle(JvmMetadataKey key, T value, C context); } /** @@ -134,7 +134,7 @@ public interface RepeatedValueHandler { * instance is read-only and must not be held beyond the scope of this callback. * @param context an arbitrary context object supplied to the process method. */ - void handle(FloggerMetadataKey key, Iterator values, C context); + void handle(JvmMetadataKey key, Iterator values, C context); } /** @@ -148,16 +148,16 @@ public static final class Builder { private static final ValueHandler IGNORE_VALUE = new ValueHandler() { @Override - public void handle(FloggerMetadataKey key, Object value, Object context) {} + public void handle(JvmMetadataKey key, Object value, Object context) {} }; // Since the context is ignored, this can safely be cast to RepeatedValueHandler. private static final RepeatedValueHandler IGNORE_REPEATED_VALUE = (key, value, context) -> { /* No op. */ }; - private final Map, ValueHandler> singleValueHandlers = + private final Map, ValueHandler> singleValueHandlers = new HashMap<>(); - private final Map, RepeatedValueHandler> repeatedValueHandlers = + private final Map, RepeatedValueHandler> repeatedValueHandlers = new HashMap<>(); private final ValueHandler defaultHandler; private RepeatedValueHandler defaultRepeatedHandler = null; @@ -169,10 +169,10 @@ private Builder(ValueHandler defaultHandler) { /** * Sets a handler for any unknown repeated keys which allows values to be processed via a * generic {@link Iterator}. To handle repeated values against a known key with their expected - * type, register a handler via {@link #addRepeatedHandler(FloggerMetadataKey,RepeatedValueHandler)}. + * type, register a handler via {@link #addRepeatedHandler(JvmMetadataKey,RepeatedValueHandler)}. * *

    Note that if a repeated key is associated with an individual value handler (i.e. via - * {@link #addHandler(FloggerMetadataKey,ValueHandler)}), then that will be used in preference + * {@link #addHandler(JvmMetadataKey,ValueHandler)}), then that will be used in preference * to the default handler set here. * * @param defaultHandler the default handler for unknown repeated keys/values. @@ -195,7 +195,7 @@ public Builder setDefaultRepeatedHandler( */ @CanIgnoreReturnValue public Builder addHandler( - FloggerMetadataKey key, ValueHandler handler) { + JvmMetadataKey key, ValueHandler handler) { checkNotNull(key, "key"); checkNotNull(handler, "handler"); repeatedValueHandlers.remove(key); @@ -214,7 +214,7 @@ public Builder addHandler( */ @CanIgnoreReturnValue public Builder addRepeatedHandler( - FloggerMetadataKey key, RepeatedValueHandler handler) { + JvmMetadataKey key, RepeatedValueHandler handler) { checkNotNull(key, "key"); checkNotNull(handler, "handler"); checkArgument(key.canRepeat(), "key must be repeating"); @@ -231,9 +231,9 @@ public Builder addRepeatedHandler( * @return the builder instance for chaining. */ @CanIgnoreReturnValue - public Builder ignoring(FloggerMetadataKey key, FloggerMetadataKey... rest) { + public Builder ignoring(JvmMetadataKey key, JvmMetadataKey... rest) { checkAndIgnore(key); - for (FloggerMetadataKey k : rest) { + for (JvmMetadataKey k : rest) { checkAndIgnore(k); } return this; @@ -246,14 +246,14 @@ public Builder ignoring(FloggerMetadataKey key, FloggerMetadataKey... r * @return the builder instance for chaining. */ @CanIgnoreReturnValue - public Builder ignoring(Iterable> keys) { - for (FloggerMetadataKey k : keys) { + public Builder ignoring(Iterable> keys) { + for (JvmMetadataKey k : keys) { checkAndIgnore(k); } return this; } - void checkAndIgnore(FloggerMetadataKey key) { + void checkAndIgnore(JvmMetadataKey key) { checkNotNull(key, "key"); // It is more efficient to ignore a repeated key explicitly. if (key.canRepeat()) { @@ -273,15 +273,15 @@ void checkAndIgnore(FloggerMetadataKey key) { * @return the builder instance for chaining. */ @CanIgnoreReturnValue - public Builder removeHandlers(FloggerMetadataKey key, FloggerMetadataKey... rest) { + public Builder removeHandlers(JvmMetadataKey key, JvmMetadataKey... rest) { checkAndRemove(key); - for (FloggerMetadataKey k : rest) { + for (JvmMetadataKey k : rest) { checkAndRemove(k); } return this; } - void checkAndRemove(FloggerMetadataKey key) { + void checkAndRemove(JvmMetadataKey key) { checkNotNull(key, "key"); singleValueHandlers.remove(key); repeatedValueHandlers.remove(key); @@ -294,9 +294,9 @@ public MetadataHandler build() { } private static final class MapBasedhandler extends MetadataHandler { - private final Map, ValueHandler> singleValueHandlers = + private final Map, ValueHandler> singleValueHandlers = new HashMap<>(); - private final Map, RepeatedValueHandler> repeatedValueHandlers = + private final Map, RepeatedValueHandler> repeatedValueHandlers = new HashMap<>(); private final ValueHandler defaultHandler; private final RepeatedValueHandler defaultRepeatedHandler; @@ -310,7 +310,7 @@ private MapBasedhandler(Builder builder) { @SuppressWarnings("unchecked") // See comments for why casting is safe. @Override - protected void handle(FloggerMetadataKey key, T value, C context) { + protected void handle(JvmMetadataKey key, T value, C context) { // Safe cast because of how our private map is managed. ValueHandler handler = (ValueHandler) singleValueHandlers.get(key); @@ -318,13 +318,13 @@ protected void handle(FloggerMetadataKey key, T value, C context) { handler.handle(key, value, context); } else { // Casting MetadataKey to "" is safe since it only produces elements of 'T'. - defaultHandler.handle((FloggerMetadataKey) key, value, context); + defaultHandler.handle((JvmMetadataKey) key, value, context); } } @SuppressWarnings("unchecked") // See comments for why casting is safe. @Override - protected void handleRepeated(FloggerMetadataKey key, Iterator values, C context) { + protected void handleRepeated(JvmMetadataKey key, Iterator values, C context) { // Safe cast because of how our private map is managed. RepeatedValueHandler handler = (RepeatedValueHandler) repeatedValueHandlers.get(key); @@ -334,7 +334,7 @@ protected void handleRepeated(FloggerMetadataKey key, Iterator values, // Casting MetadataKey to "" is safe since it only produces elements of 'T'. // Casting the iterator is safe since it also only produces elements of 'T'. defaultRepeatedHandler.handle( - (FloggerMetadataKey) key, (Iterator) values, context); + (JvmMetadataKey) key, (Iterator) values, context); } else { // Dispatches keys individually. super.handleRepeated(key, values, context); diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/MetadataKeyValueHandlers.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/MetadataKeyValueHandlers.java similarity index 87% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/MetadataKeyValueHandlers.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/MetadataKeyValueHandlers.java index 296a6041f..5da8761bc 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/MetadataKeyValueHandlers.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/MetadataKeyValueHandlers.java @@ -24,12 +24,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; -import io.spine.logging.flogger.FloggerMetadataKey; -import io.spine.logging.flogger.FloggerMetadataKey.KeyValueHandler; -import io.spine.logging.flogger.backend.MetadataHandler.RepeatedValueHandler; -import io.spine.logging.flogger.backend.MetadataHandler.ValueHandler; +import io.spine.logging.jvm.JvmMetadataKey; +import io.spine.logging.jvm.JvmMetadataKey.KeyValueHandler; +import io.spine.logging.jvm.backend.MetadataHandler.RepeatedValueHandler; +import io.spine.logging.jvm.backend.MetadataHandler.ValueHandler; import java.util.Iterator; import java.util.Set; @@ -45,7 +45,7 @@ public final class MetadataKeyValueHandlers { private static final ValueHandler EMIT_METADATA = new ValueHandler() { @Override - public void handle(FloggerMetadataKey key, Object value, KeyValueHandler kvf) { + public void handle(JvmMetadataKey key, Object value, KeyValueHandler kvf) { key.safeEmit(value, kvf); } }; @@ -53,7 +53,7 @@ public void handle(FloggerMetadataKey key, Object value, KeyValueHandler private static final RepeatedValueHandler EMIT_REPEATED_METADATA = new RepeatedValueHandler() { @Override - public void handle(FloggerMetadataKey key, Iterator value, KeyValueHandler kvf) { + public void handle(JvmMetadataKey key, Iterator value, KeyValueHandler kvf) { key.safeEmitRepeated(value, kvf); } }; @@ -79,7 +79,7 @@ public static RepeatedValueHandler getDefaultRepeatedVa * @return a builder configured with the default key/value handlers and ignored keys. */ public static MetadataHandler.Builder getDefaultBuilder( - Set> ignored) { + Set> ignored) { return MetadataHandler.builder(getDefaultValueHandler()) .setDefaultRepeatedHandler(getDefaultRepeatedValueHandler()) .ignoring(ignored); @@ -92,7 +92,7 @@ public static MetadataHandler.Builder getDefaultBuilder( * * @return a handler configured with the default key/value handlers and ignored keys. */ - public static MetadataHandler getDefaultHandler(Set> ignored) { + public static MetadataHandler getDefaultHandler(Set> ignored) { return getDefaultBuilder(ignored).build(); } diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/MetadataProcessor.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/MetadataProcessor.java similarity index 88% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/MetadataProcessor.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/MetadataProcessor.java index a7e813371..6b7b38320 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/MetadataProcessor.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/MetadataProcessor.java @@ -24,13 +24,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; -import static io.spine.logging.flogger.util.Checks.checkArgument; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkArgument; +import static io.spine.logging.jvm.util.Checks.checkNotNull; -import io.spine.logging.flogger.LogContext; -import io.spine.logging.flogger.FloggerMetadataKey; +import io.spine.logging.jvm.LogContext; +import io.spine.logging.jvm.JvmMetadataKey; import java.util.AbstractSet; import java.util.ArrayList; import java.util.Collections; @@ -72,10 +72,10 @@ public abstract class MetadataProcessor { public void process(MetadataHandler handler, C context) {} @Override - public void handle(FloggerMetadataKey key, MetadataHandler handler, C context) {} + public void handle(JvmMetadataKey key, MetadataHandler handler, C context) {} @Override - public T getSingleValue(FloggerMetadataKey key) { + public T getSingleValue(JvmMetadataKey key) { return null; } @@ -85,7 +85,7 @@ public int keyCount() { } @Override - public Set> keySet() { + public Set> keySet() { return Collections.emptySet(); } }; @@ -138,7 +138,7 @@ private MetadataProcessor() {} * * *

    Note that equal or identical repeated values are permitted, and no "deduplication" is - * performed. This is very much in contrast to the {@link io.spine.logging.flogger.context.Tags + * performed. This is very much in contrast to the {@link io.spine.logging.jvm.context.Tags * Tags} mechanism, which de-duplicates mappings and reorders keys and values to generate a * minimal, canonical representation. * @@ -155,14 +155,14 @@ private MetadataProcessor() {} * The handler method invoked depends on whether the key is single valued or repeated. * If no metadata is present for the given key, the handler is not invoked. */ - public abstract void handle(FloggerMetadataKey key, MetadataHandler handler, C context); + public abstract void handle(JvmMetadataKey key, MetadataHandler handler, C context); /** * Returns the unique value for a single valued key, or {@code null} if not present. * * @throws IllegalArgumentException if passed a repeatable key (even if that key has one value). */ - public abstract T getSingleValue(FloggerMetadataKey key); + public abstract T getSingleValue(JvmMetadataKey key); /** * Returns the number of unique keys represented by this processor. This is the same as the size @@ -172,11 +172,11 @@ private MetadataProcessor() {} public abstract int keyCount(); /** - * Returns the set of {@link FloggerMetadataKey}s known to this processor, in the order in which + * Returns the set of {@link JvmMetadataKey}s known to this processor, in the order in which * they will be processed. Note that this implementation is lightweight, but not necessarily * performant for things like containment testing. */ - public abstract Set> keySet(); + public abstract Set> keySet(); /* * The values in the keyMap array are structured as: @@ -225,7 +225,7 @@ public void process(MetadataHandler handler, C context) { } @Override - public void handle(FloggerMetadataKey key, MetadataHandler handler, C context) { + public void handle(JvmMetadataKey key, MetadataHandler handler, C context) { int index = indexOf(key, keyMap, keyCount); if (index >= 0) { dispatch(key, keyMap[index], handler, context); @@ -233,7 +233,7 @@ public void handle(FloggerMetadataKey key, MetadataHandler handler, C } @Override - public T getSingleValue(FloggerMetadataKey key) { + public T getSingleValue(JvmMetadataKey key) { checkArgument(!key.canRepeat(), "key must be single valued"); int index = indexOf(key, keyMap, keyCount); // For single keys, the keyMap values are just the value index. @@ -246,18 +246,18 @@ public int keyCount() { } @Override - public Set> keySet() { + public Set> keySet() { // We may want to cache this, since it's effectively immutable, but it's also a small and // likely short lived instance, so quite possibly not worth it for the cost of another field. - return new AbstractSet>() { + return new AbstractSet>() { @Override public int size() { return keyCount; } @Override - public Iterator> iterator() { - return new Iterator>() { + public Iterator> iterator() { + return new Iterator>() { private int i = 0; @Override @@ -266,7 +266,7 @@ public boolean hasNext() { } @Override - public FloggerMetadataKey next() { + public JvmMetadataKey next() { return getKey(keyMap[i++] & 0x1F); } @@ -280,7 +280,7 @@ public void remove() { } // Separate method to re-capture the value type. - private void dispatch(FloggerMetadataKey key, int n, + private void dispatch(JvmMetadataKey key, int n, MetadataHandler handler, C context) { if (!key.canRepeat()) { // For single keys, the keyMap values are just the value index. @@ -294,13 +294,13 @@ private void dispatch(FloggerMetadataKey key, int n, // same a little on allocations. However this is a fixed size instance and repeated keys are // a fairly unusual use case. private final class ValueIterator implements Iterator { - private final FloggerMetadataKey key; + private final JvmMetadataKey key; private int nextIndex; // For repeated keys, the bits 5-32 contain a mask of additional indices (where bit 5 // implies index 1, since index 0 cannot apply to an additional repeated value). private int mask; - private ValueIterator(FloggerMetadataKey key, int valueIndices) { + private ValueIterator(JvmMetadataKey key, int valueIndices) { this.key = key; // Get the first element index (lowest 5 bits, 0-27). this.nextIndex = valueIndices & 0x1F; @@ -341,7 +341,7 @@ private int prepareKeyMap(int[] keyMap) { long bloomFilterMask = 0L; int count = 0; for (int n = 0; n < keyMap.length; n++) { - FloggerMetadataKey key = getKey(n); + JvmMetadataKey key = getKey(n); // Use the bloom filter mask to get a quick true-negative test for whether we've seen this // key before. Most keys are distinct and this test is very reliable up to 10-15 keys, so // it saves building a HashSet or similar to track the set of unique keys. @@ -377,7 +377,7 @@ private int prepareKeyMap(int[] keyMap) { } // Returns the (unique) index into the keyMap array for the given key. - private int indexOf(FloggerMetadataKey key, int[] keyMap, int count) { + private int indexOf(JvmMetadataKey key, int[] keyMap, int count) { for (int i = 0; i < count; i++) { // Low 5 bits of keyMap values are *always* an index to a valid metadata key. if (key.equals(getKey(keyMap[i] & 0x1F))) { @@ -387,7 +387,7 @@ private int indexOf(FloggerMetadataKey key, int[] keyMap, int count) { return -1; } - private FloggerMetadataKey getKey(int n) { + private JvmMetadataKey getKey(int n) { int scopeSize = scope.size(); return n >= scopeSize ? logged.getKey(n - scopeSize) : scope.getKey(n); } @@ -405,14 +405,14 @@ private Object getValue(int n) { * during processing. */ private static final class SimpleProcessor extends MetadataProcessor { - private final Map, Object> map; + private final Map, Object> map; private SimpleProcessor(Metadata scope, Metadata logged) { - LinkedHashMap, Object> map = new LinkedHashMap, Object>(); + LinkedHashMap, Object> map = new LinkedHashMap, Object>(); addTo(map, scope); addTo(map, logged); // Wrap any repeated value lists to make them unmodifiable (required for correctness). - for (Map.Entry, Object> e : map.entrySet()) { + for (Map.Entry, Object> e : map.entrySet()) { if (e.getKey().canRepeat()) { e.setValue(Collections.unmodifiableList((List) e.getValue())); } @@ -422,9 +422,9 @@ private SimpleProcessor(Metadata scope, Metadata logged) { // Unlike the LightweightProcessor, we copy references from the Metadata eagerly, so can "cast" // values to their key-types early, ensuring safe casting when dispatching. - private static void addTo(Map, Object> map, Metadata metadata) { + private static void addTo(Map, Object> map, Metadata metadata) { for (int i = 0; i < metadata.size(); i++) { - FloggerMetadataKey key = metadata.getKey(i); + JvmMetadataKey key = metadata.getKey(i); Object value = map.get(key); if (key.canRepeat()) { @SuppressWarnings("unchecked") @@ -444,13 +444,13 @@ private static void addTo(Map, Object> map, Metadata metad @Override public void process(MetadataHandler handler, C context) { - for (Map.Entry, Object> e : map.entrySet()) { + for (Map.Entry, Object> e : map.entrySet()) { dispatch(e.getKey(), e.getValue(), handler, context); } } @Override - public void handle(FloggerMetadataKey key, MetadataHandler handler, C context) { + public void handle(JvmMetadataKey key, MetadataHandler handler, C context) { Object value = map.get(key); if (value != null) { dispatch(key, value, handler, context); @@ -460,7 +460,7 @@ public void handle(FloggerMetadataKey key, MetadataHandler handler, C // It's safe to ignore warnings since single keys are only ever 'T' when added to the map. @Override @SuppressWarnings("unchecked") - public T getSingleValue(FloggerMetadataKey key) { + public T getSingleValue(JvmMetadataKey key) { checkArgument(!key.canRepeat(), "key must be single valued"); Object value = map.get(key); return (value != null) ? (T) value : null; @@ -472,7 +472,7 @@ public int keyCount() { } @Override - public Set> keySet() { + public Set> keySet() { return map.keySet(); } @@ -480,7 +480,7 @@ public Set> keySet() { // and single keys are only ever 'T' when added to the map. @SuppressWarnings("unchecked") private static void dispatch( - FloggerMetadataKey key, Object value, MetadataHandler handler, C context) { + JvmMetadataKey key, Object value, MetadataHandler handler, C context) { if (key.canRepeat()) { handler.handleRepeated(key, ((List) value).iterator(), context); } else { diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/Platform.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/Platform.java similarity index 96% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/Platform.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/Platform.java index 15edf68be..0bd50c49a 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/Platform.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/Platform.java @@ -24,13 +24,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; -import io.spine.logging.flogger.AbstractLogger; -import io.spine.logging.flogger.FloggerLogSite; -import io.spine.logging.flogger.context.ContextDataProvider; -import io.spine.logging.flogger.context.Tags; -import io.spine.logging.flogger.util.RecursionDepth; +import io.spine.logging.jvm.AbstractLogger; +import io.spine.logging.jvm.JvmLogSite; +import io.spine.logging.jvm.context.ContextDataProvider; +import io.spine.logging.jvm.context.Tags; +import io.spine.logging.jvm.util.RecursionDepth; import org.jspecify.annotations.Nullable; import java.lang.reflect.InvocationTargetException; @@ -189,10 +189,10 @@ public abstract static class LogCallerFinder { * @param loggerApi the class containing the log() methods whose caller we need to find. * @param stackFramesToSkip the number of method calls which exist on the stack between the * {@code log()} method and the point at which this method is invoked. - * @return A log site inferred from the stack, or {@link FloggerLogSite#INVALID} if no log site + * @return A log site inferred from the stack, or {@link JvmLogSite#INVALID} if no log site * can be determined. */ - public abstract FloggerLogSite findLogSite(Class loggerApi, int stackFramesToSkip); + public abstract JvmLogSite findLogSite(Class loggerApi, int stackFramesToSkip); } /** @@ -255,7 +255,7 @@ public static boolean shouldForceLogging(String loggerName, Level level, boolean /** * Obtains a custom logging level set for the logger with the given name via - * a {@link io.spine.logging.flogger.context.LogLevelMap} set in the current logging context. + * a {@link io.spine.logging.jvm.context.LogLevelMap} set in the current logging context. * *

    The method returns {@code null} if: *

      diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/SimpleMessageFormatter.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/SimpleMessageFormatter.java similarity index 92% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/SimpleMessageFormatter.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/SimpleMessageFormatter.java index 0c32cea87..463783b06 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/SimpleMessageFormatter.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/SimpleMessageFormatter.java @@ -24,11 +24,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; -import io.spine.logging.flogger.LogContext; -import io.spine.logging.flogger.FloggerMetadataKey; -import io.spine.logging.flogger.FloggerMetadataKey.KeyValueHandler; +import io.spine.logging.jvm.LogContext; +import io.spine.logging.jvm.JvmMetadataKey; +import io.spine.logging.jvm.JvmMetadataKey.KeyValueHandler; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Collections; import java.util.HashSet; @@ -58,7 +58,7 @@ * } * *

      If additional metadata keys, other than the {@code cause} are to be omitted, then {@link - * #getSimpleFormatterIgnoring(FloggerMetadataKey...)} can be used to obtain a static formatter, + * #getSimpleFormatterIgnoring(JvmMetadataKey...)} can be used to obtain a static formatter, * instead of using the default. * * @see @@ -66,8 +66,8 @@ */ public final class SimpleMessageFormatter { @SuppressWarnings("ConstantCaseForConstants") - private static final Set> DEFAULT_KEYS_TO_IGNORE = - Collections.>singleton(LogContext.Key.LOG_CAUSE); + private static final Set> DEFAULT_KEYS_TO_IGNORE = + Collections.>singleton(LogContext.Key.LOG_CAUSE); private static final LogMessageFormatter DEFAULT_FORMATTER = newFormatter(DEFAULT_KEYS_TO_IGNORE); @@ -107,11 +107,11 @@ public static LogMessageFormatter getDefaultFormatter() { * almost never expected to be part of the formatted message. Other internal metadata keys may * also be suppressed. */ - public static LogMessageFormatter getSimpleFormatterIgnoring(FloggerMetadataKey... extraIgnoredKeys) { + public static LogMessageFormatter getSimpleFormatterIgnoring(JvmMetadataKey... extraIgnoredKeys) { if (extraIgnoredKeys.length == 0) { return getDefaultFormatter(); } - Set> ignored = new HashSet>(DEFAULT_KEYS_TO_IGNORE); + Set> ignored = new HashSet>(DEFAULT_KEYS_TO_IGNORE); Collections.addAll(ignored, extraIgnoredKeys); return newFormatter(ignored); } @@ -182,7 +182,7 @@ public static String getLiteralLogMessage(LogData logData) { * message. */ public static boolean mustBeFormatted( - LogData logData, MetadataProcessor metadata, Set> keysToIgnore) { + LogData logData, MetadataProcessor metadata, Set> keysToIgnore) { // If there are logged arguments or more metadata keys than can be ignored, we fail immediately // which avoids the cost of creating the metadata key set (so don't remove the size check). return logData.getTemplateContext() != null @@ -194,7 +194,7 @@ public static boolean mustBeFormatted( * Returns a new "simple" formatter which ignores the given set of metadata keys. The caller must * ensure that the given set is effectively immutable. */ - private static LogMessageFormatter newFormatter(final Set> keysToIgnore) { + private static LogMessageFormatter newFormatter(final Set> keysToIgnore) { return new LogMessageFormatter() { private final MetadataHandler handler = MetadataKeyValueHandlers.getDefaultHandler(keysToIgnore); diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/TemplateContext.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/TemplateContext.java similarity index 94% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/TemplateContext.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/TemplateContext.java index ff736f87a..9163fb4ac 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/TemplateContext.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/TemplateContext.java @@ -24,11 +24,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkNotNull; -import io.spine.logging.flogger.parser.MessageParser; +import io.spine.logging.jvm.parser.MessageParser; /** * A context object for templates that allows caches to validate existing templates or create new diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/package-info.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/package-info.java similarity index 97% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/backend/package-info.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/backend/package-info.java index 45d35bda1..03b0f65bd 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/backend/package-info.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/backend/package-info.java @@ -31,6 +31,6 @@ * Original Java code of Google Flogger */ @CheckReturnValue -package io.spine.logging.flogger.backend; +package io.spine.logging.jvm.backend; import com.google.errorprone.annotations.CheckReturnValue; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/ContextDataProvider.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/ContextDataProvider.java similarity index 96% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/context/ContextDataProvider.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/context/ContextDataProvider.java index f4bf7ab41..0c7ddb62c 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/ContextDataProvider.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/ContextDataProvider.java @@ -24,11 +24,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.context; +package io.spine.logging.jvm.context; -import io.spine.logging.flogger.LoggingScope; -import io.spine.logging.flogger.backend.Metadata; -import io.spine.logging.flogger.backend.Platform; +import io.spine.logging.jvm.LoggingScope; +import io.spine.logging.jvm.backend.Metadata; +import io.spine.logging.jvm.backend.Platform; import java.util.logging.Level; import org.jspecify.annotations.Nullable; @@ -51,7 +51,7 @@ * the jar file containing the implementation. When creating an implementation of this class, you * can provide service metadata (and thereby allow users to get your implementation just by * including your jar file) by either manually including - * a {@code META-INF/services/io.spine.logging.flogger.context.ContextDataProvider} file + * a {@code META-INF/services/io.spine.logging.jvm.context.ContextDataProvider} file * containing the name of your implementation class or by annotating your implementation class * using * {@code @AutoService(ContextDataProvider.class)}. diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/ContextMetadata.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/ContextMetadata.java similarity index 88% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/context/ContextMetadata.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/context/ContextMetadata.java index a7dbc2e82..6bb14f028 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/ContextMetadata.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/ContextMetadata.java @@ -24,13 +24,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.context; +package io.spine.logging.jvm.context; -import static io.spine.logging.flogger.util.Checks.checkArgument; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkArgument; +import static io.spine.logging.jvm.util.Checks.checkNotNull; -import io.spine.logging.flogger.FloggerMetadataKey; -import io.spine.logging.flogger.backend.Metadata; +import io.spine.logging.jvm.JvmMetadataKey; +import io.spine.logging.jvm.backend.Metadata; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.ArrayList; import java.util.Arrays; @@ -48,10 +48,10 @@ */ public abstract class ContextMetadata extends Metadata { private static final class Entry { - final FloggerMetadataKey key; + final JvmMetadataKey key; final T value; - Entry(FloggerMetadataKey key, T value) { + Entry(JvmMetadataKey key, T value) { this.key = checkNotNull(key, "key"); this.value = checkNotNull(value, "value"); } @@ -74,7 +74,7 @@ private Builder() {} /** Add a single metadata key/value pair to the builder. */ @CanIgnoreReturnValue - public Builder add(FloggerMetadataKey key, T value) { + public Builder add(JvmMetadataKey key, T value) { // Entries are immutable and get moved into the metadata when it's built, so these get shared // and reduce the size of the metadata storage compared to storing adjacent key/value pairs. entries.add(new Entry(key, value)); @@ -94,7 +94,7 @@ public static Builder builder() { } /** Returns a space efficient {@code ScopeMetadata} containing a single value. */ - public static ContextMetadata singleton(FloggerMetadataKey key, T value) { + public static ContextMetadata singleton(JvmMetadataKey key, T value) { return new SingletonMetadata(key, value); } @@ -113,9 +113,9 @@ private ContextMetadata() {} * *

      Whether this is achieved via copying or chaining of instances is an implementation detail. * - *

      Use {@link io.spine.logging.flogger.backend.MetadataProcessor MetadataProcessor} to process + *

      Use {@link io.spine.logging.jvm.backend.MetadataProcessor MetadataProcessor} to process * metadata consistently with respect to single valued and repeated keys, and use {@link - * Metadata#findValue(FloggerMetadataKey)} to look up the “most recent” value for a single + * Metadata#findValue(JvmMetadataKey)} to look up the “most recent” value for a single * valued key. */ public abstract ContextMetadata concatenate(ContextMetadata metadata); @@ -124,7 +124,7 @@ private ContextMetadata() {} abstract Entry get(int n); @Override - public FloggerMetadataKey getKey(int n) { + public JvmMetadataKey getKey(int n) { return get(n).key; } @@ -153,7 +153,7 @@ Entry get(int n) { @Override @Nullable @SuppressWarnings("unchecked") - public T findValue(FloggerMetadataKey key) { + public T findValue(JvmMetadataKey key) { checkArgument(!key.canRepeat(), "metadata key must be single valued"); for (int n = entries.length - 1; n >= 0; n--) { Entry e = entries[n]; @@ -184,7 +184,7 @@ public ContextMetadata concatenate(ContextMetadata metadata) { private static final class SingletonMetadata extends ContextMetadata { private final Entry entry; - SingletonMetadata(FloggerMetadataKey key, T value) { + SingletonMetadata(JvmMetadataKey key, T value) { this.entry = new Entry(key, value); } @@ -204,7 +204,7 @@ Entry get(int n) { @Override @Nullable @SuppressWarnings("unchecked") - public R findValue(FloggerMetadataKey key) { + public R findValue(JvmMetadataKey key) { checkArgument(!key.canRepeat(), "metadata key must be single valued"); return entry.key.equals(key) ? (R) entry.value : null; } @@ -244,7 +244,7 @@ Entry get(int n) { @Override @Nullable - public T findValue(FloggerMetadataKey key) { + public T findValue(JvmMetadataKey key) { // For consistency, do the same checks as for non-empty instances. checkArgument(!key.canRepeat(), "metadata key must be single valued"); return null; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/LogLevelMap.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/LogLevelMap.java similarity index 98% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/context/LogLevelMap.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/context/LogLevelMap.java index 520b950ba..627a18182 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/LogLevelMap.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/LogLevelMap.java @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.context; +package io.spine.logging.jvm.context; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkNotNull; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Collections; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/NoOpContextDataProvider.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/NoOpContextDataProvider.java similarity index 93% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/context/NoOpContextDataProvider.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/context/NoOpContextDataProvider.java index f5b1b22c5..6008bddfc 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/NoOpContextDataProvider.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/NoOpContextDataProvider.java @@ -24,12 +24,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.context; +package io.spine.logging.jvm.context; -import io.spine.logging.flogger.FluentLogger2; -import io.spine.logging.flogger.FloggerMetadataKey; -import io.spine.logging.flogger.StackSize; -import io.spine.logging.flogger.context.ScopedLoggingContext.LoggingContextCloseable; +import io.spine.logging.jvm.FluentLogger2; +import io.spine.logging.jvm.JvmMetadataKey; +import io.spine.logging.jvm.StackSize; +import io.spine.logging.jvm.context.ScopedLoggingContext.LoggingContextCloseable; import java.util.concurrent.atomic.AtomicBoolean; @@ -104,7 +104,7 @@ public boolean addTags(Tags tags) { } @Override - public boolean addMetadata(FloggerMetadataKey key, T value) { + public boolean addMetadata(JvmMetadataKey key, T value) { logWarningOnceOnly(); return super.addMetadata(key, value); } diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/ScopeType.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/ScopeType.java similarity index 94% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/context/ScopeType.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/context/ScopeType.java index 08fa94d29..94a1b06eb 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/ScopeType.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/ScopeType.java @@ -24,12 +24,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.context; +package io.spine.logging.jvm.context; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkNotNull; -import io.spine.logging.flogger.LoggingScope; -import io.spine.logging.flogger.LoggingScopeProvider; +import io.spine.logging.jvm.LoggingScope; +import io.spine.logging.jvm.LoggingScopeProvider; import org.jspecify.annotations.Nullable; /** diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/ScopedLoggingContext.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/ScopedLoggingContext.java similarity index 97% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/context/ScopedLoggingContext.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/context/ScopedLoggingContext.java index cccae95bc..49f29f384 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/ScopedLoggingContext.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/ScopedLoggingContext.java @@ -24,20 +24,20 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.context; +package io.spine.logging.jvm.context; -import static io.spine.logging.flogger.util.Checks.checkNotNull; -import static io.spine.logging.flogger.util.Checks.checkState; +import static io.spine.logging.jvm.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkState; -import io.spine.logging.flogger.FloggerApi; -import io.spine.logging.flogger.LoggingScope; -import io.spine.logging.flogger.FloggerMetadataKey; +import io.spine.logging.jvm.JvmApi; +import io.spine.logging.jvm.LoggingScope; +import io.spine.logging.jvm.JvmMetadataKey; import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.MustBeClosed; import java.io.Closeable; import java.util.concurrent.Callable; -import io.spine.logging.flogger.LoggingScopeProvider; +import io.spine.logging.jvm.LoggingScopeProvider; import org.jspecify.annotations.Nullable; /** @@ -172,7 +172,7 @@ public final Builder withTags(Tags tags) { * times on a builder. */ @CanIgnoreReturnValue - public final Builder withMetadata(FloggerMetadataKey key, T value) { + public final Builder withMetadata(JvmMetadataKey key, T value) { if (metadata == null) { metadata = ContextMetadata.builder(); } @@ -370,7 +370,7 @@ protected ScopedLoggingContext() {} *

      This method is the same as {@link #newContext()} except it additionally binds a new * {@link ScopeType} instance to the newly created context. * This allows log statements to control stateful logging operations (e.g., rate limiting) using - * {@link FloggerApi#per(LoggingScopeProvider) per(ScopeType)} method. + * {@link JvmApi#per(LoggingScopeProvider) per(ScopeType)} method. * *

      Note for users: if you don't need an instance of {@code ScopedLoggingContext} for some * reason such as testability (injecting it, for example), consider using the static methods in @@ -419,7 +419,7 @@ public boolean addTags(Tags tags) { * new context, rather than adding it to context visible to multiple threads. */ @CanIgnoreReturnValue - public boolean addMetadata(FloggerMetadataKey key, T value) { + public boolean addMetadata(JvmMetadataKey key, T value) { checkNotNull(key, "key"); checkNotNull(value, "value"); return false; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/ScopedLoggingContexts.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/ScopedLoggingContexts.java similarity index 96% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/context/ScopedLoggingContexts.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/context/ScopedLoggingContexts.java index 604937d39..f3d4598a1 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/ScopedLoggingContexts.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/ScopedLoggingContexts.java @@ -24,13 +24,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.context; +package io.spine.logging.jvm.context; import static java.util.concurrent.TimeUnit.MINUTES; -import io.spine.logging.flogger.FluentLogger2; -import io.spine.logging.flogger.FloggerMetadataKey; -import io.spine.logging.flogger.StackSize; +import io.spine.logging.jvm.FluentLogger2; +import io.spine.logging.jvm.JvmMetadataKey; +import io.spine.logging.jvm.StackSize; import com.google.errorprone.annotations.CanIgnoreReturnValue; /** @@ -130,7 +130,7 @@ public static boolean addTags(Tags tags) { * new context, rather than adding it to context visible to multiple threads. */ @CanIgnoreReturnValue - public static boolean addMetadata(FloggerMetadataKey key, T value) { + public static boolean addMetadata(JvmMetadataKey key, T value) { return warnOnFailure(ScopedLoggingContext.getInstance().addMetadata(key, value)); } diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/SegmentTrie.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/SegmentTrie.java similarity index 99% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/context/SegmentTrie.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/context/SegmentTrie.java index 626ea1ac6..01fde70ad 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/SegmentTrie.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/SegmentTrie.java @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.context; +package io.spine.logging.jvm.context; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkNotNull; import static java.lang.Math.min; import java.util.ArrayList; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/Tags.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/Tags.java similarity index 99% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/context/Tags.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/context/Tags.java index f4f69f97b..751b3aaad 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/Tags.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/Tags.java @@ -24,11 +24,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.context; +package io.spine.logging.jvm.context; -import static io.spine.logging.flogger.util.Checks.checkArgument; -import static io.spine.logging.flogger.util.Checks.checkMetadataIdentifier; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkArgument; +import static io.spine.logging.jvm.util.Checks.checkMetadataIdentifier; +import static io.spine.logging.jvm.util.Checks.checkNotNull; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.AbstractMap; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/package-info.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/package-info.java similarity index 97% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/context/package-info.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/context/package-info.java index 21877fa56..65f617540 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/context/package-info.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/context/package-info.java @@ -31,6 +31,6 @@ * Original Java code of Google Flogger */ @CheckReturnValue -package io.spine.logging.flogger.context; +package io.spine.logging.jvm.context; import com.google.errorprone.annotations.CheckReturnValue; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/package-info.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/package-info.java similarity index 97% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/package-info.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/package-info.java index d0ef9c266..43e252cbb 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/package-info.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/package-info.java @@ -31,6 +31,6 @@ * Original Java code of Google Flogger */ @CheckReturnValue -package io.spine.logging.flogger; +package io.spine.logging.jvm; import com.google.errorprone.annotations.CheckReturnValue; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/BraceStyleParameter.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/BraceStyleParameter.java similarity index 95% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/BraceStyleParameter.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/BraceStyleParameter.java index aa460b7f8..c583df8c2 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/BraceStyleParameter.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/BraceStyleParameter.java @@ -24,11 +24,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parameter; +package io.spine.logging.jvm.parameter; -import io.spine.logging.flogger.backend.FormatChar; -import io.spine.logging.flogger.backend.FormatOptions; -import io.spine.logging.flogger.backend.FormatType; +import io.spine.logging.jvm.backend.FormatChar; +import io.spine.logging.jvm.backend.FormatOptions; +import io.spine.logging.jvm.backend.FormatType; import java.text.MessageFormat; import java.util.Calendar; import java.util.Date; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/DateTimeFormat.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/DateTimeFormat.java similarity index 99% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/DateTimeFormat.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/DateTimeFormat.java index f23ed387a..dd8b344c0 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/DateTimeFormat.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/DateTimeFormat.java @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parameter; +package io.spine.logging.jvm.parameter; import java.util.Collections; import java.util.HashMap; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/DateTimeParameter.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/DateTimeParameter.java similarity index 96% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/DateTimeParameter.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/DateTimeParameter.java index bf5636618..f1143cffa 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/DateTimeParameter.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/DateTimeParameter.java @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parameter; +package io.spine.logging.jvm.parameter; -import io.spine.logging.flogger.backend.FormatOptions; +import io.spine.logging.jvm.backend.FormatOptions; /** * A parameter for formatting date/time arguments. diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/Parameter.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/Parameter.java similarity index 97% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/Parameter.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/Parameter.java index 78c05bbb3..53bfb21e7 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/Parameter.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/Parameter.java @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parameter; +package io.spine.logging.jvm.parameter; -import io.spine.logging.flogger.backend.FormatOptions; +import io.spine.logging.jvm.backend.FormatOptions; /** * An abstract representation of a parameter for a message template. diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/ParameterVisitor.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/ParameterVisitor.java similarity index 96% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/ParameterVisitor.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/ParameterVisitor.java index 291a316a0..dce687fd0 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/ParameterVisitor.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/ParameterVisitor.java @@ -24,10 +24,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parameter; +package io.spine.logging.jvm.parameter; -import io.spine.logging.flogger.backend.FormatChar; -import io.spine.logging.flogger.backend.FormatOptions; +import io.spine.logging.jvm.backend.FormatChar; +import io.spine.logging.jvm.backend.FormatOptions; /** * A visitor of log message arguments, dispatched by {@code Parameter} instances. diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/SimpleParameter.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/SimpleParameter.java similarity index 95% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/SimpleParameter.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/SimpleParameter.java index 69919f55f..01236c3da 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/SimpleParameter.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/SimpleParameter.java @@ -24,12 +24,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parameter; +package io.spine.logging.jvm.parameter; -import static io.spine.logging.flogger.util.Checks.checkNotNull; +import static io.spine.logging.jvm.util.Checks.checkNotNull; -import io.spine.logging.flogger.backend.FormatChar; -import io.spine.logging.flogger.backend.FormatOptions; +import io.spine.logging.jvm.backend.FormatChar; +import io.spine.logging.jvm.backend.FormatOptions; import java.util.Collections; import java.util.EnumMap; import java.util.Map; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/package-info.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/package-info.java similarity index 97% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/package-info.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/package-info.java index a08befd89..d9fd78d28 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/parameter/package-info.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/parameter/package-info.java @@ -31,6 +31,6 @@ * Original Java code of Google Flogger */ @CheckReturnValue -package io.spine.logging.flogger.parameter; +package io.spine.logging.jvm.parameter; import com.google.errorprone.annotations.CheckReturnValue; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/parser/BraceStyleMessageParser.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/parser/BraceStyleMessageParser.java similarity index 99% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/parser/BraceStyleMessageParser.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/parser/BraceStyleMessageParser.java index ae186c8ad..0f605a868 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/parser/BraceStyleMessageParser.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/parser/BraceStyleMessageParser.java @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parser; +package io.spine.logging.jvm.parser; /** * A specialized {@link MessageParser} for processing log messages in the "brace style", as used by diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/parser/DefaultBraceStyleMessageParser.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/parser/DefaultBraceStyleMessageParser.java similarity index 96% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/parser/DefaultBraceStyleMessageParser.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/parser/DefaultBraceStyleMessageParser.java index 188038418..bf9773f79 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/parser/DefaultBraceStyleMessageParser.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/parser/DefaultBraceStyleMessageParser.java @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parser; +package io.spine.logging.jvm.parser; -import io.spine.logging.flogger.parameter.BraceStyleParameter; +import io.spine.logging.jvm.parameter.BraceStyleParameter; /** * Default implementation of the brace style message parser. Note that while the underlying parsing diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/parser/DefaultPrintfMessageParser.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/parser/DefaultPrintfMessageParser.java similarity index 89% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/parser/DefaultPrintfMessageParser.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/parser/DefaultPrintfMessageParser.java index 485d0933e..e3f1a3852 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/parser/DefaultPrintfMessageParser.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/parser/DefaultPrintfMessageParser.java @@ -24,18 +24,18 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parser; +package io.spine.logging.jvm.parser; -import static io.spine.logging.flogger.backend.FormatOptions.FLAG_LEFT_ALIGN; -import static io.spine.logging.flogger.backend.FormatOptions.FLAG_UPPER_CASE; +import static io.spine.logging.jvm.backend.FormatOptions.FLAG_LEFT_ALIGN; +import static io.spine.logging.jvm.backend.FormatOptions.FLAG_UPPER_CASE; -import io.spine.logging.flogger.backend.FormatChar; -import io.spine.logging.flogger.backend.FormatOptions; -import io.spine.logging.flogger.parameter.DateTimeFormat; -import io.spine.logging.flogger.parameter.DateTimeParameter; -import io.spine.logging.flogger.parameter.Parameter; -import io.spine.logging.flogger.parameter.ParameterVisitor; -import io.spine.logging.flogger.parameter.SimpleParameter; +import io.spine.logging.jvm.backend.FormatChar; +import io.spine.logging.jvm.backend.FormatOptions; +import io.spine.logging.jvm.parameter.DateTimeFormat; +import io.spine.logging.jvm.parameter.DateTimeParameter; +import io.spine.logging.jvm.parameter.Parameter; +import io.spine.logging.jvm.parameter.ParameterVisitor; +import io.spine.logging.jvm.parameter.SimpleParameter; /** * Default implementation of the printf message parser. This parser supports all the place-holders diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/parser/MessageBuilder.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/parser/MessageBuilder.java similarity index 96% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/parser/MessageBuilder.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/parser/MessageBuilder.java index 74d100a8d..a2a77e9ec 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/parser/MessageBuilder.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/parser/MessageBuilder.java @@ -24,11 +24,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parser; +package io.spine.logging.jvm.parser; -import io.spine.logging.flogger.backend.TemplateContext; -import io.spine.logging.flogger.parameter.Parameter; -import io.spine.logging.flogger.util.Checks; +import io.spine.logging.jvm.backend.TemplateContext; +import io.spine.logging.jvm.parameter.Parameter; +import io.spine.logging.jvm.util.Checks; /** * A builder which is used during message parsing to create a message object which encapsulates diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/parser/MessageParser.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/parser/MessageParser.java similarity index 96% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/parser/MessageParser.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/parser/MessageParser.java index 92a2f48a8..557a63653 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/parser/MessageParser.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/parser/MessageParser.java @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parser; +package io.spine.logging.jvm.parser; /** * Base class from which any specific message parsers are derived (e.g. {@link PrintfMessageParser} @@ -36,7 +36,7 @@ public abstract class MessageParser { /** * The maximum allowed index (this should correspond to the MAX_ALLOWED_WIDTH - * in {@link io.spine.logging.flogger.backend.FormatOptions FormatOptions} + * in {@link io.spine.logging.jvm.backend.FormatOptions FormatOptions} * because at times it is ambiguous as to which is being parsed). */ public static final int MAX_ARG_COUNT = 1000000; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/parser/ParseException.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/parser/ParseException.java similarity index 99% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/parser/ParseException.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/parser/ParseException.java index 402f2ec20..24b28888c 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/parser/ParseException.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/parser/ParseException.java @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parser; +package io.spine.logging.jvm.parser; /** * The exception that should be thrown whenever parsing of a log message fails. This exception must diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/parser/PrintfMessageParser.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/parser/PrintfMessageParser.java similarity index 99% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/parser/PrintfMessageParser.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/parser/PrintfMessageParser.java index 6647eab25..36668c3c0 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/parser/PrintfMessageParser.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/parser/PrintfMessageParser.java @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parser; +package io.spine.logging.jvm.parser; /** * A specialized {@link MessageParser} for processing log messages in printf style, as used by diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/parser/package-info.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/parser/package-info.java similarity index 97% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/parser/package-info.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/parser/package-info.java index 83d16a570..4f81af60d 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/parser/package-info.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/parser/package-info.java @@ -31,6 +31,6 @@ * Original Java code of Google Flogger */ @CheckReturnValue -package io.spine.logging.flogger.parser; +package io.spine.logging.jvm.parser; import com.google.errorprone.annotations.CheckReturnValue; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/util/Checks.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/util/Checks.java similarity index 98% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/util/Checks.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/util/Checks.java index 51776c4bb..f71b2bd51 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/util/Checks.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/util/Checks.java @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.util; +package io.spine.logging.jvm.util; import com.google.errorprone.annotations.CanIgnoreReturnValue; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/util/RecursionDepth.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/util/RecursionDepth.java similarity index 98% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/util/RecursionDepth.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/util/RecursionDepth.java index b67165110..5c29136e3 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/util/RecursionDepth.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/util/RecursionDepth.java @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.util; +package io.spine.logging.jvm.util; import java.io.Closeable; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/util/StaticMethodCaller.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/util/StaticMethodCaller.java similarity index 99% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/util/StaticMethodCaller.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/util/StaticMethodCaller.java index f0fc360e8..5873f63d7 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/util/StaticMethodCaller.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/util/StaticMethodCaller.java @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.util; +package io.spine.logging.jvm.util; import java.lang.reflect.Method; import org.jspecify.annotations.Nullable; diff --git a/flogger/middleware/src/main/java/io/spine/logging/flogger/util/package-info.java b/flogger/middleware/src/main/java/io/spine/logging/jvm/util/package-info.java similarity index 97% rename from flogger/middleware/src/main/java/io/spine/logging/flogger/util/package-info.java rename to flogger/middleware/src/main/java/io/spine/logging/jvm/util/package-info.java index 732a3b5ba..3ce947439 100644 --- a/flogger/middleware/src/main/java/io/spine/logging/flogger/util/package-info.java +++ b/flogger/middleware/src/main/java/io/spine/logging/jvm/util/package-info.java @@ -31,6 +31,6 @@ * Original Java code of Google Flogger */ @CheckReturnValue -package io.spine.logging.flogger.util; +package io.spine.logging.jvm.util; import com.google.errorprone.annotations.CheckReturnValue; diff --git a/flogger/middleware/src/main/kotlin/io/spine/logging/flogger/FloggerMetadataKeys.kt b/flogger/middleware/src/main/kotlin/io/spine/logging/jvm/JvmMetadataKeys.kt similarity index 82% rename from flogger/middleware/src/main/kotlin/io/spine/logging/flogger/FloggerMetadataKeys.kt rename to flogger/middleware/src/main/kotlin/io/spine/logging/jvm/JvmMetadataKeys.kt index d02c8c135..f8ed7a453 100644 --- a/flogger/middleware/src/main/kotlin/io/spine/logging/flogger/FloggerMetadataKeys.kt +++ b/flogger/middleware/src/main/kotlin/io/spine/logging/jvm/JvmMetadataKeys.kt @@ -24,10 +24,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger +package io.spine.logging.jvm /** - * Creates a new single [FloggerMetadataKey] with the given [label]. + * Creates a new single [JvmMetadataKey] with the given [label]. * * In JVM, if the given type [T] describes a Java primitive, * this method would use a type of the corresponding object wrapper. @@ -36,11 +36,11 @@ package io.spine.logging.flogger * * @param T type of values that can be associated with this key */ -public inline fun singleKey(label: String): FloggerMetadataKey = - FloggerMetadataKey.single(label, T::class.javaObjectType) +public inline fun singleKey(label: String): JvmMetadataKey = + JvmMetadataKey.single(label, T::class.javaObjectType) /** - * Creates a new repeated [FloggerMetadataKey] with the given [label]. + * Creates a new repeated [JvmMetadataKey] with the given [label]. * * In JVM, if the given type [T] describes a Java primitive, * this method would use a type of the corresponding object wrapper. @@ -49,5 +49,5 @@ public inline fun singleKey(label: String): FloggerMetadataKey * * @param T type of values that can be associated with this key */ -public inline fun repeatedKey(label: String): FloggerMetadataKey = - FloggerMetadataKey.repeated(label, T::class.javaObjectType) +public inline fun repeatedKey(label: String): JvmMetadataKey = + JvmMetadataKey.repeated(label, T::class.javaObjectType) diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/AbstractLoggerSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/AbstractLoggerSpec.kt similarity index 96% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/AbstractLoggerSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/AbstractLoggerSpec.kt index 10ac151d8..9ae9329eb 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/AbstractLoggerSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/AbstractLoggerSpec.kt @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger +package io.spine.logging.jvm import io.kotest.assertions.throwables.shouldThrow import io.kotest.matchers.collections.shouldBeEmpty @@ -33,10 +33,10 @@ import io.kotest.matchers.string.shouldBeEmpty import io.kotest.matchers.string.shouldContain import io.kotest.matchers.string.shouldMatch import io.kotest.matchers.string.shouldNotContain -import io.spine.logging.flogger.backend.LogData -import io.spine.logging.flogger.backend.LoggingException -import io.spine.logging.flogger.given.ConfigurableLogger -import io.spine.logging.flogger.given.FormattingBackend +import io.spine.logging.jvm.backend.LogData +import io.spine.logging.jvm.backend.LoggingException +import io.spine.logging.jvm.given.ConfigurableLogger +import io.spine.logging.jvm.given.FormattingBackend import io.spine.logging.testing.tapConsole import kotlin.text.RegexOption.DOT_MATCHES_ALL import org.junit.jupiter.api.DisplayName diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/CountingRateLimiterSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/CountingRateLimiterSpec.kt similarity index 93% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/CountingRateLimiterSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/CountingRateLimiterSpec.kt index 8458bad06..4a75d4f1b 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/CountingRateLimiterSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/CountingRateLimiterSpec.kt @@ -24,17 +24,17 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger +package io.spine.logging.jvm import io.kotest.matchers.nulls.shouldBeNull import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNotBe import io.kotest.matchers.types.shouldBeSameInstanceAs -import io.spine.logging.flogger.CountingRateLimiter.check -import io.spine.logging.flogger.LogContext.Key -import io.spine.logging.flogger.RateLimitStatus.DISALLOW -import io.spine.logging.flogger.backend.given.FakeMetadata -import io.spine.logging.flogger.given.FakeLogSite +import io.spine.logging.jvm.CountingRateLimiter.check +import io.spine.logging.jvm.LogContext.Key +import io.spine.logging.jvm.RateLimitStatus.DISALLOW +import io.spine.logging.jvm.backend.given.FakeMetadata +import io.spine.logging.jvm.given.FakeLogSite import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/DurationRateLimiterSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/DurationRateLimiterSpec.kt similarity index 93% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/DurationRateLimiterSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/DurationRateLimiterSpec.kt index 8d47cf2bc..35cd3ed8c 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/DurationRateLimiterSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/DurationRateLimiterSpec.kt @@ -24,19 +24,19 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger +package io.spine.logging.jvm import io.kotest.matchers.nulls.shouldBeNull import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNotBe import io.kotest.matchers.types.shouldBeSameInstanceAs -import io.spine.logging.flogger.DurationRateLimiter.check -import io.spine.logging.flogger.DurationRateLimiter.newRateLimitPeriod -import io.spine.logging.flogger.LogContext.Key -import io.spine.logging.flogger.RateLimitStatus.DISALLOW -import io.spine.logging.flogger.RateLimitStatus.checkStatus -import io.spine.logging.flogger.backend.given.FakeMetadata -import io.spine.logging.flogger.given.FakeLogSite +import io.spine.logging.jvm.DurationRateLimiter.check +import io.spine.logging.jvm.DurationRateLimiter.newRateLimitPeriod +import io.spine.logging.jvm.LogContext.Key +import io.spine.logging.jvm.RateLimitStatus.DISALLOW +import io.spine.logging.jvm.RateLimitStatus.checkStatus +import io.spine.logging.jvm.backend.given.FakeMetadata +import io.spine.logging.jvm.given.FakeLogSite import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit.MILLISECONDS import org.junit.jupiter.api.DisplayName diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/FluentLogger2Spec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/FluentLogger2Spec.kt similarity index 84% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/FluentLogger2Spec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/FluentLogger2Spec.kt index 87774be14..88d6e06d7 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/FluentLogger2Spec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/FluentLogger2Spec.kt @@ -24,13 +24,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger +package io.spine.logging.jvm import io.kotest.matchers.shouldBe import io.kotest.matchers.types.shouldBeInstanceOf import io.kotest.matchers.types.shouldNotBeInstanceOf -import io.spine.logging.flogger.FluentLogger2.forEnclosingClass -import io.spine.logging.flogger.backend.given.MemoizingLoggerBackend +import io.spine.logging.jvm.FluentLogger2.forEnclosingClass +import io.spine.logging.jvm.backend.given.MemoizingLoggerBackend import java.util.logging.Level import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test @@ -73,18 +73,18 @@ internal class FluentLogger2Spec { backend.setLevel(Level.INFO) // Down to and including the configured log level are not no-op instances. - logger.atSevere().shouldNotBeInstanceOf>() - logger.atWarning().shouldNotBeInstanceOf>() - logger.atInfo().shouldNotBeInstanceOf>() + logger.atSevere().shouldNotBeInstanceOf>() + logger.atWarning().shouldNotBeInstanceOf>() + logger.atInfo().shouldNotBeInstanceOf>() logger.atSevere().shouldBeInstanceOf() logger.atWarning().shouldBeInstanceOf() logger.atInfo().shouldBeInstanceOf() // Below the configured log level, you only get no-op instances. - logger.atFine().shouldBeInstanceOf>() - logger.atFiner().shouldBeInstanceOf>() - logger.atFinest().shouldBeInstanceOf>() + logger.atFine().shouldBeInstanceOf>() + logger.atFiner().shouldBeInstanceOf>() + logger.atFinest().shouldBeInstanceOf>() // Just verify that logs below the current log level are discarded. logger.atFine().log("DISCARDED") @@ -96,8 +96,8 @@ internal class FluentLogger2Spec { logger.atInfo().log("LOGGED") backend.loggedCount shouldBe 1 backend.setLevel(Level.OFF) - logger.atSevere().shouldBeInstanceOf>() + logger.atSevere().shouldBeInstanceOf>() backend.setLevel(Level.ALL) - logger.atFinest().shouldNotBeInstanceOf>() + logger.atFinest().shouldNotBeInstanceOf>() } } diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/FloggerLogSitesSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/JvmLogSitesSpec.kt similarity index 82% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/FloggerLogSitesSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/JvmLogSitesSpec.kt index e7b832008..7bec2a0d0 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/FloggerLogSitesSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/JvmLogSitesSpec.kt @@ -24,25 +24,25 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger +package io.spine.logging.jvm -import io.spine.logging.flogger.FloggerLogSites.callerOf -import io.spine.logging.flogger.FloggerLogSites.logSite -import io.spine.logging.flogger.FloggerLogSites.logSiteFrom -import io.spine.logging.flogger.MyLogUtil.callerLogSite -import io.spine.logging.flogger.MyLogUtil.callerLogSiteWrapped +import io.spine.logging.jvm.JvmLogSites.callerOf +import io.spine.logging.jvm.JvmLogSites.logSite +import io.spine.logging.jvm.JvmLogSites.logSiteFrom +import io.spine.logging.jvm.MyLogUtil.callerLogSite +import io.spine.logging.jvm.MyLogUtil.callerLogSiteWrapped import io.kotest.matchers.shouldBe import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test /** - * Tests for [FloggerLogSites]. + * Tests for [JvmLogSites]. * * @see * Original Java code of Google Flogger */ -@DisplayName("`FloggerLogSites` should") -internal class FloggerLogSitesSpec { +@DisplayName("`JvmLogSites` should") +internal class JvmLogSitesSpec { @Test fun `return log site for the current line of code`() { @@ -59,7 +59,7 @@ internal class FloggerLogSitesSpec { @Test fun `return 'INVALID' log site if the caller not found`() { - callerOf(String::class.java) shouldBe FloggerLogSite.INVALID + callerOf(String::class.java) shouldBe JvmLogSite.INVALID } @Test @@ -74,8 +74,8 @@ internal class FloggerLogSitesSpec { } private object MyLogUtil { - val callerLogSite: FloggerLogSite + val callerLogSite: JvmLogSite get() = callerOf(MyLogUtil::class.java) - val callerLogSiteWrapped: FloggerLogSite + val callerLogSiteWrapped: JvmLogSite get() = callerLogSite } diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/FloggerMetadataKeySpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/JvmMetadataKeySpec.kt similarity index 90% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/FloggerMetadataKeySpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/JvmMetadataKeySpec.kt index 73a0b532a..1ff293918 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/FloggerMetadataKeySpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/JvmMetadataKeySpec.kt @@ -24,14 +24,14 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger - -import io.spine.logging.flogger.FloggerMetadataKey.repeated -import io.spine.logging.flogger.FloggerMetadataKey.single -import io.spine.logging.flogger.backend.Platform -import io.spine.logging.flogger.given.MemoizingKvHandler -import io.spine.logging.flogger.given.iterate -import io.spine.logging.flogger.util.RecursionDepth +package io.spine.logging.jvm + +import io.spine.logging.jvm.JvmMetadataKey.repeated +import io.spine.logging.jvm.JvmMetadataKey.single +import io.spine.logging.jvm.backend.Platform +import io.spine.logging.jvm.given.MemoizingKvHandler +import io.spine.logging.jvm.given.iterate +import io.spine.logging.jvm.util.RecursionDepth import io.kotest.assertions.throwables.shouldThrow import io.kotest.matchers.collections.shouldContain import io.kotest.matchers.collections.shouldContainExactly @@ -41,13 +41,13 @@ import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test /** - * Tests for [FloggerMetadataKey]. + * Tests for [JvmMetadataKey]. * * @see * Original Java code of Google Flogger */ -@DisplayName("`FloggerMetadataKey` should") -internal class FloggerMetadataKeySpec { +@DisplayName("`JvmMetadataKey` should") +internal class JvmMetadataKeySpec { @Test fun `create a key for a single piece of metadata`() { @@ -63,7 +63,7 @@ internal class FloggerMetadataKeySpec { val badLabels = mutableListOf("", "foo bar", "_FOO") badLabels.forEach { label -> shouldThrow { - FloggerMetadataKey(label, String::class.java, false) + JvmMetadataKey(label, String::class.java, false) } } } @@ -154,8 +154,8 @@ internal class FloggerMetadataKeySpec { @Test fun `throw on 'null's`() { val badInstantiations = listOf( - { FloggerMetadataKey(null, String::class.java, false) }, - { FloggerMetadataKey("label", null, false) }, + { JvmMetadataKey(null, String::class.java, false) }, + { JvmMetadataKey("label", null, false) }, { single(null, String::class.java) }, { single("label", null) }, { repeated(null, String::class.java) }, @@ -175,7 +175,7 @@ internal class FloggerMetadataKeySpec { * include that key, even in code, which has no explicit knowledge of it. */ private class ReenteringKey(label: String) : - FloggerMetadataKey(label, Any::class.java, true) { + JvmMetadataKey(label, Any::class.java, true) { override fun emit(value: Any, kvh: KeyValueHandler) { val currentDepth = Platform.getCurrentRecursionDepth() diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/LogContextSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/LogContextSpec.kt similarity index 96% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/LogContextSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/LogContextSpec.kt index 01b30bdcb..eaaadd01e 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/LogContextSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/LogContextSpec.kt @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger +package io.spine.logging.jvm import io.kotest.assertions.throwables.shouldThrow import io.kotest.matchers.booleans.shouldBeFalse @@ -36,23 +36,23 @@ import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNotBe import io.kotest.matchers.throwable.shouldHaveMessage import io.kotest.matchers.types.shouldNotBeSameInstanceAs -import io.spine.logging.flogger.DurationRateLimiter.newRateLimitPeriod -import io.spine.logging.flogger.LazyArgs.lazy -import io.spine.logging.flogger.LogContext.Key -import io.spine.logging.flogger.LogContext.specializeLogSiteKeyFromMetadata -import io.spine.logging.flogger.backend.given.FakeMetadata -import io.spine.logging.flogger.backend.given.MemoizingLoggerBackend -import io.spine.logging.flogger.backend.given.shouldContain -import io.spine.logging.flogger.backend.given.shouldContainInOrder -import io.spine.logging.flogger.backend.given.shouldHaveSize -import io.spine.logging.flogger.backend.given.shouldNotContain -import io.spine.logging.flogger.backend.given.shouldUniquelyContain -import io.spine.logging.flogger.context.Tags -import io.spine.logging.flogger.given.ConfigurableLogger -import io.spine.logging.flogger.given.FakeLogSite -import io.spine.logging.flogger.given.iterate -import io.spine.logging.flogger.given.shouldHaveArguments -import io.spine.logging.flogger.given.shouldHaveMessage +import io.spine.logging.jvm.DurationRateLimiter.newRateLimitPeriod +import io.spine.logging.jvm.LazyArgs.lazy +import io.spine.logging.jvm.LogContext.Key +import io.spine.logging.jvm.LogContext.specializeLogSiteKeyFromMetadata +import io.spine.logging.jvm.backend.given.FakeMetadata +import io.spine.logging.jvm.backend.given.MemoizingLoggerBackend +import io.spine.logging.jvm.backend.given.shouldContain +import io.spine.logging.jvm.backend.given.shouldContainInOrder +import io.spine.logging.jvm.backend.given.shouldHaveSize +import io.spine.logging.jvm.backend.given.shouldNotContain +import io.spine.logging.jvm.backend.given.shouldUniquelyContain +import io.spine.logging.jvm.context.Tags +import io.spine.logging.jvm.given.ConfigurableLogger +import io.spine.logging.jvm.given.FakeLogSite +import io.spine.logging.jvm.given.iterate +import io.spine.logging.jvm.given.shouldHaveArguments +import io.spine.logging.jvm.given.shouldHaveMessage import java.lang.System.currentTimeMillis import java.util.concurrent.TimeUnit.MILLISECONDS import java.util.concurrent.TimeUnit.SECONDS @@ -94,7 +94,7 @@ internal class LogContextSpec { // and you'd use `logVarargs()`. private fun logHelper( logger: FluentLogger2, - logSite: FloggerLogSite, + logSite: JvmLogSite, n: Int, message: String ) { @@ -211,7 +211,7 @@ internal class LogContextSpec { /** * For testing log-site tags are correctly merged with metadata, - * see [AbstractContextDataProviderSpec][io.spine.logging.flogger.context.AbstractContextDataProviderSpec]. + * see [AbstractContextDataProviderSpec][io.spine.logging.jvm.context.AbstractContextDataProviderSpec]. */ @Test fun `accept tags`() { @@ -871,9 +871,9 @@ internal class LogContextSpec { // We don't expect this to ever happen in real code though. for (i in 0..6) { // Log every 2nd (0, 2, 4, 6) - logHelper(logger, FloggerLogSites.logSite(), 2, "Foo: $i") + logHelper(logger, JvmLogSites.logSite(), 2, "Foo: $i") // Log every 3rd (0, 3, 6) - logHelper(logger, FloggerLogSites.logSite(), 3, "Bar: $i") + logHelper(logger, JvmLogSites.logSite(), 3, "Bar: $i") } backend.loggedCount shouldBe 7 backend.firstLogged.shouldHaveArguments("Foo: 0") @@ -892,17 +892,17 @@ internal class LogContextSpec { @Test fun `suppress an invalid log site analysis`() { logger.atInfo() - .withInjectedLogSite(FloggerLogSite.INVALID) + .withInjectedLogSite(JvmLogSite.INVALID) .log("No log site here") logger.atInfo() .withInjectedLogSite(null) .log("No-op injection") backend.loggedCount shouldBe 2 - backend.firstLogged.logSite shouldBe FloggerLogSite.INVALID + backend.firstLogged.logSite shouldBe JvmLogSite.INVALID backend.logged[1].logSite.shouldNotBeNull() - backend.logged[1].logSite shouldNotBe FloggerLogSite.INVALID + backend.logged[1].logSite shouldNotBe JvmLogSite.INVALID } @Nested inner class diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/LogPerBucketingStrategySpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/LogPerBucketingStrategySpec.kt similarity index 99% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/LogPerBucketingStrategySpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/LogPerBucketingStrategySpec.kt index 28c4a7991..e4dcf2548 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/LogPerBucketingStrategySpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/LogPerBucketingStrategySpec.kt @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger +package io.spine.logging.jvm import io.kotest.matchers.nulls.shouldBeNull import io.kotest.matchers.shouldBe diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/LogSiteMapSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/LogSiteMapSpec.kt similarity index 96% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/LogSiteMapSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/LogSiteMapSpec.kt index 4155dc1f8..516c0b3ae 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/LogSiteMapSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/LogSiteMapSpec.kt @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger +package io.spine.logging.jvm import io.kotest.matchers.booleans.shouldBeFalse import io.kotest.matchers.booleans.shouldBeTrue @@ -32,9 +32,9 @@ import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.shouldBe import io.kotest.matchers.types.shouldBeSameInstanceAs import io.kotest.matchers.types.shouldNotBeSameInstanceAs -import io.spine.logging.flogger.backend.Metadata -import io.spine.logging.flogger.backend.given.FakeMetadata -import io.spine.logging.flogger.given.FakeLogSite +import io.spine.logging.jvm.backend.Metadata +import io.spine.logging.jvm.backend.given.FakeMetadata +import io.spine.logging.jvm.given.FakeLogSite import java.lang.Thread.sleep import java.util.concurrent.Callable import java.util.concurrent.atomic.AtomicInteger diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/LogSiteStackTraceSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/LogSiteStackTraceSpec.kt similarity index 98% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/LogSiteStackTraceSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/LogSiteStackTraceSpec.kt index 509d5a6f5..10a45e844 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/LogSiteStackTraceSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/LogSiteStackTraceSpec.kt @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger +package io.spine.logging.jvm import io.kotest.matchers.nulls.shouldBeNull import io.kotest.matchers.shouldBe diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/LoggingScopeSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/LoggingScopeSpec.kt similarity index 95% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/LoggingScopeSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/LoggingScopeSpec.kt index 5fa26222e..2164011ca 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/LoggingScopeSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/LoggingScopeSpec.kt @@ -24,10 +24,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger +package io.spine.logging.jvm import io.kotest.matchers.shouldNotBe -import io.spine.logging.flogger.LoggingScope.create +import io.spine.logging.jvm.LoggingScope.create import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/RateLimitStatusSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/RateLimitStatusSpec.kt similarity index 93% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/RateLimitStatusSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/RateLimitStatusSpec.kt index 11f12340c..30419d4f5 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/RateLimitStatusSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/RateLimitStatusSpec.kt @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger +package io.spine.logging.jvm import io.kotest.assertions.throwables.shouldThrow import io.kotest.matchers.booleans.shouldBeFalse @@ -32,12 +32,12 @@ import io.kotest.matchers.booleans.shouldBeTrue import io.kotest.matchers.nulls.shouldBeNull import io.kotest.matchers.shouldBe import io.kotest.matchers.types.shouldBeSameInstanceAs -import io.spine.logging.flogger.RateLimitStatus.ALLOW -import io.spine.logging.flogger.RateLimitStatus.DISALLOW -import io.spine.logging.flogger.RateLimitStatus.checkStatus -import io.spine.logging.flogger.RateLimitStatus.combine -import io.spine.logging.flogger.backend.given.FakeMetadata -import io.spine.logging.flogger.given.FakeLogSite +import io.spine.logging.jvm.RateLimitStatus.ALLOW +import io.spine.logging.jvm.RateLimitStatus.DISALLOW +import io.spine.logging.jvm.RateLimitStatus.checkStatus +import io.spine.logging.jvm.RateLimitStatus.combine +import io.spine.logging.jvm.backend.given.FakeMetadata +import io.spine.logging.jvm.given.FakeLogSite import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/SamplingRateLimiterSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/SamplingRateLimiterSpec.kt similarity index 90% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/SamplingRateLimiterSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/SamplingRateLimiterSpec.kt index 0269cf0b8..cf22166aa 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/SamplingRateLimiterSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/SamplingRateLimiterSpec.kt @@ -24,20 +24,20 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger +package io.spine.logging.jvm import io.kotest.matchers.ints.shouldBeGreaterThan import io.kotest.matchers.ints.shouldBeInRange import io.kotest.matchers.nulls.shouldBeNull import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNotBe -import io.spine.logging.flogger.LogContext.Key -import io.spine.logging.flogger.RateLimitStatus.DISALLOW -import io.spine.logging.flogger.RateLimitStatus.checkStatus -import io.spine.logging.flogger.SamplingRateLimiter.check -import io.spine.logging.flogger.backend.Metadata -import io.spine.logging.flogger.backend.given.FakeMetadata -import io.spine.logging.flogger.given.FakeLogSite +import io.spine.logging.jvm.LogContext.Key +import io.spine.logging.jvm.RateLimitStatus.DISALLOW +import io.spine.logging.jvm.RateLimitStatus.checkStatus +import io.spine.logging.jvm.SamplingRateLimiter.check +import io.spine.logging.jvm.backend.Metadata +import io.spine.logging.jvm.backend.given.FakeMetadata +import io.spine.logging.jvm.given.FakeLogSite import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/SpecializedLogSiteKeySpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/SpecializedLogSiteKeySpec.kt similarity index 97% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/SpecializedLogSiteKeySpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/SpecializedLogSiteKeySpec.kt index ea0ae4f28..ccfdded7a 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/SpecializedLogSiteKeySpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/SpecializedLogSiteKeySpec.kt @@ -24,11 +24,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger +package io.spine.logging.jvm import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNotBe -import io.spine.logging.flogger.given.FakeLogSite +import io.spine.logging.jvm.given.FakeLogSite import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/StackBasedLogSiteSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/StackBasedLogSiteSpec.kt similarity index 97% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/StackBasedLogSiteSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/StackBasedLogSiteSpec.kt index 5d7a86e64..6150449c6 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/StackBasedLogSiteSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/StackBasedLogSiteSpec.kt @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger +package io.spine.logging.jvm import io.kotest.assertions.throwables.shouldThrow import io.kotest.matchers.collections.shouldHaveSize @@ -77,7 +77,7 @@ internal class StackBasedLogSiteSpec { val lineNumber = -3 // Can also be unknown, represented with a negative value. val logSite = stackBasedLogSite(CLASS_NAME, METHOD_NAME, fileName, lineNumber) logSite.fileName.shouldBeNull() - logSite.lineNumber shouldBe FloggerLogSite.UNKNOWN_LINE + logSite.lineNumber shouldBe JvmLogSite.UNKNOWN_LINE } @Test diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/BaseMessageFormatterSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/BaseMessageFormatterSpec.kt similarity index 98% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/BaseMessageFormatterSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/BaseMessageFormatterSpec.kt index b089f8565..841202d70 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/BaseMessageFormatterSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/BaseMessageFormatterSpec.kt @@ -24,12 +24,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend +package io.spine.logging.jvm.backend import io.kotest.assertions.throwables.shouldThrow import io.kotest.matchers.shouldBe -import io.spine.logging.flogger.backend.given.FakeLogData -import io.spine.logging.flogger.parser.ParseException +import io.spine.logging.jvm.backend.given.FakeLogData +import io.spine.logging.jvm.parser.ParseException import java.math.BigDecimal import java.math.BigInteger import java.util.* diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/FormatCharSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/FormatCharSpec.kt similarity index 85% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/FormatCharSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/FormatCharSpec.kt index 8efe1bf8b..017252231 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/FormatCharSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/FormatCharSpec.kt @@ -24,20 +24,20 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend +package io.spine.logging.jvm.backend -import io.spine.logging.flogger.backend.FormatChar.BOOLEAN -import io.spine.logging.flogger.backend.FormatChar.CHAR -import io.spine.logging.flogger.backend.FormatChar.DECIMAL -import io.spine.logging.flogger.backend.FormatChar.EXPONENT -import io.spine.logging.flogger.backend.FormatChar.EXPONENT_HEX -import io.spine.logging.flogger.backend.FormatChar.FLOAT -import io.spine.logging.flogger.backend.FormatChar.GENERAL -import io.spine.logging.flogger.backend.FormatChar.HEX -import io.spine.logging.flogger.backend.FormatChar.OCTAL -import io.spine.logging.flogger.backend.FormatChar.STRING -import io.spine.logging.flogger.backend.FormatOptions.parse -import io.spine.logging.flogger.backend.FormatOptions.parseValidFlags +import io.spine.logging.jvm.backend.FormatChar.BOOLEAN +import io.spine.logging.jvm.backend.FormatChar.CHAR +import io.spine.logging.jvm.backend.FormatChar.DECIMAL +import io.spine.logging.jvm.backend.FormatChar.EXPONENT +import io.spine.logging.jvm.backend.FormatChar.EXPONENT_HEX +import io.spine.logging.jvm.backend.FormatChar.FLOAT +import io.spine.logging.jvm.backend.FormatChar.GENERAL +import io.spine.logging.jvm.backend.FormatChar.HEX +import io.spine.logging.jvm.backend.FormatChar.OCTAL +import io.spine.logging.jvm.backend.FormatChar.STRING +import io.spine.logging.jvm.backend.FormatOptions.parse +import io.spine.logging.jvm.backend.FormatOptions.parseValidFlags import io.kotest.matchers.shouldBe import io.kotest.matchers.types.shouldBeSameInstanceAs import org.junit.jupiter.api.DisplayName diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/FormatOptionsSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/FormatOptionsSpec.kt similarity index 92% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/FormatOptionsSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/FormatOptionsSpec.kt index 003dfcde2..8ac2b7825 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/FormatOptionsSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/FormatOptionsSpec.kt @@ -24,19 +24,19 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend - -import io.spine.logging.flogger.backend.FormatOptions.ALL_FLAGS -import io.spine.logging.flogger.backend.FormatOptions.FLAG_LEFT_ALIGN -import io.spine.logging.flogger.backend.FormatOptions.FLAG_PREFIX_PLUS_FOR_POSITIVE_VALUES -import io.spine.logging.flogger.backend.FormatOptions.FLAG_PREFIX_SPACE_FOR_POSITIVE_VALUES -import io.spine.logging.flogger.backend.FormatOptions.FLAG_SHOW_ALT_FORM -import io.spine.logging.flogger.backend.FormatOptions.FLAG_SHOW_GROUPING -import io.spine.logging.flogger.backend.FormatOptions.FLAG_SHOW_LEADING_ZEROS -import io.spine.logging.flogger.backend.FormatOptions.FLAG_UPPER_CASE -import io.spine.logging.flogger.backend.FormatOptions.UNSET -import io.spine.logging.flogger.backend.FormatOptions.parse -import io.spine.logging.flogger.parser.ParseException +package io.spine.logging.jvm.backend + +import io.spine.logging.jvm.backend.FormatOptions.ALL_FLAGS +import io.spine.logging.jvm.backend.FormatOptions.FLAG_LEFT_ALIGN +import io.spine.logging.jvm.backend.FormatOptions.FLAG_PREFIX_PLUS_FOR_POSITIVE_VALUES +import io.spine.logging.jvm.backend.FormatOptions.FLAG_PREFIX_SPACE_FOR_POSITIVE_VALUES +import io.spine.logging.jvm.backend.FormatOptions.FLAG_SHOW_ALT_FORM +import io.spine.logging.jvm.backend.FormatOptions.FLAG_SHOW_GROUPING +import io.spine.logging.jvm.backend.FormatOptions.FLAG_SHOW_LEADING_ZEROS +import io.spine.logging.jvm.backend.FormatOptions.FLAG_UPPER_CASE +import io.spine.logging.jvm.backend.FormatOptions.UNSET +import io.spine.logging.jvm.backend.FormatOptions.parse +import io.spine.logging.jvm.parser.ParseException import io.kotest.assertions.throwables.shouldNotThrow import io.kotest.assertions.throwables.shouldThrow import io.kotest.matchers.booleans.shouldBeFalse diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/FormatTypeSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/FormatTypeSpec.kt similarity index 92% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/FormatTypeSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/FormatTypeSpec.kt index 0a977f9ce..47b7b98d9 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/FormatTypeSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/FormatTypeSpec.kt @@ -24,13 +24,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend +package io.spine.logging.jvm.backend -import io.spine.logging.flogger.backend.FormatType.GENERAL -import io.spine.logging.flogger.backend.FormatType.BOOLEAN -import io.spine.logging.flogger.backend.FormatType.CHARACTER -import io.spine.logging.flogger.backend.FormatType.INTEGRAL -import io.spine.logging.flogger.backend.FormatType.FLOAT +import io.spine.logging.jvm.backend.FormatType.GENERAL +import io.spine.logging.jvm.backend.FormatType.BOOLEAN +import io.spine.logging.jvm.backend.FormatType.CHARACTER +import io.spine.logging.jvm.backend.FormatType.INTEGRAL +import io.spine.logging.jvm.backend.FormatType.FLOAT import io.kotest.matchers.booleans.shouldBeFalse import io.kotest.matchers.booleans.shouldBeTrue import java.math.BigDecimal diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/KeyValueFormatterSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/KeyValueFormatterSpec.kt similarity index 99% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/KeyValueFormatterSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/KeyValueFormatterSpec.kt index 9c0272e54..bb4fb8cb8 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/KeyValueFormatterSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/KeyValueFormatterSpec.kt @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend +package io.spine.logging.jvm.backend import io.kotest.matchers.shouldBe import io.kotest.matchers.string.shouldBeEmpty diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/LightweightProcessorSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/LightweightProcessorSpec.kt similarity index 97% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/LightweightProcessorSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/LightweightProcessorSpec.kt index ea5abe351..00a3b706e 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/LightweightProcessorSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/LightweightProcessorSpec.kt @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend +package io.spine.logging.jvm.backend import org.junit.jupiter.api.DisplayName diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/MessageUtilsSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/MessageUtilsSpec.kt similarity index 88% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/MessageUtilsSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/MessageUtilsSpec.kt index 8fb1ffded..7567f6130 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/MessageUtilsSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/MessageUtilsSpec.kt @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend +package io.spine.logging.jvm.backend import io.kotest.matchers.booleans.shouldBeFalse import io.kotest.matchers.booleans.shouldBeTrue @@ -34,16 +34,16 @@ import io.kotest.matchers.string.shouldContain import io.kotest.matchers.string.shouldNotContain import io.kotest.matchers.types.shouldBeSameInstanceAs import io.spine.logging.backend.given.BadToString -import io.spine.logging.flogger.FloggerLogSite -import io.spine.logging.flogger.backend.FormatOptions.FLAG_SHOW_ALT_FORM -import io.spine.logging.flogger.backend.FormatOptions.FLAG_SHOW_LEADING_ZEROS -import io.spine.logging.flogger.backend.FormatOptions.FLAG_UPPER_CASE -import io.spine.logging.flogger.backend.FormatOptions.UNSET -import io.spine.logging.flogger.backend.MessageUtils.appendHex -import io.spine.logging.flogger.backend.MessageUtils.appendLogSite -import io.spine.logging.flogger.backend.MessageUtils.safeFormatTo -import io.spine.logging.flogger.backend.MessageUtils.safeToString -import io.spine.logging.flogger.given.FakeLogSite +import io.spine.logging.jvm.JvmLogSite +import io.spine.logging.jvm.backend.FormatOptions.FLAG_SHOW_ALT_FORM +import io.spine.logging.jvm.backend.FormatOptions.FLAG_SHOW_LEADING_ZEROS +import io.spine.logging.jvm.backend.FormatOptions.FLAG_UPPER_CASE +import io.spine.logging.jvm.backend.FormatOptions.UNSET +import io.spine.logging.jvm.backend.MessageUtils.appendHex +import io.spine.logging.jvm.backend.MessageUtils.appendLogSite +import io.spine.logging.jvm.backend.MessageUtils.safeFormatTo +import io.spine.logging.jvm.backend.MessageUtils.safeToString +import io.spine.logging.jvm.given.FakeLogSite import java.util.* import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Nested @@ -141,7 +141,7 @@ internal class MessageUtilsSpec { "$out" shouldBe ".:32" out.setLength(0) - appendLogSite(FloggerLogSite.INVALID, out).shouldBeFalse() + appendLogSite(JvmLogSite.INVALID, out).shouldBeFalse() "$out".shouldBeEmpty() } diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/MetadataHandlerSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/MetadataHandlerSpec.kt similarity index 91% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/MetadataHandlerSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/MetadataHandlerSpec.kt index 34be07013..846634620 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/MetadataHandlerSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/MetadataHandlerSpec.kt @@ -24,15 +24,15 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend +package io.spine.logging.jvm.backend import com.google.common.base.Joiner import com.google.common.collect.Iterators import io.kotest.matchers.shouldBe -import io.spine.logging.flogger.FloggerMetadataKey -import io.spine.logging.flogger.backend.given.FakeMetadata -import io.spine.logging.flogger.repeatedKey -import io.spine.logging.flogger.singleKey +import io.spine.logging.jvm.JvmMetadataKey +import io.spine.logging.jvm.backend.given.FakeMetadata +import io.spine.logging.jvm.repeatedKey +import io.spine.logging.jvm.singleKey import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test @@ -192,7 +192,7 @@ private fun process( * * @see MetadataHandler.builder */ -private fun appendUnknownValue(key: FloggerMetadataKey<*>, value: Any, out: StringBuilder) { +private fun appendUnknownValue(key: JvmMetadataKey<*>, value: Any, out: StringBuilder) { out.append("${key.label}=<<$value>> ") } @@ -202,7 +202,7 @@ private fun appendUnknownValue(key: FloggerMetadataKey<*>, value: Any, out: Stri * @see MetadataHandler.builder */ private fun appendUnknownValues( - key: FloggerMetadataKey<*>, + key: JvmMetadataKey<*>, values: Iterator<*>, out: StringBuilder ) { @@ -210,16 +210,16 @@ private fun appendUnknownValues( appendUnknownValue(key, joinedValues, out) } -private fun appendValue(key: FloggerMetadataKey<*>, value: Any, out: StringBuilder) { +private fun appendValue(key: JvmMetadataKey<*>, value: Any, out: StringBuilder) { out.append("${key.label}=$value ") } -private fun appendValues(key: FloggerMetadataKey<*>, values: Iterator<*>, out: StringBuilder) { +private fun appendValues(key: JvmMetadataKey<*>, values: Iterator<*>, out: StringBuilder) { val joinedValues = Iterators.toString(values) appendValue(key, joinedValues, out) } -private fun appendSum(key: FloggerMetadataKey, values: Iterator, out: StringBuilder) { +private fun appendSum(key: JvmMetadataKey, values: Iterator, out: StringBuilder) { var sum = 0 values.forEach { sum += it } out.append("sum(${key.label})=$sum ") diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/MetadataKeyValueHandlersSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/MetadataKeyValueHandlersSpec.kt similarity index 87% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/MetadataKeyValueHandlersSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/MetadataKeyValueHandlersSpec.kt index 5d7e39cdc..807c4144b 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/MetadataKeyValueHandlersSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/MetadataKeyValueHandlersSpec.kt @@ -24,17 +24,17 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend +package io.spine.logging.jvm.backend -import io.spine.logging.flogger.backend.MetadataKeyValueHandlers.getDefaultHandler -import io.spine.logging.flogger.backend.MetadataKeyValueHandlers.getDefaultRepeatedValueHandler -import io.spine.logging.flogger.backend.MetadataKeyValueHandlers.getDefaultValueHandler -import io.spine.logging.flogger.given.MemoizingKvHandler -import io.spine.logging.flogger.given.iterate +import io.spine.logging.jvm.backend.MetadataKeyValueHandlers.getDefaultHandler +import io.spine.logging.jvm.backend.MetadataKeyValueHandlers.getDefaultRepeatedValueHandler +import io.spine.logging.jvm.backend.MetadataKeyValueHandlers.getDefaultValueHandler +import io.spine.logging.jvm.given.MemoizingKvHandler +import io.spine.logging.jvm.given.iterate import io.kotest.matchers.collections.shouldContainExactly import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder -import io.spine.logging.flogger.repeatedKey -import io.spine.logging.flogger.singleKey +import io.spine.logging.jvm.repeatedKey +import io.spine.logging.jvm.singleKey import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/MetadataProcessorSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/MetadataProcessorSpec.kt similarity index 93% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/MetadataProcessorSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/MetadataProcessorSpec.kt index 71276d141..27de8f442 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/MetadataProcessorSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/MetadataProcessorSpec.kt @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend +package io.spine.logging.jvm.backend import com.google.common.collect.Iterators import io.kotest.assertions.throwables.shouldThrow @@ -33,10 +33,10 @@ import io.kotest.matchers.collections.shouldContainExactly import io.kotest.matchers.ints.shouldBeLessThanOrEqual import io.kotest.matchers.nulls.shouldBeNull import io.kotest.matchers.shouldBe -import io.spine.logging.flogger.FloggerMetadataKey -import io.spine.logging.flogger.backend.given.FakeMetadata -import io.spine.logging.flogger.repeatedKey -import io.spine.logging.flogger.singleKey +import io.spine.logging.jvm.JvmMetadataKey +import io.spine.logging.jvm.backend.given.FakeMetadata +import io.spine.logging.jvm.repeatedKey +import io.spine.logging.jvm.singleKey import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test @@ -185,8 +185,8 @@ internal abstract class MetadataProcessorSpec(private val factory: ProcessorFact .add(REP_1, "two") val metadata = factory.processorFor(scope, Metadata.empty()) val handler: MetadataHandler = object : MetadataHandler() { - override fun handle(key: FloggerMetadataKey, value: T, context: Void) = Unit - override fun handleRepeated(key: FloggerMetadataKey, + override fun handle(key: JvmMetadataKey, value: T, context: Void) = Unit + override fun handleRepeated(key: JvmMetadataKey, values: MutableIterator, context: Void?) { values.hasNext().shouldBeTrue() @@ -221,7 +221,7 @@ private fun entries(metadata: MetadataProcessor): List { * Processes the given [metadata] for a single metadata [key], * returning the formatted entry. */ -private fun handleEntry(metadata: MetadataProcessor, key: FloggerMetadataKey<*>): String? { +private fun handleEntry(metadata: MetadataProcessor, key: JvmMetadataKey<*>): String? { val entries = arrayListOf() metadata.handle(key, COLLECTING_HANDLER, entries) entries.size shouldBeLessThanOrEqual 1 @@ -230,12 +230,12 @@ private fun handleEntry(metadata: MetadataProcessor, key: FloggerMetadataKey<*>) private object COLLECTING_HANDLER : MetadataHandler>() { - override fun handle(key: FloggerMetadataKey, value: T, out: MutableList) { + override fun handle(key: JvmMetadataKey, value: T, out: MutableList) { val stringified = "%s=%s".format(key.label, value) out.add(stringified) } - override fun handleRepeated(key: FloggerMetadataKey, + override fun handleRepeated(key: JvmMetadataKey, values: MutableIterator, out: MutableList) { val stringified = "%s=%s".format(key.label, Iterators.toString(values)) diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/SimpleMessageFormatterSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/SimpleMessageFormatterSpec.kt similarity index 95% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/SimpleMessageFormatterSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/SimpleMessageFormatterSpec.kt index 94b150391..561fae3a8 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/SimpleMessageFormatterSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/SimpleMessageFormatterSpec.kt @@ -24,16 +24,16 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend +package io.spine.logging.jvm.backend import io.kotest.matchers.shouldBe import io.kotest.matchers.types.shouldBeSameInstanceAs -import io.spine.logging.flogger.LogContext.Key -import io.spine.logging.flogger.backend.given.FakeLogData -import io.spine.logging.flogger.backend.given.FakeMetadata -import io.spine.logging.flogger.context.Tags -import io.spine.logging.flogger.repeatedKey -import io.spine.logging.flogger.singleKey +import io.spine.logging.jvm.LogContext.Key +import io.spine.logging.jvm.backend.given.FakeLogData +import io.spine.logging.jvm.backend.given.FakeMetadata +import io.spine.logging.jvm.context.Tags +import io.spine.logging.jvm.repeatedKey +import io.spine.logging.jvm.singleKey import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/SimpleProcessorSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/SimpleProcessorSpec.kt similarity index 97% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/SimpleProcessorSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/SimpleProcessorSpec.kt index f69b698d1..e3d1a8089 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/SimpleProcessorSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/SimpleProcessorSpec.kt @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend +package io.spine.logging.jvm.backend import org.junit.jupiter.api.DisplayName diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/given/FakeLogData.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/given/FakeLogData.kt similarity index 85% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/given/FakeLogData.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/given/FakeLogData.kt index e6c7b5550..895ee0c7a 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/given/FakeLogData.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/given/FakeLogData.kt @@ -24,19 +24,19 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend.given +package io.spine.logging.jvm.backend.given import com.google.errorprone.annotations.CanIgnoreReturnValue -import io.spine.logging.flogger.FloggerLogSite -import io.spine.logging.flogger.FloggerMetadataKey -import io.spine.logging.flogger.LogContext -import io.spine.logging.flogger.backend.LogData -import io.spine.logging.flogger.backend.Metadata -import io.spine.logging.flogger.backend.TemplateContext -import io.spine.logging.flogger.given.FakeLogSite -import io.spine.logging.flogger.parser.DefaultBraceStyleMessageParser -import io.spine.logging.flogger.parser.DefaultPrintfMessageParser -import io.spine.logging.flogger.parser.MessageParser +import io.spine.logging.jvm.JvmLogSite +import io.spine.logging.jvm.JvmMetadataKey +import io.spine.logging.jvm.LogContext +import io.spine.logging.jvm.backend.LogData +import io.spine.logging.jvm.backend.Metadata +import io.spine.logging.jvm.backend.TemplateContext +import io.spine.logging.jvm.given.FakeLogSite +import io.spine.logging.jvm.parser.DefaultBraceStyleMessageParser +import io.spine.logging.jvm.parser.DefaultPrintfMessageParser +import io.spine.logging.jvm.parser.MessageParser import java.util.concurrent.TimeUnit import java.util.logging.Level @@ -54,7 +54,7 @@ class FakeLogData : LogData { private var literalArgument: Any? = null private var timestampNanos = 0L private val metadata = FakeMetadata() - private var logSite: FloggerLogSite = LOG_SITE + private var logSite: JvmLogSite = LOG_SITE companion object { private const val LOGGER_NAME = "io.spine.LoggerName" @@ -106,13 +106,13 @@ class FakeLogData : LogData { } @CanIgnoreReturnValue - fun setLogSite(logSite: FloggerLogSite): FakeLogData { + fun setLogSite(logSite: JvmLogSite): FakeLogData { this.logSite = logSite return this } @CanIgnoreReturnValue - fun addMetadata(key: FloggerMetadataKey, value: Any?): FakeLogData { + fun addMetadata(key: JvmMetadataKey, value: Any?): FakeLogData { metadata.add(key, key.cast(value)) return this } @@ -134,7 +134,7 @@ class FakeLogData : LogData { return LOGGER_NAME } - override fun getLogSite(): FloggerLogSite { + override fun getLogSite(): JvmLogSite { return logSite } diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/given/FakeMetadata.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/given/FakeMetadata.kt similarity index 82% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/given/FakeMetadata.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/given/FakeMetadata.kt index 911c16ac0..966608ec0 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/given/FakeMetadata.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/given/FakeMetadata.kt @@ -24,11 +24,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend.given +package io.spine.logging.jvm.backend.given import com.google.errorprone.annotations.CanIgnoreReturnValue -import io.spine.logging.flogger.FloggerMetadataKey -import io.spine.logging.flogger.backend.Metadata +import io.spine.logging.jvm.JvmMetadataKey +import io.spine.logging.jvm.backend.Metadata /** * A mutable [Metadata] implementation for testing logging backends @@ -38,7 +38,7 @@ import io.spine.logging.flogger.backend.Metadata */ class FakeMetadata : Metadata() { - private class KeyValuePair(val key: FloggerMetadataKey, val value: T) + private class KeyValuePair(val key: JvmMetadataKey, val value: T) private val entries = mutableListOf>() @@ -46,18 +46,18 @@ class FakeMetadata : Metadata() { * Adds a key/value pair to this [Metadata]. */ @CanIgnoreReturnValue - fun add(key: FloggerMetadataKey, value: T): FakeMetadata { + fun add(key: JvmMetadataKey, value: T): FakeMetadata { entries.add(KeyValuePair(key, value)) return this } override fun size(): Int = entries.size - override fun getKey(n: Int): FloggerMetadataKey<*> = entries[n].key + override fun getKey(n: Int): JvmMetadataKey<*> = entries[n].key override fun getValue(n: Int): Any = entries[n].value!! - override fun findValue(key: FloggerMetadataKey): T? { + override fun findValue(key: JvmMetadataKey): T? { val entry = entries.firstOrNull { it.key == key } val casted = key.cast(entry?.value) // It is safe to pass `null` here. return casted diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/given/MemoizingLoggerBackend.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/given/MemoizingLoggerBackend.kt similarity index 94% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/given/MemoizingLoggerBackend.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/given/MemoizingLoggerBackend.kt index 358a1d715..5727f2324 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/given/MemoizingLoggerBackend.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/given/MemoizingLoggerBackend.kt @@ -24,10 +24,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend.given +package io.spine.logging.jvm.backend.given -import io.spine.logging.flogger.backend.LogData -import io.spine.logging.flogger.backend.LoggerBackend +import io.spine.logging.jvm.backend.LogData +import io.spine.logging.jvm.backend.LoggerBackend import java.util.logging.Level /** diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/given/MetadataAssertions.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/given/MetadataAssertions.kt similarity index 82% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/given/MetadataAssertions.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/given/MetadataAssertions.kt index 2093933e4..a851ee4ac 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/backend/given/MetadataAssertions.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/backend/given/MetadataAssertions.kt @@ -24,10 +24,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.backend.given +package io.spine.logging.jvm.backend.given -import io.spine.logging.flogger.FloggerMetadataKey -import io.spine.logging.flogger.backend.Metadata +import io.spine.logging.jvm.JvmMetadataKey +import io.spine.logging.jvm.backend.Metadata import io.kotest.matchers.collections.shouldContainInOrder import io.kotest.matchers.ints.shouldBeExactly import io.kotest.matchers.nulls.shouldBeNull @@ -60,7 +60,7 @@ internal infix fun Metadata.shouldHaveSize(number: Int) { /** * Asserts that this [Metadata] has a [key] with the mapped [values]. */ -internal fun Metadata.shouldContainInOrder(key: FloggerMetadataKey, vararg values: T) { +internal fun Metadata.shouldContainInOrder(key: JvmMetadataKey, vararg values: T) { valuesOf(key) shouldContainInOrder values.asList() } @@ -69,34 +69,34 @@ internal fun Metadata.shouldContainInOrder(key: FloggerMetadataKey, varar * * The given [value] should be the first one, which was mapped to the [key]. */ -internal fun Metadata.shouldHaveFirstValue(key: FloggerMetadataKey, value: T) { +internal fun Metadata.shouldHaveFirstValue(key: JvmMetadataKey, value: T) { findValue(key) shouldBe value } /** * Asserts that this [Metadata] does NOT HAVE a value for the given [key]. */ -internal infix fun Metadata.shouldNotContain(key: FloggerMetadataKey) { +internal infix fun Metadata.shouldNotContain(key: JvmMetadataKey) { findValue(key).shouldBeNull() } /** * Asserts that this [Metadata] has one or more values for the given [key] */ -internal infix fun Metadata.shouldContain(key: FloggerMetadataKey) { +internal infix fun Metadata.shouldContain(key: JvmMetadataKey) { findValue(key).shouldNotBeNull() } /** * Asserts that this [Metadata] has a [key] to which only a single [value] is mapped. */ -internal fun Metadata.shouldUniquelyContain(key: FloggerMetadataKey, value: T) { +internal fun Metadata.shouldUniquelyContain(key: JvmMetadataKey, value: T) { findValue(key) shouldBe value val allKeys = (0.. getKey(i) }.toList() allKeys.indexOf(key) shouldBe allKeys.lastIndexOf(key) } -private fun Metadata.valuesOf(key: FloggerMetadataKey): List { +private fun Metadata.valuesOf(key: JvmMetadataKey): List { val values: MutableList = ArrayList() for (n in 0.. + interface Api : JvmApi /** * Logs at the given level with the fixed [DEFAULT_TIMESTAMP_NANOS]. diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/given/FakeLogSite.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/given/FakeLogSite.kt similarity index 94% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/given/FakeLogSite.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/given/FakeLogSite.kt index 5ffe80382..5697b11f9 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/given/FakeLogSite.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/given/FakeLogSite.kt @@ -24,14 +24,14 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.given +package io.spine.logging.jvm.given -import io.spine.logging.flogger.FloggerLogSite +import io.spine.logging.jvm.JvmLogSite import java.util.* import java.util.concurrent.atomic.AtomicInteger /** - * A simplified implementation of [FloggerLogSite] for testing. + * A simplified implementation of [JvmLogSite] for testing. * * @see Original Java code of Google Flogger */ @@ -40,7 +40,7 @@ class FakeLogSite( private val methodName: String, private val lineNumber: Int, private val sourcePath: String? -) : FloggerLogSite() { +) : JvmLogSite() { companion object { private const val LOGGING_CLASS = "com.example.ClassName" diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/given/FormattingBackend.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/given/FormattingBackend.kt similarity index 95% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/given/FormattingBackend.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/given/FormattingBackend.kt index 2175a7d19..29d76ba37 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/given/FormattingBackend.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/given/FormattingBackend.kt @@ -24,10 +24,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.given +package io.spine.logging.jvm.given -import io.spine.logging.flogger.backend.LogData -import io.spine.logging.flogger.backend.LoggerBackend +import io.spine.logging.jvm.backend.LogData +import io.spine.logging.jvm.backend.LoggerBackend import java.util.* import java.util.logging.Level diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/given/LogDataAssertions.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/given/LogDataAssertions.kt similarity index 96% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/given/LogDataAssertions.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/given/LogDataAssertions.kt index 3da1004c1..c60aeade4 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/given/LogDataAssertions.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/given/LogDataAssertions.kt @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.given +package io.spine.logging.jvm.given -import io.spine.logging.flogger.backend.LogData +import io.spine.logging.jvm.backend.LogData import io.kotest.matchers.collections.shouldContainExactly import io.kotest.matchers.shouldBe diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/given/MemoizingKvHandler.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/given/MemoizingKvHandler.kt similarity index 89% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/given/MemoizingKvHandler.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/given/MemoizingKvHandler.kt index 4af386119..76274694c 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/given/MemoizingKvHandler.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/given/MemoizingKvHandler.kt @@ -24,14 +24,14 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.given +package io.spine.logging.jvm.given -import io.spine.logging.flogger.FloggerMetadataKey +import io.spine.logging.jvm.JvmMetadataKey /** * Remembers all handled key/value pairs. */ -internal class MemoizingKvHandler : FloggerMetadataKey.KeyValueHandler { +internal class MemoizingKvHandler : JvmMetadataKey.KeyValueHandler { val entries = ArrayList() diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parameter/ParameterSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parameter/ParameterSpec.kt similarity index 96% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parameter/ParameterSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parameter/ParameterSpec.kt index 09adf63e7..6f4c4775e 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parameter/ParameterSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parameter/ParameterSpec.kt @@ -24,9 +24,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parameter +package io.spine.logging.jvm.parameter -import io.spine.logging.flogger.backend.FormatOptions +import io.spine.logging.jvm.backend.FormatOptions import io.kotest.matchers.shouldBe import io.kotest.matchers.types.shouldBeSameInstanceAs import org.junit.jupiter.api.DisplayName diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parameter/SimpleParameterSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parameter/SimpleParameterSpec.kt similarity index 88% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parameter/SimpleParameterSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parameter/SimpleParameterSpec.kt index e4b2d2fb6..4b1f5fc93 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parameter/SimpleParameterSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parameter/SimpleParameterSpec.kt @@ -24,18 +24,18 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parameter +package io.spine.logging.jvm.parameter -import io.spine.logging.flogger.backend.FormatChar -import io.spine.logging.flogger.backend.FormatOptions +import io.spine.logging.jvm.backend.FormatChar +import io.spine.logging.jvm.backend.FormatOptions import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test -import io.spine.logging.flogger.backend.FormatChar.DECIMAL -import io.spine.logging.flogger.backend.FormatChar.FLOAT -import io.spine.logging.flogger.backend.FormatChar.HEX -import io.spine.logging.flogger.backend.FormatChar.STRING -import io.spine.logging.flogger.parameter.SimpleParameter.buildFormatString -import io.spine.logging.flogger.parser.ParseException +import io.spine.logging.jvm.backend.FormatChar.DECIMAL +import io.spine.logging.jvm.backend.FormatChar.FLOAT +import io.spine.logging.jvm.backend.FormatChar.HEX +import io.spine.logging.jvm.backend.FormatChar.STRING +import io.spine.logging.jvm.parameter.SimpleParameter.buildFormatString +import io.spine.logging.jvm.parser.ParseException import io.kotest.matchers.shouldBe import io.kotest.matchers.types.shouldBeSameInstanceAs import io.kotest.matchers.types.shouldNotBeSameInstanceAs diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parser/BraceStyleMessageParserSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parser/BraceStyleMessageParserSpec.kt similarity index 95% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parser/BraceStyleMessageParserSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parser/BraceStyleMessageParserSpec.kt index 53cadb205..1b33589af 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parser/BraceStyleMessageParserSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parser/BraceStyleMessageParserSpec.kt @@ -24,12 +24,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parser +package io.spine.logging.jvm.parser -import io.spine.logging.flogger.parser.BraceStyleMessageParser.nextBraceFormatTerm -import io.spine.logging.flogger.parser.given.FakeParameter -import io.spine.logging.flogger.parser.given.assertParse -import io.spine.logging.flogger.parser.given.assertParseError +import io.spine.logging.jvm.parser.BraceStyleMessageParser.nextBraceFormatTerm +import io.spine.logging.jvm.parser.given.FakeParameter +import io.spine.logging.jvm.parser.given.assertParse +import io.spine.logging.jvm.parser.given.assertParseError import io.kotest.matchers.shouldBe import io.kotest.matchers.string.shouldContain import org.junit.jupiter.api.DisplayName diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parser/DefaultBraceStyleMessageParserSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parser/DefaultBraceStyleMessageParserSpec.kt similarity index 88% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parser/DefaultBraceStyleMessageParserSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parser/DefaultBraceStyleMessageParserSpec.kt index 9bbd2cbea..98bb96eac 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parser/DefaultBraceStyleMessageParserSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parser/DefaultBraceStyleMessageParserSpec.kt @@ -24,14 +24,14 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parser +package io.spine.logging.jvm.parser -import io.spine.logging.flogger.backend.FormatChar -import io.spine.logging.flogger.backend.FormatOptions -import io.spine.logging.flogger.backend.FormatOptions.FLAG_SHOW_GROUPING -import io.spine.logging.flogger.backend.FormatOptions.UNSET -import io.spine.logging.flogger.parser.given.MemoizingMessageBuilder -import io.spine.logging.flogger.parser.given.MemoizingParameterVisitor +import io.spine.logging.jvm.backend.FormatChar +import io.spine.logging.jvm.backend.FormatOptions +import io.spine.logging.jvm.backend.FormatOptions.FLAG_SHOW_GROUPING +import io.spine.logging.jvm.backend.FormatOptions.UNSET +import io.spine.logging.jvm.parser.given.MemoizingMessageBuilder +import io.spine.logging.jvm.parser.given.MemoizingParameterVisitor import io.kotest.matchers.shouldBe import io.kotest.matchers.string.shouldContain import org.junit.jupiter.api.DisplayName diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parser/DefaultPrintfMessageParserSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parser/DefaultPrintfMessageParserSpec.kt similarity index 93% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parser/DefaultPrintfMessageParserSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parser/DefaultPrintfMessageParserSpec.kt index a8d357a46..3ef45d422 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parser/DefaultPrintfMessageParserSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parser/DefaultPrintfMessageParserSpec.kt @@ -24,11 +24,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parser +package io.spine.logging.jvm.parser -import io.spine.logging.flogger.backend.FormatChar -import io.spine.logging.flogger.parser.given.MemoizingMessageBuilder -import io.spine.logging.flogger.parser.given.MemoizingParameterVisitor +import io.spine.logging.jvm.backend.FormatChar +import io.spine.logging.jvm.parser.given.MemoizingMessageBuilder +import io.spine.logging.jvm.parser.given.MemoizingParameterVisitor import io.kotest.matchers.shouldBe import io.kotest.matchers.string.shouldContain import org.junit.jupiter.api.DisplayName diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parser/PrintfMessageParserSpec.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parser/PrintfMessageParserSpec.kt similarity index 95% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parser/PrintfMessageParserSpec.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parser/PrintfMessageParserSpec.kt index 30ef32ac3..89f1a6ea4 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parser/PrintfMessageParserSpec.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parser/PrintfMessageParserSpec.kt @@ -24,12 +24,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parser +package io.spine.logging.jvm.parser -import io.spine.logging.flogger.parser.PrintfMessageParser.nextPrintfTerm -import io.spine.logging.flogger.parser.given.FakeParameter -import io.spine.logging.flogger.parser.given.assertParse -import io.spine.logging.flogger.parser.given.assertParseError +import io.spine.logging.jvm.parser.PrintfMessageParser.nextPrintfTerm +import io.spine.logging.jvm.parser.given.FakeParameter +import io.spine.logging.jvm.parser.given.assertParse +import io.spine.logging.jvm.parser.given.assertParseError import io.kotest.matchers.collections.shouldBeIn import io.kotest.matchers.shouldBe diff --git a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parser/given/ParserTestEnv.kt b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parser/given/ParserTestEnv.kt similarity index 90% rename from flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parser/given/ParserTestEnv.kt rename to flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parser/given/ParserTestEnv.kt index 2b57791b7..1e0abe4c8 100644 --- a/flogger/middleware/src/test/kotlin/io/spine/logging/flogger/parser/given/ParserTestEnv.kt +++ b/flogger/middleware/src/test/kotlin/io/spine/logging/jvm/parser/given/ParserTestEnv.kt @@ -24,17 +24,17 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.logging.flogger.parser.given - -import io.spine.logging.flogger.backend.FormatChar -import io.spine.logging.flogger.backend.FormatOptions -import io.spine.logging.flogger.backend.TemplateContext -import io.spine.logging.flogger.parameter.DateTimeFormat -import io.spine.logging.flogger.parameter.Parameter -import io.spine.logging.flogger.parameter.ParameterVisitor -import io.spine.logging.flogger.parser.MessageBuilder -import io.spine.logging.flogger.parser.MessageParser -import io.spine.logging.flogger.parser.ParseException +package io.spine.logging.jvm.parser.given + +import io.spine.logging.jvm.backend.FormatChar +import io.spine.logging.jvm.backend.FormatOptions +import io.spine.logging.jvm.backend.TemplateContext +import io.spine.logging.jvm.parameter.DateTimeFormat +import io.spine.logging.jvm.parameter.Parameter +import io.spine.logging.jvm.parameter.ParameterVisitor +import io.spine.logging.jvm.parser.MessageBuilder +import io.spine.logging.jvm.parser.MessageParser +import io.spine.logging.jvm.parser.ParseException import io.kotest.matchers.collections.shouldContainExactly import io.kotest.matchers.string.shouldContain import kotlin.properties.Delegates.notNull diff --git a/flogger/platform-generator/src/main/java/io/spine/logging/backend/generator/PlatformProviderGenerator.java b/flogger/platform-generator/src/main/java/io/spine/logging/backend/generator/PlatformProviderGenerator.java index 3e8056125..21f000abb 100644 --- a/flogger/platform-generator/src/main/java/io/spine/logging/backend/generator/PlatformProviderGenerator.java +++ b/flogger/platform-generator/src/main/java/io/spine/logging/backend/generator/PlatformProviderGenerator.java @@ -60,7 +60,7 @@ /** * Generates {@code PlatformProvider} class from scratch. * - *

      The generated class discovers {@code io.spine.logging.flogger.backend.Platform} + *

      The generated class discovers {@code io.spine.logging.jvm.backend.Platform} * implementations, and creates their instances. * *

      This generator is necessary to create a class, which explicitly @@ -83,7 +83,7 @@ public final class PlatformProviderGenerator { private static final String[] PLATFORM_CLASSES = { - "Lio/spine/logging/flogger/backend/system/DefaultPlatform;", + "Lio/spine/logging/jvm/backend/system/DefaultPlatform;", }; /** @@ -99,7 +99,7 @@ public static void main(String[] args) throws IOException { classWriter.visit( V1_6, ACC_PUBLIC + ACC_FINAL + ACC_SUPER, - "io/spine/logging/flogger/backend/PlatformProvider", + "io/spine/logging/jvm/backend/PlatformProvider", null, "java/lang/Object", null) @@ -118,7 +118,7 @@ public static void main(String[] args) throws IOException { methodVisitor = classWriter.visitMethod( ACC_PUBLIC + ACC_STATIC, "getPlatform", - "()Lio/spine/logging/flogger/backend/Platform;", + "()Lio/spine/logging/jvm/backend/Platform;", null, null ); @@ -141,7 +141,7 @@ public static void main(String[] args) throws IOException { var path = Paths.get(args[0]); Files.createDirectories(path.getParent()); try (var jar = new JarOutputStream(newOutputStream(path, StandardOpenOption.CREATE_NEW))) { - var entry = new ZipEntry("io/spine/logging/flogger/backend/PlatformProvider.class"); + var entry = new ZipEntry("io/spine/logging/jvm/backend/PlatformProvider.class"); // Clear timestamp to ensure JAR is deterministic for build cache. entry.setTime(0); jar.putNextEntry(entry); @@ -231,7 +231,7 @@ the class not being present. "newInstance", "([Ljava/lang/Object;)Ljava/lang/Object;", false); - methodVisitor.visitTypeInsn(CHECKCAST, "io/spine/logging/flogger/backend/Platform"); + methodVisitor.visitTypeInsn(CHECKCAST, "io/spine/logging/jvm/backend/Platform"); methodVisitor.visitLabel(endLabel); methodVisitor.visitInsn(ARETURN); diff --git a/logging/src/jvmMain/kotlin/io/spine/logging/JvmLogger.kt b/logging/src/jvmMain/kotlin/io/spine/logging/JvmLogger.kt index b371fec7d..561a7182d 100644 --- a/logging/src/jvmMain/kotlin/io/spine/logging/JvmLogger.kt +++ b/logging/src/jvmMain/kotlin/io/spine/logging/JvmLogger.kt @@ -26,10 +26,10 @@ package io.spine.logging -import io.spine.logging.flogger.FluentLogger2 -import io.spine.logging.flogger.FloggerLogSites.callerOf +import io.spine.logging.jvm.FluentLogger2 +import io.spine.logging.jvm.JvmLogSites.callerOf import com.google.errorprone.annotations.CheckReturnValue -import io.spine.logging.flogger.FloggerLogSite +import io.spine.logging.jvm.JvmLogSite import kotlin.reflect.KClass import kotlin.time.DurationUnit import kotlin.time.toTimeUnit @@ -159,20 +159,20 @@ public operator fun JLevel.compareTo(other: JLevel): Int = intValue().compareTo(other.intValue()) /** - * Converts this [LogSite] to Flogger's counterpart. + * Converts this [LogSite] to the JVM logging counterpart. */ -private fun LogSite.toFloggerSite(): FloggerLogSite { +private fun LogSite.toFloggerSite(): JvmLogSite { if (this == LogSite.INVALID) { - return FloggerLogSite.INVALID + return JvmLogSite.INVALID } - return object : FloggerLogSite() { + return object : JvmLogSite() { override fun getClassName(): String = this@toFloggerSite.className override fun getMethodName(): String = this@toFloggerSite.methodName override fun getLineNumber(): Int = this@toFloggerSite.lineNumber override fun getFileName(): String? = null override fun hashCode(): Int = this@toFloggerSite.hashCode() override fun equals(other: Any?): Boolean { - if (other !is FloggerLogSite) { + if (other !is JvmLogSite) { return false } return lineNumber == other.lineNumber && diff --git a/logging/src/jvmMain/kotlin/io/spine/logging/JvmMetadataKey.kt b/logging/src/jvmMain/kotlin/io/spine/logging/JvmMetadataKey.kt index 6a3d2fd4a..5242f7153 100644 --- a/logging/src/jvmMain/kotlin/io/spine/logging/JvmMetadataKey.kt +++ b/logging/src/jvmMain/kotlin/io/spine/logging/JvmMetadataKey.kt @@ -26,7 +26,7 @@ package io.spine.logging -import io.spine.logging.flogger.FloggerMetadataKey +import io.spine.logging.jvm.JvmMetadataKey as FloggerMetadataKey import kotlin.reflect.KClass import kotlin.reflect.cast diff --git a/logging/src/jvmMain/kotlin/io/spine/logging/LogSiteLookup.kt b/logging/src/jvmMain/kotlin/io/spine/logging/LogSiteLookup.kt index 59b6b3855..42353be2e 100644 --- a/logging/src/jvmMain/kotlin/io/spine/logging/LogSiteLookup.kt +++ b/logging/src/jvmMain/kotlin/io/spine/logging/LogSiteLookup.kt @@ -26,10 +26,10 @@ package io.spine.logging -import io.spine.logging.flogger.backend.Platform +import io.spine.logging.jvm.backend.Platform import kotlin.reflect.KClass -import io.spine.logging.flogger.FloggerLogSite -import io.spine.logging.flogger.FloggerLogSites +import io.spine.logging.jvm.JvmLogSite +import io.spine.logging.jvm.JvmLogSites /** * Determines log sites for the current line of code using Flogger utils. @@ -43,7 +43,7 @@ public actual object LogSiteLookup { * the [LogSite.INVALID] instance. */ public actual fun callerOf(loggingApi: KClass<*>): LogSite { - val floggerSite = FloggerLogSites.callerOf(loggingApi.java) + val floggerSite = JvmLogSites.callerOf(loggingApi.java) val logSite = floggerSite.toLogSite() return logSite } @@ -64,8 +64,8 @@ public actual object LogSiteLookup { } } -private fun FloggerLogSite.toLogSite(): LogSite { - if (this == FloggerLogSite.INVALID) { +private fun JvmLogSite.toLogSite(): LogSite { + if (this == JvmLogSite.INVALID) { return LogSite.INVALID } return InjectedLogSite( diff --git a/logging/src/jvmMain/kotlin/io/spine/logging/LoggingFactory.kt b/logging/src/jvmMain/kotlin/io/spine/logging/LoggingFactory.kt index bae8a45b0..883f74434 100644 --- a/logging/src/jvmMain/kotlin/io/spine/logging/LoggingFactory.kt +++ b/logging/src/jvmMain/kotlin/io/spine/logging/LoggingFactory.kt @@ -26,8 +26,8 @@ package io.spine.logging -import io.spine.logging.flogger.FluentLogger2 -import io.spine.logging.flogger.backend.Platform +import io.spine.logging.jvm.FluentLogger2 +import io.spine.logging.jvm.backend.Platform import io.spine.reflect.CallerFinder import kotlin.reflect.KClass diff --git a/logging/src/jvmMain/kotlin/io/spine/logging/context/LoggingContextFactory.kt b/logging/src/jvmMain/kotlin/io/spine/logging/context/LoggingContextFactory.kt index 3cb182f04..7ee2a3e7b 100644 --- a/logging/src/jvmMain/kotlin/io/spine/logging/context/LoggingContextFactory.kt +++ b/logging/src/jvmMain/kotlin/io/spine/logging/context/LoggingContextFactory.kt @@ -35,9 +35,9 @@ import io.spine.logging.toJavaLogging import io.spine.logging.toLevel import io.spine.logging.toLoggerName import kotlin.reflect.KClass -import io.spine.logging.flogger.context.ContextDataProvider as FContextDataProvider -import io.spine.logging.flogger.context.LogLevelMap as FLogLevelMap -import io.spine.logging.flogger.context.ScopedLoggingContext as FScopedLoggingContext +import io.spine.logging.jvm.context.ContextDataProvider as FContextDataProvider +import io.spine.logging.jvm.context.LogLevelMap as FLogLevelMap +import io.spine.logging.jvm.context.ScopedLoggingContext as FScopedLoggingContext /** * A JVM implementation of `LoggingContextFactory`. diff --git a/platforms/jvm-default-platform/src/main/java/io/spine/logging/backend/system/DefaultPlatform.java b/platforms/jvm-default-platform/src/main/java/io/spine/logging/backend/system/DefaultPlatform.java index 0c3427a3c..0e6c0f0b5 100644 --- a/platforms/jvm-default-platform/src/main/java/io/spine/logging/backend/system/DefaultPlatform.java +++ b/platforms/jvm-default-platform/src/main/java/io/spine/logging/backend/system/DefaultPlatform.java @@ -27,18 +27,18 @@ package io.spine.logging.backend.system; import io.spine.logging.backend.jul.JulBackendFactory; -import io.spine.logging.flogger.backend.BackendFactory; -import io.spine.logging.flogger.backend.Clock; -import io.spine.logging.flogger.backend.LoggerBackend; -import io.spine.logging.flogger.backend.Platform; -import io.spine.logging.flogger.context.ContextDataProvider; +import io.spine.logging.jvm.backend.BackendFactory; +import io.spine.logging.jvm.backend.Clock; +import io.spine.logging.jvm.backend.LoggerBackend; +import io.spine.logging.jvm.backend.Platform; +import io.spine.logging.jvm.context.ContextDataProvider; import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; import java.util.ServiceLoader; -import static io.spine.logging.flogger.util.StaticMethodCaller.getInstanceFromSystemProperty; +import static io.spine.logging.jvm.util.StaticMethodCaller.getInstanceFromSystemProperty; /** * The default logger platform for a server-side Java environment. diff --git a/platforms/jvm-default-platform/src/main/java/io/spine/logging/backend/system/StackBasedCallerFinder.java b/platforms/jvm-default-platform/src/main/java/io/spine/logging/backend/system/StackBasedCallerFinder.java index 86d34a67f..86d38dc23 100644 --- a/platforms/jvm-default-platform/src/main/java/io/spine/logging/backend/system/StackBasedCallerFinder.java +++ b/platforms/jvm-default-platform/src/main/java/io/spine/logging/backend/system/StackBasedCallerFinder.java @@ -26,10 +26,10 @@ package io.spine.logging.backend.system; -import io.spine.logging.flogger.AbstractLogger; -import io.spine.logging.flogger.FloggerLogSite; -import io.spine.logging.flogger.FloggerLogSites; -import io.spine.logging.flogger.backend.Platform.LogCallerFinder; +import io.spine.logging.jvm.AbstractLogger; +import io.spine.logging.jvm.JvmLogSite; +import io.spine.logging.jvm.JvmLogSites; +import io.spine.logging.jvm.backend.Platform.LogCallerFinder; import static io.spine.reflect.CallerFinder.findCallerOf; @@ -61,13 +61,13 @@ public String findLoggingClass(Class> loggerClass) { } @Override - public FloggerLogSite findLogSite(Class loggerApi, int stackFramesToSkip) { + public JvmLogSite findLogSite(Class loggerApi, int stackFramesToSkip) { // Skip an additional stack frame because we create the Throwable inside this method, not at // the point that this method was invoked (which allows completely alternate implementations // to avoid even constructing the Throwable instance). var caller = findCallerOf(loggerApi, stackFramesToSkip + 1); // Returns INVALID if "caller" is null (no caller found for given API class). - return FloggerLogSites.logSiteFrom(caller); + return JvmLogSites.logSiteFrom(caller); } @Override diff --git a/platforms/jvm-default-platform/src/main/java/io/spine/logging/backend/system/SystemClock.java b/platforms/jvm-default-platform/src/main/java/io/spine/logging/backend/system/SystemClock.java index 1990778d9..76d109b45 100644 --- a/platforms/jvm-default-platform/src/main/java/io/spine/logging/backend/system/SystemClock.java +++ b/platforms/jvm-default-platform/src/main/java/io/spine/logging/backend/system/SystemClock.java @@ -26,7 +26,7 @@ package io.spine.logging.backend.system; -import io.spine.logging.flogger.backend.Clock; +import io.spine.logging.jvm.backend.Clock; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/platforms/jvm-default-platform/src/test/kotlin/io/spine/logging/backend/system/DefaultPlatformSpec.kt b/platforms/jvm-default-platform/src/test/kotlin/io/spine/logging/backend/system/DefaultPlatformSpec.kt index c6d56a9c2..469a13cac 100644 --- a/platforms/jvm-default-platform/src/test/kotlin/io/spine/logging/backend/system/DefaultPlatformSpec.kt +++ b/platforms/jvm-default-platform/src/test/kotlin/io/spine/logging/backend/system/DefaultPlatformSpec.kt @@ -35,8 +35,8 @@ import io.spine.logging.backend.system.given.NoOpCallerFinder import io.spine.logging.backend.system.given.StubBackendFactoryService import io.spine.logging.backend.system.given.StubClockService import io.spine.logging.backend.system.given.StubContextDataProviderService -import io.spine.logging.flogger.backend.given.MemoizingLoggerBackend -import io.spine.logging.flogger.context.ContextDataProvider +import io.spine.logging.jvm.backend.given.MemoizingLoggerBackend +import io.spine.logging.jvm.context.ContextDataProvider import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test diff --git a/platforms/jvm-default-platform/src/test/kotlin/io/spine/logging/backend/system/given/DefaultPlatformTestEnv.kt b/platforms/jvm-default-platform/src/test/kotlin/io/spine/logging/backend/system/given/DefaultPlatformTestEnv.kt index f3c864fba..3d45f9fa8 100644 --- a/platforms/jvm-default-platform/src/test/kotlin/io/spine/logging/backend/system/given/DefaultPlatformTestEnv.kt +++ b/platforms/jvm-default-platform/src/test/kotlin/io/spine/logging/backend/system/given/DefaultPlatformTestEnv.kt @@ -26,13 +26,13 @@ package io.spine.logging.backend.system.given -import io.spine.logging.flogger.backend.BackendFactory -import io.spine.logging.flogger.backend.Clock -import io.spine.logging.flogger.AbstractLogger -import io.spine.logging.flogger.FloggerLogSite -import io.spine.logging.flogger.backend.LoggerBackend -import io.spine.logging.flogger.backend.Platform -import io.spine.logging.flogger.backend.given.MemoizingLoggerBackend +import io.spine.logging.jvm.backend.BackendFactory +import io.spine.logging.jvm.backend.Clock +import io.spine.logging.jvm.AbstractLogger +import io.spine.logging.jvm.JvmLogSite +import io.spine.logging.jvm.backend.LoggerBackend +import io.spine.logging.jvm.backend.Platform +import io.spine.logging.jvm.backend.given.MemoizingLoggerBackend /** * A primitive factory of [MemoizingLoggerBackend]. @@ -72,6 +72,6 @@ internal class NoOpCallerFinder : Platform.LogCallerFinder() { /** * Throws [IllegalStateException]. */ - override fun findLogSite(loggerApi: Class<*>?, stackFramesToSkip: Int): FloggerLogSite = + override fun findLogSite(loggerApi: Class<*>?, stackFramesToSkip: Int): JvmLogSite = throw UnsupportedOperationException() } diff --git a/platforms/jvm-default-platform/src/test/kotlin/io/spine/logging/backend/system/given/JavaServices.kt b/platforms/jvm-default-platform/src/test/kotlin/io/spine/logging/backend/system/given/JavaServices.kt index b0f2c1f4c..d2c81c4bc 100644 --- a/platforms/jvm-default-platform/src/test/kotlin/io/spine/logging/backend/system/given/JavaServices.kt +++ b/platforms/jvm-default-platform/src/test/kotlin/io/spine/logging/backend/system/given/JavaServices.kt @@ -27,11 +27,11 @@ package io.spine.logging.backend.system.given import com.google.auto.service.AutoService -import io.spine.logging.flogger.backend.LoggerBackend -import io.spine.logging.flogger.backend.BackendFactory -import io.spine.logging.flogger.backend.Clock -import io.spine.logging.flogger.context.ContextDataProvider -import io.spine.logging.flogger.context.ScopedLoggingContext +import io.spine.logging.jvm.backend.LoggerBackend +import io.spine.logging.jvm.backend.BackendFactory +import io.spine.logging.jvm.backend.Clock +import io.spine.logging.jvm.context.ContextDataProvider +import io.spine.logging.jvm.context.ScopedLoggingContext /** * This file contains Java services that are used to test how diff --git a/tests/jvm-jul-backend-std-context/src/test/kotlin/LogLevelMapITest.kt b/tests/jvm-jul-backend-std-context/src/test/kotlin/LogLevelMapITest.kt index 0f02c09ba..a85fdc782 100644 --- a/tests/jvm-jul-backend-std-context/src/test/kotlin/LogLevelMapITest.kt +++ b/tests/jvm-jul-backend-std-context/src/test/kotlin/LogLevelMapITest.kt @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import io.spine.logging.flogger.backend.Platform +import io.spine.logging.jvm.backend.Platform import io.kotest.matchers.shouldBe import io.spine.logging.backend.jul.JulBackendFactory import io.spine.logging.context.JulLogLevelMapTest diff --git a/tests/jvm-log4j2-backend-std-context/src/test/kotlin/LogLevelMapITest.kt b/tests/jvm-log4j2-backend-std-context/src/test/kotlin/LogLevelMapITest.kt index 219af4a4a..29f55abd7 100644 --- a/tests/jvm-log4j2-backend-std-context/src/test/kotlin/LogLevelMapITest.kt +++ b/tests/jvm-log4j2-backend-std-context/src/test/kotlin/LogLevelMapITest.kt @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import io.spine.logging.flogger.backend.Platform +import io.spine.logging.jvm.backend.Platform import io.kotest.matchers.shouldBe import io.spine.logging.Level import io.spine.logging.backend.log4j2.Log4j2BackendFactory