You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2018/07/09 08:19:20 UTC
[incubator-dubbo] branch master updated: Merge pull request #2047, deprecate dubbo-rpc-thrift.

This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git


The following commit(s) were added to refs/heads/master by this push:
     new 026693c  Merge pull request #2047, deprecate dubbo-rpc-thrift.
026693c is described below

commit 026693c649afffbc0c0a047d08cde0230de99e99
Author: Xin Wang <xi...@gmail.com>
AuthorDate: Mon Jul 9 16:19:02 2018 +0800

    Merge pull request #2047, deprecate dubbo-rpc-thrift.
---
 .codecov.yml                                                         | 3 ++-
 .../org/apache/dubbo/rpc/protocol/thrift/ClassNameGenerator.java     | 5 ++++-
 .../apache/dubbo/rpc/protocol/thrift/DubboClassNameGenerator.java    | 5 ++++-
 .../apache/dubbo/rpc/protocol/thrift/ThriftClassNameGenerator.java   | 5 ++++-
 .../main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftCodec.java  | 4 ++++
 .../java/org/apache/dubbo/rpc/protocol/thrift/ThriftConstants.java   | 5 ++++-
 .../java/org/apache/dubbo/rpc/protocol/thrift/ThriftInvoker.java     | 5 ++++-
 .../java/org/apache/dubbo/rpc/protocol/thrift/ThriftNativeCodec.java | 5 ++++-
 .../java/org/apache/dubbo/rpc/protocol/thrift/ThriftProtocol.java    | 5 ++++-
 .../main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftType.java   | 5 ++++-
 .../main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftUtils.java  | 5 ++++-
 .../apache/dubbo/rpc/protocol/thrift/ext/MultiServiceProcessor.java  | 4 ++++
 .../org/apache/dubbo/rpc/protocol/thrift/io/InputStreamWrapper.java  | 2 +-
 .../rpc/protocol/thrift/io/RandomAccessByteArrayOutputStream.java    | 2 +-
 14 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/.codecov.yml b/.codecov.yml
index a99dbaf..4b49c86 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -7,4 +7,5 @@ coverage:
 ignore:
   - "dubbo-demo/.*"
   - "dubbo-common/src/main/java/org/apache/dubbo/common/json/*.java" #  internal JSON impl is deprecate, ignore test coverage for them
-  - "dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/AnnotationBean.java" # Deprecated
\ No newline at end of file
+  - "dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/AnnotationBean.java" # Deprecated
+  - "dubbo-rpc/dubbo-rpc-thrift/.*"
\ No newline at end of file
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ClassNameGenerator.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ClassNameGenerator.java
index 0a5e226..dd2d7f3 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ClassNameGenerator.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ClassNameGenerator.java
@@ -17,7 +17,10 @@
 package org.apache.dubbo.rpc.protocol.thrift;
 
 import org.apache.dubbo.common.extension.SPI;
