Move objectNodeSetAll to companion object

Resolves binary compat issue.
circe · Dec 16, 2019 · e4643b9 · e4643b9
1 parent cd1c26d
commit e4643b9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/210/src/main/scala/io/circe/jackson/JacksonCompat.scala b/210/src/main/scala/io/circe/jackson/JacksonCompat.scala
@@ -12,7 +12,9 @@ private[jackson] trait JacksonCompat {
     parser: JsonParser
   ): Unit =
     context.handleUnexpectedToken(klass, parser)
+}
 
-  protected def objectNodeSetAll(node: ObjectNode, fields: java.util.Map[String, JsonNode]): JsonNode =
+private[jackson] object JacksonCompat {
+  def objectNodeSetAll(node: ObjectNode, fields: java.util.Map[String, JsonNode]): JsonNode =
     node.setAll[JsonNode](fields)
 }
diff --git a/25/src/main/scala/io/circe/jackson/JacksonCompat.scala b/25/src/main/scala/io/circe/jackson/JacksonCompat.scala
@@ -12,7 +12,9 @@ private[jackson] trait JacksonCompat {
     parser: JsonParser
   ): Unit =
     throw context.mappingException(klass)
+}
 
-  protected def objectNodeSetAll(node: ObjectNode, fields: java.util.Map[String, JsonNode]): JsonNode =
+private[jackson] object JacksonCompat {
+  def objectNodeSetAll(node: ObjectNode, fields: java.util.Map[String, JsonNode]): JsonNode =
     node.setAll(fields)
 }
diff --git a/27/src/main/scala/io/circe/jackson/JacksonCompat.scala b/27/src/main/scala/io/circe/jackson/JacksonCompat.scala
@@ -12,7 +12,9 @@ private[jackson] trait JacksonCompat {
     parser: JsonParser
   ): Unit =
     throw context.mappingException(klass)
+}
 
-  protected def objectNodeSetAll(node: ObjectNode, fields: java.util.Map[String, JsonNode]): JsonNode =
+private[jackson] object JacksonCompat {
+  def objectNodeSetAll(node: ObjectNode, fields: java.util.Map[String, JsonNode]): JsonNode =
     node.setAll(fields)
 }
diff --git a/28/src/main/scala/io/circe/jackson/JacksonCompat.scala b/28/src/main/scala/io/circe/jackson/JacksonCompat.scala
@@ -12,7 +12,9 @@ private[jackson] trait JacksonCompat {
     parser: JsonParser
   ): Unit =
     context.handleUnexpectedToken(klass, parser)
+}
 
-  protected def objectNodeSetAll(node: ObjectNode, fields: java.util.Map[String, JsonNode]): JsonNode =
+private[jackson] object JacksonCompat {
+  def objectNodeSetAll(node: ObjectNode, fields: java.util.Map[String, JsonNode]): JsonNode =
     node.setAll(fields)
 }
diff --git a/shared/src/main/scala/io/circe/jackson/package.scala b/shared/src/main/scala/io/circe/jackson/package.scala
@@ -72,7 +72,10 @@ package object jackson extends WithJacksonMapper with JacksonParser with Jackson
       },
     TextNode.valueOf(_),
     array => JsonNodeFactory.instance.arrayNode.addAll(array.map(circeToJackson).asJava),
-    obj => objectNodeSetAll(JsonNodeFactory.instance.objectNode, obj.toMap.mapValues(circeToJackson).asJava)
+    obj => JacksonCompat.objectNodeSetAll(
+      JsonNodeFactory.instance.objectNode,
+      obj.toMap.mapValues(circeToJackson).asJava
+    )
   )
 
   /**