Fix build errors after refactoring of Strings class in core (#432)

Signed-off-by: Hailong Cui <[email protected]>

src/main/java/org/opensearch/commons/InjectSecurity.java

@@ -14,10 +14,10 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.commons.authuser.User;
+import org.opensearch.core.common.Strings;
 
 /**
  * For background jobs usage only. User or Roles injection can be done using transport layer only.

src/main/java/org/opensearch/commons/authuser/AuthUserRequestBuilder.java

@@ -7,8 +7,8 @@
 
 import org.opensearch.client.Request;
 import org.opensearch.client.RequestOptions;
-import org.opensearch.common.Strings;
 import org.opensearch.commons.ConfigConstants;
+import org.opensearch.core.common.Strings;
 
 public class AuthUserRequestBuilder {
     private final String auth;

src/main/java/org/opensearch/commons/authuser/User.java

@@ -18,13 +18,13 @@
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.opensearch.client.Response;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.inject.internal.ToStringBuilder;
 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;

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.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

src/main/java/org/opensearch/commons/destination/message/LegacyChimeMessage.java

@@ -7,8 +7,8 @@
 
 import java.io.IOException;
 
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.Strings;
 
 /**
  * This class holds the contents of an Chime message

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.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

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.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

src/main/java/org/opensearch/commons/destination/message/LegacySNSMessage.java

@@ -7,10 +7,10 @@
 
 import java.io.IOException;
 
-import org.opensearch.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

src/main/java/org/opensearch/commons/destination/message/LegacySlackMessage.java

@@ -7,8 +7,8 @@
 
 import java.io.IOException;
 
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.Strings;
 
 /**
  * This class holds the content of an Slack message

src/main/java/org/opensearch/commons/destination/util/Util.java

@@ -7,8 +7,8 @@
 
 import java.util.regex.Pattern;
 
-import org.opensearch.common.Strings;
 import org.opensearch.common.ValidationException;
+import org.opensearch.core.common.Strings;
 
 public class Util {
     private Util() {}

src/main/java/org/opensearch/commons/rest/SecureRestClientBuilder.java

@@ -41,9 +41,9 @@
 import org.opensearch.client.RestClient;
 import org.opensearch.client.RestClientBuilder;
 import org.opensearch.client.RestHighLevelClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.commons.ConfigConstants;
+import org.opensearch.core.common.Strings;
 
 /**
  * Provides builder to create low-level and high-level REST client to make calls to OpenSearch.

src/main/kotlin/org/opensearch/commons/notifications/action/UpdateNotificationConfigRequest.kt

@@ -7,7 +7,6 @@ package org.opensearch.commons.notifications.action
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.ValidateActions
-import org.opensearch.common.Strings
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
@@ -16,6 +15,7 @@ import org.opensearch.commons.notifications.NotificationConstants.CONFIG_ID_TAG
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_TAG
 import org.opensearch.commons.notifications.model.NotificationConfig
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.common.Strings
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder

src/main/kotlin/org/opensearch/commons/notifications/model/Channel.kt

@@ -4,7 +4,6 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.Strings
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
@@ -15,6 +14,7 @@ import org.opensearch.commons.notifications.NotificationConstants.DESCRIPTION_TA
 import org.opensearch.commons.notifications.NotificationConstants.IS_ENABLED_TAG
 import org.opensearch.commons.notifications.NotificationConstants.NAME_TAG
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.common.Strings
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser

src/main/kotlin/org/opensearch/commons/notifications/model/ChannelMessage.kt

@@ -5,7 +5,6 @@
 
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.Strings
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
@@ -15,6 +14,7 @@ import org.opensearch.commons.notifications.NotificationConstants.HTML_DESCRIPTI
 import org.opensearch.commons.notifications.NotificationConstants.TEXT_DESCRIPTION_TAG
 import org.opensearch.commons.utils.fieldIfNotNull
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.common.Strings
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser

src/main/kotlin/org/opensearch/commons/notifications/model/Chime.kt

@@ -4,14 +4,14 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.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.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.URL_TAG
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.validateUrl
+import org.opensearch.core.common.Strings
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser

src/main/kotlin/org/opensearch/commons/notifications/model/DeliveryStatus.kt

@@ -4,14 +4,14 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.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.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.STATUS_CODE_TAG
 import org.opensearch.commons.notifications.NotificationConstants.STATUS_TEXT_TAG
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.common.Strings
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser

src/main/kotlin/org/opensearch/commons/notifications/model/Email.kt

@@ -4,7 +4,6 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.Strings
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
@@ -15,6 +14,7 @@ import org.opensearch.commons.notifications.NotificationConstants.RECIPIENT_LIST
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.objectList
 import org.opensearch.commons.utils.stringList
+import org.opensearch.core.common.Strings
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser

src/main/kotlin/org/opensearch/commons/notifications/model/EventSource.kt

@@ -4,7 +4,6 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.Strings
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
@@ -15,6 +14,7 @@ import org.opensearch.commons.notifications.NotificationConstants.TAGS_TAG
 import org.opensearch.commons.notifications.NotificationConstants.TITLE_TAG
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.stringList
+import org.opensearch.core.common.Strings
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser

src/main/kotlin/org/opensearch/commons/notifications/model/EventStatus.kt

@@ -5,7 +5,6 @@
 
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.Strings
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
@@ -18,6 +17,7 @@ import org.opensearch.commons.notifications.NotificationConstants.EMAIL_RECIPIEN
 import org.opensearch.commons.utils.fieldIfNotNull
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.objectList
+import org.opensearch.core.common.Strings
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser

src/main/kotlin/org/opensearch/commons/notifications/model/NotificationConfig.kt

@@ -4,7 +4,6 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.Strings
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
@@ -18,6 +17,7 @@ import org.opensearch.commons.notifications.model.config.ConfigDataProperties.ge
 import org.opensearch.commons.notifications.model.config.ConfigDataProperties.validateConfigData
 import org.opensearch.commons.utils.fieldIfNotNull
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.common.Strings
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser

src/main/kotlin/org/opensearch/commons/notifications/model/NotificationConfigInfo.kt

@@ -5,7 +5,6 @@
 
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.Strings
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
@@ -15,6 +14,7 @@ import org.opensearch.commons.notifications.NotificationConstants.CONFIG_TAG
 import org.opensearch.commons.notifications.NotificationConstants.CREATED_TIME_TAG
 import org.opensearch.commons.notifications.NotificationConstants.UPDATED_TIME_TAG
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.common.Strings
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser

src/main/kotlin/org/opensearch/commons/notifications/model/SesAccount.kt

@@ -5,7 +5,6 @@
 
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.Strings
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
@@ -17,6 +16,7 @@ import org.opensearch.commons.utils.fieldIfNotNull
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.validateEmail
 import org.opensearch.commons.utils.validateIamRoleArn
+import org.opensearch.core.common.Strings
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser

src/main/kotlin/org/opensearch/commons/notifications/model/Slack.kt

@@ -4,14 +4,14 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.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.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.URL_TAG
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.validateUrl
+import org.opensearch.core.common.Strings
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser

src/main/kotlin/org/opensearch/commons/notifications/model/SmtpAccount.kt

@@ -4,7 +4,6 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.Strings
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
@@ -15,6 +14,7 @@ import org.opensearch.commons.notifications.NotificationConstants.METHOD_TAG
 import org.opensearch.commons.notifications.NotificationConstants.PORT_TAG
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.validateEmail
+import org.opensearch.core.common.Strings
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser

src/main/kotlin/org/opensearch/commons/notifications/model/Webhook.kt

@@ -4,7 +4,6 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.Strings
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
@@ -16,6 +15,7 @@ import org.opensearch.commons.utils.STRING_READER
 import org.opensearch.commons.utils.STRING_WRITER
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.validateUrl
+import org.opensearch.core.common.Strings
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser

src/test/java/org/opensearch/commons/authuser/UserTest.java

@@ -15,11 +15,11 @@
 import java.util.Arrays;
 
 import org.junit.jupiter.api.Test;
-import org.opensearch.common.Strings;
 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;
 
 public class UserTest {