-
+/**
+ * @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
+ */
+@Deprecated
 @SPI(DubboClassNameGenerator.NAME)
 public interface ClassNameGenerator {
 
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/DubboClassNameGenerator.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/DubboClassNameGenerator.java
index 0ed589e..cc4b1b2 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/DubboClassNameGenerator.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/DubboClassNameGenerator.java
@@ -15,7 +15,10 @@
  * limitations under the License.
  */
 package org.apache.dubbo.rpc.protocol.thrift;
-
+/**
+ * @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
+ */
+@Deprecated
 public class DubboClassNameGenerator implements ClassNameGenerator {
 
     public static final String NAME = "dubbo";
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftClassNameGenerator.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftClassNameGenerator.java
index ed2073b..ce8b359 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftClassNameGenerator.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftClassNameGenerator.java
@@ -15,7 +15,10 @@
  * limitations under the License.
  */
 package org.apache.dubbo.rpc.protocol.thrift;
-
+/**
+ * @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
+ */
+@Deprecated
 public class ThriftClassNameGenerator implements ClassNameGenerator {
 
     public static final String NAME = "thrift";
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftCodec.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftCodec.java
index cba0664..b693847 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftCodec.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftCodec.java
@@ -72,6 +72,10 @@ import java.util.concurrent.atomic.AtomicInteger;
  * </ol>
  * </p>
  */
+/**
+ * @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
+ */
+@Deprecated
 public class ThriftCodec implements Codec2 {
 
     public static final int MESSAGE_LENGTH_INDEX = 2;
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftConstants.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftConstants.java
index 12fd19f..55fb552 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftConstants.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftConstants.java
@@ -15,7 +15,10 @@
  * limitations under the License.
  */
 package org.apache.dubbo.rpc.protocol.thrift;
-
+/**
+ * @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
+ */
+@Deprecated
 public final class ThriftConstants {
 
     public static final String THRIFT_PROTOCOL_KEY = "thrift.protocol";
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftInvoker.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftInvoker.java
index e3f3930..fa123e2 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftInvoker.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftInvoker.java
@@ -32,7 +32,10 @@ import org.apache.dubbo.rpc.protocol.AbstractInvoker;
 
 import java.util.Set;
 import java.util.concurrent.locks.ReentrantLock;
-
+/**
+ * @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
+ */
+@Deprecated
 public class ThriftInvoker<T> extends AbstractInvoker<T> {
 
     private final ExchangeClient[] clients;
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftNativeCodec.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftNativeCodec.java
index 0822904..e7e036a 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftNativeCodec.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftNativeCodec.java
@@ -35,7 +35,10 @@ import org.apache.thrift.transport.TIOStreamTransport;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
-
+/**
+ * @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
+ */
+@Deprecated
 public class ThriftNativeCodec implements Codec2 {
 
     private final AtomicInteger thriftSeq = new AtomicInteger(0);
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftProtocol.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftProtocol.java
index 81b7f02..1c50bdf 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftProtocol.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftProtocol.java
@@ -42,7 +42,10 @@ import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-
+/**
+ * @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
+ */
+@Deprecated
 public class ThriftProtocol extends AbstractProtocol {
 
     public static final int DEFAULT_PORT = 40880;
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftType.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftType.java
index 7ef659b..3d8d3b3 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftType.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftType.java
@@ -18,7 +18,10 @@ package org.apache.dubbo.rpc.protocol.thrift;
 
 import java.util.HashMap;
 import java.util.Map;
-
+/**
+ * @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
+ */
+@Deprecated
 public enum ThriftType {
 
     BOOL, BYTE, I16, I32, I64, DOUBLE, STRING;
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftUtils.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftUtils.java
index f4eb01e..da4408b 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftUtils.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftUtils.java
@@ -15,7 +15,10 @@
  * limitations under the License.
  */
 package org.apache.dubbo.rpc.protocol.thrift;
-
+/**
+ * @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift instead
+ */
+@Deprecated
 public class ThriftUtils {
 
     /**
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ext/MultiServiceProcessor.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ext/MultiServiceProcessor.java
index 712db8e..e80efa4 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ext/MultiServiceProcessor.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ext/MultiServiceProcessor.java
@@ -31,6 +31,10 @@ import java.io.ByteArrayOutputStream;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+/**
+ * @since 2.7.0, use https://github.com/dubbo/dubbo-rpc-native-thrift to instead of this module
+ */
+@Deprecated
 public class MultiServiceProcessor implements TProcessor {
 
     private static final Logger logger = LoggerFactory.getLogger(MultiServiceProcessor.class);
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/io/InputStreamWrapper.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/io/InputStreamWrapper.java
index a35568b..c1eb69d 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/io/InputStreamWrapper.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/io/InputStreamWrapper.java
@@ -18,7 +18,7 @@ package org.apache.dubbo.rpc.protocol.thrift.io;
 
 import java.io.IOException;
 import java.io.InputStream;
-
+@Deprecated
 public class InputStreamWrapper extends InputStream {
 
     private InputStream is;
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/io/RandomAccessByteArrayOutputStream.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/io/RandomAccessByteArrayOutputStream.java
index af9485b..bfdd8c0 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/io/RandomAccessByteArrayOutputStream.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/io/RandomAccessByteArrayOutputStream.java
@@ -22,7 +22,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
-
+@Deprecated
 public class RandomAccessByteArrayOutputStream extends OutputStream {
 
     protected byte buffer[];