You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by ki...@apache.org on 2022/02/15 06:21:20 UTC
[incubator-seatunnel] branch dev updated: [Bug] [utils] Should ensure that utility classes are not available to be extended (#1244)
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new 99a24d4 [Bug] [utils] Should ensure that utility classes are not available to be extended (#1244)
99a24d4 is described below
commit 99a24d479b843a940bc60b07b308457f8482ed84
Author: Benedict Jin <as...@apache.org>
AuthorDate: Tue Feb 15 14:21:08 2022 +0800
[Bug] [utils] Should ensure that utility classes are not available to be extended (#1244)
---
.../main/java/org/apache/seatunnel/flink/util/EnvironmentUtil.java | 5 ++++-
.../src/main/java/org/apache/seatunnel/flink/util/SchemaUtil.java | 5 ++++-
.../src/main/java/org/apache/seatunnel/flink/util/TableUtil.java | 5 ++++-
.../java/org/apache/seatunnel/spark/utils/SparkStructTypeUtil.java | 5 ++++-
.../src/main/java/org/apache/seatunnel/common/PropertiesUtil.java | 5 ++++-
.../java/org/apache/seatunnel/common/config/CheckConfigUtil.java | 5 ++++-
.../java/org/apache/seatunnel/common/config/TypesafeConfigUtils.java | 5 ++++-
.../main/java/org/apache/seatunnel/common/utils/StringTemplate.java | 5 ++++-
.../src/test/java/org/apache/seatunnel/config/utils/FileUtils.java | 5 ++++-
.../java/org/apache/seatunnel/config/command/CommandLineUtils.java | 5 ++++-
.../src/main/java/org/apache/seatunnel/utils/AsciiArtUtils.java | 5 ++++-
.../src/main/java/org/apache/seatunnel/utils/CompressionUtils.java | 5 ++++-
12 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel/flink/util/EnvironmentUtil.java b/seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel/flink/util/EnvironmentUtil.java
index dadaa6a..e23e26f 100644
--- a/seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel/flink/util/EnvironmentUtil.java
+++ b/seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel/flink/util/EnvironmentUtil.java
@@ -29,10 +29,13 @@ import org.slf4j.LoggerFactory;
import java.util.concurrent.TimeUnit;
-public class EnvironmentUtil {
+public final class EnvironmentUtil {
private static final Logger LOGGER = LoggerFactory.getLogger(EnvironmentUtil.class);
+ private EnvironmentUtil() {
+ }
+
public static void setRestartStrategy(Config config, ExecutionConfig executionConfig) {
try {
if (config.hasPath(ConfigKeyName.RESTART_STRATEGY)) {
diff --git a/seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel/flink/util/SchemaUtil.java b/seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel/flink/util/SchemaUtil.java
index b8788f3..cd23aaa 100644
--- a/seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel/flink/util/SchemaUtil.java
+++ b/seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel/flink/util/SchemaUtil.java
@@ -44,7 +44,10 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-public class SchemaUtil {
+public final class SchemaUtil {
+
+ private SchemaUtil() {
+ }
public static void setSchema(Schema schema, Object info, String format) {
diff --git a/seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel/flink/util/TableUtil.java b/seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel/flink/util/TableUtil.java
index 06878d0..a615ec9 100644
--- a/seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel/flink/util/TableUtil.java
+++ b/seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel/flink/util/TableUtil.java
@@ -28,7 +28,10 @@ import org.apache.flink.table.catalog.Catalog;
import org.apache.flink.table.catalog.ObjectPath;
import org.apache.flink.types.Row;
-public class TableUtil {
+public final class TableUtil {
+
+ private TableUtil() {
+ }
public static DataStream<Row> tableToDataStream(StreamTableEnvironment tableEnvironment, Table table, boolean isAppend) {
diff --git a/seatunnel-apis/seatunnel-api-spark/src/main/java/org/apache/seatunnel/spark/utils/SparkStructTypeUtil.java b/seatunnel-apis/seatunnel-api-spark/src/main/java/org/apache/seatunnel/spark/utils/SparkStructTypeUtil.java
index f4be5f7..a95193f 100644
--- a/seatunnel-apis/seatunnel-api-spark/src/main/java/org/apache/seatunnel/spark/utils/SparkStructTypeUtil.java
+++ b/seatunnel-apis/seatunnel-api-spark/src/main/java/org/apache/seatunnel/spark/utils/SparkStructTypeUtil.java
@@ -27,7 +27,10 @@ import org.apache.spark.sql.types.StructType;
import java.util.List;
import java.util.Map;
-public class SparkStructTypeUtil {
+public final class SparkStructTypeUtil {
+
+ private SparkStructTypeUtil() {
+ }
public static StructType getStructType(StructType schema, JSONObject json) {
StructType newSchema = schema.copy(schema.fields());
diff --git a/seatunnel-common/src/main/java/org/apache/seatunnel/common/PropertiesUtil.java b/seatunnel-common/src/main/java/org/apache/seatunnel/common/PropertiesUtil.java
index 25b242e..e9052bf 100644
--- a/seatunnel-common/src/main/java/org/apache/seatunnel/common/PropertiesUtil.java
+++ b/seatunnel-common/src/main/java/org/apache/seatunnel/common/PropertiesUtil.java
@@ -21,7 +21,10 @@ import org.apache.seatunnel.shade.com.typesafe.config.Config;
import java.util.Properties;
-public class PropertiesUtil {
+public final class PropertiesUtil {
+
+ private PropertiesUtil() {
+ }
public static void setProperties(Config config, Properties properties, String prefix, boolean keepPrefix) {
config.entrySet().forEach(entry -> {
diff --git a/seatunnel-common/src/main/java/org/apache/seatunnel/common/config/CheckConfigUtil.java b/seatunnel-common/src/main/java/org/apache/seatunnel/common/config/CheckConfigUtil.java
index 4432276..1202cc4 100644
--- a/seatunnel-common/src/main/java/org/apache/seatunnel/common/config/CheckConfigUtil.java
+++ b/seatunnel-common/src/main/java/org/apache/seatunnel/common/config/CheckConfigUtil.java
@@ -24,7 +24,10 @@ import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;
-public class CheckConfigUtil {
+public final class CheckConfigUtil {
+
+ private CheckConfigUtil() {
+ }
/**
* please using {@link #checkAllExists} instead, since 2.0.5
diff --git a/seatunnel-common/src/main/java/org/apache/seatunnel/common/config/TypesafeConfigUtils.java b/seatunnel-common/src/main/java/org/apache/seatunnel/common/config/TypesafeConfigUtils.java
index 0fe1216..ef4ec5e 100644
--- a/seatunnel-common/src/main/java/org/apache/seatunnel/common/config/TypesafeConfigUtils.java
+++ b/seatunnel-common/src/main/java/org/apache/seatunnel/common/config/TypesafeConfigUtils.java
@@ -24,7 +24,10 @@ import org.apache.seatunnel.shade.com.typesafe.config.ConfigValue;
import java.util.LinkedHashMap;
import java.util.Map;
-public class TypesafeConfigUtils {
+public final class TypesafeConfigUtils {
+
+ private TypesafeConfigUtils() {
+ }
/**
* Extract sub config with fixed prefix
diff --git a/seatunnel-common/src/main/java/org/apache/seatunnel/common/utils/StringTemplate.java b/seatunnel-common/src/main/java/org/apache/seatunnel/common/utils/StringTemplate.java
index a030d82..f8bb912 100644
--- a/seatunnel-common/src/main/java/org/apache/seatunnel/common/utils/StringTemplate.java
+++ b/seatunnel-common/src/main/java/org/apache/seatunnel/common/utils/StringTemplate.java
@@ -25,7 +25,10 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-public class StringTemplate {
+public final class StringTemplate {
+
+ private StringTemplate() {
+ }
/**
* @param str raw string
diff --git a/seatunnel-config/seatunnel-config-shade/src/test/java/org/apache/seatunnel/config/utils/FileUtils.java b/seatunnel-config/seatunnel-config-shade/src/test/java/org/apache/seatunnel/config/utils/FileUtils.java
index 6a251f9..c106494 100644
--- a/seatunnel-config/seatunnel-config-shade/src/test/java/org/apache/seatunnel/config/utils/FileUtils.java
+++ b/seatunnel-config/seatunnel-config-shade/src/test/java/org/apache/seatunnel/config/utils/FileUtils.java
@@ -20,7 +20,10 @@ package org.apache.seatunnel.config.utils;
import java.io.File;
import java.net.URL;
-public class FileUtils {
+public final class FileUtils {
+
+ private FileUtils() {
+ }
// get file from classpath, resources folder
public static File getFileFromResources(String fileName) {
diff --git a/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/config/command/CommandLineUtils.java b/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/config/command/CommandLineUtils.java
index e6e0d5f..0dab928 100644
--- a/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/config/command/CommandLineUtils.java
+++ b/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/config/command/CommandLineUtils.java
@@ -19,7 +19,10 @@ package org.apache.seatunnel.config.command;
import com.beust.jcommander.JCommander;
-public class CommandLineUtils {
+public final class CommandLineUtils {
+
+ private CommandLineUtils() {
+ }
public static CommandLineArgs parseSparkArgs(String[] args) {
CommandSparkArgs commandSparkArgs = new CommandSparkArgs();
diff --git a/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/utils/AsciiArtUtils.java b/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/utils/AsciiArtUtils.java
index 1ba7d59..67305c0 100644
--- a/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/utils/AsciiArtUtils.java
+++ b/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/utils/AsciiArtUtils.java
@@ -26,7 +26,7 @@ import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.image.BufferedImage;
-public class AsciiArtUtils {
+public final class AsciiArtUtils {
private static final Logger LOGGER = LoggerFactory.getLogger(AsciiArtUtils.class);
@@ -34,6 +34,9 @@ public class AsciiArtUtils {
private static final int DRAW_X = 6;
private static final int RGB = -16777216;
+ private AsciiArtUtils() {
+ }
+
/**
* Print ASCII art of string
*
diff --git a/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/utils/CompressionUtils.java b/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/utils/CompressionUtils.java
index c86afdb..a4fd1e9 100644
--- a/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/utils/CompressionUtils.java
+++ b/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/utils/CompressionUtils.java
@@ -36,10 +36,13 @@ import java.util.LinkedList;
import java.util.List;
import java.util.zip.GZIPInputStream;
-public class CompressionUtils {
+public final class CompressionUtils {
private static final Logger LOGGER = LoggerFactory.getLogger(CompressionUtils.class);
+ private CompressionUtils() {
+ }
+
/**
* Untar an input file into an output file.
* <p>