diff --git a/inlong-common/pom.xml b/inlong-common/pom.xml index 5d7d8e5aa5..2d3dfecfbf 100644 --- a/inlong-common/pom.xml +++ b/inlong-common/pom.xml @@ -92,6 +92,14 @@ com.github.jsqlparser jsqlparser + + com.fasterxml.jackson.core + jackson-databind + + + org.apache.flink + flink-shaded-jackson + diff --git a/inlong-common/src/main/java/org/apache/inlong/common/constant/CompressionType.java b/inlong-common/src/main/java/org/apache/inlong/common/constant/CompressionType.java new file mode 100644 index 0000000000..7b9caafe5e --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/constant/CompressionType.java @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.constant; + +public class CompressionType { + + public static final String GZIP = "GZIP"; + public static final String SNAPPY = "SNAPPY"; + public static final String LZO = "LZO"; + public static final String NONE = "NONE"; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/constant/DataNodeType.java b/inlong-common/src/main/java/org/apache/inlong/common/constant/DataNodeType.java new file mode 100644 index 0000000000..2ccae832fa --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/constant/DataNodeType.java @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.constant; + +public class DataNodeType { + + public static final String KAFKA = "KAFKA"; + public static final String PULSAR = "PULSAR"; + public static final String CLS = "CLS"; + public static final String ELASTICSEARCH = "ELASTICSEARCH"; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/constant/DeserializationType.java b/inlong-common/src/main/java/org/apache/inlong/common/constant/DeserializationType.java new file mode 100644 index 0000000000..66999634fa --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/constant/DeserializationType.java @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.constant; + +public class DeserializationType { + + public static final String INLONG_MSG = "INLONG_MSG"; + public static final String INLONG_MSG_PB = "INLONG_MSG_PB"; + public static final String CSV = "CSV"; + public static final String KV = "KV"; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/constant/SinkType.java b/inlong-common/src/main/java/org/apache/inlong/common/constant/SinkType.java new file mode 100644 index 0000000000..0dba17eb60 --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/constant/SinkType.java @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.constant; + +public class SinkType { + + public static final String KAFKA = "KAFKA"; + public static final String PULSAR = "PULSAR"; + public static final String CLS = "CLS"; + public static final String ELASTICSEARCH = "ELASTICSEARCH"; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortClusterConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortClusterConfig.java new file mode 100644 index 0000000000..d4b903e0ce --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortClusterConfig.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort; + +import org.apache.inlong.common.pojo.sort.dataflow.DataFlowConfig; +import org.apache.inlong.common.pojo.sort.mq.MqClusterConfig; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class SortClusterConfig implements Serializable { + + private String clusterTag; + private List mqClusterConfigs; + private List dataFlowConfigs; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortConfig.java new file mode 100644 index 0000000000..ad3a6bb892 --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortConfig.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class SortConfig implements Serializable { + + private String sortClusterName; + private List clusters; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortTaskConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortTaskConfig.java new file mode 100644 index 0000000000..ac98af5b81 --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortTaskConfig.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort; + +import org.apache.inlong.common.pojo.sort.node.NodeConfig; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class SortTaskConfig implements Serializable { + + private String sortTaskName; + private List clusters; + private NodeConfig nodeConfig; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/DataFlowConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/DataFlowConfig.java new file mode 100644 index 0000000000..859f1dadd5 --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/DataFlowConfig.java @@ -0,0 +1,35 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.dataflow; + +import org.apache.inlong.common.pojo.sort.dataflow.sink.SinkConfig; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Map; + +@Data +public class DataFlowConfig implements Serializable { + + private String dataflowId; + private Integer version; + private SourceConfig sourceConfig; + private SinkConfig sinkConfig; + private Map properties; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/SourceConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/SourceConfig.java new file mode 100644 index 0000000000..4eac286b68 --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/SourceConfig.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.dataflow; + +import org.apache.inlong.common.pojo.sort.dataflow.deserialization.DeserializationConfig; +import org.apache.inlong.common.pojo.sort.dataflow.field.FieldConfig; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class SourceConfig implements Serializable { + + private String topic; + private String subscription; + private String encodingType; + private DeserializationConfig deserializationConfig; + private List fieldConfigs; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/CsvDeserializationConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/CsvDeserializationConfig.java new file mode 100644 index 0000000000..5a071e42ba --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/CsvDeserializationConfig.java @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.dataflow.deserialization; + +import lombok.Data; + +@Data +public class CsvDeserializationConfig implements DeserializationConfig { + + private char delimiter; + private Character escapeChar; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/DeserializationConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/DeserializationConfig.java new file mode 100644 index 0000000000..0859cd3988 --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/DeserializationConfig.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.dataflow.deserialization; + +import org.apache.inlong.common.constant.DeserializationType; + +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo; + +import java.io.Serializable; + +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") +@JsonSubTypes({ + @JsonSubTypes.Type(value = InlongMsgDeserializationConfig.class, name = DeserializationType.INLONG_MSG), + @JsonSubTypes.Type(value = InlongMsgPbDeserialiationConfig.class, name = DeserializationType.INLONG_MSG_PB), + @JsonSubTypes.Type(value = CsvDeserializationConfig.class, name = DeserializationType.CSV), + @JsonSubTypes.Type(value = KvDeserializationConfig.class, name = DeserializationType.KV), +}) +public interface DeserializationConfig extends Serializable { + +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/InlongMsgDeserializationConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/InlongMsgDeserializationConfig.java new file mode 100644 index 0000000000..b491f20a00 --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/InlongMsgDeserializationConfig.java @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.dataflow.deserialization; + +import lombok.Data; + +@Data +public class InlongMsgDeserializationConfig implements DeserializationConfig { + + private String streamId; + private DeserializationConfig innerDeserializationConfig; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/InlongMsgPbDeserialiationConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/InlongMsgPbDeserialiationConfig.java new file mode 100644 index 0000000000..4b62cf171f --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/InlongMsgPbDeserialiationConfig.java @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.dataflow.deserialization; + +import lombok.Data; + +@Data +public class InlongMsgPbDeserialiationConfig implements DeserializationConfig { + + private final String compressionType; + private DeserializationConfig innerDeserializationConfig; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/KvDeserializationConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/KvDeserializationConfig.java new file mode 100644 index 0000000000..e43896166c --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/KvDeserializationConfig.java @@ -0,0 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.dataflow.deserialization; + +import lombok.Data; + +@Data +public class KvDeserializationConfig implements DeserializationConfig { + + private char entrySplitter; + private char kvSplitter; + private Character escapeChar; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/FieldConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/FieldConfig.java new file mode 100644 index 0000000000..eead241654 --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/FieldConfig.java @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.dataflow.field; + +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class FieldConfig implements Serializable { + + private String name; + private FormatInfo formatInfo; +} diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ArrayFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayFormatInfo.java similarity index 97% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ArrayFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayFormatInfo.java index c296e0da9c..30aab091e2 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ArrayFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ArrayTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayTypeInfo.java similarity index 97% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ArrayTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayTypeInfo.java index c67a9350fd..f3868a06ac 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ArrayTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BasicFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BasicFormatInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BasicFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BasicFormatInfo.java index 2ed0a65552..02ea656c5a 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BasicFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BasicFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The format information for basic types. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BinaryFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BinaryFormatInfo.java similarity index 97% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BinaryFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BinaryFormatInfo.java index a2f73d6bd2..3838145ff1 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BinaryFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BinaryFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BinaryTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BinaryTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BinaryTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BinaryTypeInfo.java index 36918c25ff..b0f733901c 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BinaryTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BinaryTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; public class BinaryTypeInfo implements TypeInfo { diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BooleanFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BooleanFormatInfo.java similarity index 96% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BooleanFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BooleanFormatInfo.java index 2bae898a04..63935c6f96 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BooleanFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BooleanFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The format information for booleans. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BooleanTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BooleanTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BooleanTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BooleanTypeInfo.java index b63b4c3f58..5e3cf61a40 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BooleanTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BooleanTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for booleans. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ByteFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ByteFormatInfo.java similarity index 96% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ByteFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ByteFormatInfo.java index 1fbafb263b..257d8ef747 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ByteFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ByteFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The format information for strings. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ByteTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ByteTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ByteTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ByteTypeInfo.java index dddca846c7..42b55497ef 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ByteTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ByteTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for strings. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/Constants.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/Constants.java similarity index 93% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/Constants.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/Constants.java index d196ba6f4f..f3056180ed 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/Constants.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/Constants.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; public class Constants { diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DateFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DateFormatInfo.java similarity index 94% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DateFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DateFormatInfo.java index d323ec398f..5c2694cf59 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DateFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DateFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore; @@ -30,8 +30,8 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; -import static org.apache.inlong.sort.formats.common.Constants.DATE_AND_TIME_STANDARD_ISO_8601; -import static org.apache.inlong.sort.formats.common.Constants.DATE_AND_TIME_STANDARD_SQL; +import static org.apache.inlong.common.pojo.sort.dataflow.field.format.Constants.DATE_AND_TIME_STANDARD_ISO_8601; +import static org.apache.inlong.common.pojo.sort.dataflow.field.format.Constants.DATE_AND_TIME_STANDARD_SQL; /** * The format information for {@link Date}s. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DateTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DateTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DateTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DateTypeInfo.java index 1d84dd74b3..bdfd7c45db 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DateTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DateTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for dates. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DecimalFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DecimalFormatInfo.java similarity index 97% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DecimalFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DecimalFormatInfo.java index 0bb740a42a..4eb480658e 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DecimalFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DecimalFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DecimalTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DecimalTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DecimalTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DecimalTypeInfo.java index 06c2710157..65bbfc0412 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DecimalTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DecimalTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for decimals. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DoubleFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DoubleFormatInfo.java similarity index 96% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DoubleFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DoubleFormatInfo.java index 4277a7d01e..259d13a393 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DoubleFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DoubleFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The format information for doubles. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DoubleTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DoubleTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DoubleTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DoubleTypeInfo.java index 3bccdfdeea..537ca0b0e9 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DoubleTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DoubleTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for doubles. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FloatFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FloatFormatInfo.java similarity index 96% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FloatFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FloatFormatInfo.java index 2557e2baf1..aede019ef0 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FloatFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FloatFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The format information for floats. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FloatTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FloatTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FloatTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FloatTypeInfo.java index cf261d1d29..c44d1a512a 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FloatTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FloatTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for floats. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatInfo.java similarity index 97% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatInfo.java index 4d8cc7fe5d..bd2b5a1dbd 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FormatUtils.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatUtils.java similarity index 97% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FormatUtils.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatUtils.java index e7b5de20fa..82ca93a635 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FormatUtils.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/IntFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/IntFormatInfo.java similarity index 96% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/IntFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/IntFormatInfo.java index 2a0ba47c7f..e80f1fed3d 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/IntFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/IntFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The format information for integers. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/IntTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/IntTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/IntTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/IntTypeInfo.java index 16a537d4cc..442fe66f38 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/IntTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/IntTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for integers. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LocalZonedTimestampFormatInfo.java similarity index 97% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LocalZonedTimestampFormatInfo.java index 952ddf94f5..56d8611e2d 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LocalZonedTimestampFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; import java.util.Objects; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LocalZonedTimestampTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LocalZonedTimestampTypeInfo.java index cdc66f8e30..1a82b2c529 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LocalZonedTimestampTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; public class LocalZonedTimestampTypeInfo implements TypeInfo { diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LongFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LongFormatInfo.java similarity index 96% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LongFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LongFormatInfo.java index 6dd8882809..b019df4d4c 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LongFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LongFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The format information for longs. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LongTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LongTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LongTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LongTypeInfo.java index aa0f66dc58..e55e79844a 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LongTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LongTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for longs. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/MapFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapFormatInfo.java similarity index 97% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/MapFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapFormatInfo.java index 6ccbedd092..20c9d7db81 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/MapFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/MapTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapTypeInfo.java similarity index 97% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/MapTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapTypeInfo.java index 0da0d7c2af..73cba9949e 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/MapTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/NullFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/NullFormatInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/NullFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/NullFormatInfo.java index 24273c84e2..b7264cc3ef 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/NullFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/NullFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; public class NullFormatInfo implements FormatInfo { diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/NullTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/NullTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/NullTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/NullTypeInfo.java index e31d398f85..b8fe669af0 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/NullTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/NullTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; public class NullTypeInfo implements TypeInfo { diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/RowFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowFormatInfo.java similarity index 98% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/RowFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowFormatInfo.java index 27b38459df..4bc0e22fd4 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/RowFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/RowTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowTypeInfo.java similarity index 98% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/RowTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowTypeInfo.java index 1e0dd72b91..ecaaddccff 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/RowTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ShortFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ShortFormatInfo.java similarity index 96% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ShortFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ShortFormatInfo.java index fb47c64520..6dc6baf1aa 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ShortFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ShortFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The format information for strings. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ShortTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ShortTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ShortTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ShortTypeInfo.java index d588b6154f..796c8d847d 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ShortTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ShortTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for strings. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/StringFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/StringFormatInfo.java similarity index 96% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/StringFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/StringFormatInfo.java index f59e50e3f8..c249b33486 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/StringFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/StringFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The format information for strings. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/StringTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/StringTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/StringTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/StringTypeInfo.java index 2022c0d04e..0a53543569 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/StringTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/StringTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for strings. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimeFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimeFormatInfo.java similarity index 94% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimeFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimeFormatInfo.java index 45bfa9f948..65101cb7bd 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimeFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimeFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore; @@ -31,8 +31,8 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; -import static org.apache.inlong.sort.formats.common.Constants.DATE_AND_TIME_STANDARD_ISO_8601; -import static org.apache.inlong.sort.formats.common.Constants.DATE_AND_TIME_STANDARD_SQL; +import static org.apache.inlong.common.pojo.sort.dataflow.field.format.Constants.DATE_AND_TIME_STANDARD_ISO_8601; +import static org.apache.inlong.common.pojo.sort.dataflow.field.format.Constants.DATE_AND_TIME_STANDARD_SQL; /** * The format information for {@link Time}s. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimeTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimeTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimeTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimeTypeInfo.java index 99ed9cd53e..e5935f1aab 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimeTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimeTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for times. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimestampFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimestampFormatInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimestampFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimestampFormatInfo.java index ec3de92036..1985c2fea5 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimestampFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimestampFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore; @@ -31,8 +31,8 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; -import static org.apache.inlong.sort.formats.common.Constants.DATE_AND_TIME_STANDARD_ISO_8601; -import static org.apache.inlong.sort.formats.common.Constants.DATE_AND_TIME_STANDARD_SQL; +import static org.apache.inlong.common.pojo.sort.dataflow.field.format.Constants.DATE_AND_TIME_STANDARD_ISO_8601; +import static org.apache.inlong.common.pojo.sort.dataflow.field.format.Constants.DATE_AND_TIME_STANDARD_SQL; /** * The format information for {@link Timestamp}s. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimestampTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimestampTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimestampTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimestampTypeInfo.java index b8cbebe01d..aa999dfad1 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimestampTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimestampTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for timestamps. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TypeInfo.java similarity index 97% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TypeInfo.java index fc2d262508..738a67f4b0 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/VarBinaryFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarBinaryFormatInfo.java similarity index 97% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/VarBinaryFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarBinaryFormatInfo.java index 28732a2447..aca02ea805 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/VarBinaryFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarBinaryFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/VarBinaryTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarBinaryTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/VarBinaryTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarBinaryTypeInfo.java index 97ff95350f..de7a415983 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/VarBinaryTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarBinaryTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for VarBinary. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/VarCharFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarCharFormatInfo.java similarity index 97% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/VarCharFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarCharFormatInfo.java index dd1ef59787..ac5694bb9c 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/VarCharFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarCharFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/ClsSinkConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/ClsSinkConfig.java new file mode 100644 index 0000000000..64df375ce3 --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/ClsSinkConfig.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.dataflow.sink; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class ClsSinkConfig extends SinkConfig { + + private String topicId; + private String topicName; + private Integer storageDuration; + private String tag; + private String tokenizer; + private Integer contentOffset; + private Integer fieldOffset; + private String separator; + +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/EsSinkConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/EsSinkConfig.java new file mode 100644 index 0000000000..a6eb0f07b8 --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/EsSinkConfig.java @@ -0,0 +1,29 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.dataflow.sink; + +import lombok.Data; + +@Data +public class EsSinkConfig extends SinkConfig { + + private String indexNamePattern; + private Integer contentOffset; + private Integer fieldOffset; + private String separator; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/PulsarSinkConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/PulsarSinkConfig.java new file mode 100644 index 0000000000..9142019d20 --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/PulsarSinkConfig.java @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.dataflow.sink; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class PulsarSinkConfig extends SinkConfig { + + private String pulsarTenant; + private String namespace; + private String topic; + private Integer partitionNum; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/SinkConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/SinkConfig.java new file mode 100644 index 0000000000..06635d219f --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/SinkConfig.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.dataflow.sink; + +import org.apache.inlong.common.constant.SinkType; +import org.apache.inlong.common.pojo.sort.dataflow.field.FieldConfig; + +import lombok.Data; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo; + +import java.io.Serializable; +import java.util.List; + +@Data +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") +@JsonSubTypes({ + @JsonSubTypes.Type(value = ClsSinkConfig.class, name = SinkType.CLS), + @JsonSubTypes.Type(value = EsSinkConfig.class, name = SinkType.ELASTICSEARCH), + @JsonSubTypes.Type(value = PulsarSinkConfig.class, name = SinkType.PULSAR), +}) +public abstract class SinkConfig implements Serializable { + + private String encodingType; + private List fieldConfigs; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/MqClusterConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/MqClusterConfig.java new file mode 100644 index 0000000000..ebd16d4e30 --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/MqClusterConfig.java @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.mq; + +import org.apache.inlong.common.constant.MQType; + +import lombok.Data; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo; + +import java.io.Serializable; + +@Data +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") +@JsonSubTypes({ + @JsonSubTypes.Type(value = PulsarClusterConfig.class, name = MQType.PULSAR), + @JsonSubTypes.Type(value = TubeClusterConfig.class, name = MQType.TUBEMQ) +}) +public abstract class MqClusterConfig implements Serializable { + + private String version; + private String clusterName; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/PulsarClusterConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/PulsarClusterConfig.java new file mode 100644 index 0000000000..1bb503b7a4 --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/PulsarClusterConfig.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.mq; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class PulsarClusterConfig extends MqClusterConfig { + + @JsonInclude(JsonInclude.Include.NON_NULL) + private String adminUrl; + + @JsonInclude(JsonInclude.Include.NON_NULL) + private String serviceUrl; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/TubeClusterConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/TubeClusterConfig.java new file mode 100644 index 0000000000..baa3a56ffd --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/TubeClusterConfig.java @@ -0,0 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.mq; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class TubeClusterConfig extends MqClusterConfig { + + private String masterAddress; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/ClsNodeConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/ClsNodeConfig.java new file mode 100644 index 0000000000..b2f23382bd --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/ClsNodeConfig.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.node; + +import lombok.Data; + +@Data +public class ClsNodeConfig extends NodeConfig { + + private String mainAccountId; + private String subAccountId; + private String sendSecretKey; + private String sendSecretId; + private String manageSecretKey; + private String manageSecretId; + private String endpoint; + private String region; + private String logSetId; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/EsNodeConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/EsNodeConfig.java new file mode 100644 index 0000000000..5a6a3ae894 --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/EsNodeConfig.java @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.node; + +import lombok.Data; + +@Data +public class EsNodeConfig extends NodeConfig { + + private Integer bulkAction; + private Integer bulkSizeMb; + private Integer flushInterval; + private Integer concurrentRequests; + private Integer maxConnect; + private Integer keywordMaxLength; + private Boolean isUseIndexId; + private Integer maxThreads; + private String auditSetName; + private String httpHosts; + private String username; + private String token; + private String password; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/NodeConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/NodeConfig.java new file mode 100644 index 0000000000..921bdf2e02 --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/NodeConfig.java @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.node; + +import org.apache.inlong.common.constant.DataNodeType; + +import lombok.Data; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo; + +import java.io.Serializable; + +@Data +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") +@JsonSubTypes({ + @JsonSubTypes.Type(value = ClsNodeConfig.class, name = DataNodeType.CLS), + @JsonSubTypes.Type(value = EsNodeConfig.class, name = DataNodeType.ELASTICSEARCH), + @JsonSubTypes.Type(value = PulsarNodeConfig.class, name = DataNodeType.PULSAR), +}) +public abstract class NodeConfig implements Serializable { + + private Integer version; + private String nodeName; +} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/PulsarNodeConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/PulsarNodeConfig.java new file mode 100644 index 0000000000..b207e1de27 --- /dev/null +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/PulsarNodeConfig.java @@ -0,0 +1,29 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.common.pojo.sort.node; + +import lombok.Data; + +@Data +public class PulsarNodeConfig extends NodeConfig { + + private String serviceUrl; + private String adminUrl; + private String token; + private String compressionType; +} diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/base/LoadNodeProvider.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/base/LoadNodeProvider.java index 87f82e7185..e243226b7c 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/base/LoadNodeProvider.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/base/LoadNodeProvider.java @@ -18,13 +18,13 @@ package org.apache.inlong.manager.pojo.sort.node.base; import org.apache.inlong.common.enums.DataTypeEnum; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringTypeInfo; import org.apache.inlong.manager.common.enums.FieldType; import org.apache.inlong.manager.common.fieldtype.strategy.FieldTypeMappingStrategy; import org.apache.inlong.manager.pojo.sink.SinkField; import org.apache.inlong.manager.pojo.sort.util.FieldInfoUtils; import org.apache.inlong.manager.pojo.stream.StreamField; import org.apache.inlong.manager.pojo.stream.StreamNode; -import org.apache.inlong.sort.formats.common.StringTypeInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.node.LoadNode; import org.apache.inlong.sort.protocol.node.format.CanalJsonFormat; diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/PulsarProvider.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/PulsarProvider.java index a0fada67c1..815a2c945d 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/PulsarProvider.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/PulsarProvider.java @@ -18,12 +18,12 @@ package org.apache.inlong.manager.pojo.sort.node.provider; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; import org.apache.inlong.manager.common.consts.SourceType; import org.apache.inlong.manager.pojo.sort.node.base.ExtractNodeProvider; import org.apache.inlong.manager.pojo.source.pulsar.PulsarSource; import org.apache.inlong.manager.pojo.stream.StreamField; import org.apache.inlong.manager.pojo.stream.StreamNode; -import org.apache.inlong.sort.formats.common.LongFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.enums.PulsarScanStartupMode; import org.apache.inlong.sort.protocol.node.ExtractNode; diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/StarRocksProvider.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/StarRocksProvider.java index 5a86455a0f..3f0c7e2165 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/StarRocksProvider.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/StarRocksProvider.java @@ -18,13 +18,13 @@ package org.apache.inlong.manager.pojo.sort.node.provider; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; import org.apache.inlong.manager.common.consts.SinkType; import org.apache.inlong.manager.pojo.sink.SinkField; import org.apache.inlong.manager.pojo.sink.starrocks.StarRocksSink; import org.apache.inlong.manager.pojo.sort.node.base.LoadNodeProvider; import org.apache.inlong.manager.pojo.stream.StreamField; import org.apache.inlong.manager.pojo.stream.StreamNode; -import org.apache.inlong.sort.formats.common.LongFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.node.LoadNode; import org.apache.inlong.sort.protocol.node.format.Format; diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/TubeMqProvider.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/TubeMqProvider.java index 34723608a5..546363fe7e 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/TubeMqProvider.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/TubeMqProvider.java @@ -18,12 +18,12 @@ package org.apache.inlong.manager.pojo.sort.node.provider; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; import org.apache.inlong.manager.common.consts.SourceType; import org.apache.inlong.manager.pojo.sort.node.base.ExtractNodeProvider; import org.apache.inlong.manager.pojo.source.tubemq.TubeMQSource; import org.apache.inlong.manager.pojo.stream.StreamField; import org.apache.inlong.manager.pojo.stream.StreamNode; -import org.apache.inlong.sort.formats.common.LongFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.node.ExtractNode; import org.apache.inlong.sort.protocol.node.extract.TubeMQExtractNode; diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtils.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtils.java index 6e6a0483d2..96781cc7d3 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtils.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtils.java @@ -18,6 +18,25 @@ package org.apache.inlong.manager.pojo.sort.util; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LocalZonedTimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarBinaryFormatInfo; import org.apache.inlong.manager.common.enums.FieldType; import org.apache.inlong.manager.common.fieldtype.strategy.FieldTypeMappingStrategy; import org.apache.inlong.manager.pojo.fieldformat.ArrayFormat; @@ -29,25 +48,6 @@ import org.apache.inlong.manager.pojo.fieldformat.VarBinaryFormat; import org.apache.inlong.manager.pojo.sink.SinkField; import org.apache.inlong.manager.pojo.stream.StreamField; -import org.apache.inlong.sort.formats.common.ArrayFormatInfo; -import org.apache.inlong.sort.formats.common.BinaryFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LocalZonedTimestampFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; -import org.apache.inlong.sort.formats.common.VarBinaryFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.MetaFieldInfo; diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldRelationUtils.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldRelationUtils.java index bd0120d8af..675accc9a4 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldRelationUtils.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldRelationUtils.java @@ -17,6 +17,8 @@ package org.apache.inlong.manager.pojo.sort.util; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringTypeInfo; import org.apache.inlong.manager.common.enums.ErrorCodeEnum; import org.apache.inlong.manager.common.enums.FieldType; import org.apache.inlong.manager.common.enums.TransformType; @@ -31,8 +33,6 @@ import org.apache.inlong.manager.pojo.transform.replacer.StringReplacerDefinition.ReplaceRule; import org.apache.inlong.manager.pojo.transform.splitter.SplitterDefinition; import org.apache.inlong.manager.pojo.transform.splitter.SplitterDefinition.SplitRule; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.StringTypeInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.CascadeFunction; import org.apache.inlong.sort.protocol.transformation.ConstantParam; diff --git a/inlong-manager/manager-pojo/src/test/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtilsTest.java b/inlong-manager/manager-pojo/src/test/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtilsTest.java index 92fd73ace2..6aade6c54f 100644 --- a/inlong-manager/manager-pojo/src/test/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtilsTest.java +++ b/inlong-manager/manager-pojo/src/test/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtilsTest.java @@ -17,6 +17,12 @@ package org.apache.inlong.manager.pojo.sort.util; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LocalZonedTimestampTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TypeInfo; import org.apache.inlong.manager.common.enums.FieldType; import org.apache.inlong.manager.common.fieldtype.strategy.ClickHouseFieldTypeStrategy; import org.apache.inlong.manager.common.fieldtype.strategy.IcebergFieldTypeStrategy; @@ -26,12 +32,6 @@ import org.apache.inlong.manager.common.fieldtype.strategy.PostgreSQLFieldTypeStrategy; import org.apache.inlong.manager.common.fieldtype.strategy.SQLServerFieldTypeStrategy; import org.apache.inlong.manager.pojo.stream.StreamField; -import org.apache.inlong.sort.formats.common.ByteTypeInfo; -import org.apache.inlong.sort.formats.common.IntTypeInfo; -import org.apache.inlong.sort.formats.common.LocalZonedTimestampTypeInfo; -import org.apache.inlong.sort.formats.common.ShortTypeInfo; -import org.apache.inlong.sort.formats.common.StringTypeInfo; -import org.apache.inlong.sort.formats.common.TypeInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.junit.jupiter.api.Assertions; diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceTest.java index d8c0224f36..bea9e09930 100644 --- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceTest.java +++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceTest.java @@ -360,11 +360,13 @@ public void testDataProxyCluster() { // save cluster node String ip = "127.0.0.1"; Integer port1 = 46800; - Integer nodeId1 = this.saveDataProxyClusterNode(id, ClusterType.DATAPROXY, ip, port1, ProtocolType.TCP); + Integer nodeId1 = + this.saveDataProxyClusterNode(id, ClusterType.DATAPROXY, ip, port1, ProtocolType.TCP); Assertions.assertNotNull(nodeId1); Integer port2 = 46801; - Integer nodeId2 = this.saveDataProxyClusterNode(id, ClusterType.DATAPROXY, ip, port2, ProtocolType.TCP); + Integer nodeId2 = + this.saveDataProxyClusterNode(id, ClusterType.DATAPROXY, ip, port2, ProtocolType.TCP); Assertions.assertNotNull(nodeId2); // create an inlong group which use the clusterTag @@ -382,7 +384,8 @@ public void testDataProxyCluster() { ComponentTypeEnum.DataProxy.getType(), ProtocolType.TCP); heartbeatManager.reportHeartbeat(msg2); // get the data proxy nodes, the first port should is p1, second port is p2 - DataProxyNodeResponse nodeResponse = clusterService.getDataProxyNodes(inlongGroupId, ProtocolType.TCP); + DataProxyNodeResponse nodeResponse = + clusterService.getDataProxyNodes(inlongGroupId, ProtocolType.TCP); List nodeInfoList = nodeResponse.getNodeList(); nodeInfoList.sort(Comparator.comparingInt(DataProxyNodeInfo::getId)); Assertions.assertEquals(nodeInfoList.size(), 2); diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/FieldInfo.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/FieldInfo.java index 86a4898558..92366a42cf 100644 --- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/FieldInfo.java +++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/FieldInfo.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol; -import org.apache.inlong.sort.formats.common.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; import org.apache.inlong.sort.protocol.transformation.FunctionParam; import com.google.common.base.Preconditions; diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/extract/MongoExtractNode.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/extract/MongoExtractNode.java index ad39b33772..7fb5624165 100644 --- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/extract/MongoExtractNode.java +++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/extract/MongoExtractNode.java @@ -18,7 +18,7 @@ package org.apache.inlong.sort.protocol.node.extract; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.InlongMetric; import org.apache.inlong.sort.protocol.Metadata; diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNode.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNode.java index a9d4f081f0..d9020292ea 100644 --- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNode.java +++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNode.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; -import org.apache.inlong.sort.formats.common.LocalZonedTimestampFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LocalZonedTimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.InlongMetric; import org.apache.inlong.sort.protocol.enums.FilterStrategy; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/FieldInfoTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/FieldInfoTest.java index 8a51a09dcd..29dafc2d47 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/FieldInfoTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/FieldInfoTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/GroupInfoTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/GroupInfoTest.java index 1100a71bdf..b65e4639b0 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/GroupInfoTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/GroupInfoTest.java @@ -17,12 +17,12 @@ package org.apache.inlong.sort.protocol; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; import org.apache.inlong.sort.protocol.node.Node; import org.apache.inlong.sort.protocol.node.extract.MySqlExtractNode; import org.apache.inlong.sort.protocol.node.format.JsonFormat; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/StreamInfoTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/StreamInfoTest.java index 93fad50576..f1b59918bb 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/StreamInfoTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/StreamInfoTest.java @@ -17,12 +17,12 @@ package org.apache.inlong.sort.protocol; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; import org.apache.inlong.sort.protocol.node.Node; import org.apache.inlong.sort.protocol.node.extract.MySqlExtractNode; import org.apache.inlong.sort.protocol.node.format.JsonFormat; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/DorisExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/DorisExtractNodeTest.java index e9a465cdf0..9bc2bf9b12 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/DorisExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/DorisExtractNodeTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.protocol.node.extract; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import java.util.Arrays; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/HudiExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/HudiExtractNodeTest.java index 245787e478..e71f8f701f 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/HudiExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/HudiExtractNodeTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.protocol.node.extract; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.constant.HudiConstant.CatalogType; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/KafkaExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/KafkaExtractNodeTest.java index 9b556285fc..b7b8e327aa 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/KafkaExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/KafkaExtractNodeTest.java @@ -18,9 +18,9 @@ package org.apache.inlong.sort.protocol.node.extract; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.enums.KafkaScanStartupMode; import org.apache.inlong.sort.protocol.node.format.CsvFormat; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/MongoExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/MongoExtractNodeTest.java index b8d5f603db..f74098f2bf 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/MongoExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/MongoExtractNodeTest.java @@ -18,9 +18,9 @@ package org.apache.inlong.sort.protocol.node.extract; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.junit.Assert; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/MySqlExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/MySqlExtractNodeTest.java index 1dcd7d2c59..8f70b1223b 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/MySqlExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/MySqlExtractNodeTest.java @@ -18,8 +18,8 @@ package org.apache.inlong.sort.protocol.node.extract; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.junit.Assert; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/OracleExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/OracleExtractNodeTest.java index fe9639b6ea..30470620f8 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/OracleExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/OracleExtractNodeTest.java @@ -18,9 +18,9 @@ package org.apache.inlong.sort.protocol.node.extract; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.junit.Assert; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/PostgresExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/PostgresExtractNodeTest.java index d06dbc26b1..c6083659f5 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/PostgresExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/PostgresExtractNodeTest.java @@ -18,9 +18,9 @@ package org.apache.inlong.sort.protocol.node.extract; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.junit.Assert; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/PulsarExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/PulsarExtractNodeTest.java index 5c84a4e0e7..8134146bc6 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/PulsarExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/PulsarExtractNodeTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.protocol.node.extract; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.node.Node; import org.apache.inlong.sort.protocol.node.format.CsvFormat; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/RedisExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/RedisExtractNodeTest.java index 01087077bd..20e67f802d 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/RedisExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/RedisExtractNodeTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.protocol.node.extract; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.LookupOptions; import org.apache.inlong.sort.protocol.enums.RedisCommand; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/SqlServerExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/SqlServerExtractNodeTest.java index b618be0c1b..616c10432b 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/SqlServerExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/SqlServerExtractNodeTest.java @@ -18,9 +18,9 @@ package org.apache.inlong.sort.protocol.node.extract; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.junit.Assert; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/TubeMQExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/TubeMQExtractNodeTest.java index e7849fc24e..951dcae7ba 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/TubeMQExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/TubeMQExtractNodeTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.protocol.node.extract; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.node.format.CsvFormat; import org.apache.inlong.sort.protocol.node.format.Format; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/ClickHouseLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/ClickHouseLoadNodeTest.java index eeeae2a57f..d034dfbfec 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/ClickHouseLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/ClickHouseLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.node.Node; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/DorisLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/DorisLoadNodeTest.java index 7a24071cfd..11d72304ca 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/DorisLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/DorisLoadNodeTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; import org.apache.inlong.sort.protocol.transformation.FilterFunction; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/ElasticSearchNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/ElasticSearchNodeTest.java index cd52b9e56c..eb43d16b59 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/ElasticSearchNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/ElasticSearchNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.node.Node; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/GreenplumLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/GreenplumLoadNodeTest.java index 79a13b775e..22a6da352c 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/GreenplumLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/GreenplumLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HbaseLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HbaseLoadNodeTest.java index 5b5522e24c..56d8fd8013 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HbaseLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HbaseLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNodeTest.java index e761351fef..297bc11df0 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNodeTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HudiLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HudiLoadNodeTest.java index 8c69e85496..346c72ebb1 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HudiLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HudiLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.constant.HudiConstant.CatalogType; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/IcebergLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/IcebergLoadNodeTest.java index 24d5b39730..c38f90779d 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/IcebergLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/IcebergLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.constant.IcebergConstant.CatalogType; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/KafkaLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/KafkaLoadNodeTest.java index 1c45279a15..90947665b4 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/KafkaLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/KafkaLoadNodeTest.java @@ -18,8 +18,8 @@ package org.apache.inlong.sort.protocol.node.load; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.node.format.CanalJsonFormat; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/MySqlLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/MySqlLoadNodeTest.java index ec79abe8bb..1c4a5f7041 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/MySqlLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/MySqlLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/OracleLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/OracleLoadNodeTest.java index 474f666aa9..2af0fd1f98 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/OracleLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/OracleLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/PostgresLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/PostgresLoadNodeTest.java index 4e6b555bea..d38dfe7938 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/PostgresLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/PostgresLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/SqlServerLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/SqlServerLoadNodeTest.java index 40428c22ca..6f44c1dbb2 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/SqlServerLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/SqlServerLoadNodeTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/TDSQLPostgresLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/TDSQLPostgresLoadNodeTest.java index 2f954ce522..6cf57bb42f 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/TDSQLPostgresLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/TDSQLPostgresLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/transform/DistinctNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/transform/DistinctNodeTest.java index d7ad63af9c..c4b79e1d34 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/transform/DistinctNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/transform/DistinctNodeTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.protocol.node.transform; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; import org.apache.inlong.sort.protocol.transformation.OrderDirection; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/FieldRelationTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/FieldRelationTest.java index fb4db7fca5..c4e3751db7 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/FieldRelationTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/FieldRelationTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.transformation; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; /** diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/WatermarkFieldTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/WatermarkFieldTest.java index 10aeba5271..1ba9abb7e5 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/WatermarkFieldTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/WatermarkFieldTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.TimeUnitConstantParam.TimeUnit; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/AddFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/AddFunctionTest.java index 344c2e8ac6..58880f39cc 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/AddFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/AddFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/BetweenFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/BetweenFunctionTest.java index 89518c7e8b..627c5ca71c 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/BetweenFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/BetweenFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/CascadeFunctionWrapperTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/CascadeFunctionWrapperTest.java index 438539cce9..a77cd03b00 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/CascadeFunctionWrapperTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/CascadeFunctionWrapperTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopEndFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopEndFunctionTest.java index 6eb079d282..52114cffda 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopEndFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopEndFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopFunctionTest.java index 1a2dc61a61..482e81ee25 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopStartFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopStartFunctionTest.java index 6b766e5957..fa2f3de1df 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopStartFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopStartFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/MultiValueFilterFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/MultiValueFilterFunctionTest.java index fa7d2d0619..0203c5a02e 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/MultiValueFilterFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/MultiValueFilterFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/RegexpReplaceFirstFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/RegexpReplaceFirstFunctionTest.java index a32aa0a8ed..2ba423d68b 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/RegexpReplaceFirstFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/RegexpReplaceFirstFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/RegexpReplaceFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/RegexpReplaceFunctionTest.java index 5a07dd07c9..af76863a72 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/RegexpReplaceFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/RegexpReplaceFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionEndFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionEndFunctionTest.java index 6804674bc7..0135b8b8ac 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionEndFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionEndFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionFunctionTest.java index e60cfd0734..56b70276bd 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionStartFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionStartFunctionTest.java index 388863f397..2d4a0acd51 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionStartFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionStartFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SingleValueFilterFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SingleValueFilterFunctionTest.java index 1ea74dc36f..3ce0bad518 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SingleValueFilterFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SingleValueFilterFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SplitIndexFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SplitIndexFunctionTest.java index 2a66b9859a..f7c890676c 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SplitIndexFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SplitIndexFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.ConstantParam; import org.apache.inlong.sort.protocol.transformation.Function; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SubtractFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SubtractFunctionTest.java index 57a3eef164..0433bbc324 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SubtractFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SubtractFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleEndFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleEndFunctionTest.java index 966a3fb467..0215b49136 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleEndFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleEndFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleFunctionTest.java index 8d3a313aaf..46c7558feb 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleStartFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleStartFunctionTest.java index 758279820e..e3e1b7062a 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleStartFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleStartFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/FullOuterJoinNodeRelationTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/FullOuterJoinNodeRelationTest.java index 6210c4c10e..94f7de6808 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/FullOuterJoinNodeRelationTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/FullOuterJoinNodeRelationTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.transformation.relation; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.ConstantParam; import org.apache.inlong.sort.protocol.transformation.FilterFunction; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/InnerJoinNodeRelationTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/InnerJoinNodeRelationTest.java index 9e62a74fce..ed9bca210c 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/InnerJoinNodeRelationTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/InnerJoinNodeRelationTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.transformation.relation; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.ConstantParam; import org.apache.inlong.sort.protocol.transformation.FilterFunction; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/InnerTemporalJoinRelationTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/InnerTemporalJoinRelationTest.java index 17549ba6d8..caa7c9be48 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/InnerTemporalJoinRelationTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/InnerTemporalJoinRelationTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.protocol.transformation.relation; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.ConstantParam; import org.apache.inlong.sort.protocol.transformation.FilterFunction; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/IntervalJoinRelationTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/IntervalJoinRelationTest.java index ca50ac0ded..71ca6fde44 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/IntervalJoinRelationTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/IntervalJoinRelationTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.transformation.relation; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.ConstantParam; import org.apache.inlong.sort.protocol.transformation.FilterFunction; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/LeftOuterJoinNodeRelationTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/LeftOuterJoinNodeRelationTest.java index ce36f08b11..25212ee89f 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/LeftOuterJoinNodeRelationTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/LeftOuterJoinNodeRelationTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.transformation.relation; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.ConstantParam; import org.apache.inlong.sort.protocol.transformation.FilterFunction; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/LeftTemporalJoinRelationTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/LeftTemporalJoinRelationTest.java index 67be513341..07b55851be 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/LeftTemporalJoinRelationTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/LeftTemporalJoinRelationTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.protocol.transformation.relation; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.ConstantParam; import org.apache.inlong.sort.protocol.transformation.FilterFunction; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/RightOuterJoinNodeRelationTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/RightOuterJoinNodeRelationTest.java index 605481fd70..3b067036e5 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/RightOuterJoinNodeRelationTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/RightOuterJoinNodeRelationTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.transformation.relation; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.ConstantParam; import org.apache.inlong.sort.protocol.transformation.FilterFunction; diff --git a/inlong-sort/sort-core/src/main/java/org/apache/inlong/sort/parser/impl/FlinkSqlParser.java b/inlong-sort/sort-core/src/main/java/org/apache/inlong/sort/parser/impl/FlinkSqlParser.java index 61f497d650..933a0af0f2 100644 --- a/inlong-sort/sort-core/src/main/java/org/apache/inlong/sort/parser/impl/FlinkSqlParser.java +++ b/inlong-sort/sort-core/src/main/java/org/apache/inlong/sort/parser/impl/FlinkSqlParser.java @@ -17,12 +17,12 @@ package org.apache.inlong.sort.parser.impl; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.configuration.Constants; import org.apache.inlong.sort.formats.base.TableFormatUtils; -import org.apache.inlong.sort.formats.common.ArrayFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.function.EmbeddingFunction; import org.apache.inlong.sort.function.EncryptFunction; import org.apache.inlong.sort.function.JsonGetterFunction; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/CascadeFunctionWrapperTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/CascadeFunctionWrapperTest.java index f8eef41c1f..3afdc696cf 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/CascadeFunctionWrapperTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/CascadeFunctionWrapperTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.CascadeFunction; import org.apache.inlong.sort.protocol.transformation.StringConstantParam; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/EncryptFunctionTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/EncryptFunctionTest.java index 98d686b4fb..b3f86e582b 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/EncryptFunctionTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/EncryptFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.StringConstantParam; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/JsonGetterFunctionTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/JsonGetterFunctionTest.java index 5c602523d7..6b4771c710 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/JsonGetterFunctionTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/JsonGetterFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.StringConstantParam; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/RegexpReplaceFirstFunctionTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/RegexpReplaceFirstFunctionTest.java index 4ebddc464b..96de0cf0b5 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/RegexpReplaceFirstFunctionTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/RegexpReplaceFirstFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.StringConstantParam; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/RegexpReplaceFunctionTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/RegexpReplaceFunctionTest.java index ea25034b53..2d6d1d522c 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/RegexpReplaceFunctionTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/RegexpReplaceFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.StringConstantParam; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/SplitIndexFunctionTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/SplitIndexFunctionTest.java index 13701f707b..bc4972e78c 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/SplitIndexFunctionTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/SplitIndexFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.ConstantParam; import org.apache.inlong.sort.protocol.transformation.StringConstantParam; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateMongoDBTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateMongoDBTest.java index fb3f8fd61f..f52db7092e 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateMongoDBTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateMongoDBTest.java @@ -18,7 +18,7 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateOracleTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateOracleTest.java index c44e35f561..afa358bb14 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateOracleTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateOracleTest.java @@ -18,8 +18,8 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.VarBinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarBinaryFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigratePostgreSQLTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigratePostgreSQLTest.java index 87b507923b..7bbaaa2294 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigratePostgreSQLTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigratePostgreSQLTest.java @@ -18,7 +18,7 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateTest.java index 1f75ca89d4..7919bfbc72 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateTest.java @@ -18,8 +18,8 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.VarBinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarBinaryFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateWithSpecifyingFieldTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateWithSpecifyingFieldTest.java index 1f5f1007d0..c314cd5f00 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateWithSpecifyingFieldTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateWithSpecifyingFieldTest.java @@ -18,7 +18,7 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.VarBinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarBinaryFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ClickHouseSqlParserTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ClickHouseSqlParserTest.java index fecd29e106..a43772071b 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ClickHouseSqlParserTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ClickHouseSqlParserTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/CustomFunctionSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/CustomFunctionSqlParseTest.java index d765117a07..808289e050 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/CustomFunctionSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/CustomFunctionSqlParseTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DataTypeConvertSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DataTypeConvertSqlParseTest.java index e0e7558ee2..bdf886a4f0 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DataTypeConvertSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DataTypeConvertSqlParseTest.java @@ -18,9 +18,9 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DecimalFormatSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DecimalFormatSqlParseTest.java index 7a19568659..d03ddba1e8 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DecimalFormatSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DecimalFormatSqlParseTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DistinctNodeSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DistinctNodeSqlParseTest.java index a1e7c65d54..13dfcc7981 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DistinctNodeSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DistinctNodeSqlParseTest.java @@ -18,11 +18,11 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisExtractNodeToDorisLoadNodeTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisExtractNodeToDorisLoadNodeTest.java index 2661ae5dba..916978ae1d 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisExtractNodeToDorisLoadNodeTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisExtractNodeToDorisLoadNodeTest.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisExtractNodeToMySqlLoadNodeTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisExtractNodeToMySqlLoadNodeTest.java index e07fd49d9d..c05d2f1b4c 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisExtractNodeToMySqlLoadNodeTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisExtractNodeToMySqlLoadNodeTest.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisMultipleSinkTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisMultipleSinkTest.java index 54f20de477..97fc015fb5 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisMultipleSinkTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisMultipleSinkTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.VarBinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarBinaryFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ESMultipleSinkTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ESMultipleSinkTest.java index 80186cee28..fb5e0c56b7 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ESMultipleSinkTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ESMultipleSinkTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.VarBinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarBinaryFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ElasticsearchSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ElasticsearchSqlParseTest.java index 29a3d1fd51..44c27b9c62 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ElasticsearchSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ElasticsearchSqlParseTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FilesystemSqlParserTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FilesystemSqlParserTest.java index 51478cf704..a8ee9a16a9 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FilesystemSqlParserTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FilesystemSqlParserTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FilterParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FilterParseTest.java index e76a829cb5..1b63e15c34 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FilterParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FilterParseTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FlinkSqlParserTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FlinkSqlParserTest.java index 6db698414d..09bbfc62db 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FlinkSqlParserTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FlinkSqlParserTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FullOuterJoinSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FullOuterJoinSqlParseTest.java index cad150822b..dd5e2fb98d 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FullOuterJoinSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FullOuterJoinSqlParseTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/GreenplumLoadSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/GreenplumLoadSqlParseTest.java index bdf72278af..161abad880 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/GreenplumLoadSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/GreenplumLoadSqlParseTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HbaseLoadFlinkSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HbaseLoadFlinkSqlParseTest.java index 291f89f22e..74c08231c1 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HbaseLoadFlinkSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HbaseLoadFlinkSqlParseTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HudiNodeSqlParserTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HudiNodeSqlParserTest.java index 0b7ff83296..35a77d55a7 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HudiNodeSqlParserTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HudiNodeSqlParserTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.FlinkSqlParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/Iceberg2StarRocksSqlParserTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/Iceberg2StarRocksSqlParserTest.java index d9c7c26fc0..4e9012d370 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/Iceberg2StarRocksSqlParserTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/Iceberg2StarRocksSqlParserTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.FlinkSqlParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/IcebergNodeSqlParserTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/IcebergNodeSqlParserTest.java index fc0b889db0..141bb4dba3 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/IcebergNodeSqlParserTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/IcebergNodeSqlParserTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.FlinkSqlParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/InnerJoinRelationSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/InnerJoinRelationSqlParseTest.java index bde57ec2cc..ef28487890 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/InnerJoinRelationSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/InnerJoinRelationSqlParseTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/IntervalJoinRelationSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/IntervalJoinRelationSqlParseTest.java index 3e7c51ff53..f97cd4dbe6 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/IntervalJoinRelationSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/IntervalJoinRelationSqlParseTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/KafkaLoadSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/KafkaLoadSqlParseTest.java index 957e890e68..b3f055147a 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/KafkaLoadSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/KafkaLoadSqlParseTest.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.VarBinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarBinaryFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/KafkaSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/KafkaSqlParseTest.java index 6c91da6bba..ab03d0aeab 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/KafkaSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/KafkaSqlParseTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/LeftOuterJoinSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/LeftOuterJoinSqlParseTest.java index 547535a136..d33899d375 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/LeftOuterJoinSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/LeftOuterJoinSqlParseTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MetaFieldSyncTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MetaFieldSyncTest.java index d7e4b75106..3bd02973e7 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MetaFieldSyncTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MetaFieldSyncTest.java @@ -18,11 +18,11 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MongoExtractFlinkSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MongoExtractFlinkSqlParseTest.java index d2bb5645de..a54d0a6ea2 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MongoExtractFlinkSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MongoExtractFlinkSqlParseTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlExtractNodeToDorisLoadNodeTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlExtractNodeToDorisLoadNodeTest.java index 422cde37e7..bc4fd57d26 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlExtractNodeToDorisLoadNodeTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlExtractNodeToDorisLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlLoadSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlLoadSqlParseTest.java index 17ad63b178..279b834037 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlLoadSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlLoadSqlParseTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlTemporalJoinRelationSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlTemporalJoinRelationSqlParseTest.java index 1aac2d11bd..987d30be89 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlTemporalJoinRelationSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlTemporalJoinRelationSqlParseTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/OracleExtractSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/OracleExtractSqlParseTest.java index 6f61c9eaf7..e16f574fa7 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/OracleExtractSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/OracleExtractSqlParseTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/OracleLoadSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/OracleLoadSqlParseTest.java index 0b7e7e4fc5..8f17fb9c34 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/OracleLoadSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/OracleLoadSqlParseTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PostgresExtractFlinkSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PostgresExtractFlinkSqlParseTest.java index 342c7e3e38..12dea3856f 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PostgresExtractFlinkSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PostgresExtractFlinkSqlParseTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PostgresLoadNodeFlinkSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PostgresLoadNodeFlinkSqlParseTest.java index 52e6671bf7..13ff219577 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PostgresLoadNodeFlinkSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PostgresLoadNodeFlinkSqlParseTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PulsarSqlParserTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PulsarSqlParserTest.java index fe3d758fae..87db594dde 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PulsarSqlParserTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PulsarSqlParserTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisNodeSqlParserTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisNodeSqlParserTest.java index 49651dc68c..b8ca015d15 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisNodeSqlParserTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisNodeSqlParserTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.FlinkSqlParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisTemporalJoinRelationSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisTemporalJoinRelationSqlParseTest.java index 56927ab5e4..0de56cd526 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisTemporalJoinRelationSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisTemporalJoinRelationSqlParseTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RightOuterJoinSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RightOuterJoinSqlParseTest.java index f945bcb3ec..41279e52ed 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RightOuterJoinSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RightOuterJoinSqlParseTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/SqlServerNodeSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/SqlServerNodeSqlParseTest.java index 5eff7df857..ceb01254e8 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/SqlServerNodeSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/SqlServerNodeSqlParseTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.GroupInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/TDSQLPostgresLoadNodeFlinkSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/TDSQLPostgresLoadNodeFlinkSqlParseTest.java index 4662eff382..f956644a1d 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/TDSQLPostgresLoadNodeFlinkSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/TDSQLPostgresLoadNodeFlinkSqlParseTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/TubeMQNodeSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/TubeMQNodeSqlParseTest.java index 16a66bb0ca..b6c863ac8c 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/TubeMQNodeSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/TubeMQNodeSqlParseTest.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.GroupInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/UnionSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/UnionSqlParseTest.java index 4616a13697..1e04a59e4f 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/UnionSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/UnionSqlParseTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kudu/src/main/java/org/apache/inlong/sort/kudu/common/KuduUtils.java b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kudu/src/main/java/org/apache/inlong/sort/kudu/common/KuduUtils.java index f83829d368..f471c319fa 100644 --- a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kudu/src/main/java/org/apache/inlong/sort/kudu/common/KuduUtils.java +++ b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kudu/src/main/java/org/apache/inlong/sort/kudu/common/KuduUtils.java @@ -17,18 +17,18 @@ package org.apache.inlong.sort.kudu.common; -import org.apache.inlong.sort.formats.common.BooleanTypeInfo; -import org.apache.inlong.sort.formats.common.ByteTypeInfo; -import org.apache.inlong.sort.formats.common.DateTypeInfo; -import org.apache.inlong.sort.formats.common.DecimalTypeInfo; -import org.apache.inlong.sort.formats.common.DoubleTypeInfo; -import org.apache.inlong.sort.formats.common.FloatTypeInfo; -import org.apache.inlong.sort.formats.common.IntTypeInfo; -import org.apache.inlong.sort.formats.common.LongTypeInfo; -import org.apache.inlong.sort.formats.common.RowTypeInfo; -import org.apache.inlong.sort.formats.common.StringTypeInfo; -import org.apache.inlong.sort.formats.common.TimestampTypeInfo; -import org.apache.inlong.sort.formats.common.TypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TypeInfo; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.table.types.DataType; diff --git a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kudu/src/test/java/org/apache/inlong/sort/connector/kudu/KuduTestBase.java b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kudu/src/test/java/org/apache/inlong/sort/connector/kudu/KuduTestBase.java index 32b4434233..58e9076066 100644 --- a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kudu/src/test/java/org/apache/inlong/sort/connector/kudu/KuduTestBase.java +++ b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kudu/src/test/java/org/apache/inlong/sort/connector/kudu/KuduTestBase.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.connector.kudu; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.flink.configuration.Configuration; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TableFormatUtils.java b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TableFormatUtils.java index 430b89b32f..7d41821f35 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TableFormatUtils.java +++ b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TableFormatUtils.java @@ -17,47 +17,47 @@ package org.apache.inlong.sort.formats.base; -import org.apache.inlong.sort.formats.common.ArrayFormatInfo; -import org.apache.inlong.sort.formats.common.ArrayTypeInfo; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BinaryFormatInfo; -import org.apache.inlong.sort.formats.common.BinaryTypeInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanTypeInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.ByteTypeInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DateTypeInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalTypeInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleTypeInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FloatTypeInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.IntTypeInfo; -import org.apache.inlong.sort.formats.common.LocalZonedTimestampFormatInfo; -import org.apache.inlong.sort.formats.common.LocalZonedTimestampTypeInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.LongTypeInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.MapTypeInfo; -import org.apache.inlong.sort.formats.common.NullFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.RowTypeInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.ShortTypeInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.StringTypeInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimeTypeInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampTypeInfo; -import org.apache.inlong.sort.formats.common.TypeInfo; -import org.apache.inlong.sort.formats.common.VarBinaryFormatInfo; -import org.apache.inlong.sort.formats.common.VarCharFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BinaryTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatUtils; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LocalZonedTimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LocalZonedTimestampTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.NullFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarBinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarCharFormatInfo; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TextFormatBuilder.java b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TextFormatBuilder.java index 965a77f218..b329c79149 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TextFormatBuilder.java +++ b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TextFormatBuilder.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.base; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.flink.table.descriptors.DescriptorProperties; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TextFormatDescriptor.java b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TextFormatDescriptor.java index 0eada989e6..e4819bae62 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TextFormatDescriptor.java +++ b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TextFormatDescriptor.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.base; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatUtils; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.flink.table.descriptors.DescriptorProperties; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ArrayFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ArrayFormatInfoTest.java index 1df333f475..0bc09d3115 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ArrayFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ArrayFormatInfoTest.java @@ -17,6 +17,13 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; + import java.util.Arrays; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/BinaryFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/BinaryFormatInfoTest.java index d8ee05ac64..12db8034b9 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/BinaryFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/BinaryFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; + import org.junit.Test; import java.nio.charset.StandardCharsets; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/BooleanFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/BooleanFormatInfoTest.java index 24f7b4667f..0efbb48721 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/BooleanFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/BooleanFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ByteFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ByteFormatInfoTest.java index fa5789b160..09b031b44b 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ByteFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ByteFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DateFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DateFormatInfoTest.java index 33ad8dec56..6ee8209ffe 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DateFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DateFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; + import org.junit.Test; import java.sql.Date; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DecimalFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DecimalFormatInfoTest.java index 43e5b89276..412b0a5e4a 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DecimalFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DecimalFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; + import org.junit.Test; import java.math.BigDecimal; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DoubleFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DoubleFormatInfoTest.java index b91809e506..d89108671f 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DoubleFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DoubleFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/FloatFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/FloatFormatInfoTest.java index 85003d9169..05a6cdc7ca 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/FloatFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/FloatFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/FormatInfoTestBase.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/FormatInfoTestBase.java index c9a8460e44..58781e1509 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/FormatInfoTestBase.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/FormatInfoTestBase.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatUtils; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/IntFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/IntFormatInfoTest.java index c9cbb7d704..3241cff9bc 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/IntFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/IntFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampFormatInfoTest.java index 4389b03ca1..0697767f0f 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LocalZonedTimestampFormatInfo; + import java.util.Collection; import java.util.Collections; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/LongFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/LongFormatInfoTest.java index d36e3cf9bf..c4a04c218a 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/LongFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/LongFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/MapFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/MapFormatInfoTest.java index 93566c140f..2b72bd7a6e 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/MapFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/MapFormatInfoTest.java @@ -17,6 +17,15 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; + import java.util.Arrays; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/RowFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/RowFormatInfoTest.java index 3d36d40973..22cf45c3e4 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/RowFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/RowFormatInfoTest.java @@ -17,6 +17,13 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; + import org.junit.Test; import java.util.Arrays; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ShortFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ShortFormatInfoTest.java index c950e9e862..1eb1d891dd 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ShortFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ShortFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/StringFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/StringFormatInfoTest.java index f2494d1712..fd863e5143 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/StringFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/StringFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/TimeFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/TimeFormatInfoTest.java index 20ece19548..1051741862 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/TimeFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/TimeFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; + import org.junit.Test; import java.sql.Time; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/TimestampFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/TimestampFormatInfoTest.java index 421cb12121..1dc61019ab 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/TimestampFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/TimestampFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; + import org.junit.Test; import java.sql.Timestamp; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/VarBinaryFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/VarBinaryFormatInfoTest.java index d5fc008389..4cf956f45f 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/VarBinaryFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/VarBinaryFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarBinaryFormatInfo; + import org.junit.Test; import java.nio.charset.StandardCharsets; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/VarCharFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/VarCharFormatInfoTest.java index a8237d2cdf..2f22b29b8a 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/VarCharFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/VarCharFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarCharFormatInfo; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-row/format-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java b/inlong-sort/sort-formats/format-row/format-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java index 189fda1e0e..1487cea9e2 100644 --- a/inlong-sort/sort-formats/format-row/format-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java +++ b/inlong-sort/sort-formats/format-row/format-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.base; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.junit.Assert; import org.junit.Test; diff --git a/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchema.java b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchema.java index f070cfef17..39bfb5f7a2 100644 --- a/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchema.java +++ b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchema.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.formats.csv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultDeserializationSchema; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; import org.apache.inlong.sort.formats.base.util.LogCounter; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.types.Row; diff --git a/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatBuilder.java b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatBuilder.java index 1e8d5f023a..c7f61accf5 100644 --- a/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatBuilder.java +++ b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatBuilder.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.csv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.table.descriptors.DescriptorProperties; diff --git a/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java index b2835e3e2b..7d006b8802 100644 --- a/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java +++ b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.csv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultTableFormatDeserializer; import org.apache.inlong.sort.formats.base.DefaultTableFormatSerializer; import org.apache.inlong.sort.formats.base.ProjectedDeserializationSchemaFactory; @@ -25,9 +28,6 @@ import org.apache.inlong.sort.formats.base.TableFormatDeserializerFactory; import org.apache.inlong.sort.formats.base.TableFormatSerializer; import org.apache.inlong.sort.formats.base.TableFormatSerializerFactory; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; diff --git a/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchema.java b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchema.java index 71620f98d9..ec8bfadf2d 100644 --- a/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchema.java +++ b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchema.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.csv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultSerializationSchema; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.types.Row; import org.slf4j.Logger; diff --git a/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchemaTest.java b/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchemaTest.java index 9ddc0c4a74..968f46d5c3 100644 --- a/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchemaTest.java @@ -17,21 +17,21 @@ package org.apache.inlong.sort.formats.csv; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.types.Row; import org.junit.Test; diff --git a/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java index 44c16eec25..df9bc2d805 100644 --- a/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java @@ -17,17 +17,17 @@ package org.apache.inlong.sort.formats.csv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.DefaultTableFormatDeserializer; import org.apache.inlong.sort.formats.base.DefaultTableFormatSerializer; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; import org.apache.inlong.sort.formats.base.TableFormatSerializer; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; diff --git a/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchemaTest.java b/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchemaTest.java index 36b89aa7e6..0bfcc2847d 100644 --- a/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchemaTest.java @@ -17,21 +17,21 @@ package org.apache.inlong.sort.formats.csv; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.types.Row; import org.junit.Test; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java index 3abf904204..2e289d4faa 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsg; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.flink.table.descriptors.DescriptorProperties; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java index 39a05b6986..1a85eddd1e 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.formats.inlongmsg; import org.apache.inlong.common.msg.InLongMsg; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatConstants; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.util.StringUtils; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlog.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlog.java index 02fad5a8eb..cea8c011d0 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlog.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlog.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatUtils; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FormatDescriptor; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.table.descriptors.DescriptorProperties; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatBuilder.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatBuilder.java index 9dad5d9349..57c795548a 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatBuilder.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatBuilder.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.flink.table.descriptors.DescriptorProperties; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializer.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializer.java index 538e02e815..866a6be6ce 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializer.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactory.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactory.java index 1f35f2a3a4..45b9992837 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactory.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactory.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatDeserializerFactory; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatDeserializer; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogMixedFormatConverter.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogMixedFormatConverter.java index e92b2b1217..9bd4cf3c61 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogMixedFormatConverter.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogMixedFormatConverter.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogUtils.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogUtils.java index b2a6a26d17..40f398d6c5 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogUtils.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogUtils.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.binlog.InLongBinlog; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializerTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializerTest.java index 5bcca7f72a..8fc0950709 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializerTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializerTest.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeinfo.Types; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactoryTest.java index 35ad72d6dc..e7a44305a5 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactoryTest.java @@ -17,13 +17,13 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.junit.Test; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogTest.java index 29a27b7d13..73ba12d20b 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.flink.table.api.ValidationException; import org.apache.flink.table.descriptors.Descriptor; @@ -34,7 +34,7 @@ import java.util.List; import java.util.Map; -import static org.apache.inlong.sort.formats.common.FormatUtils.marshall; +import static org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatUtils.marshall; import static org.apache.inlong.sort.formats.inlongmsgbinlog.InLongMsgBinlogUtils.DEFAULT_METADATA_FIELD_NAME; public class InLongMsgBinlogTest extends DescriptorTestBase { diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java index e500a9c386..e43266e358 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactory.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactory.java index 613c478301..8e21aa1d51 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactory.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactory.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatDeserializerFactory; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgMixedFormatConverterValidator; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvMixedFormatConverter.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvMixedFormatConverter.java index c0d4d1de62..ea9f691cc6 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvMixedFormatConverter.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvMixedFormatConverter.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgMixedFormatConverterBuilder; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgUtils; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java index fdccdc2b61..caa82e8faf 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java index c2c0239518..a6aaa9c8d0 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; import org.apache.inlong.common.msg.InLongMsg; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java index 8adaa6acbf..e0d576d604 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java @@ -17,14 +17,14 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatUtils; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgUtils; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java index c7c16dcf30..24a8f09ec0 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.inlongmsgkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactory.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactory.java index b3a0b54c9d..405069112f 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactory.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactory.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.formats.inlongmsgkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatDeserializer.TableFormatContext; import org.apache.inlong.sort.formats.base.TableFormatDeserializerFactory; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgMixedFormatConverterValidator; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvMixedFormatConverter.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvMixedFormatConverter.java index efc1c7642c..6eef05212a 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvMixedFormatConverter.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvMixedFormatConverter.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgkv; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgMixedFormatConverterBuilder; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgUtils; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java index 7fb7966992..5d5d3b860a 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.inlongmsgkv; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java index abfb25a536..045b423f94 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.formats.inlongmsgkv; import org.apache.inlong.common.msg.InLongMsg; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java index 659b01ce62..16a7adc8b0 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java @@ -17,13 +17,13 @@ package org.apache.inlong.sort.formats.inlongmsgkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.TableSchema; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializer.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializer.java index 191df7fd16..a606ad14e8 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializer.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactory.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactory.java index bb83ad6558..5f67880178 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactory.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactory.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatDeserializer.TableFormatContext; import org.apache.inlong.sort.formats.base.TableFormatDeserializerFactory; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgMixedFormatConverterValidator; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvMixedFormatConverter.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvMixedFormatConverter.java index d97bb341da..27a1157dcd 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvMixedFormatConverter.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvMixedFormatConverter.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgMixedFormatConverterBuilder; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgUtils; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvUtils.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvUtils.java index 6683e08f5e..79784249e7 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvUtils.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvUtils.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializerTest.java index fae60c03a4..f24e788787 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializerTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializerTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; import org.apache.inlong.common.msg.InLongMsg; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactoryTest.java index 10e2fbcbcd..06cde665a4 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactoryTest.java @@ -17,14 +17,14 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatUtils; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgUtils; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializer.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializer.java index 19a82503fa..9f3df07d5d 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializer.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.inlongmsgtlogkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatFactory.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatFactory.java index 0dbf0723ee..611a3dc303 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatFactory.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatFactory.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.formats.inlongmsgtlogkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatDeserializer.TableFormatContext; import org.apache.inlong.sort.formats.base.TableFormatDeserializerFactory; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgMixedFormatConverterValidator; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvMixedFormatConverter.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvMixedFormatConverter.java index 560d571685..417343351e 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvMixedFormatConverter.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvMixedFormatConverter.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgtlogkv; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgMixedFormatConverterBuilder; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgUtils; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvUtils.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvUtils.java index 8628d6cb79..298cc650e0 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvUtils.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvUtils.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.inlongmsgtlogkv; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializerTest.java index 72d9604719..d361313916 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializerTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializerTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.formats.inlongmsgtlogkv; import org.apache.inlong.common.msg.InLongMsg; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatFactoryTest.java index 941a633a5a..5022c64b87 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatFactoryTest.java @@ -17,14 +17,14 @@ package org.apache.inlong.sort.formats.inlongmsgtlogkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatUtils; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgUtils; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchema.java b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchema.java index c5de08cae6..0e3f35180e 100644 --- a/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchema.java +++ b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchema.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultDeserializationSchema; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.types.Row; diff --git a/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java index c6e73ab1d5..9f5c8bd7b4 100644 --- a/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java +++ b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.table.descriptors.DescriptorProperties; diff --git a/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java index 77009f733e..edfd938926 100644 --- a/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java +++ b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultTableFormatDeserializer; import org.apache.inlong.sort.formats.base.DefaultTableFormatSerializer; import org.apache.inlong.sort.formats.base.ProjectedDeserializationSchemaFactory; @@ -25,9 +28,6 @@ import org.apache.inlong.sort.formats.base.TableFormatDeserializerFactory; import org.apache.inlong.sort.formats.base.TableFormatSerializer; import org.apache.inlong.sort.formats.base.TableFormatSerializerFactory; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; diff --git a/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvSerializationSchema.java b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvSerializationSchema.java index 0996dceab9..acc94973f3 100644 --- a/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvSerializationSchema.java +++ b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvSerializationSchema.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultSerializationSchema; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.types.Row; import org.slf4j.Logger; diff --git a/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchemaTest.java b/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchemaTest.java index 144c2aa889..f9579d6069 100644 --- a/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchemaTest.java @@ -17,21 +17,21 @@ package org.apache.inlong.sort.formats.kv; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.types.Row; import org.junit.Test; diff --git a/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java index 021cb89fa3..623c27e7e1 100644 --- a/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java @@ -17,17 +17,17 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.DefaultTableFormatDeserializer; import org.apache.inlong.sort.formats.base.DefaultTableFormatSerializer; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; import org.apache.inlong.sort.formats.base.TableFormatSerializer; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; @@ -43,7 +43,7 @@ import java.util.HashMap; import java.util.Map; -import static org.apache.inlong.sort.formats.common.FormatUtils.marshall; +import static org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatUtils.marshall; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvSerializationSchemaTest.java b/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvSerializationSchemaTest.java index 2635128950..90377c942a 100644 --- a/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvSerializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvSerializationSchemaTest.java @@ -17,21 +17,21 @@ package org.apache.inlong.sort.formats.kv; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.types.Row; import org.junit.Test; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java index 82bf820d50..6067688902 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsg; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.flink.table.descriptors.DescriptorProperties; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java index fae71b09f8..02bca5450e 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.inlongmsg; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; import org.apache.inlong.sort.formats.base.TableFormatUtils; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.data.GenericRowData; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializer.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializer.java index 6a915b48fb..53a0ba64f4 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializer.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogRowDataDeserializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogRowDataDeserializationSchema.java index 3d0d88d401..63cb4bec38 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogRowDataDeserializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogRowDataDeserializationSchema.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgDeserializationSchema; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogUtils.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogUtils.java index 06d7174bb0..16ed2a7056 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogUtils.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogUtils.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatUtils; import org.apache.inlong.sort.formats.binlog.InLongBinlog; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactoryTest.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactoryTest.java index ccb05d7f08..e74eef9a22 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactoryTest.java @@ -17,12 +17,12 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatUtils; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java index 60417f9ce6..3e9f0843f5 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters.FieldToRowDataConverter; import org.apache.inlong.sort.formats.base.TableFormatUtils; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvRowDataDeserializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvRowDataDeserializationSchema.java index 5c021e8be9..d90cedb28d 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvRowDataDeserializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvRowDataDeserializationSchema.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgDeserializationSchema; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java index cd737eb1b1..a7f0fd1905 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters.FieldToRowDataConverter; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java index fcd6f468e7..7c6159a0de 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java @@ -18,14 +18,14 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; import org.apache.inlong.common.msg.InLongMsg; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters.FieldToRowDataConverter; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java index bc524678a3..17d6d9fdda 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java @@ -17,14 +17,14 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatUtils; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java index a125a2786d..b3dff0dec8 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.formats.inlongmsgkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters.FieldToRowDataConverter; import org.apache.inlong.sort.formats.base.TableFormatUtils; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvRowDataDeserializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvRowDataDeserializationSchema.java index caa27078c0..e2fbc29336 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvRowDataDeserializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvRowDataDeserializationSchema.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgkv; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgDeserializationSchema; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java index dd9cf95512..8bcf77c1ec 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.inlongmsgkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters.FieldToRowDataConverter; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java index 9025cbc439..d99882c30f 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java @@ -18,11 +18,11 @@ package org.apache.inlong.sort.formats.inlongmsgkv; import org.apache.inlong.common.msg.InLongMsg; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java index 2e66ee93e8..a560029aa0 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java @@ -17,14 +17,14 @@ package org.apache.inlong.sort.formats.inlongmsgkv; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatUtils; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvDeserializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvDeserializationSchema.java index 3fb30ccecd..6d29d839ee 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvDeserializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvDeserializationSchema.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgDeserializationSchema; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializer.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializer.java index 3a9f4c001b..c0cdc68b30 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializer.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters.FieldToRowDataConverter; import org.apache.inlong.sort.formats.base.TableFormatUtils; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvUtils.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvUtils.java index 19c77fca7d..8523ff544d 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvUtils.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvUtils.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializerTest.java index 664e8de31c..8d44ae4dd6 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializerTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializerTest.java @@ -18,11 +18,11 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; import org.apache.inlong.common.msg.InLongMsg; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactoryTest.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactoryTest.java index 33aed19033..4660c76ef4 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactoryTest.java @@ -17,14 +17,14 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatUtils; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializer.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializer.java index 2b8ad4c07c..dee2a5b791 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializer.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.formats.inlongmsgtlogkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters.FieldToRowDataConverter; import org.apache.inlong.sort.formats.base.TableFormatUtils; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvUtils.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvUtils.java index 4ec1a4d149..7e5dc6f864 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvUtils.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvUtils.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.inlongmsgtlogkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters.FieldToRowDataConverter; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializerTest.java index e797a9774f..f8b4c9c519 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializerTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializerTest.java @@ -18,11 +18,11 @@ package org.apache.inlong.sort.formats.inlongmsgtlogkv; import org.apache.inlong.common.msg.InLongMsg; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatForRowDataUtils.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatForRowDataUtils.java index 2f3567e4ae..358045c283 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatForRowDataUtils.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatForRowDataUtils.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.base; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.flink.table.types.DataType; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java index 39126370a7..22e5b5cb9e 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java @@ -17,16 +17,16 @@ package org.apache.inlong.sort.formats.base; -import org.apache.inlong.sort.formats.common.ArrayTypeInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.IntTypeInfo; -import org.apache.inlong.sort.formats.common.LongTypeInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.StringTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringTypeInfo; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.catalog.Column; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java index e55f5c3924..9ec4f83677 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.csv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatForRowDataUtils; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.flink.api.common.serialization.DeserializationSchema; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvRowDataDeserializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvRowDataDeserializationSchema.java index 4541d0d555..2a7182e39b 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvRowDataDeserializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvRowDataDeserializationSchema.java @@ -17,12 +17,12 @@ package org.apache.inlong.sort.formats.csv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultDeserializationSchema; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters.FieldToRowDataConverter; import org.apache.inlong.sort.formats.base.TableFormatUtils; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvRowDataSerializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvRowDataSerializationSchema.java index 9842e3cc98..227e1dadd1 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvRowDataSerializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvRowDataSerializationSchema.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.formats.csv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultSerializationSchema; import org.apache.inlong.sort.formats.base.RowDataToFieldConverters; import org.apache.inlong.sort.formats.base.TableFormatForRowDataUtils; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java index 8ce9024c2a..c8611d00e8 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java @@ -17,12 +17,12 @@ package org.apache.inlong.sort.formats.csv; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatUtils; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvRowDataDeserializationSchemaTest.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvRowDataDeserializationSchemaTest.java index d804bc6fa9..a02cb198e8 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvRowDataDeserializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvRowDataDeserializationSchemaTest.java @@ -17,22 +17,22 @@ package org.apache.inlong.sort.formats.csv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatUtils; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.DataTypes; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvRowDataSerializationSchemaTest.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvRowDataSerializationSchemaTest.java index d97a8a8fe7..612b40e290 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvRowDataSerializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvRowDataSerializationSchemaTest.java @@ -17,21 +17,21 @@ package org.apache.inlong.sort.formats.csv; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.DataTypes; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/main/java/org/apache/inlong/sort/formats/json/JsonRowDeserializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/main/java/org/apache/inlong/sort/formats/json/JsonRowDeserializationSchema.java index d499886389..55e919d4fc 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/main/java/org/apache/inlong/sort/formats/json/JsonRowDeserializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/main/java/org/apache/inlong/sort/formats/json/JsonRowDeserializationSchema.java @@ -17,13 +17,13 @@ package org.apache.inlong.sort.formats.json; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatUtils; -import org.apache.inlong.sort.formats.common.ArrayFormatInfo; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/main/java/org/apache/inlong/sort/formats/json/JsonRowSerializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/main/java/org/apache/inlong/sort/formats/json/JsonRowSerializationSchema.java index 61a6aca1ac..828d186d51 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/main/java/org/apache/inlong/sort/formats/json/JsonRowSerializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/main/java/org/apache/inlong/sort/formats/json/JsonRowSerializationSchema.java @@ -17,19 +17,19 @@ package org.apache.inlong.sort.formats.json; -import org.apache.inlong.sort.formats.common.ArrayFormatInfo; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; import org.apache.flink.api.common.serialization.SerializationSchema; import org.apache.flink.configuration.Configuration; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/test/java/org/apache/inlong/sort/formats/json/JsonRowDeserializationSchemaTest.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/test/java/org/apache/inlong/sort/formats/json/JsonRowDeserializationSchemaTest.java index 033bac3f07..6e3688a4c0 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/test/java/org/apache/inlong/sort/formats/json/JsonRowDeserializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/test/java/org/apache/inlong/sort/formats/json/JsonRowDeserializationSchemaTest.java @@ -17,22 +17,22 @@ package org.apache.inlong.sort.formats.json; -import org.apache.inlong.sort.formats.common.ArrayFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.configuration.Configuration; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/test/java/org/apache/inlong/sort/formats/json/JsonRowSerializationSchemaTest.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/test/java/org/apache/inlong/sort/formats/json/JsonRowSerializationSchemaTest.java index 7fc3557c2e..82ff1810ce 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/test/java/org/apache/inlong/sort/formats/json/JsonRowSerializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/test/java/org/apache/inlong/sort/formats/json/JsonRowSerializationSchemaTest.java @@ -17,22 +17,22 @@ package org.apache.inlong.sort.formats.json; -import org.apache.inlong.sort.formats.common.ArrayFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java index 7f42e43b6a..fb603dac29 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.table.descriptors.DescriptorProperties; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java index dff4adff04..b9ca0d9599 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatForRowDataUtils; import org.apache.inlong.sort.formats.base.TableFormatOptions; import org.apache.inlong.sort.formats.base.TextFormatOptions; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.flink.api.common.serialization.DeserializationSchema; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvRowDataDeserializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvRowDataDeserializationSchema.java index 033a51135e..0f4e2b4a63 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvRowDataDeserializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvRowDataDeserializationSchema.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultDeserializationSchema; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; import org.apache.inlong.sort.formats.base.TableFormatForRowDataUtils; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.data.GenericRowData; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvRowDataSerializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvRowDataSerializationSchema.java index 2b684bbe7f..c79960639e 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvRowDataSerializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvRowDataSerializationSchema.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultSerializationSchema; import org.apache.inlong.sort.formats.base.RowDataToFieldConverters; import org.apache.inlong.sort.formats.base.TableFormatForRowDataUtils; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.table.data.RowData; import org.slf4j.Logger; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java index 13bc3a2c5f..2e58a4bb4e 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java @@ -17,15 +17,15 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatUtils; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatConstants; import org.apache.inlong.sort.formats.base.TableFormatOptions; import org.apache.inlong.sort.formats.base.TableFormatUtils; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvRowDataDeserializationSchemaTest.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvRowDataDeserializationSchemaTest.java index bcc0dc3911..8c467dc34d 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvRowDataDeserializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvRowDataDeserializationSchemaTest.java @@ -17,22 +17,22 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatUtils; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.data.DecimalData; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvRowDataSerializationSchemaTest.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvRowDataSerializationSchemaTest.java index 02616b61a9..9e0ced94a5 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvRowDataSerializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvRowDataSerializationSchemaTest.java @@ -17,21 +17,21 @@ package org.apache.inlong.sort.formats.kv; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData;