From 5188f7998904d71324f8f3a039823e0799dfe2fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grant=20Pal=C3=A1u=20Spencer?= <gspencer@linkedin.com>
Date: Fri, 9 Aug 2024 12:13:19 -0700
Subject: [PATCH 1/2] cleanup instance (#2879)

Fix flaky test getAllInstances - clean up added instances
---
 .../org/apache/helix/rest/server/TestPerInstanceAccessor.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/helix-rest/src/test/java/org/apache/helix/rest/server/TestPerInstanceAccessor.java b/helix-rest/src/test/java/org/apache/helix/rest/server/TestPerInstanceAccessor.java
index 8ba32e0ccd..243406dc76 100644
--- a/helix-rest/src/test/java/org/apache/helix/rest/server/TestPerInstanceAccessor.java
+++ b/helix-rest/src/test/java/org/apache/helix/rest/server/TestPerInstanceAccessor.java
@@ -597,6 +597,9 @@ public void updateInstance() throws Exception {
     Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode());
     Assert.assertTrue(evacuateFinishedResult.get("successful"));
 
+    // Remove instance created for evacuate test
+    delete("clusters/" + CLUSTER_NAME + "/instances/" + test_instance_name, Response.Status.OK.getStatusCode());
+
     // test setPartitionsToError
     List<String> partitionsToSetToError = Arrays.asList(CLUSTER_NAME + dbName + "7");
 

From c9ad55fd3eb1841e5dbba433210d86290504921b Mon Sep 17 00:00:00 2001
From: Junkai Xue <junkai.xue@gmail.com>
Date: Fri, 9 Aug 2024 12:59:17 -0700
Subject: [PATCH 2/2] Fix intellji formatter to wrap on Enum type per line
 (#2881)

---
 helix-style-intellij.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-style-intellij.xml b/helix-style-intellij.xml
index 1e003fb2ad..39df6102c6 100644
--- a/helix-style-intellij.xml
+++ b/helix-style-intellij.xml
@@ -131,7 +131,7 @@
     <option name="WHILE_BRACE_FORCE" value="3" />
     <option name="FOR_BRACE_FORCE" value="3" />
     <option name="VARIABLE_ANNOTATION_WRAP" value="2" />
-    <option name="ENUM_CONSTANTS_WRAP" value="5" />
+    <option name="ENUM_CONSTANTS_WRAP" value="2" />
     <option name="PARENT_SETTINGS_INSTALLED" value="true" />
     <indentOptions>
       <option name="INDENT_SIZE" value="2" />