apache · slievrly · Jan 30, 2024 · Jan 23, 2024 · Jan 23, 2024 · Jan 23, 2024
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
@@ -74,7 +74,10 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6294](https://github.com/apache/incubator-seata/pull/6294)] split the frontend resource build process into separate profiles
 - [[#6297](https://github.com/apache/incubator-seata/pull/6297)] fix problem of `maven-pmd-plugin`
 - [[#6298](https://github.com/apache/incubator-seata/pull/6298)] repackage name to org.apache.seata
+<<<<<<< HEAD
+=======
 - [[#6304](https://github.com/apache/incubator-seata/pull/6304)] disable Publish OSSRH workflow
+>>>>>>> 5412202ee622104c925b5e26c35193062e7f09a7
 
 ### security:
 - [[#6069](https://github.com/apache/incubator-seata/pull/6069)] Upgrade Guava dependencies to fix security vulnerabilities

diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
@@ -72,7 +72,10 @@
 - [[#6294](https://github.com/apache/incubator-seata/pull/6294)] 拆分前端资源打包流程到单独的profile
 - [[#6297](https://github.com/apache/incubator-seata/pull/6297)] 修复 `maven-pmd-plugin` 相关的问题
 - [[#6298](https://github.com/apache/incubator-seata/pull/6298)] 重命名包名为 org.apache.seata
+<<<<<<< HEAD
+=======
 - [[#6304](https://github.com/apache/incubator-seata/pull/6304)] 禁用 OSSRH 发布工作流
+>>>>>>> 5412202ee622104c925b5e26c35193062e7f09a7
 
 ### security:
 - [[#6069](https://github.com/apache/incubator-seata/pull/6069)] 升级Guava依赖版本，修复安全漏洞

diff --git a/common/src/main/java/org/apache/seata/common/DefaultValues.java b/common/src/main/java/org/apache/seata/common/DefaultValues.java
@@ -18,8 +18,6 @@
 
 import java.time.Duration;
 
-/**
- */
 public interface DefaultValues {
     int DEFAULT_CLIENT_LOCK_RETRY_INTERVAL = 10;
     int DEFAULT_TM_DEGRADE_CHECK_ALLOW_TIMES = 10;

diff --git a/common/src/main/java/org/apache/seata/common/exception/JsonParseException.java b/common/src/main/java/org/apache/seata/common/exception/JsonParseException.java
@@ -16,8 +16,7 @@
  */
 package org.apache.seata.common.exception;
 
-/**
- */
+
 public class JsonParseException extends RuntimeException {
 
     public JsonParseException(String message) {

diff --git a/common/src/main/java/org/apache/seata/common/metadata/ClusterRole.java b/common/src/main/java/org/apache/seata/common/metadata/ClusterRole.java
@@ -16,8 +16,7 @@
  */
 package org.apache.seata.common.metadata;
 
-/**
- */
+
 public enum ClusterRole {
 
     /**

diff --git a/common/src/main/java/org/apache/seata/common/metadata/Metadata.java b/common/src/main/java/org/apache/seata/common/metadata/Metadata.java
@@ -27,8 +27,7 @@
 import org.apache.seata.common.store.StoreMode;
 import org.apache.seata.common.util.StringUtils;
 
-/**
- */
+
 public class Metadata {
 
     private final Map<String/*vgroup*/, Map<String/*raft-group*/, Node>> leaders = new ConcurrentHashMap<>();

diff --git a/common/src/main/java/org/apache/seata/common/metadata/MetadataResponse.java b/common/src/main/java/org/apache/seata/common/metadata/MetadataResponse.java
@@ -18,8 +18,7 @@
 
 import java.util.List;
 
-/**
- */
+
 public class MetadataResponse {
 
     List<Node> nodes;

diff --git a/common/src/main/java/org/apache/seata/common/metadata/Node.java b/common/src/main/java/org/apache/seata/common/metadata/Node.java
@@ -19,8 +19,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-/**
- */
+
 public class Node {
 
     Map<String, Object> metadata = new HashMap<>();

diff --git a/common/src/main/java/org/apache/seata/common/util/ConfigTools.java b/common/src/main/java/org/apache/seata/common/util/ConfigTools.java
@@ -27,8 +27,7 @@
 import java.util.Base64;
 import javax.crypto.Cipher;
 
-/**
- */
+
 public class ConfigTools {
 
     // generate key pair

diff --git a/common/src/main/java/org/apache/seata/common/util/DurationUtil.java b/common/src/main/java/org/apache/seata/common/util/DurationUtil.java
@@ -20,8 +20,7 @@
 import java.time.format.DateTimeParseException;
 import java.util.regex.Pattern;
 
-/**
- */
+
 public class DurationUtil {
 
     public static final Duration DEFAULT_DURATION = Duration.ofMillis(-1);

diff --git a/common/src/main/java/org/apache/seata/common/util/HttpClientUtil.java b/common/src/main/java/org/apache/seata/common/util/HttpClientUtil.java
@@ -44,8 +44,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-/**
- */
+
 public class HttpClientUtil {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(HttpClientUtil.class);

diff --git a/common/src/main/java/org/apache/seata/common/util/IOUtil.java b/common/src/main/java/org/apache/seata/common/util/IOUtil.java
@@ -16,8 +16,7 @@
  */
 package org.apache.seata.common.util;
 
-/**
- */
+
 public class IOUtil {
 
     /**

diff --git a/common/src/main/java/org/apache/seata/common/util/IdWorker.java b/common/src/main/java/org/apache/seata/common/util/IdWorker.java
@@ -21,8 +21,7 @@
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicLong;
 
-/**
- */
+
 public class IdWorker {
 
     /**

diff --git a/common/src/main/java/org/apache/seata/common/util/SizeUtil.java b/common/src/main/java/org/apache/seata/common/util/SizeUtil.java
@@ -16,8 +16,7 @@
  */
 package org.apache.seata.common.util;
 
-/**
- */
+
 public class SizeUtil {
     private static final long RADIX = 1024;
     /**

diff --git a/common/src/main/java/org/apache/seata/common/util/StringFormatUtils.java b/common/src/main/java/org/apache/seata/common/util/StringFormatUtils.java
@@ -16,8 +16,7 @@
  */
 package org.apache.seata.common.util;
 
-/**
- */
+
 public class StringFormatUtils {
     private static final char MINUS = '-';
     private static final char UNDERLINE = '_';

diff --git a/...on/src/test/java/org/apache/seata/common/exception/AuthenticationFailedExceptionTest.java b/...on/src/test/java/org/apache/seata/common/exception/AuthenticationFailedExceptionTest.java
@@ -19,8 +19,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-/**
- */
+
 public class AuthenticationFailedExceptionTest {
 
     @Test

diff --git a/common/src/test/java/org/apache/seata/common/exception/JsonParseExceptionTest.java b/common/src/test/java/org/apache/seata/common/exception/JsonParseExceptionTest.java
@@ -19,8 +19,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-/**
- */
+
 public class JsonParseExceptionTest {
 
     @Test

diff --git a/common/src/test/java/org/apache/seata/common/exception/RedisExceptionTest.java b/common/src/test/java/org/apache/seata/common/exception/RedisExceptionTest.java
@@ -19,8 +19,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-/**
- */
+
 public class RedisExceptionTest {
 
     @Test

diff --git a/common/src/test/java/org/apache/seata/common/exception/RetryableExceptionTest.java b/common/src/test/java/org/apache/seata/common/exception/RetryableExceptionTest.java
@@ -19,8 +19,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-/**
- */
+
 public class RetryableExceptionTest {
 
     @Test

diff --git a/common/src/test/java/org/apache/seata/common/holder/ObjectHolderTest.java b/common/src/test/java/org/apache/seata/common/holder/ObjectHolderTest.java
@@ -22,8 +22,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-/**
- */
+
 public class ObjectHolderTest {
 
     @BeforeEach

diff --git a/common/src/test/java/org/apache/seata/common/io/FileLoaderTest.java b/common/src/test/java/org/apache/seata/common/io/FileLoaderTest.java
@@ -21,8 +21,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-/**
- */
+
 public class FileLoaderTest {
 
     @Test

diff --git a/common/src/test/java/org/apache/seata/common/loader/ExtensionDefinitionTest.java b/common/src/test/java/org/apache/seata/common/loader/ExtensionDefinitionTest.java
@@ -19,8 +19,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-/**
- */
+
 public class ExtensionDefinitionTest {
 
     @Test

diff --git a/common/src/test/java/org/apache/seata/common/loader/Hello2.java b/common/src/test/java/org/apache/seata/common/loader/Hello2.java
@@ -16,7 +16,6 @@
  */
 package org.apache.seata.common.loader;
 
-/**
- */
+
 public interface Hello2 {
 }
diff --git a/common/src/test/java/org/apache/seata/common/loader/JapaneseHello.java b/common/src/test/java/org/apache/seata/common/loader/JapaneseHello.java
@@ -16,8 +16,7 @@
  */
 package org.apache.seata.common.loader;
 
-/**
- */
+
 @LoadLevel(name = "JapaneseHello", order = Integer.MAX_VALUE)
 public class JapaneseHello implements Hello2{
 

diff --git a/common/src/test/java/org/apache/seata/common/metadata/ClusterRoleTest.java b/common/src/test/java/org/apache/seata/common/metadata/ClusterRoleTest.java
@@ -19,8 +19,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-/**
- */
+
 public class ClusterRoleTest {
 
     @Test

diff --git a/common/src/test/java/org/apache/seata/common/metadata/MetadataTest.java b/common/src/test/java/org/apache/seata/common/metadata/MetadataTest.java
@@ -24,8 +24,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- */
+
 public class MetadataTest {
 
     private static Metadata metadata;

diff --git a/common/src/test/java/org/apache/seata/common/metadata/NodeTest.java b/common/src/test/java/org/apache/seata/common/metadata/NodeTest.java
@@ -21,8 +21,7 @@
 
 import java.util.HashMap;
 
-/**
- */
+
 public class NodeTest {
 
     @Test

diff --git a/common/src/test/java/org/apache/seata/common/thread/NamedThreadFactoryTest.java b/common/src/test/java/org/apache/seata/common/thread/NamedThreadFactoryTest.java
@@ -21,8 +21,7 @@
 
 import org.junit.jupiter.api.Test;
 
-/**
- */
+
 public class NamedThreadFactoryTest {
     private static final int THREAD_TOTAL_SIZE = 3;
     private static final int DEFAULT_THREAD_PREFIX_COUNTER = 1;

diff --git a/common/src/test/java/org/apache/seata/common/util/ArrayUtilsTest.java b/common/src/test/java/org/apache/seata/common/util/ArrayUtilsTest.java
@@ -19,8 +19,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-/**
- */
+
 public class ArrayUtilsTest {
 
     @Test

diff --git a/common/src/test/java/org/apache/seata/common/util/BufferUtilsTest.java b/common/src/test/java/org/apache/seata/common/util/BufferUtilsTest.java
@@ -21,8 +21,7 @@
 
 import java.nio.ByteBuffer;
 
-/**
- */
+
 public class BufferUtilsTest {
 
     @Test

diff --git a/common/src/test/java/org/apache/seata/common/util/ConfigToolsTest.java b/common/src/test/java/org/apache/seata/common/util/ConfigToolsTest.java
@@ -21,8 +21,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-/**
- */
+
 public class ConfigToolsTest {
 
     @Test

diff --git a/common/src/test/java/org/apache/seata/common/util/CycleDependencyHandlerTest.java b/common/src/test/java/org/apache/seata/common/util/CycleDependencyHandlerTest.java
@@ -19,8 +19,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-/**
- */
+
 public class CycleDependencyHandlerTest {
 
     @Test

diff --git a/common/src/test/java/org/apache/seata/common/util/DateUtilTest.java b/common/src/test/java/org/apache/seata/common/util/DateUtilTest.java
@@ -23,8 +23,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-/**
- */
+
 public class DateUtilTest {
     @Test
     public void testGetCurrentDate() {

diff --git a/common/src/test/java/org/apache/seata/common/util/HttpClientUtilTest.java b/common/src/test/java/org/apache/seata/common/util/HttpClientUtilTest.java
@@ -22,8 +22,7 @@
 import java.io.IOException;
 import java.util.HashMap;
 
-/**
- */
+
 public class HttpClientUtilTest {
 
     @Test

diff --git a/common/src/test/java/org/apache/seata/common/util/IOUtilTest.java b/common/src/test/java/org/apache/seata/common/util/IOUtilTest.java
@@ -19,8 +19,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-/**
- */
+
 public class IOUtilTest {
 
     @Test

diff --git a/common/src/test/java/org/apache/seata/common/util/LowerCaseLinkHashMapTest.java b/common/src/test/java/org/apache/seata/common/util/LowerCaseLinkHashMapTest.java
@@ -27,8 +27,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-/**
- */
+
 public class LowerCaseLinkHashMapTest {
 
     private static final Map<String, Object> lowerCaseLinkHashMap = new LowerCaseLinkHashMap<>();

diff --git a/common/src/test/java/org/apache/seata/common/util/MapUtilTest.java b/common/src/test/java/org/apache/seata/common/util/MapUtilTest.java
@@ -24,8 +24,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-/**
- */
+
 public class MapUtilTest {
 
     @Test

diff --git a/common/src/test/java/org/apache/seata/common/util/NumberUtilsTest.java b/common/src/test/java/org/apache/seata/common/util/NumberUtilsTest.java
@@ -19,8 +19,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-/**
- */
+
 public class NumberUtilsTest {
 
     @Test

diff --git a/...essor-deflater/src/main/java/org/apache/seata/compressor/deflater/DeflaterCompressor.java b/...essor-deflater/src/main/java/org/apache/seata/compressor/deflater/DeflaterCompressor.java
@@ -19,8 +19,7 @@
 import org.apache.seata.common.loader.LoadLevel;
 import org.apache.seata.core.compressor.Compressor;
 
-/**
- */
+
 @LoadLevel(name = "DEFLATER")
 public class DeflaterCompressor implements Compressor {
 

diff --git a/...-compressor-deflater/src/main/java/org/apache/seata/compressor/deflater/DeflaterUtil.java b/...-compressor-deflater/src/main/java/org/apache/seata/compressor/deflater/DeflaterUtil.java
@@ -21,8 +21,7 @@
 import java.util.zip.Deflater;
 import java.util.zip.Inflater;
 
-/**
- */
+
 public class DeflaterUtil {
 
     private DeflaterUtil() {