Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;

import com.fasterxml.jackson.databind.JsonNode;
import tools.jackson.databind.JsonNode;
import com.typesafe.config.ConfigFactory;
import org.junit.Test;
import play.libs.ws.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

package play.libs.ws;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import tools.jackson.databind.JsonNode;
import tools.jackson.databind.ObjectMapper;

import java.io.IOException;
import tools.jackson.core.JacksonException;

/**
*
Expand All @@ -25,7 +25,7 @@ default BodyReadable<JsonNode> json(ObjectMapper objectMapper) {
// Jackson will automatically detect the correct encoding according to the rules in RFC-4627
try {
return objectMapper.readTree(response.getBody());
} catch(IOException e) {
} catch(JacksonException e) {
throw new RuntimeException("Error parsing JSON from WS response wsBody", e);
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
package play.libs.ws;

import org.apache.pekko.util.ByteString;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import tools.jackson.databind.JsonNode;
import tools.jackson.databind.ObjectMapper;

public interface JsonBodyWritables {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
package play.api.libs.ws

import org.apache.pekko.util.ByteString
import com.fasterxml.jackson.databind.JsonNode
import com.fasterxml.jackson.databind.ObjectMapper
import tools.jackson.databind.JsonNode
import tools.jackson.databind.ObjectMapper
import play.api.libs.json.JsValue
import play.api.libs.json.Json

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package play.libs.ws

import com.fasterxml.jackson.databind.ObjectMapper
import tools.jackson.databind.ObjectMapper

object DefaultObjectMapper {
def instance(): ObjectMapper = play.api.libs.json.jackson.JacksonJson.get.mapper()
Expand Down
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import sbt._
object Dependencies {

val scala213Version = "2.13.18"
val scala33LTSVersion = "3.3.8"
val scala33LTSVersion = "3.3.9"
val scala39LTSVersion = "3.9.0"
val scala3NextVersion = "3.10.0-RC3"

Expand Down Expand Up @@ -38,7 +38,7 @@ object Dependencies {

val junitInterface = Seq("com.github.sbt" % "junit-interface" % "0.13.3")

val playJson = Seq("org.playframework" %% "play-json" % "3.1.0-M10+108-69160600-SNAPSHOT")
val playJson = Seq("org.playframework" %% "play-json" % "3.1.0-M10+120-a3cbc9e1-SNAPSHOT")

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ To be replaced with a released version (or at least a publicly available one) ; requires playframework/play-json#1268


val slf4jApi = Seq("org.slf4j" % "slf4j-api" % "2.0.20")

Expand Down
Loading