Skip to content

Commit

Permalink
[Rename] o.e.common.settings (#336)
Browse files Browse the repository at this point in the history 
This commit refactors o.e.common.settings package to the
o.opensearch.common.setttings namespace. All references throughout the codebase
are refactored.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
  • Loading branch information
@nknize
nknize committed Mar 20, 2021
1 parent f19557b commit eee7e03
Show file tree
Hide file tree
Showing 1,006 changed files with 2,300 additions and 2,289 deletions.
2 changes: 1 addition & 1 deletion ...ark/src/main/java/org/opensearch/client/benchmark/transport/TransportClientBenchmark.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.opensearch.client.benchmark.ops.bulk.BulkRequestExecutor;
import org.opensearch.client.benchmark.ops.search.SearchRequestExecutor;
import org.opensearch.client.transport.TransportClient;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.common.xcontent.XContentType;
import org.opensearch.index.query.QueryBuilders;
Expand Down
8 changes: 4 additions & 4 deletions ...client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/NoopPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
import org.opensearch.action.ActionResponse;
import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
import org.opensearch.cluster.node.DiscoveryNodes;
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.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.plugin.noop.action.search.NoopSearchAction;
import org.opensearch.plugin.noop.action.search.RestNoopSearchAction;
import org.opensearch.plugin.noop.action.search.TransportNoopSearchAction;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/indices/AnalyzeRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import org.opensearch.client.Validatable;
import org.opensearch.common.Strings;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.ToXContentFragment;
import org.elasticsearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder;
Expand Down
4 changes: 2 additions & 2 deletions client/rest-high-level/src/main/java/org/opensearch/client/indices/CreateIndexRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.opensearch.common.Strings;
import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.DeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.ToXContentObject;
Expand All @@ -47,7 +47,7 @@
import java.util.Objects;
import java.util.Set;

import static org.elasticsearch.common.settings.Settings.Builder.EMPTY_SETTINGS;
import static org.opensearch.common.settings.Settings.Builder.EMPTY_SETTINGS;

/**
* A request to create an index.
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/indices/GetIndexResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.apache.lucene.util.CollectionUtil;
import org.opensearch.cluster.metadata.AliasMetadata;
import org.opensearch.cluster.metadata.MappingMetadata;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentParser.Token;
import org.elasticsearch.index.mapper.MapperService;
Expand Down
2 changes: 1 addition & 1 deletion ...nt/rest-high-level/src/main/java/org/opensearch/client/indices/IndexTemplateMetadata.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.ParseField;
import org.opensearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.mapper.MapperService;
Expand Down
4 changes: 2 additions & 2 deletions .../rest-high-level/src/main/java/org/opensearch/client/indices/PutIndexTemplateRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.elasticsearch.common.Nullable;
import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.DeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.ToXContentFragment;
Expand All @@ -51,7 +51,7 @@
import java.util.stream.Collectors;

import static org.opensearch.action.ValidateActions.addValidationError;
import static org.elasticsearch.common.settings.Settings.Builder.EMPTY_SETTINGS;
import static org.opensearch.common.settings.Settings.Builder.EMPTY_SETTINGS;

/**
* A request to create an index template.
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/indices/ResizeRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.opensearch.client.TimedRequest;
import org.opensearch.client.Validatable;
import org.opensearch.client.ValidationException;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder;

Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/test/java/org/opensearch/client/ClusterClientIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
import org.opensearch.cluster.metadata.Template;
import org.opensearch.cluster.routing.allocation.decider.EnableAllocationDecider;
import org.opensearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentType;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/test/java/org/opensearch/client/CrudIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
import org.opensearch.client.indices.GetIndexRequest;
import org.opensearch.common.Strings;
import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.xcontent.XContentBuilder;
Expand Down
4 changes: 2 additions & 2 deletions client/rest-high-level/src/test/java/org/opensearch/client/IndicesClientIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@
import org.opensearch.common.ValidationException;
import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Setting;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.TimeValue;
Expand Down
2 changes: 1 addition & 1 deletion ...nt/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
import org.opensearch.client.indices.rollover.RolloverRequest;
import org.elasticsearch.common.CheckedFunction;
import org.opensearch.common.Strings;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.opensearch.common.util.CollectionUtils;
import org.elasticsearch.common.xcontent.XContentType;
Expand Down
2 changes: 1 addition & 1 deletion ...high-level/src/test/java/org/opensearch/client/OpenSearchRestHighLevelClientTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import org.elasticsearch.common.Booleans;
import org.elasticsearch.common.CheckedRunnable;
import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentHelper;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/test/java/org/opensearch/client/ReindexIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.opensearch.action.search.SearchRequest;
import org.opensearch.action.support.WriteRequest;
import org.opensearch.client.tasks.TaskSubmissionResponse;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentType;
import org.opensearch.index.query.IdsQueryBuilder;
import org.opensearch.index.reindex.BulkByScrollResponse;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/test/java/org/opensearch/client/SnapshotIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
import org.opensearch.action.admin.cluster.snapshots.status.SnapshotsStatusResponse;
import org.opensearch.action.support.master.AcknowledgedResponse;
import org.opensearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentType;
import org.opensearch.repositories.fs.FsRepository;
import org.opensearch.rest.RestStatus;
Expand Down
2 changes: 1 addition & 1 deletion ...t/rest-high-level/src/test/java/org/opensearch/client/SnapshotRequestConvertersTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.opensearch.action.admin.cluster.snapshots.status.SnapshotsStatusRequest;
import org.opensearch.action.support.master.AcknowledgedRequest;
import org.elasticsearch.common.io.PathUtils;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.repositories.fs.FsRepository;
import org.elasticsearch.test.ESTestCase;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/test/java/org/opensearch/client/TasksIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import org.opensearch.client.tasks.GetTaskResponse;
import org.opensearch.client.tasks.TaskId;
import org.opensearch.client.tasks.TaskSubmissionResponse;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.index.reindex.ReindexRequest;
import org.opensearch.rest.RestStatus;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/test/java/org/opensearch/client/UpdateByQueryIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.opensearch.action.index.IndexRequest;
import org.opensearch.action.support.WriteRequest;
import org.opensearch.client.tasks.TaskSubmissionResponse;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.index.query.IdsQueryBuilder;
import org.elasticsearch.index.reindex.BulkByScrollResponse;
Expand Down
6 changes: 3 additions & 3 deletions client/rest-high-level/src/test/java/org/opensearch/client/core/CountRequestTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
import org.opensearch.common.util.ArrayUtils;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.query.MatchAllQueryBuilder;
import org.elasticsearch.index.query.MatchQueryBuilder;
import org.elasticsearch.index.query.QueryBuilder;
import org.opensearch.index.query.MatchAllQueryBuilder;
import org.opensearch.index.query.MatchQueryBuilder;
import org.opensearch.index.query.QueryBuilder;
import org.opensearch.rest.action.RestActions;
import org.opensearch.search.SearchModule;
import org.opensearch.search.builder.SearchSourceBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...est-high-level/src/test/java/org/opensearch/client/documentation/CRUDDocumentationIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
import org.opensearch.client.indices.CreateIndexResponse;
import org.opensearch.common.Strings;
import org.opensearch.common.bytes.BytesArray;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.TimeValue;
Expand Down
2 changes: 1 addition & 1 deletion ...level/src/test/java/org/opensearch/client/documentation/ClusterClientDocumentationIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
import org.opensearch.cluster.routing.allocation.decider.EnableAllocationDecider;
import org.opensearch.common.Priority;
import org.opensearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentType;
Expand Down
2 changes: 1 addition & 1 deletion ...level/src/test/java/org/opensearch/client/documentation/IndicesClientDocumentationIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
import org.opensearch.cluster.metadata.MappingMetadata;
import org.opensearch.cluster.metadata.Template;
import org.opensearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.TimeValue;
Expand Down
2 changes: 1 addition & 1 deletion ...evel/src/test/java/org/opensearch/client/documentation/SnapshotClientDocumentationIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
import org.opensearch.cluster.SnapshotsInProgress;
import org.opensearch.cluster.metadata.RepositoryMetadata;
import org.elasticsearch.common.Booleans;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentType;
import org.opensearch.repositories.fs.FsRepository;
Expand Down
2 changes: 1 addition & 1 deletion ...level/src/test/java/org/opensearch/client/indices/GetComponentTemplatesResponseTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.opensearch.cluster.metadata.ComponentTemplate;
import org.opensearch.cluster.metadata.Template;
import org.opensearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.test.ESTestCase;

Expand Down
4 changes: 2 additions & 2 deletions ...nt/rest-high-level/src/test/java/org/opensearch/client/indices/GetIndexResponseTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import org.opensearch.cluster.metadata.AliasMetadata;
import org.opensearch.cluster.metadata.MappingMetadata;
import org.opensearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.settings.IndexScopedSettings;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.IndexScopedSettings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.ToXContent.Params;
import org.elasticsearch.common.xcontent.XContentBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...igh-level/src/test/java/org/opensearch/client/indices/GetIndexTemplatesResponseTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.DeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.ToXContent;
Expand Down
2 changes: 1 addition & 1 deletion ...-high-level/src/test/java/org/opensearch/client/indices/PutIndexTemplateRequestTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import org.opensearch.action.ActionRequestValidationException;
import org.opensearch.action.admin.indices.alias.Alias;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.test.AbstractXContentTestCase;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/test/java/org/opensearch/client/indices/ResizeRequestTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import org.opensearch.action.admin.indices.alias.Alias;
import org.opensearch.client.AbstractRequestTestCase;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentParser;

import java.io.IOException;
Expand Down
2 changes: 1 addition & 1 deletion client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.opensearch.client.transport.TransportClient;
import org.elasticsearch.common.SuppressForbidden;
import org.opensearch.common.network.NetworkModule;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.opensearch.index.reindex.ReindexPlugin;
import org.opensearch.join.ParentJoinPlugin;
import org.opensearch.percolator.PercolatorPlugin;
Expand Down
2 changes: 1 addition & 1 deletion ...transport/src/test/java/org/opensearch/transport/client/PreBuiltTransportClientTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import com.carrotsearch.randomizedtesting.RandomizedTest;
import org.opensearch.client.transport.TransportClient;
import org.opensearch.common.network.NetworkModule;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.opensearch.index.reindex.ReindexPlugin;
import org.opensearch.join.ParentJoinPlugin;
import org.opensearch.percolator.PercolatorPlugin;
Expand Down
2 changes: 1 addition & 1 deletion distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.opensearch.OpenSearchException;
import org.opensearch.client.Request;
import org.elasticsearch.common.io.PathUtils;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
import org.junit.AfterClass;
Expand Down
2 changes: 0 additions & 2 deletions ...ols/keystore-cli/src/main/java/org/opensearch/common/settings/AddFileKeyStoreCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@

import joptsimple.OptionSet;
import joptsimple.OptionSpec;
import org.elasticsearch.common.settings.BaseKeyStoreCommand;
import org.elasticsearch.common.settings.KeyStoreWrapper;
import org.opensearch.cli.ExitCodes;
import org.opensearch.cli.Terminal;
import org.opensearch.cli.UserException;
Expand Down
2 changes: 0 additions & 2 deletions ...s/keystore-cli/src/main/java/org/opensearch/common/settings/AddStringKeyStoreCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@

import joptsimple.OptionSet;
import joptsimple.OptionSpec;
import org.elasticsearch.common.settings.BaseKeyStoreCommand;
import org.elasticsearch.common.settings.KeyStoreWrapper;
import org.opensearch.cli.ExitCodes;
import org.opensearch.cli.Terminal;
import org.opensearch.cli.UserException;
Expand Down
1 change: 0 additions & 1 deletion ...ools/keystore-cli/src/main/java/org/opensearch/common/settings/CreateKeyStoreCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

import joptsimple.OptionSet;
import joptsimple.OptionSpec;
import org.elasticsearch.common.settings.KeyStoreWrapper;
import org.opensearch.cli.ExitCodes;
import org.opensearch.cli.KeyStoreAwareCommand;
import org.opensearch.cli.Terminal;
Expand Down
2 changes: 0 additions & 2 deletions ...ribution/tools/keystore-cli/src/main/java/org/opensearch/common/settings/KeyStoreCli.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
package org.opensearch.common.settings;

import org.elasticsearch.common.settings.ChangeKeyStorePasswordCommand;
import org.elasticsearch.common.settings.HasPasswordKeyStoreCommand;
import org.elasticsearch.common.settings.UpgradeKeyStoreCommand;
import org.opensearch.cli.LoggingAwareMultiCommand;
import org.opensearch.cli.Terminal;

Expand Down
2 changes: 0 additions & 2 deletions .../tools/keystore-cli/src/main/java/org/opensearch/common/settings/ListKeyStoreCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
import java.util.List;

import joptsimple.OptionSet;
import org.elasticsearch.common.settings.BaseKeyStoreCommand;
import org.elasticsearch.common.settings.KeyStoreWrapper;
import org.opensearch.cli.Terminal;
import org.elasticsearch.env.Environment;

Expand Down
2 changes: 0 additions & 2 deletions ...ystore-cli/src/main/java/org/opensearch/common/settings/RemoveSettingKeyStoreCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@

import joptsimple.OptionSet;
import joptsimple.OptionSpec;
import org.elasticsearch.common.settings.BaseKeyStoreCommand;
import org.elasticsearch.common.settings.KeyStoreWrapper;
import org.opensearch.cli.ExitCodes;
import org.opensearch.cli.Terminal;
import org.opensearch.cli.UserException;
Expand Down
9 changes: 4 additions & 5 deletions distribution/tools/keystore-cli/src/test/java/org/opensearch/bootstrap/BootstrapTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,14 @@

import org.elasticsearch.core.internal.io.IOUtils;
import org.opensearch.common.settings.KeyStoreCommandTestCase;
import org.elasticsearch.common.settings.KeyStoreWrapper;
import org.elasticsearch.common.settings.SecureSettings;
import org.elasticsearch.common.settings.SecureString;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.KeyStoreWrapper;
import org.opensearch.common.settings.SecureSettings;
import org.opensearch.common.settings.SecureString;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.test.ESTestCase;
import org.junit.After;
import org.junit.Before;
import org.opensearch.bootstrap.Bootstrap;

import java.io.ByteArrayInputStream;
import java.io.IOException;
Expand Down
1 change: 0 additions & 1 deletion ...eystore-cli/src/test/java/org/opensearch/common/settings/AddFileKeyStoreCommandTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

package org.opensearch.common.settings;

import org.elasticsearch.common.settings.KeyStoreWrapper;
import org.opensearch.cli.Command;
import org.opensearch.cli.ExitCodes;
import org.opensearch.cli.UserException;
Expand Down
1 change: 0 additions & 1 deletion ...store-cli/src/test/java/org/opensearch/common/settings/AddStringKeyStoreCommandTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

package org.opensearch.common.settings;

import org.elasticsearch.common.settings.KeyStoreWrapper;
import org.opensearch.cli.Command;
import org.opensearch.cli.ExitCodes;
import org.opensearch.cli.UserException;
Expand Down
Loading

0 comments on commit eee7e03

Please sign in to comment.