Fix checkStyle error

ballerina-platform · Mar 27, 2023 · 6985146 · 6985146
1 parent 87d3068
commit 6985146
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 23 deletions.
diff --git a/...allerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmConstants.java b/...allerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmConstants.java
@@ -309,7 +309,7 @@ public class JvmConstants {
     public static final String MODULE_TUPLE_TYPES_CLASS_NAME = "types/$_tuple_types";
     public static final String MODULE_ANON_TYPES_CLASS_NAME = "types/$_anon_types";
     public static final String MODULE_RECORDS_CREATOR_CLASS_NAME = "creators/$_records";
-    public static final String MODULE_ZERO_VALUE_RECORDS__CLASS_NAME = "creators/$_zero_value_records";
+    public static final String MODULE_ZERO_VALUE_RECORDS_CLASS_NAME = "creators/$_zero_value_records";
     public static final String MODULE_OBJECTS_CREATOR_CLASS_NAME = "creators/$_objects";
     public static final String MODULE_FUNCTION_CALLS_CLASS_NAME = "creators/$_function_calls";
     public static final String MODULE_ERRORS_CREATOR_CLASS_NAME = "creators/$_errors";

diff --git a/...erina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmDesugarPhase.java b/...erina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmDesugarPhase.java
@@ -65,7 +65,7 @@
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmCodeGenUtil.containsDefaultableField;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmCodeGenUtil.getReferredType;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmCodeGenUtil.toNameString;
-import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.MODULE_ZERO_VALUE_RECORDS__CLASS_NAME;
+import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.MODULE_ZERO_VALUE_RECORDS_CLASS_NAME;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmPackageGen.getFunctionWrapper;
 
 /**
@@ -141,7 +141,8 @@ static void rewriteRecordInits(BIRNode.BIRPackage module, InitMethodGen initMeth
                         getRecordInitFunction((BRecordType) recordType, module, symbolTable, initMethodGen);
                 module.functions.add(zeroValueFunction);
                 String pkgName = JvmCodeGenUtil.getPackageName(module.packageID);
-                String className = JvmCodeGenUtil.getModuleLevelClassName(module.packageID, MODULE_ZERO_VALUE_RECORDS__CLASS_NAME);
+                String className =
+                        JvmCodeGenUtil.getModuleLevelClassName(module.packageID, MODULE_ZERO_VALUE_RECORDS_CLASS_NAME);
                 birFunctionMap.put(pkgName + zeroValueFunction.name.value,
                         getFunctionWrapper(zeroValueFunction, module.packageID, className));
                 JavaClass javaClass = jvmClassMapping.get(className);
@@ -208,9 +209,6 @@ private static BIRFunction getRecordInitFunction(BRecordType recordType, BIRNode
                         new BIRNode.BIRMappingConstructorKeyValueEntry(keyVarRef, fieldVarRef);
                 initialValues.add(initialValue);
                 BInvokableSymbol defaultFunc = defaultValues.get(field.symbol.name.value);
-//                BIRNode.BIRGlobalVariableDcl defaultFuncVar = getDefaultFuncFPGlobalVar(defaultFunc.name, module.globalVars);
-//                BIROperand defaultFP = new BIROperand(defaultFuncVar);
-//                boolean workerDerivative = Symbols.isFlagOn(defaultFunc.flags, Flags.WORKER);
                 BIRNode.BIRBasicBlock nextBB = initMethodGen.addAndGetNextBasicBlock(zeroValueFunc);
                 prevBB.terminator =
                         new BIRTerminator.Call(null, InstructionKind.CALL, false, module.packageID, defaultFunc.name,
@@ -229,16 +227,6 @@ private static BIRFunction getRecordInitFunction(BRecordType recordType, BIRNode
         return zeroValueFunc;
     }
 
-    private static BIRNode.BIRGlobalVariableDcl getDefaultFuncFPGlobalVar(Name name,
-                                                                          List<BIRNode.BIRGlobalVariableDcl> globalVars) {
-        for (BIRNode.BIRGlobalVariableDcl globalVar : globalVars) {
-            if (globalVar.name.value.equals(name.value)) {
-                return globalVar;
-            }
-        }
-        throw new BLangCompilerException("Cannot find global var for default value function: " + name);
-    }
-
     private static void rewriteRecordInitFunction(BIRFunction func, BRecordType recordType) {
 
         BIRVariableDcl receiver = func.receiver;

diff --git a/...ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmValueGen.java b/...ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmValueGen.java
@@ -90,8 +90,7 @@
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.LOCK_VALUE;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.MAP_VALUE;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.MAP_VALUE_IMPL;
-import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.MODULE_INIT_CLASS_NAME;
-import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.MODULE_ZERO_VALUE_RECORDS__CLASS_NAME;
+import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.MODULE_ZERO_VALUE_RECORDS_CLASS_NAME;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.POPULATE_INITIAL_VALUES_METHOD;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.RECORD_INIT_WRAPPER_NAME;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.STRAND_CLASS;
@@ -268,7 +267,8 @@ private void createInstantiateMethodWithDefaultValues(ClassWriter cw, BIRNode.BI
         mv.visitCode();
 
         mv.visitVarInsn(ALOAD, 1);
-        String zeroValueClass = JvmCodeGenUtil.getModuleLevelClassName(module.packageID, MODULE_ZERO_VALUE_RECORDS__CLASS_NAME);
+        String zeroValueClass =
+                JvmCodeGenUtil.getModuleLevelClassName(module.packageID, MODULE_ZERO_VALUE_RECORDS_CLASS_NAME);
         mv.visitMethodInsn(INVOKESTATIC, zeroValueClass, "$init_" + typeDef.internalName.value,
                 "(L" + STRAND_CLASS + ";)L" + MAP_VALUE + ";", false);
         mv.visitInsn(ARETURN);

diff --git a/...ang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/split/JvmCreateTypeGen.java b/...ang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/split/JvmCreateTypeGen.java
@@ -117,8 +117,8 @@
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.MODULE_ANON_TYPES_CLASS_NAME;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.MODULE_TYPES_CLASS_NAME;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.OBJECT;
-import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.POPULATE_METHOD_PREFIX;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.OBJECT_FIELD_IMPL;
+import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.POPULATE_METHOD_PREFIX;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.RECORD_FIELD_IMPL;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.SET_IMMUTABLE_TYPE_METHOD;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.STRING_VALUE;

diff --git a/.../java/org/wso2/ballerinalang/compiler/bir/codegen/split/creators/JvmRecordCreatorGen.java b/.../java/org/wso2/ballerinalang/compiler/bir/codegen/split/creators/JvmRecordCreatorGen.java
@@ -59,7 +59,7 @@
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.MAP_VALUE;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.MAX_TYPES_PER_METHOD;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.MODULE_RECORDS_CREATOR_CLASS_NAME;
-import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.MODULE_ZERO_VALUE_RECORDS__CLASS_NAME;
+import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.MODULE_ZERO_VALUE_RECORDS_CLASS_NAME;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.OBJECT;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.SCHEDULER;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.STRAND_CLASS;
@@ -161,7 +161,8 @@ private void generateCreateRecordMethodSplits(ClassWriter cw, List<BIRTypeDefini
             mv.visitLabel(targetLabel);
             String className = getTypeValueClassName(moduleId, optionalTypeDef.internalName.value);
             if (JvmCodeGenUtil.containsDefaultableField((BRecordType) getReferredType(optionalTypeDef.type))) {
-                mv.visitMethodInsn(INVOKESTATIC, "io/ballerina/runtime/internal/scheduling/Scheduler", "getStrand", "()Lio/ballerina/runtime/internal/scheduling/Strand;", false);
+                mv.visitMethodInsn(INVOKESTATIC, SCHEDULER, "getStrand",
+                        "()Lio/ballerina/runtime/internal/scheduling/Strand;", false);
                 mv.visitVarInsn(ASTORE, 3);
                 mv.visitTypeInsn(NEW, STRAND_CLASS);
                 mv.visitInsn(DUP);
@@ -176,7 +177,7 @@ private void generateCreateRecordMethodSplits(ClassWriter cw, List<BIRTypeDefini
                 mv.visitMethodInsn(INVOKESPECIAL, STRAND_CLASS, JVM_INIT_METHOD, INIT_STRAND, false);
 
 
-                String zeroValueClass = getModuleLevelClassName(moduleId, MODULE_ZERO_VALUE_RECORDS__CLASS_NAME);
+                String zeroValueClass = getModuleLevelClassName(moduleId, MODULE_ZERO_VALUE_RECORDS_CLASS_NAME);
                 mv.visitMethodInsn(INVOKESTATIC, zeroValueClass, "$init_" + optionalTypeDef.internalName.value,
                         "(L" + STRAND_CLASS + ";)L" + MAP_VALUE + ";", false);
             } else {