add annotation @public and upgrade version to 3.5.0

maven-tpi-plugin/pom.xml

@@ -22,7 +22,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

pom.xml

@@ -31,7 +31,7 @@
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
  <!--https://maven.apache.org/maven-ci-friendly.html-->
- <version>3.4.0</version>
+ <version>3.5.0</version>
  <packaging>pom</packaging>
  <name>tis</name>
  <url>https://maven.apache.org</url>

setversion.sh

@@ -1 +1 @@
-mvn versions:set -DnewVersion=3.4.0 -DprocessDependencies=true -DgenerateBackupPoms=false
+mvn versions:set -DnewVersion=3.5.0 -DprocessDependencies=true -DgenerateBackupPoms=false

tis-assemble/pom.xml

@@ -24,7 +24,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

tis-base-test/pom.xml

@@ -23,7 +23,7 @@
  <parent>
  <artifactId>tis</artifactId>
  <groupId>com.qlangtech.tis</groupId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

tis-builder-api/pom.xml

@@ -23,7 +23,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

tis-builder-api/src/main/java/com/qlangtech/tis/annotation/Public.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
+ *
+ * https://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 com.qlangtech.tis.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation for marking classes as public, stable interfaces.
+ *
+ * <p>Classes, methods and fields with this annotation are stable across minor releases (1.0, 1.1,
+ * 1.2). In other words, applications using @Public annotated classes will compile against newer
+ * versions of the same major release.
+ *
+ * <p>Only major releases (1.0, 2.0, 3.0) can break interfaces with this annotation.
+ */
+@Documented
+@Target(ElementType.TYPE)
+@Public
+public @interface Public {
+}

tis-collection-info-collect/pom.xml

@@ -22,7 +22,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
  <artifactId>tis-collection-info-collect</artifactId>

tis-common-dao/pom.xml

@@ -23,7 +23,7 @@
  <parent>
  <artifactId>tis</artifactId>
  <groupId>com.qlangtech.tis</groupId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

tis-common/pom.xml

@@ -22,7 +22,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
  <groupId>com.qlangtech.tis</groupId>

tis-console/pom.xml

@@ -23,7 +23,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

tis-dag/pom.xml

@@ -23,7 +23,7 @@
  <parent>
  <artifactId>tis</artifactId>
  <groupId>com.qlangtech.tis</groupId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

tis-datax-executor/pom.xml

@@ -23,7 +23,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>

tis-hadoop-rpc/pom.xml

@@ -23,7 +23,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

tis-manage-pojo/pom.xml

@@ -22,7 +22,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

tis-plugin-sezpoz/pom.xml

@@ -23,7 +23,7 @@
  <parent>
  <artifactId>tis</artifactId>
  <groupId>com.qlangtech.tis</groupId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

tis-plugin-sezpoz/src/main/java/com/qlangtech/tis/extension/TISExtensible.java

@@ -25,6 +25,7 @@
  * @author 百岁（[email protected]）
  * @date 2020/04/13
  */
+
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.CLASS)
 @Documented

tis-plugin/pom.xml

@@ -22,7 +22,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

tis-plugin/src/main/java/com/qlangtech/tis/async/message/client/consumer/IConsumerHandle.java

@@ -1,19 +1,19 @@
 /**
- *  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
- *
- *  https://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.
+ * 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
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 com.qlangtech.tis.async.message.client.consumer;
 
@@ -24,12 +24,12 @@
  * @author 百岁（[email protected]）
  * @date 2020/04/13
  */
