[Tooling BE model revamp] Move dependencies into component level

.gitattributes

@@ -0,0 +1,2 @@
+# Ensure all Java files use LF.
+*.java eol=lf

.github/workflows/build-master.yml

@@ -9,17 +9,18 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
           node-version: '10.22.1'
 
-      - name: Set up JDK 11.0.7
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11.0.7
+          distribution: 'temurin'
+          java-version: 17.0.7
 
       - name: Change to Timestamped Version
         run: |

.github/workflows/daily-build.yml

@@ -10,17 +10,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
           node-version: '10.22.1'
 
-      - name: Set up JDK 11.0.7
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11.0.7
+          distribution: 'temurin'
+          java-version: 17.0.7
       - name: Build with Gradle
         env:
           packageUser: ${{ secrets.BALLERINA_BOT_USERNAME }}
@@ -32,17 +33,18 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
           node-version: '10.22.1'
 
-      - name: Set up JDK 11.0.7
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11.0.7
+          distribution: 'temurin'
+          java-version: 17.0.7
       - name: Build with Gradle
         env:
           packageUser: ${{ secrets.BALLERINA_BOT_USERNAME }}

.github/workflows/publish-release.yml

@@ -7,17 +7,18 @@ jobs:
   publish-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
           node-version: '10.22.1'
 
-      - name: Set up JDK 11.0.7
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11.0.7
+          distribution: 'temurin'
+          java-version: 17.0.7
       - name: Set version env variable
         run: echo VERSION=$((grep -w "version" | cut -d= -f2) < gradle.properties | cut -d- -f1) >> $GITHUB_ENV
       - name: Pre release depenency version update

.github/workflows/pull-request.yml

@@ -8,17 +8,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
           node-version: '10.22.1'
 
-      - name: Set up JDK 11.0.7
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11.0.7
+          distribution: 'temurin'
+          java-version: 17.0.7
       - name: Build with Gradle
         env:
           packageUser: ${{ github.actor }}
@@ -36,15 +37,16 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
           node-version: '10.22.1'
-      - name: Set up JDK 11.0.7
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11.0.7
+          distribution: 'temurin'
+          java-version: 17.0.7
       - name: Build with Gradle
         env:
           packageUser: ${{ github.actor }}

architecture-model-generator/modules/architecture-model-generator-core/src/main/java/io/ballerina/architecturemodelgenerator/core/ArchitectureModel.java

@@ -21,8 +21,8 @@
 import io.ballerina.architecturemodelgenerator.core.diagnostics.ArchitectureModelDiagnostic;
 import io.ballerina.architecturemodelgenerator.core.model.entity.Entity;
 import io.ballerina.architecturemodelgenerator.core.model.functionentrypoint.FunctionEntryPoint;
+import io.ballerina.architecturemodelgenerator.core.model.service.Connection;
 import io.ballerina.architecturemodelgenerator.core.model.service.Service;
-import io.ballerina.projects.Package;
 
 import java.util.List;
 import java.util.Map;
