Collapsed YamlValues to object only

losizm · Jan 13, 2024 · 1551c43 · 1551c43
1 parent cf066e6
commit 1551c43
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/main/scala/shampoo/yaml/YamlMappingImpl.scala b/src/main/scala/shampoo/yaml/YamlMappingImpl.scala
@@ -17,6 +17,8 @@ package shampoo.yaml
 
 import scala.jdk.javaapi.CollectionConverters.asScala
 
+import YamlValues.*
+
 private class YamlMappingImpl(private[yaml] val value: JMap[String, AnyRef]) extends AbstractYamlMapping:
   val size = value.size()
 
@@ -30,6 +32,6 @@ private class YamlMappingImpl(private[yaml] val value: JMap[String, AnyRef]) ext
     wrap(getValue(key))
 
   private def getValue(key: String): AnyRef =
-    value.getOrDefault(key, "{[(<default>)]}") match
-      case "{[(<default>)]}" => throw new NoSuchElementException(key)
-      case value             => value
+    value.getOrDefault(key, "b4efcad99f60423a") match
+      case "b4efcad99f60423a" => throw new NoSuchElementException(key)
+      case value              => value
diff --git a/src/main/scala/shampoo/yaml/YamlNode.scala b/src/main/scala/shampoo/yaml/YamlNode.scala
@@ -701,6 +701,6 @@ private case class YamlTimestampImpl(value: Temporal) extends YamlTimestamp:
     case value: Instant        => value
     case _                     => throw DateTimeException(s"Cannot express ${value.getClass.getSimpleName} as OffsetDateTime")
 
-private abstract class AbstractYamlSequence extends YamlSequence with YamlValues
+private abstract class AbstractYamlSequence extends YamlSequence
 
-private abstract class AbstractYamlMapping extends YamlMapping with YamlValues
+private abstract class AbstractYamlMapping extends YamlMapping
diff --git a/src/main/scala/shampoo/yaml/YamlSequenceImpl.scala b/src/main/scala/shampoo/yaml/YamlSequenceImpl.scala
@@ -17,6 +17,8 @@ package shampoo.yaml
 
 import scala.jdk.javaapi.CollectionConverters.asScala
 
+import YamlValues.*
+
 private class YamlSequenceImpl(private[yaml] val value: JList[AnyRef]) extends AbstractYamlSequence:
   val size = value.size()
 

diff --git a/src/main/scala/shampoo/yaml/YamlValues.scala b/src/main/scala/shampoo/yaml/YamlValues.scala
@@ -22,7 +22,7 @@ import java.time.temporal.Temporal
 
 import scala.jdk.javaapi.CollectionConverters.asScala
 
-private transparent trait YamlValues:
+private object YamlValues:
   def wrap(value: AnyRef): YamlNode =
     value match
       case null                  => YamlNull
@@ -64,6 +64,3 @@ private transparent trait YamlValues:
 
   def valueOf(temporal: Temporal): Temporal =
     temporal
-
-
-private object YamlValues extends YamlValues