refactor

Lingxi Chen · Lingxi Chen · commit eae3370be035 · 2025-04-25T17:47:10.000-07:00
Signed-off-by: Lingxi Chen &lt;lingxich@amazon.com&gt;
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/CreateWorkloadGroupAction.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/CreateWorkloadGroupAction.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.action.ActionType;
 
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/CreateWorkloadGroupRequest.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/CreateWorkloadGroupRequest.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeRequest;
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/CreateWorkloadGroupResponse.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/CreateWorkloadGroupResponse.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.cluster.metadata.WorkloadGroup;
 import org.opensearch.core.action.ActionResponse;
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/DeleteWorkloadGroupAction.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/DeleteWorkloadGroupAction.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.action.ActionType;
 import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/DeleteWorkloadGroupRequest.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/DeleteWorkloadGroupRequest.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.support.clustermanager.AcknowledgedRequest;
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/GetWorkloadGroupAction.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/GetWorkloadGroupAction.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.action.ActionType;
 
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/GetWorkloadGroupRequest.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/GetWorkloadGroupRequest.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeReadRequest;
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/GetWorkloadGroupResponse.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/GetWorkloadGroupResponse.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.cluster.metadata.WorkloadGroup;
 import org.opensearch.core.action.ActionResponse;
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/TransportCreateWorkloadGroupAction.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/TransportCreateWorkloadGroupAction.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeAction;
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/TransportDeleteWorkloadGroupAction.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/TransportDeleteWorkloadGroupAction.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/TransportGetWorkloadGroupAction.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/TransportGetWorkloadGroupAction.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/TransportUpdateWorkloadGroupAction.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/TransportUpdateWorkloadGroupAction.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeAction;
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/UpdateWorkloadGroupAction.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/UpdateWorkloadGroupAction.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.action.ActionType;
 
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/UpdateWorkloadGroupRequest.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/UpdateWorkloadGroupRequest.java
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/UpdateWorkloadGroupResponse.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/UpdateWorkloadGroupResponse.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.cluster.metadata.WorkloadGroup;
 import org.opensearch.core.action.ActionResponse;
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/package-info.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/package-info.java
@@ -9,4 +9,4 @@
 /**
  * Package for the action classes related to query groups in WorkloadManagementPlugin
  */
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/querygroup/service/package-info.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/querygroup/service/package-info.java
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/rest/RestCreateWorkloadGroupAction.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/rest/RestCreateWorkloadGroupAction.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.rest;
+package org.opensearch.plugin.wlm.rest;
 
 import org.opensearch.core.rest.RestStatus;
 import org.opensearch.core.xcontent.ToXContent;
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/rest/RestDeleteWorkloadGroupAction.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/rest/RestDeleteWorkloadGroupAction.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.rest;
+package org.opensearch.plugin.wlm.rest;
 
 import org.opensearch.plugin.wlm.action.DeleteWorkloadGroupAction;
 import org.opensearch.plugin.wlm.action.DeleteWorkloadGroupRequest;
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/rest/RestGetWorkloadGroupAction.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/rest/RestGetWorkloadGroupAction.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.rest;
+package org.opensearch.plugin.wlm.rest;
 
 import org.opensearch.core.rest.RestStatus;
 import org.opensearch.core.xcontent.ToXContent;
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/rest/RestUpdateWorkloadGroupAction.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/rest/RestUpdateWorkloadGroupAction.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.rest;
+package org.opensearch.plugin.wlm.rest;
 
 import org.opensearch.core.rest.RestStatus;
 import org.opensearch.core.xcontent.ToXContent;
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/rest/package-info.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/rest/package-info.java
@@ -9,4 +9,4 @@
 /**
  * Package for the rest classes related to query groups in WorkloadManagementPlugin
  */
-package org.opensearch.plugin.wlm.querygroup.rest;
+package org.opensearch.plugin.wlm.rest;
diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/CreateWorkloadGroupRequestTests.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/CreateWorkloadGroupRequestTests.java
@@ -6,11 +6,12 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.cluster.metadata.WorkloadGroup;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.plugin.wlm.action.CreateWorkloadGroupRequest;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.io.IOException;
diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/CreateWorkloadGroupResponseTests.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/CreateWorkloadGroupResponseTests.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.cluster.metadata.WorkloadGroup;
 import org.opensearch.common.io.stream.BytesStreamOutput;
