diff --git a/bitsail-connectors/connector-elasticsearch/src/main/java/com/bytedance/bitsail/connector/elasticsearch/source/split/ElasticsearchSplitByIndexStrategy.java b/bitsail-connectors/connector-elasticsearch/src/main/java/com/bytedance/bitsail/connector/elasticsearch/source/split/ElasticsearchSplitByIndexStrategy.java index 5fba65a63..46870e329 100644 --- a/bitsail-connectors/connector-elasticsearch/src/main/java/com/bytedance/bitsail/connector/elasticsearch/source/split/ElasticsearchSplitByIndexStrategy.java +++ b/bitsail-connectors/connector-elasticsearch/src/main/java/com/bytedance/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 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/bitsail-connectors/connector-elasticsearch/src/main/java/com/bytedance/bitsail/connector/elasticsearch/utils/SplitStringUtils.java b/bitsail-connectors/connector-elasticsearch/src/main/java/com/bytedance/bitsail/connector/elasticsearch/util/SplitStringUtil.java similarity index 92% rename from bitsail-connectors/connector-elasticsearch/src/main/java/com/bytedance/bitsail/connector/elasticsearch/utils/SplitStringUtils.java rename to bitsail-connectors/connector-elasticsearch/src/main/java/com/bytedance/bitsail/connector/elasticsearch/util/SplitStringUtil.java index cb95b9ebd..bbcebb2ee 100644 --- a/bitsail-connectors/connector-elasticsearch/src/main/java/com/bytedance/bitsail/connector/elasticsearch/utils/SplitStringUtils.java +++ b/bitsail-connectors/connector-elasticsearch/src/main/java/com/bytedance/bitsail/connector/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/bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/ElasticsearchSourceITCase.java b/bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/ElasticsearchSourceITCase.java index bf261695b..1be9c5e91 100644 --- a/bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/ElasticsearchSourceITCase.java +++ b/bitsail-connectors/connector-elasticsearch/src/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/bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/rest/source/EsSourceRequestITCase.java b/bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/rest/source/EsSourceRequestITCase.java index 1f189fc7b..08469ebb3 100644 --- a/bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/rest/source/EsSourceRequestITCase.java +++ b/bitsail-connectors/connector-elasticsearch/src/test/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/bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/source/coordinator/ElasticsearchSourceSplitCoordinatorITCase.java b/bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/source/coordinator/ElasticsearchSourceSplitCoordinatorITCase.java index 3c1326e45..ce45abb0b 100644 --- a/bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/source/coordinator/ElasticsearchSourceSplitCoordinatorITCase.java +++ b/bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/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/bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/utils/SourceSetupUtils.java b/bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/util/SourceSetupUtil.java similarity index 97% rename from bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/utils/SourceSetupUtils.java rename to bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/util/SourceSetupUtil.java index c85f1d864..379ec7344 100644 --- a/bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/utils/SourceSetupUtils.java +++ b/bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/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/bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/utils/SplitStringUtilsTest.java b/bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/util/SplitStringUtilTest.java similarity index 82% rename from bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/utils/SplitStringUtilsTest.java rename to bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/util/SplitStringUtilTest.java index 7f834a850..5f7948649 100644 --- a/bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/utils/SplitStringUtilsTest.java +++ b/bitsail-connectors/connector-elasticsearch/src/test/java/com/bytedance/bitsail/connector/elasticsearch/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); }