Test new action approach3

.github/workflows/main.yml

@@ -26,7 +26,7 @@ jobs:
 
   javadoc:
     runs-on: ubuntu-latest
-    needs: test
+    needs: test  # Ensures the javadoc phase runs only after the test phase succeeds
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -47,11 +47,12 @@ jobs:
             exit 1
           fi
 
-  deploy:
+  update-docs:
     runs-on: ubuntu-latest
-
+    needs: [test, javadoc]  # This ensures that deploy phase runs only after both test and javadoc phases succeed
+    if: github.event.pull_request.merged == true  # Ensures this runs only when the PR is merged
     steps:
-      - name: Checkout repository
+      - name: Checkout code
         uses: actions/checkout@v2
 
       - name: Set up SSH for deploy key
@@ -66,14 +67,15 @@ jobs:
       - name: Generate Javadoc
         run: mvn javadoc:javadoc --no-transfer-progress
 
-      - name: Push Javadoc to GitHub Pages
+      - name: Deploy docs to GitHub Pages
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
+          git remote set-url origin [email protected]:${{ github.repository }}.git
           rm -rf docs/apidocs
           mv target/site/apidocs docs/apidocs
           git add docs/apidocs
           git commit -m "Update Javadoc"
-          git push origin main
+          git push origin gh-pages
         env:
-          GIT_SSH_COMMAND: "ssh -i ~/.ssh/deploy_key -o IdentitiesOnly=yes"
+          GIT_SSH_COMMAND: "ssh -i ~/.ssh/deploy_key -o IdentitiesOnly=yes"

src/main/java/edu/university/ecs/lab/common/utils/FlowUtils.java

@@ -8,7 +8,7 @@
 public class FlowUtils {
 
     /**
-     * Method for generating <strong>ALL</strong> possibilities
+     * Method for generating all possibilities
      * of Flows
      *
      * @param microserviceSystem the microservice system to scan for flows
@@ -223,7 +223,7 @@ private static Field findServiceField(Flow flow) {
      * This method finds any jClass affiliated with the serviceField of a flow.
      * Due to polymorphism the type is not guaranteed to match one class so all
      * possibilities will be considered.
-     * <br/><strong>Note: This is a source of approximation -- Runtime types</strong>
+     * Note: This is a source of approximation -- Runtime types
      *
      * @param flow the flow
      * @return the jClass affiliated with the serviceField
@@ -278,7 +278,7 @@ private static Field findRepositoryField(Flow flow) {
      * This method finds any jClass affiliated with the repositoryField of a flow.
      * Due to polymorphism the type is not guaranteed to match one class so all
      * possibilities will be considered.
-     * <br/><strong>Note: This is a source of approximation -- Runtime types</strong>
+     * Note: This is a source of approximation -- Runtime types
      *
      * @param flow the flow
      * @return the jClass affiliated with the repositoryField

src/main/java/edu/university/ecs/lab/detection/antipatterns/services/NoApiGatewayService.java

@@ -39,7 +39,7 @@ public NoApiGateway checkforApiGateway(MicroserviceSystem microserviceSystem) {
    }
 
    /**
-     * Checks if the given JsonObject contains the "cloud" -> "gateway" configuration.
+     * Checks if the given JsonObject contains the "cloud" or "gateway" configuration.
      * @param data The JsonObject to check.
      * @return true if the configuration is found, false otherwise.
      */