diff --git a/compiler-plugin/src/main/java/io/ballerina/c2c/tasks/ChoreoCodeGenTask.java b/compiler-plugin/src/main/java/io/ballerina/c2c/tasks/ChoreoCodeGenTask.java index 36b81c6f..86222217 100644 --- a/compiler-plugin/src/main/java/io/ballerina/c2c/tasks/ChoreoCodeGenTask.java +++ b/compiler-plugin/src/main/java/io/ballerina/c2c/tasks/ChoreoCodeGenTask.java @@ -62,11 +62,11 @@ public void perform(CompilerLifecycleEventContext compilerLifecycleEventContext) Optional executablePath = compilerLifecycleEventContext.getGeneratedArtifactPath(); final PackageID currentPackage = KubernetesContext.getInstance().getCurrentPackage(); executablePath.ifPresent(path -> { - String executableJarName = "$anon".equals(currentPackage.orgName.value) ? path.getFileName().toString() : - currentPackage.orgName.value + "-" + currentPackage.name.value + - "-" + currentPackage.version.value + ".jar"; - String outputName = "$anon".equals(currentPackage.orgName.value) ? extractJarName(path.getFileName()) : - currentPackage.name.value; + String executableJarName = "$anon".equals(currentPackage.orgName.getValue()) ? path.getFileName().toString() : + currentPackage.orgName.getValue() + "-" + currentPackage.name.getValue() + + "-" + currentPackage.version.getValue() + ".jar"; + String outputName = "$anon".equals(currentPackage.orgName.getValue()) ? extractJarName(path.getFileName()) : + currentPackage.name.getValue(); dataHolder.setOutputName(outputName); addDependencyJars(compilerLifecycleEventContext.compilation(), executableJarName); dataHolder.setSourceRoot(executablePath.get().getParent().getParent().getParent()); diff --git a/compiler-plugin/src/main/java/io/ballerina/c2c/utils/DockerGenerator.java b/compiler-plugin/src/main/java/io/ballerina/c2c/utils/DockerGenerator.java index 1a25bafc..08ed4c63 100644 --- a/compiler-plugin/src/main/java/io/ballerina/c2c/utils/DockerGenerator.java +++ b/compiler-plugin/src/main/java/io/ballerina/c2c/utils/DockerGenerator.java @@ -232,8 +232,8 @@ private String generateDockerfile() { appendCommonCommands(dockerfileContent); if (isBlank(this.dockerModel.getEntryPoint())) { PackageID packageID = this.dockerModel.getPkgId(); - String mainClass = JarResolver.getQualifiedClassName(packageID.orgName.value, packageID.name.value, - packageID.version.value, MODULE_INIT_CLASS_NAME); + String mainClass = JarResolver.getQualifiedClassName(packageID.orgName.getValue(), packageID.name.getValue(), + packageID.version.getValue(), MODULE_INIT_CLASS_NAME); List args = new ArrayList<>(); args.add("java"); args.add("-Xdiag");