Merge branch 'main' into 58_bugfix_missingPropertiesOnCommandRun

SJSU-CS-systems-group · Jun 5, 2024 · 02cd2f1 · 02cd2f1
2 parents 7b9483c + ebc0058
commit 02cd2f1
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 78 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -1,12 +1,11 @@
 name: Build Modules
-# Runs workflow only when pull requests are made to 
-# the 'main' branch
+
 on:
   pull_request:
     branches: main
 
 jobs:
-  # Github Action to detect file changes between 
+  # Github Action to detect file changes between
   # main branch and pull request branch
   changes:
     runs-on: ubuntu-latest
@@ -18,7 +17,7 @@ jobs:
     steps:
       - uses: dorny/paths-filter@v3
         id: filter
-        with: 
+        with:
           # Detect any changes to the following folders
           filters: |
             core:
@@ -30,7 +29,6 @@ jobs:
             server:
               - 'bundleserver/**'
 
-
   # Github Action to Compile bundle-core
   build-bundle-core:
     needs: changes
@@ -43,42 +41,40 @@ jobs:
 
       - name: Setup JDK 17
         uses: actions/setup-java@v3
-        with: 
-          java-version: '17'
-          distribution: 'temurin'
-      
+        with:
+          java-version: "17"
+          distribution: "temurin"
+
       - name: Run maven package on bundle-core
         working-directory: ./bundle-core
         run: mvn package
 
-
   # Github Action to Compile BundleClient
   build-bundle-client:
     needs: changes
     # Compile BundleClient only if files were changed here
     if: ${{ needs.changes.outputs.client == 'true' }}
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-
-    - name: Setup gradle
-      uses: gradle/gradle-build-action@v2
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-    - name: Setup JDK 17
-      uses: actions/setup-java@v3
-      with: 
-        java-version: '17'
-        distribution: 'temurin'
+      - name: Setup gradle
+        uses: gradle/gradle-build-action@v2
 
-    - name: Run maven package on server dependency > bundle-core
-      working-directory: ./bundle-core
-      run: mvn install
+      - name: Setup JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: "17"
+          distribution: "temurin"
 
-    - name: Run gradle build on BundleClient
-      working-directory: ./BundleClient
-      run: ./gradlew build
+      - name: Run maven package on server dependency > bundle-core
+        working-directory: ./bundle-core
+        run: mvn install
 
+      - name: Run gradle build on BundleClient
+        working-directory: ./BundleClient
+        run: ./gradlew build
 
   # Github Action to Compile BundleTransport
   build-bundle-transport:
@@ -87,22 +83,21 @@ jobs:
     if: ${{ needs.changes.outputs.transport == 'true' }}
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-
-    - name: Setup gradle
-      uses: gradle/gradle-build-action@v2
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-    - name: Setup JDK 17
-      uses: actions/setup-java@v3
-      with: 
-        java-version: '17'
-        distribution: 'temurin'
+      - name: Setup gradle
+        uses: gradle/gradle-build-action@v2
 
-    - name: Run gradle build on BundleTransport
-      working-directory: ./BundleTransport
-      run: ./gradlew build
+      - name: Setup JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: "17"
+          distribution: "temurin"
 
+      - name: Run gradle build on BundleTransport
+        working-directory: ./BundleTransport
+        run: ./gradlew build
 
   # Github Action to Compile bundleserver
   build-bundle-server:
@@ -113,17 +108,54 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        
+
       - name: Setup JDK 17
         uses: actions/setup-java@v3
-        with: 
-          java-version: '17'
-          distribution: 'temurin'
+        with:
+          java-version: "17"
+          distribution: "temurin"
 
       - name: Run maven package on server dependency > bundle-core
         working-directory: ./bundle-core
         run: mvn install
-      
+
       - name: Run maven package on BundleServer
         working-directory: ./bundleserver
         run: mvn package
+
+  call-auto-formatter:
+    needs:
+      [
+        changes,
+        build-bundle-core,
+        build-bundle-client,
+        build-bundle-transport,
+        build-bundle-server,
+      ]
+    if: ${{ always() }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+
+      - name: Install IntelliJ IDEA
+        run: |
+          wget -q -O idea.tar.gz https://download.jetbrains.com/idea/ideaIC-2024.1.1.tar.gz
+          tar -xzf idea.tar.gz
+
+      - name: Format code
+        run: |
+          ./*/bin/format.sh -m *.java -r .
+
+      - name: Commit changes
+        run: |
+          git config user.name 'github-actions[bot]'
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          if ! git diff --exit-code > /dev/null
+          then
+            git commit -a -m "Auto-format code"
+            git push
+          fi
diff --git a/.github/workflows/reformat.yml b/.github/workflows/reformat.yml
diff --git a/BundleClient/app/src/main/java/com/ddd/utils/JarUtils.java b/BundleClient/app/src/main/java/com/ddd/utils/JarUtils.java
@@ -20,7 +20,6 @@
 import java.util.zip.CheckedInputStream;
 
 import android.util.Base64;
-
 import com.ddd.datastore.filestore.FileStoreHelper;
 
 public class JarUtils {

diff --git a/bundle-core/src/main/java/com/ddd/model/BundleDTO.java b/bundle-core/src/main/java/com/ddd/model/BundleDTO.java
@@ -1,6 +1,7 @@
 package com.ddd.model;
 
 public class BundleDTO {
+
     private String bundleId;
     private Bundle bundle;