From 1023eb902a2ad8627334a0c60ea7e5bffefe29d0 Mon Sep 17 00:00:00 2001
From: Owais Kazi <owaiskazi19@gmail.com>
Date: Wed, 21 Jun 2023 15:53:46 -0700
Subject: [PATCH 1/2] Run precommit before gradle check

Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>
---
 .github/workflows/gradle-check.yml | 33 ++++++++++++++++++++++++++++--
 .github/workflows/precommit.yml    | 19 -----------------
 2 files changed, 31 insertions(+), 21 deletions(-)
 delete mode 100644 .github/workflows/precommit.yml

diff --git a/.github/workflows/gradle-check.yml b/.github/workflows/gradle-check.yml
index ba1dc3dc3b5e6..99b38165277b4 100644
--- a/.github/workflows/gradle-check.yml
+++ b/.github/workflows/gradle-check.yml
@@ -12,7 +12,36 @@ permissions:
   contents: read # to fetch code (actions/checkout)
 
 jobs:
+  spotless:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Spotless Check
+        run: ./gradlew spotlessCheck
+  precommit:
+    needs: spotless
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: 11
+          distribution: temurin
+      - name: Run Gradle
+        run: |
+          ./gradlew javadoc precommit --parallel
   gradle-check:
+    needs: [spotless, precommit]
     permissions:
       contents: read # to fetch code (actions/checkout)
       pull-requests: write # to create or update comment (peter-evans/create-or-update-comment)
@@ -22,7 +51,7 @@ jobs:
     timeout-minutes: 130
     steps:
       - name: Checkout OpenSearch repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
@@ -49,7 +78,7 @@ jobs:
             echo "pr_number=Null" >> $GITHUB_ENV
 
       - name: Checkout opensearch-build repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: opensearch-project/opensearch-build
           ref: main
diff --git a/.github/workflows/precommit.yml b/.github/workflows/precommit.yml
deleted file mode 100644
index e264d65cdf191..0000000000000
--- a/.github/workflows/precommit.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Gradle Precommit
-on: [pull_request]
- 
-jobs:
-  precommit:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest] 
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
-        with:
-          java-version: 11
-          distribution: adopt
-      - name: Run Gradle
-        run: |
-          ./gradlew javadoc precommit --parallel

From d62f905de82a61cbceb378af81e1e3d419e6a0e8 Mon Sep 17 00:00:00 2001
From: Owais Kazi <owaiskazi19@gmail.com>
Date: Wed, 21 Jun 2023 16:27:18 -0700
Subject: [PATCH 2/2] Removed getter

Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>
---
 .../java/org/opensearch/extensions/ExtensionsManager.java     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java b/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java
index 9d74e8f22d2b1..6596180feae24 100644
--- a/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java
+++ b/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java
@@ -564,10 +564,6 @@ Path getExtensionsPath() {
         return extensionsPath;
     }
 
-    TransportService getTransportService() {
-        return transportService;
-    }
-
     ClusterService getClusterService() {
         return clusterService;
     }