Skip to content

Commit 026693c

Browse files
lovepoemchickenlj
authored andcommitted
Merge pull request apache#2047, deprecate dubbo-rpc-thrift.
1 parent d2df156 commit 026693c

14 files changed

+48
-12
lines changed

.codecov.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ coverage:
77
ignore:
88
- "dubbo-demo/.*"
99
- "dubbo-common/src/main/java/org/apache/dubbo/common/json/*.java" # internal JSON impl is deprecate, ignore test coverage for them
10-
- "dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/AnnotationBean.java" # Deprecated
10+
- "dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/AnnotationBean.java" # Deprecated
11+
- "dubbo-rpc/dubbo-rpc-thrift/.*"

dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ClassNameGenerator.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
package org.apache.dubbo.rpc.protocol.thrift;
1818

1919
import org.apache.dubbo.common.extension.SPI;
20-
20+
/**
21+
* @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
22+
*/
23+
@Deprecated
2124
@SPI(DubboClassNameGenerator.NAME)
2225
public interface ClassNameGenerator {
2326

dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/DubboClassNameGenerator.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
* limitations under the License.
1616
*/
1717
package org.apache.dubbo.rpc.protocol.thrift;
18-
18+
/**
19+
* @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
20+
*/
21+
@Deprecated
1922
public class DubboClassNameGenerator implements ClassNameGenerator {
2023

2124
public static final String NAME = "dubbo";

dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftClassNameGenerator.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
* limitations under the License.
1616
*/
1717
package org.apache.dubbo.rpc.protocol.thrift;
18-
18+
/**
19+
* @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
20+
*/
21+
@Deprecated
1922
public class ThriftClassNameGenerator implements ClassNameGenerator {
2023

2124
public static final String NAME = "thrift";

dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftCodec.java

+4
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@
7272
* </ol>
7373
* </p>
7474
*/
75+
/**
76+
* @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
77+
*/
78+
@Deprecated
7579
public class ThriftCodec implements Codec2 {
7680

7781
public static final int MESSAGE_LENGTH_INDEX = 2;

dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftConstants.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
* limitations under the License.
1616
*/
1717
package org.apache.dubbo.rpc.protocol.thrift;
18-
18+
/**
19+
* @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
20+
*/
21+
@Deprecated
1922
public final class ThriftConstants {
2023

2124
public static final String THRIFT_PROTOCOL_KEY = "thrift.protocol";

dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftInvoker.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232

3333
import java.util.Set;
3434
import java.util.concurrent.locks.ReentrantLock;
35-
35+
/**
36+
* @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
37+
*/
38+
@Deprecated
3639
public class ThriftInvoker<T> extends AbstractInvoker<T> {
3740

3841
private final ExchangeClient[] clients;

dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftNativeCodec.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@
3535

3636
import java.io.IOException;
3737
import java.util.concurrent.atomic.AtomicInteger;
38-
38+
/**
39+
* @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
40+
*/
41+
@Deprecated
3942
public class ThriftNativeCodec implements Codec2 {
4043

4144
private final AtomicInteger thriftSeq = new AtomicInteger(0);

dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftProtocol.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@
4242
import java.util.concurrent.CompletableFuture;
4343
import java.util.concurrent.ConcurrentHashMap;
4444
import java.util.concurrent.ConcurrentMap;
45-
45+
/**
46+
* @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
47+
*/
48+
@Deprecated
4649
public class ThriftProtocol extends AbstractProtocol {
4750

4851
public static final int DEFAULT_PORT = 40880;

dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftType.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818

1919
import java.util.HashMap;
2020
import java.util.Map;
21-
21+
/**
22+
* @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
23+
*/
24+
@Deprecated
2225
public enum ThriftType {
2326

2427
BOOL, BYTE, I16, I32, I64, DOUBLE, STRING;

dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftUtils.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
* limitations under the License.
1616
*/
1717
package org.apache.dubbo.rpc.protocol.thrift;
18-
18+
/**
19+
* @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
20+
*/
21+
@Deprecated
1922
public class ThriftUtils {
2023

2124
/**

dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ext/MultiServiceProcessor.java

+4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
import java.util.concurrent.ConcurrentHashMap;
3232
import java.util.concurrent.ConcurrentMap;
3333

34+
/**
35+
* @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift to instead of this module
36+
*/
37+
@Deprecated
3438
public class MultiServiceProcessor implements TProcessor {
3539

3640
private static final Logger logger = LoggerFactory.getLogger(MultiServiceProcessor.class);

dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/io/InputStreamWrapper.java

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

1919
import java.io.IOException;
2020
import java.io.InputStream;
21-
21+
@Deprecated
2222
public class InputStreamWrapper extends InputStream {
2323

2424
private InputStream is;

dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/io/RandomAccessByteArrayOutputStream.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.io.OutputStream;
2323
import java.io.UnsupportedEncodingException;
2424
import java.nio.ByteBuffer;
25-
25+
@Deprecated
2626
public class RandomAccessByteArrayOutputStream extends OutputStream {
2727

2828
protected byte buffer[];

0 commit comments

Comments
 (0)