Fix after core #8157 (#486)

* Fix after core #8157

Signed-off-by: bowenlan-amzn <[email protected]>

* Fix ktlint issue

Signed-off-by: bowenlan-amzn <[email protected]>

* Fix spotless java check

Signed-off-by: bowenlan-amzn <[email protected]>

---------

Signed-off-by: bowenlan-amzn <[email protected]>

Author: bowenlan-amzn

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
-        kotlin_version = System.getProperty("kotlin.version", "1.6.10")
+        kotlin_version = System.getProperty("kotlin.version", "1.8.21")
     }
 
     repositories {
@@ -114,7 +114,7 @@ spotless {
     buildUponDefaultConfig = true
 }*/
 
-task ktlint(type: JavaExec, group: "verification") {
+tasks.register('ktlint', JavaExec) {
     description = "Check Kotlin code style."
     main = "com.pinterest.ktlint.Main"
     classpath = configurations.ktlint
@@ -126,10 +126,12 @@ task ktlint(type: JavaExec, group: "verification") {
 
 check.dependsOn ktlint
 
-task ktlintFormat(type: JavaExec, group: "formatting") {
+tasks.register('ktlintFormat', JavaExec) {
     description = "Fix Kotlin code style deviations."
-    main = "com.pinterest.ktlint.Main"
     classpath = configurations.ktlint
+    // https://github.com/pinterest/ktlint/issues/1391#issuecomment-1251287020
+    jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED"
+    setProperty("mainClass", "com.pinterest.ktlint.Main")
     args "-F", "src/**/*.kt"
 }
 

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

@@ -6,8 +6,8 @@
 package org.opensearch.commons;
 
 import org.opensearch.common.settings.SecureSetting;
-import org.opensearch.common.settings.SecureString;
 import org.opensearch.common.settings.Setting;
+import org.opensearch.core.common.settings.SecureString;
 
 public class ConfigConstants {
 

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

@@ -5,7 +5,7 @@
 
 package org.opensearch.commons.authuser;
 
-import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
+import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -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.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.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.Writeable;
 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.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.io.stream.Writeable;
 import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.Writeable;
 
 /**
  * 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.io.stream.StreamInput;
 import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.io.stream.StreamInput;
 
 /**
  * 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.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 
 /**
  * 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.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.commons.notifications.model.MethodType;
 import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 
 /**
  * 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.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.commons.destination.util.Util;
 import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 
 /**
  * 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.io.stream.StreamInput;
 import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.io.stream.StreamInput;
 
 /**
  * This class holds the content of an Slack message

src/main/java/org/opensearch/commons/destination/response/LegacyBaseResponse.java

@@ -7,9 +7,9 @@
 
 import java.io.IOException;
 
-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.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.Writeable;
 
 /**
  * This class holds the generic response attributes