@@ -34,32 +34,47 @@
  */
 public class ArchitectureModel {
 
+    private final String modelVersion;
+    private final String id;
+    private final String orgName;
     private final String version;
-    private final PackageId packageId;
     private final boolean hasCompilationErrors;
     private final List<ArchitectureModelDiagnostic> diagnostics;
     private final Map<String, Service> services;
     private final Map<String, Entity> entities;
     private final FunctionEntryPoint functionEntryPoint;
-
-    public ArchitectureModel(String version, PackageId packageId, List<ArchitectureModelDiagnostic> diagnostics,
-                             Map<String, Service> services, Map<String, Entity> entities,
-                             FunctionEntryPoint functionEntryPoint, boolean hasCompilationErrors) {
+    private final List<Connection> connections;
+
+    public ArchitectureModel(String modelVersion, String id, String orgName, String version,
+                             List<ArchitectureModelDiagnostic> diagnostics, Map<String, Service> services,
+                             Map<String, Entity> entities, FunctionEntryPoint functionEntryPoint,
+                             boolean hasCompilationErrors, List<Connection> dependencies) {
+        this.modelVersion = modelVersion;
+        this.id = id;
+        this.orgName = orgName;
         this.version = version;
-        this.packageId = packageId;
         this.diagnostics = diagnostics;
         this.services = services;
         this.entities = entities;
         this.functionEntryPoint = functionEntryPoint;
         this.hasCompilationErrors = hasCompilationErrors;
+        this.connections = dependencies;
     }
 
-    public String getVersion() {
-        return version;
+    public String getModelVersion() {
+        return modelVersion;
+    }
+
+    public String getId() {
+        return String.format("%s/%s:%s", orgName, id, version);
+    }
+
+    public String getOrgName() {
+        return orgName;
     }
 
-    public PackageId getPackageId() {
-        return packageId;
+    public String getVersion() {
+        return version;
     }
 
     public List<ArchitectureModelDiagnostic> getDiagnostics() {
@@ -82,31 +97,7 @@ public boolean hasCompilationErrors() {
         return hasCompilationErrors;
     }
 
-    /**
-     * Represent current package information.
-     */
-    public static class PackageId {
-
-        private final String name;
-        private final String org;
-        private final String version;
-
-        public PackageId(Package currentPackage) {
-            this.name = currentPackage.packageName().value();
-            this.org = currentPackage.packageOrg().value();
-            this.version = currentPackage.packageVersion().value().toString();
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public String getOrg() {
-            return org;
-        }
-
-        public String getVersion() {
-            return version;
-        }
+    public List<Connection> getConnections() {
+        return connections;
     }
 }

architecture-model-generator/modules/architecture-model-generator-core/src/main/java/io/ballerina/architecturemodelgenerator/core/ArchitectureModelBuilder.java

@@ -18,7 +18,6 @@
 
 package io.ballerina.architecturemodelgenerator.core;
 
-import io.ballerina.architecturemodelgenerator.core.ArchitectureModel.PackageId;
 import io.ballerina.architecturemodelgenerator.core.diagnostics.ArchitectureModelDiagnostic;
 import io.ballerina.architecturemodelgenerator.core.diagnostics.DiagnosticMessage;
 import io.ballerina.architecturemodelgenerator.core.diagnostics.DiagnosticNode;
@@ -27,6 +26,7 @@
 import io.ballerina.architecturemodelgenerator.core.generators.service.ServiceModelGenerator;
 import io.ballerina.architecturemodelgenerator.core.model.entity.Entity;
 import io.ballerina.architecturemodelgenerator.core.model.functionentrypoint.FunctionEntryPoint;
+import io.ballerina.architecturemodelgenerator.core.model.service.Connection;
 import io.ballerina.architecturemodelgenerator.core.model.service.Service;
 import io.ballerina.projects.Package;
 import io.ballerina.projects.PackageCompilation;
@@ -54,9 +54,12 @@ public ArchitectureModel constructComponentModel(Package currentPackage, Package
         // todo: Change to TypeDefinition
         Map<String, Entity> entities = new HashMap<>();
         List<ArchitectureModelDiagnostic> diagnostics = new ArrayList<>();
+        List<Connection> allDependencies = new ArrayList<>();
         AtomicReference<FunctionEntryPoint> functionEntryPoint = new AtomicReference<>();
-        PackageId packageId = new PackageId(currentPackage);
         AtomicBoolean hasDiagnosticErrors = new AtomicBoolean(false);
+        String packageOrg = currentPackage.packageOrg().value();
+        String packageName = currentPackage.packageName().value();
+        String packageVersion = currentPackage.packageVersion().value().toString();
 
         currentPackage.modules().forEach(module -> {
             PackageCompilation currentPackageCompilation = packageCompilation == null ?
@@ -67,7 +70,9 @@ public ArchitectureModel constructComponentModel(Package currentPackage, Package
 
             ServiceModelGenerator serviceModelGenerator = new ServiceModelGenerator(currentPackageCompilation, module);
             try {
-                services.putAll(serviceModelGenerator.generate());
+                serviceModelGenerator.generate();
+                services.putAll(serviceModelGenerator.getServices());
+                allDependencies.addAll(serviceModelGenerator.getDependencies());
             } catch (Exception e) {
                 DiagnosticMessage message = DiagnosticMessage.failedToGenerate(DiagnosticNode.SERVICES,
                         e.getMessage());
@@ -91,13 +96,15 @@ public ArchitectureModel constructComponentModel(Package currentPackage, Package
 
             FunctionEntryPointModelGenerator functionEntryPointModelGenerator =
                     new FunctionEntryPointModelGenerator(currentPackageCompilation, module);
-            FunctionEntryPoint generatedFunctionEntryPoint = functionEntryPointModelGenerator.generate();
+            functionEntryPointModelGenerator.generate();
+            FunctionEntryPoint generatedFunctionEntryPoint = functionEntryPointModelGenerator.getFunctionEntryPoint();
             if (generatedFunctionEntryPoint != null) {
-                functionEntryPoint.set(functionEntryPointModelGenerator.generate());
+                functionEntryPoint.set(generatedFunctionEntryPoint);
+                allDependencies.addAll(functionEntryPointModelGenerator.getDependencies());
             }
         });
 
-        return new ArchitectureModel(Constants.MODEL_VERSION, packageId, diagnostics, services, entities,
-                functionEntryPoint.get(), hasDiagnosticErrors.get());
+        return new ArchitectureModel(Constants.MODEL_VERSION, packageName, packageOrg, packageVersion, diagnostics,
+                services, entities, functionEntryPoint.get(), hasDiagnosticErrors.get(), allDependencies);
     }
 }

architecture-model-generator/modules/architecture-model-generator-core/src/main/java/io/ballerina/architecturemodelgenerator/core/Constants.java

@@ -51,7 +51,7 @@ public String getValue() {
         }
     }
 
-    public static final String MODEL_VERSION = "0.3.1";
+    public static final String MODEL_VERSION = "0.4.0";
     public static final String COLON = ":";
     public static final String FORWARD_SLASH = "/";
     public static final String SERVICE_ANNOTATION = "choreo:Service";
@@ -71,6 +71,7 @@ public String getValue() {
     public static final String CONSTRAINT_ARRAY = "Array";
     public static final String MIN_LENGTH_FIELD = "minLength";
     public static final String MAX_LENGTH_FIELD = "maxLength";
+    public static final String DEFAULT_SERVICE_BASE_PATH = "_defaultBasePath";
 
     // REST Methods
     public static final String GET_KEYWORD = "get";

architecture-model-generator/modules/architecture-model-generator-core/src/main/java/io/ballerina/architecturemodelgenerator/core/generators/GeneratorUtils.java

@@ -18,8 +18,7 @@
 
 package io.ballerina.architecturemodelgenerator.core.generators;
 
-import io.ballerina.architecturemodelgenerator.core.ArchitectureModel;
-import io.ballerina.architecturemodelgenerator.core.model.ElementLocation;
+import io.ballerina.architecturemodelgenerator.core.model.SourceLocation;
 import io.ballerina.architecturemodelgenerator.core.model.common.DisplayAnnotation;
 import io.ballerina.compiler.api.SemanticModel;
 import io.ballerina.compiler.api.symbols.Annotatable;
@@ -70,29 +69,29 @@
  */
 public class GeneratorUtils {
 
-    public static ElementLocation getElementLocation(String filePath, LineRange lineRange) {
+    public static SourceLocation getSourceLocation(String filePath, LineRange lineRange) {
 
-        ElementLocation.LinePosition startPosition = ElementLocation.LinePosition.from(
+        SourceLocation.LinePosition startPosition = SourceLocation.LinePosition.from(
                 lineRange.startLine().line(), lineRange.startLine().offset());
-        ElementLocation.LinePosition endLinePosition = ElementLocation.LinePosition.from(
+        SourceLocation.LinePosition endLinePosition = SourceLocation.LinePosition.from(
                 lineRange.endLine().line(), lineRange.endLine().offset()
         );
-        return ElementLocation.from(filePath, startPosition, endLinePosition);
+        return SourceLocation.from(filePath, startPosition, endLinePosition);
 
     }
 
     public static DisplayAnnotation getServiceAnnotation(NodeList<AnnotationNode> annotationNodes, String filePath) {
 
-        String id = UUID.randomUUID().toString();
+        String id = "";
         String label = "";
-        ElementLocation elementLocation = null;
+        SourceLocation elementLocation = null;
         for (AnnotationNode annotationNode : annotationNodes) {
             String annotationName = annotationNode.annotReference().toString().trim();
             if (!(annotationName.equals(DISPLAY_ANNOTATION) && annotationNode.annotValue().isPresent())) {
                 continue;
             }
             SeparatedNodeList<MappingFieldNode> fields = annotationNode.annotValue().get().fields();
-            elementLocation = getElementLocation(filePath, annotationNode.lineRange());
+            elementLocation = getSourceLocation(filePath, annotationNode.lineRange());
             for (MappingFieldNode mappingFieldNode : fields) {
                 if (mappingFieldNode.kind() != SyntaxKind.SPECIFIC_FIELD) {
                     continue;
@@ -121,7 +120,7 @@ public static DisplayAnnotation getServiceAnnotation(Annotatable annotableSymbol
 
         String id = null;
         String label = "";
-        ElementLocation elementLocation = null;
+        SourceLocation elementLocation = null;
 
         List<AnnotationSymbol> annotSymbols = annotableSymbol.annotations();
         List<AnnotationAttachmentSymbol> annotAttachmentSymbols = annotableSymbol.annotAttachments();
@@ -131,7 +130,7 @@ public static DisplayAnnotation getServiceAnnotation(Annotatable annotableSymbol
                 AnnotationAttachmentSymbol annotAttachmentSymbol = annotAttachmentSymbols.get(i);
                 String annotName = annotSymbol.getName().orElse("");
                 elementLocation = annotAttachmentSymbol.getLocation().isPresent() ?
-                        getElementLocation(filePath, annotAttachmentSymbol.getLocation().get().lineRange()) : null;
+                        getSourceLocation(filePath, annotAttachmentSymbol.getLocation().get().lineRange()) : null;
                 if (!annotName.equals(DISPLAY_ANNOTATION) || annotAttachmentSymbol.attachmentValue().isEmpty() ||
                         !(annotAttachmentSymbol.attachmentValue().get().value() instanceof LinkedHashMap) ||
                         !annotAttachmentSymbol.isConstAnnotation()) {
@@ -220,9 +219,8 @@ public static List<String> getReferencedType(TypeSymbol typeSymbol, Package curr
 
     private static String getReferenceEntityName(TypeReferenceTypeSymbol typeReferenceTypeSymbol,
                                                  Package currentPackage) {
-        ArchitectureModel.PackageId packageId = new ArchitectureModel.PackageId(currentPackage);
-        String currentPackageName = String.format
-                ("%s/%s:%s", packageId.getOrg(), packageId.getName(), packageId.getVersion());
+        String currentPackageName = String.format("%s/%s:%s", currentPackage.packageOrg().value(),
+                currentPackage.packageName().value(), currentPackage.packageVersion().value());
         String referenceType = typeReferenceTypeSymbol.signature();
         if (typeReferenceTypeSymbol.getModule().isPresent() &&
                 !referenceType.split(":")[0].equals(currentPackageName.split(":")[0])) {