From c6e0be38bb68e80a217b3704219c456e1fd83c28 Mon Sep 17 00:00:00 2001 From: Peter Lawrey Date: Thu, 29 Feb 2024 20:02:51 +0000 Subject: [PATCH] Support copying between yaml and json --- .../chronicle/wire/WireTypeConverter.java | 8 -- .../wire/WireTypeConverterWithTuplesTest.java | 76 ------------------- 2 files changed, 84 deletions(-) delete mode 100644 src/test/java/net/openhft/chronicle/wire/WireTypeConverterWithTuplesTest.java diff --git a/src/main/java/net/openhft/chronicle/wire/WireTypeConverter.java b/src/main/java/net/openhft/chronicle/wire/WireTypeConverter.java index 520741424..c34beefc5 100644 --- a/src/main/java/net/openhft/chronicle/wire/WireTypeConverter.java +++ b/src/main/java/net/openhft/chronicle/wire/WireTypeConverter.java @@ -18,14 +18,6 @@ public CharSequence yamlToJson(CharSequence yaml) { return delegate.yamlToJson(yaml); } - public void generateTuples(boolean generateTuples) { - delegate.generateTuples(generateTuples); - } - - public boolean generateTuples() { - return delegate.generateTuples(); - } - public void addAlias(Class newClass, String oldTypeName) { delegate.addAlias(newClass, oldTypeName); } diff --git a/src/test/java/net/openhft/chronicle/wire/WireTypeConverterWithTuplesTest.java b/src/test/java/net/openhft/chronicle/wire/WireTypeConverterWithTuplesTest.java deleted file mode 100644 index c1f2442c1..000000000 --- a/src/test/java/net/openhft/chronicle/wire/WireTypeConverterWithTuplesTest.java +++ /dev/null @@ -1,76 +0,0 @@ -package net.openhft.chronicle.wire; - -import org.junit.Test; - -import static org.junit.Assert.assertEquals; - -public class WireTypeConverterWithTuplesTest { //extends WireTestCommon { - @Test - public void fromYamlToJsonAndBackToYaml() { - WireTypeConverter wireTypeConverter = new WireTypeConverter(); - wireTypeConverter.generateTuples(true); - String originalYaml = "!ChronicleServicesCfg {\n" + - " queues: {\n" + - " in: {\n" + - " path: tmp/benchmark/in\n" + - " },\n" + - " sender-one-out: {\n" + - " path: tmp/benchmark/sender-one-out,\n" + - " builder: !SingleChronicleQueueBuilder {\n" + - " useSparseFiles: true,\n" + - " rollCycle: HUGE_DAILY\n" + - " }\n" + - " },\n" + - " sender-two-out: {\n" + - " path: tmp/benchmark/sender-two-out,\n" + - " builder: !SingleChronicleQueueBuilder {\n" + - " useSparseFiles: true,\n" + - " rollCycle: HUGE_DAILY\n" + - " }\n" + - " },\n" + - " sender-three-out: {\n" + - " path: tmp/benchmark/sender-three-out,\n" + - " builder: !SingleChronicleQueueBuilder {\n" + - " useSparseFiles: true,\n" + - " rollCycle: HUGE_DAILY\n" + - " }\n" + - " },\n" + - " receiver-out: {\n" + - " path: tmp/benchmark/receiver-out\n" + - " }\n" + - " },\n" + - " services: {\n" + - " sender-one: {\n" + - " inputs: [\n" + - " in\n" + - " ],\n" + - " output: sender-one-out,\n" + - " startFromStrategy: $property.name,\n" + - " affinityCpu: any,\n" + - " pretouchMS: 100,\n" + - " serviceConfig: {\n" + - " param: !CustomClass1 {\n" + - " param2: value\n" + - " }\n" + - " }\n" + - " }\n" + - " }\n" + - "}\n"; - - CharSequence json = wireTypeConverter.yamlToJson(originalYaml); - assertEquals(json, - "{\"@ChronicleServicesCfg\":{" + - "\"queues\":{" + - "\"in\":{\"path\":\"tmp/benchmark/in\"}," + - "\"sender-one-out\":{\"@SingleChronicleQueueBuilder\":{\"path\":\"tmp/benchmark/sender-one-out\",\"builder\":{\"useSparseFiles\":\"true\",\"rollCycle\":\"HUGE_DAILY\"}}}," + - "\"sender-two-out\":{\"@SingleChronicleQueueBuilder\":{\"path\":\"tmp/benchmark/sender-two-out\",\"builder\":{\"useSparseFiles\":\"true\",\"rollCycle\":\"HUGE_DAILY\"}}}," + - "\"sender-three-out\":{\"@SingleChronicleQueueBuilder\":{\"path\":\"tmp/benchmark/sender-three-out\",\"builder\":{\"useSparseFiles\":\"true\",\"rollCycle\":\"HUGE_DAILY\"}}}," + - "\"receiver-out\":{\"path\":\"tmp/benchmark/receiver-out\"}}," + - "\"services\":{" + - "\"sender-one\":{\"inputs\":[\"in\"],\"output\":\"sender-one-out\",\"startFromStrategy\":\"$property.name\",\"affinityCpu\":\"any\",\"pretouchMS\":100,\"serviceConfig\":{\"@!CustomClass1\":{\"param\":{\"param2\":\"value\"}}}}}}}"); - - CharSequence yamlFromJson = wireTypeConverter.jsonToYaml(json.toString()); - - assertEquals(originalYaml, yamlFromJson.toString()); - } -}