From bf0a57d7633ed41649b92f4853fc20437a02965c Mon Sep 17 00:00:00 2001 From: Sylvain Wallez Date: Fri, 21 Feb 2025 13:02:55 +0100 Subject: [PATCH] Run tests in non-strict JSON mode, like real applications (#942) --- .../clients/json/JsonpMappingExceptionTest.java | 2 +- .../elastic/clients/testkit/ModelTestCase.java | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/java-client/src/test/java/co/elastic/clients/json/JsonpMappingExceptionTest.java b/java-client/src/test/java/co/elastic/clients/json/JsonpMappingExceptionTest.java index e719d0793..0354e22a1 100644 --- a/java-client/src/test/java/co/elastic/clients/json/JsonpMappingExceptionTest.java +++ b/java-client/src/test/java/co/elastic/clients/json/JsonpMappingExceptionTest.java @@ -98,7 +98,7 @@ public void testLookAhead() { // Unknown field 'baz' (JSON path: properties['foo-bar'].baz) (...line no=1, column no=36, offset=35) JsonpMappingException e = assertThrows(JsonpMappingException.class, () -> { - fromJson(json, TypeMapping.class); + fromJson(json, TypeMapping.class, SimpleJsonpMapper.INSTANCE_REJECT_UNKNOWN_FIELDS); }); // Check escaping of non identifier path elements and path from map elements diff --git a/java-client/src/test/java/co/elastic/clients/testkit/ModelTestCase.java b/java-client/src/test/java/co/elastic/clients/testkit/ModelTestCase.java index 690ddad52..7d6cdbbb2 100644 --- a/java-client/src/test/java/co/elastic/clients/testkit/ModelTestCase.java +++ b/java-client/src/test/java/co/elastic/clients/testkit/ModelTestCase.java @@ -58,25 +58,15 @@ private static JsonpMapper createMapper(JsonImpl jsonImpl, int rand) { switch(jsonImpl) { case Jsonb: System.out.println("Using a JsonB mapper (rand = " + rand + ")."); - return new JsonbJsonpMapper() { - @Override - public boolean ignoreUnknownFields() { - return false; - } - }; + return new JsonbJsonpMapper(); case Jackson: System.out.println("Using a Jackson mapper (rand = " + rand + ")."); - return new JacksonJsonpMapper() { - @Override - public boolean ignoreUnknownFields() { - return false; - } - }; + return new JacksonJsonpMapper(); default: System.out.println("Using a simple mapper (rand = " + rand + ")."); - return SimpleJsonpMapper.INSTANCE_REJECT_UNKNOWN_FIELDS; + return SimpleJsonpMapper.INSTANCE; } }