Update Show instances to not show values

vlovgr · Jun 16, 2018 · b62a940 · b62a940
1 parent 8de5916
commit b62a940
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/modules/cats/shared/src/main/scala/ciris/cats/api/CirisInstancesForCats.scala b/modules/cats/shared/src/main/scala/ciris/cats/api/CirisInstancesForCats.scala
@@ -5,24 +5,16 @@ import ciris._
 
 trait CirisInstancesForCats {
   implicit def showConfigEntry[F[_], K, S, V](
-    implicit showK: Show[K],
-    showS: Show[F[Either[ConfigError, S]]],
-    showV: Show[F[Either[ConfigError, V]]]
+    implicit showKey: Show[K],
+    showKeyType: Show[ConfigKeyType[K]]
   ): Show[ConfigEntry[F, K, S, V]] = Show.show { entry =>
-    val key = showK.show(entry.key)
-    val keyType = showConfigKeyType[K].show(entry.keyType)
-    val sourceValue = showS.show(entry.sourceValue)
-    val value = showV.show(entry.value)
-
-    if (sourceValue == value) s"ConfigEntry($key, $keyType, $value)"
-    else s"ConfigEntry($key, $keyType, $sourceValue, $value)"
+    val key = showKey.show(entry.key)
+    val keyType = showKeyType.show(entry.keyType)
+    s"ConfigEntry($key, $keyType)"
   }
 
-  implicit def showConfigValue[F[_], V](
-    implicit show: Show[F[Either[ConfigError, V]]]
-  ): Show[ConfigValue[F, V]] = Show.show { value =>
-    s"ConfigValue(${show.show(value.value)})"
-  }
+  implicit def showConfigValue[F[_], V]: Show[ConfigValue[F, V]] =
+    Show.fromToString
 
   implicit val showConfigError: Show[ConfigError] =
     Show.fromToString

diff --git a/tests/shared/src/test/scala/ciris/cats/api/CirisInstancesForCatsSpec.scala b/tests/shared/src/test/scala/ciris/cats/api/CirisInstancesForCatsSpec.scala
@@ -21,7 +21,7 @@ final class CirisInstancesForCatsSpec extends PropertySpec {
               List(Right("123"))
             )
             .mapValue(_.toInt)
-        ) shouldBe "ConfigEntry(key, ConfigKeyType(keyType), List(Right(123)))"
+        ) shouldBe "ConfigEntry(key, ConfigKeyType(keyType))"
 
         Show[ConfigEntry[List, String, String, Int]].show(
           ConfigEntry
@@ -31,11 +31,13 @@ final class CirisInstancesForCatsSpec extends PropertySpec {
             List(Right("123"))
           )
             .mapValue(s => (s + "4").toInt)
-        ) shouldBe "ConfigEntry(key, ConfigKeyType(keyType), List(Right(123)), List(Right(1234)))"
+        ) shouldBe "ConfigEntry(key, ConfigKeyType(keyType))"
+
+        val configValue = ConfigValue.applyF[List, Int](List(right(123)))
 
         Show[ConfigValue[List, Int]].show(
-          ConfigValue.applyF[List, Int](List(right(123)))
-        ) shouldBe "ConfigValue(List(Right(123)))"
+          configValue
+        ) shouldBe configValue.toString
 
         Show[_root_.ciris.api.Id[Int]]
           .show(123) shouldBe "123"