-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
JsonMarker#apply to use an Encoder on a scala object
- Loading branch information
Showing
2 changed files
with
46 additions
and
15 deletions.
There are no files selected for viewing
39 changes: 39 additions & 0 deletions
39
marker/src/main/scala/io/github/nafg/cloudlogging/marker/BasicMarker.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
package io.github.nafg.cloudlogging.marker | ||
|
||
import org.slf4j.Marker | ||
|
||
import java.util | ||
import scala.jdk.CollectionConverters._ | ||
|
||
// based on org.slf4j.helpers.BasicMarker | ||
private class BasicMarker(name: String, references: Seq[Marker]) | ||
extends Marker { | ||
override def getName: String = name | ||
override def add(reference: Marker): Unit = | ||
throw new UnsupportedOperationException | ||
override def hasReferences: Boolean = references.nonEmpty | ||
//noinspection ScalaDeprecation | ||
@deprecated override def hasChildren: Boolean = hasReferences | ||
override def iterator: util.Iterator[Marker] = references.iterator.asJava | ||
override def remove(referenceToRemove: Marker): Boolean = | ||
throw new UnsupportedOperationException | ||
override def contains(other: Marker): Boolean = | ||
this == other || references.exists(_.contains(other)) | ||
override def contains(name: String): Boolean = | ||
this.name == name || references.exists(_.contains(name)) | ||
override def equals(obj: AnyRef): Boolean = | ||
if (this eq obj) | ||
true | ||
else if (obj == null) | ||
false | ||
else | ||
obj match { | ||
case other: Marker => name == other.getName | ||
case _ => false | ||
} | ||
override def hashCode: Int = name.hashCode | ||
override def toString: String = | ||
getName + | ||
(if (!this.hasReferences) "" | ||
else " [ " + references.map(_.getName).mkString(", ") + " ]") | ||
} |
22 changes: 7 additions & 15 deletions
22
marker/src/main/scala/io/github/nafg/cloudlogging/marker/JsonMarker.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,12 @@ | ||
package io.github.nafg.cloudlogging.marker | ||
|
||
import scala.jdk.CollectionConverters._ | ||
|
||
import io.circe.Json | ||
import io.circe.{Encoder, Json} | ||
import org.slf4j.Marker | ||
|
||
|
||
case class JsonMarker(name: String, data: Json, references: Marker*) extends Marker { | ||
override def getName = name | ||
override def add(reference: Marker): Unit = throw new NotImplementedError | ||
override def remove(reference: Marker) = throw new NotImplementedError | ||
override def hasChildren = hasReferences | ||
override def hasReferences = references.nonEmpty | ||
override def iterator() = references.asJava.iterator() | ||
override def contains(other: Marker) = | ||
this == other || references.exists(_.contains(other)) | ||
override def contains(name: String) = | ||
this.name == name || references.exists(_.contains(name)) | ||
case class JsonMarker(name: String, data: Json, references: Marker*) | ||
extends BasicMarker(name, references) | ||
object JsonMarker { | ||
def apply[A: Encoder](name: String, | ||
references: Marker*)(data: A): JsonMarker = | ||
JsonMarker(name, Encoder[A].apply(data), references: _*) | ||
} |