From 631b7623687e0e25719aca5d90f1541b78031389 Mon Sep 17 00:00:00 2001 From: Heshan Padmasiri Date: Mon, 29 Jul 2024 10:08:34 +0530 Subject: [PATCH] Fix checkstyle violations --- .../runtime/api/types/semtype/Builder.java | 1 - .../api/types/semtype/PredefinedTypeEnv.java | 15 +++++++-------- .../runtime/internal/types/BFunctionType.java | 3 +-- .../internal/types/BNetworkObjectType.java | 1 - .../runtime/internal/types/BObjectType.java | 3 +-- .../types/semtype/FunctionQualifiers.java | 2 +- .../runtime/internal/types/semtype/Member.java | 1 - 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/semtype/Builder.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/semtype/Builder.java index 956a40023aec..889b0310c7f6 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/semtype/Builder.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/semtype/Builder.java @@ -39,7 +39,6 @@ import io.ballerina.runtime.internal.values.AbstractObjectValue; import io.ballerina.runtime.internal.values.DecimalValue; import io.ballerina.runtime.internal.values.FPValue; -import io.ballerina.runtime.internal.values.ObjectValue; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/semtype/PredefinedTypeEnv.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/semtype/PredefinedTypeEnv.java index 469bf0198d28..8d2b27fa4f18 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/semtype/PredefinedTypeEnv.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/semtype/PredefinedTypeEnv.java @@ -57,14 +57,14 @@ private void initilizeEnv() { cellAtomicInnerRO(); } - private static PredefinedTypeEnv INSTANCE; + private static PredefinedTypeEnv instance; - public synchronized static PredefinedTypeEnv getInstance() { - if (INSTANCE == null) { - INSTANCE = new PredefinedTypeEnv(); - INSTANCE.initilizeEnv(); + public static synchronized PredefinedTypeEnv getInstance() { + if (instance == null) { + instance = new PredefinedTypeEnv(); + instance.initilizeEnv(); } - return INSTANCE; + return instance; } private final List> initializedCellAtoms = new ArrayList<>(); @@ -74,7 +74,6 @@ public synchronized static PredefinedTypeEnv getInstance() { private final List initializedRecMappingAtoms = new ArrayList<>(); private final AtomicInteger nextAtomIndex = new AtomicInteger(0); - // FIXME: instead use enums and enum map // This is to avoid passing down env argument when doing cell type operations. // Please refer to the cellSubtypeDataEnsureProper() in cell.bal private CellAtomicType cellAtomicVal; @@ -529,7 +528,7 @@ private int reservedRecAtomCount() { return Integer.max(initializedRecListAtoms.size(), initializedRecMappingAtoms.size()); } - // FIXME: avoid creating these multiple times + // TODO: avoid creating these multiple times private SemType cellSemTypeObjectMemberKind() { return Builder.basicSubType( BT_CELL, BCellSubType.createDelegate(bddAtom(atomCellObjectMemberKind())) 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 d382ce89e88a..557550a8a8bb 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 @@ -235,7 +235,6 @@ public long getFlags() { private static SemType createIsolatedTop(Env env) { FunctionDefinition fd = new FunctionDefinition(); SemType ret = Builder.valType(); - // FIXME: add a comment explaining why we are using neverType here return fd.define(env, Builder.neverType(), ret, FunctionQualifiers.create(true, false)); } @@ -303,7 +302,7 @@ public FunctionQualifiers getQualifiers() { SymbolFlags.isFlagOn(flags, SymbolFlags.TRANSACTIONAL)); } - // FIXME: consider moving this to builder + // TODO: consider moving this to builder private static SemTypeResult getSemType(Context cx, Type type) { SemType semType = Builder.from(cx, type); if (!Core.isNever(Core.intersect(semType, Core.B_TYPE_TOP))) { diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BNetworkObjectType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BNetworkObjectType.java index ee3cacde96f4..774964095558 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BNetworkObjectType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BNetworkObjectType.java @@ -27,7 +27,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.stream.Stream; /** 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 f49edd0d49f5..c976aee0a63d 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 @@ -64,7 +64,6 @@ import java.util.StringJoiner; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; -import java.util.stream.Stream; import static io.ballerina.runtime.api.TypeTags.SERVICE_TAG; @@ -88,7 +87,7 @@ public class BObjectType extends BStructureType implements ObjectType, PartialSe private boolean resolving; private ObjectDefinition od; private final Env env = Env.getInstance(); - // FIXME: better name + // TODO: better name private SemType softSemTypeCache; private final DistinctIdSupplier distinctIdSupplier; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/semtype/FunctionQualifiers.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/semtype/FunctionQualifiers.java index f62fece7667f..850b6131466d 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/semtype/FunctionQualifiers.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/semtype/FunctionQualifiers.java @@ -25,7 +25,7 @@ public final class FunctionQualifiers { - private final static FunctionQualifiers DEFAULT = new FunctionQualifiers(false, false); + private static final FunctionQualifiers DEFAULT = new FunctionQualifiers(false, false); private final boolean isolated; private final boolean transactional; private SemType semType; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/semtype/Member.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/semtype/Member.java index bd84d06e6dee..8d96cfcc543c 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/semtype/Member.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/semtype/Member.java @@ -21,7 +21,6 @@ import io.ballerina.runtime.api.types.semtype.Core; import io.ballerina.runtime.api.types.semtype.SemType; -import static io.ballerina.runtime.api.types.semtype.Builder.booleanConst; import static io.ballerina.runtime.api.types.semtype.Builder.stringConst; public record Member(String name, SemType valueTy, Kind kind, Visibility visibility, boolean immutable) {