diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 8d17e9c..d0878e0 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -4,4 +4,4 @@ # See: https://help.github.com/articles/about-codeowners/ # These owners will be the default owners for everything in the repo. -* @hasithaa @prakanth97 @SasinduDilshara +* @hasithaa @SasinduDilshara diff --git a/ballerina/tests/parse_string_union_test.bal b/ballerina/tests/parse_string_union_test.bal index bade260..33b2041 100644 --- a/ballerina/tests/parse_string_union_test.bal +++ b/ballerina/tests/parse_string_union_test.bal @@ -56,7 +56,7 @@ function testParseStringUnionTypes2() { S22|error a22 = parseString(s2); test:assertTrue(a22 is Error); - test:assertEquals(( a22).message(), "source value cannot convert into 'ballerina/data.xmldata:1:S22'"); + test:assertEquals(( a22).message(), "source value cannot be converted into 'ballerina/data.xmldata:1:S22'"); // https://github.com/ballerina-platform/ballerina-library/issues/6925 // S23|error a23 = parseString(s2); @@ -248,7 +248,7 @@ function testParseStringUnionTypes7() { S73|error a73 = parseString(s7); test:assertTrue(a73 is Error); - test:assertEquals((a73).message(), "field 'B' cannot convert into the type '(data.xmldata:record {| string @content; |}|string[])'"); + test:assertEquals((a73).message(), "field 'B' cannot be converted into the type '(data.xmldata:record {| string @content; |}|string[])'"); // //bug https://github.com/ballerina-platform/ballerina-library/issues/6907 // S74|error a74 = parseString(s7); diff --git a/ballerina/tests/parse_type_union_test.bal b/ballerina/tests/parse_type_union_test.bal index a5ca8d2..18992ee 100644 --- a/ballerina/tests/parse_type_union_test.bal +++ b/ballerina/tests/parse_type_union_test.bal @@ -56,7 +56,7 @@ function testTraverseUnionTypes2() { A22|error a22 = parseAsType(x2); test:assertTrue(a22 is Error); - test:assertEquals(( a22).message(), "source value cannot convert into 'ballerina/data.xmldata:1:A22'"); + test:assertEquals(( a22).message(), "source value cannot be converted into 'ballerina/data.xmldata:1:A22'"); // https://github.com/ballerina-platform/ballerina-library/issues/6925 // A23|error a23 = parseAsType(x2); @@ -247,7 +247,7 @@ function testTraverseUnionTypes7() { A73|error a73 = parseAsType(x7); test:assertTrue(a73 is Error); - test:assertEquals((a73).message(), "field 'B' cannot convert into the type '(data.xmldata:record {| string @content; |}|string[])'"); + test:assertEquals((a73).message(), "field 'B' cannot be converted into the type '(data.xmldata:record {| string @content; |}|string[])'"); // //bug https://github.com/ballerina-platform/ballerina-library/issues/6907 // A74|error a74 = parseAsType(x7); diff --git a/ballerina/tests/union_error_tests.bal b/ballerina/tests/union_error_tests.bal index acfc32f..ff7a5de 100644 --- a/ballerina/tests/union_error_tests.bal +++ b/ballerina/tests/union_error_tests.bal @@ -117,33 +117,33 @@ type G112 record { function testErrorUnion() { E1|error e1 = parseAsType(xe1); test:assertTrue(e1 is error); - test:assertEquals((e1).message(), "field '#content' cannot convert into the type '(boolean|int|decimal|data.xmldata:record {| anydata...; |})?'"); + test:assertEquals((e1).message(), "field '#content' cannot be converted into the type '(boolean|int|decimal|data.xmldata:record {| anydata...; |})?'"); E2|error e2 = parseAsType(xe2); test:assertTrue(e2 is error); - test:assertEquals((e2).message(), "field '#content' cannot convert into the type '(boolean|int|decimal|data.xmldata:record {| anydata...; |})?'"); + test:assertEquals((e2).message(), "field '#content' cannot be converted into the type '(boolean|int|decimal|data.xmldata:record {| anydata...; |})?'"); E22|error e22 = parseAsType(xe2); test:assertTrue(e22 is error); - test:assertEquals((e22).message(), "field 'B' cannot convert into the type '(data.xmldata:record {| (boolean|int|decimal|record {| anydata...; |})? #content; anydata...; |}|data.xmldata:record {| record {| int #content; anydata...; |} #content; anydata...; |})'"); + test:assertEquals((e22).message(), "field 'B' cannot be converted into the type '(data.xmldata:record {| (boolean|int|decimal|record {| anydata...; |})? #content; anydata...; |}|data.xmldata:record {| record {| int #content; anydata...; |} #content; anydata...; |})'"); E3|error e3 = parseAsType(xe3); test:assertTrue(e3 is error); - test:assertEquals((e3).message(), "field 'B' cannot convert into the type '(data.xmldata:record {| int #content; anydata...; |}|data.xmldata:record {| boolean #content; anydata...; |})[]'"); + test:assertEquals((e3).message(), "field 'B' cannot be converted into the type '(data.xmldata:record {| int #content; anydata...; |}|data.xmldata:record {| boolean #content; anydata...; |})[]'"); E32|error e32 = parseAsType(xe3); test:assertTrue(e32 is error); - test:assertEquals((e32).message(), "field 'B' cannot convert into the type '(data.xmldata:record {| int #content; anydata...; |}[]|data.xmldata:record {| boolean #content; anydata...; |}[])'"); + test:assertEquals((e32).message(), "field 'B' cannot be converted into the type '(data.xmldata:record {| int #content; anydata...; |}[]|data.xmldata:record {| boolean #content; anydata...; |}[])'"); E4|error e4 = parseAsType(xe4); test:assertTrue(e4 is error); - test:assertEquals((e4).message(), "field 'C' cannot convert into the type 'data.xmldata:E4P12[]'"); + test:assertEquals((e4).message(), "field 'C' cannot be converted into the type 'data.xmldata:E4P12[]'"); E42|error e42 = parseAsType(xe4); test:assertTrue(e42 is error); - test:assertEquals((e42).message(), "field 'C' cannot convert into the type 'ballerina/data.xmldata:1:E4P22'"); + test:assertEquals((e42).message(), "field 'C' cannot be converted into the type 'ballerina/data.xmldata:1:E4P22'"); E5|error e5 = parseAsType(xe5); test:assertTrue(e5 is error); - test:assertEquals((e5).message(), "field 'B' cannot convert into the type '(data.xmldata:F111|data.xmldata:F112)[]'"); + test:assertEquals((e5).message(), "field 'B' cannot be converted into the type '(data.xmldata:F111|data.xmldata:F112)[]'"); } diff --git a/native/src/main/java/io/ballerina/lib/data/xmldata/utils/DataUtils.java b/native/src/main/java/io/ballerina/lib/data/xmldata/utils/DataUtils.java index 4ac3fb0..0a8cd06 100644 --- a/native/src/main/java/io/ballerina/lib/data/xmldata/utils/DataUtils.java +++ b/native/src/main/java/io/ballerina/lib/data/xmldata/utils/DataUtils.java @@ -258,7 +258,6 @@ private static Object convertStringToUnionExpType(BString value, Type expType) { try { return convertStringToExpType(value, memberType); } catch (Exception ex) { - int a = 1; // ignore } } diff --git a/native/src/main/java/io/ballerina/lib/data/xmldata/xml/XmlTraversal.java b/native/src/main/java/io/ballerina/lib/data/xmldata/xml/XmlTraversal.java index 67063c1..0d1776f 100644 --- a/native/src/main/java/io/ballerina/lib/data/xmldata/xml/XmlTraversal.java +++ b/native/src/main/java/io/ballerina/lib/data/xmldata/xml/XmlTraversal.java @@ -93,21 +93,20 @@ public Object traverseXml(BXml xml, XmlAnalyzerData analyzerData, Type type) { Type referredType = TypeUtils.getReferredType(type); switch (referredType.getTag()) { case TypeTags.RECORD_TYPE_TAG -> { - return traverseXmlWithRecordAsExpectedType(xml, analyzerData, referredType); + return traverseXmlWithRecordAsExpectedType(xml, analyzerData, (RecordType) referredType); } case TypeTags.MAP_TAG -> { - return traverseXmlWithMapAsExpectedType(xml, referredType, analyzerData); + return traverseXmlWithMapAsExpectedType(xml, (MapType) referredType, analyzerData); } case TypeTags.UNION_TAG -> { - return traverseXmlToUnion(xml, analyzerData, referredType); + return traverseXmlToUnion(xml, analyzerData, (UnionType) referredType); } default -> throw DiagnosticLog.error(DiagnosticErrorCode.INVALID_TYPE, Constants.RECORD_OR_MAP, type); } } private Object traverseXmlWithRecordAsExpectedType(BXml xml, - XmlAnalyzerData analyzerData, Type referredType) { - RecordType recordType = (RecordType) referredType; + XmlAnalyzerData analyzerData, RecordType recordType) { currentNode = ValueCreator.createRecordValue(recordType.getPackage(), recordType.getName()); BXml nextXml = validateRootElement(xml, recordType, analyzerData); Object resultRecordValue = traverseXml(nextXml, recordType, analyzerData); @@ -115,15 +114,13 @@ private Object traverseXmlWithRecordAsExpectedType(BXml xml, return resultRecordValue; } - private Object traverseXmlWithMapAsExpectedType(BXml xml, Type referredType, XmlAnalyzerData analyzerData) { - MapType mapType = (MapType) referredType; + private Object traverseXmlWithMapAsExpectedType(BXml xml, MapType mapType, XmlAnalyzerData analyzerData) { RecordType anonRecType = TypeCreator.createRecordType(Constants.ANON_TYPE, mapType.getPackage(), 0, new HashMap<>(), mapType.getConstrainedType(), false, 0); return traverseXml(xml, analyzerData, anonRecType); } - private Object traverseXmlToUnion(BXml xml, XmlAnalyzerData options, Type type) { - UnionType unionType = (UnionType) type; + private Object traverseXmlToUnion(BXml xml, XmlAnalyzerData options, UnionType unionType) { XmlAnalyzerData clonedAnalyzerData = XmlAnalyzerData.copy(options); for (Type memberType: unionType.getMemberTypes()) { memberType = TypeUtils.getReferredType(memberType); @@ -133,12 +130,11 @@ private Object traverseXmlToUnion(BXml xml, XmlAnalyzerData options, Type type) } return traverseXml(xml, options, memberType); } catch (Exception ex) { - int a = 1; options.resetFrom(clonedAnalyzerData); // ignore } } - throw DiagnosticLog.error(DiagnosticErrorCode.CANNOT_CONVERT_SOURCE_INTO_EXP_TYPE, type); + throw DiagnosticLog.error(DiagnosticErrorCode.CANNOT_CONVERT_SOURCE_INTO_EXP_TYPE, unionType); } private Object traverseXml(BXml xml, Type type, XmlAnalyzerData analyzerData) { @@ -190,7 +186,6 @@ private void convertText(String text, XmlAnalyzerData analyzerData) { fieldType = memberType; break; } catch (Exception ex) { - int a = 1; analyzerData.resetFrom(clonedAnalyzerData); // ignore } @@ -318,7 +313,6 @@ private void convertFieldTypeToUnion(BXmlItem xmlItem, Field currentField, Strin } catch (Exception ex) { analyzerData.resetFrom(clonedAnalyzerData); mapValue.put(StringUtils.fromString(fieldName), null); - int a = 1; // ignore } } @@ -381,7 +375,6 @@ private void convertToUnionMemberType(BXmlItem xmlItem, String fieldName, ArrayT return; } catch (Exception ex) { analyzerData.resetFrom(clonedAnalyzerData); - int a = 1; // ignore } } @@ -537,7 +530,6 @@ private void checkRestTypeAndConvertForUnionTypes(BXmlItem xmlItem, String elemN if (restType.getTag() != TypeTags.ARRAY_TAG) { mapValue.put(StringUtils.fromString(elemName), null); } - int a = 1; // ignore } } diff --git a/native/src/main/resources/error.properties b/native/src/main/resources/error.properties index 108ea74..65e56ee 100644 --- a/native/src/main/resources/error.properties +++ b/native/src/main/resources/error.properties @@ -72,7 +72,7 @@ error.undefined.field=\ undefined field ''{0}'' in record ''{1}'' error.cannot.convert.source.into.expected.type=\ - source value cannot convert into ''{0}'' + source value cannot be converted into ''{0}'' error.field.cannot.convert.into.type=\ - field ''{0}'' cannot convert into the type ''{1}'' + field ''{0}'' cannot be converted into the type ''{1}''