Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some IDEA inspections #211

Merged
merged 1 commit into from
Aug 15, 2023
Merged

Fix some IDEA inspections #211

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions appender/src/main/scala/io/github/nafg/cloudlogging/appender/CloudJsonLoggingAppender.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.github.nafg.cloudlogging.appender

import java.io.{PrintWriter, StringWriter}
import java.time.Instant
import java.util
import java.util.Collections

Expand All @@ -19,7 +20,7 @@ import org.slf4j.Marker


object CloudJsonLoggingAppender {
def severityFor(level: Level) =
private def severityFor(level: Level) =
level match {
case Level.TRACE | Level.DEBUG => Severity.DEBUG
case Level.INFO => Severity.INFO
Expand All @@ -28,13 +29,11 @@ object CloudJsonLoggingAppender {
case _ => Severity.DEFAULT
}

def someMap[A, B](entries: (A, Option[B])*): Map[A, B] =
private def someMap[A, B](entries: (A, Option[B])*): Map[A, B] =
entries.collect { case (k, Some(v)) => (k, v) }.toMap

def stack(
nullOrThrowProxy: IThrowableProxy,
refs: mutable.Set[IThrowableProxy]
): Option[util.Map[String, AnyRef]] =
private def stack(nullOrThrowProxy: IThrowableProxy,
refs: mutable.Set[IThrowableProxy]): Option[util.Map[String, AnyRef]] =
Option(nullOrThrowProxy).map { throwProxy =>
if (refs.contains(throwProxy))
someMap("circularRef" -> Some(throwProxy.toString: AnyRef)).asJava
Expand All @@ -52,14 +51,14 @@ object CloudJsonLoggingAppender {
}
}

object JsonToRaw extends Json.Folder[Any] {
override def onNull = null
override def onBoolean(value: Boolean) = value
override def onNumber(value: JsonNumber) = value.toDouble
override def onString(value: String) = value
override def onArray(value: Vector[Json]) =
private object JsonToRaw extends Json.Folder[Any] {
override def onNull: Null = null
override def onBoolean(value: Boolean): Boolean = value
override def onNumber(value: JsonNumber): Double = value.toDouble
override def onString(value: String): String = value
override def onArray(value: Vector[Json]): util.List[Any] =
value.map(_.foldWith[Any](JsonToRaw)).asJava
override def onObject(value: JsonObject) =
override def onObject(value: JsonObject): util.Map[String, Any] =
value.toMap.map { case (k, v) => (k, v.foldWith[Any](JsonToRaw)) }.asJava
}

Expand All @@ -79,10 +78,11 @@ object CloudJsonLoggingAppender {
m.getName
}

val legalNameChars = ('a' to 'z').toSet ++ ('A' to 'Z') ++ ('0' to '9') ++ Set('/', '_', '-', '.')
def legalizeNameChar(c: Char) = if (legalNameChars(c)) c else '-'
private val legalNameChars =
('a' to 'z').toSet ++ ('A' to 'Z') ++ ('0' to '9') ++ Set('/', '_', '-', '.')
private def legalizeNameChar(c: Char) = if (legalNameChars(c)) c else '-'

def logEntryFor(e: ILoggingEvent) = {
def logEntryFor(e: ILoggingEvent): LogEntry = {
val level = e.getLevel

val message =
Expand Down Expand Up @@ -138,7 +138,7 @@ object CloudJsonLoggingAppender {
LogEntry
.newBuilder(Payload.JsonPayload.of(payload.asJava))
.setLogName(e.getLoggerName.map(legalizeNameChar))
.setTimestamp(e.getTimeStamp)
.setTimestamp(Instant.ofEpochMilli(e.getTimeStamp))
.setSeverity(severityFor(level))
.setLabels(labels.asJava)
.build
Expand Down