Skip to content

Commit 5a84c42

Browse files
authored
optimize: server compatible io.seata package (apache#6310)
1 parent 74785d2 commit 5a84c42

File tree

482 files changed

+885
-977
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

482 files changed

+885
-977
lines changed

changes/en-us/2.x.md

+2
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,12 @@ Add changes here for all PR submitted to the 2.x branch.
7676
- [[#6298](https://github.com/apache/incubator-seata/pull/6298)] repackage name to org.apache.seata
7777
- [[#6306](https://github.com/apache/incubator-seata/pull/6306)] replace some URL to org/apache/seata
7878
- [[#6304](https://github.com/apache/incubator-seata/pull/6304)] disable Publish OSSRH workflow
79+
- [[#6310](https://github.com/apache/incubator-seata/pull/6310)] seata-server compatible io.seata package
7980
- [[#6301](https://github.com/apache/incubator-seata/pull/6301)] upgrade console frontend dependencies and supported nodejs versions
8081
- [[#6301](https://github.com/apache/incubator-seata/pull/6312)] add saga related io.seata compatible api
8182
- [[#6313](https://github.com/apache/incubator-seata/pull/6313)] console display the version number
8283

84+
8385
### security:
8486
- [[#6069](https://github.com/apache/incubator-seata/pull/6069)] Upgrade Guava dependencies to fix security vulnerabilities
8587
- [[#6145](https://github.com/apache/incubator-seata/pull/6145)] upgrade jettison to 1.5.4

changes/zh-cn/2.x.md

+2
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,12 @@
7474
- [[#6298](https://github.com/apache/incubator-seata/pull/6298)] 重命名包名为 org.apache.seata
7575
- [[#6306](https://github.com/apache/incubator-seata/pull/6306)] 替换一些URL 至 org/apache/seata
7676
- [[#6304](https://github.com/apache/incubator-seata/pull/6304)] 禁用 OSSRH 发布工作流
77+
- [[#6310](https://github.com/apache/incubator-seata/pull/6310)] seata-server兼容io.seata包
7778
- [[#6301](https://github.com/apache/incubator-seata/pull/6301)] 升级console前端依赖及支持的nodejs版本
7879
- [[#6301](https://github.com/apache/incubator-seata/pull/6312)] 添加saga相关的io.seata兼容性API
7980
- [[#6313](https://github.com/apache/incubator-seata/pull/6313)] console展示版本号
8081

82+
8183
### security:
8284
- [[#6069](https://github.com/apache/incubator-seata/pull/6069)] 升级Guava依赖版本,修复安全漏洞
8385
- [[#6144](https://github.com/apache/incubator-seata/pull/6144)] 升级Nacos依赖版本至1.4.6

common/src/main/java/org/apache/seata/common/DefaultValues.java

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import java.time.Duration;
2020

21-
/**
22-
*/
2321
public interface DefaultValues {
2422
int DEFAULT_CLIENT_LOCK_RETRY_INTERVAL = 10;
2523
int DEFAULT_TM_DEGRADE_CHECK_ALLOW_TIMES = 10;

common/src/main/java/org/apache/seata/common/exception/JsonParseException.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
*/
1717
package org.apache.seata.common.exception;
1818

19-
/**
20-
*/
19+
2120
public class JsonParseException extends RuntimeException {
2221

2322
public JsonParseException(String message) {

common/src/main/java/org/apache/seata/common/metadata/ClusterRole.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
*/
1717
package org.apache.seata.common.metadata;
1818

19-
/**
20-
*/
19+
2120
public enum ClusterRole {
2221

2322
/**

common/src/main/java/org/apache/seata/common/metadata/Metadata.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
import org.apache.seata.common.store.StoreMode;
2828
import org.apache.seata.common.util.StringUtils;
2929

30-
/**
31-
*/
30+
3231
public class Metadata {
3332

3433
private final Map<String/*vgroup*/, Map<String/*raft-group*/, Node>> leaders = new ConcurrentHashMap<>();

common/src/main/java/org/apache/seata/common/metadata/MetadataResponse.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818

1919
import java.util.List;
2020

21-
/**
22-
*/
21+
2322
public class MetadataResponse {
2423

2524
List<Node> nodes;

common/src/main/java/org/apache/seata/common/metadata/Node.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import java.util.HashMap;
2020
import java.util.Map;
2121

22-
/**
23-
*/
22+
2423
public class Node {
2524

2625
Map<String, Object> metadata = new HashMap<>();

common/src/main/java/org/apache/seata/common/util/ConfigTools.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
import java.util.Base64;
2828
import javax.crypto.Cipher;
2929

30-
/**
31-
*/
30+
3231
public class ConfigTools {
3332

3433
// generate key pair

common/src/main/java/org/apache/seata/common/util/DurationUtil.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
import java.time.format.DateTimeParseException;
2121
import java.util.regex.Pattern;
2222

23-
/**
24-
*/
23+
2524
public class DurationUtil {
2625

2726
public static final Duration DEFAULT_DURATION = Duration.ofMillis(-1);

common/src/main/java/org/apache/seata/common/util/HttpClientUtil.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@
4444
import java.util.Map;
4545
import java.util.concurrent.ConcurrentHashMap;
4646

47-
/**
48-
*/
47+
4948
public class HttpClientUtil {
5049

5150
private static final Logger LOGGER = LoggerFactory.getLogger(HttpClientUtil.class);

common/src/main/java/org/apache/seata/common/util/IOUtil.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
*/
1717
package org.apache.seata.common.util;
1818

19-
/**
20-
*/
19+
2120
public class IOUtil {
2221

2322
/**

common/src/main/java/org/apache/seata/common/util/IdWorker.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
import java.util.Random;
2222
import java.util.concurrent.atomic.AtomicLong;
2323

24-
/**
25-
*/
24+
2625
public class IdWorker {
2726

2827
/**

common/src/main/java/org/apache/seata/common/util/SizeUtil.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
*/
1717
package org.apache.seata.common.util;
1818

19-
/**
20-
*/
19+
2120
public class SizeUtil {
2221
private static final long RADIX = 1024;
2322
/**

common/src/main/java/org/apache/seata/common/util/StringFormatUtils.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
*/
1717
package org.apache.seata.common.util;
1818

19-
/**
20-
*/
19+
2120
public class StringFormatUtils {
2221
private static final char MINUS = '-';
2322
private static final char UNDERLINE = '_';

common/src/test/java/org/apache/seata/common/exception/AuthenticationFailedExceptionTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import org.junit.jupiter.api.Assertions;
2020
import org.junit.jupiter.api.Test;
2121

22-
/**
23-
*/
22+
2423
public class AuthenticationFailedExceptionTest {
2524

2625
@Test

common/src/test/java/org/apache/seata/common/exception/JsonParseExceptionTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import org.junit.jupiter.api.Assertions;
2020
import org.junit.jupiter.api.Test;
2121

22-
/**
23-
*/
22+
2423
public class JsonParseExceptionTest {
2524

2625
@Test

common/src/test/java/org/apache/seata/common/exception/RedisExceptionTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import org.junit.jupiter.api.Assertions;
2020
import org.junit.jupiter.api.Test;
2121

22-
/**
23-
*/
22+
2423
public class RedisExceptionTest {
2524

2625
@Test

common/src/test/java/org/apache/seata/common/exception/RetryableExceptionTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import org.junit.jupiter.api.Assertions;
2020
import org.junit.jupiter.api.Test;
2121

22-
/**
23-
*/
22+
2423
public class RetryableExceptionTest {
2524

2625
@Test

common/src/test/java/org/apache/seata/common/holder/ObjectHolderTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
import org.junit.jupiter.api.BeforeEach;
2323
import org.junit.jupiter.api.Test;
2424

25-
/**
26-
*/
25+
2726
public class ObjectHolderTest {
2827

2928
@BeforeEach

common/src/test/java/org/apache/seata/common/io/FileLoaderTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
import org.junit.jupiter.api.Assertions;
2222
import org.junit.jupiter.api.Test;
2323

24-
/**
25-
*/
24+
2625
public class FileLoaderTest {
2726

2827
@Test

common/src/test/java/org/apache/seata/common/loader/ExtensionDefinitionTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import org.junit.jupiter.api.Assertions;
2020
import org.junit.jupiter.api.Test;
2121

22-
/**
23-
*/
22+
2423
public class ExtensionDefinitionTest {
2524

2625
@Test

common/src/test/java/org/apache/seata/common/loader/Hello2.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package org.apache.seata.common.loader;
1818

19-
/**
20-
*/
19+
2120
public interface Hello2 {
2221
}

common/src/test/java/org/apache/seata/common/loader/JapaneseHello.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
*/
1717
package org.apache.seata.common.loader;
1818

19-
/**
20-
*/
19+
2120
@LoadLevel(name = "JapaneseHello", order = Integer.MAX_VALUE)
2221
public class JapaneseHello implements Hello2{
2322

common/src/test/java/org/apache/seata/common/metadata/ClusterRoleTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import org.junit.jupiter.api.Assertions;
2020
import org.junit.jupiter.api.Test;
2121

22-
/**
23-
*/
22+
2423
public class ClusterRoleTest {
2524

2625
@Test

common/src/test/java/org/apache/seata/common/metadata/MetadataTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
import java.util.ArrayList;
2525
import java.util.List;
2626

27-
/**
28-
*/
27+
2928
public class MetadataTest {
3029

3130
private static Metadata metadata;

common/src/test/java/org/apache/seata/common/metadata/NodeTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121

2222
import java.util.HashMap;
2323

24-
/**
25-
*/
24+
2625
public class NodeTest {
2726

2827
@Test

common/src/test/java/org/apache/seata/common/thread/NamedThreadFactoryTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121

2222
import org.junit.jupiter.api.Test;
2323

24-
/**
25-
*/
24+
2625
public class NamedThreadFactoryTest {
2726
private static final int THREAD_TOTAL_SIZE = 3;
2827
private static final int DEFAULT_THREAD_PREFIX_COUNTER = 1;

common/src/test/java/org/apache/seata/common/util/ArrayUtilsTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import org.junit.jupiter.api.Assertions;
2020
import org.junit.jupiter.api.Test;
2121

22-
/**
23-
*/
22+
2423
public class ArrayUtilsTest {
2524

2625
@Test

common/src/test/java/org/apache/seata/common/util/BufferUtilsTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121

2222
import java.nio.ByteBuffer;
2323

24-
/**
25-
*/
24+
2625
public class BufferUtilsTest {
2726

2827
@Test

common/src/test/java/org/apache/seata/common/util/ConfigToolsTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
import org.junit.jupiter.api.Assertions;
2222
import org.junit.jupiter.api.Test;
2323

24-
/**
25-
*/
24+
2625
public class ConfigToolsTest {
2726

2827
@Test

common/src/test/java/org/apache/seata/common/util/CycleDependencyHandlerTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import org.junit.jupiter.api.Assertions;
2020
import org.junit.jupiter.api.Test;
2121

22-
/**
23-
*/
22+
2423
public class CycleDependencyHandlerTest {
2524

2625
@Test

common/src/test/java/org/apache/seata/common/util/DateUtilTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
import org.junit.jupiter.api.Assertions;
2424
import org.junit.jupiter.api.Test;
2525

26-
/**
27-
*/
26+
2827
public class DateUtilTest {
2928
@Test
3029
public void testGetCurrentDate() {

common/src/test/java/org/apache/seata/common/util/HttpClientUtilTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
import java.io.IOException;
2323
import java.util.HashMap;
2424

25-
/**
26-
*/
25+
2726
public class HttpClientUtilTest {
2827

2928
@Test

common/src/test/java/org/apache/seata/common/util/IOUtilTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import org.junit.jupiter.api.Assertions;
2020
import org.junit.jupiter.api.Test;
2121

22-
/**
23-
*/
22+
2423
public class IOUtilTest {
2524

2625
@Test

common/src/test/java/org/apache/seata/common/util/LowerCaseLinkHashMapTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
import org.junit.jupiter.api.BeforeEach;
2828
import org.junit.jupiter.api.Test;
2929

30-
/**
31-
*/
30+
3231
public class LowerCaseLinkHashMapTest {
3332

3433
private static final Map<String, Object> lowerCaseLinkHashMap = new LowerCaseLinkHashMap<>();

common/src/test/java/org/apache/seata/common/util/MapUtilTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
import org.junit.jupiter.api.Assertions;
2525
import org.junit.jupiter.api.Test;
2626

27-
/**
28-
*/
27+
2928
public class MapUtilTest {
3029

3130
@Test

common/src/test/java/org/apache/seata/common/util/NumberUtilsTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import org.junit.jupiter.api.Assertions;
2020
import org.junit.jupiter.api.Test;
2121

22-
/**
23-
*/
22+
2423
public class NumberUtilsTest {
2524

2625
@Test

compressor/seata-compressor-deflater/src/main/java/org/apache/seata/compressor/deflater/DeflaterCompressor.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import org.apache.seata.common.loader.LoadLevel;
2020
import org.apache.seata.core.compressor.Compressor;
2121

22-
/**
23-
*/
22+
2423
@LoadLevel(name = "DEFLATER")
2524
public class DeflaterCompressor implements Compressor {
2625

0 commit comments

Comments
 (0)