From 31b26bc0f9c4fe36eb113d744dcc466628703d08 Mon Sep 17 00:00:00 2001 From: Mateusz Jonak Date: Thu, 23 Oct 2025 15:30:56 +0200 Subject: [PATCH] feat: use core type blue ids from blue-repository wip Update dependencies in build.gradle and change default Blue ID in Preprocessor.java tests: Enhance test logging in build.gradle and update sample Blue IDs in test resources --- build.gradle | 7 ++++++- .../java/blue/language/preprocess/Preprocessor.java | 2 +- src/main/java/blue/language/utils/Properties.java | 12 ++++++------ src/main/resources/transformation/DefaultBlue.blue | 12 ++++++------ .../language/mapping/NodeToObjectConverterTest.java | 6 +++--- .../provider/ClasspathBasedNodeProviderTest.java | 2 +- .../blue/language/utils/BlueIdCalculatorTest.java | 4 ++-- src/test/resources/samples/Hattori2.blue | 2 +- src/test/resources/samples/Hattori3.blue | 2 +- src/test/resources/samples/Person.blue | 2 +- 10 files changed, 28 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index 8b8d39f..a4a4f42 100644 --- a/build.gradle +++ b/build.gradle @@ -38,8 +38,9 @@ compileTestJava { dependencies { // JUnit Jupiter (JUnit 5) - testImplementation(platform("org.junit:junit-bom:5.9.1")) + testImplementation(platform("org.junit:junit-bom:5.10.2")) testImplementation("org.junit.jupiter:junit-jupiter") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") testImplementation("org.mockito:mockito-core:3.12.4") // Jackson @@ -62,6 +63,10 @@ test { junitXml.required = false html.required = true } + testLogging { + events 'PASSED', 'FAILED', 'SKIPPED' + showStandardStreams = true + } } ext.genResourcesDir = file("$buildDir/generated-resources") diff --git a/src/main/java/blue/language/preprocess/Preprocessor.java b/src/main/java/blue/language/preprocess/Preprocessor.java index 6e9c7ff..05a9b01 100644 --- a/src/main/java/blue/language/preprocess/Preprocessor.java +++ b/src/main/java/blue/language/preprocess/Preprocessor.java @@ -18,7 +18,7 @@ public class Preprocessor { - public static final String DEFAULT_BLUE_BLUE_ID = "FREHAAGDZSzpnoTUoCQ86bBmxbVCULMjvx9JZM6fyqT1"; + public static final String DEFAULT_BLUE_BLUE_ID = "5r24T2gs9no9mDhjgf4sD6j43JeYSwndXmyMz4H8wSMV"; private TransformationProcessorProvider processorProvider; private NodeProvider nodeProvider; diff --git a/src/main/java/blue/language/utils/Properties.java b/src/main/java/blue/language/utils/Properties.java index cd03def..21aef0e 100644 --- a/src/main/java/blue/language/utils/Properties.java +++ b/src/main/java/blue/language/utils/Properties.java @@ -31,12 +31,12 @@ public class Properties { Arrays.asList(TEXT_TYPE, DOUBLE_TYPE, INTEGER_TYPE, BOOLEAN_TYPE, LIST_TYPE, DICTIONARY_TYPE); - public static final String TEXT_TYPE_BLUE_ID = "F92yo19rCcbBoBSpUA5LRxpfDejJDAaP1PRxxbWAraVP"; - public static final String DOUBLE_TYPE_BLUE_ID = "68ryJtnmui4j5rCZWUnkZ3DChtmEb7Z9F8atn1mBSM3L"; - public static final String INTEGER_TYPE_BLUE_ID = "DHmxTkFbXePZHCHCYmQr2dSzcNLcryFVjXVHkdQrrZr8"; - public static final String BOOLEAN_TYPE_BLUE_ID = "EL6AjrbJsxTWRTPzY8WR8Y2zAMXRbydQj83PcZwuAHbo"; - public static final String LIST_TYPE_BLUE_ID = "G8wmfjEqugPEEXByMYWJXiEdbLToPRWNQEekNxrxfQWB"; - public static final String DICTIONARY_TYPE_BLUE_ID = "294NBTj2mFRL3RB4kDRUSckwGg7Kzj6T8CTAFeR1kcSA"; + public static final String TEXT_TYPE_BLUE_ID = "DLRQwz7MQeCrzjy9bohPNwtCxKEBbKaMK65KBrwjfG6K"; + public static final String DOUBLE_TYPE_BLUE_ID = "7pwXmXYCJtWnd348c2JQGBkm9C4renmZRwxbfaypsx5y"; + public static final String INTEGER_TYPE_BLUE_ID = "5WNMiV9Knz63B4dVY5JtMyh3FB4FSGqv7ceScvuapdE1"; + public static final String BOOLEAN_TYPE_BLUE_ID = "4EzhSubEimSQD3zrYHRtobfPPWntUuhEz8YcdxHsi12u"; + public static final String LIST_TYPE_BLUE_ID = "3MhWSaTRoPQidNkFJqRkYcFwNcAwYjLRTYu44Y5DeFh7"; + public static final String DICTIONARY_TYPE_BLUE_ID = "G7fBT9PSod1RfHLHkpafAGBDVAJMrMhAMY51ERcyXNrj"; public static final List BASIC_TYPE_BLUE_IDS = Arrays.asList(TEXT_TYPE_BLUE_ID, DOUBLE_TYPE_BLUE_ID, INTEGER_TYPE_BLUE_ID, BOOLEAN_TYPE_BLUE_ID); public static final List CORE_TYPE_BLUE_IDS = Arrays.asList(TEXT_TYPE_BLUE_ID, DOUBLE_TYPE_BLUE_ID, INTEGER_TYPE_BLUE_ID, BOOLEAN_TYPE_BLUE_ID, LIST_TYPE_BLUE_ID, DICTIONARY_TYPE_BLUE_ID); diff --git a/src/main/resources/transformation/DefaultBlue.blue b/src/main/resources/transformation/DefaultBlue.blue index d5d6bb0..3d5348a 100644 --- a/src/main/resources/transformation/DefaultBlue.blue +++ b/src/main/resources/transformation/DefaultBlue.blue @@ -1,11 +1,11 @@ - type: blueId: 27B7fuxQCS1VAptiCPc2RMkKoutP5qxkh3uDxZ7dr6Eo mappings: - Text: F92yo19rCcbBoBSpUA5LRxpfDejJDAaP1PRxxbWAraVP - Double: 68ryJtnmui4j5rCZWUnkZ3DChtmEb7Z9F8atn1mBSM3L - Integer: DHmxTkFbXePZHCHCYmQr2dSzcNLcryFVjXVHkdQrrZr8 - Boolean: EL6AjrbJsxTWRTPzY8WR8Y2zAMXRbydQj83PcZwuAHbo - List: G8wmfjEqugPEEXByMYWJXiEdbLToPRWNQEekNxrxfQWB - Dictionary: 294NBTj2mFRL3RB4kDRUSckwGg7Kzj6T8CTAFeR1kcSA + Text: DLRQwz7MQeCrzjy9bohPNwtCxKEBbKaMK65KBrwjfG6K + Double: 7pwXmXYCJtWnd348c2JQGBkm9C4renmZRwxbfaypsx5y + Integer: 5WNMiV9Knz63B4dVY5JtMyh3FB4FSGqv7ceScvuapdE1 + Boolean: 4EzhSubEimSQD3zrYHRtobfPPWntUuhEz8YcdxHsi12u + List: 3MhWSaTRoPQidNkFJqRkYcFwNcAwYjLRTYu44Y5DeFh7 + Dictionary: G7fBT9PSod1RfHLHkpafAGBDVAJMrMhAMY51ERcyXNrj - type: blueId: FGYuTXwaoSKfZmpTysLTLsb8WzSqf43384rKZDkXhxD4 diff --git a/src/test/java/blue/language/mapping/NodeToObjectConverterTest.java b/src/test/java/blue/language/mapping/NodeToObjectConverterTest.java index 5b433a7..6872786 100644 --- a/src/test/java/blue/language/mapping/NodeToObjectConverterTest.java +++ b/src/test/java/blue/language/mapping/NodeToObjectConverterTest.java @@ -480,19 +480,19 @@ public void testValueVariants() throws Exception { " blueId: PersonValue-BlueId\n" + "age1:\n" + " type:\n" + - " blueId: DHmxTkFbXePZHCHCYmQr2dSzcNLcryFVjXVHkdQrrZr8\n" + + " blueId: 5WNMiV9Knz63B4dVY5JtMyh3FB4FSGqv7ceScvuapdE1\n" + " name: Official Age\n" + " description: Description for official age\n" + " value: 25\n" + "age2:\n" + " type:\n" + - " blueId: DHmxTkFbXePZHCHCYmQr2dSzcNLcryFVjXVHkdQrrZr8\n" + + " blueId: 5WNMiV9Knz63B4dVY5JtMyh3FB4FSGqv7ceScvuapdE1\n" + " name: Official Age\n" + " description: Description for official age\n" + " value: 25\n" + "age3:\n" + " type:\n" + - " blueId: DHmxTkFbXePZHCHCYmQr2dSzcNLcryFVjXVHkdQrrZr8\n" + + " blueId: 5WNMiV9Knz63B4dVY5JtMyh3FB4FSGqv7ceScvuapdE1\n" + " name: Official Age\n" + " description: Description for official age\n" + " value: 25"; diff --git a/src/test/java/blue/language/provider/ClasspathBasedNodeProviderTest.java b/src/test/java/blue/language/provider/ClasspathBasedNodeProviderTest.java index a385fbd..c9149bc 100644 --- a/src/test/java/blue/language/provider/ClasspathBasedNodeProviderTest.java +++ b/src/test/java/blue/language/provider/ClasspathBasedNodeProviderTest.java @@ -20,7 +20,7 @@ void setUp() throws IOException { @Test void testFetchByBlueId() { - String knownBlueId = "8RTziohyZKuSMrybq9NfH1RroL91uwmAahV5KwfgiXKX"; + String knownBlueId = "7hSVRWdTCXpr4TKvf5dibF24vAxyqGuVERVrvgHrxzYs"; List nodes = provider.fetchByBlueId(knownBlueId); assertNotNull(nodes); assertFalse(nodes.isEmpty()); diff --git a/src/test/java/blue/language/utils/BlueIdCalculatorTest.java b/src/test/java/blue/language/utils/BlueIdCalculatorTest.java index 203f341..978f703 100644 --- a/src/test/java/blue/language/utils/BlueIdCalculatorTest.java +++ b/src/test/java/blue/language/utils/BlueIdCalculatorTest.java @@ -233,7 +233,7 @@ public void testMultilineText1() { Node node = YAML_MAPPER.readValue(yaml, Node.class); String blueId = BlueIdCalculator.calculateBlueId(node); - String json = "{\"text\":{\"type\":{\"blueId\":\"F92yo19rCcbBoBSpUA5LRxpfDejJDAaP1PRxxbWAraVP\"},\"value\":\"abc\\ndef\"}}"; + String json = "{\"text\":{\"type\":{\"blueId\":\"DLRQwz7MQeCrzjy9bohPNwtCxKEBbKaMK65KBrwjfG6K\"},\"value\":\"abc\\ndef\"}}"; Node node2 = JSON_MAPPER.readValue(json, Node.class); String blueId2 = BlueIdCalculator.calculateBlueId(node2); @@ -249,7 +249,7 @@ public void testMultilineText2() { Node node = YAML_MAPPER.readValue(yaml, Node.class); String blueId = BlueIdCalculator.calculateBlueId(node); - String json = "{\"text\":{\"type\":{\"blueId\":\"F92yo19rCcbBoBSpUA5LRxpfDejJDAaP1PRxxbWAraVP\"},\"value\":\"abc def\"}}\n"; + String json = "{\"text\":{\"type\":{\"blueId\":\"DLRQwz7MQeCrzjy9bohPNwtCxKEBbKaMK65KBrwjfG6K\"},\"value\":\"abc def\"}}\n"; Node node2 = JSON_MAPPER.readValue(json, Node.class); String blueId2 = BlueIdCalculator.calculateBlueId(node2); diff --git a/src/test/resources/samples/Hattori2.blue b/src/test/resources/samples/Hattori2.blue index f30dce9..570b89f 100644 --- a/src/test/resources/samples/Hattori2.blue +++ b/src/test/resources/samples/Hattori2.blue @@ -1,6 +1,6 @@ name: Celebrating Kill Bill Anniversary 2024 type: - blueId: 8RTziohyZKuSMrybq9NfH1RroL91uwmAahV5KwfgiXKX + blueId: 7hSVRWdTCXpr4TKvf5dibF24vAxyqGuVERVrvgHrxzYs availableMenuItems: appetizers: - SakuraSpringSalad: diff --git a/src/test/resources/samples/Hattori3.blue b/src/test/resources/samples/Hattori3.blue index 3bccbf5..ec45053 100644 --- a/src/test/resources/samples/Hattori3.blue +++ b/src/test/resources/samples/Hattori3.blue @@ -1,6 +1,6 @@ name: My Voucher type: name: Celebrating Kill Bill Anniversary 2024 - blueId: 76W6FPpv3mZxtT6mKjgQ7iDjJjHUsfq9LBeySNiPqFgF + blueId: Csue6YkqPiwPU8FbGctT8thc2GDv4QHZLzGKhcXDV1EJ serialNumber: 30902345235 purchaseDate: 2024-04-01 diff --git a/src/test/resources/samples/Person.blue b/src/test/resources/samples/Person.blue index 1e373b1..7a32b64 100644 --- a/src/test/resources/samples/Person.blue +++ b/src/test/resources/samples/Person.blue @@ -6,4 +6,4 @@ age: pets: type: name: Pet - blueId: 68Y1GazJSKJL1irezxJ3S4ZE7UCVXVswTRAhJf5RatK8 \ No newline at end of file + blueId: GwjPFDPV5Ay9tSrAjk8W8ENfRUuLJ9QC9kdNp48YAo9M \ No newline at end of file