Merge pull request #42899 from Shadow-Devil/fix-redundant-casts

Fix redundant casts
ballerina-platform · Jun 11, 2024 · 04a642d · 04a642d
2 parents a92dce6 + 6874aa0
commit 04a642d
Show file tree

Hide file tree

Showing 47 changed files with 84 additions and 86 deletions.
diff --git a/ballerina-shell/modules/shell-core/src/main/java/io/ballerina/shell/utils/StringUtils.java b/ballerina-shell/modules/shell-core/src/main/java/io/ballerina/shell/utils/StringUtils.java
@@ -172,7 +172,7 @@ public static String getErrorStringValue(Throwable error) {
      * @return Reformatted unicode string.
      */
     public static String convertUnicode(char character) {
-        return "\\u{" + Integer.toHexString((int) character) + "}";
+        return "\\u{" + Integer.toHexString(character) + "}";
     }
 
     /**

diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/JsonUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/JsonUtils.java
@@ -21,7 +21,6 @@
 import io.ballerina.runtime.api.TypeTags;
 import io.ballerina.runtime.api.creators.TypeCreator;
 import io.ballerina.runtime.api.creators.ValueCreator;
-import io.ballerina.runtime.api.types.ArrayType;
 import io.ballerina.runtime.api.types.JsonType;
 import io.ballerina.runtime.api.types.MapType;
 import io.ballerina.runtime.api.types.StructureType;
@@ -385,7 +384,7 @@ private static Object convertMapToJson(BMap<?, ?> map, List<TypeValuePair> unres
     }
 
     private static Object convertArrayToJson(BArray array, List<TypeValuePair> unresolvedValues) {
-        BArray newArray = ValueCreator.createArrayValue((ArrayType) PredefinedTypes.TYPE_JSON_ARRAY);
+        BArray newArray = ValueCreator.createArrayValue(PredefinedTypes.TYPE_JSON_ARRAY);
         for (int i = 0; i < array.size(); i++) {
             Object newValue = convertToJsonType(array.get(i), unresolvedValues);
             newArray.add(i, newValue);

diff --git a/...llerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BParameterizedType.java b/...llerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BParameterizedType.java
@@ -40,7 +40,7 @@ public BParameterizedType(Type paramValueType, int paramIndex) {
 
     @Override
     public <V extends Object> V getZeroValue() {
-        return (V) paramValueType.getZeroValue();
+        return paramValueType.getZeroValue();
     }
 
     @Override

diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/TableValueImpl.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/TableValueImpl.java
@@ -605,7 +605,7 @@ public void addData(V data) {
             checkInherentTypeViolation(dataMap, tableType);
             K key = this.keyWrapper.wrapKey(dataMap);
 
-            if (containsKey((K) key)) {
+            if (containsKey(key)) {
                 throw ErrorCreator.createError(TABLE_HAS_A_VALUE_FOR_KEY_ERROR,
                         ErrorHelper.getErrorDetails(ErrorCodes.TABLE_HAS_A_VALUE_FOR_KEY, key));
             }
@@ -680,7 +680,7 @@ public V putData(V data) {
             if (entries.containsKey(hash)) {
                 return updateExistingEntry(key, data, entry, hash);
             }
-            return putNewData((K) key, data, entry, hash);
+            return putNewData(key, data, entry, hash);
         }
 
         private V updateExistingEntry(K key, V data, Map.Entry<K, V> entry, Long hash) {

diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlItem.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlItem.java
@@ -587,7 +587,7 @@ public void removeChildren(String qname) {
         List<Integer> toRemove = new ArrayList<>();
         for (int i = 0; i < children.size(); i++) {
             BXml child = children.get(i);
-            if (child.getNodeType() == ELEMENT && ((XmlItem) child).getElementName().equals(qname)) {
+            if (child.getNodeType() == ELEMENT && child.getElementName().equals(qname)) {
                 toRemove.add(i);
             }
         }

diff --git a/...iler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/EnvironmentResolver.java b/...iler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/EnvironmentResolver.java
@@ -603,7 +603,7 @@ public void visit(BLangJoinClause joinClause) {
         }
         this.scope = joinClause.env;
         this.acceptNode(joinClause.collection, joinClause.env);
-        this.acceptNode((BLangNode) joinClause.onClause, joinClause.env);
+        this.acceptNode(joinClause.onClause, joinClause.env);
     }
 
     @Override

diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/NodeFinder.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/NodeFinder.java
@@ -500,7 +500,7 @@ public void visit(BLangFromClause fromClause) {
     public void visit(BLangJoinClause joinClause) {
         lookupNode(joinClause.collection);
         lookupNode((BLangNode) joinClause.variableDefinitionNode);
-        lookupNode((BLangNode) joinClause.onClause);
+        lookupNode(joinClause.onClause);
     }
 
     @Override
@@ -639,7 +639,7 @@ public void visit(BLangRecordLiteral recordLiteral) {
     @Override
     public void visit(BLangTupleVarRef varRefExpr) {
         lookupNodes(varRefExpr.expressions);
-        lookupNode((BLangNode) varRefExpr.restParam);
+        lookupNode(varRefExpr.restParam);
     }
 
     @Override

diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/ReferenceFinder.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/ReferenceFinder.java
@@ -632,7 +632,7 @@ public void visit(BLangFromClause fromClause) {
     @Override
     public void visit(BLangJoinClause joinClause) {
         find((BLangNode) joinClause.variableDefinitionNode);
-        find((BLangOnClause) joinClause.onClause);
+        find(joinClause.onClause);
         find(joinClause.collection);
     }
 
@@ -813,7 +813,7 @@ public void visit(BLangRecordLiteral recordLiteral) {
     @Override
     public void visit(BLangTupleVarRef varRefExpr) {
         find(varRefExpr.expressions);
-        find((BLangNode) varRefExpr.restParam);
+        find(varRefExpr.restParam);
     }
 
     @Override
@@ -822,7 +822,7 @@ public void visit(BLangRecordVarRef varRefExpr) {
             find(recordRefField.getBindingPattern());
         }
 
-        find((BLangNode) varRefExpr.restParam);
+        find(varRefExpr.restParam);
     }
 
     @Override

diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/Desugar.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/Desugar.java
@@ -8591,7 +8591,7 @@ private BLangInvocation createLanglibXMLInvocation(Location pos, String function
         invocationNode.requiredArgs = requiredArgs;
         invocationNode.restArgs = rewriteExprs(restArgs);
 
-        invocationNode.setBType(((BInvokableType) invocationNode.symbol.type).getReturnType());
+        invocationNode.setBType(invocationNode.symbol.type.getReturnType());
         invocationNode.langLibInvocation = true;
         return invocationNode;
     }

diff --git a/...er/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/QueryDesugar.java b/...er/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/QueryDesugar.java
@@ -1376,7 +1376,7 @@ private List<BVarSymbol> getIntroducedSymbols(BLangVariable variable) {
             } else {
                 // Simple binding
                 if (variable.symbol != null) {
-                    symbols.add(((BLangSimpleVariable) variable).symbol);
+                    symbols.add(variable.symbol);
                 }
             }
             return symbols;

diff --git a/...ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java b/...ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java
@@ -1277,7 +1277,7 @@ public BLangNode transform(ObjectTypeDescriptorNode objTypeDescNode) {
         }
 
         if (objTypeDescNode.parent().kind() == SyntaxKind.DISTINCT_TYPE_DESC) {
-            ((BLangType) objectTypeNode).flagSet.add(Flag.DISTINCT);
+            objectTypeNode.flagSet.add(Flag.DISTINCT);
         }
         return deSugarTypeAsUserDefType(objectTypeNode);
     }
@@ -2362,7 +2362,7 @@ private Iterator<FunctionArgumentNode> getArgumentNodesIterator(NewExpressionNod
             }
         } else {
             ParenthesizedArgList argList =
-                    (ParenthesizedArgList) ((ExplicitNewExpressionNode) expression).parenthesizedArgList();
+                    ((ExplicitNewExpressionNode) expression).parenthesizedArgList();
             argumentsIter = argList.arguments().iterator();
         }
 
@@ -4184,8 +4184,8 @@ private BLangSimpleVariableDef getVariableDefinition(TypeDescriptorNode typeDesc
 
     @Override
     public BLangNode transform(IntersectionTypeDescriptorNode intersectionTypeDescriptorNode) {
-        BLangType lhsType = (BLangType) createTypeNode(intersectionTypeDescriptorNode.leftTypeDesc());
-        BLangType rhsType = (BLangType) createTypeNode(intersectionTypeDescriptorNode.rightTypeDesc());
+        BLangType lhsType = createTypeNode(intersectionTypeDescriptorNode.leftTypeDesc());
+        BLangType rhsType = createTypeNode(intersectionTypeDescriptorNode.rightTypeDesc());
 
         BLangIntersectionTypeNode intersectionType;
         if (rhsType.getKind() == NodeKind.INTERSECTION_TYPE_NODE) {

diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/NodeCloner.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/NodeCloner.java
@@ -303,7 +303,7 @@ private <T extends Node> List<T> cloneList(List<T> nodes) {
         }
         List<T> cloneList = new ArrayList<>(nodes.size());
         for (T node : nodes) {
-            T clone = (T) clone(node);
+            T clone = clone(node);
             cloneList.add(clone);
         }
         return cloneList;

diff --git a/...c/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/ConstantValueResolver.java b/...c/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/ConstantValueResolver.java
@@ -479,7 +479,7 @@ private BLangConstantValue calculateDivision(BLangConstantValue lhs, BLangConsta
                     dlog.error(currentPos, DiagnosticErrorCode.INT_RANGE_OVERFLOW_ERROR);
                     return new BLangConstantValue(null, this.currentConstSymbol.type);
                 }
-                result = (Long) ((Long) lhs.value / (Long) rhs.value);
+                result = (Long) lhs.value / (Long) rhs.value;
                 break;
             case TypeTags.FLOAT:
                 result = String.valueOf(Double.parseDouble(String.valueOf(lhs.value))
@@ -501,7 +501,7 @@ private BLangConstantValue calculateMod(BLangConstantValue lhs, BLangConstantVal
         switch (Types.getImpliedType(this.currentConstSymbol.type).tag) {
             case TypeTags.INT:
             case TypeTags.BYTE: // Byte will be a compiler error.
-                result = (Long) ((Long) lhs.value % (Long) rhs.value);
+                result = (Long) lhs.value % (Long) rhs.value;
                 break;
             case TypeTags.FLOAT:
                 result = String.valueOf(Double.parseDouble(String.valueOf(lhs.value))

diff --git a/...ng/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/DataflowAnalyzer.java b/...ng/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/DataflowAnalyzer.java
@@ -1741,7 +1741,7 @@ public void visit(BLangJoinClause joinClause) {
                                             (BLangVariable) joinClause.variableDefinitionNode.getVariable());
         analyzeNode(joinClause.collection, env);
         if (joinClause.onClause != null) {
-            analyzeNode((BLangNode) joinClause.onClause, env);
+            analyzeNode(joinClause.onClause, env);
         }
     }
 
@@ -2624,14 +2624,14 @@ private void checkAssignment(BLangExpression varRef) {
                 BLangRecordVarRef recordVarRef = (BLangRecordVarRef) varRef;
                 recordVarRef.recordRefFields.forEach(field -> checkAssignment(field.variableReference));
                 if (recordVarRef.restParam != null) {
-                    checkAssignment((BLangExpression) recordVarRef.restParam);
+                    checkAssignment(recordVarRef.restParam);
                 }
                 return;
             case TUPLE_VARIABLE_REF:
                 BLangTupleVarRef tupleVarRef = (BLangTupleVarRef) varRef;
                 tupleVarRef.expressions.forEach(this::checkAssignment);
                 if (tupleVarRef.restParam != null) {
-                    checkAssignment((BLangExpression) tupleVarRef.restParam);
+                    checkAssignment(tupleVarRef.restParam);
                 }
                 return;
             case ERROR_VARIABLE_REF:
@@ -2877,7 +2877,7 @@ private void populateUnusedVariableMapForMembers(Map<BSymbol, Location> unusedLo
                     populateUnusedVariableMapForMembers(unusedLocalVariables, member.valueBindingPattern);
                 }
 
-                populateUnusedVariableMapForMembers(unusedLocalVariables, (BLangVariable) recordVariable.restParam);
+                populateUnusedVariableMapForMembers(unusedLocalVariables, recordVariable.restParam);
                 break;
             case TUPLE_VARIABLE:
                 BLangTupleVariable tupleVariable = (BLangTupleVariable) variable;

diff --git a/...g/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/IsolationAnalyzer.java b/...g/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/IsolationAnalyzer.java
@@ -878,7 +878,7 @@ public void visit(BLangJoinClause joinClause) {
         SymbolEnv joinEnv = joinClause.env;
         analyzeNode((BLangNode) joinClause.getVariableDefinitionNode(), joinEnv);
         analyzeNode(joinClause.collection, joinEnv);
-        analyzeNode((BLangNode) joinClause.onClause, joinEnv);
+        analyzeNode(joinClause.onClause, joinEnv);
     }
 
     @Override
@@ -1166,7 +1166,7 @@ public void visit(BLangTupleVarRef varRefExpr) {
             analyzeNode(expression, env);
         }
 
-        BLangExpression restParam = (BLangExpression) varRefExpr.restParam;
+        BLangExpression restParam = varRefExpr.restParam;
         if (restParam != null) {
             analyzeNode(restParam, env);
         }
@@ -1178,7 +1178,7 @@ public void visit(BLangRecordVarRef varRefExpr) {
             analyzeNode(recordRefField.variableReference, env);
         }
 
-        BLangExpression restParam = (BLangExpression) varRefExpr.restParam;
+        BLangExpression restParam = varRefExpr.restParam;
         if (restParam != null) {
             analyzeNode(restParam, env);
         }

diff --git a/...ng/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SemanticAnalyzer.java b/...ng/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SemanticAnalyzer.java
@@ -2509,7 +2509,7 @@ private void checkRecordVarRefEquivalency(Location pos, BLangRecordVarRef lhsVar
             if (Types.getImpliedType(varRefRest.getBType()).tag == TypeTags.RECORD) {
                 lhsRefType = varRefRest.getBType();
             } else {
-                lhsRefType = ((BLangSimpleVarRef) lhsVarRef.restParam).getBType();
+                lhsRefType = lhsVarRef.restParam.getBType();
             }
 
             BType rhsRestConstraint = rhsRecordType.restFieldType == symTable.noType ? symTable.neverType
@@ -2604,7 +2604,7 @@ private void checkTupleVarRefEquivalency(Location pos, BLangTupleVarRef target,
             if ((target.expressions.size() > i)) {
                 varRefExpr = target.expressions.get(i);
             } else {
-                varRefExpr = (BLangExpression) target.restParam;
+                varRefExpr = target.restParam;
             }
 
             BType sourceType = sourceTypes.get(i);
@@ -4586,7 +4586,7 @@ private void setTypeOfVarRefForBindingPattern(BLangExpression expr, AnalyzerData
                 recordVarRef.recordRefFields
                         .forEach(refKeyValue -> setTypeOfVarRefForBindingPattern(refKeyValue.variableReference, data));
                 if (recordVarRef.restParam != null) {
-                    setTypeOfVarRefForBindingPattern((BLangExpression) recordVarRef.restParam, data);
+                    setTypeOfVarRefForBindingPattern(recordVarRef.restParam, data);
                 }
                 return;
             case ERROR_VARIABLE_REF:
@@ -4624,7 +4624,7 @@ private void checkInvalidTypeDef(BLangExpression expr) {
                     checkInvalidTypeDef(tupleExpr);
                 }
                 if (tupleVarRef.restParam != null) {
-                    checkInvalidTypeDef((BLangExpression) tupleVarRef.restParam);
+                    checkInvalidTypeDef(tupleVarRef.restParam);
                 }
                 return;
             case RECORD_VARIABLE_REF:
@@ -4633,7 +4633,7 @@ private void checkInvalidTypeDef(BLangExpression expr) {
                     checkInvalidTypeDef(refKeyValue.variableReference);
                 }
                 if (recordVarRef.restParam != null) {
-                    checkInvalidTypeDef((BLangExpression) recordVarRef.restParam);
+                    checkInvalidTypeDef(recordVarRef.restParam);
                 }
                 return;
             case ERROR_VARIABLE_REF:

diff --git a/...na-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolEnter.java b/...na-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolEnter.java
@@ -4294,9 +4294,9 @@ private void validateFieldsAndSetReadOnlyType(List<BLangNode> typeDefNodes, Symb
 
                     Set<Flag> flagSet;
                     if (typeNode.getKind() == NodeKind.OBJECT_TYPE) {
-                        flagSet = ((BLangObjectTypeNode) typeNode).flagSet;
+                        flagSet = typeNode.flagSet;
                     } else if (typeNode.getKind() == NodeKind.USER_DEFINED_TYPE) {
-                        flagSet = ((BLangUserDefinedType) typeNode).flagSet;
+                        flagSet = typeNode.flagSet;
                     } else {
                         flagSet = new HashSet<>();
                     }

diff --git a/...lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolResolver.java b/...lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolResolver.java
@@ -2398,7 +2398,7 @@ private BType computeIntersectionType(BLangIntersectionTypeNode intersectionType
         if (typeNode == null) {
             flagSet = new HashSet<>();
         } else if (typeNode.getKind() == NodeKind.OBJECT_TYPE) {
-            flagSet = ((BLangObjectTypeNode) typeNode).flagSet;
+            flagSet = typeNode.flagSet;
         } else if (typeNode.getKind() == NodeKind.USER_DEFINED_TYPE) {
             flagSet = typeNode.flagSet;
         } else {

diff --git a/...na-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java b/...na-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java
@@ -940,7 +940,7 @@ private BType getTypeMatchingFloatOrDecimal(BType finiteType, List<BType> member
                     }
                 }
 
-                finiteType = getFiniteTypeWithValuesOfSingleType((BUnionType) expType, type);
+                finiteType = getFiniteTypeWithValuesOfSingleType(expType, type);
                 if (finiteType != symTable.semanticError) {
                     BType setType = setLiteralValueAndGetType(literalExpr, finiteType, data);
                     if (literalExpr.isFiniteContext) {
@@ -3270,7 +3270,7 @@ public void visit(BLangRecordVarRef varRefExpr, AnalyzerData data) {
             fields.put(field.name.value, field);
         }
 
-        BLangExpression restParam = (BLangExpression) varRefExpr.restParam;
+        BLangExpression restParam = varRefExpr.restParam;
         if (restParam != null) {
             checkExpr(restParam, data);
             unresolvedReference = !isValidVariableReference(restParam);

diff --git a/...a-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeResolver.java b/...a-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeResolver.java
@@ -1718,7 +1718,7 @@ private BType blangTypeUpdate(BLangExpression expression) {
                 expression.setBType(type);
                 return type;
             case LITERAL:
-                return ((BLangLiteral) expression).getBType();
+                return expression.getBType();
             case BINARY_EXPR:
                 type = blangTypeUpdate(((BLangBinaryExpr) expression).lhsExpr);
                 expression.setBType(type);

diff --git a/...allerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/Types.java b/...allerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/Types.java
@@ -3807,7 +3807,7 @@ public BType updateSelfReferencedWithNewType(BType source, BType s, BType target
                 return new BTableType(tableType.tag, target, tableType.tsymbol,
                         tableType.flags);
             } else if (tableType.constraint instanceof BMapType) {
-                return updateSelfReferencedWithNewType(source, (BMapType) tableType.constraint, target);
+                return updateSelfReferencedWithNewType(source, tableType.constraint, target);
             }
         }
         return s;

diff --git a/...ballerina-parser/src/main/java/io/ballerina/compiler/syntax/tree/AbstractNodeFactory.java b/...ballerina-parser/src/main/java/io/ballerina/compiler/syntax/tree/AbstractNodeFactory.java
@@ -174,7 +174,7 @@ public static Minutiae createWhitespaceMinutiae(String text) {
         // TODO Validate the given text for whitespace characters
         STMinutiae internalNode = (STMinutiae) STNodeFactory.createMinutiae(
                 SyntaxKind.WHITESPACE_MINUTIAE, text);
-        return Minutiae.createUnlinked((STMinutiae) internalNode);
+        return Minutiae.createUnlinked(internalNode);
     }
 
     public static Minutiae createEndOfLineMinutiae(String text) {

diff --git a/...b/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/SelectDescendants.java b/...b/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/SelectDescendants.java
@@ -47,7 +47,7 @@ public static BXml selectDescendants(BXml xml, BString[] qnames) {
                 }
                 qnameList.add(strQname);
             }
-            return (BXml) xml.descendants(qnameList);
+            return xml.descendants(qnameList);
         } catch (Throwable e) {
             ErrorHelper.handleXMLException(OPERATION, e);
         }

diff --git a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Elements.java b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Elements.java
@@ -45,9 +45,9 @@ public class Elements {
     public static BXml elements(BXml xml, Object name) {
         try {
             if (name instanceof BString) {
-                return (BXml) xml.elements(((BString) name).getValue());
+                return xml.elements(((BString) name).getValue());
             }
-            return (BXml) xml.elements();
+            return xml.elements();
         } catch (Throwable e) {
             ErrorHelper.handleXMLException(OPERATION, e);
         }

diff --git a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Get.java b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Get.java
@@ -65,6 +65,6 @@ public static BXml get(BXml xmlVal, long i) {
             throw ErrorHelper.getRuntimeException(ErrorCodes.XML_SEQUENCE_INDEX_OUT_OF_RANGE, size, i);
         }
 
-        return (BXml) childrenList.get((int) i);
+        return childrenList.get((int) i);
     }
 }
diff --git a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/GetAttributes.java b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/GetAttributes.java
@@ -44,6 +44,6 @@ public static BMap<BString, BString> getAttributes(BXml xmlVal) {
                     "getAttributes", "element");
         }
 
-        return (BMap<BString, BString>) xmlVal.getAttributesMap();
+        return xmlVal.getAttributesMap();
     }
 }