refactor imports for streamIO (#168) (#170)

Signed-off-by: Sean Li <lnse@amazon.com> (cherry picked from commit f51c12c) Co-authored-by: Sean Li <lnse@amazon.com>
opensearch-project · Jul 25, 2023 · 9a55919 · 9a55919
1 parent 01bb3e7
commit 9a55919
Show file tree

Hide file tree

Showing 20 changed files with 35 additions and 35 deletions.
diff --git a/src/main/java/org/opensearch/search/relevance/SearchRelevancePlugin.java b/src/main/java/org/opensearch/search/relevance/SearchRelevancePlugin.java
@@ -11,7 +11,7 @@
 import org.opensearch.client.Client;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.io.stream.NamedWriteableRegistry;
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.env.Environment;

diff --git a/src/main/java/org/opensearch/search/relevance/actionfilter/SearchActionFilter.java b/src/main/java/org/opensearch/search/relevance/actionfilter/SearchActionFilter.java
@@ -20,9 +20,9 @@
 import org.opensearch.action.support.ActionFilter;
 import org.opensearch.action.support.ActionFilterChain;
 import org.opensearch.common.io.stream.BytesStreamOutput;
-import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput;
-import org.opensearch.common.io.stream.NamedWriteableRegistry;
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.NamedWriteableAwareStreamInput;
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
+import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.search.SearchHit;

diff --git a/.../org/opensearch/search/relevance/configuration/ResultTransformerConfigurationFactory.java b/.../org/opensearch/search/relevance/configuration/ResultTransformerConfigurationFactory.java
@@ -7,7 +7,7 @@
  */
 package org.opensearch.search.relevance.configuration;
 
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.xcontent.XContentParser;
 
@@ -33,7 +33,7 @@ public interface ResultTransformerConfigurationFactory {
 
     /**
      * Build configuration from a serialized stream.
-     * @param streamInput a {@link org.opensearch.common.io.stream.Writeable} serialized representation of transformer
+     * @param streamInput a {@link org.opensearch.core.common.io.stream.Writeable} serialized representation of transformer
      *                    configuration.
      * @return configuration the deserialized transformer configuration.
      */

diff --git a/...ain/java/org/opensearch/search/relevance/configuration/SearchConfigurationExtBuilder.java b/...ain/java/org/opensearch/search/relevance/configuration/SearchConfigurationExtBuilder.java
@@ -7,9 +7,9 @@
  */
 package org.opensearch.search.relevance.configuration;
 
-import org.opensearch.common.ParsingException;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.ParsingException;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;

diff --git a/src/main/java/org/opensearch/search/relevance/configuration/TransformerConfiguration.java b/src/main/java/org/opensearch/search/relevance/configuration/TransformerConfiguration.java
@@ -10,7 +10,7 @@
 import static org.opensearch.search.relevance.configuration.Constants.ORDER;
 import static org.opensearch.search.relevance.configuration.Constants.PROPERTIES;
 
-import org.opensearch.common.io.stream.Writeable;
+import org.opensearch.core.common.io.stream.Writeable;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.xcontent.ToXContentObject;
 

diff --git a/...ch/search/relevance/transformer/kendraintelligentranking/client/KendraClientSettings.java b/...ch/search/relevance/transformer/kendraintelligentranking/client/KendraClientSettings.java
@@ -21,7 +21,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.common.settings.SecureString;
+import org.opensearch.core.common.settings.SecureString;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.SettingsException;
 

diff --git a/...e/transformer/kendraintelligentranking/configuration/KendraIntelligentRankerSettings.java b/...e/transformer/kendraintelligentranking/configuration/KendraIntelligentRankerSettings.java
@@ -12,7 +12,7 @@
 import java.util.List;
 import java.util.function.Function;
 import org.opensearch.common.settings.SecureSetting;
-import org.opensearch.common.settings.SecureString;
+import org.opensearch.core.common.settings.SecureString;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Setting.Property;
 

diff --git a/...sformer/kendraintelligentranking/configuration/KendraIntelligentRankingConfiguration.java b/...sformer/kendraintelligentranking/configuration/KendraIntelligentRankingConfiguration.java
@@ -7,10 +7,10 @@
  */
 package org.opensearch.search.relevance.transformer.kendraintelligentranking.configuration;
 
-import org.opensearch.common.ParsingException;
-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.ParsingException;
+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.common.settings.Settings;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.xcontent.ObjectParser;

diff --git a/.../kendraintelligentranking/configuration/KendraIntelligentRankingConfigurationFactory.java b/.../kendraintelligentranking/configuration/KendraIntelligentRankingConfigurationFactory.java
@@ -7,7 +7,7 @@
  */
 package org.opensearch.search.relevance.transformer.kendraintelligentranking.configuration;
 
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.search.relevance.configuration.ResultTransformerConfiguration;

diff --git a/...levance/transformer/kendraintelligentranking/model/KendraIntelligentRankingException.java b/...levance/transformer/kendraintelligentranking/model/KendraIntelligentRankingException.java
@@ -9,7 +9,7 @@
 
 import java.io.IOException;
 import org.opensearch.OpenSearchException;
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 
 public class KendraIntelligentRankingException extends OpenSearchException {
   public KendraIntelligentRankingException(StreamInput in) throws IOException {

diff --git a/...relevance/transformer/personalizeintelligentranking/client/PersonalizeClientSettings.java b/...relevance/transformer/personalizeintelligentranking/client/PersonalizeClientSettings.java
@@ -12,7 +12,7 @@
 import com.amazonaws.auth.BasicSessionCredentials;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.common.settings.SecureString;
+import org.opensearch.core.common.settings.SecureString;
 import org.opensearch.common.settings.SecureSetting;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;

diff --git a/...nsformer/personalizeintelligentranking/requestparameter/PersonalizeRequestParameters.java b/...nsformer/personalizeintelligentranking/requestparameter/PersonalizeRequestParameters.java
@@ -7,9 +7,9 @@
  */
 package org.opensearch.search.relevance.transformer.personalizeintelligentranking.requestparameter;
 
-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;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.xcontent.ObjectParser;
 import org.opensearch.core.xcontent.ToXContentObject;

diff --git a/...ersonalizeintelligentranking/requestparameter/PersonalizeRequestParametersExtBuilder.java b/...ersonalizeintelligentranking/requestparameter/PersonalizeRequestParametersExtBuilder.java
@@ -9,8 +9,8 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.search.SearchExtBuilder;

diff --git a/src/test/java/org/opensearch/search/relevance/actionfilter/SearchActionFilterTests.java b/src/test/java/org/opensearch/search/relevance/actionfilter/SearchActionFilterTests.java
@@ -24,10 +24,10 @@
 import org.opensearch.action.search.ShardSearchFailure;
 import org.opensearch.action.support.ActionFilterChain;
 import org.opensearch.client.Client;
-import org.opensearch.common.bytes.BytesReference;
+import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.common.document.DocumentField;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.json.JsonXContent;

diff --git a/...ava/org/opensearch/search/relevance/configuration/SearchConfigurationExtBuilderTests.java b/...ava/org/opensearch/search/relevance/configuration/SearchConfigurationExtBuilderTests.java
@@ -7,10 +7,10 @@
  */
 package org.opensearch.search.relevance.configuration;
 
-import org.opensearch.common.bytes.BytesReference;
+import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.common.io.stream.BytesStreamOutput;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.common.xcontent.XContentType;

diff --git a/...h/search/relevance/transformer/kendraintelligentranking/KendraIntelligentRankerTests.java b/...h/search/relevance/transformer/kendraintelligentranking/KendraIntelligentRankerTests.java
@@ -9,7 +9,7 @@
 
 import org.apache.lucene.search.TotalHits;
 import org.opensearch.action.search.SearchRequest;
-import org.opensearch.common.bytes.BytesReference;
+import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.json.JsonXContent;

diff --git a/...er/kendraintelligentranking/configuration/KendraIntelligentRankingConfigurationTests.java b/...er/kendraintelligentranking/configuration/KendraIntelligentRankingConfigurationTests.java
@@ -7,7 +7,7 @@
  */
 package org.opensearch.search.relevance.transformer.kendraintelligentranking.configuration;
 
-import org.opensearch.common.bytes.BytesReference;
+import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentHelper;

diff --git a/...ce/transformer/kendraintelligentranking/pipeline/KendraRankingResponseProcessorTests.java b/...ce/transformer/kendraintelligentranking/pipeline/KendraRankingResponseProcessorTests.java
@@ -12,7 +12,7 @@
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchResponseSections;
-import org.opensearch.common.bytes.BytesArray;
+import org.opensearch.core.common.bytes.BytesArray;
 import org.opensearch.common.document.DocumentField;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.env.Environment;

diff --git a/...alizeintelligentranking/requestparameter/PersonalizeRequestParametersExtBuilderTests.java b/...alizeintelligentranking/requestparameter/PersonalizeRequestParametersExtBuilderTests.java
@@ -7,7 +7,7 @@
  */
 package org.opensearch.search.relevance.transformer.personalizeintelligentranking.requestparameter;
 
-import org.opensearch.common.bytes.BytesReference;
+import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.common.xcontent.XContentType;

diff --git a/...arch/search/relevance/transformer/personalizeintelligentranking/utils/SearchTestUtil.java b/...arch/search/relevance/transformer/personalizeintelligentranking/utils/SearchTestUtil.java
@@ -9,7 +9,7 @@
 
 import org.apache.lucene.search.TotalHits;
 import org.opensearch.action.search.SearchRequest;
-import org.opensearch.common.bytes.BytesReference;
+import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.common.xcontent.json.JsonXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.search.SearchHit;