feat: remove proto
diff --git a/dubbo-samples-migration/case-configuration.yml b/dubbo-samples-migration/case-configuration.yml
index 79b7ea1..f4f6ed2 100644
--- a/dubbo-samples-migration/case-configuration.yml
+++ b/dubbo-samples-migration/case-configuration.yml
@@ -18,7 +18,7 @@
app_default: dubbo-samples-migration-default
app_default_main_class: org.apache.dubbo.migration.provider.ApiProvider
zookeeper_port: 2181
- triple_port: 50051
+ dubbo_port: 20880
services:
${app_default}:
@@ -26,10 +26,12 @@
basedir: ${app_default}
mainClass: ${app_default_main_class}
systemProps:
+ - dubbo.current.protocol=dubbo
- zookeeper.address=${app_default}
+ - dubbo.application.register-mode=all
checkPorts:
- ${zookeeper_port}
- - ${triple_port}
+ - ${dubbo_port}
checkLog: "dubbo service started"
${app_default}-test:
@@ -38,9 +40,10 @@
tests:
- "**/*IT.class"
systemProps:
+ - dubbo.current.protocol=dubbo
- zookeeper.address=${app_default}
waitPortsBeforeRun:
- ${app_default}:${zookeeper_port}
- - ${app_default}:${triple_port}
+ - ${app_default}:${dubbo_port}
depends_on:
- ${app_default}
\ No newline at end of file
diff --git a/dubbo-samples-migration/dubbo-samples-migration-default/pom.xml b/dubbo-samples-migration/dubbo-samples-migration-default/pom.xml
index 05c4176..a49ca72 100644
--- a/dubbo-samples-migration/dubbo-samples-migration-default/pom.xml
+++ b/dubbo-samples-migration/dubbo-samples-migration-default/pom.xml
@@ -12,33 +12,8 @@
<artifactId>dubbo-samples-migration-default</artifactId>
<build>
- <extensions>
- <extension>
- <groupId>kr.motd.maven</groupId>
- <artifactId>os-maven-plugin</artifactId>
- <version>1.6.1</version>
- </extension>
- </extensions>
<plugins>
<plugin>
- <groupId>org.xolstice.maven.plugins</groupId>
- <artifactId>protobuf-maven-plugin</artifactId>
- <version>0.6.1</version>
- <configuration>
- <protocArtifact>com.google.protobuf:protoc:3.7.1:exe:${os.detected.classifier}</protocArtifact>
- <pluginId>triple-java</pluginId>
- <outputDirectory>build/generated/source/proto/main/java</outputDirectory>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- <goal>test-compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
@@ -47,23 +22,6 @@
<target>${target.level}</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>build/generated/source/proto/main/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/dubbo-samples-migration/dubbo-samples-migration-default/src/main/java/org/apache/dubbo/migration/GreeterService.java b/dubbo-samples-migration/dubbo-samples-migration-default/src/main/java/org/apache/dubbo/migration/GreeterService.java
index 02d950d..5c0688f 100644
--- a/dubbo-samples-migration/dubbo-samples-migration-default/src/main/java/org/apache/dubbo/migration/GreeterService.java
+++ b/dubbo-samples-migration/dubbo-samples-migration-default/src/main/java/org/apache/dubbo/migration/GreeterService.java
@@ -16,6 +16,9 @@
*/
package org.apache.dubbo.migration;
+import org.apache.dubbo.migration.pojo.HelloReply;
+import org.apache.dubbo.migration.pojo.HelloRequest;
+
public interface GreeterService {
/**
diff --git a/dubbo-samples-migration/dubbo-samples-migration-default/src/main/java/org/apache/dubbo/migration/GreeterServiceImpl.java b/dubbo-samples-migration/dubbo-samples-migration-default/src/main/java/org/apache/dubbo/migration/GreeterServiceImpl.java
index 0ee95fc..525657b 100644
--- a/dubbo-samples-migration/dubbo-samples-migration-default/src/main/java/org/apache/dubbo/migration/GreeterServiceImpl.java
+++ b/dubbo-samples-migration/dubbo-samples-migration-default/src/main/java/org/apache/dubbo/migration/GreeterServiceImpl.java
@@ -17,12 +17,15 @@
package org.apache.dubbo.migration;
+import org.apache.dubbo.migration.pojo.HelloReply;
+import org.apache.dubbo.migration.pojo.HelloRequest;
+
public class GreeterServiceImpl implements GreeterService {
@Override
public HelloReply sayHello(HelloRequest request) {
- return HelloReply.newBuilder()
- .setMessage("Hello " + request.getName())
- .build();
+ HelloReply helloReply = new HelloReply();
+ helloReply.setMessage("Hello " + request.getName());
+ return helloReply;
}
}
diff --git a/dubbo-samples-migration/dubbo-samples-migration-default/src/main/java/org/apache/dubbo/migration/pojo/HelloReply.java b/dubbo-samples-migration/dubbo-samples-migration-default/src/main/java/org/apache/dubbo/migration/pojo/HelloReply.java
new file mode 100644
index 0000000..a764df7
--- /dev/null
+++ b/dubbo-samples-migration/dubbo-samples-migration-default/src/main/java/org/apache/dubbo/migration/pojo/HelloReply.java
@@ -0,0 +1,19 @@
+package org.apache.dubbo.migration.pojo;
+
+import java.io.Serializable;
+
+/**
+ * @author plusman
+ * @since 2021/9/12 10:22 PM
+ */
+public class HelloReply implements Serializable {
+ private String message;
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+}
diff --git a/dubbo-samples-migration/dubbo-samples-migration-default/src/main/java/org/apache/dubbo/migration/pojo/HelloRequest.java b/dubbo-samples-migration/dubbo-samples-migration-default/src/main/java/org/apache/dubbo/migration/pojo/HelloRequest.java
new file mode 100644
index 0000000..c6010a8
--- /dev/null
+++ b/dubbo-samples-migration/dubbo-samples-migration-default/src/main/java/org/apache/dubbo/migration/pojo/HelloRequest.java
@@ -0,0 +1,19 @@
+package org.apache.dubbo.migration.pojo;
+
+import java.io.Serializable;
+
+/**
+ * @author plusman
+ * @since 2021/9/12 10:25 PM
+ */
+public class HelloRequest implements Serializable {
+ private String name;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/dubbo-samples-migration/dubbo-samples-migration-default/src/main/java/org/apache/dubbo/migration/provider/ApiProvider.java b/dubbo-samples-migration/dubbo-samples-migration-default/src/main/java/org/apache/dubbo/migration/provider/ApiProvider.java
index 39dcf85..084d7c3 100644
--- a/dubbo-samples-migration/dubbo-samples-migration-default/src/main/java/org/apache/dubbo/migration/provider/ApiProvider.java
+++ b/dubbo-samples-migration/dubbo-samples-migration-default/src/main/java/org/apache/dubbo/migration/provider/ApiProvider.java
@@ -16,7 +16,6 @@
*/
package org.apache.dubbo.migration.provider;
-import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.RegistryConfig;
@@ -28,6 +27,9 @@
public class ApiProvider {
public static void main(String[] args) throws InterruptedException {
+ String curProtocol = System.getProperty("dubbo.current.protocol", "tri");
+ String zookeeperAddress = System.getProperty("zookeeper.address", "127.0.0.1");
+
new EmbeddedZooKeeper(2181, false).start();
ServiceConfig<GreeterService> serviceConfig = new ServiceConfig<>();
@@ -36,8 +38,8 @@
DubboBootstrap bootstrap = DubboBootstrap.getInstance();
bootstrap.application(new ApplicationConfig("dubbo-demo-triple-api-provider"))
- .registry(new RegistryConfig("zookeeper://" + System.getProperty("zookeeper.address", "127.0.0.1") + ":2181"))
- .protocol(new ProtocolConfig(CommonConstants.TRIPLE, 50051))
+ .registry(new RegistryConfig("zookeeper://" + zookeeperAddress + ":2181"))
+ .protocol(new ProtocolConfig(curProtocol))
.service(serviceConfig)
.start();
diff --git a/dubbo-samples-migration/dubbo-samples-migration-default/src/main/proto/helloworld.proto b/dubbo-samples-migration/dubbo-samples-migration-default/src/main/proto/helloworld.proto
deleted file mode 100644
index 4a31504..0000000
--- a/dubbo-samples-migration/dubbo-samples-migration-default/src/main/proto/helloworld.proto
+++ /dev/null
@@ -1,29 +0,0 @@
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-syntax = "proto3";
-
-option java_multiple_files = true;
-option java_package = "org.apache.dubbo.migration";
-option java_outer_classname = "HelloWorldProto";
-option objc_class_prefix = "HLW";
-
-package helloworld;
-
-// The request message containing the user's name.
-message HelloRequest {
- string name = 1;
-}
-
-// The response message containing the greetings
-message HelloReply {
- string message = 1;
-}
diff --git a/dubbo-samples-migration/dubbo-samples-migration-default/src/test/java/org/apache/dubbo/migration/ApiConsumerIT.java b/dubbo-samples-migration/dubbo-samples-migration-default/src/test/java/org/apache/dubbo/migration/ApiConsumerIT.java
index bef9521..bf3a72b 100644
--- a/dubbo-samples-migration/dubbo-samples-migration-default/src/test/java/org/apache/dubbo/migration/ApiConsumerIT.java
+++ b/dubbo-samples-migration/dubbo-samples-migration-default/src/test/java/org/apache/dubbo/migration/ApiConsumerIT.java
@@ -5,6 +5,8 @@
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
+import org.apache.dubbo.migration.pojo.HelloReply;
+import org.apache.dubbo.migration.pojo.HelloRequest;
import org.junit.Assert;
import org.junit.Test;
@@ -16,24 +18,27 @@
public class ApiConsumerIT {
@Test
public void consumeInvoke() {
+ String curProtocol = System.getProperty("dubbo.current.protocol", "tri");
+ String zookeeperAddress = System.getProperty("zookeeper.address", "127.0.0.1");
+
ReferenceConfig<GreeterService> referenceConfig = new ReferenceConfig<>();
referenceConfig.setInterface(GreeterService.class);
referenceConfig.setCheck(false);
- referenceConfig.setProtocol(CommonConstants.TRIPLE);
+ referenceConfig.setProtocol(curProtocol);
referenceConfig.setLazy(true);
referenceConfig.setTimeout(100000);
DubboBootstrap bootstrap = DubboBootstrap.getInstance();
bootstrap.application(new ApplicationConfig("dubbo-demo-triple-api-consumer"))
- .registry(new RegistryConfig("zookeeper://" + System.getProperty("zookeeper.address", "127.0.0.1") + ":2181"))
+ .registry(new RegistryConfig("zookeeper://" + zookeeperAddress + ":2181"))
.reference(referenceConfig)
.start();
GreeterService greeterService = referenceConfig.get();
- final HelloReply reply = greeterService.sayHello(HelloRequest.newBuilder()
- .setName("triple")
- .build());
+ HelloRequest helloRequest = new HelloRequest();
+ helloRequest.setName(curProtocol);
+ final HelloReply reply = greeterService.sayHello(helloRequest);
- Assert.assertEquals("Hello triple", reply.getMessage());
+ Assert.assertEquals("Hello " + curProtocol, reply.getMessage());
}
}
diff --git a/dubbo-samples-migration/pom.xml b/dubbo-samples-migration/pom.xml
index 46cca60..e5d4981 100644
--- a/dubbo-samples-migration/pom.xml
+++ b/dubbo-samples-migration/pom.xml
@@ -16,7 +16,8 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<!-- <dubbo.version>3.0.2.1</dubbo.version>-->
- <dubbo.version>3.0.3-SNAPSHOT</dubbo.version>
+<!-- <dubbo.version>3.0.3-SNAPSHOT</dubbo.version>-->
+ <dubbo.version>2.7.13</dubbo.version>
<junit.version>4.12</junit.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<source.level>1.8</source.level>
