diff --git a/src/main/java/org/opensearch/commons/authuser/User.java b/src/main/java/org/opensearch/commons/authuser/User.java
index 55c48aea..de8a66a6 100644
--- a/src/main/java/org/opensearch/commons/authuser/User.java
+++ b/src/main/java/org/opensearch/commons/authuser/User.java
@@ -19,12 +19,12 @@
 import org.opensearch.client.Response;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.inject.internal.ToStringBuilder;
-import org.opensearch.common.xcontent.XContentHelper;
-import org.opensearch.common.xcontent.json.JsonXContent;
-import org.opensearch.core.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.XContentHelper;
+import org.opensearch.common.xcontent.json.JsonXContent;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
diff --git a/src/main/java/org/opensearch/commons/destination/message/LegacyBaseMessage.java b/src/main/java/org/opensearch/commons/destination/message/LegacyBaseMessage.java
index 076e2d21..f08d33b2 100644
--- a/src/main/java/org/opensearch/commons/destination/message/LegacyBaseMessage.java
+++ b/src/main/java/org/opensearch/commons/destination/message/LegacyBaseMessage.java
@@ -11,10 +11,10 @@
 import java.util.Map;
 
 import org.apache.hc.core5.net.URIBuilder;
-import org.opensearch.core.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.core.common.Strings;
 
 /**
  * This class holds the generic parameters required for a
diff --git a/src/main/java/org/opensearch/commons/destination/message/LegacyChimeMessage.java b/src/main/java/org/opensearch/commons/destination/message/LegacyChimeMessage.java
index baa1b78a..52e18903 100644
--- a/src/main/java/org/opensearch/commons/destination/message/LegacyChimeMessage.java
+++ b/src/main/java/org/opensearch/commons/destination/message/LegacyChimeMessage.java
@@ -7,8 +7,8 @@
 
 import java.io.IOException;
 
-import org.opensearch.core.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.Strings;
 
 /**
  * This class holds the contents of an Chime message
diff --git a/src/main/java/org/opensearch/commons/destination/message/LegacyCustomWebhookMessage.java b/src/main/java/org/opensearch/commons/destination/message/LegacyCustomWebhookMessage.java
index ada5cfc9..077d901e 100644
--- a/src/main/java/org/opensearch/commons/destination/message/LegacyCustomWebhookMessage.java
+++ b/src/main/java/org/opensearch/commons/destination/message/LegacyCustomWebhookMessage.java
@@ -12,9 +12,9 @@
 import org.apache.hc.client5.http.classic.methods.HttpPatch;
 import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.apache.hc.client5.http.classic.methods.HttpPut;
-import org.opensearch.core.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 /**
  * This class holds the content of an CustomWebhook message
diff --git a/src/main/java/org/opensearch/commons/destination/message/LegacyEmailMessage.java b/src/main/java/org/opensearch/commons/destination/message/LegacyEmailMessage.java
index edab6ea0..480ae76b 100644
--- a/src/main/java/org/opensearch/commons/destination/message/LegacyEmailMessage.java
+++ b/src/main/java/org/opensearch/commons/destination/message/LegacyEmailMessage.java
@@ -9,10 +9,10 @@
 import java.net.URI;
 import java.util.List;
 
-import org.opensearch.commons.notifications.model.MethodType;
-import org.opensearch.core.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.commons.notifications.model.MethodType;
+import org.opensearch.core.common.Strings;
 
 /**
  * This class holds the content of an CustomWebhook message
diff --git a/src/main/java/org/opensearch/commons/destination/message/LegacySNSMessage.java b/src/main/java/org/opensearch/commons/destination/message/LegacySNSMessage.java
index a1b2df82..afef192c 100644
--- a/src/main/java/org/opensearch/commons/destination/message/LegacySNSMessage.java
+++ b/src/main/java/org/opensearch/commons/destination/message/LegacySNSMessage.java
@@ -7,10 +7,10 @@
 
 import java.io.IOException;
 
-import org.opensearch.commons.destination.util.Util;
-import org.opensearch.core.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.commons.destination.util.Util;
+import org.opensearch.core.common.Strings;
 
 /**
  * This class holds the content of an SNS message
diff --git a/src/main/java/org/opensearch/commons/destination/message/LegacySlackMessage.java b/src/main/java/org/opensearch/commons/destination/message/LegacySlackMessage.java
index 7a9d6080..b42bd87e 100644
--- a/src/main/java/org/opensearch/commons/destination/message/LegacySlackMessage.java
+++ b/src/main/java/org/opensearch/commons/destination/message/LegacySlackMessage.java
@@ -7,8 +7,8 @@
 
 import java.io.IOException;
 
-import org.opensearch.core.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.Strings;
 
 /**
  * This class holds the content of an Slack message
diff --git a/src/test/java/org/opensearch/commons/authuser/UserTest.java b/src/test/java/org/opensearch/commons/authuser/UserTest.java
index 051f95da..3453d802 100644
--- a/src/test/java/org/opensearch/commons/authuser/UserTest.java
+++ b/src/test/java/org/opensearch/commons/authuser/UserTest.java
@@ -16,10 +16,10 @@
 
 import org.junit.jupiter.api.Test;
 import org.opensearch.common.io.stream.BytesStreamOutput;
+import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.core.common.Strings;
-import org.opensearch.common.io.stream.StreamInput;
 
 public class UserTest {