Rename of aux package to auxiliary. Aux path is reserved on windows.

Signed-off-by: Finn Carroll <[email protected]>
opensearch-project · Dec 16, 2024 · e1879ea · e1879ea
1 parent 119c882
commit e1879ea
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/transport/grpc/GrpcModulePlugin.java b/plugins/transport-grpc/src/main/java/org/opensearch/transport/grpc/GrpcModulePlugin.java
@@ -25,9 +25,9 @@
 import java.util.Map;
 import java.util.function.Supplier;
 
-import static org.opensearch.aux.AuxTransportSettings.SETTING_AUX_BIND_HOST;
-import static org.opensearch.aux.AuxTransportSettings.SETTING_AUX_HOST;
-import static org.opensearch.aux.AuxTransportSettings.SETTING_AUX_PUBLISH_HOST;
+import static org.opensearch.auxiliary.AuxTransportSettings.SETTING_AUX_BIND_HOST;
+import static org.opensearch.auxiliary.AuxTransportSettings.SETTING_AUX_HOST;
+import static org.opensearch.auxiliary.AuxTransportSettings.SETTING_AUX_PUBLISH_HOST;
 
 /**
  * Main class for the gRPC plugin

diff --git a/...transport-grpc/src/main/java/org/opensearch/transport/grpc/Netty4GrpcServerTransport.java b/...transport-grpc/src/main/java/org/opensearch/transport/grpc/Netty4GrpcServerTransport.java
@@ -41,10 +41,10 @@
 import io.grpc.protobuf.services.HealthStatusManager;
 import io.grpc.protobuf.services.ProtoReflectionService;
 
-import static org.opensearch.aux.AuxTransportSettings.SETTING_AUX_BIND_HOST;
-import static org.opensearch.aux.AuxTransportSettings.SETTING_AUX_PORT;
-import static org.opensearch.aux.AuxTransportSettings.SETTING_AUX_PUBLISH_HOST;
-import static org.opensearch.aux.AuxTransportSettings.SETTING_AUX_PUBLISH_PORT;
+import static org.opensearch.auxiliary.AuxTransportSettings.SETTING_AUX_BIND_HOST;
+import static org.opensearch.auxiliary.AuxTransportSettings.SETTING_AUX_PORT;
+import static org.opensearch.auxiliary.AuxTransportSettings.SETTING_AUX_PUBLISH_HOST;
+import static org.opensearch.auxiliary.AuxTransportSettings.SETTING_AUX_PUBLISH_PORT;
 import static org.opensearch.common.network.NetworkService.resolvePublishPort;
 import static org.opensearch.common.util.concurrent.OpenSearchExecutors.daemonThreadFactory;
 import static org.opensearch.transport.grpc.GrpcModulePlugin.SETTING_GRPC_WORKER_COUNT;

diff --git a/...port-grpc/src/test/java/org/opensearch/transport/grpc/Netty4GrpcServerTransportTests.java b/...port-grpc/src/test/java/org/opensearch/transport/grpc/Netty4GrpcServerTransportTests.java
@@ -8,7 +8,7 @@
 
 package org.opensearch.transport.grpc;
 
-import org.opensearch.aux.AuxTransportSettings;
+import org.opensearch.auxiliary.AuxTransportSettings;
 import org.opensearch.common.network.NetworkService;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.test.OpenSearchTestCase;

diff --git a/.../opensearch/aux/AuxTransportSettings.java → ...earch/auxiliary/AuxTransportSettings.java b/.../opensearch/aux/AuxTransportSettings.java → ...earch/auxiliary/AuxTransportSettings.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.aux;
+package org.opensearch.auxiliary;
 
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Setting.Property;

diff --git a/...java/org/opensearch/aux/package-info.java → ...rg/opensearch/auxiliary/package-info.java b/...java/org/opensearch/aux/package-info.java → ...rg/opensearch/auxiliary/package-info.java
@@ -9,4 +9,4 @@
 /**
  * Settings and configuration helpers for optional auxiliary client/server transports provided by installed plugins.
  */
-package org.opensearch.aux;
+package org.opensearch.auxiliary;
diff --git a/server/src/main/java/org/opensearch/bootstrap/Security.java b/server/src/main/java/org/opensearch/bootstrap/Security.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.bootstrap;
 
-import org.opensearch.aux.AuxTransportSettings;
+import org.opensearch.auxiliary.AuxTransportSettings;
 import org.opensearch.cli.Command;
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.io.PathUtils;

diff --git a/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java b/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java
@@ -41,7 +41,7 @@
 import org.opensearch.action.support.AutoCreateIndex;
 import org.opensearch.action.support.DestructiveOperations;
 import org.opensearch.action.support.replication.TransportReplicationAction;
-import org.opensearch.aux.AuxTransportSettings;
+import org.opensearch.auxiliary.AuxTransportSettings;
 import org.opensearch.bootstrap.BootstrapSettings;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.ClusterModule;