From d60882bb975d8968c02c5070afb582c799de4b82 Mon Sep 17 00:00:00 2001 From: warunalakshitha Date: Mon, 11 Nov 2024 23:34:09 +0530 Subject: [PATCH 1/5] Refactor ballerina runtime --- .../shell/invoker/ShellSnippetsInvoker.java | 2 +- .../runtime/profiler/ui/JsonParser.java | 8 +-- bvm/ballerina-runtime/README.md | 6 +- .../io/ballerina/runtime/api/Environment.java | 1 + .../io/ballerina/runtime/api/Runtime.java | 2 +- .../{async => concurrent}/StrandMetadata.java | 2 +- .../runtime/api/creators/ErrorCreator.java | 4 +- .../runtime/api/creators/ValueCreator.java | 10 +-- .../api/{ => repository}/Artifact.java | 2 +- .../runtime/api/{ => repository}/Node.java | 2 +- .../api/{ => repository}/Repository.java | 2 +- .../api/{ => types}/PredefinedTypes.java | 31 +--------- .../runtime/api/{ => types}/TypeTags.java | 2 +- .../runtime/api/utils/JsonUtils.java | 10 +-- .../runtime/api/utils/StringUtils.java | 10 +-- .../runtime/api/utils/TypeUtils.java | 38 ++++++------ .../runtime/api/utils/ValueUtils.java | 4 +- .../ballerina/runtime/api/utils/XmlUtils.java | 4 +- .../runtime/api/values/BDecimal.java | 2 +- .../ballerina/runtime/api/values/BNever.java | 2 +- .../runtime/internal/BalEnvironment.java | 3 +- .../runtime/internal/BalRuntime.java | 6 +- .../runtime/internal/ColumnDefinition.java | 42 ------------- .../runtime/internal/DataIterator.java | 62 ------------------- .../io/ballerina/runtime/internal/Lists.java | 52 ---------------- .../runtime/internal/TypeChecker.java | 44 ++++++------- .../runtime/internal/TypeConverter.java | 19 +++--- .../runtime/internal/cli/CliSpec.java | 2 +- .../runtime/internal/cli/CliUtil.java | 4 +- .../runtime/internal/cli/Option.java | 2 +- .../internal/configurable/ConfigResolver.java | 2 +- .../configurable/providers/ConfigUtils.java | 2 +- .../providers/cli/CliProvider.java | 2 +- .../providers/env/EnvVarProvider.java | 2 +- .../providers/toml/ConfigValueCreator.java | 4 +- .../providers/toml/TomlConstants.java | 2 +- .../providers/toml/TomlProvider.java | 6 +- .../configurable/providers/toml/Utils.java | 10 +-- .../runtime/internal/errors/ErrorHelper.java | 2 +- .../internal/{ => json}/JsonDataSource.java | 2 +- .../internal/{ => json}/JsonGenerator.java | 5 +- .../{ => json}/JsonInternalUtils.java | 8 ++- .../internal/{ => json}/JsonParser.java | 15 +++-- .../internal/{ => json}/ParserException.java | 2 +- .../internal/{ => json}/StateMachine.java | 2 +- .../{ => json}/TableJsonDataSource.java | 7 ++- .../runtime/internal/launch/LaunchUtils.java | 2 +- .../{ => repository}/RepositoryImpl.java | 8 +-- .../internal/scheduling/AsyncUtils.java | 2 +- .../{ => scheduling}/ClassloaderRuntime.java | 5 +- .../internal/scheduling/RuntimeRegistry.java | 2 +- .../internal/scheduling/Scheduler.java | 6 +- .../runtime/internal/scheduling/Strand.java | 2 +- .../internal/scheduling/WorkerChannel.java | 2 +- .../internal/scheduling/WorkerUtils.java | 30 ++++----- .../runtime/internal/types/BAnyType.java | 4 +- .../runtime/internal/types/BAnydataType.java | 4 +- .../runtime/internal/types/BArrayType.java | 2 +- .../runtime/internal/types/BBooleanType.java | 2 +- .../runtime/internal/types/BByteType.java | 2 +- .../runtime/internal/types/BDecimalType.java | 2 +- .../runtime/internal/types/BErrorType.java | 4 +- .../runtime/internal/types/BFiniteType.java | 2 +- .../runtime/internal/types/BFloatType.java | 2 +- .../runtime/internal/types/BFunctionType.java | 4 +- .../runtime/internal/types/BFutureType.java | 2 +- .../runtime/internal/types/BHandleType.java | 2 +- .../runtime/internal/types/BIntegerType.java | 2 +- .../internal/types/BIntersectionType.java | 2 +- .../runtime/internal/types/BIteratorType.java | 2 +- .../runtime/internal/types/BJsonType.java | 4 +- .../runtime/internal/types/BMapType.java | 4 +- .../runtime/internal/types/BNeverType.java | 2 +- .../runtime/internal/types/BNullType.java | 2 +- .../runtime/internal/types/BObjectType.java | 6 +- .../internal/types/BParameterizedType.java | 2 +- .../runtime/internal/types/BReadonlyType.java | 2 +- .../runtime/internal/types/BRecordType.java | 2 +- .../runtime/internal/types/BServiceType.java | 2 +- .../runtime/internal/types/BStreamType.java | 4 +- .../runtime/internal/types/BStringType.java | 2 +- .../runtime/internal/types/BTableType.java | 2 +- .../runtime/internal/types/BTupleType.java | 2 +- .../runtime/internal/types/BType.java | 2 +- .../internal/types/BTypeReferenceType.java | 2 +- .../runtime/internal/types/BTypedescType.java | 4 +- .../runtime/internal/types/BUnionType.java | 2 +- .../internal/types/BXmlAttributesType.java | 2 +- .../runtime/internal/types/BXmlType.java | 2 +- .../internal/{ => utils}/AnnotationUtils.java | 4 +- .../internal/{ => utils}/BalStringUtils.java | 11 ++-- .../internal/{ => utils}/CloneUtils.java | 4 +- .../{util => utils}/CompatibilityChecker.java | 2 +- .../internal/{ => utils}/CycleUtils.java | 2 +- .../{util => utils}/DefaultLogFormatter.java | 2 +- .../internal/{ => utils}/ErrorUtils.java | 5 +- .../internal/{ => utils}/FloatUtils.java | 2 +- .../internal/{ => utils}/IteratorUtils.java | 2 +- .../{util => utils}/LargeStructureUtils.java | 2 +- .../internal/{ => utils}/MapUtils.java | 5 +- .../internal/{ => utils}/MathUtils.java | 2 +- .../{util => utils}/RuntimeUtils.java | 5 +- .../internal/{util => utils}/StringUtils.java | 6 +- .../internal/{ => utils}/TableUtils.java | 7 ++- .../{ => utils}/ValueComparisonUtils.java | 8 ++- .../internal/{ => utils}/ValueConverter.java | 8 ++- .../internal/{ => utils}/ValueUtils.java | 3 +- .../internal/values/AbstractArrayValue.java | 6 +- .../internal/values/ArrayValueImpl.java | 14 ++--- .../values/AttributeMapValueImpl.java | 4 +- .../runtime/internal/values/DecimalValue.java | 5 +- .../{ => values}/DecimalValueKind.java | 2 +- .../runtime/internal/values/ErrorValue.java | 12 ++-- .../runtime/internal/values/FutureValue.java | 30 ++++----- .../runtime/internal/values/HandleValue.java | 2 +- .../internal/values/IteratorValue.java | 2 +- .../runtime/internal/values/MapValueImpl.java | 22 +++---- .../internal/values/ReadOnlyUtils.java | 4 +- .../internal/values/RegExpAtomQuantifier.java | 2 +- .../internal/values/RegExpCommonValue.java | 2 +- .../internal/values/RegExpDisjunction.java | 2 +- .../runtime/internal/values/RegExpValue.java | 4 +- .../runtime/internal/values/StreamValue.java | 2 +- .../internal/values/StreamingJsonValue.java | 8 +-- .../runtime/internal/values/StringValue.java | 2 +- .../internal/values/TableValueImpl.java | 14 ++--- .../internal/values/TupleValueImpl.java | 12 ++-- .../internal/values/TypedescValueImpl.java | 2 +- .../runtime/internal/values/XmlComment.java | 2 +- .../runtime/internal/values/XmlItem.java | 8 +-- .../internal/values/XmlNonElementItem.java | 2 +- .../runtime/internal/values/XmlPi.java | 2 +- .../runtime/internal/values/XmlQName.java | 4 +- .../runtime/internal/values/XmlSequence.java | 10 +-- .../runtime/internal/values/XmlText.java | 2 +- .../runtime/internal/values/XmlValue.java | 8 +-- .../{ => xml}/BallerinaXmlSerializer.java | 2 +- .../internal/{ => xml}/TableOmDataSource.java | 4 +- .../internal/{ => xml}/XmlFactory.java | 3 +- .../internal/{ => xml}/XmlTreeBuilder.java | 2 +- .../internal/{ => xml}/XmlValidator.java | 2 +- .../runtime/observability/ObserveUtils.java | 2 +- .../runtime/observability/tracer/BSpan.java | 2 +- .../TransactionResourceManager.java | 5 +- .../src/main/java/module-info.java | 25 +++----- .../runtime/test/RuntimeUtilTests.java | 4 +- .../io/ballerina/runtime/test/TestUtils.java | 4 +- .../test/api/IntersectionTypeApiTests.java | 4 +- .../runtime/test/cli/OperandTest.java | 2 +- .../runtime/test/config/CliProviderTest.java | 2 +- .../runtime/test/config/ConfigTest.java | 6 +- .../runtime/test/config/EnvProviderTest.java | 2 +- .../runtime/test/config/TomlProviderTest.java | 14 ++--- .../negative/CliProviderNegativeTest.java | 2 +- .../config/negative/ConfigNegativeTest.java | 4 +- .../negative/EnvProviderNegativeTest.java | 2 +- .../negative/TomlProviderNegativeTest.java | 4 +- .../java/io/ballerina/cli/launcher/Main.java | 2 +- .../io/ballerina/cli/utils/NativeUtils.java | 2 +- .../cli/utils/RunCommandExecutor.java | 2 +- .../internal/CompilerPhaseRunner.java | 2 +- .../ballerinalang/spi/EmbeddedExecutor.java | 2 +- .../compiler/bir/codegen/JvmConstants.java | 28 ++++----- .../compiler/parser/BLangNodeBuilder.java | 2 +- .../analyzer/CompilerPluginRunner.java | 2 +- .../langlib/internal/GetCompletionType.java | 4 +- .../langlib/internal/GetElementType.java | 2 +- .../langlib/internal/GetFilterFunc.java | 2 +- .../langlib/internal/GetMapFunc.java | 2 +- .../langlib/array/Enumerate.java | 4 +- .../ballerinalang/langlib/array/Filter.java | 2 +- .../org/ballerinalang/langlib/array/Map.java | 2 +- .../org/ballerinalang/langlib/array/Pop.java | 2 +- .../org/ballerinalang/langlib/array/Push.java | 2 +- .../ballerinalang/langlib/array/Reverse.java | 2 +- .../ballerinalang/langlib/array/Slice.java | 2 +- .../org/ballerinalang/langlib/array/Sort.java | 2 +- .../ballerinalang/langlib/array/ToBase16.java | 2 +- .../ballerinalang/langlib/array/ToBase64.java | 2 +- .../langlib/array/utils/ArrayUtils.java | 4 +- .../langlib/bool/FromString.java | 2 +- .../langlib/decimal/FromString.java | 2 +- .../langlib/error/StackTrace.java | 2 +- .../langlib/floatingpoint/FromString.java | 2 +- .../langlib/floatingpoint/ToExpString.java | 4 +- .../langlib/floatingpoint/ToFixedString.java | 4 +- .../langlib/integer/FromString.java | 2 +- .../ballerinalang/langlib/integer/Sum.java | 2 +- .../ballerinalang/langlib/map/Entries.java | 2 +- .../org/ballerinalang/langlib/map/Filter.java | 4 +- .../org/ballerinalang/langlib/map/Remove.java | 2 +- .../ballerinalang/langlib/map/RemoveAll.java | 2 +- .../langlib/map/RemoveIfHasKey.java | 2 +- .../ballerinalang/langlib/map/ToArray.java | 4 +- .../langlib/map/util/MapLibUtils.java | 4 +- .../langlib/regexp/RegexUtil.java | 2 +- .../ballerinalang/langlib/string/Next.java | 2 +- .../ballerinalang/langlib/table/GetKeys.java | 2 +- .../org/ballerinalang/langlib/table/Map.java | 2 +- .../langlib/test/AssertError.java | 2 +- .../langlib/test/AssertNotError.java | 2 +- .../langlib/typedesc/TypeIds.java | 2 +- .../ballerinalang/langlib/value/Clone.java | 2 +- .../langlib/value/CloneReadOnly.java | 2 +- .../langlib/value/CloneWithType.java | 2 +- .../langlib/value/EnsureType.java | 2 +- .../langlib/value/FromJsonDecimalString.java | 2 +- .../langlib/value/FromJsonFloatString.java | 2 +- .../langlib/value/FromJsonString.java | 2 +- .../langlib/value/FromJsonStringWithType.java | 2 +- .../langlib/value/FromJsonWithType.java | 2 +- .../langlib/value/MergeJson.java | 2 +- .../org/ballerinalang/langlib/xml/Concat.java | 2 +- .../langlib/xml/CreateComment.java | 2 +- .../langlib/xml/CreateElement.java | 2 +- .../xml/CreateProcessingInstruction.java | 2 +- .../ballerinalang/langlib/xml/CreateText.java | 2 +- .../org/ballerinalang/langlib/xml/Next.java | 2 +- .../langlib/xml/SetChildren.java | 6 +- .../langlib/test/LangLibArrayTest.java | 2 +- .../langlib/test/LangLibBooleanTest.java | 2 +- .../langlib/test/LangLibDecimalTest.java | 2 +- .../langlib/test/LangLibErrorTest.java | 2 +- .../langlib/test/LangLibIntTest.java | 2 +- .../langlib/test/LangLibMapTest.java | 2 +- .../langlib/test/LangLibRecordTest.java | 2 +- .../langlib/test/LangLibTupleTest.java | 2 +- .../langlib/test/LangLibValueTest.java | 2 +- .../debugadapter/runtime/DebuggerRuntime.java | 4 +- .../shell/service/util/TypeUtils.java | 2 +- .../testerina/natives/io/StringUtils.java | 2 +- .../testerina/natives/mock/FunctionMock.java | 2 +- .../natives/mock/GenericMockObjectValue.java | 2 +- .../testerina/natives/mock/ObjectMock.java | 4 +- .../test/runtime/util/TesterinaUtils.java | 2 +- .../java/org/ballerinalang/test/BRunUtil.java | 3 +- .../benchmark/nativeimpl/Utils.java | 2 +- .../benchmark/BenchmarkUtilTest.java | 2 +- .../jvm/runtime/api/tests/Async.java | 2 +- .../jvm/runtime/api/tests/Enums.java | 2 +- .../jvm/runtime/api/tests/Environments.java | 2 +- .../jvm/runtime/api/tests/Errors.java | 2 +- .../jvm/runtime/api/tests/TypeReference.java | 2 +- .../jvm/runtime/api/tests/Values.java | 10 +-- .../jvm/servicetests/ServiceValue.java | 2 +- .../nativeimpl/jvm/tests/StaticMethods.java | 4 +- .../nativeimpl/jvm/tests/Timer.java | 2 +- .../jvm/tests/VariableReturnType.java | 24 +++---- .../annotations/AnnotationRuntimeTest.java | 2 +- .../record/ClosedRecordTypeInclusionTest.java | 2 +- .../record/OpenRecordTypeInclusionTest.java | 2 +- .../ballerinalang/test/error/ErrorTest.java | 2 +- .../EqualAndNotEqualOperationsTest.java | 2 +- .../AnydataStampInbuiltFunctionTest.java | 2 +- .../stamp/ArrayStampInbuiltFunctionTest.java | 2 +- .../stamp/JSONStampInbuiltFunctionTest.java | 2 +- .../stamp/MapStampInbuiltFunctionTest.java | 2 +- .../stamp/RecordStampInbuiltFunctionTest.java | 2 +- .../TupleTypeStampInbuiltFunctionTest.java | 2 +- .../UnionTypeStampInbuiltFunctionTest.java | 2 +- .../test/functions/FunctionSignatureTest.java | 2 +- .../test/functions/InitFunctionTest.java | 2 +- .../test/isolation/IsolatedWorkerTest.java | 2 +- .../isolation/IsolationInferenceTest.java | 2 +- .../test/javainterop/RefTypeTests.java | 2 +- .../RefTypeWithBValueAPITests.java | 4 +- .../org/ballerinalang/test/jvm/TypesTest.java | 4 +- .../test/main/function/MainFunctionsTest.java | 2 +- .../test/object/ObjectInitializerTest.java | 2 +- .../ClosedRecordOptionalFieldsTest.java | 2 +- .../record/OpenRecordOptionalFieldsTest.java | 2 +- .../arrays/ArrayAccessExprTest.java | 2 +- .../test/statements/arrays/ArrayFillTest.java | 4 +- .../test/statements/arrays/ArrayTest.java | 4 +- .../statements/arrays/SealedArrayTest.java | 2 +- .../SealedArraysOfArraysTest.java | 2 +- .../statements/assign/AssignStmtTest.java | 2 +- .../types/anydata/AnydataTernaryConvTest.java | 2 +- .../test/types/anydata/AnydataTest.java | 2 +- .../test/types/bytetype/BByteValueTest.java | 2 +- .../types/decimaltype/BDecimalValueTest.java | 2 +- .../types/handle/OpaqueHandleTypeTest.java | 2 +- .../test/types/json/JSONLibraryTest.java | 4 +- .../test/types/json/JSONTest.java | 6 +- .../test/types/map/BMapValueTest.java | 2 +- .../test/types/readonly/DeepReadOnlyTest.java | 2 +- .../test/types/string/StringTest.java | 2 +- .../test/types/typedesc/TypedescTests.java | 2 +- .../test/types/uniontypes/UnionTypeTest.java | 2 +- .../test/types/xml/XMLLiteralTest.java | 2 +- .../xml/XMLLiteralWithNamespacesTest.java | 2 +- .../test/types/xml/XMLParserNegativeTest.java | 2 +- .../test/types/xml/XMLSecurityTest.java | 2 +- 293 files changed, 585 insertions(+), 752 deletions(-) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/{async => concurrent}/StrandMetadata.java (95%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/{ => repository}/Artifact.java (96%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/{ => repository}/Node.java (96%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/{ => repository}/Repository.java (96%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/{ => types}/PredefinedTypes.java (92%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/{ => types}/TypeTags.java (99%) delete mode 100644 bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ColumnDefinition.java delete mode 100644 bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/DataIterator.java delete mode 100644 bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/Lists.java rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => json}/JsonDataSource.java (97%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => json}/JsonGenerator.java (98%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => json}/JsonInternalUtils.java (99%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => json}/JsonParser.java (98%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => json}/ParserException.java (95%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => json}/StateMachine.java (99%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => json}/TableJsonDataSource.java (97%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => repository}/RepositoryImpl.java (96%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => scheduling}/ClassloaderRuntime.java (88%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => utils}/AnnotationUtils.java (98%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => utils}/BalStringUtils.java (96%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => utils}/CloneUtils.java (97%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{util => utils}/CompatibilityChecker.java (98%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => utils}/CycleUtils.java (97%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{util => utils}/DefaultLogFormatter.java (97%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => utils}/ErrorUtils.java (98%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => utils}/FloatUtils.java (96%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => utils}/IteratorUtils.java (97%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{util => utils}/LargeStructureUtils.java (98%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => utils}/MapUtils.java (98%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => utils}/MathUtils.java (98%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{util => utils}/RuntimeUtils.java (98%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{util => utils}/StringUtils.java (98%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => utils}/TableUtils.java (95%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => utils}/ValueComparisonUtils.java (98%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => utils}/ValueConverter.java (98%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => utils}/ValueUtils.java (99%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => values}/DecimalValueKind.java (95%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => xml}/BallerinaXmlSerializer.java (99%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => xml}/TableOmDataSource.java (98%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => xml}/XmlFactory.java (99%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => xml}/XmlTreeBuilder.java (99%) rename bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/{ => xml}/XmlValidator.java (99%) diff --git a/ballerina-shell/modules/shell-core/src/main/java/io/ballerina/shell/invoker/ShellSnippetsInvoker.java b/ballerina-shell/modules/shell-core/src/main/java/io/ballerina/shell/invoker/ShellSnippetsInvoker.java index 76f60ee4c08d..18b4f7af90d1 100644 --- a/ballerina-shell/modules/shell-core/src/main/java/io/ballerina/shell/invoker/ShellSnippetsInvoker.java +++ b/ballerina-shell/modules/shell-core/src/main/java/io/ballerina/shell/invoker/ShellSnippetsInvoker.java @@ -36,7 +36,7 @@ import io.ballerina.projects.util.ProjectUtils; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.internal.BalRuntime; -import io.ballerina.runtime.internal.ClassloaderRuntime; +import io.ballerina.runtime.internal.scheduling.ClassloaderRuntime; import io.ballerina.shell.DiagnosticReporter; import io.ballerina.shell.exceptions.InvokerException; import io.ballerina.shell.exceptions.InvokerPanicException; diff --git a/bvm/ballerina-profiler/src/main/java/io/ballerina/runtime/profiler/ui/JsonParser.java b/bvm/ballerina-profiler/src/main/java/io/ballerina/runtime/profiler/ui/JsonParser.java index ef927edf26b1..52834d466d71 100644 --- a/bvm/ballerina-profiler/src/main/java/io/ballerina/runtime/profiler/ui/JsonParser.java +++ b/bvm/ballerina-profiler/src/main/java/io/ballerina/runtime/profiler/ui/JsonParser.java @@ -19,7 +19,7 @@ package io.ballerina.runtime.profiler.ui; import io.ballerina.runtime.api.values.BArray; -import io.ballerina.runtime.internal.JsonInternalUtils; +import io.ballerina.runtime.internal.json.JsonInternalUtils; import io.ballerina.runtime.internal.types.BArrayType; import io.ballerina.runtime.internal.values.BmpStringValue; @@ -30,10 +30,10 @@ import java.util.List; import java.util.Map; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_STRING; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_JSON; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_STRING; import static io.ballerina.runtime.profiler.util.Constants.OUT_STREAM; import static io.ballerina.runtime.profiler.util.Constants.PERFORMANCE_JSON; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_JSON; /** * This class contains the JSON parser of the Ballerina profiler. @@ -108,7 +108,7 @@ private Data populateChildNodes(StackTraceItem stackTraceItem, Data current, Str } private List populateStackTraceItems(String jsonInput) { - Object jsonObj = io.ballerina.runtime.internal.JsonParser.parse(jsonInput, TYPE_JSON); + Object jsonObj = io.ballerina.runtime.internal.json.JsonParser.parse(jsonInput, TYPE_JSON); BArray arr = (BArray) jsonObj; ArrayList stackTraceItems = new ArrayList<>(); for (int i = 0; i < arr.getLength(); i++) { diff --git a/bvm/ballerina-runtime/README.md b/bvm/ballerina-runtime/README.md index 119e513de441..6b0526f3512d 100644 --- a/bvm/ballerina-runtime/README.md +++ b/bvm/ballerina-runtime/README.md @@ -48,7 +48,7 @@ Ballerina runtime API will contain the following sub packages. | **Package** | **Description** | |---------------------------------------|--------------------------------------------------| | io.ballerina.runtime.api | Basic runtime constructs | -| io.ballerina.runtime.api.async | Handle Ballerina asynchronous related constructs | +| io.ballerina.runtime.api.concurrent | Handle Ballerina asynchronous related constructs | | io.ballerina.runtime.api.constants | Runtime constants | | io.ballerina.runtime.api.creators | APIs to create types, values, etc. | | io.ballerina.runtime.api.flags | Runtime flags | @@ -103,9 +103,9 @@ The following table summarizes how Ballerina types are mapped to corresponding J | io.ballerina.runtime.api.Environment | Developers can use this as the first argument of an interop method, Ballerina will inject an instance of `Environment` class when calling. That instance can be used to communicate with the currently executing Ballerina runtime. With `Environment` instance, you can get interop Ballerina function name, path parameters, strand id, strand metadata, current module, current runtime, etc. | | io.ballerina.runtime.api.Future | This will contain the future value once we call the Ballerina method from API asynchronously. | | io.ballerina.runtime.api.Module | Represent Java runtime module. | -| io.ballerina.runtime.api.PredefinedTypes | Contains predefined types. | +| io.ballerina.runtime.api.types.PredefinedTypes | Contains predefined types. | | io.ballerina.runtime.api.Runtime | An instance of the current runtime can be obtained through an `Environment` instance. This will contain APIs to call Ballerina object methods asynchronously. | -| io.ballerina.runtime.api.TypeTags | Contains runtime type tags. | +| io.ballerina.runtime.api.types.TypeTags | Contains runtime type tags. | ## Create a Ballerina value diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Environment.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Environment.java index 948abfa36a4b..73b523cec7ca 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Environment.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Environment.java @@ -17,6 +17,7 @@ */ package io.ballerina.runtime.api; +import io.ballerina.runtime.api.repository.Repository; import io.ballerina.runtime.api.types.Parameter; import java.util.function.Supplier; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Runtime.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Runtime.java index a8111398fe18..d241d690ea1f 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Runtime.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Runtime.java @@ -17,7 +17,7 @@ package io.ballerina.runtime.api; -import io.ballerina.runtime.api.async.StrandMetadata; +import io.ballerina.runtime.api.concurrent.StrandMetadata; import io.ballerina.runtime.api.values.BFunctionPointer; import io.ballerina.runtime.api.values.BObject; import io.ballerina.runtime.internal.BalRuntime; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/async/StrandMetadata.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/concurrent/StrandMetadata.java similarity index 95% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/async/StrandMetadata.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/concurrent/StrandMetadata.java index f44de88c8c96..46490a1f3774 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/async/StrandMetadata.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/concurrent/StrandMetadata.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.ballerina.runtime.api.async; +package io.ballerina.runtime.api.concurrent; import java.util.Map; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/creators/ErrorCreator.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/creators/ErrorCreator.java index 2397d3b20c76..d16eef3f0148 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/creators/ErrorCreator.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/creators/ErrorCreator.java @@ -18,8 +18,8 @@ package io.ballerina.runtime.api.creators; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.constants.TypeConstants; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BError; @@ -27,7 +27,7 @@ import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.internal.TypeChecker; import io.ballerina.runtime.internal.types.BErrorType; -import io.ballerina.runtime.internal.util.RuntimeUtils; +import io.ballerina.runtime.internal.utils.RuntimeUtils; import io.ballerina.runtime.internal.values.ErrorValue; import io.ballerina.runtime.internal.values.MapValueImpl; import io.ballerina.runtime.internal.values.MappingInitialValueEntry; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/creators/ValueCreator.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/creators/ValueCreator.java index 26cbdf888e3e..498d1b600e3a 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/creators/ValueCreator.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/creators/ValueCreator.java @@ -46,14 +46,13 @@ import io.ballerina.runtime.api.values.BXmlItem; import io.ballerina.runtime.api.values.BXmlQName; import io.ballerina.runtime.api.values.BXmlSequence; -import io.ballerina.runtime.internal.DecimalValueKind; -import io.ballerina.runtime.internal.JsonDataSource; -import io.ballerina.runtime.internal.ValueUtils; -import io.ballerina.runtime.internal.XmlFactory; -import io.ballerina.runtime.internal.util.RuntimeUtils; +import io.ballerina.runtime.internal.json.JsonDataSource; +import io.ballerina.runtime.internal.utils.RuntimeUtils; +import io.ballerina.runtime.internal.utils.ValueUtils; import io.ballerina.runtime.internal.values.ArrayValue; import io.ballerina.runtime.internal.values.ArrayValueImpl; import io.ballerina.runtime.internal.values.DecimalValue; +import io.ballerina.runtime.internal.values.DecimalValueKind; import io.ballerina.runtime.internal.values.FPValue; import io.ballerina.runtime.internal.values.HandleValue; import io.ballerina.runtime.internal.values.ListInitialValueEntry; @@ -67,6 +66,7 @@ import io.ballerina.runtime.internal.values.XmlItem; import io.ballerina.runtime.internal.values.XmlQName; import io.ballerina.runtime.internal.values.XmlSequence; +import io.ballerina.runtime.internal.xml.XmlFactory; import java.io.InputStream; import java.math.BigDecimal; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Artifact.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/repository/Artifact.java similarity index 96% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Artifact.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/repository/Artifact.java index c8e8127386f8..e6645d898858 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Artifact.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/repository/Artifact.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.ballerina.runtime.api; +package io.ballerina.runtime.api.repository; import java.util.Map; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Node.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/repository/Node.java similarity index 96% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Node.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/repository/Node.java index 8d2bd96209d7..31d56ab0d42e 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Node.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/repository/Node.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.ballerina.runtime.api; +package io.ballerina.runtime.api.repository; import java.util.Map; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Repository.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/repository/Repository.java similarity index 96% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Repository.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/repository/Repository.java index af4f803c91c6..f34bae67398f 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Repository.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/repository/Repository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.ballerina.runtime.api; +package io.ballerina.runtime.api.repository; import java.util.List; 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/types/PredefinedTypes.java similarity index 92% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/PredefinedTypes.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/PredefinedTypes.java index 3d0c7e49e7d5..6541d6aa9811 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/PredefinedTypes.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/PredefinedTypes.java @@ -15,36 +15,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.ballerina.runtime.api; +package io.ballerina.runtime.api.types; +import io.ballerina.runtime.api.Module; import io.ballerina.runtime.api.constants.TypeConstants; -import io.ballerina.runtime.api.types.AnyType; -import io.ballerina.runtime.api.types.AnydataType; -import io.ballerina.runtime.api.types.ArrayType; -import io.ballerina.runtime.api.types.BooleanType; -import io.ballerina.runtime.api.types.ByteType; -import io.ballerina.runtime.api.types.DecimalType; -import io.ballerina.runtime.api.types.ErrorType; -import io.ballerina.runtime.api.types.FloatType; -import io.ballerina.runtime.api.types.FutureType; -import io.ballerina.runtime.api.types.HandleType; -import io.ballerina.runtime.api.types.IntegerType; -import io.ballerina.runtime.api.types.IteratorType; -import io.ballerina.runtime.api.types.JsonType; -import io.ballerina.runtime.api.types.MapType; -import io.ballerina.runtime.api.types.NeverType; -import io.ballerina.runtime.api.types.NullType; -import io.ballerina.runtime.api.types.ReadonlyType; -import io.ballerina.runtime.api.types.RecordType; -import io.ballerina.runtime.api.types.ServiceType; -import io.ballerina.runtime.api.types.StreamType; -import io.ballerina.runtime.api.types.StringType; -import io.ballerina.runtime.api.types.Type; -import io.ballerina.runtime.api.types.TypedescType; -import io.ballerina.runtime.api.types.UnionType; -import io.ballerina.runtime.api.types.XmlAttributesType; -import io.ballerina.runtime.api.types.XmlType; -import io.ballerina.runtime.internal.IteratorUtils; import io.ballerina.runtime.internal.types.BAnyType; import io.ballerina.runtime.internal.types.BAnydataType; import io.ballerina.runtime.internal.types.BArrayType; @@ -70,6 +44,7 @@ import io.ballerina.runtime.internal.types.BUnionType; import io.ballerina.runtime.internal.types.BXmlAttributesType; import io.ballerina.runtime.internal.types.BXmlType; +import io.ballerina.runtime.internal.utils.IteratorUtils; import io.ballerina.runtime.internal.values.ReadOnlyUtils; import java.util.ArrayList; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/TypeTags.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/TypeTags.java similarity index 99% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/TypeTags.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/TypeTags.java index 94882acdee29..ebd78439ded5 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/TypeTags.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/TypeTags.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.ballerina.runtime.api; +package io.ballerina.runtime.api.types; /** * This class contains tag values of each type in Ballerina. 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 index 653338dc1bff..2cc7b5ffc1e9 100644 --- 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 @@ -17,16 +17,16 @@ */ package io.ballerina.runtime.api.utils; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.JsonType; import io.ballerina.runtime.api.types.MapType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.StructureType; import io.ballerina.runtime.api.types.TableType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BIterator; @@ -34,13 +34,13 @@ import io.ballerina.runtime.api.values.BRefValue; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BTable; -import io.ballerina.runtime.internal.JsonGenerator; -import io.ballerina.runtime.internal.JsonInternalUtils; -import io.ballerina.runtime.internal.JsonParser; import io.ballerina.runtime.internal.TypeChecker; import io.ballerina.runtime.internal.commons.TypeValuePair; import io.ballerina.runtime.internal.errors.ErrorCodes; import io.ballerina.runtime.internal.errors.ErrorHelper; +import io.ballerina.runtime.internal.json.JsonGenerator; +import io.ballerina.runtime.internal.json.JsonInternalUtils; +import io.ballerina.runtime.internal.json.JsonParser; import java.io.IOException; import java.io.InputStream; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/StringUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/StringUtils.java index 44e6f75ab783..e18c94b9ed49 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/StringUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/StringUtils.java @@ -16,17 +16,17 @@ */ package io.ballerina.runtime.api.utils; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BLink; import io.ballerina.runtime.api.values.BString; -import io.ballerina.runtime.internal.JsonGenerator; import io.ballerina.runtime.internal.TypeChecker; import io.ballerina.runtime.internal.errors.ErrorCodes; import io.ballerina.runtime.internal.errors.ErrorHelper; +import io.ballerina.runtime.internal.json.JsonGenerator; import io.ballerina.runtime.internal.values.ArrayValue; import io.ballerina.runtime.internal.values.ArrayValueImpl; import io.ballerina.runtime.internal.values.BmpStringValue; @@ -48,9 +48,9 @@ import static io.ballerina.runtime.internal.errors.ErrorReasons.INDEX_OUT_OF_RANGE_ERROR_IDENTIFIER; import static io.ballerina.runtime.internal.errors.ErrorReasons.STRING_OPERATION_ERROR; import static io.ballerina.runtime.internal.errors.ErrorReasons.getModulePrefixedReason; -import static io.ballerina.runtime.internal.util.StringUtils.getExpressionStringVal; -import static io.ballerina.runtime.internal.util.StringUtils.getStringVal; -import static io.ballerina.runtime.internal.util.StringUtils.parseExpressionStringVal; +import static io.ballerina.runtime.internal.utils.StringUtils.getExpressionStringVal; +import static io.ballerina.runtime.internal.utils.StringUtils.getStringVal; +import static io.ballerina.runtime.internal.utils.StringUtils.parseExpressionStringVal; /** * Common utility methods used for String manipulation. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/TypeUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/TypeUtils.java index 71fc7f2c8a9d..381a970f38e5 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/TypeUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/TypeUtils.java @@ -17,33 +17,33 @@ */ package io.ballerina.runtime.api.utils; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.constants.TypeConstants; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.ReferenceType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.internal.TypeChecker; import io.ballerina.runtime.internal.types.BArrayType; import io.ballerina.runtime.internal.types.BFiniteType; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_ANY; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_ANYDATA; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_BOOLEAN; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_BYTE; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_DECIMAL; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_ERROR; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_FLOAT; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_FUTURE; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_INT; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_JSON; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_MAP; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_NEVER; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_NULL; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_STREAM; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_STRING; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_TYPEDESC; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_XML; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_XML_ATTRIBUTES; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_ANY; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_ANYDATA; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_BOOLEAN; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_BYTE; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_DECIMAL; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_ERROR; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_FLOAT; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_FUTURE; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_INT; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_JSON; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_MAP; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_NEVER; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_NULL; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_STREAM; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_STRING; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_TYPEDESC; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_XML; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_XML_ATTRIBUTES; /** * This class contains various methods to manipulate {@link Type}s in Ballerina. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/ValueUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/ValueUtils.java index b5c1cc3f2cd2..930d501c080b 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/ValueUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/ValueUtils.java @@ -21,8 +21,8 @@ import io.ballerina.runtime.api.types.AnydataType; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.values.BError; -import io.ballerina.runtime.internal.JsonParser; -import io.ballerina.runtime.internal.ValueConverter; +import io.ballerina.runtime.internal.json.JsonParser; +import io.ballerina.runtime.internal.utils.ValueConverter; import java.io.InputStream; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/XmlUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/XmlUtils.java index 3f65db5552a8..153102b05825 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/XmlUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/utils/XmlUtils.java @@ -22,9 +22,9 @@ import io.ballerina.runtime.api.values.BTable; import io.ballerina.runtime.api.values.BXml; import io.ballerina.runtime.api.values.BXmlQName; -import io.ballerina.runtime.internal.XmlFactory; -import io.ballerina.runtime.internal.XmlValidator; import io.ballerina.runtime.internal.values.TableValueImpl; +import io.ballerina.runtime.internal.xml.XmlFactory; +import io.ballerina.runtime.internal.xml.XmlValidator; import java.io.InputStream; import java.io.Reader; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/values/BDecimal.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/values/BDecimal.java index c50eb32f9cb9..ede0ab23be57 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/values/BDecimal.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/values/BDecimal.java @@ -19,8 +19,8 @@ package io.ballerina.runtime.api.values; import io.ballerina.runtime.api.types.Type; -import io.ballerina.runtime.internal.DecimalValueKind; import io.ballerina.runtime.internal.values.DecimalValue; +import io.ballerina.runtime.internal.values.DecimalValueKind; import java.math.BigDecimal; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/values/BNever.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/values/BNever.java index b35681c36bcb..eeeecf4050fe 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/values/BNever.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/values/BNever.java @@ -16,7 +16,7 @@ package io.ballerina.runtime.api.values; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import java.util.Map; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BalEnvironment.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BalEnvironment.java index cf9274fa82cb..5064959fa791 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BalEnvironment.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BalEnvironment.java @@ -20,8 +20,9 @@ import io.ballerina.runtime.api.Environment; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.Repository; +import io.ballerina.runtime.api.repository.Repository; import io.ballerina.runtime.api.types.Parameter; +import io.ballerina.runtime.internal.repository.RepositoryImpl; import io.ballerina.runtime.internal.scheduling.Strand; import java.util.function.Supplier; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BalRuntime.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BalRuntime.java index 0f20e069d06f..17f3cdb14cc8 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BalRuntime.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BalRuntime.java @@ -21,7 +21,7 @@ import io.ballerina.identifier.Utils; import io.ballerina.runtime.api.Module; import io.ballerina.runtime.api.Runtime; -import io.ballerina.runtime.api.async.StrandMetadata; +import io.ballerina.runtime.api.concurrent.StrandMetadata; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BFunctionPointer; @@ -219,12 +219,12 @@ Object invokeModuleStop() throws ClassNotFoundException, NoSuchMethodException, return method.invoke(null, this); } - Class loadClass(String className) throws ClassNotFoundException { + protected Class loadClass(String className) throws ClassNotFoundException { String name = getFullQualifiedClassName(this.rootModule, className); return Class.forName(name); } - static String getFullQualifiedClassName(Module module, String className) { + protected static String getFullQualifiedClassName(Module module, String className) { String orgName = module.getOrg(); String packageName = module.getName(); if (!DOT.equals(packageName)) { diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ColumnDefinition.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ColumnDefinition.java deleted file mode 100644 index 873b8f306a3f..000000000000 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ColumnDefinition.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package io.ballerina.runtime.internal; - -/** - * This wraps the column name and type of a selected result set from a data source. - * - * @since 0.995.0 - */ -public class ColumnDefinition { - - protected String name; - protected int mappedTypeTag; - - public ColumnDefinition(String name, int mappedType) { - this.name = name; - this.mappedTypeTag = mappedType; - } - - public String getName() { - return name; - } - - public int getTypeTag() { - return mappedTypeTag; - } -} diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/DataIterator.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/DataIterator.java deleted file mode 100644 index 363946a5e56b..000000000000 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/DataIterator.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package io.ballerina.runtime.internal; - -import io.ballerina.runtime.internal.types.BStructureType; -import io.ballerina.runtime.internal.values.DecimalValue; -import io.ballerina.runtime.internal.values.MapValue; - -import java.util.List; - -/** - * This interface represents an data iterator operations. - * Each data source need to implement their own implementation by implementing this interface. - * Known implementations: {@code SQLDataIterator} - * - * @since 0.995.0 - */ -public interface DataIterator { - - boolean next(); - - void close(); - - void reset(); - - String getString(int columnIndex); - - Long getInt(int columnIndex); - - Double getFloat(int columnIndex); - - Boolean getBoolean(int columnIndex); - - String getBlob(int columnIndex); - - DecimalValue getDecimal(int columnIndex); - - Object[] getStruct(int columnIndex); - - Object[] getArray(int columnIndex); - - MapValue generateNext(); - - List getColumnDefinitions(); - - BStructureType getStructType(); -} diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/Lists.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/Lists.java deleted file mode 100644 index 2a545f6b5739..000000000000 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/Lists.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -package io.ballerina.runtime.internal; - -import io.ballerina.runtime.api.TypeTags; -import io.ballerina.runtime.api.utils.TypeUtils; -import io.ballerina.runtime.internal.types.BArrayType; -import io.ballerina.runtime.internal.values.ArrayValue; - -/** - * Common utility methods used for List manipulation. - * - * @since 0.995.0 - */ -public final class Lists { - - private Lists() { - } - - public static Object get(ArrayValue array, long index) { - if (array.getType().getTag() != TypeTags.ARRAY_TAG) { - return array.getRefValue(index); - } - - return switch (TypeUtils.getImpliedType(((BArrayType) array.getType()).getElementType()).getTag()) { - case TypeTags.BOOLEAN_TAG -> array.getBoolean(index); - case TypeTags.BYTE_TAG -> (long) array.getByte(index); - case TypeTags.FLOAT_TAG -> array.getFloat(index); - case TypeTags.DECIMAL_TAG -> array.getRefValue(index); - case TypeTags.INT_TAG -> array.getInt(index); - case TypeTags.STRING_TAG -> array.getString(index); - default -> array.getRefValue(index); - }; - } -} diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TypeChecker.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TypeChecker.java index cc3e8e8fdc1c..4705c4ead712 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TypeChecker.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TypeChecker.java @@ -18,15 +18,15 @@ package io.ballerina.runtime.internal; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.ArrayType.ArrayState; import io.ballerina.runtime.api.types.Field; import io.ballerina.runtime.api.types.FunctionType; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.MethodType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.types.XmlNodeType; import io.ballerina.runtime.api.utils.StringUtils; @@ -62,8 +62,10 @@ import io.ballerina.runtime.internal.types.BTypedescType; import io.ballerina.runtime.internal.types.BUnionType; import io.ballerina.runtime.internal.types.BXmlType; +import io.ballerina.runtime.internal.utils.ErrorUtils; import io.ballerina.runtime.internal.values.ArrayValue; import io.ballerina.runtime.internal.values.DecimalValue; +import io.ballerina.runtime.internal.values.DecimalValueKind; import io.ballerina.runtime.internal.values.ErrorValue; import io.ballerina.runtime.internal.values.HandleValue; import io.ballerina.runtime.internal.values.MapValue; @@ -94,23 +96,6 @@ import java.util.Optional; import java.util.Set; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_ANY; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_ANYDATA; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_BOOLEAN; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_BYTE; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_DECIMAL; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_FLOAT; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_INT; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_INT_SIGNED_16; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_INT_SIGNED_32; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_INT_SIGNED_8; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_INT_UNSIGNED_16; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_INT_UNSIGNED_32; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_INT_UNSIGNED_8; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_JSON; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_NULL; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_READONLY_JSON; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_STRING; import static io.ballerina.runtime.api.constants.RuntimeConstants.BALLERINA_BUILTIN_PKG_PREFIX; import static io.ballerina.runtime.api.constants.RuntimeConstants.BBYTE_MAX_VALUE; import static io.ballerina.runtime.api.constants.RuntimeConstants.BBYTE_MIN_VALUE; @@ -124,12 +109,29 @@ import static io.ballerina.runtime.api.constants.RuntimeConstants.UNSIGNED16_MAX_VALUE; import static io.ballerina.runtime.api.constants.RuntimeConstants.UNSIGNED32_MAX_VALUE; import static io.ballerina.runtime.api.constants.RuntimeConstants.UNSIGNED8_MAX_VALUE; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_ANY; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_ANYDATA; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_BOOLEAN; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_BYTE; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_DECIMAL; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_FLOAT; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_INT; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_INT_SIGNED_16; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_INT_SIGNED_32; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_INT_SIGNED_8; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_INT_UNSIGNED_16; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_INT_UNSIGNED_32; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_INT_UNSIGNED_8; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_JSON; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_NULL; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_READONLY_JSON; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_STRING; import static io.ballerina.runtime.api.utils.TypeUtils.getImpliedType; import static io.ballerina.runtime.api.utils.TypeUtils.isValueType; -import static io.ballerina.runtime.internal.CloneUtils.getErrorMessage; import static io.ballerina.runtime.internal.TypeConverter.ERROR_MESSAGE_UNION_END; import static io.ballerina.runtime.internal.TypeConverter.ERROR_MESSAGE_UNION_SEPARATOR; import static io.ballerina.runtime.internal.TypeConverter.ERROR_MESSAGE_UNION_START; +import static io.ballerina.runtime.internal.utils.CloneUtils.getErrorMessage; /** * Responsible for performing runtime type checking. @@ -2453,7 +2455,7 @@ private static boolean checkIsLikeTupleType(Object sourceValue, BTupleType targe return true; } - static boolean isByteLiteral(long longValue) { + public static boolean isByteLiteral(long longValue) { return (longValue >= BBYTE_MIN_VALUE && longValue <= BBYTE_MAX_VALUE); } diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TypeConverter.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TypeConverter.java index 82f3ffbdb370..b107a4f617d3 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TypeConverter.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TypeConverter.java @@ -17,16 +17,16 @@ */ package io.ballerina.runtime.internal; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.Field; import io.ballerina.runtime.api.types.FiniteType; import io.ballerina.runtime.api.types.IntersectionType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.ReferenceType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; @@ -52,6 +52,7 @@ import io.ballerina.runtime.internal.types.BTypeReferenceType; import io.ballerina.runtime.internal.types.BTypedescType; import io.ballerina.runtime.internal.types.BUnionType; +import io.ballerina.runtime.internal.utils.ErrorUtils; import io.ballerina.runtime.internal.values.ArrayValue; import io.ballerina.runtime.internal.values.DecimalValue; import io.ballerina.runtime.internal.values.MapValueImpl; @@ -67,9 +68,9 @@ import java.util.Set; import java.util.function.Supplier; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_STRING; import static io.ballerina.runtime.api.constants.RuntimeConstants.BINT_MAX_VALUE_DOUBLE_RANGE_MAX; import static io.ballerina.runtime.api.constants.RuntimeConstants.BINT_MIN_VALUE_DOUBLE_RANGE_MIN; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_STRING; import static io.ballerina.runtime.internal.TypeChecker.anyToSigned16; import static io.ballerina.runtime.internal.TypeChecker.anyToSigned32; import static io.ballerina.runtime.internal.TypeChecker.anyToSigned8; @@ -100,11 +101,11 @@ public final class TypeConverter { private static final String POSITIVE_INFINITY = "Infinity"; private static final String NEGATIVE_INFINITY = "-Infinity"; - static final byte MAX_CONVERSION_ERROR_COUNT = 20; - static final byte MAX_DISPLAYED_SOURCE_VALUE_LENGTH = 20; - static final String ERROR_MESSAGE_UNION_START = "{"; - static final String ERROR_MESSAGE_UNION_END = "}"; - static final String ERROR_MESSAGE_UNION_SEPARATOR = "or"; + public static final byte MAX_CONVERSION_ERROR_COUNT = 20; + public static final byte MAX_DISPLAYED_SOURCE_VALUE_LENGTH = 20; + public static final String ERROR_MESSAGE_UNION_START = "{"; + public static final String ERROR_MESSAGE_UNION_END = "}"; + public static final String ERROR_MESSAGE_UNION_SEPARATOR = "or"; public static Object convertValues(Type targetType, Object inputValue) { Type inputType = TypeChecker.getType(inputValue); @@ -1236,7 +1237,7 @@ public static Type resolveMatchingTypeForUnion(Object value, Type targetUnionTyp private TypeConverter() { } - static List getXmlTargetTypes(Type targetType) { + public static List getXmlTargetTypes(Type targetType) { List xmlTargetTypes = new ArrayList<>(); return switch (targetType.getTag()) { case TypeTags.XML_TAG, TypeTags.XML_PI_TAG, TypeTags.XML_COMMENT_TAG, TypeTags.XML_ELEMENT_TAG, diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/cli/CliSpec.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/cli/CliSpec.java index 4f6bd7ebd631..584a9912c98a 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/cli/CliSpec.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/cli/CliSpec.java @@ -18,13 +18,13 @@ package io.ballerina.runtime.internal.cli; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; 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.RecordType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/cli/CliUtil.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/cli/CliUtil.java index d677e3b42be0..74795aea33a2 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/cli/CliUtil.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/cli/CliUtil.java @@ -18,10 +18,10 @@ package io.ballerina.runtime.internal.cli; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/cli/Option.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/cli/Option.java index 5f7e41eb8cb1..22412d34dfd9 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/cli/Option.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/cli/Option.java @@ -19,13 +19,13 @@ package io.ballerina.runtime.internal.cli; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.RecordType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BMap; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/ConfigResolver.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/ConfigResolver.java index 2261fe6e8895..6ae42da0f486 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/ConfigResolver.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/ConfigResolver.java @@ -20,10 +20,10 @@ import io.ballerina.identifier.Utils; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.ReferenceType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.internal.configurable.exceptions.ConfigException; import io.ballerina.runtime.internal.diagnostics.RuntimeDiagnosticLog; import io.ballerina.runtime.internal.errors.ErrorCodes; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/ConfigUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/ConfigUtils.java index 4c559b4594cf..670ffbe02458 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/ConfigUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/ConfigUtils.java @@ -16,8 +16,8 @@ package io.ballerina.runtime.internal.configurable.providers; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/cli/CliProvider.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/cli/CliProvider.java index 003998ff95d3..33cdb575226b 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/cli/CliProvider.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/cli/CliProvider.java @@ -19,10 +19,10 @@ package io.ballerina.runtime.internal.configurable.providers.cli; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.internal.TypeConverter; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/env/EnvVarProvider.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/env/EnvVarProvider.java index 78cc5992c94f..d8959794442d 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/env/EnvVarProvider.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/env/EnvVarProvider.java @@ -17,10 +17,10 @@ package io.ballerina.runtime.internal.configurable.providers.env; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.internal.TypeConverter; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/ConfigValueCreator.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/ConfigValueCreator.java index 7c2c7164b131..a8c1f5c2672f 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/ConfigValueCreator.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/ConfigValueCreator.java @@ -18,7 +18,6 @@ package io.ballerina.runtime.internal.configurable.providers.toml; -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; @@ -31,6 +30,7 @@ import io.ballerina.runtime.api.types.TableType; import io.ballerina.runtime.api.types.TupleType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; @@ -65,11 +65,11 @@ import java.util.Map; import java.util.Optional; -import static io.ballerina.runtime.internal.ValueUtils.createReadOnlyXmlValue; import static io.ballerina.runtime.internal.configurable.providers.toml.Utils.getEffectiveType; import static io.ballerina.runtime.internal.configurable.providers.toml.Utils.getValueFromKeyValueNode; import static io.ballerina.runtime.internal.configurable.providers.toml.Utils.isSimpleType; import static io.ballerina.runtime.internal.configurable.providers.toml.Utils.isXMLType; +import static io.ballerina.runtime.internal.utils.ValueUtils.createReadOnlyXmlValue; /** * Value creator to create values for structured configurable values from TOML nodes. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/TomlConstants.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/TomlConstants.java index 7d28f92110cd..79397ccd0d9b 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/TomlConstants.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/TomlConstants.java @@ -18,7 +18,7 @@ package io.ballerina.runtime.internal.configurable.providers.toml; -import io.ballerina.runtime.internal.util.RuntimeUtils; +import io.ballerina.runtime.internal.utils.RuntimeUtils; import java.nio.file.Path; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/TomlProvider.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/TomlProvider.java index 949ebf33b0d1..e2f093d59947 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/TomlProvider.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/TomlProvider.java @@ -19,7 +19,6 @@ package io.ballerina.runtime.internal.configurable.providers.toml; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.ArrayType; @@ -31,6 +30,7 @@ import io.ballerina.runtime.api.types.TableType; import io.ballerina.runtime.api.types.TupleType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.internal.TypeConverter; @@ -68,7 +68,6 @@ import java.util.Optional; import java.util.Set; -import static io.ballerina.runtime.internal.ValueUtils.createReadOnlyXmlValue; import static io.ballerina.runtime.internal.configurable.providers.toml.Utils.checkEffectiveTomlType; import static io.ballerina.runtime.internal.configurable.providers.toml.Utils.getEffectiveType; import static io.ballerina.runtime.internal.configurable.providers.toml.Utils.getLineRange; @@ -87,7 +86,8 @@ import static io.ballerina.runtime.internal.errors.ErrorCodes.CONFIG_TOML_TABLE_KEY_NOT_PROVIDED; import static io.ballerina.runtime.internal.errors.ErrorCodes.CONFIG_TOML_UNUSED_VALUE; import static io.ballerina.runtime.internal.errors.ErrorCodes.CONFIG_TYPE_NOT_SUPPORTED; -import static io.ballerina.runtime.internal.util.RuntimeUtils.isByteLiteral; +import static io.ballerina.runtime.internal.utils.RuntimeUtils.isByteLiteral; +import static io.ballerina.runtime.internal.utils.ValueUtils.createReadOnlyXmlValue; /** * Toml value provider for configurable implementation. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/Utils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/Utils.java index 86d2615bc0b5..4d0a4f47f1fc 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/Utils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/Utils.java @@ -19,8 +19,6 @@ package io.ballerina.runtime.internal.configurable.providers.toml; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; -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.flags.SymbolFlags; @@ -28,10 +26,12 @@ import io.ballerina.runtime.api.types.FiniteType; import io.ballerina.runtime.api.types.IntersectableReferenceType; import io.ballerina.runtime.api.types.IntersectionType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.RecordType; import io.ballerina.runtime.api.types.ReferenceType; import io.ballerina.runtime.api.types.TupleType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BMapInitialValueEntry; @@ -66,12 +66,12 @@ import java.util.Set; import static io.ballerina.identifier.Utils.decodeIdentifier; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_ANYDATA; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_READONLY_ANYDATA; -import static io.ballerina.runtime.internal.ValueUtils.createReadOnlyXmlValue; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_ANYDATA; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_READONLY_ANYDATA; import static io.ballerina.runtime.internal.configurable.providers.toml.TomlConstants.CONFIG_FILE_NAME; import static io.ballerina.runtime.internal.errors.ErrorCodes.CONFIG_TYPE_NOT_SUPPORTED; import static io.ballerina.runtime.internal.errors.ErrorCodes.CONFIG_UNION_VALUE_AMBIGUOUS_TARGET; +import static io.ballerina.runtime.internal.utils.ValueUtils.createReadOnlyXmlValue; /** * Util methods required for configurable variables. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/errors/ErrorHelper.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/errors/ErrorHelper.java index f28cbc6167a5..dd2c05d33d83 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/errors/ErrorHelper.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/errors/ErrorHelper.java @@ -18,8 +18,8 @@ package io.ballerina.runtime.internal.errors; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BMap; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonDataSource.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/JsonDataSource.java similarity index 97% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonDataSource.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/JsonDataSource.java index e43579211667..6962c6d1347e 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonDataSource.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/JsonDataSource.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.json; import java.io.IOException; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonGenerator.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/JsonGenerator.java similarity index 98% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonGenerator.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/JsonGenerator.java index b9b11d98dad3..1cce229bcef8 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonGenerator.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/JsonGenerator.java @@ -15,11 +15,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.json; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BString; +import io.ballerina.runtime.internal.TypeChecker; import io.ballerina.runtime.internal.values.ArrayValue; import io.ballerina.runtime.internal.values.DecimalValue; import io.ballerina.runtime.internal.values.MapValueImpl; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonInternalUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/JsonInternalUtils.java similarity index 99% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonInternalUtils.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/JsonInternalUtils.java index f056abddc30d..0fe77bbde9da 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonInternalUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/JsonInternalUtils.java @@ -16,17 +16,17 @@ * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.json; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.constants.TypeConstants; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.Field; import io.ballerina.runtime.api.types.JsonType; import io.ballerina.runtime.api.types.MapType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.StructureType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; @@ -35,6 +35,8 @@ import io.ballerina.runtime.api.values.BRefValue; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BTable; +import io.ballerina.runtime.internal.TypeChecker; +import io.ballerina.runtime.internal.TypeConverter; import io.ballerina.runtime.internal.errors.ErrorCodes; import io.ballerina.runtime.internal.errors.ErrorHelper; import io.ballerina.runtime.internal.errors.ErrorReasons; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonParser.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/JsonParser.java similarity index 98% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonParser.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/JsonParser.java index 80a73363a64d..401a3a83eb48 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonParser.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/JsonParser.java @@ -16,10 +16,8 @@ * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.json; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; @@ -28,10 +26,12 @@ import io.ballerina.runtime.api.types.Field; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.MapType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.RecordType; import io.ballerina.runtime.api.types.TableType; import io.ballerina.runtime.api.types.TupleType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.JsonUtils; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; @@ -40,6 +40,8 @@ import io.ballerina.runtime.api.values.BListInitialValueEntry; import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BString; +import io.ballerina.runtime.internal.TypeChecker; +import io.ballerina.runtime.internal.TypeConverter; import io.ballerina.runtime.internal.commons.TypeValuePair; import io.ballerina.runtime.internal.errors.ErrorCodes; import io.ballerina.runtime.internal.errors.ErrorHelper; @@ -49,6 +51,9 @@ import io.ballerina.runtime.internal.types.BIntersectionType; import io.ballerina.runtime.internal.types.BMapType; import io.ballerina.runtime.internal.types.BRecordType; +import io.ballerina.runtime.internal.utils.CloneUtils; +import io.ballerina.runtime.internal.utils.ValueConverter; +import io.ballerina.runtime.internal.utils.ValueUtils; import io.ballerina.runtime.internal.values.ArrayValue; import io.ballerina.runtime.internal.values.ArrayValueImpl; import io.ballerina.runtime.internal.values.DecimalValue; @@ -75,8 +80,8 @@ import static io.ballerina.runtime.api.creators.ErrorCreator.createError; import static io.ballerina.runtime.api.utils.JsonUtils.NonStringValueProcessingMode.FROM_JSON_DECIMAL_STRING; import static io.ballerina.runtime.api.utils.JsonUtils.NonStringValueProcessingMode.FROM_JSON_FLOAT_STRING; -import static io.ballerina.runtime.internal.ErrorUtils.createConversionError; -import static io.ballerina.runtime.internal.ValueUtils.createRecordValueWithDefaultValues; +import static io.ballerina.runtime.internal.utils.ErrorUtils.createConversionError; +import static io.ballerina.runtime.internal.utils.ValueUtils.createRecordValueWithDefaultValues; /** * This class represents a {@link InputStream} parser which creates a value of the given target type diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ParserException.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/ParserException.java similarity index 95% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ParserException.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/ParserException.java index 5597e2cc6bad..0b7340b7f007 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ParserException.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/ParserException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.json; /** * Represents a parser related exception. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/StateMachine.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/StateMachine.java similarity index 99% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/StateMachine.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/StateMachine.java index c605927b1e28..66450a1ccaa8 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/StateMachine.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/StateMachine.java @@ -16,7 +16,7 @@ * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.json; import io.ballerina.identifier.Utils; import io.ballerina.runtime.api.creators.ErrorCreator; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableJsonDataSource.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/TableJsonDataSource.java similarity index 97% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableJsonDataSource.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/TableJsonDataSource.java index 80132514c4ae..da34291ad572 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableJsonDataSource.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/json/TableJsonDataSource.java @@ -15,12 +15,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.json; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; @@ -28,6 +28,7 @@ import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BTable; +import io.ballerina.runtime.internal.TypeChecker; import io.ballerina.runtime.internal.types.BArrayType; import io.ballerina.runtime.internal.types.BMapType; import io.ballerina.runtime.internal.values.ArrayValue; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/launch/LaunchUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/launch/LaunchUtils.java index f68340154f23..98d3610a17e9 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/launch/LaunchUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/launch/LaunchUtils.java @@ -30,7 +30,7 @@ import io.ballerina.runtime.internal.configurable.providers.toml.TomlFileProvider; import io.ballerina.runtime.internal.diagnostics.RuntimeDiagnosticLog; import io.ballerina.runtime.internal.troubleshoot.StrandDump; -import io.ballerina.runtime.internal.util.RuntimeUtils; +import io.ballerina.runtime.internal.utils.RuntimeUtils; import sun.misc.Signal; import java.io.File; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/RepositoryImpl.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/repository/RepositoryImpl.java similarity index 96% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/RepositoryImpl.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/repository/RepositoryImpl.java index 002c04780501..f737e17bd7d5 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/RepositoryImpl.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/repository/RepositoryImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.repository; -import io.ballerina.runtime.api.Artifact; -import io.ballerina.runtime.api.Node; -import io.ballerina.runtime.api.Repository; +import io.ballerina.runtime.api.repository.Artifact; +import io.ballerina.runtime.api.repository.Node; +import io.ballerina.runtime.api.repository.Repository; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BObject; import io.ballerina.runtime.internal.types.BServiceType; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/AsyncUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/AsyncUtils.java index 234a3edb06c3..cc4ab7517707 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/AsyncUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/AsyncUtils.java @@ -22,7 +22,7 @@ import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BString; -import io.ballerina.runtime.internal.ErrorUtils; +import io.ballerina.runtime.internal.utils.ErrorUtils; import io.ballerina.runtime.internal.values.FutureValue; import io.ballerina.runtime.internal.values.MapValue; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ClassloaderRuntime.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/ClassloaderRuntime.java similarity index 88% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ClassloaderRuntime.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/ClassloaderRuntime.java index d1ced5c7289e..6fec4cc46231 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ClassloaderRuntime.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/ClassloaderRuntime.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.scheduling; import io.ballerina.runtime.api.Module; +import io.ballerina.runtime.internal.BalRuntime; import io.ballerina.runtime.internal.values.ValueCreator; /** @@ -34,7 +35,7 @@ public ClassloaderRuntime(Module module, ClassLoader classLoader) { } @Override - Class loadClass(String className) throws ClassNotFoundException { + protected Class loadClass(String className) throws ClassNotFoundException { String name = getFullQualifiedClassName(rootModule, className); return Class.forName(name, true, classLoader); } diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/RuntimeRegistry.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/RuntimeRegistry.java index f620c8a03c10..e5860dd51757 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/RuntimeRegistry.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/RuntimeRegistry.java @@ -18,7 +18,7 @@ import io.ballerina.runtime.api.values.BFunctionPointer; import io.ballerina.runtime.api.values.BObject; -import io.ballerina.runtime.internal.util.RuntimeUtils; +import io.ballerina.runtime.internal.utils.RuntimeUtils; import io.ballerina.runtime.internal.values.ObjectValue; import java.util.ArrayDeque; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/Scheduler.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/Scheduler.java index 23e6ac1d618a..a7b657dceba5 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/Scheduler.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/Scheduler.java @@ -18,8 +18,7 @@ package io.ballerina.runtime.internal.scheduling; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; -import io.ballerina.runtime.api.async.StrandMetadata; +import io.ballerina.runtime.api.concurrent.StrandMetadata; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.FunctionType; import io.ballerina.runtime.api.types.MethodType; @@ -28,15 +27,16 @@ import io.ballerina.runtime.api.types.RemoteMethodType; import io.ballerina.runtime.api.types.ResourceMethodType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BNever; import io.ballerina.runtime.api.values.BObject; import io.ballerina.runtime.internal.BalRuntime; -import io.ballerina.runtime.internal.ErrorUtils; import io.ballerina.runtime.internal.types.BFunctionType; import io.ballerina.runtime.internal.types.BServiceType; +import io.ballerina.runtime.internal.utils.ErrorUtils; import io.ballerina.runtime.internal.values.FPValue; import io.ballerina.runtime.internal.values.FutureValue; import io.ballerina.runtime.internal.values.ObjectValue; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/Strand.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/Strand.java index bf606bb0b3af..d089297683ec 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/Strand.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/Strand.java @@ -18,7 +18,7 @@ package io.ballerina.runtime.internal.scheduling; -import io.ballerina.runtime.internal.ErrorUtils; +import io.ballerina.runtime.internal.utils.ErrorUtils; import io.ballerina.runtime.transactions.TransactionLocalContext; import java.util.HashMap; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/WorkerChannel.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/WorkerChannel.java index 1ccd66091ea9..d84f2f7d90bf 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/WorkerChannel.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/WorkerChannel.java @@ -18,7 +18,7 @@ package io.ballerina.runtime.internal.scheduling; import io.ballerina.runtime.api.values.BError; -import io.ballerina.runtime.internal.ErrorUtils; +import io.ballerina.runtime.internal.utils.ErrorUtils; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicInteger; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/WorkerUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/WorkerUtils.java index a787ba1a8bf1..8ce61df47bc1 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/WorkerUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/WorkerUtils.java @@ -18,21 +18,21 @@ package io.ballerina.runtime.internal.scheduling; - import io.ballerina.runtime.api.TypeTags; - import io.ballerina.runtime.api.creators.ErrorCreator; - import io.ballerina.runtime.api.creators.ValueCreator; - import io.ballerina.runtime.api.types.MapType; - import io.ballerina.runtime.api.types.RecordType; - import io.ballerina.runtime.api.types.Type; - import io.ballerina.runtime.api.utils.StringUtils; - import io.ballerina.runtime.api.values.BError; - import io.ballerina.runtime.api.values.BMap; - import io.ballerina.runtime.api.values.BMapInitialValueEntry; - import io.ballerina.runtime.api.values.BString; - import io.ballerina.runtime.internal.values.ErrorValue; - - import java.util.Map; - import java.util.concurrent.CompletableFuture; +import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.MapType; +import io.ballerina.runtime.api.types.RecordType; +import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; +import io.ballerina.runtime.api.utils.StringUtils; +import io.ballerina.runtime.api.values.BError; +import io.ballerina.runtime.api.values.BMap; +import io.ballerina.runtime.api.values.BMapInitialValueEntry; +import io.ballerina.runtime.api.values.BString; +import io.ballerina.runtime.internal.values.ErrorValue; + +import java.util.Map; +import java.util.concurrent.CompletableFuture; /** diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BAnyType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BAnyType.java index 6c9dfbbd046f..feb9d147bf7c 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BAnyType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BAnyType.java @@ -18,13 +18,13 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.constants.TypeConstants; import io.ballerina.runtime.api.flags.TypeFlags; import io.ballerina.runtime.api.types.AnyType; import io.ballerina.runtime.api.types.IntersectionType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.internal.values.RefValue; import java.util.Optional; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BAnydataType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BAnydataType.java index 7d006df8e080..0bc38e99f4fb 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BAnydataType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BAnydataType.java @@ -18,12 +18,12 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.constants.TypeConstants; import io.ballerina.runtime.api.flags.TypeFlags; import io.ballerina.runtime.api.types.AnydataType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.internal.values.RefValue; /** diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BArrayType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BArrayType.java index d73fb58f5a82..a399bcddf71a 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BArrayType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BArrayType.java @@ -17,11 +17,11 @@ */ package io.ballerina.runtime.internal.types; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.flags.TypeFlags; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.internal.TypeChecker; import io.ballerina.runtime.internal.values.ArrayValue; import io.ballerina.runtime.internal.values.ArrayValueImpl; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BBooleanType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BBooleanType.java index 28031b69e41e..6fd5b0afb07d 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BBooleanType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BBooleanType.java @@ -18,8 +18,8 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.BooleanType; +import io.ballerina.runtime.api.types.TypeTags; /** * {@code BBooleanType} represents boolean type in Ballerina. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BByteType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BByteType.java index 8e5cda22dfbc..97aca3f82894 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BByteType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BByteType.java @@ -19,8 +19,8 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.ByteType; +import io.ballerina.runtime.api.types.TypeTags; /** * {@code BByteType} represents byte type in Ballerina. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BDecimalType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BDecimalType.java index a5af3b4d220a..d1bf252d0f0b 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BDecimalType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BDecimalType.java @@ -19,8 +19,8 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.DecimalType; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.internal.values.DecimalValue; import java.math.BigDecimal; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BErrorType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BErrorType.java index 59cf32500a3d..8c1002def149 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BErrorType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BErrorType.java @@ -19,11 +19,11 @@ import io.ballerina.identifier.Utils; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.ErrorType; import io.ballerina.runtime.api.types.IntersectionType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.internal.values.ErrorValue; import java.util.Optional; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFiniteType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFiniteType.java index 3ca2ae443844..de03a587aa95 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFiniteType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFiniteType.java @@ -18,9 +18,9 @@ package io.ballerina.runtime.internal.types; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.flags.TypeFlags; import io.ballerina.runtime.api.types.FiniteType; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.internal.TypeChecker; import io.ballerina.runtime.internal.values.RefValue; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFloatType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFloatType.java index 2ef0d084d3e9..50450df52beb 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFloatType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFloatType.java @@ -18,8 +18,8 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.FloatType; +import io.ballerina.runtime.api.types.TypeTags; /** * {@code BFloatType} represents a integer which is a 32-bit floating-point number according to the diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFunctionType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFunctionType.java index c46110ff3c53..dbef43081922 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFunctionType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFunctionType.java @@ -19,12 +19,12 @@ import io.ballerina.identifier.Utils; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.FunctionType; import io.ballerina.runtime.api.types.Parameter; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import java.util.Arrays; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFutureType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFutureType.java index df747fc1865c..3eb490648562 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFutureType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFutureType.java @@ -18,10 +18,10 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.constants.TypeConstants; import io.ballerina.runtime.api.types.FutureType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.internal.TypeChecker; /** diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BHandleType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BHandleType.java index 89b5482936bf..ed1065c1df9e 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BHandleType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BHandleType.java @@ -18,8 +18,8 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.HandleType; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.internal.values.RefValue; /** diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BIntegerType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BIntegerType.java index d8e290013da6..d8ec02af768b 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BIntegerType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BIntegerType.java @@ -18,8 +18,8 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.IntegerType; +import io.ballerina.runtime.api.types.TypeTags; /** * {@code BIntegerType} represents an integer which is a 32-bit signed number. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BIntersectionType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BIntersectionType.java index c2112f4a4578..f9cf98a079df 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BIntersectionType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BIntersectionType.java @@ -18,12 +18,12 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.constants.TypeConstants; import io.ballerina.runtime.api.flags.TypeFlags; import io.ballerina.runtime.api.types.IntersectableReferenceType; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import java.util.ArrayList; import java.util.Arrays; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BIteratorType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BIteratorType.java index 13d870f510b6..5f4a3dde387a 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BIteratorType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BIteratorType.java @@ -18,8 +18,8 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.IteratorType; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.internal.values.IteratorValue; /** diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BJsonType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BJsonType.java index 382a5d4b66f8..f8ea801b62ce 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BJsonType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BJsonType.java @@ -18,12 +18,12 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.constants.TypeConstants; import io.ballerina.runtime.api.flags.TypeFlags; import io.ballerina.runtime.api.types.JsonType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.internal.values.MapValueImpl; /** diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BMapType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BMapType.java index c69aaa56c144..fa47a26e06fc 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BMapType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BMapType.java @@ -18,12 +18,12 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.constants.TypeConstants; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.MapType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.internal.values.MapValueImpl; import io.ballerina.runtime.internal.values.ReadOnlyUtils; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BNeverType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BNeverType.java index 9f0d4da9901b..f57eedcc6dcf 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BNeverType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BNeverType.java @@ -18,9 +18,9 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.constants.TypeConstants; import io.ballerina.runtime.api.types.NeverType; +import io.ballerina.runtime.api.types.TypeTags; /** * {@code BNeverType} represents the type of a {@code Never}. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BNullType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BNullType.java index 702133228119..9070784980fc 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BNullType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BNullType.java @@ -18,8 +18,8 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.NullType; +import io.ballerina.runtime.api.types.TypeTags; /** * {@code BNullType} represents the type of a {@code NullLiteral}. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BObjectType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BObjectType.java index a4e609158587..05cd15e570fc 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BObjectType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BObjectType.java @@ -19,7 +19,6 @@ import io.ballerina.identifier.Utils; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.Field; @@ -29,11 +28,12 @@ import io.ballerina.runtime.api.types.ResourceMethodType; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.types.TypeIdSet; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BObject; -import io.ballerina.runtime.internal.ValueUtils; import io.ballerina.runtime.internal.scheduling.Scheduler; import io.ballerina.runtime.internal.scheduling.Strand; +import io.ballerina.runtime.internal.utils.ValueUtils; import java.lang.reflect.Array; import java.util.ArrayList; @@ -42,7 +42,7 @@ import java.util.Optional; import java.util.StringJoiner; -import static io.ballerina.runtime.api.TypeTags.SERVICE_TAG; +import static io.ballerina.runtime.api.types.TypeTags.SERVICE_TAG; /** * {@code BObjectType} represents a user defined object type in Ballerina. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BParameterizedType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BParameterizedType.java index ca8a47508c11..9ab78cf7271c 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BParameterizedType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BParameterizedType.java @@ -18,9 +18,9 @@ package io.ballerina.runtime.internal.types; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.ParameterizedType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; /** * {@code ParameterizedType} represents the parameterized type in dependently-typed functions. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BReadonlyType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BReadonlyType.java index 8fb84c638a1e..c945f4941839 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BReadonlyType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BReadonlyType.java @@ -18,8 +18,8 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.ReadonlyType; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.internal.values.RefValue; /** diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BRecordType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BRecordType.java index 9e092513709f..2af42d5596d2 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BRecordType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BRecordType.java @@ -20,7 +20,6 @@ import io.ballerina.identifier.Utils; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.flags.TypeFlags; @@ -28,6 +27,7 @@ import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.RecordType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BFunctionPointer; import io.ballerina.runtime.api.values.BMap; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BServiceType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BServiceType.java index 2a0a074eee8a..2834b873c348 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BServiceType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BServiceType.java @@ -17,8 +17,8 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.ServiceType; +import io.ballerina.runtime.api.types.TypeTags; /** * {@code BServiceType} represents a service object in Ballerina. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BStreamType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BStreamType.java index 049ba7f16452..494dc1d54642 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BStreamType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BStreamType.java @@ -19,11 +19,11 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.constants.TypeConstants; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.StreamType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.internal.values.StreamValue; import java.util.Objects; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BStringType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BStringType.java index 34be4d3d188f..0211eef19b38 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BStringType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BStringType.java @@ -18,9 +18,9 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.constants.RuntimeConstants; import io.ballerina.runtime.api.types.StringType; +import io.ballerina.runtime.api.types.TypeTags; /** * {@code BStringType} represents a String type in ballerina. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BTableType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BTableType.java index 1aae344cfd3e..14c7d2b803e2 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BTableType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BTableType.java @@ -17,11 +17,11 @@ */ package io.ballerina.runtime.internal.types; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.constants.TypeConstants; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.TableType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.internal.values.ReadOnlyUtils; import io.ballerina.runtime.internal.values.TableValue; import io.ballerina.runtime.internal.values.TableValueImpl; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BTupleType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BTupleType.java index 21fb42a59f92..e4758fd5e8b8 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BTupleType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BTupleType.java @@ -19,11 +19,11 @@ import io.ballerina.identifier.Utils; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.flags.TypeFlags; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.TupleType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.internal.values.ReadOnlyUtils; import io.ballerina.runtime.internal.values.TupleValueImpl; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BType.java index 5d2aba9ddc8f..d6cd9c996ba3 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BType.java @@ -18,10 +18,10 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.internal.TypeChecker; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BTypeReferenceType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BTypeReferenceType.java index 4d228b2d78f6..cc2e78d6a319 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BTypeReferenceType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BTypeReferenceType.java @@ -20,11 +20,11 @@ import io.ballerina.identifier.Utils; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.flags.TypeFlags; import io.ballerina.runtime.api.types.IntersectableReferenceType; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import java.util.Objects; import java.util.Optional; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BTypedescType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BTypedescType.java index a6988bc263cb..411d75cf9662 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BTypedescType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BTypedescType.java @@ -19,10 +19,10 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.constants.TypeConstants; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.TypedescType; import io.ballerina.runtime.internal.values.TypedescValue; import io.ballerina.runtime.internal.values.TypedescValueImpl; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BUnionType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BUnionType.java index 3f957eac231a..4fe1f164c653 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BUnionType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BUnionType.java @@ -18,12 +18,12 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.flags.TypeFlags; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.SelectivelyImmutableReferenceType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.internal.TypeChecker; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BXmlAttributesType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BXmlAttributesType.java index d9edf897051a..629be337797f 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BXmlAttributesType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BXmlAttributesType.java @@ -18,7 +18,7 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.XmlAttributesType; /** diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BXmlType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BXmlType.java index c48c9d085594..05e1cde6985c 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BXmlType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BXmlType.java @@ -18,10 +18,10 @@ package io.ballerina.runtime.internal.types; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.constants.TypeConstants; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.XmlType; import io.ballerina.runtime.internal.values.ReadOnlyUtils; import io.ballerina.runtime.internal.values.XmlSequence; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/AnnotationUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/AnnotationUtils.java similarity index 98% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/AnnotationUtils.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/AnnotationUtils.java index 2fa4a634eb7b..00b7d37b44f4 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/AnnotationUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/AnnotationUtils.java @@ -15,13 +15,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.utils; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.MethodType; import io.ballerina.runtime.api.types.ResourceMethodType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BString; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BalStringUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/BalStringUtils.java similarity index 96% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BalStringUtils.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/BalStringUtils.java index fb6d5c4540c6..6a6e087d9c14 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BalStringUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/BalStringUtils.java @@ -16,17 +16,19 @@ * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.utils; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.MapType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BLink; import io.ballerina.runtime.api.values.BString; +import io.ballerina.runtime.internal.TypeChecker; +import io.ballerina.runtime.internal.TypeConverter; import io.ballerina.runtime.internal.types.BArrayType; import io.ballerina.runtime.internal.types.BMapType; import io.ballerina.runtime.internal.types.BTableType; @@ -35,15 +37,16 @@ import io.ballerina.runtime.internal.values.ArrayValueImpl; import io.ballerina.runtime.internal.values.MapValueImpl; import io.ballerina.runtime.internal.values.TableValueImpl; +import io.ballerina.runtime.internal.xml.XmlFactory; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_ANYDATA; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_ANYDATA; import static io.ballerina.runtime.api.utils.StringUtils.fromString; -import static io.ballerina.runtime.internal.util.StringUtils.parseExpressionStringVal; +import static io.ballerina.runtime.internal.utils.StringUtils.parseExpressionStringVal; /** * Common utility methods used for Ballerina expression syntax manipulation. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/CloneUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/CloneUtils.java similarity index 97% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/CloneUtils.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/CloneUtils.java index 3a41e8eefb85..9f9b718da505 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/CloneUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/CloneUtils.java @@ -16,7 +16,7 @@ * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.utils; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.values.BError; @@ -87,7 +87,7 @@ public static BError createConversionError(Object value, Type targetType, List errors, int maxErrorCount) { + public static String getErrorMessage(List errors, int maxErrorCount) { StringBuilder errorMsg = new StringBuilder(); int totalErrorCount = errors.size(); int tabs = 0; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/util/CompatibilityChecker.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/CompatibilityChecker.java similarity index 98% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/util/CompatibilityChecker.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/CompatibilityChecker.java index f0f1507122bc..e8efa2609140 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/util/CompatibilityChecker.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/CompatibilityChecker.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.ballerina.runtime.internal.util; +package io.ballerina.runtime.internal.utils; import java.io.PrintStream; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/CycleUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/CycleUtils.java similarity index 97% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/CycleUtils.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/CycleUtils.java index 545f89c4efbf..0977f7c8d0aa 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/CycleUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/CycleUtils.java @@ -15,7 +15,7 @@ * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.utils; import io.ballerina.runtime.api.values.BLink; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/util/DefaultLogFormatter.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/DefaultLogFormatter.java similarity index 97% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/util/DefaultLogFormatter.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/DefaultLogFormatter.java index a2c91cccf61b..c7a8adfa48cd 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/util/DefaultLogFormatter.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/DefaultLogFormatter.java @@ -16,7 +16,7 @@ * under the License. */ -package io.ballerina.runtime.internal.util; +package io.ballerina.runtime.internal.utils; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ErrorUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/ErrorUtils.java similarity index 98% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ErrorUtils.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/ErrorUtils.java index 56d31d57a8e9..52fab8c498d0 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ErrorUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/ErrorUtils.java @@ -15,15 +15,16 @@ * specific language governing permissions and limitations * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.utils; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BString; +import io.ballerina.runtime.internal.TypeChecker; import io.ballerina.runtime.internal.errors.ErrorCodes; import io.ballerina.runtime.internal.errors.ErrorHelper; import io.ballerina.runtime.internal.errors.ErrorReasons; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/FloatUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/FloatUtils.java similarity index 96% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/FloatUtils.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/FloatUtils.java index ac1af0ccb240..3816425567d4 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/FloatUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/FloatUtils.java @@ -16,7 +16,7 @@ * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.utils; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BString; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/IteratorUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/IteratorUtils.java similarity index 97% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/IteratorUtils.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/IteratorUtils.java index 867b0a355c9d..81e84a8ee550 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/IteratorUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/IteratorUtils.java @@ -16,7 +16,7 @@ * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.utils; import io.ballerina.runtime.api.constants.TypeConstants; import io.ballerina.runtime.api.flags.SymbolFlags; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/util/LargeStructureUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/LargeStructureUtils.java similarity index 98% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/util/LargeStructureUtils.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/LargeStructureUtils.java index 252b866237a0..06507e72c758 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/util/LargeStructureUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/LargeStructureUtils.java @@ -16,7 +16,7 @@ * under the License. */ -package io.ballerina.runtime.internal.util; +package io.ballerina.runtime.internal.utils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BMap; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/MapUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/MapUtils.java similarity index 98% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/MapUtils.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/MapUtils.java index 2b062de290e8..2ae27c4cd2cb 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/MapUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/MapUtils.java @@ -15,16 +15,17 @@ * specific language governing permissions and limitations * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.utils; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.Field; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BString; +import io.ballerina.runtime.internal.TypeChecker; import io.ballerina.runtime.internal.errors.ErrorCodes; import io.ballerina.runtime.internal.errors.ErrorHelper; import io.ballerina.runtime.internal.types.BMapType; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/MathUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/MathUtils.java similarity index 98% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/MathUtils.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/MathUtils.java index 1c0d1b21b77d..5d551d8e777c 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/MathUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/MathUtils.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.utils; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.utils.StringUtils; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/util/RuntimeUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/RuntimeUtils.java similarity index 98% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/util/RuntimeUtils.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/RuntimeUtils.java index 67c0dda5b8e8..2b5a1d09c9ab 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/util/RuntimeUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/RuntimeUtils.java @@ -16,15 +16,14 @@ * under the License. */ -package io.ballerina.runtime.internal.util; +package io.ballerina.runtime.internal.utils; import io.ballerina.identifier.Utils; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BValue; -import io.ballerina.runtime.internal.ErrorUtils; import io.ballerina.runtime.internal.diagnostics.RuntimeDiagnosticLog; import io.ballerina.runtime.internal.scheduling.AsyncUtils; import io.ballerina.runtime.internal.values.ErrorValue; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/util/StringUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/StringUtils.java similarity index 98% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/util/StringUtils.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/StringUtils.java index fa44bae7cf50..94dba9a34a70 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/util/StringUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/StringUtils.java @@ -16,21 +16,19 @@ * under the License. */ -package io.ballerina.runtime.internal.util; +package io.ballerina.runtime.internal.utils; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.MethodType; import io.ballerina.runtime.api.types.ObjectType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BLink; import io.ballerina.runtime.api.values.BRefValue; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BValue; -import io.ballerina.runtime.internal.BalStringUtils; -import io.ballerina.runtime.internal.CycleUtils; import io.ballerina.runtime.internal.TypeChecker; import io.ballerina.runtime.internal.regexp.RegExpFactory; import io.ballerina.runtime.internal.scheduling.Scheduler; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/TableUtils.java similarity index 95% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableUtils.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/TableUtils.java index cd4bade3c1c5..86db615cef2d 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/TableUtils.java @@ -15,13 +15,14 @@ * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.utils; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BRefValue; +import io.ballerina.runtime.internal.TypeChecker; import io.ballerina.runtime.internal.errors.ErrorCodes; import io.ballerina.runtime.internal.errors.ErrorHelper; import io.ballerina.runtime.internal.values.ArrayValue; @@ -32,8 +33,8 @@ import java.util.Map; -import static io.ballerina.runtime.internal.CycleUtils.Node; import static io.ballerina.runtime.internal.errors.ErrorReasons.TABLE_KEY_CYCLIC_VALUE_REFERENCE_ERROR; +import static io.ballerina.runtime.internal.utils.CycleUtils.Node; /** * This class contains the utility methods required by the table implementation. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ValueComparisonUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/ValueComparisonUtils.java similarity index 98% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ValueComparisonUtils.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/ValueComparisonUtils.java index 13f1010ceabc..48f33fda34ab 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ValueComparisonUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/ValueComparisonUtils.java @@ -16,18 +16,20 @@ * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.utils; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BError; +import io.ballerina.runtime.internal.TypeChecker; import io.ballerina.runtime.internal.values.DecimalValue; +import io.ballerina.runtime.internal.values.DecimalValueKind; import io.ballerina.runtime.internal.values.TupleValueImpl; import java.util.PrimitiveIterator; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_NULL; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_NULL; /** * Class @{@link ValueComparisonUtils} provides utils to compare Ballerina Values. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ValueConverter.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/ValueConverter.java similarity index 98% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ValueConverter.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/ValueConverter.java index d29f432d9712..ec772ed9b133 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ValueConverter.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/ValueConverter.java @@ -16,9 +16,8 @@ * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.utils; -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.AnydataType; @@ -30,6 +29,7 @@ import io.ballerina.runtime.api.types.TableType; import io.ballerina.runtime.api.types.TupleType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.TypedescType; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; @@ -42,6 +42,8 @@ import io.ballerina.runtime.api.values.BTable; import io.ballerina.runtime.api.values.BTypedesc; import io.ballerina.runtime.api.values.BXml; +import io.ballerina.runtime.internal.TypeChecker; +import io.ballerina.runtime.internal.TypeConverter; import io.ballerina.runtime.internal.commons.TypeValuePair; import io.ballerina.runtime.internal.errors.ErrorCodes; import io.ballerina.runtime.internal.errors.ErrorHelper; @@ -65,7 +67,7 @@ import java.util.Set; import static io.ballerina.runtime.api.creators.ErrorCreator.createError; -import static io.ballerina.runtime.internal.ErrorUtils.createConversionError; +import static io.ballerina.runtime.internal.utils.ErrorUtils.createConversionError; /** * Responsible for performing the conversion of values between subtypes of {@link AnydataType} at runtime. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ValueUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/ValueUtils.java similarity index 99% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ValueUtils.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/ValueUtils.java index 1f83bc6c1a22..e2701a607244 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/ValueUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/ValueUtils.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.utils; import io.ballerina.runtime.api.Module; import io.ballerina.runtime.api.creators.TypeCreator; @@ -32,6 +32,7 @@ import io.ballerina.runtime.api.values.BTypedesc; import io.ballerina.runtime.api.values.BValue; import io.ballerina.runtime.api.values.BXml; +import io.ballerina.runtime.internal.TypeConverter; import io.ballerina.runtime.internal.scheduling.Scheduler; import io.ballerina.runtime.internal.scheduling.Strand; import io.ballerina.runtime.internal.types.BRecordType; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/AbstractArrayValue.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/AbstractArrayValue.java index ab80640c69d0..4768e51ecd52 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/AbstractArrayValue.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/AbstractArrayValue.java @@ -17,16 +17,16 @@ */ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; -import io.ballerina.runtime.internal.IteratorUtils; -import io.ballerina.runtime.internal.JsonGenerator; import io.ballerina.runtime.internal.errors.ErrorHelper; +import io.ballerina.runtime.internal.json.JsonGenerator; import io.ballerina.runtime.internal.types.BTupleType; import io.ballerina.runtime.internal.types.BUnionType; +import io.ballerina.runtime.internal.utils.IteratorUtils; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/ArrayValueImpl.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/ArrayValueImpl.java index e983854997ef..ad1896b75e76 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/ArrayValueImpl.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/ArrayValueImpl.java @@ -17,13 +17,13 @@ */ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.constants.RuntimeConstants; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.ArrayType.ArrayState; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; @@ -34,13 +34,13 @@ import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BTypedesc; import io.ballerina.runtime.api.values.BValue; -import io.ballerina.runtime.internal.CycleUtils; import io.ballerina.runtime.internal.TypeChecker; -import io.ballerina.runtime.internal.ValueConverter; import io.ballerina.runtime.internal.errors.ErrorCodes; import io.ballerina.runtime.internal.errors.ErrorHelper; import io.ballerina.runtime.internal.errors.ErrorReasons; import io.ballerina.runtime.internal.types.BArrayType; +import io.ballerina.runtime.internal.utils.CycleUtils; +import io.ballerina.runtime.internal.utils.ValueConverter; import java.io.IOException; import java.io.OutputStream; @@ -54,12 +54,12 @@ import java.util.stream.IntStream; import static io.ballerina.runtime.api.constants.RuntimeConstants.ARRAY_LANG_LIB; -import static io.ballerina.runtime.internal.ValueUtils.getTypedescValue; import static io.ballerina.runtime.internal.errors.ErrorReasons.INDEX_OUT_OF_RANGE_ERROR_IDENTIFIER; import static io.ballerina.runtime.internal.errors.ErrorReasons.INHERENT_TYPE_VIOLATION_ERROR_IDENTIFIER; import static io.ballerina.runtime.internal.errors.ErrorReasons.getModulePrefixedReason; -import static io.ballerina.runtime.internal.util.StringUtils.getExpressionStringVal; -import static io.ballerina.runtime.internal.util.StringUtils.getStringVal; +import static io.ballerina.runtime.internal.utils.StringUtils.getExpressionStringVal; +import static io.ballerina.runtime.internal.utils.StringUtils.getStringVal; +import static io.ballerina.runtime.internal.utils.ValueUtils.getTypedescValue; /** *

diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/AttributeMapValueImpl.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/AttributeMapValueImpl.java index ea3b593194ef..ca62b3ea88cb 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/AttributeMapValueImpl.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/AttributeMapValueImpl.java @@ -17,13 +17,13 @@ */ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BString; -import io.ballerina.runtime.internal.XmlValidator; import io.ballerina.runtime.internal.errors.ErrorHelper; import io.ballerina.runtime.internal.types.BMapType; +import io.ballerina.runtime.internal.xml.XmlValidator; import javax.xml.XMLConstants; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/DecimalValue.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/DecimalValue.java index 2771264baf37..ec48ef7789af 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/DecimalValue.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/DecimalValue.java @@ -18,17 +18,16 @@ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.constants.RuntimeConstants; import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.values.BDecimal; import io.ballerina.runtime.api.values.BLink; -import io.ballerina.runtime.internal.DecimalValueKind; -import io.ballerina.runtime.internal.ErrorUtils; import io.ballerina.runtime.internal.errors.ErrorCodes; import io.ballerina.runtime.internal.errors.ErrorHelper; import io.ballerina.runtime.internal.errors.ErrorReasons; +import io.ballerina.runtime.internal.utils.ErrorUtils; import java.math.BigDecimal; import java.math.MathContext; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/DecimalValueKind.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/DecimalValueKind.java similarity index 95% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/DecimalValueKind.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/DecimalValueKind.java index 275b86ef1bdf..cc77a215e4f4 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/DecimalValueKind.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/DecimalValueKind.java @@ -16,7 +16,7 @@ * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.values; /** * Possible kinds of a decimal value. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/ErrorValue.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/ErrorValue.java index 5b4bed0934ca..f8cd391a127a 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/ErrorValue.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/ErrorValue.java @@ -19,11 +19,11 @@ import io.ballerina.identifier.Utils; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.constants.TypeConstants; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.types.TypeId; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BError; @@ -33,10 +33,10 @@ import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BTypedesc; import io.ballerina.runtime.api.values.BValue; -import io.ballerina.runtime.internal.CycleUtils; import io.ballerina.runtime.internal.TypeChecker; import io.ballerina.runtime.internal.types.BErrorType; import io.ballerina.runtime.internal.types.BTypeIdSet; +import io.ballerina.runtime.internal.utils.CycleUtils; import java.io.PrintStream; import java.io.PrintWriter; @@ -49,13 +49,13 @@ import java.util.Set; import java.util.StringJoiner; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_MAP; import static io.ballerina.runtime.api.constants.RuntimeConstants.BLANG_SRC_FILE_SUFFIX; import static io.ballerina.runtime.api.constants.RuntimeConstants.DOT; import static io.ballerina.runtime.api.constants.RuntimeConstants.MODULE_INIT_CLASS_NAME; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_MAP; import static io.ballerina.runtime.internal.TypeChecker.isEqual; -import static io.ballerina.runtime.internal.util.StringUtils.getExpressionStringVal; -import static io.ballerina.runtime.internal.util.StringUtils.getStringVal; +import static io.ballerina.runtime.internal.utils.StringUtils.getExpressionStringVal; +import static io.ballerina.runtime.internal.utils.StringUtils.getStringVal; /** *

diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/FutureValue.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/FutureValue.java index b8f1c1768d84..7dda2fecd950 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/FutureValue.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/FutureValue.java @@ -17,21 +17,21 @@ */ package io.ballerina.runtime.internal.values; - import io.ballerina.runtime.api.types.Type; - import io.ballerina.runtime.api.values.BError; - import io.ballerina.runtime.api.values.BFuture; - import io.ballerina.runtime.api.values.BLink; - import io.ballerina.runtime.api.values.BTypedesc; - import io.ballerina.runtime.internal.scheduling.AsyncUtils; - import io.ballerina.runtime.internal.scheduling.Scheduler; - import io.ballerina.runtime.internal.scheduling.Strand; - import io.ballerina.runtime.internal.types.BFutureType; - import io.ballerina.runtime.internal.util.StringUtils; - - import java.util.Map; - import java.util.StringJoiner; - import java.util.concurrent.CompletableFuture; - import java.util.concurrent.atomic.AtomicBoolean; +import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.values.BError; +import io.ballerina.runtime.api.values.BFuture; +import io.ballerina.runtime.api.values.BLink; +import io.ballerina.runtime.api.values.BTypedesc; +import io.ballerina.runtime.internal.scheduling.AsyncUtils; +import io.ballerina.runtime.internal.scheduling.Scheduler; +import io.ballerina.runtime.internal.scheduling.Strand; +import io.ballerina.runtime.internal.types.BFutureType; +import io.ballerina.runtime.internal.utils.StringUtils; + +import java.util.Map; +import java.util.StringJoiner; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.atomic.AtomicBoolean; /** *

diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/HandleValue.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/HandleValue.java index 42f5ce5c100f..c0aff83e5122 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/HandleValue.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/HandleValue.java @@ -17,7 +17,7 @@ */ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.values.BHandle; import io.ballerina.runtime.api.values.BLink; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/IteratorValue.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/IteratorValue.java index 8004a431ad5f..6934af3536ce 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/IteratorValue.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/IteratorValue.java @@ -17,7 +17,7 @@ */ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.values.BIterator; import io.ballerina.runtime.api.values.BLink; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/MapValueImpl.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/MapValueImpl.java index a72c7ed38d42..1361db3b3697 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/MapValueImpl.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/MapValueImpl.java @@ -17,11 +17,11 @@ */ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.Field; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BError; @@ -34,20 +34,20 @@ import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BTypedesc; import io.ballerina.runtime.api.values.BValue; -import io.ballerina.runtime.internal.CycleUtils; -import io.ballerina.runtime.internal.IteratorUtils; -import io.ballerina.runtime.internal.JsonGenerator; -import io.ballerina.runtime.internal.JsonInternalUtils; -import io.ballerina.runtime.internal.MapUtils; import io.ballerina.runtime.internal.TypeChecker; import io.ballerina.runtime.internal.errors.ErrorCodes; import io.ballerina.runtime.internal.errors.ErrorHelper; +import io.ballerina.runtime.internal.json.JsonGenerator; +import io.ballerina.runtime.internal.json.JsonInternalUtils; import io.ballerina.runtime.internal.scheduling.Scheduler; import io.ballerina.runtime.internal.types.BField; import io.ballerina.runtime.internal.types.BMapType; import io.ballerina.runtime.internal.types.BRecordType; import io.ballerina.runtime.internal.types.BTupleType; import io.ballerina.runtime.internal.types.BUnionType; +import io.ballerina.runtime.internal.utils.CycleUtils; +import io.ballerina.runtime.internal.utils.IteratorUtils; +import io.ballerina.runtime.internal.utils.MapUtils; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -66,15 +66,15 @@ import static io.ballerina.runtime.api.constants.RuntimeConstants.MAP_LANG_LIB; import static io.ballerina.runtime.api.utils.TypeUtils.getImpliedType; -import static io.ballerina.runtime.internal.JsonInternalUtils.mergeJson; import static io.ballerina.runtime.internal.TypeChecker.isEqual; -import static io.ballerina.runtime.internal.ValueUtils.getTypedescValue; import static io.ballerina.runtime.internal.errors.ErrorCodes.INVALID_READONLY_VALUE_UPDATE; import static io.ballerina.runtime.internal.errors.ErrorReasons.INVALID_UPDATE_ERROR_IDENTIFIER; import static io.ballerina.runtime.internal.errors.ErrorReasons.MAP_KEY_NOT_FOUND_ERROR; import static io.ballerina.runtime.internal.errors.ErrorReasons.getModulePrefixedReason; -import static io.ballerina.runtime.internal.util.StringUtils.getExpressionStringVal; -import static io.ballerina.runtime.internal.util.StringUtils.getStringVal; +import static io.ballerina.runtime.internal.json.JsonInternalUtils.mergeJson; +import static io.ballerina.runtime.internal.utils.StringUtils.getExpressionStringVal; +import static io.ballerina.runtime.internal.utils.StringUtils.getStringVal; +import static io.ballerina.runtime.internal.utils.ValueUtils.getTypedescValue; import static io.ballerina.runtime.internal.values.ReadOnlyUtils.handleInvalidUpdate; /** diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/ReadOnlyUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/ReadOnlyUtils.java index 78f4bff92be7..c9ba580378da 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/ReadOnlyUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/ReadOnlyUtils.java @@ -19,8 +19,6 @@ import io.ballerina.identifier.Utils; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.constants.TypeConstants; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.flags.SymbolFlags; @@ -28,9 +26,11 @@ import io.ballerina.runtime.api.types.Field; import io.ballerina.runtime.api.types.IntersectableReferenceType; import io.ballerina.runtime.api.types.IntersectionType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.ReferenceType; import io.ballerina.runtime.api.types.SelectivelyImmutableReferenceType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BFunctionPointer; import io.ballerina.runtime.internal.TypeChecker; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpAtomQuantifier.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpAtomQuantifier.java index 21a3bef34c66..0ab09925fe7d 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpAtomQuantifier.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpAtomQuantifier.java @@ -21,7 +21,7 @@ import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.internal.regexp.RegExpFactory; -import static io.ballerina.runtime.internal.util.StringUtils.getStringVal; +import static io.ballerina.runtime.internal.utils.StringUtils.getStringVal; /** *

diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpCommonValue.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpCommonValue.java index 1b460f8e276d..aa790ee4bf74 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpCommonValue.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpCommonValue.java @@ -17,7 +17,7 @@ */ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.values.BLink; import io.ballerina.runtime.api.values.BTypedesc; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpDisjunction.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpDisjunction.java index 54cde1be1df8..8f2a32084878 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpDisjunction.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpDisjunction.java @@ -21,7 +21,7 @@ import java.util.StringJoiner; -import static io.ballerina.runtime.internal.util.StringUtils.getStringVal; +import static io.ballerina.runtime.internal.utils.StringUtils.getStringVal; /** *

diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpValue.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpValue.java index da45d3856a1e..c9a4fd8f30c7 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpValue.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpValue.java @@ -15,7 +15,7 @@ */ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.values.BLink; import io.ballerina.runtime.api.values.BRegexpValue; @@ -25,7 +25,7 @@ import java.util.Objects; import java.util.Set; -import static io.ballerina.runtime.internal.ValueUtils.getTypedescValue; +import static io.ballerina.runtime.internal.utils.ValueUtils.getTypedescValue; /** *

diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/StreamValue.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/StreamValue.java index bf0eb2d4a2ca..7f6d1ed45728 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/StreamValue.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/StreamValue.java @@ -23,8 +23,8 @@ import io.ballerina.runtime.api.values.BObject; import io.ballerina.runtime.api.values.BStream; import io.ballerina.runtime.api.values.BTypedesc; -import io.ballerina.runtime.internal.IteratorUtils; import io.ballerina.runtime.internal.types.BStreamType; +import io.ballerina.runtime.internal.utils.IteratorUtils; import java.util.Map; import java.util.UUID; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/StreamingJsonValue.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/StreamingJsonValue.java index e532436f0c9e..be4449349c57 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/StreamingJsonValue.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/StreamingJsonValue.java @@ -17,12 +17,12 @@ */ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.values.BLink; import io.ballerina.runtime.api.values.BStreamingJson; -import io.ballerina.runtime.internal.JsonDataSource; -import io.ballerina.runtime.internal.JsonGenerator; -import io.ballerina.runtime.internal.JsonInternalUtils; +import io.ballerina.runtime.internal.json.JsonDataSource; +import io.ballerina.runtime.internal.json.JsonGenerator; +import io.ballerina.runtime.internal.json.JsonInternalUtils; import io.ballerina.runtime.internal.types.BArrayType; import io.ballerina.runtime.internal.types.BMapType; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/StringValue.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/StringValue.java index a96fcacd5a07..3898b3aa8ca4 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/StringValue.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/StringValue.java @@ -17,7 +17,7 @@ */ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.values.BLink; import io.ballerina.runtime.api.values.BString; 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 index 7c584496c9ff..c027da267680 100644 --- 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 @@ -17,12 +17,12 @@ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.Field; import io.ballerina.runtime.api.types.TableType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; @@ -33,9 +33,6 @@ import io.ballerina.runtime.api.values.BRefValue; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BTypedesc; -import io.ballerina.runtime.internal.CycleUtils; -import io.ballerina.runtime.internal.IteratorUtils; -import io.ballerina.runtime.internal.TableUtils; import io.ballerina.runtime.internal.TypeChecker; import io.ballerina.runtime.internal.errors.ErrorCodes; import io.ballerina.runtime.internal.errors.ErrorHelper; @@ -46,6 +43,9 @@ import io.ballerina.runtime.internal.types.BTupleType; import io.ballerina.runtime.internal.types.BTypeReferenceType; import io.ballerina.runtime.internal.types.BUnionType; +import io.ballerina.runtime.internal.utils.CycleUtils; +import io.ballerina.runtime.internal.utils.IteratorUtils; +import io.ballerina.runtime.internal.utils.TableUtils; import java.util.AbstractMap; import java.util.ArrayList; @@ -67,14 +67,14 @@ import static io.ballerina.runtime.api.constants.RuntimeConstants.TABLE_LANG_LIB; import static io.ballerina.runtime.api.utils.TypeUtils.getImpliedType; import static io.ballerina.runtime.internal.TypeChecker.isEqual; -import static io.ballerina.runtime.internal.ValueUtils.getTypedescValue; import static io.ballerina.runtime.internal.errors.ErrorReasons.INHERENT_TYPE_VIOLATION_ERROR_IDENTIFIER; import static io.ballerina.runtime.internal.errors.ErrorReasons.OPERATION_NOT_SUPPORTED_ERROR; import static io.ballerina.runtime.internal.errors.ErrorReasons.TABLE_HAS_A_VALUE_FOR_KEY_ERROR; import static io.ballerina.runtime.internal.errors.ErrorReasons.TABLE_KEY_NOT_FOUND_ERROR; import static io.ballerina.runtime.internal.errors.ErrorReasons.getModulePrefixedReason; -import static io.ballerina.runtime.internal.util.StringUtils.getExpressionStringVal; -import static io.ballerina.runtime.internal.util.StringUtils.getStringVal; +import static io.ballerina.runtime.internal.utils.StringUtils.getExpressionStringVal; +import static io.ballerina.runtime.internal.utils.StringUtils.getStringVal; +import static io.ballerina.runtime.internal.utils.ValueUtils.getTypedescValue; /** * The runtime representation of table. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/TupleValueImpl.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/TupleValueImpl.java index 922b1ce59a21..b6db397f4617 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/TupleValueImpl.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/TupleValueImpl.java @@ -17,10 +17,10 @@ */ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.TupleType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; @@ -31,12 +31,12 @@ import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BTypedesc; import io.ballerina.runtime.api.values.BValue; -import io.ballerina.runtime.internal.CycleUtils; import io.ballerina.runtime.internal.TypeChecker; -import io.ballerina.runtime.internal.ValueConverter; import io.ballerina.runtime.internal.errors.ErrorCodes; import io.ballerina.runtime.internal.errors.ErrorHelper; import io.ballerina.runtime.internal.errors.ErrorReasons; +import io.ballerina.runtime.internal.utils.CycleUtils; +import io.ballerina.runtime.internal.utils.ValueConverter; import java.io.IOException; import java.io.OutputStream; @@ -48,13 +48,13 @@ import java.util.stream.IntStream; import static io.ballerina.runtime.api.constants.RuntimeConstants.ARRAY_LANG_LIB; -import static io.ballerina.runtime.internal.ValueUtils.getTypedescValue; import static io.ballerina.runtime.internal.errors.ErrorReasons.INDEX_OUT_OF_RANGE_ERROR_IDENTIFIER; import static io.ballerina.runtime.internal.errors.ErrorReasons.INHERENT_TYPE_VIOLATION_ERROR_IDENTIFIER; import static io.ballerina.runtime.internal.errors.ErrorReasons.OPERATION_NOT_SUPPORTED_IDENTIFIER; import static io.ballerina.runtime.internal.errors.ErrorReasons.getModulePrefixedReason; -import static io.ballerina.runtime.internal.util.StringUtils.getExpressionStringVal; -import static io.ballerina.runtime.internal.util.StringUtils.getStringVal; +import static io.ballerina.runtime.internal.utils.StringUtils.getExpressionStringVal; +import static io.ballerina.runtime.internal.utils.StringUtils.getStringVal; +import static io.ballerina.runtime.internal.utils.ValueUtils.getTypedescValue; /** *

diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/TypedescValueImpl.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/TypedescValueImpl.java index 39dc6347600a..043ab88d84d3 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/TypedescValueImpl.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/TypedescValueImpl.java @@ -17,9 +17,9 @@ */ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BInitialValueEntry; import io.ballerina.runtime.api.values.BLink; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlComment.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlComment.java index 00cab7fe4d6b..1e67f4aa3bca 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlComment.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlComment.java @@ -17,7 +17,7 @@ */ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.XmlNodeType; import io.ballerina.runtime.api.values.BLink; import org.apache.axiom.om.OMNode; 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 index 10d35118e3a2..602186748313 100644 --- 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 @@ -16,8 +16,8 @@ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.XmlNodeType; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BError; @@ -27,12 +27,12 @@ import io.ballerina.runtime.api.values.BXml; import io.ballerina.runtime.api.values.BXmlItem; import io.ballerina.runtime.api.values.BXmlSequence; -import io.ballerina.runtime.internal.BallerinaXmlSerializer; -import io.ballerina.runtime.internal.XmlFactory; -import io.ballerina.runtime.internal.XmlValidator; import io.ballerina.runtime.internal.errors.ErrorCodes; import io.ballerina.runtime.internal.errors.ErrorHelper; import io.ballerina.runtime.internal.errors.ErrorReasons; +import io.ballerina.runtime.internal.xml.BallerinaXmlSerializer; +import io.ballerina.runtime.internal.xml.XmlFactory; +import io.ballerina.runtime.internal.xml.XmlValidator; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMException; import org.apache.axiom.om.OMNode; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlNonElementItem.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlNonElementItem.java index 8a404e5b755e..ac102cdbfcd2 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlNonElementItem.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlNonElementItem.java @@ -24,9 +24,9 @@ import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BXml; import io.ballerina.runtime.api.values.BXmlNonElementItem; -import io.ballerina.runtime.internal.BallerinaXmlSerializer; import io.ballerina.runtime.internal.errors.ErrorCodes; import io.ballerina.runtime.internal.errors.ErrorHelper; +import io.ballerina.runtime.internal.xml.BallerinaXmlSerializer; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMFactory; import org.apache.axiom.om.OMNode; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlPi.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlPi.java index 8ece7823964d..b829b82237c4 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlPi.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlPi.java @@ -17,7 +17,7 @@ */ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.XmlNodeType; import io.ballerina.runtime.api.values.BLink; import org.apache.axiom.om.OMNode; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlQName.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlQName.java index d4cc801acc11..6b495deb68f4 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlQName.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlQName.java @@ -17,7 +17,7 @@ */ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.values.BLink; import io.ballerina.runtime.api.values.BString; @@ -27,7 +27,7 @@ import java.util.Map; import java.util.Objects; -import static io.ballerina.runtime.internal.ValueUtils.getTypedescValue; +import static io.ballerina.runtime.internal.utils.ValueUtils.getTypedescValue; /** *

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 index f024b023c122..5343f2eb6d93 100644 --- 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 @@ -16,11 +16,11 @@ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.constants.RuntimeConstants; import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.XmlNodeType; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; @@ -29,13 +29,13 @@ import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BXml; import io.ballerina.runtime.api.values.BXmlSequence; -import io.ballerina.runtime.internal.CycleUtils; -import io.ballerina.runtime.internal.IteratorUtils; -import io.ballerina.runtime.internal.XmlFactory; import io.ballerina.runtime.internal.errors.ErrorCodes; import io.ballerina.runtime.internal.errors.ErrorHelper; import io.ballerina.runtime.internal.types.BArrayType; import io.ballerina.runtime.internal.types.BUnionType; +import io.ballerina.runtime.internal.utils.CycleUtils; +import io.ballerina.runtime.internal.utils.IteratorUtils; +import io.ballerina.runtime.internal.xml.XmlFactory; import java.util.ArrayList; import java.util.HashSet; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlText.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlText.java index 5103c770ebe3..dd1ff14d75a8 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlText.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlText.java @@ -17,7 +17,7 @@ */ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.types.XmlNodeType; import io.ballerina.runtime.api.values.BXml; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlValue.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlValue.java index 23443629ca47..30c606d8c4b2 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlValue.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlValue.java @@ -16,8 +16,8 @@ package io.ballerina.runtime.internal.values; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.types.XmlNodeType; import io.ballerina.runtime.api.utils.StringUtils; @@ -27,8 +27,8 @@ import io.ballerina.runtime.api.values.BTypedesc; import io.ballerina.runtime.api.values.BXml; import io.ballerina.runtime.api.values.BXmlQName; -import io.ballerina.runtime.internal.BallerinaXmlSerializer; -import io.ballerina.runtime.internal.IteratorUtils; +import io.ballerina.runtime.internal.utils.IteratorUtils; +import io.ballerina.runtime.internal.xml.BallerinaXmlSerializer; import java.io.OutputStream; import java.util.List; @@ -36,7 +36,7 @@ import javax.xml.namespace.QName; -import static io.ballerina.runtime.internal.ValueUtils.getTypedescValue; +import static io.ballerina.runtime.internal.utils.ValueUtils.getTypedescValue; /** * {@code BXML} represents an XML in Ballerina. An XML could be one of: diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BallerinaXmlSerializer.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/xml/BallerinaXmlSerializer.java similarity index 99% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BallerinaXmlSerializer.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/xml/BallerinaXmlSerializer.java index cdce109da43a..2003aea3e180 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BallerinaXmlSerializer.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/xml/BallerinaXmlSerializer.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.xml; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BXml; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableOmDataSource.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/xml/TableOmDataSource.java similarity index 98% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableOmDataSource.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/xml/TableOmDataSource.java index 0178af2e19b5..aa8fe2fd8a75 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableOmDataSource.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/xml/TableOmDataSource.java @@ -15,12 +15,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.xml; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.Field; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/XmlFactory.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/xml/XmlFactory.java similarity index 99% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/XmlFactory.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/xml/XmlFactory.java index 096f3c8f40c6..54d02df83796 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/XmlFactory.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/xml/XmlFactory.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.xml; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.XmlNodeType; @@ -25,6 +25,7 @@ import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BXml; import io.ballerina.runtime.api.values.BXmlQName; +import io.ballerina.runtime.internal.TypeChecker; import io.ballerina.runtime.internal.values.TableValueImpl; import io.ballerina.runtime.internal.values.XmlComment; import io.ballerina.runtime.internal.values.XmlItem; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/XmlTreeBuilder.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/xml/XmlTreeBuilder.java similarity index 99% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/XmlTreeBuilder.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/xml/XmlTreeBuilder.java index 922215fee5c4..7d8786231423 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/XmlTreeBuilder.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/xml/XmlTreeBuilder.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.xml; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.utils.StringUtils; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/XmlValidator.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/xml/XmlValidator.java similarity index 99% rename from bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/XmlValidator.java rename to bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/xml/XmlValidator.java index 0d9e69977bd8..99f7b117ddbb 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/XmlValidator.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/xml/XmlValidator.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.ballerina.runtime.internal; +package io.ballerina.runtime.internal.xml; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.utils.StringUtils; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/ObserveUtils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/ObserveUtils.java index 759bf3f0210b..685add2c9219 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/ObserveUtils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/ObserveUtils.java @@ -19,8 +19,8 @@ import io.ballerina.runtime.api.Environment; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.types.ObjectType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BObject; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/tracer/BSpan.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/tracer/BSpan.java index 8350ce227bb4..1b9ecc424ceb 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/tracer/BSpan.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/tracer/BSpan.java @@ -17,10 +17,10 @@ */ package io.ballerina.runtime.observability.tracer; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.MapType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BMapInitialValueEntry; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java index 0a3a103aca0e..dc44d816da2c 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java @@ -18,9 +18,9 @@ package io.ballerina.runtime.transactions; import com.atomikos.icatch.jta.UserTransactionManager; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BFunctionPointer; import io.ballerina.runtime.api.values.BString; @@ -28,7 +28,7 @@ import io.ballerina.runtime.internal.configurable.VariableKey; import io.ballerina.runtime.internal.scheduling.Scheduler; import io.ballerina.runtime.internal.scheduling.Strand; -import io.ballerina.runtime.internal.util.RuntimeUtils; +import io.ballerina.runtime.internal.utils.RuntimeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,7 +58,6 @@ import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; - import static io.ballerina.runtime.transactions.TransactionConstants.DEFAULT_TRX_AUTO_COMMIT_TIMEOUT; import static io.ballerina.runtime.transactions.TransactionConstants.DEFAULT_TRX_CLEANUP_TIMEOUT; import static io.ballerina.runtime.transactions.TransactionConstants.TRANSACTION_PACKAGE_ID; diff --git a/bvm/ballerina-runtime/src/main/java/module-info.java b/bvm/ballerina-runtime/src/main/java/module-info.java index 436117e62686..d09fee04a70a 100644 --- a/bvm/ballerina-runtime/src/main/java/module-info.java +++ b/bvm/ballerina-runtime/src/main/java/module-info.java @@ -21,7 +21,7 @@ // API exports exports io.ballerina.runtime.api; - exports io.ballerina.runtime.api.async; + exports io.ballerina.runtime.api.concurrent; exports io.ballerina.runtime.api.constants; exports io.ballerina.runtime.api.creators; exports io.ballerina.runtime.api.flags; @@ -37,31 +37,15 @@ exports io.ballerina.runtime.transactions; // export only for Langlib , Cli and Testerina - exports io.ballerina.runtime.internal to io.ballerina.testerina.core, io.ballerina.testerina.runtime, - io.ballerina.lang, io.ballerina.lang.map, io.ballerina.lang.test, io.ballerina.lang.array, - io.ballerina.lang.table, io.ballerina.lang.value, io.ballerina.lang.xml, ballerina.debug.adapter.core, - io.ballerina.cli, io.ballerina.lang.integer, io.ballerina.lang.bool, io.ballerina.lang.decimal, - io.ballerina.lang.floatingpoint, io.ballerina.lang.internal, io.ballerina.lang.function, - io.ballerina.lang.regexp, io.ballerina.runtime.profiler, io.ballerina.shell, - org.ballerinalang.debugadapter.runtime; exports io.ballerina.runtime.internal.commons to io.ballerina.lang.value; exports io.ballerina.runtime.internal.launch to io.ballerina.testerina.runtime, ballerina.test.listener, io.ballerina.cli, org.ballerinalang.debugadapter.runtime; - exports io.ballerina.runtime.internal.util to io.ballerina.testerina.runtime, io.ballerina.lang, - io.ballerina.lang.integer, io.ballerina.lang.floatingpoint, io.ballerina.lang.array, - io.ballerina.lang.table, io.ballerina.java, io.ballerina.lang.map, io.ballerina.lang.string, - io.ballerina.lang.xml, io.ballerina.lang.bool, io.ballerina.lang.error, io.ballerina.lang.internal, - io.ballerina.lang.value, io.ballerina.cli; exports io.ballerina.runtime.internal.errors to io.ballerina.lang.value, io.ballerina.lang.integer, io.ballerina.java, io.ballerina.lang.internal, io.ballerina.lang.array, io.ballerina.lang.bool, io.ballerina.lang.floatingpoint, io.ballerina.lang.map, io.ballerina.lang.string, io.ballerina.lang.table, io.ballerina.lang.xml, io.ballerina.testerina.core, io.ballerina.cli, io.ballerina.lang.decimal, org.ballerinalang.debugadapter.runtime, io.ballerina.lang.function, io.ballerina.lang.regexp; - exports io.ballerina.runtime.internal.values to io.ballerina.testerina.core, io.ballerina.testerina.runtime, - io.ballerina.lang.xml, org.ballerinalang.debugadapter.runtime, io.ballerina.lang.query, - io.ballerina.lang.function, io.ballerina.lang.regexp, io.ballerina.lang.value, io.ballerina.lang.internal, - io.ballerina.runtime.profiler, io.ballerina.lang.array; exports io.ballerina.runtime.internal.configurable to io.ballerina.lang.internal; exports io.ballerina.runtime.internal.types to io.ballerina.lang.typedesc, io.ballerina.testerina.runtime, org.ballerinalang.debugadapter.runtime, io.ballerina.lang.function, io.ballerina.lang.regexp, io.ballerina.testerina.core, @@ -71,4 +55,11 @@ exports io.ballerina.runtime.internal.regexp; exports io.ballerina.runtime.internal.configurable.providers to org.ballerinalang.debugadapter.runtime; exports io.ballerina.runtime.internal.scheduling to ballerina.debug.adapter.core, io.ballerina.cli, io.ballerina.cli.utils, io.ballerina.java, io.ballerina.lang, io.ballerina.lang.array, io.ballerina.lang.bool, io.ballerina.lang.decimal, io.ballerina.lang.error, io.ballerina.lang.floatingpoint, io.ballerina.lang.function, io.ballerina.lang.integer, io.ballerina.lang.internal, io.ballerina.lang.map, io.ballerina.lang.regexp, io.ballerina.lang.table, io.ballerina.lang.test, io.ballerina.lang.transaction, io.ballerina.lang.value, io.ballerina.lang.xml, io.ballerina.log.api, io.ballerina.runtime.profiler, io.ballerina.shell, io.ballerina.testerina.core, io.ballerina.testerina.runtime, org.ballerinalang.debugadapter.runtime; + exports io.ballerina.runtime.internal.json to ballerina.debug.adapter.core, io.ballerina.cli, io.ballerina.lang, io.ballerina.lang.array, io.ballerina.lang.bool, io.ballerina.lang.decimal, io.ballerina.lang.floatingpoint, io.ballerina.lang.function, io.ballerina.lang.integer, io.ballerina.lang.internal, io.ballerina.lang.map, io.ballerina.lang.regexp, io.ballerina.lang.table, io.ballerina.lang.test, io.ballerina.lang.value, io.ballerina.lang.xml, io.ballerina.runtime.profiler, io.ballerina.shell, io.ballerina.testerina.core, io.ballerina.testerina.runtime, org.ballerinalang.debugadapter.runtime; + exports io.ballerina.runtime.internal.utils to ballerina.debug.adapter.core, io.ballerina.cli, io.ballerina.java, io.ballerina.lang, io.ballerina.lang.array, io.ballerina.lang.bool, io.ballerina.lang.decimal, io.ballerina.lang.error, io.ballerina.lang.floatingpoint, io.ballerina.lang.function, io.ballerina.lang.integer, io.ballerina.lang.internal, io.ballerina.lang.map, io.ballerina.lang.regexp, io.ballerina.lang.string, io.ballerina.lang.table, io.ballerina.lang.test, io.ballerina.lang.value, io.ballerina.lang.xml, io.ballerina.runtime.profiler, io.ballerina.shell, io.ballerina.testerina.core, io.ballerina.testerina.runtime, org.ballerinalang.debugadapter.runtime; + exports io.ballerina.runtime.internal.xml to ballerina.debug.adapter.core, io.ballerina.cli, io.ballerina.lang, io.ballerina.lang.array, io.ballerina.lang.bool, io.ballerina.lang.decimal, io.ballerina.lang.floatingpoint, io.ballerina.lang.function, io.ballerina.lang.integer, io.ballerina.lang.internal, io.ballerina.lang.map, io.ballerina.lang.regexp, io.ballerina.lang.table, io.ballerina.lang.test, io.ballerina.lang.value, io.ballerina.lang.xml, io.ballerina.runtime.profiler, io.ballerina.shell, io.ballerina.testerina.core, io.ballerina.testerina.runtime, org.ballerinalang.debugadapter.runtime; + exports io.ballerina.runtime.internal.values to ballerina.debug.adapter.core, io.ballerina.cli, io.ballerina.lang, io.ballerina.lang.array, io.ballerina.lang.bool, io.ballerina.lang.decimal, io.ballerina.lang.floatingpoint, io.ballerina.lang.function, io.ballerina.lang.integer, io.ballerina.lang.internal, io.ballerina.lang.map, io.ballerina.lang.query, io.ballerina.lang.regexp, io.ballerina.lang.table, io.ballerina.lang.test, io.ballerina.lang.value, io.ballerina.lang.xml, io.ballerina.runtime.profiler, io.ballerina.shell, io.ballerina.testerina.core, io.ballerina.testerina.runtime, org.ballerinalang.debugadapter.runtime; + exports io.ballerina.runtime.internal to ballerina.debug.adapter.core, io.ballerina.cli, io.ballerina.cli.utils, io.ballerina.java, io.ballerina.lang, io.ballerina.lang.array, io.ballerina.lang.bool, io.ballerina.lang.decimal, io.ballerina.lang.error, io.ballerina.lang.floatingpoint, io.ballerina.lang.function, io.ballerina.lang.integer, io.ballerina.lang.internal, io.ballerina.lang.map, io.ballerina.lang.regexp, io.ballerina.lang.table, io.ballerina.lang.test, io.ballerina.lang.transaction, io.ballerina.lang.value, io.ballerina.lang.xml, io.ballerina.log.api, io.ballerina.runtime.profiler, io.ballerina.shell, io.ballerina.testerina.core, io.ballerina.testerina.runtime, org.ballerinalang.debugadapter.runtime; + exports io.ballerina.runtime.api.repository; + exports io.ballerina.runtime.internal.repository to ballerina.debug.adapter.core, io.ballerina.cli, io.ballerina.cli.utils, io.ballerina.java, io.ballerina.lang, io.ballerina.lang.array, io.ballerina.lang.bool, io.ballerina.lang.decimal, io.ballerina.lang.error, io.ballerina.lang.floatingpoint, io.ballerina.lang.function, io.ballerina.lang.integer, io.ballerina.lang.internal, io.ballerina.lang.map, io.ballerina.lang.regexp, io.ballerina.lang.table, io.ballerina.lang.test, io.ballerina.lang.transaction, io.ballerina.lang.value, io.ballerina.lang.xml, io.ballerina.log.api, io.ballerina.runtime.profiler, io.ballerina.shell, io.ballerina.testerina.core, io.ballerina.testerina.runtime, org.ballerinalang.debugadapter.runtime; } diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/RuntimeUtilTests.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/RuntimeUtilTests.java index 2d862f8909be..512f180cf4b9 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/RuntimeUtilTests.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/RuntimeUtilTests.java @@ -18,8 +18,8 @@ package io.ballerina.runtime.test; -import io.ballerina.runtime.internal.util.CompatibilityChecker; -import io.ballerina.runtime.internal.util.RuntimeUtils; +import io.ballerina.runtime.internal.utils.CompatibilityChecker; +import io.ballerina.runtime.internal.utils.RuntimeUtils; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/TestUtils.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/TestUtils.java index d215c5470de0..236871517167 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/TestUtils.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/TestUtils.java @@ -18,11 +18,11 @@ package io.ballerina.runtime.test; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.internal.configurable.VariableKey; import io.ballerina.runtime.internal.types.BIntersectionType; -import io.ballerina.runtime.internal.util.RuntimeUtils; +import io.ballerina.runtime.internal.utils.RuntimeUtils; import java.nio.file.Path; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/api/IntersectionTypeApiTests.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/api/IntersectionTypeApiTests.java index 4c6897c19065..d54e12989b55 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/api/IntersectionTypeApiTests.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/api/IntersectionTypeApiTests.java @@ -19,8 +19,8 @@ package io.ballerina.runtime.test.api; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.PredefinedTypes; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.ErrorType; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/cli/OperandTest.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/cli/OperandTest.java index ccc16d1a27d4..e8aa1e899678 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/cli/OperandTest.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/cli/OperandTest.java @@ -18,7 +18,7 @@ package io.ballerina.runtime.test.cli; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BDecimal; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/CliProviderTest.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/CliProviderTest.java index 71a55055055e..8be489f1feba 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/CliProviderTest.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/CliProviderTest.java @@ -19,7 +19,7 @@ package io.ballerina.runtime.test.config; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.FiniteType; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/ConfigTest.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/ConfigTest.java index 9807d9640e7e..8d57b1e5d8f6 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/ConfigTest.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/ConfigTest.java @@ -19,7 +19,7 @@ package io.ballerina.runtime.test.config; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.ArrayType; @@ -53,8 +53,8 @@ import java.util.Map; import java.util.Set; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_ANYDATA; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_STRING; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_ANYDATA; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_STRING; import static io.ballerina.runtime.test.TestUtils.getConfigPath; import static io.ballerina.runtime.test.TestUtils.getConfigPathForNegativeCases; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/EnvProviderTest.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/EnvProviderTest.java index 4f8b57d9034f..c4d17ac1efb4 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/EnvProviderTest.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/EnvProviderTest.java @@ -17,7 +17,7 @@ package io.ballerina.runtime.test.config; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.FiniteType; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/TomlProviderTest.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/TomlProviderTest.java index 3ab6dbf9311c..72991618e4a2 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/TomlProviderTest.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/TomlProviderTest.java @@ -19,7 +19,7 @@ package io.ballerina.runtime.test.config; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.ArrayType; @@ -53,12 +53,12 @@ import java.util.Set; import java.util.function.Function; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_ANYDATA; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_BYTE; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_DECIMAL; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_FLOAT; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_INT; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_STRING; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_ANYDATA; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_BYTE; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_DECIMAL; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_FLOAT; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_INT; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_STRING; import static io.ballerina.runtime.api.utils.StringUtils.fromString; import static io.ballerina.runtime.test.TestUtils.getConfigPath; import static io.ballerina.runtime.test.TestUtils.getIntersectionType; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/CliProviderNegativeTest.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/CliProviderNegativeTest.java index 9e6df0f45410..30697e69bd62 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/CliProviderNegativeTest.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/CliProviderNegativeTest.java @@ -19,7 +19,7 @@ package io.ballerina.runtime.test.config.negative; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.FiniteType; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/ConfigNegativeTest.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/ConfigNegativeTest.java index a3a2fc0cd202..0af23fb5a83a 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/ConfigNegativeTest.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/ConfigNegativeTest.java @@ -19,7 +19,7 @@ package io.ballerina.runtime.test.config.negative; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.types.MapType; import io.ballerina.runtime.api.types.Type; @@ -42,7 +42,7 @@ import java.util.Map; import java.util.Set; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_STRING; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_STRING; import static io.ballerina.runtime.test.TestUtils.getConfigPathForNegativeCases; /** diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/EnvProviderNegativeTest.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/EnvProviderNegativeTest.java index 46aa7e3fbfa0..21b037a8a8fe 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/EnvProviderNegativeTest.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/EnvProviderNegativeTest.java @@ -17,7 +17,7 @@ package io.ballerina.runtime.test.config.negative; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.FiniteType; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/TomlProviderNegativeTest.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/TomlProviderNegativeTest.java index 253b87ce7efb..2a84f6b8a8d6 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/TomlProviderNegativeTest.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/TomlProviderNegativeTest.java @@ -19,7 +19,7 @@ package io.ballerina.runtime.test.config.negative; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.flags.SymbolFlags; @@ -50,7 +50,7 @@ import java.util.Map; import java.util.Set; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_ANYDATA; +import static io.ballerina.runtime.api.types.PredefinedTypes.TYPE_ANYDATA; import static io.ballerina.runtime.api.utils.StringUtils.fromString; import static io.ballerina.runtime.test.TestUtils.getConfigPath; import static io.ballerina.runtime.test.TestUtils.getConfigPathForNegativeCases; diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/launcher/Main.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/launcher/Main.java index 4b0d8a039e21..29d8326b3911 100644 --- a/cli/ballerina-cli/src/main/java/io/ballerina/cli/launcher/Main.java +++ b/cli/ballerina-cli/src/main/java/io/ballerina/cli/launcher/Main.java @@ -20,7 +20,7 @@ import io.ballerina.cli.BLauncherCmd; import io.ballerina.cli.launcher.util.BalToolsUtil; -import io.ballerina.runtime.internal.util.RuntimeUtils; +import io.ballerina.runtime.internal.utils.RuntimeUtils; import org.ballerinalang.compiler.BLangCompilerException; import picocli.CommandLine; diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/utils/NativeUtils.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/utils/NativeUtils.java index d564891a6bda..7ed5cd20c891 100644 --- a/cli/ballerina-cli/src/main/java/io/ballerina/cli/utils/NativeUtils.java +++ b/cli/ballerina-cli/src/main/java/io/ballerina/cli/utils/NativeUtils.java @@ -23,7 +23,7 @@ import com.google.gson.reflect.TypeToken; import io.ballerina.projects.Package; import io.ballerina.projects.internal.model.Target; -import io.ballerina.runtime.internal.util.RuntimeUtils; +import io.ballerina.runtime.internal.utils.RuntimeUtils; import org.apache.commons.compress.utils.IOUtils; import org.ballerinalang.test.runtime.entity.MockFunctionReplaceVisitor; import org.ballerinalang.test.runtime.entity.TestSuite; diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/utils/RunCommandExecutor.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/utils/RunCommandExecutor.java index 1b3644692ee0..bb8c1eb87520 100644 --- a/cli/ballerina-cli/src/main/java/io/ballerina/cli/utils/RunCommandExecutor.java +++ b/cli/ballerina-cli/src/main/java/io/ballerina/cli/utils/RunCommandExecutor.java @@ -22,7 +22,7 @@ import io.ballerina.cli.launcher.BLauncherException; import io.ballerina.cli.launcher.LauncherUtils; import io.ballerina.cli.launcher.RuntimePanicException; -import io.ballerina.runtime.internal.util.RuntimeUtils; +import io.ballerina.runtime.internal.utils.RuntimeUtils; import org.ballerinalang.compiler.BLangCompilerException; import java.io.PrintStream; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/CompilerPhaseRunner.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/CompilerPhaseRunner.java index 5699656bceca..94a3a727885a 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/CompilerPhaseRunner.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/CompilerPhaseRunner.java @@ -17,7 +17,7 @@ */ package io.ballerina.projects.internal; -import io.ballerina.runtime.internal.util.RuntimeUtils; +import io.ballerina.runtime.internal.utils.RuntimeUtils; import org.ballerinalang.compiler.CompilerPhase; import org.wso2.ballerinalang.compiler.bir.BIRGen; import org.wso2.ballerinalang.compiler.bir.emit.BIREmitter; diff --git a/compiler/ballerina-lang/src/main/java/org/ballerinalang/spi/EmbeddedExecutor.java b/compiler/ballerina-lang/src/main/java/org/ballerinalang/spi/EmbeddedExecutor.java index 1020d420a9b4..df30a3d014dc 100644 --- a/compiler/ballerina-lang/src/main/java/org/ballerinalang/spi/EmbeddedExecutor.java +++ b/compiler/ballerina-lang/src/main/java/org/ballerinalang/spi/EmbeddedExecutor.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.spi; -import io.ballerina.runtime.api.async.StrandMetadata; +import io.ballerina.runtime.api.concurrent.StrandMetadata; import java.util.Optional; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmConstants.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmConstants.java index b9554676520a..8b36b3d02c79 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmConstants.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmConstants.java @@ -103,7 +103,7 @@ public final class JvmConstants { // types related classes public static final String TYPE = "io/ballerina/runtime/api/types/Type"; - public static final String PREDEFINED_TYPES = "io/ballerina/runtime/api/PredefinedTypes"; + public static final String PREDEFINED_TYPES = "io/ballerina/runtime/api/types/PredefinedTypes"; public static final String ARRAY_TYPE = "io/ballerina/runtime/api/types/ArrayType"; public static final String XML_TYPE = "io/ballerina/runtime/api/types/XmlType"; @@ -184,37 +184,37 @@ public final class JvmConstants { public static final String BAL_RUNTIME = "io/ballerina/runtime/internal/BalRuntime"; public static final String TYPE_CHECKER = "io/ballerina/runtime/internal/TypeChecker"; public static final String SCHEDULER = "io/ballerina/runtime/internal/scheduling/Scheduler"; - public static final String JSON_UTILS = "io/ballerina/runtime/internal/JsonInternalUtils"; + public static final String JSON_UTILS = "io/ballerina/runtime/internal/json/JsonInternalUtils"; public static final String STRAND_CLASS = "io/ballerina/runtime/internal/scheduling/Strand"; - public static final String STRAND_METADATA = "io/ballerina/runtime/api/async/StrandMetadata"; + public static final String STRAND_METADATA = "io/ballerina/runtime/api/concurrent/StrandMetadata"; public static final String BAL_ENV_CLASS = "io/ballerina/runtime/internal/BalEnvironment"; public static final String BAL_ENV = "io/ballerina/runtime/api/Environment"; public static final String TYPE_CONVERTER = "io/ballerina/runtime/internal/TypeConverter"; public static final String VALUE_CREATOR = "io/ballerina/runtime/internal/values/ValueCreator"; - public static final String XML_FACTORY = "io/ballerina/runtime/internal/XmlFactory"; + public static final String XML_FACTORY = "io/ballerina/runtime/internal/xml/XmlFactory"; public static final String XML_SEQUENCE = "io/ballerina/runtime/internal/values/XmlSequence"; public static final String ASYNC_UTILS = "io/ballerina/runtime/internal/scheduling/AsyncUtils"; public static final String WORKER_UTILS = "io/ballerina/runtime/internal/scheduling/WorkerUtils"; public static final String WORKER_CHANNEL_MAP = "io/ballerina/runtime/internal/scheduling/WorkerChannelMap"; - public static final String MAP_UTILS = "io/ballerina/runtime/internal/MapUtils"; - public static final String TABLE_UTILS = "io/ballerina/runtime/internal/TableUtils"; + public static final String MAP_UTILS = "io/ballerina/runtime/internal/utils/MapUtils"; + public static final String TABLE_UTILS = "io/ballerina/runtime/internal/utils/TableUtils"; public static final String STRING_UTILS = "io/ballerina/runtime/api/utils/StringUtils"; - public static final String ERROR_UTILS = "io/ballerina/runtime/internal/ErrorUtils"; - public static final String RUNTIME_UTILS = "io/ballerina/runtime/internal/util/RuntimeUtils"; - public static final String LARGE_STRUCTURE_UTILS = "io/ballerina/runtime/internal/util/LargeStructureUtils"; + public static final String ERROR_UTILS = "io/ballerina/runtime/internal/utils/ErrorUtils"; + public static final String RUNTIME_UTILS = "io/ballerina/runtime/internal/utils/RuntimeUtils"; + public static final String LARGE_STRUCTURE_UTILS = "io/ballerina/runtime/internal/utils/LargeStructureUtils"; public static final String OPTION = "io/ballerina/runtime/internal/cli/Option"; public static final String OPERAND = "io/ballerina/runtime/internal/cli/Operand"; public static final String CLI_SPEC = "io/ballerina/runtime/internal/cli/CliSpec"; public static final String LAUNCH_UTILS = "io/ballerina/runtime/internal/launch/LaunchUtils"; - public static final String MATH_UTILS = "io/ballerina/runtime/internal/MathUtils"; + public static final String MATH_UTILS = "io/ballerina/runtime/internal/utils/MathUtils"; public static final String ERROR_REASONS = "io/ballerina/runtime/internal/errors/ErrorReasons"; public static final String ERROR_CODES = "io/ballerina/runtime/internal/errors/ErrorCodes"; public static final String ERROR_HELPER = "io/ballerina/runtime/internal/errors/ErrorHelper"; - public static final String COMPATIBILITY_CHECKER = "io/ballerina/runtime/internal/util/CompatibilityChecker"; + public static final String COMPATIBILITY_CHECKER = "io/ballerina/runtime/internal/utils/CompatibilityChecker"; public static final String RUNTIME_REGISTRY_CLASS = "io/ballerina/runtime/internal/scheduling/RuntimeRegistry"; - public static final String VALUE_COMPARISON_UTILS = "io/ballerina/runtime/internal/ValueComparisonUtils"; + public static final String VALUE_COMPARISON_UTILS = "io/ballerina/runtime/internal/utils/ValueComparisonUtils"; public static final String REG_EXP_FACTORY = "io/ballerina/runtime/internal/regexp/RegExpFactory"; - public static final String REPOSITORY_IMPL = "io/ballerina/runtime/internal/RepositoryImpl"; + public static final String REPOSITORY_IMPL = "io/ballerina/runtime/internal/repository/RepositoryImpl"; // other java classes public static final String OBJECT = "java/lang/Object"; @@ -238,7 +238,7 @@ public final class JvmConstants { public static final String SYSTEM = "java/lang/System"; // service objects, annotation processing related classes - public static final String ANNOTATION_UTILS = "io/ballerina/runtime/internal/AnnotationUtils"; + public static final String ANNOTATION_UTILS = "io/ballerina/runtime/internal/utils/AnnotationUtils"; public static final String ANNOTATION_MAP_NAME = "$annotation_data"; public static final String ANNOTATIONS_FIELD = "$annotations"; public static final String DEFAULTABLE_ARGS_ANOT_NAME = "DefaultableArgs"; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java index 6acdf0aaf800..aa698df5108e 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java @@ -260,7 +260,7 @@ import io.ballerina.compiler.syntax.tree.XMLStepMethodCallExtendNode; import io.ballerina.compiler.syntax.tree.XMLTextNode; import io.ballerina.identifier.Utils; -import io.ballerina.runtime.internal.XmlFactory; +import io.ballerina.runtime.internal.xml.XmlFactory; import io.ballerina.tools.diagnostics.DiagnosticCode; import io.ballerina.tools.diagnostics.Location; import io.ballerina.tools.text.LinePosition; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/CompilerPluginRunner.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/CompilerPluginRunner.java index 9cda10484059..cdcaac598efd 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/CompilerPluginRunner.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/CompilerPluginRunner.java @@ -17,7 +17,7 @@ */ package org.wso2.ballerinalang.compiler.semantics.analyzer; -import io.ballerina.runtime.internal.util.RuntimeUtils; +import io.ballerina.runtime.internal.utils.RuntimeUtils; import io.ballerina.tools.diagnostics.Location; import org.ballerinalang.compiler.CompilerPhase; import org.ballerinalang.compiler.plugins.CompilerPlugin; diff --git a/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/GetCompletionType.java b/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/GetCompletionType.java index ad4a592f8db8..a96d2ee31900 100644 --- a/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/GetCompletionType.java +++ b/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/GetCompletionType.java @@ -18,11 +18,11 @@ package org.ballerinalang.langlib.internal; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.StreamType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BTypedesc; diff --git a/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/GetElementType.java b/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/GetElementType.java index 378194ce0f99..8135c33979fd 100644 --- a/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/GetElementType.java +++ b/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/GetElementType.java @@ -18,7 +18,6 @@ package org.ballerinalang.langlib.internal; -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; @@ -26,6 +25,7 @@ import io.ballerina.runtime.api.types.StreamType; import io.ballerina.runtime.api.types.TupleType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BTypedesc; import io.ballerina.runtime.api.values.BValue; diff --git a/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/GetFilterFunc.java b/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/GetFilterFunc.java index 08cea5aca77e..357109ed1168 100644 --- a/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/GetFilterFunc.java +++ b/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/GetFilterFunc.java @@ -18,9 +18,9 @@ package org.ballerinalang.langlib.internal; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.types.FunctionType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BFunctionPointer; diff --git a/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/GetMapFunc.java b/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/GetMapFunc.java index 69c45725dca9..15f9631f0ddf 100644 --- a/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/GetMapFunc.java +++ b/langlib/lang.__internal/src/main/java/org/ballerinalang/langlib/internal/GetMapFunc.java @@ -18,9 +18,9 @@ package org.ballerinalang.langlib.internal; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.types.FunctionType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BFunctionPointer; diff --git a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Enumerate.java b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Enumerate.java index e2195a49ab27..9b81784d7c2d 100644 --- a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Enumerate.java +++ b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Enumerate.java @@ -18,13 +18,13 @@ package org.ballerinalang.langlib.array; -import io.ballerina.runtime.api.PredefinedTypes; -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.PredefinedTypes; import io.ballerina.runtime.api.types.TupleType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; diff --git a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Filter.java b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Filter.java index 1ba4e2636d41..23c428feb4a9 100644 --- a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Filter.java +++ b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Filter.java @@ -19,10 +19,10 @@ package org.ballerinalang.langlib.array; import io.ballerina.runtime.api.Environment; -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.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BFunctionPointer; diff --git a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Map.java b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Map.java index 7343c38a858a..e61a8167c0b2 100644 --- a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Map.java +++ b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Map.java @@ -19,12 +19,12 @@ package org.ballerinalang.langlib.array; import io.ballerina.runtime.api.Environment; -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.FunctionType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BFunctionPointer; diff --git a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Pop.java b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Pop.java index 516be4f24d7b..53cf298a3a41 100644 --- a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Pop.java +++ b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Pop.java @@ -18,9 +18,9 @@ package org.ballerinalang.langlib.array; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.internal.values.ArrayValue; diff --git a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Push.java b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Push.java index 8fdd20a9db34..9dc59d054ea9 100644 --- a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Push.java +++ b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Push.java @@ -18,8 +18,8 @@ package org.ballerinalang.langlib.array; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; diff --git a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Reverse.java b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Reverse.java index 9eb39ab72a48..d48a7f7d3742 100644 --- a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Reverse.java +++ b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Reverse.java @@ -18,10 +18,10 @@ package org.ballerinalang.langlib.array; -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.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; import org.ballerinalang.langlib.array.utils.ArrayUtils; diff --git a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Slice.java b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Slice.java index 2ab2f69058ce..915a42040375 100644 --- a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Slice.java +++ b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Slice.java @@ -18,12 +18,12 @@ package org.ballerinalang.langlib.array; -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.TupleType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; diff --git a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Sort.java b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Sort.java index d36e7b60eb07..335857455491 100644 --- a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Sort.java +++ b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/Sort.java @@ -28,7 +28,7 @@ import io.ballerina.runtime.api.values.BFunctionPointer; import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BString; -import io.ballerina.runtime.internal.ValueComparisonUtils; +import io.ballerina.runtime.internal.utils.ValueComparisonUtils; import static io.ballerina.runtime.api.constants.RuntimeConstants.ARRAY_LANG_LIB; import static io.ballerina.runtime.internal.errors.ErrorReasons.INVALID_TYPE_TO_SORT; diff --git a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/ToBase16.java b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/ToBase16.java index 6bbabfb8bb01..2e1c54f47ccb 100644 --- a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/ToBase16.java +++ b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/ToBase16.java @@ -18,10 +18,10 @@ package org.ballerinalang.langlib.array; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; diff --git a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/ToBase64.java b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/ToBase64.java index 58707e693ce1..996fd70fa870 100644 --- a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/ToBase64.java +++ b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/ToBase64.java @@ -18,10 +18,10 @@ package org.ballerinalang.langlib.array; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; diff --git a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/utils/ArrayUtils.java b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/utils/ArrayUtils.java index 13df1d56986c..95f4712230d6 100644 --- a/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/utils/ArrayUtils.java +++ b/langlib/lang.array/src/main/java/org/ballerinalang/langlib/array/utils/ArrayUtils.java @@ -18,14 +18,14 @@ package org.ballerinalang.langlib.array.utils; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; 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.PredefinedTypes; import io.ballerina.runtime.api.types.TupleType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; diff --git a/langlib/lang.boolean/src/main/java/org/ballerinalang/langlib/bool/FromString.java b/langlib/lang.boolean/src/main/java/org/ballerinalang/langlib/bool/FromString.java index 70bea3597702..8c811af94bec 100644 --- a/langlib/lang.boolean/src/main/java/org/ballerinalang/langlib/bool/FromString.java +++ b/langlib/lang.boolean/src/main/java/org/ballerinalang/langlib/bool/FromString.java @@ -18,8 +18,8 @@ package org.ballerinalang.langlib.bool; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.internal.TypeConverter; import io.ballerina.runtime.internal.errors.ErrorCodes; diff --git a/langlib/lang.decimal/src/main/java/org/ballerinalang/langlib/decimal/FromString.java b/langlib/lang.decimal/src/main/java/org/ballerinalang/langlib/decimal/FromString.java index 994c743c25fe..9ab8b661965c 100644 --- a/langlib/lang.decimal/src/main/java/org/ballerinalang/langlib/decimal/FromString.java +++ b/langlib/lang.decimal/src/main/java/org/ballerinalang/langlib/decimal/FromString.java @@ -18,8 +18,8 @@ package org.ballerinalang.langlib.decimal; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.internal.TypeConverter; diff --git a/langlib/lang.error/src/main/java/org/ballerinalang/langlib/error/StackTrace.java b/langlib/lang.error/src/main/java/org/ballerinalang/langlib/error/StackTrace.java index fc2a4c161155..33212bd6edd9 100644 --- a/langlib/lang.error/src/main/java/org/ballerinalang/langlib/error/StackTrace.java +++ b/langlib/lang.error/src/main/java/org/ballerinalang/langlib/error/StackTrace.java @@ -19,12 +19,12 @@ import io.ballerina.identifier.Utils; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.MethodType; import io.ballerina.runtime.api.types.ObjectType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; diff --git a/langlib/lang.float/src/main/java/org/ballerinalang/langlib/floatingpoint/FromString.java b/langlib/lang.float/src/main/java/org/ballerinalang/langlib/floatingpoint/FromString.java index 0f9a0e1f515d..bd9b5abda757 100644 --- a/langlib/lang.float/src/main/java/org/ballerinalang/langlib/floatingpoint/FromString.java +++ b/langlib/lang.float/src/main/java/org/ballerinalang/langlib/floatingpoint/FromString.java @@ -18,8 +18,8 @@ package org.ballerinalang.langlib.floatingpoint; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.internal.TypeConverter; diff --git a/langlib/lang.float/src/main/java/org/ballerinalang/langlib/floatingpoint/ToExpString.java b/langlib/lang.float/src/main/java/org/ballerinalang/langlib/floatingpoint/ToExpString.java index b5d4993600ea..8c4aa5595e07 100644 --- a/langlib/lang.float/src/main/java/org/ballerinalang/langlib/floatingpoint/ToExpString.java +++ b/langlib/lang.float/src/main/java/org/ballerinalang/langlib/floatingpoint/ToExpString.java @@ -20,8 +20,8 @@ import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BString; -import io.ballerina.runtime.internal.ErrorUtils; -import io.ballerina.runtime.internal.FloatUtils; +import io.ballerina.runtime.internal.utils.ErrorUtils; +import io.ballerina.runtime.internal.utils.FloatUtils; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/langlib/lang.float/src/main/java/org/ballerinalang/langlib/floatingpoint/ToFixedString.java b/langlib/lang.float/src/main/java/org/ballerinalang/langlib/floatingpoint/ToFixedString.java index e7cad36e8069..39728318a53f 100644 --- a/langlib/lang.float/src/main/java/org/ballerinalang/langlib/floatingpoint/ToFixedString.java +++ b/langlib/lang.float/src/main/java/org/ballerinalang/langlib/floatingpoint/ToFixedString.java @@ -20,8 +20,8 @@ import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BString; -import io.ballerina.runtime.internal.ErrorUtils; -import io.ballerina.runtime.internal.FloatUtils; +import io.ballerina.runtime.internal.utils.ErrorUtils; +import io.ballerina.runtime.internal.utils.FloatUtils; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/langlib/lang.int/src/main/java/org/ballerinalang/langlib/integer/FromString.java b/langlib/lang.int/src/main/java/org/ballerinalang/langlib/integer/FromString.java index 01d3e83384d8..6c3bc9e77d73 100644 --- a/langlib/lang.int/src/main/java/org/ballerinalang/langlib/integer/FromString.java +++ b/langlib/lang.int/src/main/java/org/ballerinalang/langlib/integer/FromString.java @@ -18,8 +18,8 @@ package org.ballerinalang.langlib.integer; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.internal.TypeConverter; import io.ballerina.runtime.internal.errors.ErrorCodes; diff --git a/langlib/lang.int/src/main/java/org/ballerinalang/langlib/integer/Sum.java b/langlib/lang.int/src/main/java/org/ballerinalang/langlib/integer/Sum.java index c09364c8655c..64563248cb71 100644 --- a/langlib/lang.int/src/main/java/org/ballerinalang/langlib/integer/Sum.java +++ b/langlib/lang.int/src/main/java/org/ballerinalang/langlib/integer/Sum.java @@ -19,8 +19,8 @@ package org.ballerinalang.langlib.integer; import io.ballerina.runtime.api.values.BString; -import io.ballerina.runtime.internal.MathUtils; import io.ballerina.runtime.internal.errors.ErrorReasons; +import io.ballerina.runtime.internal.utils.MathUtils; import static io.ballerina.runtime.api.constants.RuntimeConstants.INT_LANG_LIB; import static io.ballerina.runtime.internal.errors.ErrorReasons.getModulePrefixedReason; diff --git a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Entries.java b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Entries.java index c31b9738515c..d7917e70d8b3 100644 --- a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Entries.java +++ b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Entries.java @@ -18,10 +18,10 @@ package org.ballerinalang.langlib.map; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.MapType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.TupleType; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.values.BArray; diff --git a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Filter.java b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Filter.java index 274939a971d4..cdf5b001e8d4 100644 --- a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Filter.java +++ b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Filter.java @@ -19,19 +19,19 @@ package org.ballerinalang.langlib.map; import io.ballerina.runtime.api.Environment; -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.MapType; import io.ballerina.runtime.api.types.RecordType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BFunctionPointer; import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BString; import org.ballerinalang.langlib.map.util.MapLibUtils; -import static io.ballerina.runtime.internal.MapUtils.createOpNotSupportedError; +import static io.ballerina.runtime.internal.utils.MapUtils.createOpNotSupportedError; /** * Native implementation of lang.map:filter(map<Type>, function). diff --git a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Remove.java b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Remove.java index 34914231ca15..e56bc81a72e8 100644 --- a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Remove.java +++ b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/Remove.java @@ -28,8 +28,8 @@ import io.ballerina.runtime.internal.errors.ErrorCodes; import io.ballerina.runtime.internal.errors.ErrorHelper; -import static io.ballerina.runtime.internal.MapUtils.checkIsMapOnlyOperation; import static io.ballerina.runtime.internal.errors.ErrorReasons.MAP_KEY_NOT_FOUND_ERROR; +import static io.ballerina.runtime.internal.utils.MapUtils.checkIsMapOnlyOperation; import static org.ballerinalang.langlib.map.util.Constants.REMOVE; import static org.ballerinalang.langlib.map.util.MapLibUtils.validateRequiredFieldForRecord; diff --git a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/RemoveAll.java b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/RemoveAll.java index ed37ebbaefca..0e540988f05e 100644 --- a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/RemoveAll.java +++ b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/RemoveAll.java @@ -26,7 +26,7 @@ import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.internal.errors.ErrorHelper; -import static io.ballerina.runtime.internal.MapUtils.checkIsMapOnlyOperation; +import static io.ballerina.runtime.internal.utils.MapUtils.checkIsMapOnlyOperation; import static org.ballerinalang.langlib.map.util.MapLibUtils.validateRecord; /** diff --git a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/RemoveIfHasKey.java b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/RemoveIfHasKey.java index 93dc35f3cfa4..48fbe8a36b37 100644 --- a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/RemoveIfHasKey.java +++ b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/RemoveIfHasKey.java @@ -26,7 +26,7 @@ import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.internal.errors.ErrorHelper; -import static io.ballerina.runtime.internal.MapUtils.checkIsMapOnlyOperation; +import static io.ballerina.runtime.internal.utils.MapUtils.checkIsMapOnlyOperation; import static org.ballerinalang.langlib.map.util.MapLibUtils.validateRequiredFieldForRecord; /** diff --git a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/ToArray.java b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/ToArray.java index e0a03818dff7..a04b329c2097 100644 --- a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/ToArray.java +++ b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/ToArray.java @@ -18,12 +18,12 @@ package org.ballerinalang.langlib.map; -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.MapType; import io.ballerina.runtime.api.types.RecordType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BMap; @@ -32,7 +32,7 @@ import java.util.Collection; -import static io.ballerina.runtime.internal.MapUtils.createOpNotSupportedError; +import static io.ballerina.runtime.internal.utils.MapUtils.createOpNotSupportedError; /** * Function for returning the values of the map as an array. T[] vals = m.toArray(); diff --git a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/util/MapLibUtils.java b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/util/MapLibUtils.java index bfb5952f3ea3..396f7b560798 100644 --- a/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/util/MapLibUtils.java +++ b/langlib/lang.map/src/main/java/org/ballerinalang/langlib/map/util/MapLibUtils.java @@ -18,7 +18,6 @@ package org.ballerinalang.langlib.map.util; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.flags.SymbolFlags; @@ -26,6 +25,7 @@ import io.ballerina.runtime.api.types.MapType; import io.ballerina.runtime.api.types.RecordType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BMap; @@ -38,9 +38,9 @@ import java.util.Map; import static io.ballerina.runtime.api.constants.RuntimeConstants.MAP_LANG_LIB; -import static io.ballerina.runtime.internal.MapUtils.createOpNotSupportedError; import static io.ballerina.runtime.internal.errors.ErrorReasons.OPERATION_NOT_SUPPORTED_IDENTIFIER; import static io.ballerina.runtime.internal.errors.ErrorReasons.getModulePrefixedReason; +import static io.ballerina.runtime.internal.utils.MapUtils.createOpNotSupportedError; /** * Utility methods for map lib functions. diff --git a/langlib/lang.regexp/src/main/java/org/ballerinalang/langlib/regexp/RegexUtil.java b/langlib/lang.regexp/src/main/java/org/ballerinalang/langlib/regexp/RegexUtil.java index 642d3ece809c..a56ddb5b6733 100644 --- a/langlib/lang.regexp/src/main/java/org/ballerinalang/langlib/regexp/RegexUtil.java +++ b/langlib/lang.regexp/src/main/java/org/ballerinalang/langlib/regexp/RegexUtil.java @@ -18,8 +18,8 @@ package org.ballerinalang.langlib.regexp; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BRegexpValue; diff --git a/langlib/lang.string/src/main/java/org/ballerinalang/langlib/string/Next.java b/langlib/lang.string/src/main/java/org/ballerinalang/langlib/string/Next.java index c260ed05f541..51ac49e92d29 100644 --- a/langlib/lang.string/src/main/java/org/ballerinalang/langlib/string/Next.java +++ b/langlib/lang.string/src/main/java/org/ballerinalang/langlib/string/Next.java @@ -18,8 +18,8 @@ package org.ballerinalang.langlib.string; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BIterator; import io.ballerina.runtime.api.values.BObject; diff --git a/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/GetKeys.java b/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/GetKeys.java index 09fc83de7283..6ccb07c481ba 100644 --- a/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/GetKeys.java +++ b/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/GetKeys.java @@ -18,10 +18,10 @@ package org.ballerinalang.langlib.table; -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.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BTable; diff --git a/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Map.java b/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Map.java index 5f23c23a0a8e..da436c51841f 100644 --- a/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Map.java +++ b/langlib/lang.table/src/main/java/org/ballerinalang/langlib/table/Map.java @@ -19,10 +19,10 @@ package org.ballerinalang.langlib.table; import io.ballerina.runtime.api.Environment; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.FunctionType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.TableType; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.utils.TypeUtils; diff --git a/langlib/lang.test/src/main/java/org/ballerinalang/langlib/test/AssertError.java b/langlib/lang.test/src/main/java/org/ballerinalang/langlib/test/AssertError.java index 22688b4ec176..47bb1347b073 100644 --- a/langlib/lang.test/src/main/java/org/ballerinalang/langlib/test/AssertError.java +++ b/langlib/lang.test/src/main/java/org/ballerinalang/langlib/test/AssertError.java @@ -18,8 +18,8 @@ package org.ballerinalang.langlib.test; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.internal.TypeChecker; diff --git a/langlib/lang.test/src/main/java/org/ballerinalang/langlib/test/AssertNotError.java b/langlib/lang.test/src/main/java/org/ballerinalang/langlib/test/AssertNotError.java index 7fce1c2627b7..c57db379c776 100644 --- a/langlib/lang.test/src/main/java/org/ballerinalang/langlib/test/AssertNotError.java +++ b/langlib/lang.test/src/main/java/org/ballerinalang/langlib/test/AssertNotError.java @@ -18,8 +18,8 @@ package org.ballerinalang.langlib.test; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.internal.TypeChecker; diff --git a/langlib/lang.typedesc/src/main/java/org/ballerinalang/langlib/typedesc/TypeIds.java b/langlib/lang.typedesc/src/main/java/org/ballerinalang/langlib/typedesc/TypeIds.java index 63c2e305cc52..7422aa9ae987 100644 --- a/langlib/lang.typedesc/src/main/java/org/ballerinalang/langlib/typedesc/TypeIds.java +++ b/langlib/lang.typedesc/src/main/java/org/ballerinalang/langlib/typedesc/TypeIds.java @@ -19,11 +19,11 @@ package org.ballerinalang.langlib.typedesc; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.types.TypeId; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BMap; diff --git a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/Clone.java b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/Clone.java index 4e0f0776f867..539a929427f3 100644 --- a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/Clone.java +++ b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/Clone.java @@ -18,7 +18,7 @@ package org.ballerinalang.langlib.value; -import io.ballerina.runtime.internal.CloneUtils; +import io.ballerina.runtime.internal.utils.CloneUtils; /** * Performs a deep copy, recursively copying all structural values and their members. diff --git a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/CloneReadOnly.java b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/CloneReadOnly.java index 97e5da8c6be9..9833522c43d9 100644 --- a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/CloneReadOnly.java +++ b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/CloneReadOnly.java @@ -18,7 +18,7 @@ package org.ballerinalang.langlib.value; -import io.ballerina.runtime.internal.CloneUtils; +import io.ballerina.runtime.internal.utils.CloneUtils; /** * Performs a deep copy, recursively copying all structural values and their members. The copy is read-only diff --git a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/CloneWithType.java b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/CloneWithType.java index 2e5f69205bf2..7cf86b1b222d 100644 --- a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/CloneWithType.java +++ b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/CloneWithType.java @@ -24,7 +24,7 @@ import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BTypedesc; -import io.ballerina.runtime.internal.ValueConverter; +import io.ballerina.runtime.internal.utils.ValueConverter; import static io.ballerina.runtime.api.creators.ErrorCreator.createError; import static io.ballerina.runtime.internal.errors.ErrorReasons.VALUE_LANG_LIB_CONVERSION_ERROR; diff --git a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/EnsureType.java b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/EnsureType.java index ed5e81c9a48f..1cdb4b62dcfe 100644 --- a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/EnsureType.java +++ b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/EnsureType.java @@ -17,8 +17,8 @@ */ package org.ballerinalang.langlib.value; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BTypedesc; diff --git a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonDecimalString.java b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonDecimalString.java index 08c1f3d0789a..d2f4da14f023 100644 --- a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonDecimalString.java +++ b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonDecimalString.java @@ -23,7 +23,7 @@ import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BString; -import io.ballerina.runtime.internal.JsonParser; +import io.ballerina.runtime.internal.json.JsonParser; import java.io.StringReader; diff --git a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonFloatString.java b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonFloatString.java index 2bd36a02060f..1b08ed93549b 100644 --- a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonFloatString.java +++ b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonFloatString.java @@ -23,7 +23,7 @@ import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BString; -import io.ballerina.runtime.internal.JsonParser; +import io.ballerina.runtime.internal.json.JsonParser; import java.io.StringReader; diff --git a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonString.java b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonString.java index 136afb309b2f..b42fa1282dbd 100644 --- a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonString.java +++ b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonString.java @@ -22,7 +22,7 @@ import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BString; -import io.ballerina.runtime.internal.JsonParser; +import io.ballerina.runtime.internal.json.JsonParser; /** * Parse a string in JSON format and return the value that it represents. diff --git a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonStringWithType.java b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonStringWithType.java index 5055423f1ddb..470c920fda49 100644 --- a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonStringWithType.java +++ b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonStringWithType.java @@ -22,7 +22,7 @@ import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BTypedesc; -import io.ballerina.runtime.internal.JsonParser; +import io.ballerina.runtime.internal.json.JsonParser; import static io.ballerina.runtime.internal.errors.ErrorReasons.VALUE_LANG_LIB_CONVERSION_ERROR; diff --git a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonWithType.java b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonWithType.java index 38200fb1980f..df6b8c4d623a 100644 --- a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonWithType.java +++ b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/FromJsonWithType.java @@ -24,7 +24,7 @@ import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BTypedesc; -import io.ballerina.runtime.internal.ValueConverter; +import io.ballerina.runtime.internal.utils.ValueConverter; import static io.ballerina.runtime.api.creators.ErrorCreator.createError; import static io.ballerina.runtime.internal.errors.ErrorReasons.VALUE_LANG_LIB_CONVERSION_ERROR; diff --git a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/MergeJson.java b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/MergeJson.java index d80d5736ed08..395b0842fa28 100644 --- a/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/MergeJson.java +++ b/langlib/lang.value/src/main/java/org/ballerinalang/langlib/value/MergeJson.java @@ -18,7 +18,7 @@ package org.ballerinalang.langlib.value; -import io.ballerina.runtime.internal.JsonInternalUtils; +import io.ballerina.runtime.internal.json.JsonInternalUtils; /** diff --git a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Concat.java b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Concat.java index e9209a005947..30e9ca314af0 100644 --- a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Concat.java +++ b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Concat.java @@ -22,7 +22,7 @@ import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BXml; import io.ballerina.runtime.api.values.BXmlSequence; -import io.ballerina.runtime.internal.XmlFactory; +import io.ballerina.runtime.internal.xml.XmlFactory; import java.util.ArrayList; import java.util.List; diff --git a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/CreateComment.java b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/CreateComment.java index c1020e5f03d9..f25019f013f5 100644 --- a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/CreateComment.java +++ b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/CreateComment.java @@ -19,7 +19,7 @@ import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BXml; -import io.ballerina.runtime.internal.XmlFactory; +import io.ballerina.runtime.internal.xml.XmlFactory; /** * Create XML comment value from string. diff --git a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/CreateElement.java b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/CreateElement.java index dfed2f506007..cb994bd687a0 100644 --- a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/CreateElement.java +++ b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/CreateElement.java @@ -22,7 +22,7 @@ import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BXml; import io.ballerina.runtime.api.values.BXmlQName; -import io.ballerina.runtime.internal.XmlFactory; +import io.ballerina.runtime.internal.xml.XmlFactory; import java.util.Map; diff --git a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/CreateProcessingInstruction.java b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/CreateProcessingInstruction.java index be06a953d059..0b552ee03cfb 100644 --- a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/CreateProcessingInstruction.java +++ b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/CreateProcessingInstruction.java @@ -19,7 +19,7 @@ import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BXml; -import io.ballerina.runtime.internal.XmlFactory; +import io.ballerina.runtime.internal.xml.XmlFactory; /** * Create XML processing instruction. diff --git a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/CreateText.java b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/CreateText.java index d6379a71c0a4..3e94bfb879b4 100644 --- a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/CreateText.java +++ b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/CreateText.java @@ -19,7 +19,7 @@ import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BXml; -import io.ballerina.runtime.internal.XmlFactory; +import io.ballerina.runtime.internal.xml.XmlFactory; /** * Create XML text value from string. diff --git a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Next.java b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Next.java index 8400b7aa8821..687e3ac16120 100644 --- a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Next.java +++ b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Next.java @@ -18,8 +18,8 @@ package org.ballerinalang.langlib.xml; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.RecordType; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BIterator; diff --git a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/SetChildren.java b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/SetChildren.java index 4a9fac7ac255..27c53ce51b34 100644 --- a/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/SetChildren.java +++ b/langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/SetChildren.java @@ -18,18 +18,18 @@ package org.ballerinalang.langlib.xml; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.flags.TypeFlags; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BXml; import io.ballerina.runtime.internal.TypeChecker; -import io.ballerina.runtime.internal.XmlFactory; import io.ballerina.runtime.internal.errors.ErrorCodes; import io.ballerina.runtime.internal.errors.ErrorHelper; +import io.ballerina.runtime.internal.xml.XmlFactory; import java.util.Arrays; diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibArrayTest.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibArrayTest.java index 8de3b049c988..93c5de13e7e8 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibArrayTest.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibArrayTest.java @@ -18,7 +18,7 @@ package org.ballerinalang.langlib.test; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.values.BArray; import org.ballerinalang.test.BAssertUtil; diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibBooleanTest.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibBooleanTest.java index 51932f3e3a18..1580f88c097a 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibBooleanTest.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibBooleanTest.java @@ -18,7 +18,7 @@ package org.ballerinalang.langlib.test; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BError; diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibDecimalTest.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibDecimalTest.java index f8f508847dbc..d7a022cd103c 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibDecimalTest.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibDecimalTest.java @@ -18,7 +18,7 @@ package org.ballerinalang.langlib.test; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.utils.StringUtils; diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibErrorTest.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibErrorTest.java index cffd695d8064..d90858608591 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibErrorTest.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibErrorTest.java @@ -18,7 +18,7 @@ package org.ballerinalang.langlib.test; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.values.BArray; import org.ballerinalang.test.BCompileUtil; import org.ballerinalang.test.BRunUtil; diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibIntTest.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibIntTest.java index 511bd0ed6fd1..191f00b065a4 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibIntTest.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibIntTest.java @@ -18,7 +18,7 @@ package org.ballerinalang.langlib.test; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BError; diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibMapTest.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibMapTest.java index dc67b87400f6..61bbaa1e0bea 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibMapTest.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibMapTest.java @@ -18,7 +18,7 @@ package org.ballerinalang.langlib.test; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.utils.StringUtils; diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibRecordTest.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibRecordTest.java index cc007f3cdb9e..dad041879f19 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibRecordTest.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibRecordTest.java @@ -18,7 +18,7 @@ package org.ballerinalang.langlib.test; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibTupleTest.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibTupleTest.java index 96e425c14df6..f2111b6aa913 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibTupleTest.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibTupleTest.java @@ -18,7 +18,7 @@ package org.ballerinalang.langlib.test; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.values.BArray; import org.ballerinalang.test.BCompileUtil; diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibValueTest.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibValueTest.java index 6854935e4f30..aa6e42bfc90f 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibValueTest.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibValueTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.langlib.test; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BMap; diff --git a/misc/debug-adapter/modules/debug-adapter-runtime/src/main/java/org/ballerinalang/debugadapter/runtime/DebuggerRuntime.java b/misc/debug-adapter/modules/debug-adapter-runtime/src/main/java/org/ballerinalang/debugadapter/runtime/DebuggerRuntime.java index b744b6f1ec81..79ecf2ef5336 100644 --- a/misc/debug-adapter/modules/debug-adapter-runtime/src/main/java/org/ballerinalang/debugadapter/runtime/DebuggerRuntime.java +++ b/misc/debug-adapter/modules/debug-adapter-runtime/src/main/java/org/ballerinalang/debugadapter/runtime/DebuggerRuntime.java @@ -19,7 +19,6 @@ package org.ballerinalang.debugadapter.runtime; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.constants.TypeConstants; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.TypeCreator; @@ -27,6 +26,7 @@ import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.ErrorType; import io.ballerina.runtime.api.types.MapType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; @@ -39,7 +39,7 @@ import io.ballerina.runtime.api.values.BXml; import io.ballerina.runtime.api.values.BXmlSequence; import io.ballerina.runtime.internal.BalRuntime; -import io.ballerina.runtime.internal.ClassloaderRuntime; +import io.ballerina.runtime.internal.scheduling.ClassloaderRuntime; import io.ballerina.runtime.internal.scheduling.Scheduler; import io.ballerina.runtime.internal.scheduling.Strand; import io.ballerina.runtime.internal.types.BAnnotatableType; diff --git a/misc/ls-extensions/modules/bal-shell-service/src/main/java/io/ballerina/shell/service/util/TypeUtils.java b/misc/ls-extensions/modules/bal-shell-service/src/main/java/io/ballerina/shell/service/util/TypeUtils.java index 270dd268e5c3..e7341eac68c6 100644 --- a/misc/ls-extensions/modules/bal-shell-service/src/main/java/io/ballerina/shell/service/util/TypeUtils.java +++ b/misc/ls-extensions/modules/bal-shell-service/src/main/java/io/ballerina/shell/service/util/TypeUtils.java @@ -17,8 +17,8 @@ */ package io.ballerina.shell.service.util; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; /** diff --git a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/io/StringUtils.java b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/io/StringUtils.java index 29e66bcf2916..30f38c862677 100644 --- a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/io/StringUtils.java +++ b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/io/StringUtils.java @@ -18,9 +18,9 @@ package org.ballerinalang.testerina.natives.io; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BError; diff --git a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/FunctionMock.java b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/FunctionMock.java index 1181154ab0cb..f9807451ccae 100644 --- a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/FunctionMock.java +++ b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/FunctionMock.java @@ -1,7 +1,7 @@ package org.ballerinalang.testerina.natives.mock; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.RecordType; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; diff --git a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/GenericMockObjectValue.java b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/GenericMockObjectValue.java index 72b2ab463162..984ce937afba 100644 --- a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/GenericMockObjectValue.java +++ b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/GenericMockObjectValue.java @@ -17,11 +17,11 @@ */ package org.ballerinalang.testerina.natives.mock; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.ObjectType; import io.ballerina.runtime.api.types.RecordType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; diff --git a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/ObjectMock.java b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/ObjectMock.java index d53085fc89a0..c042fdce5048 100644 --- a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/ObjectMock.java +++ b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/ObjectMock.java @@ -17,8 +17,6 @@ */ package org.ballerinalang.testerina.natives.mock; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.ArrayType; @@ -27,9 +25,11 @@ import io.ballerina.runtime.api.types.ObjectType; import io.ballerina.runtime.api.types.Parameter; import io.ballerina.runtime.api.types.ParameterizedType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.ResourceMethodType; import io.ballerina.runtime.api.types.StreamType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; diff --git a/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/util/TesterinaUtils.java b/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/util/TesterinaUtils.java index ca3a75f25614..5d4c1f39fdb8 100644 --- a/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/util/TesterinaUtils.java +++ b/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/util/TesterinaUtils.java @@ -18,7 +18,7 @@ package org.ballerinalang.test.runtime.util; import io.ballerina.runtime.api.values.BError; -import io.ballerina.runtime.internal.util.RuntimeUtils; +import io.ballerina.runtime.internal.utils.RuntimeUtils; import org.ballerinalang.test.runtime.entity.Test; import org.ballerinalang.test.runtime.entity.TestSuite; import org.ballerinalang.test.runtime.exceptions.BallerinaTestException; diff --git a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/BRunUtil.java b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/BRunUtil.java index 74e24a40f4fd..6bdb2815f0da 100644 --- a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/BRunUtil.java +++ b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/BRunUtil.java @@ -21,8 +21,8 @@ import io.ballerina.projects.JarLibrary; import io.ballerina.projects.JarResolver; import io.ballerina.projects.PackageManifest; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.internal.BalRuntime; @@ -182,6 +182,7 @@ private static Object invoke(CompileResult compileResult, BIRNode.BIRFunction fu } }; BalRuntime runtime = compileResult.getRuntime(); + runtime.moduleInitialized = true; final FutureValue future = runtime.scheduler.startNonIsolatedWorker(func, null, PredefinedTypes.TYPE_ANY, "test", null, args); diff --git a/tests/jballerina-benchmark-test/src/main/java/org/ballerinalang/benchmark/nativeimpl/Utils.java b/tests/jballerina-benchmark-test/src/main/java/org/ballerinalang/benchmark/nativeimpl/Utils.java index 7251f7173353..70bf33c6b7bc 100644 --- a/tests/jballerina-benchmark-test/src/main/java/org/ballerinalang/benchmark/nativeimpl/Utils.java +++ b/tests/jballerina-benchmark-test/src/main/java/org/ballerinalang/benchmark/nativeimpl/Utils.java @@ -16,10 +16,10 @@ package org.ballerinalang.benchmark.nativeimpl; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; diff --git a/tests/jballerina-benchmark-test/src/test/java/org/ballerinalang/benchmark/BenchmarkUtilTest.java b/tests/jballerina-benchmark-test/src/test/java/org/ballerinalang/benchmark/BenchmarkUtilTest.java index 601aa0f7add4..dc1eb7dd88c1 100644 --- a/tests/jballerina-benchmark-test/src/test/java/org/ballerinalang/benchmark/BenchmarkUtilTest.java +++ b/tests/jballerina-benchmark-test/src/test/java/org/ballerinalang/benchmark/BenchmarkUtilTest.java @@ -15,7 +15,7 @@ */ package org.ballerinalang.benchmark; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.utils.StringUtils; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Async.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Async.java index 35100e5bf87f..1b707e9e2942 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Async.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Async.java @@ -19,7 +19,7 @@ package org.ballerinalang.nativeimpl.jvm.runtime.api.tests; import io.ballerina.runtime.api.Environment; -import io.ballerina.runtime.api.async.StrandMetadata; +import io.ballerina.runtime.api.concurrent.StrandMetadata; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.MethodType; import io.ballerina.runtime.api.types.ObjectType; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Enums.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Enums.java index 1dc38289ba57..020b2a396c70 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Enums.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Enums.java @@ -19,7 +19,7 @@ package org.ballerinalang.nativeimpl.jvm.runtime.api.tests; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Environments.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Environments.java index 20dc30ed994a..df409b540771 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Environments.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Environments.java @@ -19,7 +19,7 @@ package org.ballerinalang.nativeimpl.jvm.runtime.api.tests; import io.ballerina.runtime.api.Environment; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.types.Parameter; import io.ballerina.runtime.api.values.BArray; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Errors.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Errors.java index bfbc84ec5c68..c0953aa2945b 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Errors.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Errors.java @@ -19,7 +19,7 @@ package org.ballerinalang.nativeimpl.jvm.runtime.api.tests; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.constants.TypeConstants; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.TypeCreator; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/TypeReference.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/TypeReference.java index 97bc701b54d2..b664db2aab1b 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/TypeReference.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/TypeReference.java @@ -17,7 +17,7 @@ package org.ballerinalang.nativeimpl.jvm.runtime.api.tests; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.ObjectType; import io.ballerina.runtime.api.types.Parameter; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Values.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Values.java index bc53a0757738..3cfe86786972 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Values.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Values.java @@ -18,13 +18,13 @@ package org.ballerinalang.nativeimpl.jvm.runtime.api.tests; -import io.ballerina.runtime.api.Artifact; +import io.ballerina.runtime.api.repository.Artifact; import io.ballerina.runtime.api.Environment; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.Node; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.Repository; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.repository.Node; +import io.ballerina.runtime.api.types.PredefinedTypes; +import io.ballerina.runtime.api.repository.Repository; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/servicetests/ServiceValue.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/servicetests/ServiceValue.java index 63834f7b21d2..eac227266493 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/servicetests/ServiceValue.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/servicetests/ServiceValue.java @@ -19,7 +19,7 @@ import io.ballerina.identifier.Utils; import io.ballerina.runtime.api.Environment; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.ObjectType; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/StaticMethods.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/StaticMethods.java index 4beadfa33420..5e9669c430c8 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/StaticMethods.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/StaticMethods.java @@ -20,8 +20,8 @@ import io.ballerina.runtime.api.Environment; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.PredefinedTypes; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/Timer.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/Timer.java index dbab600e2dbe..e18e038b85d8 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/Timer.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/Timer.java @@ -19,7 +19,7 @@ import io.ballerina.runtime.api.Environment; import io.ballerina.runtime.api.Runtime; -import io.ballerina.runtime.api.async.StrandMetadata; +import io.ballerina.runtime.api.concurrent.StrandMetadata; import io.ballerina.runtime.internal.values.ObjectValue; import org.testng.Assert; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/VariableReturnType.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/VariableReturnType.java index 79ee728b0812..01ace39bd4b9 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/VariableReturnType.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/VariableReturnType.java @@ -17,7 +17,7 @@ package org.ballerinalang.nativeimpl.jvm.tests; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.AnnotatableType; @@ -58,17 +58,17 @@ import java.util.List; import java.util.Optional; -import static io.ballerina.runtime.api.TypeTags.ARRAY_TAG; -import static io.ballerina.runtime.api.TypeTags.BOOLEAN_TAG; -import static io.ballerina.runtime.api.TypeTags.BYTE_TAG; -import static io.ballerina.runtime.api.TypeTags.DECIMAL_TAG; -import static io.ballerina.runtime.api.TypeTags.FLOAT_TAG; -import static io.ballerina.runtime.api.TypeTags.INT_TAG; -import static io.ballerina.runtime.api.TypeTags.OBJECT_TYPE_TAG; -import static io.ballerina.runtime.api.TypeTags.RECORD_TYPE_TAG; -import static io.ballerina.runtime.api.TypeTags.STRING_TAG; -import static io.ballerina.runtime.api.TypeTags.XML_COMMENT_TAG; -import static io.ballerina.runtime.api.TypeTags.XML_ELEMENT_TAG; +import static io.ballerina.runtime.api.types.TypeTags.ARRAY_TAG; +import static io.ballerina.runtime.api.types.TypeTags.BOOLEAN_TAG; +import static io.ballerina.runtime.api.types.TypeTags.BYTE_TAG; +import static io.ballerina.runtime.api.types.TypeTags.DECIMAL_TAG; +import static io.ballerina.runtime.api.types.TypeTags.FLOAT_TAG; +import static io.ballerina.runtime.api.types.TypeTags.INT_TAG; +import static io.ballerina.runtime.api.types.TypeTags.OBJECT_TYPE_TAG; +import static io.ballerina.runtime.api.types.TypeTags.RECORD_TYPE_TAG; +import static io.ballerina.runtime.api.types.TypeTags.STRING_TAG; +import static io.ballerina.runtime.api.types.TypeTags.XML_COMMENT_TAG; +import static io.ballerina.runtime.api.types.TypeTags.XML_ELEMENT_TAG; /** * Native methods for testing functions with variable return types. diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/annotations/AnnotationRuntimeTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/annotations/AnnotationRuntimeTest.java index 18ad9e591174..5fe47a42bae4 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/annotations/AnnotationRuntimeTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/annotations/AnnotationRuntimeTest.java @@ -16,7 +16,7 @@ */ package org.ballerinalang.test.annotations; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.AnnotatableType; import io.ballerina.runtime.api.types.MethodType; import io.ballerina.runtime.api.types.ObjectType; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/bala/record/ClosedRecordTypeInclusionTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/bala/record/ClosedRecordTypeInclusionTest.java index e06f506c8520..8076caed862b 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/bala/record/ClosedRecordTypeInclusionTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/bala/record/ClosedRecordTypeInclusionTest.java @@ -19,7 +19,7 @@ package org.ballerinalang.test.bala.record; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BObject; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/bala/record/OpenRecordTypeInclusionTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/bala/record/OpenRecordTypeInclusionTest.java index f6122037f4f4..978e5e4dffee 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/bala/record/OpenRecordTypeInclusionTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/bala/record/OpenRecordTypeInclusionTest.java @@ -19,7 +19,7 @@ package org.ballerinalang.test.bala.record; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BObject; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/error/ErrorTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/error/ErrorTest.java index 9e84dfc2ea18..5b38f533ef4d 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/error/ErrorTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/error/ErrorTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.error; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BError; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/binaryoperations/EqualAndNotEqualOperationsTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/binaryoperations/EqualAndNotEqualOperationsTest.java index 4ccd6c1caf00..acbed8f5c684 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/binaryoperations/EqualAndNotEqualOperationsTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/binaryoperations/EqualAndNotEqualOperationsTest.java @@ -19,7 +19,7 @@ import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BString; -import io.ballerina.runtime.internal.JsonParser; +import io.ballerina.runtime.internal.json.JsonParser; import org.ballerinalang.test.BCompileUtil; import org.ballerinalang.test.BRunUtil; import org.ballerinalang.test.CompileResult; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/AnydataStampInbuiltFunctionTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/AnydataStampInbuiltFunctionTest.java index af90b284548c..52a2fc6d489b 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/AnydataStampInbuiltFunctionTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/AnydataStampInbuiltFunctionTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.expressions.stamp; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BMap; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/ArrayStampInbuiltFunctionTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/ArrayStampInbuiltFunctionTest.java index d7ba05008d41..8bdd33f86ec3 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/ArrayStampInbuiltFunctionTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/ArrayStampInbuiltFunctionTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.expressions.stamp; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BMap; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/JSONStampInbuiltFunctionTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/JSONStampInbuiltFunctionTest.java index 65e05fe942b1..64b16dcbf567 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/JSONStampInbuiltFunctionTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/JSONStampInbuiltFunctionTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.expressions.stamp; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BError; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/MapStampInbuiltFunctionTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/MapStampInbuiltFunctionTest.java index 6a80f98f45ab..e25a29bf71a5 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/MapStampInbuiltFunctionTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/MapStampInbuiltFunctionTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.expressions.stamp; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BError; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/RecordStampInbuiltFunctionTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/RecordStampInbuiltFunctionTest.java index 9b97ceb2ff6a..14c3e7218538 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/RecordStampInbuiltFunctionTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/RecordStampInbuiltFunctionTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.expressions.stamp; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BMap; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/TupleTypeStampInbuiltFunctionTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/TupleTypeStampInbuiltFunctionTest.java index 02889199545b..1f1064c1dcfa 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/TupleTypeStampInbuiltFunctionTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/TupleTypeStampInbuiltFunctionTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.expressions.stamp; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BMap; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/UnionTypeStampInbuiltFunctionTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/UnionTypeStampInbuiltFunctionTest.java index 09c8c5b4639f..d96833ec9a39 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/UnionTypeStampInbuiltFunctionTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/UnionTypeStampInbuiltFunctionTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.expressions.stamp; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/functions/FunctionSignatureTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/functions/FunctionSignatureTest.java index be7cbd55fec1..6ffb990371dc 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/functions/FunctionSignatureTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/functions/FunctionSignatureTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.functions; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.internal.types.BTupleType; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/functions/InitFunctionTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/functions/InitFunctionTest.java index 68079dfc92ab..7c5567f71f6a 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/functions/InitFunctionTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/functions/InitFunctionTest.java @@ -16,7 +16,7 @@ */ package org.ballerinalang.test.functions; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BString; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/isolation/IsolatedWorkerTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/isolation/IsolatedWorkerTest.java index e18cf00569ef..8c5e18d0793c 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/isolation/IsolatedWorkerTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/isolation/IsolatedWorkerTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.isolation; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.MethodType; import io.ballerina.runtime.api.types.ObjectType; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/isolation/IsolationInferenceTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/isolation/IsolationInferenceTest.java index fe349be1fc47..8983134b690e 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/isolation/IsolationInferenceTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/isolation/IsolationInferenceTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.isolation; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.MethodType; import io.ballerina.runtime.api.types.ObjectType; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/RefTypeTests.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/RefTypeTests.java index f867243e5bc2..a0bb41e824c7 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/RefTypeTests.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/RefTypeTests.java @@ -18,7 +18,7 @@ package org.ballerinalang.test.javainterop; import io.ballerina.runtime.api.Environment; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.ObjectType; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/RefTypeWithBValueAPITests.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/RefTypeWithBValueAPITests.java index 9752ab54e864..42862e793732 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/RefTypeWithBValueAPITests.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/RefTypeWithBValueAPITests.java @@ -18,8 +18,8 @@ package org.ballerinalang.test.javainterop; import io.ballerina.runtime.api.Environment; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.PredefinedTypes; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.ObjectType; import io.ballerina.runtime.api.utils.StringUtils; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/TypesTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/TypesTest.java index f95075502a80..f0e299a53f70 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/TypesTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/TypesTest.java @@ -18,8 +18,8 @@ package org.ballerinalang.test.jvm; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.PredefinedTypes; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.flags.SymbolFlags; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/main/function/MainFunctionsTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/main/function/MainFunctionsTest.java index 2462df879d7c..f25f54bf0449 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/main/function/MainFunctionsTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/main/function/MainFunctionsTest.java @@ -17,7 +17,7 @@ package org.ballerinalang.test.main.function; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.values.BArray; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/object/ObjectInitializerTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/object/ObjectInitializerTest.java index 1aecc1ba24de..34a6f3638d2c 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/object/ObjectInitializerTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/object/ObjectInitializerTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.object; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/record/ClosedRecordOptionalFieldsTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/record/ClosedRecordOptionalFieldsTest.java index de28957edf0b..c260e0b6c590 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/record/ClosedRecordOptionalFieldsTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/record/ClosedRecordOptionalFieldsTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.record; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BMap; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/record/OpenRecordOptionalFieldsTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/record/OpenRecordOptionalFieldsTest.java index 506cf5750a56..4036bb29a908 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/record/OpenRecordOptionalFieldsTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/record/OpenRecordOptionalFieldsTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.record; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BMap; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayAccessExprTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayAccessExprTest.java index 3099dcfec045..76b1654abdad 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayAccessExprTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayAccessExprTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.statements.arrays; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.values.BArray; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayFillTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayFillTest.java index 06d8ea560c61..d6dc7c086c58 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayFillTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayFillTest.java @@ -18,8 +18,8 @@ package org.ballerinalang.test.statements.arrays; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.PredefinedTypes; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.utils.StringUtils; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayTest.java index 580059fe58b0..c375e00df5f4 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.statements.arrays; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.utils.StringUtils; @@ -25,7 +25,7 @@ import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BObject; import io.ballerina.runtime.api.values.BXml; -import io.ballerina.runtime.internal.XmlFactory; +import io.ballerina.runtime.internal.xml.XmlFactory; import io.ballerina.runtime.internal.types.BArrayType; import io.ballerina.runtime.internal.values.ArrayValue; import io.ballerina.runtime.internal.values.ArrayValueImpl; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/SealedArrayTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/SealedArrayTest.java index 1a515c77c94d..c27dea7192ff 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/SealedArrayTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/SealedArrayTest.java @@ -18,7 +18,7 @@ */ package org.ballerinalang.test.statements.arrays; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.values.BArray; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/arraysofarrays/SealedArraysOfArraysTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/arraysofarrays/SealedArraysOfArraysTest.java index 1404422b92e0..89bfa96bd4e5 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/arraysofarrays/SealedArraysOfArraysTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/arraysofarrays/SealedArraysOfArraysTest.java @@ -18,7 +18,7 @@ */ package org.ballerinalang.test.statements.arrays.arraysofarrays; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.values.BArray; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/assign/AssignStmtTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/assign/AssignStmtTest.java index 23c2307a4578..2b38dff137b7 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/assign/AssignStmtTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/assign/AssignStmtTest.java @@ -16,7 +16,7 @@ */ package org.ballerinalang.test.statements.assign; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.utils.StringUtils; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/anydata/AnydataTernaryConvTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/anydata/AnydataTernaryConvTest.java index de9fdb2b56ab..0517976775a9 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/anydata/AnydataTernaryConvTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/anydata/AnydataTernaryConvTest.java @@ -18,7 +18,7 @@ package org.ballerinalang.test.types.anydata; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.internal.types.BArrayType; import org.ballerinalang.test.BCompileUtil; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/anydata/AnydataTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/anydata/AnydataTest.java index 27b735c2c316..da799af8d61a 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/anydata/AnydataTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/anydata/AnydataTest.java @@ -18,7 +18,7 @@ package org.ballerinalang.test.types.anydata; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BMap; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/bytetype/BByteValueTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/bytetype/BByteValueTest.java index bb0dd4f27c81..3f2f5193d19f 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/bytetype/BByteValueTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/bytetype/BByteValueTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.types.bytetype; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.values.BArray; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/decimaltype/BDecimalValueTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/decimaltype/BDecimalValueTest.java index 20dec117d816..a0ee273a120c 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/decimaltype/BDecimalValueTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/decimaltype/BDecimalValueTest.java @@ -23,7 +23,7 @@ import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BDecimal; import io.ballerina.runtime.api.values.BMap; -import io.ballerina.runtime.internal.DecimalValueKind; +import io.ballerina.runtime.internal.values.DecimalValueKind; import org.ballerinalang.test.BCompileUtil; import org.ballerinalang.test.BRunUtil; import org.ballerinalang.test.CompileResult; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/handle/OpaqueHandleTypeTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/handle/OpaqueHandleTypeTest.java index 316955ff1cba..23123a95c313 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/handle/OpaqueHandleTypeTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/handle/OpaqueHandleTypeTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.types.handle; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.utils.StringUtils; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/json/JSONLibraryTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/json/JSONLibraryTest.java index 4d9072395c9c..e359daf07393 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/json/JSONLibraryTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/json/JSONLibraryTest.java @@ -24,8 +24,8 @@ import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BString; -import io.ballerina.runtime.internal.JsonGenerator; -import io.ballerina.runtime.internal.JsonParser; +import io.ballerina.runtime.internal.json.JsonGenerator; +import io.ballerina.runtime.internal.json.JsonParser; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/json/JSONTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/json/JSONTest.java index 8a2581da84b7..6576e8cb1011 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/json/JSONTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/json/JSONTest.java @@ -17,14 +17,14 @@ */ package org.ballerinalang.test.types.json; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BString; -import io.ballerina.runtime.internal.JsonDataSource; -import io.ballerina.runtime.internal.JsonParser; +import io.ballerina.runtime.internal.json.JsonDataSource; +import io.ballerina.runtime.internal.json.JsonParser; import io.ballerina.runtime.internal.values.StreamingJsonValue; import org.ballerinalang.test.BCompileUtil; import org.ballerinalang.test.BRunUtil; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/map/BMapValueTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/map/BMapValueTest.java index 5afc4a76ae5d..35678ac9886d 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/map/BMapValueTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/map/BMapValueTest.java @@ -21,7 +21,7 @@ import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BString; -import io.ballerina.runtime.internal.XmlFactory; +import io.ballerina.runtime.internal.xml.XmlFactory; import io.ballerina.runtime.internal.values.MapValue; import io.ballerina.runtime.internal.values.MapValueImpl; import org.ballerinalang.test.BCompileUtil; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/readonly/DeepReadOnlyTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/readonly/DeepReadOnlyTest.java index df365cf07737..c2a855d8eb92 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/readonly/DeepReadOnlyTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/readonly/DeepReadOnlyTest.java @@ -18,7 +18,7 @@ package org.ballerinalang.test.types.readonly; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.MapType; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/string/StringTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/string/StringTest.java index 192d58957aea..3696a5159b1e 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/string/StringTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/string/StringTest.java @@ -22,7 +22,7 @@ import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BXml; -import io.ballerina.runtime.internal.JsonParser; +import io.ballerina.runtime.internal.json.JsonParser; import org.ballerinalang.test.BCompileUtil; import org.ballerinalang.test.BRunUtil; import org.ballerinalang.test.CompileResult; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/typedesc/TypedescTests.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/typedesc/TypedescTests.java index 1b2961b21ff0..8539f5558225 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/typedesc/TypedescTests.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/typedesc/TypedescTests.java @@ -16,7 +16,7 @@ */ package org.ballerinalang.test.types.typedesc; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BTypedesc; import org.ballerinalang.test.BCompileUtil; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/uniontypes/UnionTypeTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/uniontypes/UnionTypeTest.java index 1c898dd92aaf..fd4a8e4c8e74 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/uniontypes/UnionTypeTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/uniontypes/UnionTypeTest.java @@ -20,7 +20,7 @@ import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BString; -import io.ballerina.runtime.internal.DecimalValueKind; +import io.ballerina.runtime.internal.values.DecimalValueKind; import org.ballerinalang.test.BAssertUtil; import org.ballerinalang.test.BCompileUtil; import org.ballerinalang.test.BRunUtil; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLLiteralTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLLiteralTest.java index 06631ce897e0..671c2262c6ca 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLLiteralTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLLiteralTest.java @@ -22,7 +22,7 @@ import io.ballerina.runtime.api.values.BXml; import io.ballerina.runtime.api.values.BXmlItem; import io.ballerina.runtime.api.values.BXmlSequence; -import io.ballerina.runtime.internal.XmlFactory; +import io.ballerina.runtime.internal.xml.XmlFactory; import org.ballerinalang.test.BAssertUtil; import org.ballerinalang.test.BCompileUtil; import org.ballerinalang.test.BRunUtil; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLLiteralWithNamespacesTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLLiteralWithNamespacesTest.java index b916fbc37ba2..8e05df2a8470 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLLiteralWithNamespacesTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLLiteralWithNamespacesTest.java @@ -22,7 +22,7 @@ import io.ballerina.runtime.api.values.BXml; import io.ballerina.runtime.api.values.BXmlItem; import io.ballerina.runtime.api.values.BXmlSequence; -import io.ballerina.runtime.internal.XmlFactory; +import io.ballerina.runtime.internal.xml.XmlFactory; import io.ballerina.runtime.internal.values.XmlValue; import org.ballerinalang.test.BCompileUtil; import org.ballerinalang.test.BRunUtil; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLParserNegativeTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLParserNegativeTest.java index 55a40ff6f1d6..d5a67cc4e633 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLParserNegativeTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLParserNegativeTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.types.xml; -import io.ballerina.runtime.internal.XmlFactory; +import io.ballerina.runtime.internal.xml.XmlFactory; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLSecurityTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLSecurityTest.java index c1b112166531..912b738be891 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLSecurityTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLSecurityTest.java @@ -17,7 +17,7 @@ */ package org.ballerinalang.test.types.xml; -import io.ballerina.runtime.internal.XmlFactory; +import io.ballerina.runtime.internal.xml.XmlFactory; import io.ballerina.runtime.internal.values.ErrorValue; import org.testng.Assert; import org.testng.annotations.Test; From fc0336b2cb205c32a88e9f09af1e1b61648bfd8d Mon Sep 17 00:00:00 2001 From: warunalakshitha Date: Tue, 12 Nov 2024 08:02:59 +0530 Subject: [PATCH 2/5] Fix import order due to refactored classes --- .../runtime/test/api/IntersectionTypeApiTests.java | 4 ++-- .../io/ballerina/runtime/test/cli/OperandTest.java | 2 +- .../ballerina/runtime/test/config/CliProviderTest.java | 2 +- .../io/ballerina/runtime/test/config/ConfigTest.java | 2 +- .../ballerina/runtime/test/config/EnvProviderTest.java | 2 +- .../runtime/test/config/TomlProviderTest.java | 2 +- .../test/config/negative/CliProviderNegativeTest.java | 2 +- .../test/config/negative/ConfigNegativeTest.java | 2 +- .../test/config/negative/EnvProviderNegativeTest.java | 2 +- .../test/config/negative/TomlProviderNegativeTest.java | 2 +- .../ballerinalang/langlib/test/LangLibArrayTest.java | 2 +- .../ballerinalang/langlib/test/LangLibBooleanTest.java | 2 +- .../ballerinalang/langlib/test/LangLibDecimalTest.java | 2 +- .../org/ballerinalang/langlib/test/LangLibIntTest.java | 2 +- .../org/ballerinalang/langlib/test/LangLibMapTest.java | 2 +- .../ballerinalang/langlib/test/LangLibRecordTest.java | 2 +- .../ballerinalang/langlib/test/LangLibTupleTest.java | 2 +- .../org/ballerinalang/benchmark/BenchmarkUtilTest.java | 2 +- .../nativeimpl/jvm/runtime/api/tests/Enums.java | 2 +- .../nativeimpl/jvm/runtime/api/tests/Environments.java | 2 +- .../nativeimpl/jvm/runtime/api/tests/Errors.java | 2 +- .../jvm/runtime/api/tests/TypeReference.java | 2 +- .../nativeimpl/jvm/runtime/api/tests/Values.java | 10 +++++----- .../nativeimpl/jvm/servicetests/ServiceValue.java | 2 +- .../nativeimpl/jvm/tests/StaticMethods.java | 4 ++-- .../nativeimpl/jvm/tests/VariableReturnType.java | 2 +- .../test/annotations/AnnotationRuntimeTest.java | 2 +- .../stamp/UnionTypeStampInbuiltFunctionTest.java | 2 +- .../test/isolation/IsolatedWorkerTest.java | 2 +- .../test/isolation/IsolationInferenceTest.java | 2 +- .../ballerinalang/test/javainterop/RefTypeTests.java | 2 +- .../test/javainterop/RefTypeWithBValueAPITests.java | 4 ++-- .../ballerinalang/test/jvm/ObjectSubtypingTest.java | 2 +- .../java/org/ballerinalang/test/jvm/TypesTest.java | 4 ++-- .../test/main/function/MainFunctionsTest.java | 2 +- .../record/RecordRestDescriptorEquivalencyTest.java | 2 +- .../test/statements/arrays/ArrayAccessExprTest.java | 2 +- .../test/statements/arrays/ArrayFillTest.java | 6 +++--- .../test/statements/arrays/ArrayTest.java | 4 ++-- .../test/statements/arrays/SealedArrayTest.java | 2 +- .../arraysofarrays/SealedArraysOfArraysTest.java | 2 +- .../test/statements/assign/AssignStmtTest.java | 2 +- .../test/types/bytetype/BByteValueTest.java | 2 +- .../test/types/handle/OpaqueHandleTypeTest.java | 2 +- .../ballerinalang/test/types/map/BMapValueTest.java | 2 +- .../test/types/readonly/DeepReadOnlyTest.java | 2 +- .../test/types/xml/XMLLiteralWithNamespacesTest.java | 2 +- .../ballerinalang/test/types/xml/XMLSecurityTest.java | 2 +- 48 files changed, 59 insertions(+), 59 deletions(-) diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/api/IntersectionTypeApiTests.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/api/IntersectionTypeApiTests.java index d54e12989b55..60c9d2cc2f7a 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/api/IntersectionTypeApiTests.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/api/IntersectionTypeApiTests.java @@ -19,13 +19,13 @@ package io.ballerina.runtime.test.api; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.types.PredefinedTypes; -import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.ErrorType; import io.ballerina.runtime.api.types.IntersectionType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.internal.types.BIntersectionType; import io.ballerina.runtime.internal.types.BType; import io.ballerina.runtime.internal.values.ReadOnlyUtils; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/cli/OperandTest.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/cli/OperandTest.java index e8aa1e899678..bbc96040f882 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/cli/OperandTest.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/cli/OperandTest.java @@ -18,8 +18,8 @@ package io.ballerina.runtime.test.cli; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BDecimal; import io.ballerina.runtime.api.values.BError; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/CliProviderTest.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/CliProviderTest.java index 8be489f1feba..30677030c234 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/CliProviderTest.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/CliProviderTest.java @@ -19,10 +19,10 @@ package io.ballerina.runtime.test.config; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.FiniteType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.utils.StringUtils; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/ConfigTest.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/ConfigTest.java index 8d57b1e5d8f6..582b2e300e5d 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/ConfigTest.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/ConfigTest.java @@ -19,12 +19,12 @@ package io.ballerina.runtime.test.config; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.Field; import io.ballerina.runtime.api.types.MapType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.RecordType; import io.ballerina.runtime.api.types.TableType; import io.ballerina.runtime.api.types.TupleType; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/EnvProviderTest.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/EnvProviderTest.java index c4d17ac1efb4..72427ac81021 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/EnvProviderTest.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/EnvProviderTest.java @@ -17,10 +17,10 @@ package io.ballerina.runtime.test.config; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.FiniteType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.utils.StringUtils; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/TomlProviderTest.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/TomlProviderTest.java index 72991618e4a2..8c4559c5a0dd 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/TomlProviderTest.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/TomlProviderTest.java @@ -19,13 +19,13 @@ package io.ballerina.runtime.test.config; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.types.PredefinedTypes; 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.FiniteType; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.MapType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.TupleType; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.utils.StringUtils; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/CliProviderNegativeTest.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/CliProviderNegativeTest.java index 30697e69bd62..6ebb29f76e23 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/CliProviderNegativeTest.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/CliProviderNegativeTest.java @@ -19,12 +19,12 @@ package io.ballerina.runtime.test.config.negative; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.FiniteType; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.MapType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.utils.StringUtils; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/ConfigNegativeTest.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/ConfigNegativeTest.java index 0af23fb5a83a..cef5471d541b 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/ConfigNegativeTest.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/ConfigNegativeTest.java @@ -19,9 +19,9 @@ package io.ballerina.runtime.test.config.negative; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.types.MapType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.internal.configurable.ConfigResolver; import io.ballerina.runtime.internal.configurable.VariableKey; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/EnvProviderNegativeTest.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/EnvProviderNegativeTest.java index 21b037a8a8fe..54cd0db505ff 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/EnvProviderNegativeTest.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/EnvProviderNegativeTest.java @@ -17,12 +17,12 @@ package io.ballerina.runtime.test.config.negative; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.FiniteType; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.MapType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.values.BDecimal; diff --git a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/TomlProviderNegativeTest.java b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/TomlProviderNegativeTest.java index 2a84f6b8a8d6..a4d9fd911b17 100644 --- a/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/TomlProviderNegativeTest.java +++ b/bvm/ballerina-runtime/src/test/java/io/ballerina/runtime/test/config/negative/TomlProviderNegativeTest.java @@ -19,7 +19,6 @@ package io.ballerina.runtime.test.config.negative; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.flags.SymbolFlags; @@ -28,6 +27,7 @@ import io.ballerina.runtime.api.types.FiniteType; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.MapType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.RecordType; import io.ballerina.runtime.api.types.TableType; import io.ballerina.runtime.api.types.TupleType; diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibArrayTest.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibArrayTest.java index 93c5de13e7e8..8b1595a1f108 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibArrayTest.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibArrayTest.java @@ -18,8 +18,8 @@ package org.ballerinalang.langlib.test; -import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.ArrayType; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.values.BArray; import org.ballerinalang.test.BAssertUtil; import org.ballerinalang.test.BCompileUtil; diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibBooleanTest.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibBooleanTest.java index 1580f88c097a..de2208ea7196 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibBooleanTest.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibBooleanTest.java @@ -18,8 +18,8 @@ package org.ballerinalang.langlib.test; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.ErrorCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BString; diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibDecimalTest.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibDecimalTest.java index d7a022cd103c..941cd53f2080 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibDecimalTest.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibDecimalTest.java @@ -18,9 +18,9 @@ package org.ballerinalang.langlib.test; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BDecimal; diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibIntTest.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibIntTest.java index 191f00b065a4..fa802b44bf3c 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibIntTest.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibIntTest.java @@ -18,8 +18,8 @@ package org.ballerinalang.langlib.test; -import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BError; import org.ballerinalang.test.BCompileUtil; diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibMapTest.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibMapTest.java index 61bbaa1e0bea..8258de8eca9c 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibMapTest.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibMapTest.java @@ -18,9 +18,9 @@ package org.ballerinalang.langlib.test; -import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.ArrayType; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BMap; diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibRecordTest.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibRecordTest.java index dad041879f19..72933bf4069d 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibRecordTest.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibRecordTest.java @@ -18,8 +18,8 @@ package org.ballerinalang.langlib.test; -import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BMap; diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibTupleTest.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibTupleTest.java index f2111b6aa913..e6b6c5390131 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibTupleTest.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/LangLibTupleTest.java @@ -18,8 +18,8 @@ package org.ballerinalang.langlib.test; -import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.ArrayType; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.values.BArray; import org.ballerinalang.test.BCompileUtil; import org.ballerinalang.test.BRunUtil; diff --git a/tests/jballerina-benchmark-test/src/test/java/org/ballerinalang/benchmark/BenchmarkUtilTest.java b/tests/jballerina-benchmark-test/src/test/java/org/ballerinalang/benchmark/BenchmarkUtilTest.java index dc1eb7dd88c1..2ba1a2dcc6ba 100644 --- a/tests/jballerina-benchmark-test/src/test/java/org/ballerinalang/benchmark/BenchmarkUtilTest.java +++ b/tests/jballerina-benchmark-test/src/test/java/org/ballerinalang/benchmark/BenchmarkUtilTest.java @@ -15,9 +15,9 @@ */ package org.ballerinalang.benchmark; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import org.ballerinalang.test.BCompileUtil; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Enums.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Enums.java index 020b2a396c70..c841434694c0 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Enums.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Enums.java @@ -19,7 +19,6 @@ package org.ballerinalang.nativeimpl.jvm.runtime.api.tests; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; @@ -27,6 +26,7 @@ import io.ballerina.runtime.api.flags.TypeFlags; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Environments.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Environments.java index df409b540771..c458a94bcb2d 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Environments.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Environments.java @@ -19,9 +19,9 @@ package org.ballerinalang.nativeimpl.jvm.runtime.api.tests; import io.ballerina.runtime.api.Environment; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.types.Parameter; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BDecimal; import io.ballerina.runtime.api.values.BString; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Errors.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Errors.java index c0953aa2945b..2d8ed57b03b0 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Errors.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Errors.java @@ -19,12 +19,12 @@ package org.ballerinalang.nativeimpl.jvm.runtime.api.tests; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.constants.TypeConstants; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.ErrorType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.TypeId; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/TypeReference.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/TypeReference.java index b664db2aab1b..d5b51e67fa30 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/TypeReference.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/TypeReference.java @@ -17,12 +17,12 @@ package org.ballerinalang.nativeimpl.jvm.runtime.api.tests; -import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.ObjectType; import io.ballerina.runtime.api.types.Parameter; import io.ballerina.runtime.api.types.ReferenceType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Values.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Values.java index 3cfe86786972..02f1ce709066 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Values.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Values.java @@ -18,17 +18,15 @@ package org.ballerinalang.nativeimpl.jvm.runtime.api.tests; -import io.ballerina.runtime.api.repository.Artifact; import io.ballerina.runtime.api.Environment; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.repository.Node; -import io.ballerina.runtime.api.types.PredefinedTypes; -import io.ballerina.runtime.api.repository.Repository; -import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.flags.SymbolFlags; +import io.ballerina.runtime.api.repository.Artifact; +import io.ballerina.runtime.api.repository.Node; +import io.ballerina.runtime.api.repository.Repository; import io.ballerina.runtime.api.types.AnnotatableType; import io.ballerina.runtime.api.types.Field; import io.ballerina.runtime.api.types.FunctionType; @@ -37,6 +35,7 @@ import io.ballerina.runtime.api.types.MethodType; import io.ballerina.runtime.api.types.ObjectType; import io.ballerina.runtime.api.types.Parameter; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.RecordType; import io.ballerina.runtime.api.types.ReferenceType; import io.ballerina.runtime.api.types.RemoteMethodType; @@ -45,6 +44,7 @@ import io.ballerina.runtime.api.types.TupleType; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.types.TypeId; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.IdentifierUtils; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/servicetests/ServiceValue.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/servicetests/ServiceValue.java index eac227266493..efec45a7a21b 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/servicetests/ServiceValue.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/servicetests/ServiceValue.java @@ -19,11 +19,11 @@ import io.ballerina.identifier.Utils; import io.ballerina.runtime.api.Environment; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.ObjectType; import io.ballerina.runtime.api.types.Parameter; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.RemoteMethodType; import io.ballerina.runtime.api.types.ResourceMethodType; import io.ballerina.runtime.api.types.ServiceType; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/StaticMethods.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/StaticMethods.java index 5e9669c430c8..e60e94fb4723 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/StaticMethods.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/StaticMethods.java @@ -20,15 +20,15 @@ import io.ballerina.runtime.api.Environment; import io.ballerina.runtime.api.Module; -import io.ballerina.runtime.api.types.PredefinedTypes; -import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.Field; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.RecordType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/VariableReturnType.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/VariableReturnType.java index 01ace39bd4b9..891e1beb46a4 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/VariableReturnType.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/VariableReturnType.java @@ -17,10 +17,10 @@ package org.ballerinalang.nativeimpl.jvm.tests; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.AnnotatableType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.RecordType; import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.utils.StringUtils; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/annotations/AnnotationRuntimeTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/annotations/AnnotationRuntimeTest.java index 5fe47a42bae4..4493408f8fd4 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/annotations/AnnotationRuntimeTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/annotations/AnnotationRuntimeTest.java @@ -16,7 +16,6 @@ */ package org.ballerinalang.test.annotations; -import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.AnnotatableType; import io.ballerina.runtime.api.types.MethodType; import io.ballerina.runtime.api.types.ObjectType; @@ -24,6 +23,7 @@ import io.ballerina.runtime.api.types.ResourceMethodType; import io.ballerina.runtime.api.types.ServiceType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BString; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/UnionTypeStampInbuiltFunctionTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/UnionTypeStampInbuiltFunctionTest.java index d96833ec9a39..4fbacc6ef4a9 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/UnionTypeStampInbuiltFunctionTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/stamp/UnionTypeStampInbuiltFunctionTest.java @@ -17,8 +17,8 @@ */ package org.ballerinalang.test.expressions.stamp; -import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/isolation/IsolatedWorkerTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/isolation/IsolatedWorkerTest.java index 8c5e18d0793c..1b4322a4a370 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/isolation/IsolatedWorkerTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/isolation/IsolatedWorkerTest.java @@ -17,13 +17,13 @@ */ package org.ballerinalang.test.isolation; -import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.MethodType; import io.ballerina.runtime.api.types.ObjectType; import io.ballerina.runtime.api.types.ResourceMethodType; import io.ballerina.runtime.api.types.ServiceType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.TypedescType; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BObject; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/isolation/IsolationInferenceTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/isolation/IsolationInferenceTest.java index 8983134b690e..ae4549e30d2b 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/isolation/IsolationInferenceTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/isolation/IsolationInferenceTest.java @@ -17,13 +17,13 @@ */ package org.ballerinalang.test.isolation; -import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.MethodType; import io.ballerina.runtime.api.types.ObjectType; import io.ballerina.runtime.api.types.ResourceMethodType; import io.ballerina.runtime.api.types.ServiceType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.TypedescType; import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BObject; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/RefTypeTests.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/RefTypeTests.java index a0bb41e824c7..43c3d268c729 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/RefTypeTests.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/RefTypeTests.java @@ -18,8 +18,8 @@ package org.ballerinalang.test.javainterop; import io.ballerina.runtime.api.Environment; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.ObjectType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BMap; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/RefTypeWithBValueAPITests.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/RefTypeWithBValueAPITests.java index 42862e793732..a06de07f29f6 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/RefTypeWithBValueAPITests.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/RefTypeWithBValueAPITests.java @@ -18,10 +18,10 @@ package org.ballerinalang.test.javainterop; import io.ballerina.runtime.api.Environment; -import io.ballerina.runtime.api.types.PredefinedTypes; -import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.ObjectType; +import io.ballerina.runtime.api.types.PredefinedTypes; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BError; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/ObjectSubtypingTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/ObjectSubtypingTest.java index 85577a24ab05..da7b9cde168a 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/ObjectSubtypingTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/ObjectSubtypingTest.java @@ -26,10 +26,10 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static java.lang.String.format; import static org.ballerinalang.test.BAssertUtil.validateError; import static org.ballerinalang.test.BAssertUtil.validateWarning; import static org.testng.Assert.assertEquals; +import static java.lang.String.format; /** * Test cases for testing the object subtyping rules. diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/TypesTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/TypesTest.java index f0e299a53f70..318c434fb270 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/TypesTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/TypesTest.java @@ -18,13 +18,13 @@ package org.ballerinalang.test.jvm; -import io.ballerina.runtime.api.types.PredefinedTypes; -import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.flags.SymbolFlags; import io.ballerina.runtime.api.types.FunctionType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/main/function/MainFunctionsTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/main/function/MainFunctionsTest.java index f25f54bf0449..1084365ffa76 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/main/function/MainFunctionsTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/main/function/MainFunctionsTest.java @@ -17,9 +17,9 @@ package org.ballerinalang.test.main.function; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.values.BArray; import org.ballerinalang.test.BCompileUtil; import org.ballerinalang.test.BRunUtil; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/record/RecordRestDescriptorEquivalencyTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/record/RecordRestDescriptorEquivalencyTest.java index 8451d376547b..303519d224b6 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/record/RecordRestDescriptorEquivalencyTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/record/RecordRestDescriptorEquivalencyTest.java @@ -23,8 +23,8 @@ import org.testng.Assert; import org.testng.annotations.Test; -import static java.lang.String.format; import static org.ballerinalang.test.BAssertUtil.validateError; +import static java.lang.String.format; /** * Test case for equivalency of open records with different rest type descriptors. diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayAccessExprTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayAccessExprTest.java index 76b1654abdad..955f139684eb 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayAccessExprTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayAccessExprTest.java @@ -17,9 +17,9 @@ */ package org.ballerinalang.test.statements.arrays; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.values.BArray; import org.ballerinalang.test.BAssertUtil; import org.ballerinalang.test.BCompileUtil; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayFillTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayFillTest.java index d6dc7c086c58..f7fc07fb2dd8 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayFillTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayFillTest.java @@ -18,10 +18,10 @@ package org.ballerinalang.test.statements.arrays; -import io.ballerina.runtime.api.types.PredefinedTypes; -import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BMap; @@ -38,11 +38,11 @@ import java.util.Map; import static io.ballerina.runtime.api.utils.TypeUtils.getType; -import static java.math.BigDecimal.ZERO; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; +import static java.math.BigDecimal.ZERO; /** * Test cases for filling the elements of the array with its type's implicit initial value. diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayTest.java index c375e00df5f4..d8c11d4cb499 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayTest.java @@ -17,18 +17,18 @@ */ package org.ballerinalang.test.statements.arrays; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BObject; import io.ballerina.runtime.api.values.BXml; -import io.ballerina.runtime.internal.xml.XmlFactory; import io.ballerina.runtime.internal.types.BArrayType; import io.ballerina.runtime.internal.values.ArrayValue; import io.ballerina.runtime.internal.values.ArrayValueImpl; +import io.ballerina.runtime.internal.xml.XmlFactory; import org.ballerinalang.test.BAssertUtil; import org.ballerinalang.test.BCompileUtil; import org.ballerinalang.test.BRunUtil; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/SealedArrayTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/SealedArrayTest.java index c27dea7192ff..2e1d2aca850c 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/SealedArrayTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/SealedArrayTest.java @@ -18,9 +18,9 @@ */ package org.ballerinalang.test.statements.arrays; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.values.BArray; import org.ballerinalang.test.BAssertUtil; import org.ballerinalang.test.BCompileUtil; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/arraysofarrays/SealedArraysOfArraysTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/arraysofarrays/SealedArraysOfArraysTest.java index 89bfa96bd4e5..8c27e3bed470 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/arraysofarrays/SealedArraysOfArraysTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/arraysofarrays/SealedArraysOfArraysTest.java @@ -18,9 +18,9 @@ */ package org.ballerinalang.test.statements.arrays.arraysofarrays; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.values.BArray; import org.ballerinalang.test.BAssertUtil; import org.ballerinalang.test.BCompileUtil; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/assign/AssignStmtTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/assign/AssignStmtTest.java index 2b38dff137b7..38e61b099bba 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/assign/AssignStmtTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/assign/AssignStmtTest.java @@ -16,9 +16,9 @@ */ package org.ballerinalang.test.statements.assign; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BString; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/bytetype/BByteValueTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/bytetype/BByteValueTest.java index 3f2f5193d19f..b5fb77387047 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/bytetype/BByteValueTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/bytetype/BByteValueTest.java @@ -17,9 +17,9 @@ */ package org.ballerinalang.test.types.bytetype; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.values.BArray; import org.ballerinalang.test.BCompileUtil; import org.ballerinalang.test.BRunUtil; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/handle/OpaqueHandleTypeTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/handle/OpaqueHandleTypeTest.java index 23123a95c313..a9a67f02d637 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/handle/OpaqueHandleTypeTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/handle/OpaqueHandleTypeTest.java @@ -17,9 +17,9 @@ */ package org.ballerinalang.test.types.handle; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.internal.values.HandleValue; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/map/BMapValueTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/map/BMapValueTest.java index 35678ac9886d..12937ecf0fd4 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/map/BMapValueTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/map/BMapValueTest.java @@ -21,9 +21,9 @@ import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BString; -import io.ballerina.runtime.internal.xml.XmlFactory; import io.ballerina.runtime.internal.values.MapValue; import io.ballerina.runtime.internal.values.MapValueImpl; +import io.ballerina.runtime.internal.xml.XmlFactory; import org.ballerinalang.test.BCompileUtil; import org.ballerinalang.test.BRunUtil; import org.ballerinalang.test.CompileResult; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/readonly/DeepReadOnlyTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/readonly/DeepReadOnlyTest.java index c2a855d8eb92..e4c748f0a0b4 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/readonly/DeepReadOnlyTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/readonly/DeepReadOnlyTest.java @@ -18,10 +18,10 @@ package org.ballerinalang.test.types.readonly; -import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.MapType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.TableType; import io.ballerina.runtime.api.types.TupleType; import io.ballerina.runtime.api.types.Type; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLLiteralWithNamespacesTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLLiteralWithNamespacesTest.java index 8e05df2a8470..ccd2ddf37703 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLLiteralWithNamespacesTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLLiteralWithNamespacesTest.java @@ -22,8 +22,8 @@ import io.ballerina.runtime.api.values.BXml; import io.ballerina.runtime.api.values.BXmlItem; import io.ballerina.runtime.api.values.BXmlSequence; -import io.ballerina.runtime.internal.xml.XmlFactory; import io.ballerina.runtime.internal.values.XmlValue; +import io.ballerina.runtime.internal.xml.XmlFactory; import org.ballerinalang.test.BCompileUtil; import org.ballerinalang.test.BRunUtil; import org.ballerinalang.test.CompileResult; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLSecurityTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLSecurityTest.java index 912b738be891..86d298598482 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLSecurityTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/xml/XMLSecurityTest.java @@ -17,8 +17,8 @@ */ package org.ballerinalang.test.types.xml; -import io.ballerina.runtime.internal.xml.XmlFactory; import io.ballerina.runtime.internal.values.ErrorValue; +import io.ballerina.runtime.internal.xml.XmlFactory; import org.testng.Assert; import org.testng.annotations.Test; From f5cd2fa195d0df45f3ee3d05e2bb4d171765ffc7 Mon Sep 17 00:00:00 2001 From: warunalakshitha Date: Tue, 12 Nov 2024 08:08:24 +0530 Subject: [PATCH 3/5] Remove deprecated getVersion API --- .../src/main/java/io/ballerina/runtime/api/Module.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Module.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Module.java index 4573b76c3d0e..79ae48530c56 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Module.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/Module.java @@ -62,11 +62,6 @@ public String getName() { return name; } - @Deprecated - public String getVersion() { - return majorVersion; - } - public String getMajorVersion() { return majorVersion; } From f7b01d7866a88c87f3b45b89c8eaf9efedba2fb7 Mon Sep 17 00:00:00 2001 From: warunalakshitha Date: Tue, 12 Nov 2024 13:27:37 +0530 Subject: [PATCH 4/5] Fix strand metadata test --- .../src/test/resources/test-src/strand/strand-meta-data.bal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/jballerina-unit-test/src/test/resources/test-src/strand/strand-meta-data.bal b/tests/jballerina-unit-test/src/test/resources/test-src/strand/strand-meta-data.bal index 5315afb81788..8eb64b8188e0 100644 --- a/tests/jballerina-unit-test/src/test/resources/test-src/strand/strand-meta-data.bal +++ b/tests/jballerina-unit-test/src/test/resources/test-src/strand/strand-meta-data.bal @@ -103,7 +103,7 @@ function assertStrandMetadataResult(string assertString) { var module = getCurrentModule(env); string org = java:toString(getOrg(module)); string modName = java:toString(getName(module)); - string modVersion = java:toString(getVersion(module)); + string modVersion = java:toString(getMajorVersion(module)); assertEquality(assertString, org +"/" + modName + ":" + modVersion + "." + strandName); assertTrue(id > 0); } @@ -132,7 +132,7 @@ function getName(handle module) returns handle = @java:Method { 'class: "io.ballerina.runtime.api.Module" } external; -function getVersion(handle module) returns handle = @java:Method { +function getMajorVersion(handle module) returns handle = @java:Method { 'class: "io.ballerina.runtime.api.Module" } external; From 37ba5cfb12dfda834092abc1420a64c1be3de58e Mon Sep 17 00:00:00 2001 From: warunalakshitha Date: Tue, 12 Nov 2024 13:31:22 +0530 Subject: [PATCH 5/5] Fix debugger evaluation test --- .../debugadapter/evaluation/utils/EvaluationUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/debug-adapter/modules/debug-adapter-core/src/main/java/org/ballerinalang/debugadapter/evaluation/utils/EvaluationUtils.java b/misc/debug-adapter/modules/debug-adapter-core/src/main/java/org/ballerinalang/debugadapter/evaluation/utils/EvaluationUtils.java index 1348e7130e61..1548c0715e89 100644 --- a/misc/debug-adapter/modules/debug-adapter-core/src/main/java/org/ballerinalang/debugadapter/evaluation/utils/EvaluationUtils.java +++ b/misc/debug-adapter/modules/debug-adapter-core/src/main/java/org/ballerinalang/debugadapter/evaluation/utils/EvaluationUtils.java @@ -97,7 +97,7 @@ public final class EvaluationUtils { public static final String B_VALUE_CREATOR_CLASS = RUNTIME_HELPER_PREFIX + "api.creators.ValueCreator"; public static final String B_STRING_UTILS_CLASS = RUNTIME_HELPER_PREFIX + "api.utils.StringUtils"; public static final String B_TYPE_UTILS_CLASS = RUNTIME_HELPER_PREFIX + "api.utils.TypeUtils"; - public static final String B_XML_FACTORY_CLASS = RUNTIME_HELPER_PREFIX + "internal.XmlFactory"; + public static final String B_XML_FACTORY_CLASS = RUNTIME_HELPER_PREFIX + "internal.xml.XmlFactory"; public static final String B_DECIMAL_VALUE_CLASS = RUNTIME_HELPER_PREFIX + "internal.values.DecimalValue"; public static final String B_XML_CLASS = RUNTIME_HELPER_PREFIX + "api.values.BXml"; public static final String B_XML_VALUE_CLASS = RUNTIME_HELPER_PREFIX + "internal.values.XmlValue";