Move xml types to constants

ballerina-platform · Jan 17, 2024 · 5a609cc · 5a609cc
1 parent 0f43871
commit 5a609cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/PredefinedTypes.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/PredefinedTypes.java
@@ -151,6 +151,10 @@ public class PredefinedTypes {
                                                                                   TYPE_TEXT)), EMPTY_MODULE);
 
     public static final Type TYPE_READONLY_XML = ReadOnlyUtils.setImmutableTypeAndGetEffectiveType(TYPE_XML);
+    public static final Type XML_TYPE_ELEMENT = new BXmlType(PredefinedTypes.TYPE_ELEMENT, false);
+    public static final Type XML_TYPE_COMMENT = new BXmlType(PredefinedTypes.TYPE_COMMENT, false);
+    public static final Type XML_TYPE_PI = new BXmlType(PredefinedTypes.TYPE_PROCESSING_INSTRUCTION, false);
+    public static final Type XML_TYPE_TEXT = new BXmlType(PredefinedTypes.TYPE_TEXT, false);
 
     public static final AnyType TYPE_ANY = new BAnyType(TypeConstants.ANY_TNAME, EMPTY_MODULE, false);
     public static final AnyType TYPE_READONLY_ANY = new BAnyType(TypeConstants.READONLY_ANY_TNAME, EMPTY_MODULE, true);

diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlSequence.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlSequence.java
@@ -626,16 +626,12 @@ public Object next() {
     }
 
     private Type getSequenceType(Type tempExprType) {
-        switch (tempExprType.getTag()) {
-            case TypeTags.XML_ELEMENT_TAG:
-                return new BXmlType(PredefinedTypes.TYPE_ELEMENT, false);
-            case TypeTags.XML_COMMENT_TAG:
-                return new BXmlType(PredefinedTypes.TYPE_COMMENT, false);
-            case TypeTags.XML_PI_TAG:
-                return new BXmlType(PredefinedTypes.TYPE_PROCESSING_INSTRUCTION, false);
-            default:
-                return new BXmlType(PredefinedTypes.TYPE_TEXT, false);
-        }
+        return switch (tempExprType.getTag()) {
+            case TypeTags.XML_ELEMENT_TAG -> PredefinedTypes.XML_TYPE_ELEMENT;
+            case TypeTags.XML_COMMENT_TAG -> PredefinedTypes.XML_TYPE_COMMENT;
+            case TypeTags.XML_PI_TAG -> PredefinedTypes.XML_TYPE_PI;
+            default -> PredefinedTypes.XML_TYPE_TEXT;
+        };
     }
 
     private void initializeIteratorNextReturnType() {