@@ -16,6 +16,7 @@
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.plugin.wlm.WorkloadGroupTestUtils;
+import org.opensearch.plugin.wlm.action.CreateWorkloadGroupResponse;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.io.IOException;
diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/DeleteWorkloadGroupRequestTests.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/DeleteWorkloadGroupRequestTests.java
@@ -6,12 +6,13 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.plugin.wlm.WorkloadGroupTestUtils;
+import org.opensearch.plugin.wlm.action.DeleteWorkloadGroupRequest;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.io.IOException;
diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/GetWorkloadGroupRequestTests.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/GetWorkloadGroupRequestTests.java
@@ -6,11 +6,12 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.plugin.wlm.WorkloadGroupTestUtils;
+import org.opensearch.plugin.wlm.action.GetWorkloadGroupRequest;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.io.IOException;
diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/GetWorkloadGroupResponseTests.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/GetWorkloadGroupResponseTests.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.cluster.metadata.WorkloadGroup;
 import org.opensearch.common.io.stream.BytesStreamOutput;
@@ -16,6 +16,7 @@
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.plugin.wlm.WorkloadGroupTestUtils;
+import org.opensearch.plugin.wlm.action.GetWorkloadGroupResponse;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.io.IOException;
diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/TransportDeleteWorkloadGroupActionTests.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/TransportDeleteWorkloadGroupActionTests.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
@@ -15,6 +15,8 @@
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.core.action.ActionListener;
 <<<<<<<< HEAD:plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/querygroup/action/TransportDeleteWorkloadGroupActionTests.java
+import org.opensearch.plugin.wlm.action.DeleteWorkloadGroupRequest;
+import org.opensearch.plugin.wlm.action.TransportDeleteWorkloadGroupAction;
 import org.opensearch.plugin.wlm.service.WorkloadGroupPersistenceService;
 ========
 import org.opensearch.plugin.wlm.querygroup.service.QueryGroupPersistenceService;
diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/TransportGetWorkloadGroupActionTests.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/TransportGetWorkloadGroupActionTests.java
@@ -6,13 +6,15 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.ResourceNotFoundException;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.core.action.ActionListener;
+import org.opensearch.plugin.wlm.action.GetWorkloadGroupRequest;
+import org.opensearch.plugin.wlm.action.TransportGetWorkloadGroupAction;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.TransportService;
diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/UpdateWorkloadGroupRequestTests.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/UpdateWorkloadGroupRequestTests.java
@@ -6,10 +6,11 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.plugin.wlm.action.UpdateWorkloadGroupRequest;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.wlm.MutableWorkloadGroupFragment;
 import org.opensearch.wlm.MutableWorkloadGroupFragment.ResiliencyMode;
diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/UpdateWorkloadGroupResponseTests.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/UpdateWorkloadGroupResponseTests.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.action;
+package org.opensearch.plugin.wlm.action;
 
 import org.opensearch.cluster.metadata.WorkloadGroup;
 import org.opensearch.common.io.stream.BytesStreamOutput;
@@ -16,6 +16,7 @@
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.plugin.wlm.WorkloadGroupTestUtils;
+import org.opensearch.plugin.wlm.action.UpdateWorkloadGroupResponse;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.io.IOException;
diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/WorkloadGroupActionTestUtils.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/WorkloadGroupActionTestUtils.java
diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/rest/RestDeleteWorkloadGroupActionTests.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/rest/RestDeleteWorkloadGroupActionTests.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.wlm.querygroup.rest;
+package org.opensearch.plugin.wlm.rest;
 
 import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.common.CheckedConsumer;
@@ -18,6 +18,7 @@
 import org.opensearch.plugin.wlm.querygroup.action.DeleteQueryGroupAction;
 import org.opensearch.plugin.wlm.querygroup.action.DeleteQueryGroupRequest;
 >>>>>>>> 0fb9fd6e364 (add get rule api logic):plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/querygroup/rest/RestDeleteQueryGroupActionTests.java
+import org.opensearch.plugin.wlm.rest.RestDeleteWorkloadGroupAction;
 import org.opensearch.rest.RestChannel;
 import org.opensearch.rest.RestHandler;
 import org.opensearch.rest.RestRequest;
diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/service/WorkloadGroupPersistenceServiceTests.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/service/WorkloadGroupPersistenceServiceTests.java
