From c20fd0fb5af78d8bd6d809f7958a846292760437 Mon Sep 17 00:00:00 2001
From: Mitchell Gale <Mitchell.gale@improving.com>
Date: Mon, 24 Jul 2023 11:54:12 -0700
Subject: [PATCH] fixed merge conflict

---
 DEVELOPER_GUIDE.rst | 10 ++++++++--
 build.gradle        | 20 ++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/DEVELOPER_GUIDE.rst b/DEVELOPER_GUIDE.rst
index 69b6826838..5b1b4bd633 100644
--- a/DEVELOPER_GUIDE.rst
+++ b/DEVELOPER_GUIDE.rst
@@ -113,8 +113,8 @@ Note that missing license header will be detected by Gradle license plugin and f
 Making Code Changes
 ===================
 
-Project Strucure
-----------------
+Project Structure
+-----------------
 
 The plugin codebase is in standard layout of Gradle project::
 
@@ -222,6 +222,12 @@ Most of the time you just need to run ./gradlew build which will make sure you p
      - Run all integration test (this takes time).
    * - ./gradlew build
      - Build plugin by run all tasks above (this takes time).
+   * - ./gradlew pitest
+     - Run PiTest mutation testing (see more info in `#1204 <https://github.com/opensearch-project/sql/pull/1204>`_)
+   * - ./gradlew spotlessCheck
+     - Runs Spotless to check for code style.
+   * - ./gradlew spotlessApply
+     - Automatically apply spotless code style changes.
 
 For integration test, you can use ``-Dtests.class`` “UT full path” to run a task individually. For example ``./gradlew :integ-test:integTest -Dtests.class="*QueryIT"``.
 
diff --git a/build.gradle b/build.gradle
index d035f2b293..364cef28a5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,6 +65,7 @@ plugins {
     id 'checkstyle'
     id "io.freefair.lombok" version "6.4.0"
     id 'jacoco'
+    id 'com.diffplug.spotless' version '6.19.0'
 }
 
 // import versions defined in https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchJavaPlugin.java#L94
@@ -79,6 +80,25 @@ repositories {
     maven { url 'https://jitpack.io' }
 }
 
+// Spotless checks will be added as PRs are applied to resolve each style issue is approved.
+spotless {
+    java {
+//        target fileTree('.') {
+//            include '**/*.java', 'src/*/java/**/*.java'
+//            exclude '**/build/**', '**/build-*/**'
+//        }
+//        importOrder()
+//        licenseHeader("/*\n" +
+//                " * Copyright OpenSearch Contributors\n" +
+//                " * SPDX-License-Identifier: Apache-2.0\n" +
+//                " */\n\n\n")
+//        removeUnusedImports()
+//        trimTrailingWhitespace()
+//        endWithNewline()
+//        googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
+    }
+}
+
 allprojects {
     version = opensearch_version.tokenize('-')[0] + '.0'
     if (buildVersionQualifier) {