This is an automated email from the ASF dual-hosted git repository.
wenjun pushed a commit to branch api-draft
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/api-draft by this push:
new 34b37aa3 [Api-Draft] Remove useless code. (#1932)
34b37aa3 is described below
commit 34b37aa3c549ca20294dcfffe7c7d35c5dcb498a
Author: TrickyZerg <[email protected]>
AuthorDate: Sat May 21 13:31:12 2022 +0800
[Api-Draft] Remove useless code. (#1932)
---
.../api/serialization/DefaultSerializer.java | 5 ++---
.../seatunnel/api/source/SeaTunnelSource.java | 5 ++++-
.../apache/seatunnel/api/source/SourceSplit.java | 4 +++-
.../java/org/apache/seatunnel/api/state/State.java | 23 ----------------------
.../seatunnel/console/state/ConsoleState.java | 4 ++--
.../seatunnel/fake/source/FakeSource.java | 5 -----
.../seatunnel/fake/source/FakeSourceSplit.java | 4 +---
.../connectors/seatunnel/fake/state/FakeState.java | 4 ++--
.../execution/AbstractPluginExecuteProcessor.java | 4 ++--
9 files changed, 16 insertions(+), 42 deletions(-)
diff --git
a/seatunnel-api/src/main/java/org/apache/seatunnel/api/serialization/DefaultSerializer.java
b/seatunnel-api/src/main/java/org/apache/seatunnel/api/serialization/DefaultSerializer.java
index 1705d6f7..2100b952 100644
---
a/seatunnel-api/src/main/java/org/apache/seatunnel/api/serialization/DefaultSerializer.java
+++
b/seatunnel-api/src/main/java/org/apache/seatunnel/api/serialization/DefaultSerializer.java
@@ -20,17 +20,16 @@ package org.apache.seatunnel.api.serialization;
import org.apache.seatunnel.common.utils.SerializationUtils;
import java.io.IOException;
-import java.io.InvalidClassException;
import java.io.Serializable;
public class DefaultSerializer<T extends Serializable> implements
Serializer<T> {
@Override
public byte[] serialize(T obj) throws IOException {
- if (obj instanceof Serializable) {
+ if (obj != null) {
return SerializationUtils.serialize((Serializable) obj);
} else {
- throw new InvalidClassException(obj.getClass() + " must implement
java.io.Serializable interface");
+ return null;
}
}
diff --git
a/seatunnel-api/src/main/java/org/apache/seatunnel/api/source/SeaTunnelSource.java
b/seatunnel-api/src/main/java/org/apache/seatunnel/api/source/SeaTunnelSource.java
index a246425a..025c1a45 100644
---
a/seatunnel-api/src/main/java/org/apache/seatunnel/api/source/SeaTunnelSource.java
+++
b/seatunnel-api/src/main/java/org/apache/seatunnel/api/source/SeaTunnelSource.java
@@ -19,6 +19,7 @@ package org.apache.seatunnel.api.source;
import org.apache.seatunnel.api.common.PluginIdentifierInterface;
import org.apache.seatunnel.api.common.SeaTunnelPluginLifeCycle;
+import org.apache.seatunnel.api.serialization.DefaultSerializer;
import org.apache.seatunnel.api.serialization.Serializer;
import org.apache.seatunnel.api.table.type.SeaTunnelRowTypeInfo;
import org.apache.seatunnel.common.constants.JobMode;
@@ -67,7 +68,9 @@ public interface SeaTunnelSource<T, SplitT extends
SourceSplit, StateT>
*
* @return split serializer.
*/
- Serializer<SplitT> getSplitSerializer();
+ default Serializer<SplitT> getSplitSerializer() {
+ return new DefaultSerializer<>();
+ }
/**
* Create source split enumerator, used to generate splits. This method
will be called only once when start a source.
diff --git
a/seatunnel-api/src/main/java/org/apache/seatunnel/api/source/SourceSplit.java
b/seatunnel-api/src/main/java/org/apache/seatunnel/api/source/SourceSplit.java
index af6e1acf..a4ccfdbf 100644
---
a/seatunnel-api/src/main/java/org/apache/seatunnel/api/source/SourceSplit.java
+++
b/seatunnel-api/src/main/java/org/apache/seatunnel/api/source/SourceSplit.java
@@ -17,10 +17,12 @@
package org.apache.seatunnel.api.source;
+import java.io.Serializable;
+
/**
* An interface for all the Split types to extend.
*/
-public interface SourceSplit {
+public interface SourceSplit extends Serializable {
/**
* Get the split id of this source split.
diff --git
a/seatunnel-api/src/main/java/org/apache/seatunnel/api/state/State.java
b/seatunnel-api/src/main/java/org/apache/seatunnel/api/state/State.java
deleted file mode 100644
index 4384100b..00000000
--- a/seatunnel-api/src/main/java/org/apache/seatunnel/api/state/State.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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.seatunnel.api.state;
-
-import java.io.Serializable;
-
-public interface State extends Serializable {
-}
diff --git
a/seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connectors-seatunnel-console/src/main/java/org/apache/seatunnel/connectors/seatunnel/console/state/ConsoleState.java
b/seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connectors-seatunnel-console/src/main/java/org/apache/seatunnel/connectors/seatunnel/console/state/ConsoleState.java
index b2abaeff..3eda1f4c 100644
---
a/seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connectors-seatunnel-console/src/main/java/org/apache/seatunnel/connectors/seatunnel/console/state/ConsoleState.java
+++
b/seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connectors-seatunnel-console/src/main/java/org/apache/seatunnel/connectors/seatunnel/console/state/ConsoleState.java
@@ -17,8 +17,8 @@
package org.apache.seatunnel.connectors.seatunnel.console.state;
-import org.apache.seatunnel.api.state.State;
+import java.io.Serializable;
-public class ConsoleState implements State {
+public class ConsoleState implements Serializable {
}
diff --git
a/seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connectors-seatunnel-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeSource.java
b/seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connectors-seatunnel-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeSource.java
index 64585430..3c41ff45 100644
---
a/seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connectors-seatunnel-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeSource.java
+++
b/seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connectors-seatunnel-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeSource.java
@@ -49,11 +49,6 @@ public class FakeSource implements
SeaTunnelSource<SeaTunnelRow, FakeSourceSplit
return new FakeSourceReader(readerContext);
}
- @Override
- public Serializer<FakeSourceSplit> getSplitSerializer() {
- return new DefaultSerializer<>();
- }
-
@Override
public SourceSplitEnumerator<FakeSourceSplit, FakeState> createEnumerator(
SourceSplitEnumerator.Context<FakeSourceSplit> enumeratorContext) {
diff --git
a/seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connectors-seatunnel-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeSourceSplit.java
b/seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connectors-seatunnel-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeSourceSplit.java
index 05e85061..7276516f 100644
---
a/seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connectors-seatunnel-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeSourceSplit.java
+++
b/seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connectors-seatunnel-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeSourceSplit.java
@@ -19,9 +19,7 @@ package org.apache.seatunnel.connectors.seatunnel.fake.source;
import org.apache.seatunnel.api.source.SourceSplit;
-import java.io.Serializable;
-
-public class FakeSourceSplit implements SourceSplit, Serializable {
+public class FakeSourceSplit implements SourceSplit {
private static final long serialVersionUID = -1L;
diff --git
a/seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connectors-seatunnel-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/state/FakeState.java
b/seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connectors-seatunnel-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/state/FakeState.java
index a920f830..0c0edecd 100644
---
a/seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connectors-seatunnel-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/state/FakeState.java
+++
b/seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connectors-seatunnel-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/state/FakeState.java
@@ -17,7 +17,7 @@
package org.apache.seatunnel.connectors.seatunnel.fake.state;
-import org.apache.seatunnel.api.state.State;
+import java.io.Serializable;
-public class FakeState implements State {
+public class FakeState implements Serializable {
}
diff --git
a/seatunnel-core/seatunnel-core-spark/src/main/java/org/apache/seatunnel/core/spark/execution/AbstractPluginExecuteProcessor.java
b/seatunnel-core/seatunnel-core-spark/src/main/java/org/apache/seatunnel/core/spark/execution/AbstractPluginExecuteProcessor.java
index eb871aae..2d222eb4 100644
---
a/seatunnel-core/seatunnel-core-spark/src/main/java/org/apache/seatunnel/core/spark/execution/AbstractPluginExecuteProcessor.java
+++
b/seatunnel-core/seatunnel-core-spark/src/main/java/org/apache/seatunnel/core/spark/execution/AbstractPluginExecuteProcessor.java
@@ -38,9 +38,9 @@ public abstract class AbstractPluginExecuteProcessor<T>
implements PluginExecute
protected static final String ENGINE_TYPE = "seatunnel";
protected static final String PLUGIN_NAME = "plugin_name";
- protected AbstractPluginExecuteProcessor(SparkEnvironment flinkEnvironment,
+ protected AbstractPluginExecuteProcessor(SparkEnvironment sparkEnvironment,
List<? extends Config>
pluginConfigs) {
- this.sparkEnvironment = flinkEnvironment;
+ this.sparkEnvironment = sparkEnvironment;
this.pluginConfigs = pluginConfigs;
this.plugins = initializePlugins(pluginConfigs);
}
