diff --git a/build.gradle b/build.gradle index 40f6fbed..6cc0b186 100644 --- a/build.gradle +++ b/build.gradle @@ -183,24 +183,10 @@ repositories { maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } } -configurations { - all { - resolutionStrategy { - force 'com.google.guava:guava:32.1.3-jre' - } - } -} - dependencies { implementation project(path: ":${rootProject.name}-spi", configuration: 'shadow') - implementation group: 'com.google.guava', name: 'guava', version:'32.1.3-jre' - implementation group: 'com.google.guava', name: 'failureaccess', version:'1.0.3' testImplementation group: 'org.mockito', name: 'mockito-core', version: "${versions.mockito}" javaRestTestImplementation project.sourceSets.main.runtimeClasspath - //spotless - implementation('com.google.googlejavaformat:google-java-format:1.26.0') { - exclude group: 'com.google.guava' - } opensearchPlugin "org.opensearch.plugin:opensearch-security:${security_plugin_version}@zip" } diff --git a/src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java b/src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java index 63884528..6a65263a 100644 --- a/src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java +++ b/src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java @@ -61,8 +61,6 @@ import java.util.ArrayList; import java.util.function.Supplier; -import com.google.common.collect.ImmutableList; - public class JobSchedulerPlugin extends Plugin implements ActionPlugin, ExtensiblePlugin, SystemIndexPlugin { public static final String OPEN_DISTRO_JOB_SCHEDULER_THREAD_POOL_NAME = "open_distro_job_scheduler"; @@ -247,7 +245,7 @@ public List getRestHandlers( RestGetJobDetailsAction restGetJobDetailsAction = new RestGetJobDetailsAction(jobDetailsService); RestGetLockAction restGetLockAction = new RestGetLockAction(lockService); RestReleaseLockAction restReleaseLockAction = new RestReleaseLockAction(lockService); - return ImmutableList.of(restGetJobDetailsAction, restGetLockAction, restReleaseLockAction); + return List.of(restGetJobDetailsAction, restGetLockAction, restReleaseLockAction); } } diff --git a/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetJobDetailsAction.java b/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetJobDetailsAction.java index 8525692f..54e4c528 100644 --- a/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetJobDetailsAction.java +++ b/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetJobDetailsAction.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import com.google.common.collect.ImmutableList; import org.opensearch.transport.client.node.NodeClient; import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken; @@ -60,7 +59,7 @@ public String getName() { @Override public List routes() { - return ImmutableList.of( + return List.of( // New Job Details Entry Request new Route(PUT, String.format(Locale.ROOT, "%s/%s", JobSchedulerPlugin.JS_BASE_URI, "_job_details")), // Update Job Details Entry Request diff --git a/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetLockAction.java b/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetLockAction.java index c650b500..d19cc04f 100644 --- a/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetLockAction.java +++ b/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetLockAction.java @@ -33,7 +33,6 @@ import java.util.concurrent.CompletionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import com.google.common.collect.ImmutableList; import org.opensearch.transport.client.node.NodeClient; import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken; @@ -60,7 +59,7 @@ public String getName() { @Override public List routes() { - return ImmutableList.of(new Route(GET, String.format(Locale.ROOT, "%s/%s", JobSchedulerPlugin.JS_BASE_URI, "_lock"))); + return List.of(new Route(GET, String.format(Locale.ROOT, "%s/%s", JobSchedulerPlugin.JS_BASE_URI, "_lock"))); } @VisibleForTesting diff --git a/src/main/java/org/opensearch/jobscheduler/rest/action/RestReleaseLockAction.java b/src/main/java/org/opensearch/jobscheduler/rest/action/RestReleaseLockAction.java index 96e8104c..56575e85 100644 --- a/src/main/java/org/opensearch/jobscheduler/rest/action/RestReleaseLockAction.java +++ b/src/main/java/org/opensearch/jobscheduler/rest/action/RestReleaseLockAction.java @@ -8,7 +8,6 @@ */ package org.opensearch.jobscheduler.rest.action; -import com.google.common.collect.ImmutableList; import java.io.IOException; import java.util.List; import java.util.Locale; @@ -50,7 +49,7 @@ public String getName() { @Override public List routes() { - return ImmutableList.of( + return List.of( new Route(PUT, String.format(Locale.ROOT, "%s/%s/{%s}", JobSchedulerPlugin.JS_BASE_URI, "_release_lock", LockModel.LOCK_ID)) ); } diff --git a/src/test/java/org/opensearch/jobscheduler/multinode/GetJobDetailsMultiNodeRestIT.java b/src/test/java/org/opensearch/jobscheduler/multinode/GetJobDetailsMultiNodeRestIT.java index 4b294ac1..24c048f4 100644 --- a/src/test/java/org/opensearch/jobscheduler/multinode/GetJobDetailsMultiNodeRestIT.java +++ b/src/test/java/org/opensearch/jobscheduler/multinode/GetJobDetailsMultiNodeRestIT.java @@ -8,7 +8,6 @@ */ package org.opensearch.jobscheduler.multinode; -import com.google.common.collect.ImmutableMap; import java.util.Map; import org.opensearch.client.Response; import org.opensearch.jobscheduler.ODFERestTestCase; @@ -37,7 +36,7 @@ public void testGetJobDetailsRestAPI() throws Exception { client(), "PUT", TestHelpers.GET_JOB_DETAILS_BASE_URI, - ImmutableMap.of(), + Map.of(), TestHelpers.toHttpEntity(initialRequestBody), null ); @@ -50,7 +49,7 @@ public void testGetJobDetailsRestAPI() throws Exception { client(), "PUT", TestHelpers.GET_JOB_DETAILS_BASE_URI, - ImmutableMap.of(GetJobDetailsRequest.DOCUMENT_ID, expectedDocumentId), + Map.of(GetJobDetailsRequest.DOCUMENT_ID, expectedDocumentId), TestHelpers.toHttpEntity(updatedRequestBody), null ); diff --git a/src/test/java/org/opensearch/jobscheduler/multinode/GetLockMultiNodeRestIT.java b/src/test/java/org/opensearch/jobscheduler/multinode/GetLockMultiNodeRestIT.java index 65edd5e3..745c6074 100644 --- a/src/test/java/org/opensearch/jobscheduler/multinode/GetLockMultiNodeRestIT.java +++ b/src/test/java/org/opensearch/jobscheduler/multinode/GetLockMultiNodeRestIT.java @@ -9,6 +9,7 @@ package org.opensearch.jobscheduler.multinode; import java.io.IOException; +import java.util.Map; import org.junit.Before; import org.opensearch.client.Response; @@ -21,8 +22,6 @@ import org.opensearch.jobscheduler.transport.AcquireLockResponse; import org.opensearch.test.OpenSearchIntegTestCase; -import com.google.common.collect.ImmutableMap; - @OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.SUITE, numDataNodes = 2) public class GetLockMultiNodeRestIT extends ODFERestTestCase { @@ -41,7 +40,7 @@ public void setUp() throws Exception { client(), "GET", TestHelpers.GET_LOCK_BASE_URI, - ImmutableMap.of(), + Map.of(), TestHelpers.toHttpEntity(TestHelpers.generateAcquireLockRequestBody(this.initialJobIndexName, this.initialJobId)), null ); @@ -59,7 +58,7 @@ public void testGetLockRestAPI() throws Exception { client(), "GET", TestHelpers.GET_LOCK_BASE_URI, - ImmutableMap.of(), + Map.of(), TestHelpers.toHttpEntity(TestHelpers.generateAcquireLockRequestBody(String.valueOf(i), String.valueOf(i))), null ); @@ -68,7 +67,7 @@ public void testGetLockRestAPI() throws Exception { client(), "PUT", TestHelpers.RELEASE_LOCK_BASE_URI + "/" + expectedLockId, - ImmutableMap.of(), + Map.of(), null, null ); diff --git a/src/test/java/org/opensearch/jobscheduler/multinode/ReleaseLockActionMultiNodeRestIT.java b/src/test/java/org/opensearch/jobscheduler/multinode/ReleaseLockActionMultiNodeRestIT.java index 99fca6f1..bdf5ee17 100644 --- a/src/test/java/org/opensearch/jobscheduler/multinode/ReleaseLockActionMultiNodeRestIT.java +++ b/src/test/java/org/opensearch/jobscheduler/multinode/ReleaseLockActionMultiNodeRestIT.java @@ -8,7 +8,6 @@ */ package org.opensearch.jobscheduler.multinode; -import com.google.common.collect.ImmutableMap; import java.util.Map; import org.junit.Before; import org.opensearch.client.Response; @@ -33,7 +32,7 @@ public void setUp() throws Exception { client(), "GET", TestHelpers.GET_LOCK_BASE_URI, - ImmutableMap.of(), + Map.of(), TestHelpers.toHttpEntity(TestHelpers.generateAcquireLockRequestBody(initialJobIndexName, initialJobId)), null ); @@ -46,7 +45,7 @@ public void testReleaseLockRestAPI() throws Exception { client(), "PUT", TestHelpers.RELEASE_LOCK_BASE_URI + "/" + TestHelpers.generateExpectedLockId(initialJobIndexName, initialJobId), - ImmutableMap.of(), + Map.of(), null, null );