Removes common package and refactors classes

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

Author: DarshitChanpura

.github/workflows/ci.yml

@@ -48,7 +48,6 @@ jobs:
       run: |
         ./gradlew clean \
           :opensearch-resource-sharing-spi:publishToMavenLocal \
-          :opensearch-security-common:publishToMavenLocal \
           :opensearch-security-client:publishToMavenLocal \
           -Dbuild.snapshot=false
 
@@ -337,12 +336,6 @@ jobs:
           ./gradlew clean :opensearch-resource-sharing-spi:publishToMavenLocal -Dbuild.snapshot=false -Dbuild.version_qualifier=$test_qualifier && test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version_only_number-$test_qualifier-all.jar
           ./gradlew clean :opensearch-resource-sharing-spi:publishToMavenLocal -Dbuild.version_qualifier=$test_qualifier && test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version_only_number-$test_qualifier-SNAPSHOT-all.jar
 
-          # Publish Common
-          ./gradlew clean :opensearch-security-common:publishToMavenLocal && test -s ./common/build/libs/opensearch-security-common-$security_plugin_version-all.jar
-          ./gradlew clean :opensearch-security-common:publishToMavenLocal -Dbuild.snapshot=false && test -s ./common/build/libs/opensearch-security-common-$security_plugin_version_no_snapshot-all.jar
-          ./gradlew clean :opensearch-security-common:publishToMavenLocal -Dbuild.snapshot=false -Dbuild.version_qualifier=$test_qualifier && test -s ./common/build/libs/opensearch-security-common-$security_plugin_version_only_number-$test_qualifier-all.jar
-          ./gradlew clean :opensearch-security-common:publishToMavenLocal -Dbuild.version_qualifier=$test_qualifier && test -s ./common/build/libs/opensearch-security-common-$security_plugin_version_only_number-$test_qualifier-SNAPSHOT-all.jar
-
           # Publish Client
           ./gradlew clean :opensearch-security-client:publishToMavenLocal && test -s ./client/build/libs/opensearch-security-client-$security_plugin_version-all.jar
           ./gradlew clean :opensearch-security-client:publishToMavenLocal -Dbuild.snapshot=false && test -s ./client/build/libs/opensearch-security-client-$security_plugin_version_no_snapshot-all.jar
@@ -353,37 +346,31 @@ jobs:
           ./gradlew clean assemble && \
           test -s ./build/distributions/opensearch-security-$security_plugin_version.zip && \
           test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version.jar && \
-          test -s ./common/build/libs/opensearch-security-common-$security_plugin_version.jar && \
           test -s ./client/build/libs/opensearch-security-client-$security_plugin_version.jar
 
 
           ./gradlew clean assemble -Dbuild.snapshot=false && \
           test -s ./build/distributions/opensearch-security-$security_plugin_version_no_snapshot.zip && \
           test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version_no_snapshot.jar && \
-          test -s ./common/build/libs/opensearch-security-common-$security_plugin_version_no_snapshot.jar && \
           test -s ./client/build/libs/opensearch-security-client-$security_plugin_version_no_snapshot.jar
 
           ./gradlew clean assemble -Dbuild.snapshot=false -Dbuild.version_qualifier=$test_qualifier && \
           test -s ./build/distributions/opensearch-security-$security_plugin_version_only_number-$test_qualifier.zip && \
           test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version_only_number-$test_qualifier.jar && \
-          test -s ./common/build/libs/opensearch-security-common-$security_plugin_version_only_number-$test_qualifier.jar && \
           test -s ./client/build/libs/opensearch-security-client-$security_plugin_version_only_number-$test_qualifier.jar
 
           ./gradlew clean assemble -Dbuild.version_qualifier=$test_qualifier && \
           test -s ./build/distributions/opensearch-security-$security_plugin_version_only_number-$test_qualifier-SNAPSHOT.zip && \
           test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version_only_number-$test_qualifier-SNAPSHOT.jar && \
-          test -s ./common/build/libs/opensearch-security-common-$security_plugin_version_only_number-$test_qualifier-SNAPSHOT.jar && \
           test -s ./client/build/libs/opensearch-security-client-$security_plugin_version_only_number-$test_qualifier-SNAPSHOT.jar
 
           ./gradlew clean publishPluginZipPublicationToZipStagingRepository && \
           test -s ./build/distributions/opensearch-security-$security_plugin_version.zip && \
           test -s ./build/distributions/opensearch-security-$security_plugin_version.pom && \
-          test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version-all.jar && \
-          test -s ./common/build/libs/opensearch-security-common-$security_plugin_version-all.jar
+          test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version-all.jar
 
           ./gradlew clean publishShadowPublicationToMavenLocal && \
           test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version-all.jar && \
