You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by be...@apache.org on 2022/09/25 13:30:39 UTC
[incubator-streampark] branch dev updated: [polish] polish code. (#1674)
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 745422202 [polish] polish code. (#1674)
745422202 is described below
commit 74542220290a47208bb10d236e5d1bb36521748c
Author: gongzhongqiang <76...@qq.com>
AuthorDate: Sun Sep 25 21:30:32 2022 +0800
[polish] polish code. (#1674)
* [polish] polish code.
Co-authored-by: gongzhongqiang <go...@gigacloudtech.com>
---
.../streampark/console/base/util/CommonUtils.java | 40 +++++++++++-----------
.../streampark/console/base/util/EncryptUtils.java | 4 +--
.../streampark/console/base/util/GZipUtils.java | 4 +--
.../streampark/console/base/util/ObjectUtils.java | 2 +-
.../streampark/console/core/entity/FlameGraph.java | 2 +-
.../console/core/service/SqlCompleteService.java | 2 +-
.../service/impl/ApplicationBackUpServiceImpl.java | 2 +-
.../console/system/security/SecurityConfig.java | 2 +-
.../service/impl/AccessTokenServiceImpl.java | 5 +--
.../streampark/console/core/entity/GitTest.java | 2 +-
.../doris/bean/DorisSinkRowDataWithMeta.java | 2 +-
.../doris/internal/DorisSinkFunction.java | 6 ++--
.../connector/doris/internal/DorisSinkWriter.java | 6 ++--
.../connector/kafka/source/KafkaJavaSource.java | 2 +-
.../connector/mongo/source/MongoJavaSource.java | 2 +-
.../apache/streampark/plugin/profiling/Agent.java | 4 +--
.../streampark/plugin/profiling/AgentImpl.java | 4 +--
.../streampark/plugin/profiling/Arguments.java | 8 ++---
.../streampark/plugin/profiling/ProfilerGroup.java | 4 +--
.../plugin/profiling/ShutdownHookRunner.java | 6 ++--
.../profiling/example/HelloWorldApplication.java | 2 +-
.../profiler/MethodArgumentCollector.java | 2 +-
.../profiling/profiler/MethodArgumentProfiler.java | 2 +-
.../profiler/MethodDurationCollector.java | 2 +-
.../profiling/profiler/MethodDurationProfiler.java | 2 +-
.../profiler/StacktraceCollectorProfiler.java | 4 +--
.../profiler/StacktraceReporterProfiler.java | 2 +-
.../transformer/JavaAgentFileTransformer.java | 4 +--
.../transformer/MethodProfilerStaticProxy.java | 2 +-
.../plugin/profiling/util/ClassAndMethod.java | 13 +++----
.../profiling/util/ClassAndMethodMetricKey.java | 17 +++------
.../plugin/profiling/util/ClassMethodArgument.java | 17 +++------
.../util/ExponentialBackoffRetryPolicy.java | 2 +-
.../plugin/profiling/util/Histogram.java | 8 ++---
.../plugin/profiling/util/NoopConfigProvider.java | 4 +--
.../plugin/profiling/util/Stacktrace.java | 15 ++------
.../profiling/util/StacktraceMetricBuffer.java | 2 +-
.../plugin/profiling/util/StringUtils.java | 4 +--
.../streampark/plugin/profiling/ArgumentsTest.java | 27 ++++++++-------
.../plugin/profiling/YamlConfigProviderTest.java | 15 ++++----
.../profiler/ProcessInfoProfilerTest.java | 12 +++----
.../profiling/util/ClassAndMethodFilterTest.java | 15 ++++----
.../util/ClassMethodArgumentFilterTest.java | 15 ++++----
.../plugin/profiling/util/ProcFileUtilsTest.java | 2 +-
.../plugin/profiling/util/SparkUtilsTest.java | 2 +-
.../plugin/profiling/util/StringUtilsTest.java | 18 +++++-----
.../storage/oss/OssStorageServiceTest.java | 2 +-
47 files changed, 142 insertions(+), 179 deletions(-)
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/CommonUtils.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/CommonUtils.java
index 1410d7fec..ac34de426 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/CommonUtils.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/CommonUtils.java
@@ -50,7 +50,7 @@ public final class CommonUtils implements Serializable {
private static final long serialVersionUID = 6458428317155311192L;
- private static String os = System.getProperty("os.name").toLowerCase();
+ private static final String OS = System.getProperty("os.name").toLowerCase();
/**
* is empty
@@ -279,7 +279,7 @@ public final class CommonUtils implements Serializable {
public static <E> Iterator<E> toIterator(Enumeration<E> enumeration) {
@SuppressWarnings("hiding")
class EnumerationIterator<E> implements Iterator<E> {
- private Enumeration<E> enumeration;
+ private final Enumeration<E> enumeration;
public EnumerationIterator(Enumeration<E> enumeration) {
this.enumeration = enumeration;
@@ -305,75 +305,75 @@ public final class CommonUtils implements Serializable {
}
public static String getOsName() {
- return os;
+ return OS;
}
public static boolean isLinux() {
- return os.indexOf("linux") >= 0;
+ return OS.indexOf("linux") >= 0;
}
public static boolean isMacOS() {
- return os.indexOf("mac") >= 0 && os.indexOf("os") > 0 && os.indexOf("x") < 0;
+ return OS.indexOf("mac") >= 0 && OS.indexOf("os") > 0 && OS.indexOf("x") < 0;
}
public static boolean isMacOSX() {
- return os.indexOf("mac") >= 0 && os.indexOf("os") > 0 && os.indexOf("x") > 0;
+ return OS.indexOf("mac") >= 0 && OS.indexOf("os") > 0 && OS.indexOf("x") > 0;
}
public static boolean isWindows() {
- return os.indexOf("windows") >= 0;
+ return OS.indexOf("windows") >= 0;
}
public static boolean isOS2() {
- return os.indexOf("os/2") >= 0;
+ return OS.indexOf("os/2") >= 0;
}
public static boolean isSolaris() {
- return os.indexOf("solaris") >= 0;
+ return OS.indexOf("solaris") >= 0;
}
public static boolean isSunOS() {
- return os.indexOf("sunos") >= 0;
+ return OS.indexOf("sunos") >= 0;
}
public static boolean isMPEiX() {
- return os.indexOf("mpe/ix") >= 0;
+ return OS.indexOf("mpe/ix") >= 0;
}
public static boolean isHPUX() {
- return os.indexOf("hp-ux") >= 0;
+ return OS.indexOf("hp-ux") >= 0;
}
public static boolean isAix() {
- return os.indexOf("aix") >= 0;
+ return OS.indexOf("aix") >= 0;
}
public static boolean isOS390() {
- return os.indexOf("os/390") >= 0;
+ return OS.indexOf("os/390") >= 0;
}
public static boolean isFreeBSD() {
- return os.indexOf("freebsd") >= 0;
+ return OS.indexOf("freebsd") >= 0;
}
public static boolean isIrix() {
- return os.indexOf("irix") >= 0;
+ return OS.indexOf("irix") >= 0;
}
public static boolean isDigitalUnix() {
- return os.indexOf("digital") >= 0 && os.indexOf("unix") > 0;
+ return OS.indexOf("digital") >= 0 && OS.indexOf("unix") > 0;
}
public static boolean isNetWare() {
- return os.indexOf("netware") >= 0;
+ return OS.indexOf("netware") >= 0;
}
public static boolean isOSF1() {
- return os.indexOf("osf1") >= 0;
+ return OS.indexOf("osf1") >= 0;
}
public static boolean isOpenVMS() {
- return os.indexOf("openvms") >= 0;
+ return OS.indexOf("openvms") >= 0;
}
public static boolean isUnix() {
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/EncryptUtils.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/EncryptUtils.java
index 89d351f68..d57884905 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/EncryptUtils.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/EncryptUtils.java
@@ -23,7 +23,7 @@ import java.security.Key;
public class EncryptUtils {
- private static String strDefaultKey = "defaultKey";
+ private static final String DEFAULT_KEY = "defaultKey";
private Cipher encryptCipher = null;
private Cipher decryptCipher = null;
@@ -56,7 +56,7 @@ public class EncryptUtils {
}
public EncryptUtils() throws Exception {
- this(strDefaultKey);
+ this(DEFAULT_KEY);
}
EncryptUtils(String strKey) throws Exception {
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/GZipUtils.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/GZipUtils.java
index 2f577449e..4ef03430c 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/GZipUtils.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/GZipUtils.java
@@ -48,7 +48,7 @@ public final class GZipUtils {
FileInputStream inputStream = new FileInputStream(tarZipSource);
BufferedInputStream bufInput = new BufferedInputStream(inputStream);
GZIPInputStream gzipInput = new GZIPInputStream(bufInput);
- ArchiveInputStream archiveInput = archiveStreamFactory.createArchiveInputStream("tar", gzipInput);) {
+ ArchiveInputStream archiveInput = archiveStreamFactory.createArchiveInputStream("tar", gzipInput)) {
TarArchiveEntry entry = (TarArchiveEntry) archiveInput.getNextEntry();
@@ -63,7 +63,7 @@ public final class GZipUtils {
} else if (entry.isFile()) {
String fullFileName = createDir(targetDir, entryName, 2);
try (FileOutputStream outputStream = new FileOutputStream(fullFileName);
- BufferedOutputStream bufOutput = new BufferedOutputStream(outputStream);) {
+ BufferedOutputStream bufOutput = new BufferedOutputStream(outputStream)) {
int b = -1;
while ((b = archiveInput.read()) != -1) {
bufOutput.write(b);
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/ObjectUtils.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/ObjectUtils.java
index 3b25dd29c..c36ee4d20 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/ObjectUtils.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/ObjectUtils.java
@@ -649,7 +649,7 @@ public final class ObjectUtils {
} else {
sb.append(ARRAY_ELEMENT_SEPARATOR);
}
- sb.append(String.valueOf(array[i]));
+ sb.append(array[i]);
}
sb.append(ARRAY_END);
return sb.toString();
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlameGraph.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlameGraph.java
index c1dca3b75..cc9f467c7 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlameGraph.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlameGraph.java
@@ -52,7 +52,7 @@ public class FlameGraph {
private transient Integer width = 1280;
- private static final transient Integer QUERY_DURATION = 60 * 4;
+ private static final Integer QUERY_DURATION = 60 * 4;
@JsonIgnore
public Date getStart() {
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SqlCompleteService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SqlCompleteService.java
index 6d3f13095..b925414a8 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SqlCompleteService.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SqlCompleteService.java
@@ -21,5 +21,5 @@ import java.util.List;
public interface SqlCompleteService {
- public List<String> getComplete(String sql);
+ List<String> getComplete(String sql);
}
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java
index 5e0e60775..79bafaa88 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java
@@ -72,7 +72,7 @@ public class ApplicationBackUpServiceImpl
@Autowired
private FlinkSqlService flinkSqlService;
- private ExecutorService executorService = new ThreadPoolExecutor(
+ private final ExecutorService executorService = new ThreadPoolExecutor(
Runtime.getRuntime().availableProcessors() * 5,
Runtime.getRuntime().availableProcessors() * 10,
60L,
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/SecurityConfig.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/SecurityConfig.java
index 68372525b..5a6aae275 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/SecurityConfig.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/SecurityConfig.java
@@ -36,7 +36,7 @@ public class SecurityConfig {
@Value("${security.authentication.type:PASSWORD}")
private String type;
- private AutowireCapableBeanFactory beanFactory;
+ private final AutowireCapableBeanFactory beanFactory;
private AuthenticationType authenticationType;
@Autowired
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
index 877de716f..dd81629de 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
@@ -99,10 +99,7 @@ public class AccessTokenServiceImpl extends ServiceImpl<AccessTokenMapper, Acces
@Override
public boolean checkTokenEffective(Long userId, String token) {
AccessToken res = baseMapper.getByUserToken(userId, token);
- if (Objects.isNull(res) || AccessToken.STATUS_DISABLE.equals(res.getFinalStatus())) {
- return false;
- }
- return true;
+ return res != null && AccessToken.STATUS_ENABLE.equals(res.getFinalStatus());
}
@Override
diff --git a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/entity/GitTest.java b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/entity/GitTest.java
index 06c48f5b5..faf1508c8 100644
--- a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/entity/GitTest.java
+++ b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/entity/GitTest.java
@@ -26,7 +26,7 @@ import java.util.List;
public class GitTest {
- private Project project = new Project();
+ private final Project project = new Project();
@Before
public void before() {
diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/bean/DorisSinkRowDataWithMeta.java b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/bean/DorisSinkRowDataWithMeta.java
index 17fc2805d..0bb236be8 100644
--- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/bean/DorisSinkRowDataWithMeta.java
+++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/bean/DorisSinkRowDataWithMeta.java
@@ -27,7 +27,7 @@ public class DorisSinkRowDataWithMeta implements Serializable {
private String table;
private String database;
- private List<String> dataRows = new ArrayList<>();
+ private final List<String> dataRows = new ArrayList<>();
public DorisSinkRowDataWithMeta database(String database) {
this.database = database;
diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisSinkFunction.java b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisSinkFunction.java
index 114abeb29..244c5916b 100644
--- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisSinkFunction.java
+++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisSinkFunction.java
@@ -48,8 +48,8 @@ public class DorisSinkFunction<T> extends RichSinkFunction<T> implements Checkpo
private static final Logger LOGGER = LoggerFactory.getLogger(DorisSinkFunction.class);
private final Properties properties;
- private DorisSinkWriter dorisSinkWriter;
- private DorisConfig dorisConfig;
+ private final DorisSinkWriter dorisSinkWriter;
+ private final DorisConfig dorisConfig;
// state only works with `EXACTLY_ONCE`
private transient ListState<Map<String, DorisSinkBufferEntry>> checkpointedState;
private transient Counter totalInvokeRowsTime;
@@ -92,7 +92,6 @@ public class DorisSinkFunction<T> extends RichSinkFunction<T> implements Checkpo
// raw data sink
totalInvokeRows.inc(1);
totalInvokeRowsTime.inc(System.nanoTime() - start);
- return;
}
@Override
@@ -108,7 +107,6 @@ public class DorisSinkFunction<T> extends RichSinkFunction<T> implements Checkpo
// save state
checkpointedState.add(dorisSinkWriter.getBufferedBatchMap());
flushPreviousState();
- return;
}
}
diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisSinkWriter.java b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisSinkWriter.java
index fd250c9e1..875eb7582 100644
--- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisSinkWriter.java
+++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisSinkWriter.java
@@ -45,7 +45,7 @@ public class DorisSinkWriter implements Serializable {
private static final Logger LOG = LoggerFactory.getLogger(DorisSinkWriter.class);
private final DorisConfig dorisConfig;
- private DorisStreamLoader streamLoader;
+ private final DorisStreamLoader streamLoader;
private ScheduledExecutorService schedule;
private ScheduledFuture<?> scheduledFuture;
@@ -58,7 +58,7 @@ public class DorisSinkWriter implements Serializable {
private transient Counter totalFlushFailedTimes;
private final Map<String, DorisSinkBufferEntry> bufferMap = new ConcurrentHashMap<>();
- private Long timeout = 3000L;
+ private final Long timeout = 3000L;
private volatile boolean closed = false;
private volatile boolean flushThreadAlive = false;
private volatile Throwable flushException;
@@ -72,7 +72,7 @@ public class DorisSinkWriter implements Serializable {
private static final String COUNTER_TOTAL_FLUSH_SUCCEEDED_TIMES = "totalFlushSucceededTimes";
private static final String COUNTER_TOTAL_FLUSH_FAILED_TIMES = "totalFlushFailedTimes";
- private Semantic semantic;
+ private final Semantic semantic;
public DorisSinkWriter(DorisConfig dorisConfig) {
this.streamLoader = new DorisStreamLoader(dorisConfig);
diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-kafka/src/main/scala/org/apache/streampark/flink/connector/kafka/source/KafkaJavaSource.java b/streampark-flink/streampark-flink-connector/streampark-flink-connector-kafka/src/main/scala/org/apache/streampark/flink/connector/kafka/source/KafkaJavaSource.java
index 8df95dec4..501127b4b 100644
--- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-kafka/src/main/scala/org/apache/streampark/flink/connector/kafka/source/KafkaJavaSource.java
+++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-kafka/src/main/scala/org/apache/streampark/flink/connector/kafka/source/KafkaJavaSource.java
@@ -29,7 +29,7 @@ import java.util.Properties;
public class KafkaJavaSource<T> {
- private StreamingContext context;
+ private final StreamingContext context;
private String[] topics;
private String alias = "";
private KafkaDeserializationSchema<T> deserializer;
diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-mongo/src/main/scala/org/apache/streampark/flink/connector/mongo/source/MongoJavaSource.java b/streampark-flink/streampark-flink-connector/streampark-flink-connector-mongo/src/main/scala/org/apache/streampark/flink/connector/mongo/source/MongoJavaSource.java
index 9b1ba1d5c..2b1dd0d13 100644
--- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-mongo/src/main/scala/org/apache/streampark/flink/connector/mongo/source/MongoJavaSource.java
+++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-mongo/src/main/scala/org/apache/streampark/flink/connector/mongo/source/MongoJavaSource.java
@@ -30,7 +30,7 @@ import java.util.Properties;
public class MongoJavaSource<T> {
private final StreamingContext context;
- private Properties property;
+ private final Properties property;
public MongoJavaSource(StreamingContext context, Properties property) {
this.context = context;
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/Agent.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/Agent.java
index 078a8c41c..905ee1fa2 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/Agent.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/Agent.java
@@ -25,7 +25,7 @@ public final class Agent {
private static final AgentLogger LOGGER = AgentLogger.getLogger(Agent.class.getName());
- private static AgentImpl agentImpl = new AgentImpl();
+ private static final AgentImpl AGENT_IMPL = new AgentImpl();
private Agent() {
}
@@ -38,6 +38,6 @@ public final class Agent {
LOGGER.info("Java Agent " + AgentImpl.VERSION + " premain args: " + args);
Arguments arguments = Arguments.parseArgs(args);
arguments.runConfigProvider();
- agentImpl.run(arguments, instrumentation, null);
+ AGENT_IMPL.run(arguments, instrumentation, null);
}
}
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/AgentImpl.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/AgentImpl.java
index d0a31fedf..815db95e6 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/AgentImpl.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/AgentImpl.java
@@ -37,8 +37,8 @@ import org.apache.streampark.plugin.profiling.util.StacktraceMetricBuffer;
import java.lang.instrument.Instrumentation;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.Executors;
@@ -93,7 +93,7 @@ public class AgentImpl {
new Thread(
new ShutdownHookRunner(
profilerGroup.getPeriodicProfilers(),
- Arrays.asList(reporter),
+ Collections.singletonList(reporter),
objectsToCloseOnShutdown));
Runtime.getRuntime().addShutdownHook(shutdownHook);
}
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/Arguments.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/Arguments.java
index 0496a1898..d38f7ca17 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/Arguments.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/Arguments.java
@@ -71,8 +71,8 @@ public class Arguments {
private String cluster;
private boolean ioProfiling;
- private List<ClassAndMethod> durationProfiling = new ArrayList<>();
- private List<ClassMethodArgument> argumentProfiling = new ArrayList<>();
+ private final List<ClassAndMethod> durationProfiling = new ArrayList<>();
+ private final List<ClassMethodArgument> argumentProfiling = new ArrayList<>();
private Arguments(Map<String, List<String>> parsedArgs) {
doArguments(parsedArgs);
@@ -192,7 +192,7 @@ public class Arguments {
throw new IllegalArgumentException("Invalid argument value: " + str);
}
String className = str.substring(0, index);
- String methodName = str.substring(index + 1, str.length());
+ String methodName = str.substring(index + 1);
ClassAndMethod classAndMethod = new ClassAndMethod(className, methodName);
durationProfiling.add(classAndMethod);
LOGGER.info("Got argument value for durationProfiling: " + classAndMethod);
@@ -208,7 +208,7 @@ public class Arguments {
throw new IllegalArgumentException("Invalid argument value: " + str);
}
String classMethodName = str.substring(0, index);
- int argumentIndex = Integer.parseInt(str.substring(index + 1, str.length()));
+ int argumentIndex = Integer.parseInt(str.substring(index + 1));
index = classMethodName.lastIndexOf(".");
if (index <= 0 || index + 1 >= classMethodName.length()) {
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/ProfilerGroup.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/ProfilerGroup.java
index 3f3058739..dcda7b725 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/ProfilerGroup.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/ProfilerGroup.java
@@ -21,8 +21,8 @@ import java.util.ArrayList;
import java.util.List;
public class ProfilerGroup {
- private List<Profiler> oneTimeProfilers;
- private List<Profiler> periodicProfilers;
+ private final List<Profiler> oneTimeProfilers;
+ private final List<Profiler> periodicProfilers;
public ProfilerGroup(List<Profiler> oneTimeProfilers, List<Profiler> periodicProfilers) {
this.oneTimeProfilers = new ArrayList<>(oneTimeProfilers);
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/ShutdownHookRunner.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/ShutdownHookRunner.java
index 7fb928e4d..8f7c96e0b 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/ShutdownHookRunner.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/ShutdownHookRunner.java
@@ -27,9 +27,9 @@ import java.util.List;
public class ShutdownHookRunner implements Runnable {
private static final AgentLogger LOGGER = AgentLogger.getLogger(ShutdownHookRunner.class.getName());
- private List<Profiler> profilers;
- private List<Reporter> reporters;
- private List<AutoCloseable> closeables;
+ private final List<Profiler> profilers;
+ private final List<Reporter> reporters;
+ private final List<AutoCloseable> closeables;
public ShutdownHookRunner(
Collection<Profiler> profilers,
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/example/HelloWorldApplication.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/example/HelloWorldApplication.java
index a00dc4b19..c6cceb248 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/example/HelloWorldApplication.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/example/HelloWorldApplication.java
@@ -28,7 +28,7 @@ public class HelloWorldApplication {
* -javaagent:target/jvm-profiler-1.0.0.jar=reporter=org.apache.streampark.plugin.profiling.reporter.ConsoleOutputReporter,tag=tag1,metricInterval=10000,durationProfiling=org.apache.streampark.plugin.profiling.example.HelloWorldApplication.*
*/
public static void main(String[] args) throws Throwable {
- long totalRunningMillis = 1 * 60 * 1000;
+ long totalRunningMillis = 60 * 1000;
long sleepMillis = 1000;
if (args.length >= 1) {
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/MethodArgumentCollector.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/MethodArgumentCollector.java
index 9ad35d0d9..b4b07c66f 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/MethodArgumentCollector.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/MethodArgumentCollector.java
@@ -20,7 +20,7 @@ package org.apache.streampark.plugin.profiling.profiler;
import org.apache.streampark.plugin.profiling.util.ClassMethodArgumentMetricBuffer;
public class MethodArgumentCollector {
- private ClassMethodArgumentMetricBuffer buffer;
+ private final ClassMethodArgumentMetricBuffer buffer;
public MethodArgumentCollector(ClassMethodArgumentMetricBuffer buffer) {
this.buffer = buffer;
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/MethodArgumentProfiler.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/MethodArgumentProfiler.java
index 657c3487d..dc11dbd60 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/MethodArgumentProfiler.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/MethodArgumentProfiler.java
@@ -30,7 +30,7 @@ import java.util.concurrent.atomic.AtomicLong;
public class MethodArgumentProfiler extends ProfilerBase implements Profiler {
public static final String PROFILER_NAME = "MethodArgument";
- private ClassMethodArgumentMetricBuffer buffer;
+ private final ClassMethodArgumentMetricBuffer buffer;
private Reporter reporter = new ConsoleOutputReporter();
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/MethodDurationCollector.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/MethodDurationCollector.java
index 54115cf52..14ae03d62 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/MethodDurationCollector.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/MethodDurationCollector.java
@@ -20,7 +20,7 @@ package org.apache.streampark.plugin.profiling.profiler;
import org.apache.streampark.plugin.profiling.util.ClassAndMethodLongMetricBuffer;
public class MethodDurationCollector {
- private ClassAndMethodLongMetricBuffer buffer;
+ private final ClassAndMethodLongMetricBuffer buffer;
public MethodDurationCollector(ClassAndMethodLongMetricBuffer buffer) {
this.buffer = buffer;
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/MethodDurationProfiler.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/MethodDurationProfiler.java
index 02a991f7f..2eb8dc8ef 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/MethodDurationProfiler.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/MethodDurationProfiler.java
@@ -30,7 +30,7 @@ import java.util.Map;
public class MethodDurationProfiler extends ProfilerBase implements Profiler {
public static final String PROFILER_NAME = "MethodDuration";
- private ClassAndMethodLongMetricBuffer buffer;
+ private final ClassAndMethodLongMetricBuffer buffer;
private Reporter reporter = new ConsoleOutputReporter();
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/StacktraceCollectorProfiler.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/StacktraceCollectorProfiler.java
index 04404784b..189d73201 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/StacktraceCollectorProfiler.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/StacktraceCollectorProfiler.java
@@ -36,10 +36,10 @@ import java.util.List;
*/
public class StacktraceCollectorProfiler implements Profiler {
private long interval;
- private StacktraceMetricBuffer buffer;
+ private final StacktraceMetricBuffer buffer;
private String ignoreThreadNamePrefix = "";
private int maxStringLength = Constants.MAX_STRING_LENGTH;
- private ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+ private final ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
public StacktraceCollectorProfiler(StacktraceMetricBuffer buffer, String ignoreThreadNamePrefix) {
this(buffer, ignoreThreadNamePrefix, Constants.MAX_STRING_LENGTH);
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/StacktraceReporterProfiler.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/StacktraceReporterProfiler.java
index 281820bdd..b68697123 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/StacktraceReporterProfiler.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/profiler/StacktraceReporterProfiler.java
@@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicLong;
public class StacktraceReporterProfiler extends ProfilerBase implements Profiler {
public static final String PROFILER_NAME = "Stacktrace";
- private StacktraceMetricBuffer buffer;
+ private final StacktraceMetricBuffer buffer;
private Reporter reporter = new ConsoleOutputReporter();
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/transformer/JavaAgentFileTransformer.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/transformer/JavaAgentFileTransformer.java
index f1f8a6825..1ec74dca3 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/transformer/JavaAgentFileTransformer.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/transformer/JavaAgentFileTransformer.java
@@ -38,8 +38,8 @@ public class JavaAgentFileTransformer implements ClassFileTransformer {
private static final AgentLogger LOGGER =
AgentLogger.getLogger(JavaAgentFileTransformer.class.getName());
- private ClassAndMethodFilter durationProfilingFilter;
- private ClassMethodArgumentFilter argumentFilterProfilingFilter;
+ private final ClassAndMethodFilter durationProfilingFilter;
+ private final ClassMethodArgumentFilter argumentFilterProfilingFilter;
public JavaAgentFileTransformer(
List<ClassAndMethod> durationProfiling, List<ClassMethodArgument> argumentProfiling) {
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/transformer/MethodProfilerStaticProxy.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/transformer/MethodProfilerStaticProxy.java
index 63d07a3c6..411a0de20 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/transformer/MethodProfilerStaticProxy.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/transformer/MethodProfilerStaticProxy.java
@@ -54,7 +54,7 @@ public class MethodProfilerStaticProxy {
}
try {
- String argument = "arg." + argIndex + "." + String.valueOf(argValue);
+ String argument = "arg." + argIndex + "." + argValue;
argumentCollectorSingleton.collectMetric(className, methodName, argument);
} catch (Throwable ex) {
ex.printStackTrace();
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/ClassAndMethod.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/ClassAndMethod.java
index d75daa1d1..8b3d8486b 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/ClassAndMethod.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/ClassAndMethod.java
@@ -17,6 +17,8 @@
package org.apache.streampark.plugin.profiling.util;
+import java.util.Objects;
+
public class ClassAndMethod {
private final String className;
private final String methodName;
@@ -50,20 +52,13 @@ public class ClassAndMethod {
if (o == null || getClass() != o.getClass()) {
return false;
}
-
ClassAndMethod that = (ClassAndMethod) o;
-
- if (className != null ? !className.equals(that.className) : that.className != null) {
- return false;
- }
- return methodName != null ? methodName.equals(that.methodName) : that.methodName == null;
+ return className.equals(that.className) && methodName.equals(that.methodName);
}
@Override
public int hashCode() {
- int result = className != null ? className.hashCode() : 0;
- result = 31 * result + (methodName != null ? methodName.hashCode() : 0);
- return result;
+ return Objects.hash(className, methodName);
}
@Override
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/ClassAndMethodMetricKey.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/ClassAndMethodMetricKey.java
index 51ed5d10c..5ec694298 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/ClassAndMethodMetricKey.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/ClassAndMethodMetricKey.java
@@ -17,6 +17,8 @@
package org.apache.streampark.plugin.profiling.util;
+import java.util.Objects;
+
public class ClassAndMethodMetricKey {
private final String className;
private final String methodName;
@@ -48,24 +50,13 @@ public class ClassAndMethodMetricKey {
if (o == null || getClass() != o.getClass()) {
return false;
}
-
ClassAndMethodMetricKey that = (ClassAndMethodMetricKey) o;
-
- if (className != null ? !className.equals(that.className) : that.className != null) {
- return false;
- }
- if (methodName != null ? !methodName.equals(that.methodName) : that.methodName != null) {
- return false;
- }
- return metricName != null ? metricName.equals(that.metricName) : that.metricName == null;
+ return Objects.equals(className, that.className) && Objects.equals(methodName, that.methodName) && Objects.equals(metricName, that.metricName);
}
@Override
public int hashCode() {
- int result = className != null ? className.hashCode() : 0;
- result = 31 * result + (methodName != null ? methodName.hashCode() : 0);
- result = 31 * result + (metricName != null ? metricName.hashCode() : 0);
- return result;
+ return Objects.hash(className, methodName, metricName);
}
@Override
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/ClassMethodArgument.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/ClassMethodArgument.java
index 4d9e0c54b..7878facd1 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/ClassMethodArgument.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/ClassMethodArgument.java
@@ -17,6 +17,8 @@
package org.apache.streampark.plugin.profiling.util;
+import java.util.Objects;
+
public class ClassMethodArgument {
private final String className;
private final String methodName;
@@ -61,24 +63,13 @@ public class ClassMethodArgument {
if (o == null || getClass() != o.getClass()) {
return false;
}
-
ClassMethodArgument that = (ClassMethodArgument) o;
-
- if (argumentIndex != that.argumentIndex) {
- return false;
- }
- if (className != null ? !className.equals(that.className) : that.className != null) {
- return false;
- }
- return methodName != null ? methodName.equals(that.methodName) : that.methodName == null;
+ return argumentIndex == that.argumentIndex && Objects.equals(className, that.className) && Objects.equals(methodName, that.methodName);
}
@Override
public int hashCode() {
- int result = className != null ? className.hashCode() : 0;
- result = 31 * result + (methodName != null ? methodName.hashCode() : 0);
- result = 31 * result + argumentIndex;
- return result;
+ return Objects.hash(className, methodName, argumentIndex);
}
@Override
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/ExponentialBackoffRetryPolicy.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/ExponentialBackoffRetryPolicy.java
index e7b9ef5b3..327d334ca 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/ExponentialBackoffRetryPolicy.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/ExponentialBackoffRetryPolicy.java
@@ -28,7 +28,7 @@ public class ExponentialBackoffRetryPolicy<T> {
private final long minSleepMillis;
private final float scaleFactor;
- private Random random = new Random();
+ private final Random random = new Random();
public ExponentialBackoffRetryPolicy(int maxAttemptCount, long minSleepMillis) {
this(maxAttemptCount, minSleepMillis, 2.0f);
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/Histogram.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/Histogram.java
index 9ccc2ca35..0ba708e85 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/Histogram.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/Histogram.java
@@ -21,10 +21,10 @@ import java.util.concurrent.atomic.AtomicLong;
public class Histogram {
- private AtomicLong count = new AtomicLong(0);
- private AtomicLong sum = new AtomicLong(0);
- private AtomicLong min = new AtomicLong(Long.MAX_VALUE);
- private AtomicLong max = new AtomicLong(Long.MIN_VALUE);
+ private final AtomicLong count = new AtomicLong(0);
+ private final AtomicLong sum = new AtomicLong(0);
+ private final AtomicLong min = new AtomicLong(Long.MAX_VALUE);
+ private final AtomicLong max = new AtomicLong(Long.MIN_VALUE);
public void appendValue(long value) {
count.incrementAndGet();
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/NoopConfigProvider.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/NoopConfigProvider.java
index 8b35bbc80..84aecd05c 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/NoopConfigProvider.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/NoopConfigProvider.java
@@ -19,7 +19,7 @@ package org.apache.streampark.plugin.profiling.util;
import org.apache.streampark.plugin.profiling.ConfigProvider;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -30,7 +30,7 @@ public class NoopConfigProvider implements ConfigProvider {
Map<String, Map<String, List<String>>> configMap = new HashMap<>();
Map<String, List<String>> values = new HashMap<>();
- values.put("noop", Arrays.asList("true"));
+ values.put("noop", Collections.singletonList("true"));
configMap.put("", values);
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/Stacktrace.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/Stacktrace.java
index 58232a44b..bab7ee6f3 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/Stacktrace.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/Stacktrace.java
@@ -18,6 +18,7 @@
package org.apache.streampark.plugin.profiling.util;
import java.util.Arrays;
+import java.util.Objects;
public class Stacktrace {
private String threadName;
@@ -60,23 +61,13 @@ public class Stacktrace {
if (o == null || getClass() != o.getClass()) {
return false;
}
-
Stacktrace that = (Stacktrace) o;
-
- if (threadName != null ? !threadName.equals(that.threadName) : that.threadName != null) {
- return false;
- }
- if (threadState != null ? !threadState.equals(that.threadState) : that.threadState != null) {
- return false;
- }
-
- return Arrays.equals(stack, that.stack);
+ return Objects.equals(threadName, that.threadName) && Objects.equals(threadState, that.threadState) && Arrays.equals(stack, that.stack);
}
@Override
public int hashCode() {
- int result = threadName != null ? threadName.hashCode() : 0;
- result = 31 * result + (threadState != null ? threadState.hashCode() : 0);
+ int result = Objects.hash(threadName, threadState);
result = 31 * result + Arrays.hashCode(stack);
return result;
}
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/StacktraceMetricBuffer.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/StacktraceMetricBuffer.java
index 2fc70f23f..b2a8eb711 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/StacktraceMetricBuffer.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/StacktraceMetricBuffer.java
@@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicLong;
*
*/
public class StacktraceMetricBuffer {
- private AtomicLong lastResetMillis = new AtomicLong(System.currentTimeMillis());
+ private final AtomicLong lastResetMillis = new AtomicLong(System.currentTimeMillis());
private volatile ConcurrentHashMap<Stacktrace, AtomicLong> metrics = new ConcurrentHashMap<>();
diff --git a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/StringUtils.java b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/StringUtils.java
index aa0e54dc4..77d8bc0e4 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/StringUtils.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/main/java/org/apache/streampark/plugin/profiling/util/StringUtils.java
@@ -228,8 +228,8 @@ public class StringUtils {
}
static class StringValueAndIndex {
- private String str;
- private int endIndex;
+ private final String str;
+ private final int endIndex;
public StringValueAndIndex(String str, int endIndex) {
this.str = str;
diff --git a/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/ArgumentsTest.java b/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/ArgumentsTest.java
index e1d0586a0..0907e9c27 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/ArgumentsTest.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/ArgumentsTest.java
@@ -25,6 +25,7 @@ import org.junit.Assert;
import org.junit.Test;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -132,7 +133,7 @@ public class ArgumentsTest {
Assert.assertEquals("tag1", arguments.getTag());
Assert.assertEquals("cluster1", arguments.getCluster());
Assert.assertEquals(1000L, arguments.getMetricInterval());
- Assert.assertEquals(true, arguments.isIoProfiling());
+ Assert.assertTrue(arguments.isIoProfiling());
Assert.assertArrayEquals(
new ClassAndMethod[]{
new ClassAndMethod("a.bc", "foo"), new ClassAndMethod("ab.c.d", "test")
@@ -150,7 +151,7 @@ public class ArgumentsTest {
Assert.assertEquals("tag1", arguments.getTag());
Assert.assertEquals(9000L, arguments.getMetricInterval());
- Assert.assertEquals(false, arguments.isIoProfiling());
+ Assert.assertFalse(arguments.isIoProfiling());
Assert.assertArrayEquals(
new ClassAndMethod[]{
new ClassAndMethod("package.c900", "m900"), new ClassAndMethod("package.c901", "m901")
@@ -168,7 +169,7 @@ public class ArgumentsTest {
Assert.assertEquals("tag1", arguments.getTag());
Assert.assertEquals(9001L, arguments.getMetricInterval());
- Assert.assertEquals(false, arguments.isIoProfiling());
+ Assert.assertFalse(arguments.isIoProfiling());
Assert.assertArrayEquals(
new ClassAndMethod[]{
new ClassAndMethod("package.c900", "m910"), new ClassAndMethod("package.c901", "m911")
@@ -183,7 +184,7 @@ public class ArgumentsTest {
Assert.assertEquals("tag2", arguments.getTag());
Assert.assertEquals(9002L, arguments.getMetricInterval());
- Assert.assertEquals(true, arguments.isIoProfiling());
+ Assert.assertTrue(arguments.isIoProfiling());
Assert.assertArrayEquals(
new ClassAndMethod[]{
new ClassAndMethod("package.c900", "m920"), new ClassAndMethod("package.c901", "m921")
@@ -198,7 +199,7 @@ public class ArgumentsTest {
Assert.assertEquals("tag3", arguments.getTag());
Assert.assertEquals(9000L, arguments.getMetricInterval());
- Assert.assertEquals(true, arguments.isIoProfiling());
+ Assert.assertTrue(arguments.isIoProfiling());
Assert.assertArrayEquals(
new ClassAndMethod[]{
new ClassAndMethod("package.c900", "m900"), new ClassAndMethod("package.c901", "m901")
@@ -229,8 +230,8 @@ public class ArgumentsTest {
Map<String, Map<String, List<String>>> configMap = new HashMap<>();
Map<String, List<String>> argMap = new HashMap<>();
- argMap.put("metricInterval", Arrays.asList("9000"));
- argMap.put("ioProfiling", Arrays.asList("false"));
+ argMap.put("metricInterval", Collections.singletonList("9000"));
+ argMap.put("ioProfiling", Collections.singletonList("false"));
argMap.put("durationProfiling", Arrays.asList("package.c900.m900", "package.c901.m901"));
configMap.put("", argMap);
@@ -245,22 +246,22 @@ public class ArgumentsTest {
Map<String, Map<String, List<String>>> configMap = new HashMap<>();
Map<String, List<String>> argMap = new HashMap<>();
- argMap.put("metricInterval", Arrays.asList("9000"));
- argMap.put("ioProfiling", Arrays.asList("true"));
+ argMap.put("metricInterval", Collections.singletonList("9000"));
+ argMap.put("ioProfiling", Collections.singletonList("true"));
argMap.put("durationProfiling", Arrays.asList("package.c900.m900", "package.c901.m901"));
configMap.put("", argMap);
argMap = new HashMap<>();
- argMap.put("metricInterval", Arrays.asList("9001"));
- argMap.put("ioProfiling", Arrays.asList("false"));
+ argMap.put("metricInterval", Collections.singletonList("9001"));
+ argMap.put("ioProfiling", Collections.singletonList("false"));
argMap.put("durationProfiling", Arrays.asList("package.c900.m910", "package.c901.m911"));
configMap.put("tag1", argMap);
argMap = new HashMap<>();
- argMap.put("metricInterval", Arrays.asList("9002"));
- argMap.put("ioProfiling", Arrays.asList("true"));
+ argMap.put("metricInterval", Collections.singletonList("9002"));
+ argMap.put("ioProfiling", Collections.singletonList("true"));
argMap.put("durationProfiling", Arrays.asList("package.c900.m920", "package.c901.m921"));
configMap.put("tag2", argMap);
diff --git a/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/YamlConfigProviderTest.java b/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/YamlConfigProviderTest.java
index 9af05ff3f..dee5c1f51 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/YamlConfigProviderTest.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/YamlConfigProviderTest.java
@@ -26,6 +26,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -79,16 +80,16 @@ public class YamlConfigProviderTest {
Map<String, List<String>> rootConfig = config.get("");
Assert.assertEquals(4, rootConfig.size());
- Assert.assertEquals(Arrays.asList("value1"), rootConfig.get("key1"));
+ Assert.assertEquals(Collections.singletonList("value1"), rootConfig.get("key1"));
Assert.assertEquals(Arrays.asList("value2a", "value2b"), rootConfig.get("key2"));
- Assert.assertEquals(Arrays.asList("value3a"), rootConfig.get("key3.key3a"));
+ Assert.assertEquals(Collections.singletonList("value3a"), rootConfig.get("key3.key3a"));
Assert.assertEquals(Arrays.asList("value3b", "value3c"), rootConfig.get("key3.key3b"));
Map<String, List<String>> override1Config = config.get("override1");
Assert.assertEquals(3, override1Config.size());
- Assert.assertEquals(Arrays.asList("value11"), override1Config.get("key1"));
+ Assert.assertEquals(Collections.singletonList("value11"), override1Config.get("key1"));
Assert.assertEquals(Arrays.asList("value22a", "value22b"), override1Config.get("key2"));
- Assert.assertEquals(Arrays.asList("value33a"), override1Config.get("key3.key3a"));
+ Assert.assertEquals(Collections.singletonList("value33a"), override1Config.get("key3.key3a"));
}
}
@@ -131,14 +132,14 @@ public class YamlConfigProviderTest {
Map<String, List<String>> rootConfig = config.get("");
Assert.assertEquals(4, rootConfig.size());
- Assert.assertEquals(Arrays.asList("value1"), rootConfig.get("key1"));
+ Assert.assertEquals(Collections.singletonList("value1"), rootConfig.get("key1"));
Assert.assertEquals(Arrays.asList("value2a", "value2b"), rootConfig.get("key2"));
Assert.assertEquals(Arrays.asList("value3b", "value3c"), rootConfig.get("key3.key3b"));
Map<String, List<String>> override1Config = config.get("override1");
Assert.assertEquals(3, override1Config.size());
- Assert.assertEquals(Arrays.asList("value11"), override1Config.get("key1"));
+ Assert.assertEquals(Collections.singletonList("value11"), override1Config.get("key1"));
Assert.assertEquals(Arrays.asList("value22a", "value22b"), override1Config.get("key2"));
- Assert.assertEquals(Arrays.asList("value33a"), override1Config.get("key3.key3a"));
+ Assert.assertEquals(Collections.singletonList("value33a"), override1Config.get("key3.key3a"));
}
}
diff --git a/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/profiler/ProcessInfoProfilerTest.java b/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/profiler/ProcessInfoProfilerTest.java
index 86de81ee4..c2ff126ba 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/profiler/ProcessInfoProfilerTest.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/profiler/ProcessInfoProfilerTest.java
@@ -74,15 +74,13 @@ public class ProcessInfoProfilerTest {
// Verify: if cmdline is empty, there should be jvmClassPath/jvmInputArguments,
// otherwise there should be no jvmClassPath/jvmInputArguments
if (ProcFileUtils.getCmdline() == null || ProcFileUtils.getCmdline().isEmpty()) {
- Assert.assertTrue(
- metricList.stream().filter(map -> !map.get("cmdline").equals("")).count() == 0);
+ Assert.assertEquals(0, metricList.stream().filter(map -> !map.get("cmdline").equals("")).count());
Assert.assertTrue(
metricList.stream().filter(map -> !map.get("jvmClassPath").equals("")).count() > 0);
if (ProcessUtils.getJvmInputArguments().isEmpty()) {
- Assert.assertTrue(
- metricList.stream().filter(map -> !map.get("jvmInputArguments").equals("")).count() == 0);
+ Assert.assertEquals(0, metricList.stream().filter(map -> !map.get("jvmInputArguments").equals("")).count());
} else {
Assert.assertTrue(
metricList.stream().filter(map -> !map.get("jvmInputArguments").equals("")).count() > 0);
@@ -90,10 +88,8 @@ public class ProcessInfoProfilerTest {
} else {
Assert.assertTrue(
metricList.stream().filter(map -> !map.get("cmdline").equals("")).count() > 0);
- Assert.assertTrue(
- metricList.stream().filter(map -> !map.get("jvmClassPath").equals("")).count() == 0);
- Assert.assertTrue(
- metricList.stream().filter(map -> !map.get("jvmInputArguments").equals("")).count() == 0);
+ Assert.assertEquals(0, metricList.stream().filter(map -> !map.get("jvmClassPath").equals("")).count());
+ Assert.assertEquals(0, metricList.stream().filter(map -> !map.get("jvmInputArguments").equals("")).count());
}
}
}
diff --git a/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/ClassAndMethodFilterTest.java b/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/ClassAndMethodFilterTest.java
index 56ec2b642..dedd9e1b2 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/ClassAndMethodFilterTest.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/ClassAndMethodFilterTest.java
@@ -21,6 +21,7 @@ import org.junit.Assert;
import org.junit.Test;
import java.util.Arrays;
+import java.util.Collections;
public class ClassAndMethodFilterTest {
@Test
@@ -28,13 +29,13 @@ public class ClassAndMethodFilterTest {
ClassAndMethodFilter filter = new ClassAndMethodFilter(null);
Assert.assertFalse(filter.matchMethod("class1", "method1"));
- filter = new ClassAndMethodFilter(Arrays.asList(new ClassAndMethod("class1", "")));
+ filter = new ClassAndMethodFilter(Collections.singletonList(new ClassAndMethod("class1", "")));
Assert.assertTrue(filter.matchClass("class1"));
- filter = new ClassAndMethodFilter(Arrays.asList(new ClassAndMethod("", "method1")));
+ filter = new ClassAndMethodFilter(Collections.singletonList(new ClassAndMethod("", "method1")));
Assert.assertTrue(filter.matchClass("class1"));
- filter = new ClassAndMethodFilter(Arrays.asList(new ClassAndMethod("class2", "method1")));
+ filter = new ClassAndMethodFilter(Collections.singletonList(new ClassAndMethod("class2", "method1")));
Assert.assertFalse(filter.matchClass("class1"));
Assert.assertTrue(filter.matchClass("class2"));
@@ -61,13 +62,13 @@ public class ClassAndMethodFilterTest {
ClassAndMethodFilter filter = new ClassAndMethodFilter(null);
Assert.assertFalse(filter.matchMethod("class1", "method1"));
- filter = new ClassAndMethodFilter(Arrays.asList(new ClassAndMethod("class1", "")));
+ filter = new ClassAndMethodFilter(Collections.singletonList(new ClassAndMethod("class1", "")));
Assert.assertFalse(filter.matchMethod("class1", "method1"));
- filter = new ClassAndMethodFilter(Arrays.asList(new ClassAndMethod("", "method1")));
+ filter = new ClassAndMethodFilter(Collections.singletonList(new ClassAndMethod("", "method1")));
Assert.assertTrue(filter.matchMethod("class1", "method1"));
- filter = new ClassAndMethodFilter(Arrays.asList(new ClassAndMethod("class2", "method1")));
+ filter = new ClassAndMethodFilter(Collections.singletonList(new ClassAndMethod("class2", "method1")));
Assert.assertFalse(filter.matchMethod("class1", "method1"));
filter =
@@ -80,7 +81,7 @@ public class ClassAndMethodFilterTest {
@Test
public void matchMethod_wildcard() {
ClassAndMethodFilter filter =
- new ClassAndMethodFilter(Arrays.asList(new ClassAndMethod("class1", "")));
+ new ClassAndMethodFilter(Collections.singletonList(new ClassAndMethod("class1", "")));
Assert.assertFalse(filter.matchMethod("class1", "method1"));
filter =
diff --git a/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/ClassMethodArgumentFilterTest.java b/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/ClassMethodArgumentFilterTest.java
index 74452a2e9..91520db2c 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/ClassMethodArgumentFilterTest.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/ClassMethodArgumentFilterTest.java
@@ -21,6 +21,7 @@ import org.junit.Assert;
import org.junit.Test;
import java.util.Arrays;
+import java.util.Collections;
public class ClassMethodArgumentFilterTest {
@Test
@@ -28,16 +29,16 @@ public class ClassMethodArgumentFilterTest {
ClassMethodArgumentFilter filter = new ClassMethodArgumentFilter(null);
Assert.assertEquals(0, filter.matchMethod("class1", "method1").size());
- filter = new ClassMethodArgumentFilter(Arrays.asList(new ClassMethodArgument("class1", "", 1)));
+ filter = new ClassMethodArgumentFilter(Collections.singletonList(new ClassMethodArgument("class1", "", 1)));
Assert.assertTrue(filter.matchClass("class1"));
filter =
- new ClassMethodArgumentFilter(Arrays.asList(new ClassMethodArgument("", "method1", 1)));
+ new ClassMethodArgumentFilter(Collections.singletonList(new ClassMethodArgument("", "method1", 1)));
Assert.assertTrue(filter.matchClass("class1"));
filter =
new ClassMethodArgumentFilter(
- Arrays.asList(new ClassMethodArgument("class2", "method1", 1)));
+ Collections.singletonList(new ClassMethodArgument("class2", "method1", 1)));
Assert.assertFalse(filter.matchClass("class1"));
Assert.assertTrue(filter.matchClass("class2"));
@@ -65,17 +66,17 @@ public class ClassMethodArgumentFilterTest {
ClassMethodArgumentFilter filter = new ClassMethodArgumentFilter(null);
Assert.assertEquals(0, filter.matchMethod("class1", "method1").size());
- filter = new ClassMethodArgumentFilter(Arrays.asList(new ClassMethodArgument("class1", "", 1)));
+ filter = new ClassMethodArgumentFilter(Collections.singletonList(new ClassMethodArgument("class1", "", 1)));
Assert.assertEquals(0, filter.matchMethod("class1", "method1").size());
filter =
- new ClassMethodArgumentFilter(Arrays.asList(new ClassMethodArgument("", "method1", 10)));
+ new ClassMethodArgumentFilter(Collections.singletonList(new ClassMethodArgument("", "method1", 10)));
Assert.assertEquals(1, filter.matchMethod("class1", "method1").size());
Assert.assertEquals(10, filter.matchMethod("class1", "method1").get(0).intValue());
filter =
new ClassMethodArgumentFilter(
- Arrays.asList(new ClassMethodArgument("class2", "method1", 1)));
+ Collections.singletonList(new ClassMethodArgument("class2", "method1", 1)));
Assert.assertEquals(0, filter.matchMethod("class1", "method1").size());
filter =
@@ -91,7 +92,7 @@ public class ClassMethodArgumentFilterTest {
@Test
public void matchMethod_wildcard() {
ClassMethodArgumentFilter filter =
- new ClassMethodArgumentFilter(Arrays.asList(new ClassMethodArgument("class1", "", 10)));
+ new ClassMethodArgumentFilter(Collections.singletonList(new ClassMethodArgument("class1", "", 10)));
Assert.assertEquals(0, filter.matchMethod("class1", "method1").size());
filter =
diff --git a/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/ProcFileUtilsTest.java b/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/ProcFileUtilsTest.java
index b83e274b9..3f3d56a3b 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/ProcFileUtilsTest.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/ProcFileUtilsTest.java
@@ -366,7 +366,7 @@ public class ProcFileUtilsTest {
Files.write(file.toPath(), content.getBytes(), StandardOpenOption.CREATE);
String result = ProcFileUtils.getPid(file.getPath());
- Assert.assertEquals(null, result);
+ Assert.assertNull(result);
}
@Test
diff --git a/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/SparkUtilsTest.java b/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/SparkUtilsTest.java
index be80207e3..6f0c09d4a 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/SparkUtilsTest.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/SparkUtilsTest.java
@@ -44,6 +44,6 @@ public class SparkUtilsTest {
"executor",
SparkUtils.probeRole("java org.apache.spark.executor.CoarseGrainedExecutorBackend"));
Assert.assertEquals("driver", SparkUtils.probeRole("java org.apache.spark.MockDriver"));
- Assert.assertEquals(null, SparkUtils.probeRole("java foo"));
+ Assert.assertNull(SparkUtils.probeRole("java foo"));
}
}
diff --git a/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/StringUtilsTest.java b/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/StringUtilsTest.java
index 7457253a6..08188738a 100644
--- a/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/StringUtilsTest.java
+++ b/streampark-plugin/streampark-jvm-profiler/src/test/java/org/apache/streampark/plugin/profiling/util/StringUtilsTest.java
@@ -70,9 +70,9 @@ public class StringUtilsTest {
@Test
public void getValueAsBytes() {
- Assert.assertEquals(null, StringUtils.getBytesValueOrNull(null));
- Assert.assertEquals(null, StringUtils.getBytesValueOrNull(""));
- Assert.assertEquals(null, StringUtils.getBytesValueOrNull("xxx"));
+ Assert.assertNull(StringUtils.getBytesValueOrNull(null));
+ Assert.assertNull(StringUtils.getBytesValueOrNull(""));
+ Assert.assertNull(StringUtils.getBytesValueOrNull("xxx"));
Assert.assertEquals(0L, StringUtils.getBytesValueOrNull("0").longValue());
Assert.assertEquals(123L, StringUtils.getBytesValueOrNull("123").longValue());
@@ -106,13 +106,13 @@ public class StringUtilsTest {
@Test
public void getArgumentValue() {
- Assert.assertEquals(null, StringUtils.getArgumentValue(null, null));
- Assert.assertEquals(null, StringUtils.getArgumentValue(null, ""));
- Assert.assertEquals(null, StringUtils.getArgumentValue("", null));
+ Assert.assertNull(StringUtils.getArgumentValue(null, null));
+ Assert.assertNull(StringUtils.getArgumentValue(null, ""));
+ Assert.assertNull(StringUtils.getArgumentValue("", null));
- Assert.assertEquals(null, StringUtils.getArgumentValue("", ""));
- Assert.assertEquals(null, StringUtils.getArgumentValue("test", ""));
- Assert.assertEquals(null, StringUtils.getArgumentValue("", "test"));
+ Assert.assertNull(StringUtils.getArgumentValue("", ""));
+ Assert.assertNull(StringUtils.getArgumentValue("test", ""));
+ Assert.assertNull(StringUtils.getArgumentValue("", "test"));
Assert.assertEquals(
"com.foo.jobs.Abc", StringUtils.getArgumentValue("--class com.foo.jobs.Abc", "--class"));
diff --git a/streampark-storage/src/test/java/org/apache/streampark/storage/oss/OssStorageServiceTest.java b/streampark-storage/src/test/java/org/apache/streampark/storage/oss/OssStorageServiceTest.java
index 35f7683f4..5290c7407 100644
--- a/streampark-storage/src/test/java/org/apache/streampark/storage/oss/OssStorageServiceTest.java
+++ b/streampark-storage/src/test/java/org/apache/streampark/storage/oss/OssStorageServiceTest.java
@@ -28,7 +28,7 @@ public class OssStorageServiceTest {
public void testHandleException() throws Exception {
OSSException ossException = new OSSException("mock error", "MOCK_CODE", "requestId", "hostId", "header", "resource", "GET");
RuntimeException exp = OssStorageService.handleOssException(ossException);
- Assert.assertTrue(exp.getMessage().equals("Caught an OSSException. Error Message: mock error. Error Code: MOCK_CODE. Request ID: requestId"));
+ Assert.assertEquals("Caught an OSSException. Error Message: mock error. Error Code: MOCK_CODE. Request ID: requestId", exp.getMessage());
ClientException ossClientException = new ClientException("Client ERROR");
exp = OssStorageService.handleOssException(ossClientException);