rename util

bytedance · Jan 31, 2023 · 8876415 · 8876415
1 parent 7d31445
commit 8876415
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/...dance/bitsail/connector/elasticsearch/source/split/ElasticsearchSplitByIndexStrategy.java b/...dance/bitsail/connector/elasticsearch/source/split/ElasticsearchSplitByIndexStrategy.java
@@ -19,7 +19,7 @@
 import com.bytedance.bitsail.common.configuration.BitSailConfiguration;
 import com.bytedance.bitsail.connector.elasticsearch.option.ElasticsearchReaderOptions;
 import com.bytedance.bitsail.connector.elasticsearch.rest.source.EsSourceRequest;
-import com.bytedance.bitsail.connector.elasticsearch.utils.SplitStringUtils;
+import com.bytedance.bitsail.connector.elasticsearch.util.SplitStringUtil;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -48,7 +48,7 @@ public List<ElasticsearchSourceSplit> getElasticsearchSplits(BitSailConfiguratio
     String indices = jobConf.getNecessaryOption(ElasticsearchReaderOptions.ES_INDEX, REQUIRED_VALUE);
     EsSourceRequest esSourceRequest = new EsSourceRequest(restHighLevelClient);
 
-    String[] splitIndices = SplitStringUtils.splitString(indices);
+    String[] splitIndices = SplitStringUtil.splitString(indices);
     int idx = 0;
     for (String index : splitIndices) {
       if (check(index, esSourceRequest)) {
@@ -73,7 +73,7 @@ private boolean check(String index, EsSourceRequest esSourceRequest) {
   @Override
   public int estimateSplitNum(BitSailConfiguration configuration) {
     String indices = configuration.getNecessaryOption(ElasticsearchReaderOptions.ES_INDEX, REQUIRED_VALUE);
-    int estimatedSplitNum = SplitStringUtils.splitString(indices).length;
+    int estimatedSplitNum = SplitStringUtil.splitString(indices).length;
     LOG.info("Estimated split num is: {}", estimatedSplitNum);
     return estimatedSplitNum;
   }

diff --git a/...elasticsearch/utils/SplitStringUtils.java → ...r/elasticsearch/util/SplitStringUtil.java b/...elasticsearch/utils/SplitStringUtils.java → ...r/elasticsearch/util/SplitStringUtil.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.bytedance.bitsail.connector.elasticsearch.utils;
+package com.bytedance.bitsail.connector.elasticsearch.util;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static com.bytedance.bitsail.connector.elasticsearch.base.EsConstants.SPLIT_COMMA;
 
-public class SplitStringUtils {
+public class SplitStringUtil {
 
   public static String[] splitString(String indices) {
     String[] splits = indices.split(SPLIT_COMMA);

diff --git a/...rc/test/java/com/bytedance/bitsail/connector/elasticsearch/ElasticsearchSourceITCase.java b/...rc/test/java/com/bytedance/bitsail/connector/elasticsearch/ElasticsearchSourceITCase.java
@@ -19,7 +19,7 @@
 import com.bytedance.bitsail.common.configuration.BitSailConfiguration;
 import com.bytedance.bitsail.connector.elasticsearch.option.ElasticsearchReaderOptions;
 import com.bytedance.bitsail.connector.elasticsearch.option.ElasticsearchWriterOptions;
-import com.bytedance.bitsail.connector.elasticsearch.utils.SourceSetupUtils;
+import com.bytedance.bitsail.connector.elasticsearch.util.SourceSetupUtil;
 import com.bytedance.bitsail.test.connector.test.EmbeddedFlinkCluster;
 import com.bytedance.bitsail.test.connector.test.testcontainers.elasticsearch.ElasticsearchCluster;
 import com.bytedance.bitsail.test.connector.test.utils.JobConfUtils;
@@ -44,7 +44,7 @@ public class ElasticsearchSourceITCase {
 
   private final int count = 10;
 
-  private SourceSetupUtils sourceEnv;
+  private SourceSetupUtil sourceEnv;
 
   @Before
   public void prepareEsCluster() throws Exception {
@@ -57,7 +57,7 @@ public void prepareEsCluster() throws Exception {
         Collections.singletonList(esCluster.getHttpHostAddress()));
 
     this.sourceEnv =
-        SourceSetupUtils.builder()
+        SourceSetupUtil.builder()
             .esCluster(esCluster)
             .jobConf(jobConf)
             .indices(Arrays.asList("test1", "test2"))

diff --git a/...java/com/bytedance/bitsail/connector/elasticsearch/rest/source/EsSourceRequestITCase.java b/...java/com/bytedance/bitsail/connector/elasticsearch/rest/source/EsSourceRequestITCase.java
@@ -18,7 +18,7 @@
 
 import com.bytedance.bitsail.common.configuration.BitSailConfiguration;
 import com.bytedance.bitsail.connector.elasticsearch.option.ElasticsearchWriterOptions;
-import com.bytedance.bitsail.connector.elasticsearch.utils.SourceSetupUtils;
+import com.bytedance.bitsail.connector.elasticsearch.util.SourceSetupUtil;
 import com.bytedance.bitsail.test.connector.test.testcontainers.elasticsearch.ElasticsearchCluster;
 
 import org.junit.After;
@@ -38,7 +38,7 @@
 public class EsSourceRequestITCase {
 
   private static final Logger LOG = LoggerFactory.getLogger(EsSourceRequestITCase.class);
-  private SourceSetupUtils sourceEnv;
+  private SourceSetupUtil sourceEnv;
 
   private ElasticsearchCluster esCluster;
 
@@ -59,7 +59,7 @@ public void setup() throws IOException, InterruptedException {
         Collections.singletonList(esCluster.getHttpHostAddress()));
 
     this.sourceEnv =
-        SourceSetupUtils.builder()
+        SourceSetupUtil.builder()
             .esCluster(esCluster)
             .jobConf(jobConf)
             .indices(Collections.singletonList(index))

diff --git a/...connector/elasticsearch/source/coordinator/ElasticsearchSourceSplitCoordinatorITCase.java b/...connector/elasticsearch/source/coordinator/ElasticsearchSourceSplitCoordinatorITCase.java
@@ -22,7 +22,7 @@
 import com.bytedance.bitsail.common.configuration.BitSailConfiguration;
 import com.bytedance.bitsail.connector.elasticsearch.option.ElasticsearchReaderOptions;
 import com.bytedance.bitsail.connector.elasticsearch.source.split.ElasticsearchSourceSplit;
-import com.bytedance.bitsail.connector.elasticsearch.utils.SourceSetupUtils;
+import com.bytedance.bitsail.connector.elasticsearch.util.SourceSetupUtil;
 import com.bytedance.bitsail.test.connector.test.testcontainers.elasticsearch.ElasticsearchCluster;
 
 import org.junit.After;
@@ -48,7 +48,7 @@ public class ElasticsearchSourceSplitCoordinatorITCase {
 
   private ElasticsearchCluster esCluster;
 
-  private SourceSetupUtils sourceEnv;
+  private SourceSetupUtil sourceEnv;
 
   private BitSailConfiguration jobConf;
 
@@ -66,7 +66,7 @@ public void setup() throws IOException, InterruptedException {
     jobConf.set(ElasticsearchReaderOptions.SPLIT_STRATEGY, "round_robin");
 
     this.sourceEnv =
-        SourceSetupUtils.builder()
+        SourceSetupUtil.builder()
             .esCluster(esCluster)
             .jobConf(jobConf)
             .indices(Arrays.asList("test1", "test2", "test3"))

diff --git a/...elasticsearch/utils/SourceSetupUtils.java → ...r/elasticsearch/util/SourceSetupUtil.java b/...elasticsearch/utils/SourceSetupUtils.java → ...r/elasticsearch/util/SourceSetupUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bytedance.bitsail.connector.elasticsearch.utils;
+package com.bytedance.bitsail.connector.elasticsearch.util;
 
 import com.bytedance.bitsail.common.configuration.BitSailConfiguration;
 import com.bytedance.bitsail.connector.elasticsearch.rest.EsRestClientBuilder;
@@ -50,9 +50,9 @@
 import static org.junit.Assert.assertTrue;
 
 @Builder
-public class SourceSetupUtils {
+public class SourceSetupUtil {
 
-  private static final Logger LOG = LoggerFactory.getLogger(SourceSetupUtils.class);
+  private static final Logger LOG = LoggerFactory.getLogger(SourceSetupUtil.class);
 
   private final String mappings = "{\n" +
       "  \"properties\": {\n" +

diff --git a/...ticsearch/utils/SplitStringUtilsTest.java → ...asticsearch/util/SplitStringUtilTest.java b/...ticsearch/utils/SplitStringUtilsTest.java → ...asticsearch/util/SplitStringUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bytedance.bitsail.connector.elasticsearch.utils;
+package com.bytedance.bitsail.connector.elasticsearch.util;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -23,13 +23,13 @@
 
 import java.util.Arrays;
 
-public class SplitStringUtilsTest {
+public class SplitStringUtilTest {
 
-  private static final Logger LOG = LoggerFactory.getLogger(SplitStringUtilsTest.class);
+  private static final Logger LOG = LoggerFactory.getLogger(SplitStringUtilTest.class);
 
   @Test
   public void testSplitString() {
-    String[] splitNames = SplitStringUtils.splitString(" test1,  test2, , test3 , test4  ");
+    String[] splitNames = SplitStringUtil.splitString(" test1,  test2, , test3 , test4  ");
     LOG.info("split names: {}", Arrays.toString(splitNames));
     Assert.assertEquals("Index names parse error.", 4, splitNames.length);
   }