Refactor changes from core (#926)

* Refactor changes from core #1 Signed-off-by: Darshit Chanpura <[email protected]> * Fix * imports Signed-off-by: Darshit Chanpura <[email protected]> * Fixes missed refactor change Signed-off-by: Darshit Chanpura <[email protected]> * Adds import order to formatting.gradle Signed-off-by: Darshit Chanpura <[email protected]> --------- Signed-off-by: Darshit Chanpura <[email protected]>
opensearch-project · Aug 21, 2023 · 6baacae · 6baacae
1 parent c50e28e
commit 6baacae
Show file tree

Hide file tree

Showing 64 changed files with 367 additions and 368 deletions.
diff --git a/gradle/formatting.gradle b/gradle/formatting.gradle
@@ -7,6 +7,21 @@ allprojects {
             target '**/*.java'
 
             removeUnusedImports()
+            importOrder(
+                    'de.thetaphi',
+                    'com.carrotsearch',
+                    'com.fasterxml',
+                    'com.avast',
+                    'com.sun',
+                    'com.maxmind|com.github|com.networknt|groovy|nebula',
+                    'org.antlr',
+                    'software.amazon',
+                    'com.azure|com.microsoft|com.ibm|com.google|joptsimple|org.apache|org.bouncycastle|org.codehaus|org.opensearch|org.objectweb|org.joda|org.hamcrest|org.openjdk|org.gradle|org.junit',
+                    'javax',
+                    'java',
+                    '',
+                    '\\#java|\\#org.opensearch|\\#org.hamcrest|\\#'
+            )
             eclipse().configFile rootProject.file('formatter/formatterConfig.xml')
             trimTrailingWhitespace()
             endWithNewline();

diff --git a/src/main/java/org/opensearch/sdk/Extension.java b/src/main/java/org/opensearch/sdk/Extension.java
@@ -9,15 +9,15 @@
 
 package org.opensearch.sdk;
 
-import java.util.Collections;
-import java.util.Collection;
-import java.util.List;
-
-import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.common.settings.Setting;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.threadpool.ExecutorBuilder;
-import org.opensearch.common.settings.Settings;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * This interface defines methods which an extension must provide. Extensions

diff --git a/src/main/java/org/opensearch/sdk/ExtensionsRunner.java b/src/main/java/org/opensearch/sdk/ExtensionsRunner.java
@@ -18,16 +18,16 @@
 import org.opensearch.action.ActionType;
 import org.opensearch.action.support.TransportAction;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
-import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
-import org.opensearch.extensions.rest.ExtensionRestRequest;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.discovery.InitializeExtensionRequest;
 import org.opensearch.extensions.DiscoveryExtensionNode;
 import org.opensearch.extensions.ExtensionsManager;
 import org.opensearch.extensions.UpdateSettingsRequest;
 import org.opensearch.extensions.action.ExtensionActionRequest;
+import org.opensearch.extensions.rest.ExtensionRestRequest;
 import org.opensearch.sdk.action.SDKActionModule;
 import org.opensearch.sdk.api.ActionExtension;
 import org.opensearch.sdk.handlers.ExtensionActionRequestHandler;

diff --git a/src/main/java/org/opensearch/sdk/NettyTransport.java b/src/main/java/org/opensearch/sdk/NettyTransport.java
@@ -9,9 +9,6 @@
 
 package org.opensearch.sdk;
 
-import java.nio.file.Path;
-import java.util.Collections;
-
 import org.opensearch.Version;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.network.NetworkService;
@@ -29,6 +26,9 @@
 import org.opensearch.transport.TransportService;
 import org.opensearch.transport.netty4.Netty4Transport;
 
+import java.nio.file.Path;
+import java.util.Collections;
+
 import static java.util.Collections.emptySet;
 import static org.opensearch.common.UUIDs.randomBase64UUID;
 

diff --git a/src/main/java/org/opensearch/sdk/SDKClient.java b/src/main/java/org/opensearch/sdk/SDKClient.java
@@ -9,31 +9,23 @@
 
 package org.opensearch.sdk;
 
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.datatype.guava.GuavaModule;
-import org.apache.hc.core5.function.Factory;
-import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
-import org.apache.hc.client5.http.ssl.ClientTlsStrategyBuilder;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
 import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager;
 import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.ssl.ClientTlsStrategyBuilder;
+import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
+import org.apache.hc.core5.function.Factory;
+import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.nio.ssl.TlsStrategy;
 import org.apache.hc.core5.reactor.ssl.TlsDetails;
 import org.apache.hc.core5.ssl.SSLContextBuilder;
-import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.ActionRequest;
-import org.opensearch.core.action.ActionResponse;
 import org.opensearch.action.ActionType;
 import org.opensearch.action.admin.cluster.health.ClusterHealthRequest;
 import org.opensearch.action.admin.cluster.health.ClusterHealthResponse;
@@ -67,12 +59,12 @@
 import org.opensearch.client.GetAliasesResponse;
 import org.opensearch.client.IndicesClient;
 import org.opensearch.client.Node;
+import org.opensearch.client.Request;
 import org.opensearch.client.RequestOptions;
 import org.opensearch.client.Requests;
-import org.opensearch.client.RestClient;
-import org.opensearch.client.Request;
 import org.opensearch.client.Response;
 import org.opensearch.client.ResponseListener;
+import org.opensearch.client.RestClient;
 import org.opensearch.client.RestClientBuilder;
 import org.opensearch.client.RestHighLevelClient;
 import org.opensearch.client.indices.CreateIndexRequest;
@@ -90,11 +82,20 @@
 import org.opensearch.client.opensearch.OpenSearchClient;
 import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.rest_client.RestClientTransport;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.core.action.ActionResponse;
 import org.opensearch.index.reindex.BulkByScrollResponse;
 import org.opensearch.index.reindex.DeleteByQueryRequest;
 
 import javax.net.ssl.SSLEngine;
 
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * This class creates SDKClient for an extension to make requests to OpenSearch
  */

diff --git a/src/main/java/org/opensearch/sdk/SDKClusterService.java b/src/main/java/org/opensearch/sdk/SDKClusterService.java
@@ -9,22 +9,22 @@
 
 package org.opensearch.sdk;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Consumer;
-
 import org.opensearch.cluster.ClusterName;
 import org.opensearch.cluster.ClusterState;
+import org.opensearch.common.settings.AbstractScopedSettings;
 import org.opensearch.common.settings.Setting;
+import org.opensearch.common.settings.Setting.Property;
 import org.opensearch.common.settings.SettingUpgrader;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.settings.AbstractScopedSettings;
-import org.opensearch.common.settings.Setting.Property;
 import org.opensearch.extensions.DiscoveryExtensionNode;
 
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
+
 /**
  * This class simulates methods normally called from OpenSearch ClusterService class.
  */

diff --git a/src/main/java/org/opensearch/sdk/SDKNamedWriteableRegistry.java b/src/main/java/org/opensearch/sdk/SDKNamedWriteableRegistry.java
@@ -10,10 +10,10 @@
 package org.opensearch.sdk;
 
 import org.opensearch.cluster.ClusterModule;
-import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
-import org.opensearch.core.common.io.stream.NamedWriteableRegistry.Entry;
 import org.opensearch.common.network.NetworkModule;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry.Entry;
 import org.opensearch.indices.IndicesModule;
 import org.opensearch.search.SearchModule;
 

diff --git a/src/main/java/org/opensearch/sdk/SDKNamedXContentRegistry.java b/src/main/java/org/opensearch/sdk/SDKNamedXContentRegistry.java
@@ -9,22 +9,22 @@
 
 package org.opensearch.sdk;
 
-import static java.util.stream.Collectors.toList;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
 import org.opensearch.cluster.ClusterModule;
 import org.opensearch.common.network.NetworkModule;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
-import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.core.xcontent.NamedXContentRegistry.Entry;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.indices.IndicesModule;
 import org.opensearch.search.SearchModule;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import static java.util.stream.Collectors.toList;
+
 /**
  * Combines Extension NamedXContent with core OpenSearch NamedXContent
  */

diff --git a/src/main/java/org/opensearch/sdk/SDKTransportService.java b/src/main/java/org/opensearch/sdk/SDKTransportService.java
@@ -9,23 +9,14 @@
 
 package org.opensearch.sdk;
 
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-
 import com.google.protobuf.ByteString;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.transport.TransportResponse;
 import org.opensearch.extensions.AddSettingsUpdateConsumerRequest;
 import org.opensearch.extensions.DiscoveryExtensionNode;
 import org.opensearch.extensions.ExtensionRequest;
@@ -36,9 +27,9 @@
 import org.opensearch.extensions.proto.ExtensionRequestProto;
 import org.opensearch.extensions.rest.RegisterRestActionsRequest;
 import org.opensearch.extensions.settings.RegisterCustomSettingsRequest;
-import org.opensearch.sdk.api.ActionExtension.ActionHandler;
 import org.opensearch.sdk.action.RemoteExtensionActionRequest;
 import org.opensearch.sdk.action.SDKActionModule;
+import org.opensearch.sdk.api.ActionExtension.ActionHandler;
 import org.opensearch.sdk.handlers.AcknowledgedResponseHandler;
 import org.opensearch.sdk.handlers.ClusterSettingsResponseHandler;
 import org.opensearch.sdk.handlers.ClusterStateResponseHandler;
@@ -47,10 +38,19 @@
 import org.opensearch.sdk.handlers.ExtensionDependencyResponseHandler;
 import org.opensearch.sdk.handlers.UpdateSettingsRequestHandler;
 import org.opensearch.sdk.rest.ExtensionRestPathRegistry;
-import org.opensearch.core.transport.TransportResponse;
 import org.opensearch.transport.TransportResponseHandler;
 import org.opensearch.transport.TransportService;
 
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
 /**
  * Wrapper class for {@link TransportService} and associated methods.
  *

diff --git a/src/main/java/org/opensearch/sdk/action/RemoteExtensionActionRequest.java b/src/main/java/org/opensearch/sdk/action/RemoteExtensionActionRequest.java
@@ -9,19 +9,19 @@
 
 package org.opensearch.sdk.action;
 
-import java.io.IOException;
-import java.util.Objects;
-
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestValidationException;
-import org.opensearch.core.action.ActionResponse;
 import org.opensearch.action.ActionType;
-import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.common.io.stream.BytesStreamOutput;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.extensions.action.ExtensionTransportActionsHandler;
 
+import java.io.IOException;
+import java.util.Objects;
+
 /**
  * A request class to request an action be executed on another extension
  */

diff --git a/src/main/java/org/opensearch/sdk/action/RemoteExtensionTransportAction.java b/src/main/java/org/opensearch/sdk/action/RemoteExtensionTransportAction.java
@@ -9,16 +9,15 @@
 
 package org.opensearch.sdk.action;
 
-import org.opensearch.core.action.ActionListener;
+import com.google.inject.Inject;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.TransportAction;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.extensions.action.RemoteExtensionActionResponse;
 import org.opensearch.sdk.SDKTransportService;
 import org.opensearch.tasks.Task;
 import org.opensearch.tasks.TaskManager;
 
-import com.google.inject.Inject;
-
 /**
  * Sends a request to OpenSearch for a remote extension to execute an action.
  */

diff --git a/src/main/java/org/opensearch/sdk/action/SDKActionModule.java b/src/main/java/org/opensearch/sdk/action/SDKActionModule.java
@@ -9,21 +9,19 @@
 
 package org.opensearch.sdk.action;
 
-import java.util.Collections;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import com.google.inject.AbstractModule;
+import com.google.inject.multibindings.MapBinder;
 import org.opensearch.action.ActionType;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.TransportAction;
 import org.opensearch.common.NamedRegistry;
-import org.opensearch.sdk.api.ActionExtension.ActionHandler;
 import org.opensearch.sdk.Extension;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.multibindings.MapBinder;
-
 import org.opensearch.sdk.api.ActionExtension;
+import org.opensearch.sdk.api.ActionExtension.ActionHandler;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import static java.util.Collections.unmodifiableMap;
 

diff --git a/src/main/java/org/opensearch/sdk/api/ActionExtension.java b/src/main/java/org/opensearch/sdk/api/ActionExtension.java
@@ -9,17 +9,17 @@
 
 package org.opensearch.sdk.api;
 
-import org.opensearch.action.ActionType;
 import org.opensearch.action.ActionRequest;
-import org.opensearch.core.action.ActionResponse;
+import org.opensearch.action.ActionType;
 import org.opensearch.action.RequestValidators;
 import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.opensearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.opensearch.action.support.ActionFilter;
 import org.opensearch.action.support.TransportAction;
 import org.opensearch.action.support.TransportActions;
-import org.opensearch.core.common.Strings;
 import org.opensearch.common.util.concurrent.ThreadContext;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.RestHeaderDefinition;
 import org.opensearch.sdk.Extension;
 import org.opensearch.sdk.rest.ExtensionRestHandler;

diff --git a/src/main/java/org/opensearch/sdk/api/CircuitBreakerExtension.java b/src/main/java/org/opensearch/sdk/api/CircuitBreakerExtension.java
@@ -9,10 +9,10 @@
 
 package org.opensearch.sdk.api;
 
-import org.opensearch.core.common.breaker.CircuitBreaker;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.indices.breaker.BreakerSettings;
+import org.opensearch.core.common.breaker.CircuitBreaker;
 import org.opensearch.core.indices.breaker.CircuitBreakerService;
+import org.opensearch.indices.breaker.BreakerSettings;
 import org.opensearch.sdk.Extension;
 
 /**