-          test -s ./common/build/libs/opensearch-security-common-$security_plugin_version-all.jar && \
           test -s ./client/build/libs/opensearch-security-client-$security_plugin_version-all.jar
 
     - name: List files in build directory on failure

build.gradle

@@ -442,14 +442,6 @@ publishing {
     }
 }
 
-repositories {
-    mavenLocal()
-    mavenCentral()
-    maven { url "https://plugins.gradle.org/m2/" }
-    maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
-    maven { url "https://artifacts.opensearch.org/snapshots/lucene/" }
-    maven { url "https://build.shibboleth.net/nexus/content/repositories/releases" }
-}
 
 tasks.test.finalizedBy(jacocoTestReport)  // report is always generated after tests run
 
@@ -514,6 +506,15 @@ configurations {
 }
 
 allprojects {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        maven { url "https://plugins.gradle.org/m2/" }
+        maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
+        maven { url "https://artifacts.opensearch.org/snapshots/lucene/" }
+        maven { url "https://build.shibboleth.net/nexus/content/repositories/releases" }
+    }
+
     configurations {
         integrationTestImplementation.extendsFrom implementation
         compile.extendsFrom compileOnly
@@ -569,7 +570,6 @@ allprojects {
         integrationTestImplementation 'com.selectivem.collections:special-collections-complete:1.4.0'
         integrationTestImplementation "org.opensearch.plugin:lang-painless:${opensearch_version}"
         integrationTestImplementation project(path:":opensearch-resource-sharing-spi", configuration: 'shadow')
-        integrationTestImplementation project(path: ":${rootProject.name}-common", configuration: 'shadow')
         integrationTestImplementation project(path: ":${rootProject.name}-client", configuration: 'shadow')
     }
 }
@@ -594,6 +594,9 @@ sourceSets {
 
 //add new task that runs integration tests
 task integrationTest(type: Test) {
+    filter {
+        excludeTestsMatching 'org.opensearch.sample.*ResourcePlugin*'
+    }
     doFirst {
         // Only run resources tests on resource-test CI environments or locally
         if (System.getenv('CI_ENVIRONMENT') != 'resource-test' && System.getenv('CI_ENVIRONMENT') != null) {
@@ -642,7 +645,7 @@ tasks.integrationTest.finalizedBy(jacocoTestReport) // report is always generate
 check.dependsOn integrationTest
 
 dependencies {
-    implementation project(path: ":${rootProject.name}-common", configuration: 'shadow')
+    implementation project(path: ":opensearch-resource-sharing-spi", configuration: 'shadow')
     implementation "org.opensearch.plugin:transport-netty4-client:${opensearch_version}"
     implementation "org.opensearch.client:opensearch-rest-high-level-client:${opensearch_version}"
     implementation "org.apache.httpcomponents.client5:httpclient5-cache:${versions.httpclient5}"
@@ -802,8 +805,6 @@ dependencies {
     implementation('com.google.googlejavaformat:google-java-format:1.25.2') {
         exclude group: 'com.google.guava'
     }
-
-    testImplementation project(path: ":${rootProject.name}-common", configuration: 'shadow')
 }
 
 jar {

client/build.gradle

@@ -34,9 +34,8 @@ repositories {
 
 dependencies {
     compileOnly "org.opensearch:opensearch:${opensearch_version}"
-    // SPI dependency comes through common
-    compileOnly project(path: ":${rootProject.name}-common", configuration: 'shadow')
     compileOnly project(path: ":opensearch-resource-sharing-spi")
+    compileOnly project(":")
 }
 
 shadowJar {
@@ -104,5 +103,3 @@ publishing {
         }
     }
 }
-
-compileJava.dependsOn(':opensearch-security-common:shadowJar')

client/src/main/java/org/opensearch/security/client/resources/ResourceSharingNodeClient.java

@@ -17,13 +17,13 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.rest.RestStatus;
-import org.opensearch.security.common.resources.rest.ResourceAccessAction;
-import org.opensearch.security.common.resources.rest.ResourceAccessRequest;
-import org.opensearch.security.common.resources.rest.ResourceAccessResponse;
-import org.opensearch.security.common.support.ConfigConstants;
+import org.opensearch.security.resources.rest.ResourceAccessAction;
+import org.opensearch.security.resources.rest.ResourceAccessRequest;
+import org.opensearch.security.resources.rest.ResourceAccessResponse;
 import org.opensearch.security.spi.resources.Resource;
 import org.opensearch.security.spi.resources.exceptions.ResourceSharingException;
 import org.opensearch.security.spi.resources.sharing.ResourceSharing;
+import org.opensearch.security.support.ConfigConstants;
 import org.opensearch.transport.client.Client;
 
 /**