Merge pull request #38644 from ballerina-platform/revert-idl-client-d…

…eclaration Revert idl client declaration feature
ballerina-platform · Nov 14, 2022 · 084b505 · 084b505
2 parents 101d4d3 + 1a494ad
commit 084b505
Show file tree

Hide file tree

Showing 320 changed files with 158 additions and 15,568 deletions.
diff --git a/.github/workflows/pull_request_ubuntu_build.yml b/.github/workflows/pull_request_ubuntu_build.yml
@@ -11,7 +11,6 @@ on:
       - stage-swan-lake
       - 2201.[0-9]+.x
       - 2201.[0-9]+.[0-9]+-stage
-      - native-build-stage
 
 jobs:
   ubuntu_build:

diff --git a/.github/workflows/pull_request_windows_build.yml b/.github/workflows/pull_request_windows_build.yml
@@ -11,7 +11,6 @@ on:
       - ballerina-[0-9]+.[0-9]+.x
       - 2201.[0-9]+.x
       - 2201.[0-9]+.[0-9]+-stage
-      - native-build-stage
 
 jobs:
   windows_build:

diff --git a/.gitignore b/.gitignore
@@ -33,7 +33,6 @@ velocity.log
 /composer/modules/web/dist-electron
 extractedDistribution
 misc/testerina/modules/report-tools/node_modules/
-generated
 
 # gradle
 .gradle

diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/task/CompileTask.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/task/CompileTask.java
@@ -84,11 +84,8 @@ public void execute(Project project) {
 
         System.setProperty(CentralClientConstants.ENABLE_OUTPUT_STREAM, "true");
 
-        // Run IDL generator plugins
-        project.currentPackage().runIDLGeneratorPlugins();
-        List<Diagnostic> diagnostics = new ArrayList<>();
-
         try {
+            List<Diagnostic> diagnostics = new ArrayList<>();
             long start = 0;
             if (project.buildOptions().dumpBuildTime()) {
                 start = System.currentTimeMillis();

diff --git a/compiler/ballerina-lang/spotbugs-exclude.xml b/compiler/ballerina-lang/spotbugs-exclude.xml
@@ -280,10 +280,6 @@
         <Class name="io.ballerina.projects.ModuleCompilation"/>
         <Bug pattern="URF_UNREAD_FIELD"/>
     </Match>
-    <Match>
-        <Class name="io.ballerina.projects.internal.bala.IDLClientsJson"/>
-        <Bug pattern="URF_UNREAD_FIELD"/>
-    </Match>
     <Match>
         <Class name="org.wso2.ballerinalang.compiler.bir.optimizer.BIROptimizer$OptimizerEnv"/>
         <Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
@@ -315,11 +311,6 @@
         <Class name="io.ballerina.projects.internal.BalaFiles" />
         <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE" />
     </Match>
-    <Match>
-        <Class name="io.ballerina.projects.internal.BalaFiles" />
-        <Method name="createIDLClientsMapFromJson" />
-        <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" />
-    </Match>
     <Match>
         <Class name="io.ballerina.projects.internal.ProjectFiles" />
         <Method name="loadDocuments" />
@@ -442,9 +433,4 @@
         <Method name="addMatchingIncludePaths" />
         <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" />
     </Match>
-    <Match>
-        <Class name="io.ballerina.projects.Package" />
-        <Method name="saveGeneratedModules" />
-        <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" />
-    </Match>
 </FindBugsFilter>
diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/BaseVisitor.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/BaseVisitor.java
@@ -21,7 +21,6 @@
 import org.wso2.ballerinalang.compiler.tree.BLangAnnotationAttachment;
 import org.wso2.ballerinalang.compiler.tree.BLangBlockFunctionBody;
 import org.wso2.ballerinalang.compiler.tree.BLangClassDefinition;
-import org.wso2.ballerinalang.compiler.tree.BLangClientDeclaration;
 import org.wso2.ballerinalang.compiler.tree.BLangCompilationUnit;
 import org.wso2.ballerinalang.compiler.tree.BLangErrorVariable;
 import org.wso2.ballerinalang.compiler.tree.BLangExprFunctionBody;
@@ -230,10 +229,6 @@ public void visit(BLangImportPackage importPkgNode) {
     public void visit(BLangXMLNS xmlnsNode) {
     }
 
-    @Override
-    public void visit(BLangClientDeclaration clientDecl) {
-    }
-
     @Override
     public void visit(BLangFunction funcNode) {
     }

diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/NodeFinder.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/NodeFinder.java
@@ -29,7 +29,6 @@
 import org.wso2.ballerinalang.compiler.tree.BLangAnnotationAttachment;
 import org.wso2.ballerinalang.compiler.tree.BLangBlockFunctionBody;
 import org.wso2.ballerinalang.compiler.tree.BLangClassDefinition;
-import org.wso2.ballerinalang.compiler.tree.BLangClientDeclaration;
 import org.wso2.ballerinalang.compiler.tree.BLangCompilationUnit;
 import org.wso2.ballerinalang.compiler.tree.BLangErrorVariable;
 import org.wso2.ballerinalang.compiler.tree.BLangExprFunctionBody;
@@ -282,12 +281,6 @@ private boolean lookupNode(BLangNode node) {
     public void visit(BLangXMLNS xmlnsNode) {
         lookupNode(xmlnsNode.namespaceURI);
     }
-
-    @Override
-    public void visit(BLangClientDeclaration clientDeclNode) {
-        lookupNode((BLangNode) clientDeclNode.getUri());
-    }
-
     @Override
     public void visit(BLangFunction funcNode) {
         // Compare the target lookup pos with the function symbol pos to ensure that we are not looking for the

diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/ReferenceFinder.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/ReferenceFinder.java
@@ -29,7 +29,6 @@
 import org.wso2.ballerinalang.compiler.tree.BLangAnnotationAttachment;
 import org.wso2.ballerinalang.compiler.tree.BLangBlockFunctionBody;
 import org.wso2.ballerinalang.compiler.tree.BLangClassDefinition;
-import org.wso2.ballerinalang.compiler.tree.BLangClientDeclaration;
 import org.wso2.ballerinalang.compiler.tree.BLangCompilationUnit;
 import org.wso2.ballerinalang.compiler.tree.BLangErrorVariable;
 import org.wso2.ballerinalang.compiler.tree.BLangExprFunctionBody;
@@ -284,13 +283,6 @@ public void visit(BLangXMLNS xmlnsNode) {
         find(xmlnsNode.namespaceURI);
         addIfSameSymbol(xmlnsNode.symbol, xmlnsNode.prefix.pos);
     }
-
-    @Override
-    public void visit(BLangClientDeclaration clientDeclNode) {
-        find((BLangNode) clientDeclNode.getUri());
-        addIfSameSymbol(clientDeclNode.symbol, clientDeclNode.prefix.pos);
-    }
-
     @Override
     public void visit(BLangFunction funcNode) {
         find(funcNode.annAttachments);

diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/SymbolFactory.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/SymbolFactory.java
@@ -23,7 +23,6 @@
 import io.ballerina.compiler.api.impl.symbols.BallerinaAnnotationSymbol;
 import io.ballerina.compiler.api.impl.symbols.BallerinaClassFieldSymbol;
 import io.ballerina.compiler.api.impl.symbols.BallerinaClassSymbol;
-import io.ballerina.compiler.api.impl.symbols.BallerinaClientDeclSymbol;
 import io.ballerina.compiler.api.impl.symbols.BallerinaConstantSymbol;
 import io.ballerina.compiler.api.impl.symbols.BallerinaEnumSymbol;
 import io.ballerina.compiler.api.impl.symbols.BallerinaFunctionSymbol;
@@ -67,7 +66,6 @@
 import org.wso2.ballerinalang.compiler.semantics.model.symbols.BAnnotationSymbol;
 import org.wso2.ballerinalang.compiler.semantics.model.symbols.BAttachedFunction;
 import org.wso2.ballerinalang.compiler.semantics.model.symbols.BClassSymbol;
-import org.wso2.ballerinalang.compiler.semantics.model.symbols.BClientDeclarationSymbol;
 import org.wso2.ballerinalang.compiler.semantics.model.symbols.BConstantSymbol;
 import org.wso2.ballerinalang.compiler.semantics.model.symbols.BEnumSymbol;
 import org.wso2.ballerinalang.compiler.semantics.model.symbols.BInvokableSymbol;
@@ -234,10 +232,6 @@ public Symbol getBCompiledSymbol(BSymbol symbol, String name) {
             return createXMLNamespaceSymbol((BXMLNSSymbol) symbol);
         }
 
-        if (symbol.kind == SymbolKind.CLIENT_DECL) {
-            return createClientDeclSymbol((BClientDeclarationSymbol) symbol);
-        }
-
         throw new IllegalArgumentException("Unsupported symbol type: " + symbol.getClass().getName());
     }
 
@@ -674,37 +668,6 @@ public BallerinaXMLNSSymbol createXMLNamespaceSymbol(BXMLNSSymbol symbol) {
         return symbolBuilder.build();
     }
 
-    /**
-     * Creates a client declaration Symbol.
-     *
-     * @param symbol declaration symbol to convert
-     * @return {@link BallerinaClientDeclSymbol}
-     */
-    private BallerinaClientDeclSymbol createClientDeclSymbol(BClientDeclarationSymbol symbol) {
-        BallerinaClientDeclSymbol.ClientDeclSymbolBuilder symbolBuilder =
-                new BallerinaClientDeclSymbol.ClientDeclSymbolBuilder(symbol.getName().getValue(), symbol, context);
-
-        for (AnnotationAttachmentSymbol annot : symbol.getAnnotations()) {
-            BallerinaAnnotationAttachmentSymbol annotAttachment =
-                    createAnnotAttachment((BAnnotationAttachmentSymbol) annot);
-            symbolBuilder.withAnnotationAttachment(annotAttachment);
-            symbolBuilder.withAnnotation(annotAttachment.typeDescriptor());
-        }
-
-        return symbolBuilder.build();
-    }
-
-    /**
-     * Get associated module of the given client declaration symbol.
-     *
-     * @param clientDeclSymbol Client declaration Symbol
-     * @return {@link BallerinaModule} symbol generated
-     */
-    public BallerinaModule getAssociatedModule(BClientDeclarationSymbol clientDeclSymbol) {
-        BPackageSymbol packageSymbol = (BPackageSymbol) symResolver.resolveClientDeclPrefix(clientDeclSymbol);
-        return createModuleSymbol(packageSymbol, packageSymbol.getName().value);
-    }
-
     /**
      * Create a module symbol.
      *

diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/SymbolFinder.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/SymbolFinder.java
@@ -34,7 +34,6 @@
 import org.wso2.ballerinalang.compiler.tree.BLangAnnotationAttachment;
 import org.wso2.ballerinalang.compiler.tree.BLangBlockFunctionBody;
 import org.wso2.ballerinalang.compiler.tree.BLangClassDefinition;
-import org.wso2.ballerinalang.compiler.tree.BLangClientDeclaration;
 import org.wso2.ballerinalang.compiler.tree.BLangCompilationUnit;
 import org.wso2.ballerinalang.compiler.tree.BLangErrorVariable;
 import org.wso2.ballerinalang.compiler.tree.BLangExprFunctionBody;
@@ -290,15 +289,6 @@ public void visit(BLangXMLNS xmlnsNode) {
         lookupNode(xmlnsNode.namespaceURI);
     }
 
-    @Override
-    public void visit(BLangClientDeclaration clientDeclNode) {
-        if (setEnclosingNode(clientDeclNode.symbol, clientDeclNode.prefix.pos)) {
-            return;
-        }
-
-        lookupNode((BLangNode) clientDeclNode.getUri());
-    }
-
     @Override
     public void visit(BLangFunction funcNode) {
         if (setEnclosingNode(funcNode.symbol, funcNode.name.pos)) {

diff --git a/...-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaAnnotationSymbol.java b/...-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaAnnotationSymbol.java
@@ -241,9 +241,6 @@ public static List<AnnotationAttachPoint> getAttachPoints(int maskedPoints) {
             if (Symbols.isAttachPointPresent(maskedPoints, AttachPoints.RECORD_FIELD)) {
                 annotationAttachPoints.add(AnnotationAttachPoint.RECORD_FIELD);
             }
-            if (Symbols.isAttachPointPresent(maskedPoints, AttachPoints.CLIENT)) {
-                annotationAttachPoints.add(AnnotationAttachPoint.CLIENT);
-            }
 
             return annotationAttachPoints;
         }

diff --git a/...-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaClientDeclSymbol.java b/...-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaClientDeclSymbol.java
diff --git a/...ballerina-lang/src/main/java/io/ballerina/compiler/api/symbols/AnnotationAttachPoint.java b/...ballerina-lang/src/main/java/io/ballerina/compiler/api/symbols/AnnotationAttachPoint.java
@@ -40,6 +40,5 @@ public enum AnnotationAttachPoint {
     EXTERNAL,
     VAR,
     CONST,
-    WORKER,
-    CLIENT
+    WORKER;
 }