-public interface IConsumerHandle<SOURCE> {
+public interface IConsumerHandle<SOURCE,FLINK_RESULT> {
 
  /**
  * 处理消息Handle，业务逻辑在此处理
  *
  * @param asyncMsg
  */
- void consume(TargetResName dataxName, AsyncMsg<SOURCE> asyncMsg, IDataxProcessor dataXProcessor) throws Exception;
+ FLINK_RESULT consume(TargetResName dataxName, AsyncMsg<SOURCE> asyncMsg, IDataxProcessor dataXProcessor) throws Exception;
 }

tis-plugin/src/main/java/com/qlangtech/tis/async/message/client/consumer/IMQListener.java

@@ -1,19 +1,19 @@
 /**
- *  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
- *
- *  https://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.
+ * 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
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 com.qlangtech.tis.async.message.client.consumer;
 
@@ -28,7 +28,7 @@
  * @author 百岁（[email protected]）
  * @date 2020/04/13
  */
-public interface IMQListener {
+public interface IMQListener<FLINK_RESULT> {
 
  String getTopic();
 
@@ -39,5 +39,5 @@ public interface IMQListener {
  /**
  * Listener启动
  */
- void start(TargetResName dataxName, IDataxReader rdbmsReader, List<ISelectedTab> tabs, IDataxProcessor dataXProcessor) throws MQConsumeException;
+ FLINK_RESULT start(TargetResName dataxName, IDataxReader rdbmsReader, List<ISelectedTab> tabs, IDataxProcessor dataXProcessor) throws MQConsumeException;
 }

tis-plugin/src/main/java/com/qlangtech/tis/async/message/client/consumer/impl/AbstractAsyncMsgDeserialize.java

@@ -18,6 +18,7 @@
 package com.qlangtech.tis.async.message.client.consumer.impl;
 
 import com.qlangtech.tis.TIS;
+import com.qlangtech.tis.annotation.Public;
 import com.qlangtech.tis.async.message.client.consumer.IAsyncMsgDeserialize;
 import com.qlangtech.tis.extension.Describable;
 import com.qlangtech.tis.extension.Descriptor;
@@ -26,6 +27,7 @@
  * @author 百岁（[email protected]）
  * @date 2020/04/13
  */
+@Public
 public abstract class AbstractAsyncMsgDeserialize implements IAsyncMsgDeserialize, Describable<AbstractAsyncMsgDeserialize> {
 
  // public abstract String getName();

tis-plugin/src/main/java/com/qlangtech/tis/async/message/client/consumer/impl/AbstractConsumerHandle.java

@@ -1,19 +1,19 @@
 /**
- *  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
- *
- *  https://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.
+ * 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
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 com.qlangtech.tis.async.message.client.consumer.impl;
 
@@ -26,7 +26,7 @@
  * @author 百岁（[email protected]）
  * @date 2020/04/13
  */
-public abstract class AbstractConsumerHandle<SOURCE> implements IConsumerHandle<SOURCE> {
+public abstract class AbstractConsumerHandle<SOURCE, FLINK_RESULT> implements IConsumerHandle<SOURCE, FLINK_RESULT> {
 
  public abstract String getName();
 

tis-plugin/src/main/java/com/qlangtech/tis/async/message/client/consumer/impl/MQListenerFactory.java

@@ -18,6 +18,7 @@
 package com.qlangtech.tis.async.message.client.consumer.impl;
 
 import com.qlangtech.tis.TIS;
+import com.qlangtech.tis.annotation.Public;
 import com.qlangtech.tis.async.message.client.consumer.IConsumerHandle;
 import com.qlangtech.tis.async.message.client.consumer.IMQConsumerStatusFactory;
 import com.qlangtech.tis.async.message.client.consumer.IMQListenerFactory;
@@ -35,6 +36,7 @@
  * @author 百岁（[email protected]）
  * @date 2020/04/13
  */
+@Public
 public abstract class MQListenerFactory implements IMQListenerFactory, IMQConsumerStatusFactory, Describable<MQListenerFactory> {
 
  @Override

tis-plugin/src/main/java/com/qlangtech/tis/config/ParamsConfig.java

@@ -19,6 +19,7 @@
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.qlangtech.tis.TIS;
+import com.qlangtech.tis.annotation.Public;
 import com.qlangtech.tis.extension.Describable;
 import com.qlangtech.tis.extension.Descriptor;
 import com.qlangtech.tis.plugin.IPluginStore;
@@ -33,6 +34,7 @@
  * @author 百岁（[email protected]）
  * @date 2020/04/13
  */
+@Public
 public abstract class ParamsConfig implements Describable<ParamsConfig>, IdentityName {
  public static final String CONTEXT_PARAMS_CFG = "params-cfg";
 

tis-plugin/src/main/java/com/qlangtech/tis/datax/DataXJobSubmit.java

@@ -20,6 +20,7 @@
 
 import com.alibaba.citrus.turbine.Context;
 import com.qlangtech.tis.TIS;
+import com.qlangtech.tis.annotation.Public;
 import com.qlangtech.tis.datax.job.DataXJobWorker;
 import com.qlangtech.tis.extension.ExtensionList;
 import com.qlangtech.tis.extension.TISExtensible;
@@ -39,6 +40,7 @@
  * @create: 2021-04-27 17:03
  **/
 @TISExtensible
+@Public
 public abstract class DataXJobSubmit {
 
  public static final int MAX_TABS_NUM_IN_PER_JOB = 40;