honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Rename] plugins and persistent under server folder (#272) 

* Refactor persistent&plugin folder under server

Signed-off-by: Harold Wang <harowang@amazon.com>
This commit is contained in:
Harold Wang 2021-03-11 15:10:27 -08:00 committed by Nick Knize
parent f9290161d1
commit c17b34c1dc
45 changed files with 371 additions and 371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/java/org/elasticsearch/persistent/AllocatedPersistentTask.java → server/src/main/java/org/opensearch/persistent/AllocatedPersistentTask.java
View File

@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.persistent;
package org.opensearch.persistent;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
import org.opensearch.action.ActionListener;
import org.opensearch.action.admin.cluster.node.tasks.cancel.CancelTasksRequest;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.unit.TimeValue;
import org.opensearch.common.Nullable;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.tasks.CancellableTask;
import org.opensearch.tasks.TaskId;
import org.opensearch.tasks.TaskManager;

28
server/src/main/java/org/elasticsearch/persistent/CompletionPersistentTaskAction.java → server/src/main/java/org/opensearch/persistent/CompletionPersistentTaskAction.java
View File

@ -16,26 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.persistent;
package org.opensearch.persistent;
import org.opensearch.action.ActionListener;
import org.opensearch.action.ActionRequestValidationException;
import org.opensearch.action.ActionType;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder;
import org.elasticsearch.action.support.master.MasterNodeRequest;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
import org.elasticsearch.client.OpenSearchClient;
import org.opensearch.action.support.ActionFilters;
import org.opensearch.action.support.master.MasterNodeOperationRequestBuilder;
import org.opensearch.action.support.master.MasterNodeRequest;
import org.opensearch.action.support.master.TransportMasterNodeAction;
import org.opensearch.client.OpenSearchClient;
import org.opensearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.opensearch.cluster.block.ClusterBlockException;
import org.opensearch.cluster.block.ClusterBlockLevel;
import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.inject.Inject;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;
import org.opensearch.transport.TransportService;
import java.io.IOException;
import java.util.Objects;

6
server/src/main/java/org/elasticsearch/persistent/NodePersistentTasksExecutor.java → server/src/main/java/org/opensearch/persistent/NodePersistentTasksExecutor.java
View File

@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.persistent;
package org.opensearch.persistent;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.util.concurrent.AbstractRunnable;
import org.opensearch.common.Nullable;
import org.opensearch.common.util.concurrent.AbstractRunnable;
import org.opensearch.threadpool.ThreadPool;
/**

6
server/src/main/java/org/elasticsearch/persistent/PersistentTaskParams.java → server/src/main/java/org/opensearch/persistent/PersistentTaskParams.java
View File

@ -17,11 +17,11 @@
* under the License.
*/
package org.elasticsearch.persistent;
package org.opensearch.persistent;
import org.opensearch.cluster.ClusterState;
import org.elasticsearch.common.io.stream.VersionedNamedWriteable;
import org.elasticsearch.common.xcontent.ToXContentObject;
import org.opensearch.common.io.stream.VersionedNamedWriteable;
import org.opensearch.common.xcontent.ToXContentObject;
/**
* Parameters used to start persistent task

8
server/src/main/java/org/elasticsearch/persistent/PersistentTaskResponse.java → server/src/main/java/org/opensearch/persistent/PersistentTaskResponse.java
View File

@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.persistent;
package org.opensearch.persistent;
import org.opensearch.action.ActionResponse;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.persistent.PersistentTasksCustomMetadata.PersistentTask;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.persistent.PersistentTasksCustomMetadata.PersistentTask;
import java.io.IOException;
import java.util.Objects;

6
server/src/main/java/org/elasticsearch/persistent/PersistentTaskState.java → server/src/main/java/org/opensearch/persistent/PersistentTaskState.java
View File

@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.persistent;
package org.opensearch.persistent;
import org.elasticsearch.common.io.stream.NamedWriteable;
import org.elasticsearch.common.xcontent.ToXContentObject;
import org.opensearch.common.io.stream.NamedWriteable;
import org.opensearch.common.xcontent.ToXContentObject;
/**
* {@link PersistentTaskState} represents the state of the persistent tasks, as it

30
server/src/main/java/org/elasticsearch/persistent/PersistentTasksClusterService.java → server/src/main/java/org/opensearch/persistent/PersistentTasksClusterService.java
View File

@ -17,30 +17,30 @@
* under the License.
*/
package org.elasticsearch.persistent;
package org.opensearch.persistent;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.ResourceAlreadyExistsException;
import org.elasticsearch.ResourceNotFoundException;
import org.opensearch.ResourceAlreadyExistsException;
import org.opensearch.ResourceNotFoundException;
import org.opensearch.action.ActionListener;
import org.opensearch.cluster.ClusterChangedEvent;
import org.opensearch.cluster.ClusterState;
import org.opensearch.cluster.ClusterStateListener;
import org.opensearch.cluster.ClusterStateUpdateTask;
import org.opensearch.cluster.NotMasterException;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.node.DiscoveryNodes;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.AbstractAsyncTask;
import org.elasticsearch.persistent.PersistentTasksCustomMetadata.Assignment;
import org.elasticsearch.persistent.PersistentTasksCustomMetadata.PersistentTask;
import org.elasticsearch.persistent.decider.AssignmentDecision;
import org.elasticsearch.persistent.decider.EnableAssignmentDecider;
import org.opensearch.cluster.metadata.Metadata;
import org.opensearch.cluster.node.DiscoveryNode;
import org.opensearch.cluster.node.DiscoveryNodes;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.settings.Setting;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.common.util.concurrent.AbstractAsyncTask;
import org.opensearch.persistent.PersistentTasksCustomMetadata.Assignment;
import org.opensearch.persistent.PersistentTasksCustomMetadata.PersistentTask;
import org.opensearch.persistent.decider.AssignmentDecision;
import org.opensearch.persistent.decider.EnableAssignmentDecider;
import org.opensearch.threadpool.ThreadPool;
import java.io.Closeable;

41
server/src/main/java/org/elasticsearch/persistent/PersistentTasksCustomMetadata.java → server/src/main/java/org/opensearch/persistent/PersistentTasksCustomMetadata.java
View File

@ -16,28 +16,29 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.persistent;
import org.elasticsearch.ResourceAlreadyExistsException;
import org.elasticsearch.ResourceNotFoundException;
import org.elasticsearch.Version;
package org.opensearch.persistent;
import org.opensearch.ResourceAlreadyExistsException;
import org.opensearch.ResourceNotFoundException;
import org.opensearch.Version;
import org.opensearch.cluster.AbstractNamedDiffable;
import org.opensearch.cluster.ClusterState;
import org.opensearch.cluster.NamedDiff;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ObjectParser;
import org.elasticsearch.common.xcontent.ObjectParser.NamedObjectParser;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.opensearch.cluster.metadata.Metadata;
import org.opensearch.common.Nullable;
import org.opensearch.common.ParseField;
import org.opensearch.common.Strings;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.common.io.stream.Writeable;
import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.opensearch.common.xcontent.ObjectParser;
import org.opensearch.common.xcontent.ObjectParser.NamedObjectParser;
import org.opensearch.common.xcontent.ToXContent;
import org.opensearch.common.xcontent.ToXContentObject;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException;
import java.util.Collection;
@ -52,8 +53,8 @@ import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import static org.elasticsearch.cluster.metadata.Metadata.ALL_CONTEXTS;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg;
import static org.opensearch.cluster.metadata.Metadata.ALL_CONTEXTS;
import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
/**
* A cluster state record that contains a list of all running persistent tasks

10
server/src/main/java/org/elasticsearch/persistent/PersistentTasksExecutor.java → server/src/main/java/org/opensearch/persistent/PersistentTasksExecutor.java
View File

@ -17,13 +17,13 @@
* under the License.
*/
package org.elasticsearch.persistent;
package org.opensearch.persistent;
import org.opensearch.cluster.ClusterState;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.persistent.PersistentTasksCustomMetadata.Assignment;
import org.elasticsearch.persistent.PersistentTasksCustomMetadata.PersistentTask;
import org.opensearch.cluster.node.DiscoveryNode;
import org.opensearch.common.Nullable;
import org.opensearch.persistent.PersistentTasksCustomMetadata.Assignment;
import org.opensearch.persistent.PersistentTasksCustomMetadata.PersistentTask;
import org.opensearch.tasks.TaskId;
import java.util.Map;

2
server/src/main/java/org/elasticsearch/persistent/PersistentTasksExecutorRegistry.java → server/src/main/java/org/opensearch/persistent/PersistentTasksExecutorRegistry.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.persistent;
package org.opensearch.persistent;
import java.util.Collection;
import java.util.Collections;

14
server/src/main/java/org/elasticsearch/persistent/PersistentTasksNodeService.java → server/src/main/java/org/opensearch/persistent/PersistentTasksNodeService.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.persistent;
package org.opensearch.persistent;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -25,12 +25,12 @@ import org.opensearch.action.ActionListener;
import org.opensearch.action.admin.cluster.node.tasks.cancel.CancelTasksResponse;
import org.opensearch.cluster.ClusterChangedEvent;
import org.opensearch.cluster.ClusterStateListener;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.gateway.GatewayService;
import org.elasticsearch.persistent.PersistentTasksCustomMetadata.PersistentTask;
import org.opensearch.common.Strings;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.gateway.GatewayService;
import org.opensearch.persistent.PersistentTasksCustomMetadata.PersistentTask;
import org.opensearch.tasks.Task;
import org.opensearch.tasks.TaskAwareRequest;
import org.opensearch.tasks.TaskId;

16
server/src/main/java/org/elasticsearch/persistent/PersistentTasksService.java → server/src/main/java/org/opensearch/persistent/PersistentTasksService.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.persistent;
package org.opensearch.persistent;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -25,15 +25,15 @@ import org.opensearch.action.ActionListener;
import org.opensearch.action.ActionRequest;
import org.opensearch.action.admin.cluster.node.tasks.cancel.CancelTasksRequest;
import org.opensearch.action.admin.cluster.node.tasks.cancel.CancelTasksResponse;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.OriginSettingClient;
import org.opensearch.client.Client;
import org.opensearch.client.OriginSettingClient;
import org.opensearch.cluster.ClusterState;
import org.opensearch.cluster.ClusterStateObserver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.node.NodeClosedException;
import org.elasticsearch.persistent.PersistentTasksCustomMetadata.PersistentTask;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.Nullable;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.node.NodeClosedException;
import org.opensearch.persistent.PersistentTasksCustomMetadata.PersistentTask;
import org.opensearch.tasks.TaskId;
import org.opensearch.threadpool.ThreadPool;

28
server/src/main/java/org/elasticsearch/persistent/RemovePersistentTaskAction.java → server/src/main/java/org/opensearch/persistent/RemovePersistentTaskAction.java
View File

@ -16,26 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.persistent;
package org.opensearch.persistent;
import org.opensearch.action.ActionListener;
import org.opensearch.action.ActionRequestValidationException;
import org.opensearch.action.ActionType;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder;
import org.elasticsearch.action.support.master.MasterNodeRequest;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
import org.elasticsearch.client.OpenSearchClient;
import org.opensearch.action.support.ActionFilters;
import org.opensearch.action.support.master.MasterNodeOperationRequestBuilder;
import org.opensearch.action.support.master.MasterNodeRequest;
import org.opensearch.action.support.master.TransportMasterNodeAction;
import org.opensearch.client.OpenSearchClient;
import org.opensearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.opensearch.cluster.block.ClusterBlockException;
import org.opensearch.cluster.block.ClusterBlockLevel;
import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.inject.Inject;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;
import org.opensearch.transport.TransportService;
import java.io.IOException;
import java.util.Objects;

32
server/src/main/java/org/elasticsearch/persistent/StartPersistentTaskAction.java → server/src/main/java/org/opensearch/persistent/StartPersistentTaskAction.java
View File

@ -16,28 +16,28 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.persistent;
package org.opensearch.persistent;
import org.elasticsearch.Version;
import org.opensearch.Version;
import org.opensearch.action.ActionListener;
import org.opensearch.action.ActionRequestValidationException;
import org.opensearch.action.ActionType;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder;
import org.elasticsearch.action.support.master.MasterNodeRequest;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
import org.elasticsearch.client.OpenSearchClient;
import org.opensearch.action.support.ActionFilters;
import org.opensearch.action.support.master.MasterNodeOperationRequestBuilder;
import org.opensearch.action.support.master.MasterNodeRequest;
import org.opensearch.action.support.master.TransportMasterNodeAction;
import org.opensearch.client.OpenSearchClient;
import org.opensearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.opensearch.cluster.block.ClusterBlockException;
import org.opensearch.cluster.block.ClusterBlockLevel;
import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.Nullable;
import org.opensearch.common.inject.Inject;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;
import org.opensearch.transport.TransportService;
import java.io.IOException;
import java.util.Objects;

28
server/src/main/java/org/elasticsearch/persistent/UpdatePersistentTaskStatusAction.java → server/src/main/java/org/opensearch/persistent/UpdatePersistentTaskStatusAction.java
View File

@ -16,26 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.persistent;
package org.opensearch.persistent;
import org.opensearch.action.ActionListener;
import org.opensearch.action.ActionRequestValidationException;
import org.opensearch.action.ActionType;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder;
import org.elasticsearch.action.support.master.MasterNodeRequest;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
import org.elasticsearch.client.OpenSearchClient;
import org.opensearch.action.support.ActionFilters;
import org.opensearch.action.support.master.MasterNodeOperationRequestBuilder;
import org.opensearch.action.support.master.MasterNodeRequest;
import org.opensearch.action.support.master.TransportMasterNodeAction;
import org.opensearch.client.OpenSearchClient;
import org.opensearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.opensearch.cluster.block.ClusterBlockException;
import org.opensearch.cluster.block.ClusterBlockLevel;
import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.inject.Inject;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;
import org.opensearch.transport.TransportService;
import java.io.IOException;
import java.util.Objects;

2
server/src/main/java/org/elasticsearch/persistent/decider/AssignmentDecision.java → server/src/main/java/org/opensearch/persistent/decider/AssignmentDecision.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.persistent.decider;
package org.opensearch.persistent.decider;
import java.util.Locale;
import java.util.Objects;

12
server/src/main/java/org/elasticsearch/persistent/decider/EnableAssignmentDecider.java → server/src/main/java/org/opensearch/persistent/decider/EnableAssignmentDecider.java
View File

@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.persistent.decider;
package org.opensearch.persistent.decider;
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.Setting;
import org.opensearch.common.settings.Settings;
import java.util.Locale;
import static org.elasticsearch.common.settings.Setting.Property.Dynamic;
import static org.elasticsearch.common.settings.Setting.Property.NodeScope;
import static org.opensearch.common.settings.Setting.Property.Dynamic;
import static org.opensearch.common.settings.Setting.Property.NodeScope;
/**
* {@link EnableAssignmentDecider} is used to allow/disallow the persistent tasks

18
server/src/main/java/org/elasticsearch/persistent/package-info.java → server/src/main/java/org/opensearch/persistent/package-info.java
View File

@ -25,23 +25,23 @@
* requests and responses. The execution is done in six phases:
* <p>
* 1. The coordinating node sends an ordinary transport request to the master node to start a new persistent task. This task is handled
* by the {@link org.elasticsearch.persistent.PersistentTasksService}, which is using
* {@link org.elasticsearch.persistent.PersistentTasksClusterService} to update cluster state with the record about running persistent
* by the {@link org.opensearch.persistent.PersistentTasksService}, which is using
* {@link org.opensearch.persistent.PersistentTasksClusterService} to update cluster state with the record about running persistent
* task.
* <p>
* 2. The master node updates the {@link org.elasticsearch.persistent.PersistentTasksCustomMetadata} in the cluster state to indicate
* 2. The master node updates the {@link org.opensearch.persistent.PersistentTasksCustomMetadata} in the cluster state to indicate
* that there is a new persistent task running in the system.
* <p>
* 3. The {@link org.elasticsearch.persistent.PersistentTasksNodeService} running on every node in the cluster monitors changes in
* 3. The {@link org.opensearch.persistent.PersistentTasksNodeService} running on every node in the cluster monitors changes in
* the cluster state and starts execution of all new tasks assigned to the node it is running on.
* <p>
* 4. If the task fails to start on the node, the {@link org.elasticsearch.persistent.PersistentTasksNodeService} uses the
* {@link org.elasticsearch.persistent.PersistentTasksCustomMetadata} to notify the
* {@link org.elasticsearch.persistent.PersistentTasksService}, which reassigns the action to another node in the cluster.
* 4. If the task fails to start on the node, the {@link org.opensearch.persistent.PersistentTasksNodeService} uses the
* {@link org.opensearch.persistent.PersistentTasksCustomMetadata} to notify the
* {@link org.opensearch.persistent.PersistentTasksService}, which reassigns the action to another node in the cluster.
* <p>
* 5. If a task finishes successfully on the node and calls listener.onResponse(), the corresponding persistent action is removed from the
* cluster state unless removeOnCompletion flag for this task is set to false.
* <p>
* 6. The {@link org.elasticsearch.persistent.RemovePersistentTaskAction} action can be also used to remove the persistent task.
* 6. The {@link org.opensearch.persistent.RemovePersistentTaskAction} action can be also used to remove the persistent task.
*/
package org.elasticsearch.persistent;
package org.opensearch.persistent;

18
server/src/main/java/org/elasticsearch/plugins/ActionPlugin.java → server/src/main/java/org/opensearch/plugins/ActionPlugin.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.opensearch.action.ActionType;
import org.opensearch.action.ActionRequest;
@ -28,14 +28,14 @@ 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.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.node.DiscoveryNodes;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.IndexScopedSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.settings.SettingsFilter;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
import org.opensearch.cluster.node.DiscoveryNodes;
import org.opensearch.common.Strings;
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.IndexScopedSettings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.settings.SettingsFilter;
import org.opensearch.common.util.concurrent.ThreadContext;
import org.opensearch.rest.RestController;
import org.opensearch.rest.RestHandler;
import org.opensearch.rest.RestHeaderDefinition;

30
server/src/main/java/org/elasticsearch/plugins/AnalysisPlugin.java → server/src/main/java/org/opensearch/plugins/AnalysisPlugin.java
View File

@ -17,24 +17,24 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.CharFilter;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.Tokenizer;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.analysis.AnalyzerProvider;
import org.elasticsearch.index.analysis.CharFilterFactory;
import org.elasticsearch.index.analysis.PreBuiltAnalyzerProviderFactory;
import org.elasticsearch.index.analysis.PreConfiguredCharFilter;
import org.elasticsearch.index.analysis.PreConfiguredTokenFilter;
import org.elasticsearch.index.analysis.PreConfiguredTokenizer;
import org.elasticsearch.index.analysis.TokenFilterFactory;
import org.elasticsearch.index.analysis.TokenizerFactory;
import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider;
import org.opensearch.common.settings.Settings;
import org.opensearch.env.Environment;
import org.opensearch.index.IndexSettings;
import org.opensearch.index.analysis.AnalyzerProvider;
import org.opensearch.index.analysis.CharFilterFactory;
import org.opensearch.index.analysis.PreBuiltAnalyzerProviderFactory;
import org.opensearch.index.analysis.PreConfiguredCharFilter;
import org.opensearch.index.analysis.PreConfiguredTokenFilter;
import org.opensearch.index.analysis.PreConfiguredTokenizer;
import org.opensearch.index.analysis.TokenFilterFactory;
import org.opensearch.index.analysis.TokenizerFactory;
import org.opensearch.indices.analysis.AnalysisModule.AnalysisProvider;
import java.io.IOException;
import java.util.List;
@ -44,7 +44,7 @@ import static java.util.Collections.emptyList;
import static java.util.Collections.emptyMap;
/**
* An additional extension point for {@link Plugin}s that extends Elasticsearch's analysis functionality. To add an additional
* An additional extension point for {@link Plugin}s that extends OpenSearch's analysis functionality. To add an additional
* {@link TokenFilter} just implement the interface and implement the {@link #getTokenFilters()} method:
*
* <pre>{@code
@ -56,7 +56,7 @@ import static java.util.Collections.emptyMap;
* }
* }</pre>
*
* Elasticsearch doesn't have any automatic mechanism to share these components between indexes. If any component is heavy enough to warrant
* OpenSearch doesn't have any automatic mechanism to share these components between indexes. If any component is heavy enough to warrant
* such sharing then it is the Plugin's responsibility to do it in their {@link AnalysisProvider} implementation. We recommend against doing
* this unless absolutely necessary because it can be difficult to get the caching right given things like behavior changes across versions.
*/

10
server/src/main/java/org/elasticsearch/plugins/CircuitBreakerPlugin.java → server/src/main/java/org/opensearch/plugins/CircuitBreakerPlugin.java
View File

@ -17,12 +17,12 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.elasticsearch.common.breaker.CircuitBreaker;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.indices.breaker.BreakerSettings;
import org.elasticsearch.indices.breaker.CircuitBreakerService;
import org.opensearch.common.breaker.CircuitBreaker;
import org.opensearch.common.settings.Settings;
import org.opensearch.indices.breaker.BreakerSettings;
import org.opensearch.indices.breaker.CircuitBreakerService;
/**

14
server/src/main/java/org/elasticsearch/plugins/ClusterPlugin.java → server/src/main/java/org/opensearch/plugins/ClusterPlugin.java
View File

@ -17,13 +17,13 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.elasticsearch.cluster.routing.allocation.ExistingShardsAllocator;
import org.elasticsearch.cluster.routing.allocation.allocator.ShardsAllocator;
import org.elasticsearch.cluster.routing.allocation.decider.AllocationDecider;
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.cluster.routing.allocation.ExistingShardsAllocator;
import org.opensearch.cluster.routing.allocation.allocator.ShardsAllocator;
import org.opensearch.cluster.routing.allocation.decider.AllocationDecider;
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.Settings;
import java.util.Collection;
import java.util.Collections;
@ -63,7 +63,7 @@ public interface ClusterPlugin {
/**
* Return {@link ExistingShardsAllocator} implementations added by this plugin; the index setting
* {@link ExistingShardsAllocator#EXISTING_SHARDS_ALLOCATOR_SETTING} sets the key of the allocator to use to allocate its shards. The
* default allocator is {@link org.elasticsearch.gateway.GatewayAllocator}.
* default allocator is {@link org.opensearch.gateway.GatewayAllocator}.
*/
default Map<String, ExistingShardsAllocator> getExistingShardsAllocators() {
return Collections.emptyMap();

24
server/src/main/java/org/elasticsearch/plugins/DiscoveryPlugin.java → server/src/main/java/org/opensearch/plugins/DiscoveryPlugin.java
View File

@ -17,15 +17,15 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.opensearch.cluster.ClusterState;
import org.elasticsearch.cluster.coordination.ElectionStrategy;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.common.network.NetworkService;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.discovery.SeedHostsProvider;
import org.elasticsearch.transport.TransportService;
import org.opensearch.cluster.coordination.ElectionStrategy;
import org.opensearch.cluster.node.DiscoveryNode;
import org.opensearch.common.network.NetworkService;
import org.opensearch.common.settings.Settings;
import org.opensearch.discovery.SeedHostsProvider;
import org.opensearch.transport.TransportService;
import java.util.Collections;
import java.util.Map;
@ -33,7 +33,7 @@ import java.util.function.BiConsumer;
import java.util.function.Supplier;
/**
* An additional extension point for {@link Plugin}s that extends Elasticsearch's discovery functionality. To add an additional
* An additional extension point for {@link Plugin}s that extends OpenSearch's discovery functionality. To add an additional
* {@link NetworkService.CustomNameResolver} just implement the interface and implement the {@link #getCustomNameResolver(Settings)} method:
*
* <pre>{@code
@ -54,7 +54,7 @@ public interface DiscoveryPlugin {
* name.
*
* For example: you could call a third party service (an API) to resolve _mycard_.
* Then you could define in elasticsearch.yml settings like:
* Then you could define in opensearch.yml settings like:
*
* <pre>{@code
* network.host: _mycard_
@ -68,11 +68,11 @@ public interface DiscoveryPlugin {
* Returns providers of seed hosts for discovery.
*
* The key of the returned map is the name of the host provider
* (see {@link org.elasticsearch.discovery.DiscoveryModule#DISCOVERY_SEED_PROVIDERS_SETTING}), and
* (see {@link org.opensearch.discovery.DiscoveryModule#DISCOVERY_SEED_PROVIDERS_SETTING}), and
* the value is a supplier to construct the host provider when it is selected for use.
*
* @param transportService Use to form the {@link org.elasticsearch.common.transport.TransportAddress} portion
* of a {@link org.elasticsearch.cluster.node.DiscoveryNode}
* @param transportService Use to form the {@link org.opensearch.common.transport.TransportAddress} portion
* of a {@link org.opensearch.cluster.node.DiscoveryNode}
* @param networkService Use to find the publish host address of the current node
*/
default Map<String, Supplier<SeedHostsProvider>> getSeedHostProviders(TransportService transportService,

6
server/src/main/java/org/elasticsearch/plugins/EnginePlugin.java → server/src/main/java/org/opensearch/plugins/EnginePlugin.java
View File

@ -17,10 +17,10 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.engine.EngineFactory;
import org.opensearch.index.IndexSettings;
import org.opensearch.index.engine.EngineFactory;
import java.util.Optional;

2
server/src/main/java/org/elasticsearch/plugins/ExtensiblePlugin.java → server/src/main/java/org/opensearch/plugins/ExtensiblePlugin.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import java.util.List;

18
server/src/main/java/org/elasticsearch/plugins/IndexStorePlugin.java → server/src/main/java/org/opensearch/plugins/IndexStorePlugin.java
View File

@ -17,15 +17,15 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.apache.lucene.store.Directory;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.routing.ShardRouting;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.shard.ShardPath;
import org.elasticsearch.indices.recovery.RecoveryState;
import org.opensearch.cluster.node.DiscoveryNode;
import org.opensearch.cluster.routing.ShardRouting;
import org.opensearch.common.Nullable;
import org.opensearch.index.IndexSettings;
import org.opensearch.index.shard.ShardPath;
import org.opensearch.indices.recovery.RecoveryState;
import java.io.IOException;
import java.util.Collections;
@ -53,7 +53,7 @@ public interface IndexStorePlugin {
/**
* The {@link DirectoryFactory} mappings for this plugin. When an index is created the store type setting
* {@link org.elasticsearch.index.IndexModule#INDEX_STORE_TYPE_SETTING} on the index will be examined and either use the default or a
* {@link org.opensearch.index.IndexModule#INDEX_STORE_TYPE_SETTING} on the index will be examined and either use the default or a
* built-in type, or looked up among all the directory factories from {@link IndexStorePlugin} plugins.
*
* @return a map from store type to an directory factory
@ -74,7 +74,7 @@ public interface IndexStorePlugin {
/**
* The {@link RecoveryStateFactory} mappings for this plugin. When an index is created the recovery type setting
* {@link org.elasticsearch.index.IndexModule#INDEX_RECOVERY_TYPE_SETTING} on the index will be examined and either use the default
* {@link org.opensearch.index.IndexModule#INDEX_RECOVERY_TYPE_SETTING} on the index will be examined and either use the default
* or looked up among all the recovery state factories from {@link IndexStorePlugin} plugins.
*
* @return a map from recovery type to an recovery state factory

6
server/src/main/java/org/elasticsearch/plugins/IngestPlugin.java → server/src/main/java/org/opensearch/plugins/IngestPlugin.java
View File

@ -17,12 +17,12 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import java.util.Collections;
import java.util.Map;
import org.elasticsearch.ingest.Processor;
import org.opensearch.ingest.Processor;
/**
* An extension point for {@link Plugin} implementations to add custom ingest processors
@ -33,7 +33,7 @@ public interface IngestPlugin {
* Returns additional ingest processor types added by this plugin.
*
* The key of the returned {@link Map} is the unique name for the processor which is specified
* in pipeline configurations, and the value is a {@link org.elasticsearch.ingest.Processor.Factory}
* in pipeline configurations, and the value is a {@link org.opensearch.ingest.Processor.Factory}
* to create the processor from a given pipeline configuration.
*/
default Map<String, Processor.Factory> getProcessors(Processor.Parameters parameters) {

6
server/src/main/java/org/elasticsearch/plugins/MapperPlugin.java → server/src/main/java/org/opensearch/plugins/MapperPlugin.java
View File

@ -17,10 +17,10 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.elasticsearch.index.mapper.Mapper;
import org.elasticsearch.index.mapper.MetadataFieldMapper;
import org.opensearch.index.mapper.Mapper;
import org.opensearch.index.mapper.MetadataFieldMapper;
import java.util.Collections;
import java.util.Map;

6
server/src/main/java/org/elasticsearch/plugins/MetadataUpgrader.java → server/src/main/java/org/opensearch/plugins/MetadataUpgrader.java
View File

@ -17,10 +17,10 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.elasticsearch.cluster.metadata.IndexTemplateMetadata;
import org.elasticsearch.cluster.metadata.Metadata;
import org.opensearch.cluster.metadata.IndexTemplateMetadata;
import org.opensearch.cluster.metadata.Metadata;
import java.util.Collection;
import java.util.HashMap;

30
server/src/main/java/org/elasticsearch/plugins/NetworkPlugin.java → server/src/main/java/org/opensearch/plugins/NetworkPlugin.java
View File

@ -16,26 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.network.NetworkService;
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.BigArrays;
import org.elasticsearch.common.util.PageCacheRecycler;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.http.HttpServerTransport;
import org.elasticsearch.indices.breaker.CircuitBreakerService;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.opensearch.common.network.NetworkService;
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.util.BigArrays;
import org.opensearch.common.util.PageCacheRecycler;
import org.opensearch.common.util.concurrent.ThreadContext;
import org.opensearch.common.xcontent.NamedXContentRegistry;
import org.opensearch.http.HttpServerTransport;
import org.opensearch.indices.breaker.CircuitBreakerService;
import org.opensearch.threadpool.ThreadPool;
import org.elasticsearch.transport.Transport;
import org.elasticsearch.transport.TransportInterceptor;
import org.opensearch.transport.Transport;
import org.opensearch.transport.TransportInterceptor;
/**
* Plugin for extending network and transport related classes
@ -57,7 +57,7 @@ public interface NetworkPlugin {
/**
* Returns a map of {@link Transport} suppliers.
* See {@link org.elasticsearch.common.network.NetworkModule#TRANSPORT_TYPE_KEY} to configure a specific implementation.
* See {@link org.opensearch.common.network.NetworkModule#TRANSPORT_TYPE_KEY} to configure a specific implementation.
*/
default Map<String, Supplier<Transport>> getTransports(Settings settings, ThreadPool threadPool, PageCacheRecycler pageCacheRecycler,
CircuitBreakerService circuitBreakerService,
@ -67,7 +67,7 @@ public interface NetworkPlugin {
/**
* Returns a map of {@link HttpServerTransport} suppliers.
* See {@link org.elasticsearch.common.network.NetworkModule#HTTP_TYPE_SETTING} to configure a specific implementation.
* See {@link org.opensearch.common.network.NetworkModule#HTTP_TYPE_SETTING} to configure a specific implementation.
*/
default Map<String, Supplier<HttpServerTransport>> getHttpTransports(Settings settings, ThreadPool threadPool, BigArrays bigArrays,
PageCacheRecycler pageCacheRecycler,

13
server/src/main/java/org/elasticsearch/plugins/PersistentTaskPlugin.java → server/src/main/java/org/opensearch/plugins/PersistentTaskPlugin.java
View File

@ -16,13 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.plugins;
import org.elasticsearch.client.Client;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.settings.SettingsModule;
import org.elasticsearch.persistent.PersistentTasksExecutor;
package org.opensearch.plugins;
import org.opensearch.client.Client;
import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.settings.SettingsModule;
import org.opensearch.persistent.PersistentTasksExecutor;
import org.opensearch.threadpool.ThreadPool;
import java.util.Collections;

2
server/src/main/java/org/elasticsearch/plugins/Platforms.java → server/src/main/java/org/opensearch/plugins/Platforms.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.apache.lucene.util.Constants;

48
server/src/main/java/org/elasticsearch/plugins/Plugin.java → server/src/main/java/org/opensearch/plugins/Plugin.java
View File

@ -17,34 +17,34 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.elasticsearch.bootstrap.BootstrapCheck;
import org.elasticsearch.client.Client;
import org.opensearch.bootstrap.BootstrapCheck;
import org.opensearch.client.Client;
import org.opensearch.cluster.ClusterState;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.IndexTemplateMetadata;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.node.DiscoveryNodeRole;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.component.LifecycleComponent;
import org.elasticsearch.common.inject.Module;
import org.elasticsearch.common.io.stream.NamedWriteable;
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.SettingUpgrader;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.env.Environment;
import org.elasticsearch.env.NodeEnvironment;
import org.elasticsearch.index.IndexModule;
import org.elasticsearch.index.shard.IndexSettingProvider;
import org.elasticsearch.repositories.RepositoriesService;
import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
import org.opensearch.cluster.metadata.IndexTemplateMetadata;
import org.opensearch.cluster.metadata.Metadata;
import org.opensearch.cluster.node.DiscoveryNodeRole;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.component.LifecycleComponent;
import org.opensearch.common.inject.Module;
import org.opensearch.common.io.stream.NamedWriteable;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.opensearch.common.settings.Setting;
import org.opensearch.common.settings.SettingUpgrader;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.xcontent.NamedXContentRegistry;
import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.env.Environment;
import org.opensearch.env.NodeEnvironment;
import org.opensearch.index.IndexModule;
import org.opensearch.index.shard.IndexSettingProvider;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.script.ScriptService;
import org.opensearch.threadpool.ExecutorBuilder;
import org.opensearch.threadpool.ThreadPool;
import org.elasticsearch.watcher.ResourceWatcherService;
import org.opensearch.watcher.ResourceWatcherService;
import java.io.Closeable;
import java.io.IOException;
@ -59,7 +59,7 @@ import java.util.function.UnaryOperator;
/**
* An extension point allowing to plug in custom functionality. This class has a number of extension points that are available to all
* plugins, in addition you can implement any of the following interfaces to further customize Elasticsearch:
* plugins, in addition you can implement any of the following interfaces to further customize OpenSearch:
* <ul>
* <li>{@link ActionPlugin}
* <li>{@link AnalysisPlugin}

48
server/src/main/java/org/elasticsearch/plugins/PluginInfo.java → server/src/main/java/org/opensearch/plugins/PluginInfo.java
View File

@ -17,16 +17,16 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.elasticsearch.Version;
import org.elasticsearch.bootstrap.JarHell;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.opensearch.Version;
import org.opensearch.bootstrap.JarHell;
import org.opensearch.common.Strings;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.common.io.stream.Writeable;
import org.opensearch.common.xcontent.ToXContentObject;
import org.opensearch.common.xcontent.XContentBuilder;
import java.io.IOException;
import java.io.InputStream;
@ -52,7 +52,7 @@ public class PluginInfo implements Writeable, ToXContentObject {
private final String name;
private final String description;
private final String version;
private final Version elasticsearchVersion;
private final Version opensearchVersion;
private final String javaVersion;
private final String classname;
private final List<String> extendedPlugins;
@ -64,18 +64,18 @@ public class PluginInfo implements Writeable, ToXContentObject {
* @param name the name of the plugin
* @param description a description of the plugin
* @param version an opaque version identifier for the plugin
* @param elasticsearchVersion the version of Elasticsearch the plugin was built for
* @param opensearchVersion the version of OpenSearch the plugin was built for
* @param javaVersion the version of Java the plugin was built with
* @param classname the entry point to the plugin
* @param extendedPlugins other plugins this plugin extends through SPI
* @param hasNativeController whether or not the plugin has a native controller
*/
public PluginInfo(String name, String description, String version, Version elasticsearchVersion, String javaVersion,
public PluginInfo(String name, String description, String version, Version opensearchVersion, String javaVersion,
String classname, List<String> extendedPlugins, boolean hasNativeController) {
this.name = name;
this.description = description;
this.version = version;
this.elasticsearchVersion = elasticsearchVersion;
this.opensearchVersion = opensearchVersion;
this.javaVersion = javaVersion;
this.classname = classname;
this.extendedPlugins = Collections.unmodifiableList(extendedPlugins);
@ -93,11 +93,11 @@ public class PluginInfo implements Writeable, ToXContentObject {
this.description = in.readString();
this.version = in.readString();
if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
elasticsearchVersion = Version.readVersion(in);
opensearchVersion = Version.readVersion(in);
javaVersion = in.readString();
} else {
// the plugin must have the version of whichever node we are talking to, since this is enforced on startup
elasticsearchVersion = in.getVersion();
opensearchVersion = in.getVersion();
// this might not be true, but it is not important, we just need something here for bwc that is a valid java version string
javaVersion = "1.8";
}
@ -123,7 +123,7 @@ public class PluginInfo implements Writeable, ToXContentObject {
out.writeString(description);
out.writeString(version);
if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
Version.writeVersion(elasticsearchVersion, out);
Version.writeVersion(opensearchVersion, out);
out.writeString(javaVersion);
}
out.writeString(classname);
@ -175,10 +175,10 @@ public class PluginInfo implements Writeable, ToXContentObject {
"property [version] is missing for plugin [" + name + "]");
}
final String esVersionString = propsMap.remove("elasticsearch.version");
final String esVersionString = propsMap.remove("opensearch.version");
if (esVersionString == null) {
throw new IllegalArgumentException(
"property [elasticsearch.version] is missing for plugin [" + name + "]");
"property [opensearch.version] is missing for plugin [" + name + "]");
}
final Version esVersion = Version.fromString(esVersionString);
final String javaVersionString = propsMap.remove("java.version");
@ -283,12 +283,12 @@ public class PluginInfo implements Writeable, ToXContentObject {
}
/**
* The version of Elasticsearch the plugin was built for.
* The version of OpenSearch the plugin was built for.
*
* @return an Elasticsearch version
* @return an OpenSearch version
*/
public Version getElasticsearchVersion() {
return elasticsearchVersion;
public Version getOpenSearchVersion() {
return opensearchVersion;
}
/**
@ -315,7 +315,7 @@ public class PluginInfo implements Writeable, ToXContentObject {
{
builder.field("name", name);
builder.field("version", version);
builder.field("elasticsearch_version", elasticsearchVersion);
builder.field("opensearch_version", opensearchVersion);
builder.field("java_version", javaVersion);
builder.field("description", description);
builder.field("classname", classname);
@ -357,7 +357,7 @@ public class PluginInfo implements Writeable, ToXContentObject {
.append(prefix).append("Name: ").append(name).append("\n")
.append(prefix).append("Description: ").append(description).append("\n")
.append(prefix).append("Version: ").append(version).append("\n")
.append(prefix).append("Elasticsearch Version: ").append(elasticsearchVersion).append("\n")
.append(prefix).append("OpenSearch version: ").append(opensearchVersion).append("\n")
.append(prefix).append("Java Version: ").append(javaVersion).append("\n")
.append(prefix).append("Native Controller: ").append(hasNativeController).append("\n")
.append(prefix).append("Extended Plugins: ").append(extendedPlugins).append("\n")

2
server/src/main/java/org/elasticsearch/plugins/PluginLoaderIndirection.java → server/src/main/java/org/opensearch/plugins/PluginLoaderIndirection.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.opensearch.plugins.ExtendedPluginsClassLoader;

4
server/src/main/java/org/elasticsearch/plugins/PluginSecurity.java → server/src/main/java/org/opensearch/plugins/PluginSecurity.java
View File

@ -17,13 +17,13 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.opensearch.cli.ExitCodes;
import org.opensearch.cli.Terminal;
import org.opensearch.cli.Terminal.Verbosity;
import org.opensearch.cli.UserException;
import org.elasticsearch.core.internal.io.IOUtils;
import org.opensearch.core.internal.io.IOUtils;
import java.io.IOException;
import java.nio.file.Files;

48
server/src/main/java/org/elasticsearch/plugins/PluginsService.java → server/src/main/java/org/opensearch/plugins/PluginsService.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -28,23 +28,23 @@ import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.DocValuesFormat;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.util.SPIClassIterator;
import org.elasticsearch.Build;
import org.elasticsearch.OpenSearchException;
import org.elasticsearch.Version;
import org.opensearch.Build;
import org.opensearch.OpenSearchException;
import org.opensearch.Version;
import org.opensearch.action.admin.cluster.node.info.PluginsAndModules;
import org.elasticsearch.bootstrap.JarHell;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.component.LifecycleComponent;
import org.elasticsearch.common.inject.Module;
import org.elasticsearch.common.io.FileSystemUtils;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Setting.Property;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.IndexModule;
import org.elasticsearch.node.ReportingService;
import org.opensearch.bootstrap.JarHell;
import org.opensearch.common.Strings;
import org.opensearch.common.collect.Tuple;
import org.opensearch.common.component.LifecycleComponent;
import org.opensearch.common.inject.Module;
import org.opensearch.common.io.FileSystemUtils;
import org.opensearch.common.settings.Setting;
import org.opensearch.common.settings.Setting.Property;
import org.opensearch.common.settings.Settings;
import org.opensearch.index.IndexModule;
import org.opensearch.node.ReportingService;
import org.opensearch.threadpool.ExecutorBuilder;
import org.elasticsearch.transport.TransportSettings;
import org.opensearch.transport.TransportSettings;
import java.io.IOException;
import java.lang.reflect.Constructor;
@ -72,7 +72,7 @@ import java.util.TreeMap;
import java.util.function.Function;
import java.util.stream.Collectors;
import static org.elasticsearch.common.io.FileSystemUtils.isAccessibleDirectory;
import static org.opensearch.common.io.FileSystemUtils.isAccessibleDirectory;
public class PluginsService implements ReportingService<PluginsAndModules> {
@ -344,12 +344,12 @@ public class PluginsService implements ReportingService<PluginsAndModules> {
}
/**
* Verify the given plugin is compatible with the current Elasticsearch installation.
* Verify the given plugin is compatible with the current OpenSearch installation.
*/
static void verifyCompatibility(PluginInfo info) {
if (info.getElasticsearchVersion().equals(Version.CURRENT) == false) {
throw new IllegalArgumentException("Plugin [" + info.getName() + "] was built for Elasticsearch version "
+ info.getElasticsearchVersion() + " but version " + Version.CURRENT + " is running");
if (info.getOpenSearchVersion().equals(Version.CURRENT) == false) {
throw new IllegalArgumentException("Plugin [" + info.getName() + "] was built for OpenSearch version "
+ info.getOpenSearchVersion() + " but version " + Version.CURRENT + " is running");
}
JarHell.checkJavaVersion(info.getName(), info.getJavaVersion());
}
@ -367,7 +367,7 @@ public class PluginsService implements ReportingService<PluginsAndModules> {
final String name = fileName.substring(1 + fileName.indexOf("-"));
final String message = String.format(
Locale.ROOT,
"found file [%s] from a failed attempt to remove the plugin [%s]; execute [elasticsearch-plugin remove %2$s]",
"found file [%s] from a failed attempt to remove the plugin [%s]; execute [opensearch-plugin remove %2$s]",
removing,
name);
throw new IllegalStateException(message);
@ -728,8 +728,8 @@ public class PluginsService implements ReportingService<PluginsAndModules> {
Locale.ROOT,
"no public constructor of correct signature for [%s]; must be [%s], [%s], or [%s]",
clazz.getName(),
"(org.elasticsearch.common.settings.Settings,java.nio.file.Path)",
"(org.elasticsearch.common.settings.Settings)",
"(org.opensearch.common.settings.Settings,java.nio.file.Path)",
"(org.opensearch.common.settings.Settings)",
"()");
}

6
server/src/main/java/org/elasticsearch/plugins/ReloadablePlugin.java → server/src/main/java/org/opensearch/plugins/ReloadablePlugin.java
View File

@ -17,9 +17,9 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
/**
* An extension point for {@link Plugin}s that can be reloaded. There is no
@ -51,4 +51,4 @@ public interface ReloadablePlugin {
* if the offending call didn't happen.
*/
void reload(Settings settings) throws Exception;
}
}

12
server/src/main/java/org/elasticsearch/plugins/RepositoryPlugin.java → server/src/main/java/org/opensearch/plugins/RepositoryPlugin.java
View File

@ -17,13 +17,13 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.env.Environment;
import org.elasticsearch.indices.recovery.RecoverySettings;
import org.elasticsearch.repositories.Repository;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.xcontent.NamedXContentRegistry;
import org.opensearch.env.Environment;
import org.opensearch.indices.recovery.RecoverySettings;
import org.opensearch.repositories.Repository;
import java.util.Collections;
import java.util.Map;

6
server/src/main/java/org/elasticsearch/plugins/ScriptPlugin.java → server/src/main/java/org/opensearch/plugins/ScriptPlugin.java
View File

@ -16,19 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.opensearch.script.ScriptContext;
import org.opensearch.script.ScriptEngine;
/**
* An additional extension point for {@link Plugin}s that extends Elasticsearch's scripting functionality.
* An additional extension point for {@link Plugin}s that extends OpenSearch's scripting functionality.
*/
public interface ScriptPlugin {

70
server/src/main/java/org/elasticsearch/plugins/SearchPlugin.java → server/src/main/java/org/opensearch/plugins/SearchPlugin.java
View File

@ -17,41 +17,41 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.apache.lucene.search.Query;
import org.elasticsearch.common.CheckedFunction;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.io.stream.NamedWriteable;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.common.lucene.search.function.ScoreFunction;
import org.elasticsearch.common.xcontent.ContextParser;
import org.elasticsearch.common.xcontent.XContent;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryParser;
import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
import org.elasticsearch.index.query.functionscore.ScoreFunctionParser;
import org.elasticsearch.search.SearchExtBuilder;
import org.elasticsearch.search.aggregations.Aggregation;
import org.elasticsearch.search.aggregations.AggregationBuilder;
import org.elasticsearch.search.aggregations.Aggregator;
import org.elasticsearch.search.aggregations.InternalAggregation;
import org.elasticsearch.search.aggregations.PipelineAggregationBuilder;
import org.elasticsearch.search.aggregations.bucket.terms.SignificantTerms;
import org.elasticsearch.search.aggregations.bucket.terms.heuristic.SignificanceHeuristic;
import org.elasticsearch.search.aggregations.pipeline.MovAvgModel;
import org.elasticsearch.search.aggregations.pipeline.MovAvgPipelineAggregator;
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry;
import org.elasticsearch.search.fetch.FetchSubPhase;
import org.elasticsearch.search.fetch.subphase.highlight.Highlighter;
import org.elasticsearch.search.rescore.Rescorer;
import org.elasticsearch.search.rescore.RescorerBuilder;
import org.elasticsearch.search.suggest.Suggest;
import org.elasticsearch.search.suggest.Suggester;
import org.elasticsearch.search.suggest.SuggestionBuilder;
import org.opensearch.common.CheckedFunction;
import org.opensearch.common.ParseField;
import org.opensearch.common.io.stream.NamedWriteable;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.Writeable;
import org.opensearch.common.lucene.search.function.ScoreFunction;
import org.opensearch.common.xcontent.ContextParser;
import org.opensearch.common.xcontent.XContent;
import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.index.query.QueryBuilder;
import org.opensearch.index.query.QueryParser;
import org.opensearch.index.query.functionscore.ScoreFunctionBuilder;
import org.opensearch.index.query.functionscore.ScoreFunctionParser;
import org.opensearch.search.SearchExtBuilder;
import org.opensearch.search.aggregations.Aggregation;
import org.opensearch.search.aggregations.AggregationBuilder;
import org.opensearch.search.aggregations.Aggregator;
import org.opensearch.search.aggregations.InternalAggregation;
import org.opensearch.search.aggregations.PipelineAggregationBuilder;
import org.opensearch.search.aggregations.bucket.terms.SignificantTerms;
import org.opensearch.search.aggregations.bucket.terms.heuristic.SignificanceHeuristic;
import org.opensearch.search.aggregations.pipeline.MovAvgModel;
import org.opensearch.search.aggregations.pipeline.MovAvgPipelineAggregator;
import org.opensearch.search.aggregations.pipeline.PipelineAggregator;
import org.opensearch.search.aggregations.support.ValuesSourceRegistry;
import org.opensearch.search.fetch.FetchSubPhase;
import org.opensearch.search.fetch.subphase.highlight.Highlighter;
import org.opensearch.search.rescore.Rescorer;
import org.opensearch.search.rescore.RescorerBuilder;
import org.opensearch.search.suggest.Suggest;
import org.opensearch.search.suggest.Suggester;
import org.opensearch.search.suggest.SuggestionBuilder;
import java.io.IOException;
import java.util.List;
@ -354,7 +354,7 @@ public interface SearchPlugin {
}
/**
* Get the function to register the {@link org.elasticsearch.search.aggregations.support.ValuesSource} to aggregator mappings for
* Get the function to register the {@link org.opensearch.search.aggregations.support.ValuesSource} to aggregator mappings for
* this aggregation
*/
public Consumer<ValuesSourceRegistry.Builder> getAggregatorRegistrar() {
@ -362,7 +362,7 @@ public interface SearchPlugin {
}
/**
* Set the function to register the {@link org.elasticsearch.search.aggregations.support.ValuesSource} to aggregator mappings for
* Set the function to register the {@link org.opensearch.search.aggregations.support.ValuesSource} to aggregator mappings for
* this aggregation
*/
public AggregationSpec setAggregatorRegistrar(Consumer<ValuesSourceRegistry.Builder> aggregatorRegistrar) {

6
server/src/main/java/org/elasticsearch/plugins/SystemIndexPlugin.java → server/src/main/java/org/opensearch/plugins/SystemIndexPlugin.java
View File

@ -17,10 +17,10 @@
* under the License.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.indices.SystemIndexDescriptor;
import org.opensearch.common.settings.Settings;
import org.opensearch.indices.SystemIndexDescriptor;
import java.util.Collection;
import java.util.Collections;

6
server/src/main/java/org/elasticsearch/plugins/package-info.java → server/src/main/java/org/opensearch/plugins/package-info.java
View File

@ -18,7 +18,7 @@
*/
/**
* Support for extending Elasticsearch by providing java code that is loaded by a child classloader. See
* {@link org.elasticsearch.plugins.Plugin}.
* Support for extending OpenSearch by providing java code that is loaded by a child classloader. See
* {@link org.opensearch.plugins.Plugin}.
*/
package org.elasticsearch.plugins;
package org.opensearch.plugins;

4
server/src/main/java/org/elasticsearch/plugins/spi/NamedXContentProvider.java → server/src/main/java/org/opensearch/plugins/spi/NamedXContentProvider.java
View File

@ -17,9 +17,9 @@
* under the License.
*/
package org.elasticsearch.plugins.spi;
package org.opensearch.plugins.spi;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.opensearch.common.xcontent.NamedXContentRegistry;
import java.util.List;

4
server/src/main/java/org/elasticsearch/plugins/spi/package-info.java → server/src/main/java/org/opensearch/plugins/spi/package-info.java
View File

@ -19,7 +19,7 @@
/**
* This package contains interfaces for services provided by
* Elasticsearch plugins to external applications like the
* OpenSearch plugins to external applications like the
* Java High Level Rest Client.
*/
package org.elasticsearch.plugins.spi;
package org.opensearch.plugins.spi;