You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by hy...@apache.org on 2020/10/29 11:19:58 UTC
[dubbo-samples] branch master updated (1902d4d -> c1ea4ca)
This is an automated email from the ASF dual-hosted git repository.
hyunkun pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git.
from 1902d4d Merge branch 'tswstarplanet-rest_sample_package'
add ac40f38 add generic invoke demo for google protobuf service.
new 1f6ba73 Merge branch 'protobuf-demo' of https://github.com/vio-lin/dubbo-samples into vio-lin-protobuf-demo
new c1ea4ca Merge branch 'vio-lin-protobuf-demo'
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/dubbo-samples-protobuf-json/README.md | 36 ++++++
java/dubbo-samples-protobuf-json/pom.xml | 78 ++++++++++++
.../protobuf-json-serialization-api/pom.xml | 69 +++++++++++
.../sample/protobuf/GoogleProtobufService.java} | 9 +-
.../resources/protobuf/googleProtobufBasic.proto | 77 ++++++++++++
.../protobuf-json-serialization-demo/pom.xml | 75 +++++++++++
.../sample/protobuf/consumer/ConsumerStarter.java} | 24 ++--
.../sample/protobuf/genericCall/GenericClient.java | 81 ++++++++++++
.../protobuf/provider}/EmbeddedZooKeeper.java | 2 +-
.../provider/GoogleProtobufServiceImpl.java | 44 +++++++
.../sample/protobuf/provider/ProviderStarter.java} | 7 +-
.../dubbo/sample/protobuf/utils}/ZkUtil.java | 9 +-
...org.apache.dubbo.common.serialize.Serialization | 1 +
.../src/main/resources/log4j.properties | 0
.../src/main/resources/spring/provider.xml} | 10 +-
.../protobuf-json-serialization-implement}/pom.xml | 34 +++--
.../serialization/ProtobufObjectInput.java | 137 +++++++++++++++++++++
.../serialization/ProtobufObjectOutput.java | 122 ++++++++++++++++++
.../serialization/ProtobufSerialization.java | 59 +++++++++
.../exception/ProtobufSerializationException.java} | 13 +-
.../serialization/utils/ProtobufUtils.java | 137 +++++++++++++++++++++
java/pom.xml | 1 +
22 files changed, 981 insertions(+), 44 deletions(-)
create mode 100644 java/dubbo-samples-protobuf-json/README.md
create mode 100644 java/dubbo-samples-protobuf-json/pom.xml
create mode 100644 java/dubbo-samples-protobuf-json/protobuf-json-serialization-api/pom.xml
copy java/{dubbo-samples-cloud-native/dubbo-demo-interface/src/main/java/org/apache/dubbo/demo/GreetingService.java => dubbo-samples-protobuf-json/protobuf-json-serialization-api/src/main/java/org/apache/dubbo/sample/protobuf/GoogleProtobufService.java} (77%)
create mode 100644 java/dubbo-samples-protobuf-json/protobuf-json-serialization-api/src/main/resources/protobuf/googleProtobufBasic.proto
create mode 100644 java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/pom.xml
copy java/{dubbo-samples-api/src/main/java/org/apache/dubbo/samples/client/Application.java => dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/consumer/ConsumerStarter.java} (55%)
create mode 100644 java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/genericCall/GenericClient.java
copy java/{dubbo-samples-async/dubbo-samples-async-generated-future/src/main/java/org/apache/dubbo/samples/async => dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/provider}/EmbeddedZooKeeper.java (99%)
create mode 100644 java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/provider/GoogleProtobufServiceImpl.java
copy java/{dubbo-samples-serialization/dubbo-samples-serialization-java/src/main/java/org/apache/dubbo/samples/serialization/DubboProvider.java => dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/provider/ProviderStarter.java} (90%)
copy java/{dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/src/main/java/org/apache/dubbo/samples/metadatareport/local/xml => dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/utils}/ZkUtil.java (90%)
create mode 100644 java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/resources/META-INF/dubbo/org.apache.dubbo.common.serialize.Serialization
copy java/{dubbo-samples-zipkin => dubbo-samples-protobuf-json/protobuf-json-serialization-demo}/src/main/resources/log4j.properties (100%)
copy java/{dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/src/main/resources/spring/metadata-consumer.xml => dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/resources/spring/provider.xml} (82%)
copy java/{dubbo-samples-serialization => dubbo-samples-protobuf-json/protobuf-json-serialization-implement}/pom.xml (57%)
create mode 100644 java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/ProtobufObjectInput.java
create mode 100644 java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/ProtobufObjectOutput.java
create mode 100644 java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/ProtobufSerialization.java
copy java/{dubbo-samples-default-config/src/main/java/org/apache/dubbo/samples/multi/registry/impl/DemoServiceImpl.java => dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/exception/ProtobufSerializationException.java} (77%)
create mode 100644 java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/utils/ProtobufUtils.java
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[dubbo-samples] 02/02: Merge branch 'vio-lin-protobuf-demo'
Posted by hy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hyunkun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
commit c1ea4ca2c297b39cf149070476fe563aad17c16b
Merge: 1902d4d 1f6ba73
Author: Huang Yunkun <ht...@gmail.com>
AuthorDate: Thu Oct 29 19:17:39 2020 +0800
Merge branch 'vio-lin-protobuf-demo'
java/dubbo-samples-protobuf-json/README.md | 36 +++
java/dubbo-samples-protobuf-json/pom.xml | 78 +++++++
.../protobuf-json-serialization-api/pom.xml | 69 ++++++
.../sample/protobuf/GoogleProtobufService.java | 25 +++
.../resources/protobuf/googleProtobufBasic.proto | 77 +++++++
.../protobuf-json-serialization-demo/pom.xml | 75 +++++++
.../sample/protobuf/consumer/ConsumerStarter.java | 44 ++++
.../sample/protobuf/genericCall/GenericClient.java | 81 +++++++
.../protobuf/provider/EmbeddedZooKeeper.java | 250 +++++++++++++++++++++
.../provider/GoogleProtobufServiceImpl.java | 44 ++++
.../sample/protobuf/provider/ProviderStarter.java | 34 +++
.../apache/dubbo/sample/protobuf/utils/ZkUtil.java | 56 +++++
...org.apache.dubbo.common.serialize.Serialization | 1 +
.../src/main/resources/log4j.properties | 26 +++
.../src/main/resources/spring/provider.xml | 37 +++
.../protobuf-json-serialization-implement/pom.xml | 56 +++++
.../serialization/ProtobufObjectInput.java | 137 +++++++++++
.../serialization/ProtobufObjectOutput.java | 122 ++++++++++
.../serialization/ProtobufSerialization.java | 59 +++++
.../exception/ProtobufSerializationException.java | 25 +++
.../serialization/utils/ProtobufUtils.java | 137 +++++++++++
java/pom.xml | 1 +
22 files changed, 1470 insertions(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[dubbo-samples] 01/02: Merge branch 'protobuf-demo' of
https://github.com/vio-lin/dubbo-samples into vio-lin-protobuf-demo
Posted by hy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hyunkun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
commit 1f6ba73e9eca17ccf449e9e3bf30ebcacf855ead
Merge: 1902d4d ac40f38
Author: Huang Yunkun <ht...@gmail.com>
AuthorDate: Thu Oct 29 19:16:36 2020 +0800
Merge branch 'protobuf-demo' of https://github.com/vio-lin/dubbo-samples into vio-lin-protobuf-demo
# Conflicts:
# dubbo-samples-api/pom.xml
# pom.xml
java/dubbo-samples-protobuf-json/README.md | 36 +++
java/dubbo-samples-protobuf-json/pom.xml | 78 +++++++
.../protobuf-json-serialization-api/pom.xml | 69 ++++++
.../sample/protobuf/GoogleProtobufService.java | 25 +++
.../resources/protobuf/googleProtobufBasic.proto | 77 +++++++
.../protobuf-json-serialization-demo/pom.xml | 75 +++++++
.../sample/protobuf/consumer/ConsumerStarter.java | 44 ++++
.../sample/protobuf/genericCall/GenericClient.java | 81 +++++++
.../protobuf/provider/EmbeddedZooKeeper.java | 250 +++++++++++++++++++++
.../provider/GoogleProtobufServiceImpl.java | 44 ++++
.../sample/protobuf/provider/ProviderStarter.java | 34 +++
.../apache/dubbo/sample/protobuf/utils/ZkUtil.java | 56 +++++
...org.apache.dubbo.common.serialize.Serialization | 1 +
.../src/main/resources/log4j.properties | 26 +++
.../src/main/resources/spring/provider.xml | 37 +++
.../protobuf-json-serialization-implement/pom.xml | 56 +++++
.../serialization/ProtobufObjectInput.java | 137 +++++++++++
.../serialization/ProtobufObjectOutput.java | 122 ++++++++++
.../serialization/ProtobufSerialization.java | 59 +++++
.../exception/ProtobufSerializationException.java | 25 +++
.../serialization/utils/ProtobufUtils.java | 137 +++++++++++
java/pom.xml | 1 +
22 files changed, 1470 insertions(+)
diff --cc java/dubbo-samples-protobuf-json/README.md
index 0000000,0000000..14817a5
new file mode 100644
--- /dev/null
+++ b/java/dubbo-samples-protobuf-json/README.md
@@@ -1,0 -1,0 +1,36 @@@
++# About this sample
++
++This sample code demonstrates building up dubbo service provider and service consumer with the pure API approach.
++
++## About Request and Response Entity
++Google protocol file is in protobuf-json-serialization-api\src\main\resources\protobuf\googleProtobufBasic.proto.
++when protocol be modified, should refresh **org.apache.dubbo.sample.protobuf.GoogleProtobufBasic**.
++1. modify googleProtobufBasic.proto
++2. add <plugin> protobuf-maven-plugin</plugin> to dubbo-samples-protobuf\protobuf-json-serialization-api\pom.xml
++3. run bash ```
++ mvn generate-sources
++ ```
++4. copy code generated located in target directory to dubbo-samples-protobuf\protobuf-json-serialization-api\src\main\java
++
++## Start the service provider
++
++```
++Main class: org.apache.dubbo.sample.protobuf.provider.ProviderStarter
++```
++
++## Invoke the service consumer
++
++```
++normar client
++Main class: org.apache.dubbo.sample.protobuf.consumer.ConsumerStarter
++
++generic reference
++Main class: org.apache.dubbo.sample.protobuf.genericCall.GenericClient
++```
++
++## About Service Metadata of protobuf Service
++When invoke service with generic reference, we can construct request by referencing service meta data.
++Demo show how to use service meta data.
++```
++org.apache.dubbo.sample.protobuf.genericCall.GenericClient.printServiceData
++```
diff --cc java/dubbo-samples-protobuf-json/pom.xml
index 0000000,0000000..7f1b5f5
new file mode 100644
--- /dev/null
+++ b/java/dubbo-samples-protobuf-json/pom.xml
@@@ -1,0 -1,0 +1,78 @@@
++<?xml version="1.0" encoding="UTF-8"?>
++<project xmlns="http://maven.apache.org/POM/4.0.0"
++ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
++ <groupId>org.apache.dubbo</groupId>
++ <version>1.0-SNAPSHOT</version>
++ <modelVersion>4.0.0</modelVersion>
++
++ <artifactId>dubbo-samples-protobuf-json</artifactId>
++ <packaging>pom</packaging>
++ <modules>
++ <module>protobuf-json-serialization-api</module>
++ <module>protobuf-json-serialization-demo</module>
++ <module>protobuf-json-serialization-implement</module>
++ </modules>
++
++ <properties>
++ <source.level>1.8</source.level>
++ <target.level>1.8</target.level>
++ <dubbo.version>2.7.4.1</dubbo.version>
++ <protobuf.java>3.6.0</protobuf.java>
++ <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
++ <maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
++ <junit.version>4.12</junit.version>
++ <spring.version>4.3.16.RELEASE</spring.version>
++ <dubbo.port>20880</dubbo.port>
++ <zookeeper.port>2181</zookeeper.port>
++ </properties>
++
++ <dependencyManagement>
++ <dependencies>
++ <dependency>
++ <groupId>org.apache.dubbo</groupId>
++ <artifactId>dubbo</artifactId>
++ <version>${dubbo.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.dubbo</groupId>
++ <artifactId>dubbo-dependencies-zookeeper</artifactId>
++ <version>${dubbo.version}</version>
++ <type>pom</type>
++ </dependency>
++
++ <dependency>
++ <groupId>com.google.protobuf</groupId>
++ <artifactId>protobuf-java</artifactId>
++ <version>${protobuf.java}</version>
++ </dependency>
++ <dependency>
++ <groupId>junit</groupId>
++ <artifactId>junit</artifactId>
++ <version>${junit.version}</version>
++ <scope>test</scope>
++ </dependency>
++
++ <dependency>
++ <groupId>org.springframework</groupId>
++ <artifactId>spring-test</artifactId>
++ <version>${spring.version}</version>
++ <scope>test</scope>
++ </dependency>
++ </dependencies>
++ </dependencyManagement>
++ <build>
++ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-compiler-plugin</artifactId>
++ <version>${maven-compiler-plugin.version}</version>
++ <configuration>
++ <source>${source.level}</source>
++ <target>${target.level}</target>
++ </configuration>
++ </plugin>
++ </plugins>
++ </build>
++
++</project>
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-api/pom.xml
index 0000000,0000000..2ca0a97
new file mode 100644
--- /dev/null
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-api/pom.xml
@@@ -1,0 -1,0 +1,69 @@@
++<?xml version="1.0" encoding="UTF-8"?>
++<!--
++ ~ Licensed to the Apache Software Foundation (ASF) under one or more
++ ~ contributor license agreements. See the NOTICE file distributed with
++ ~ this work for additional information regarding copyright ownership.
++ ~ The ASF licenses this file to You 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.
++ -->
++<project xmlns="http://maven.apache.org/POM/4.0.0"
++ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
++ <parent>
++ <artifactId>dubbo-samples-protobuf-json</artifactId>
++ <groupId>org.apache.dubbo</groupId>
++ <version>1.0-SNAPSHOT</version>
++ </parent>
++ <modelVersion>4.0.0</modelVersion>
++
++ <artifactId>protobuf-json-serialization-api</artifactId>
++
++ <dependencies>
++ <dependency>
++ <groupId>com.google.protobuf</groupId>
++ <artifactId>protobuf-java</artifactId>
++ </dependency>
++ </dependencies>
++
++ <build>
++ <extensions>
++ <extension>
++ <groupId>kr.motd.maven</groupId>
++ <artifactId>os-maven-plugin</artifactId>
++ <version>1.6.0</version>
++ </extension>
++ </extensions>
++ <plugins>
++ <!--For CodeGen only-->
++ <plugin>
++ <groupId>org.xolstice.maven.plugins</groupId>
++ <artifactId>protobuf-maven-plugin</artifactId>
++ <version>0.6.1</version>
++ <extensions>true</extensions>
++ <executions>
++ <execution>
++ <goals>
++ <goal>compile</goal>
++ <goal>test-compile</goal>
++ </goals>
++ <configuration>
++ <protoSourceRoot>${basedir}/src/main/resources/protobuf</protoSourceRoot>
++ <protocArtifact>com.google.protobuf:protoc:3.4.0:exe:${os.detected.classifier}
++ </protocArtifact>
++ </configuration>
++ </execution>
++ </executions>
++ </plugin>
++ </plugins>
++ </build>
++
++</project>
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-api/src/main/java/org/apache/dubbo/sample/protobuf/GoogleProtobufService.java
index 0000000,80572cb..80572cb
mode 000000,100644..100644
--- a/java/dubbo-samples-protobuf-json/protobuf-json-serialization-api/src/main/java/org/apache/dubbo/sample/protobuf/GoogleProtobufService.java
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-api/src/main/java/org/apache/dubbo/sample/protobuf/GoogleProtobufService.java
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-api/src/main/resources/protobuf/googleProtobufBasic.proto
index 0000000,a813c75..a813c75
mode 000000,100644..100644
--- a/java/dubbo-samples-protobuf-json/protobuf-json-serialization-api/src/main/resources/protobuf/googleProtobufBasic.proto
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-api/src/main/resources/protobuf/googleProtobufBasic.proto
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/pom.xml
index 0000000,0000000..5136d8f
new file mode 100644
--- /dev/null
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/pom.xml
@@@ -1,0 -1,0 +1,75 @@@
++<?xml version="1.0" encoding="UTF-8"?>
++<!--
++ ~ Licensed to the Apache Software Foundation (ASF) under one or more
++ ~ contributor license agreements. See the NOTICE file distributed with
++ ~ this work for additional information regarding copyright ownership.
++ ~ The ASF licenses this file to You 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.
++ -->
++<project xmlns="http://maven.apache.org/POM/4.0.0"
++ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
++ <parent>
++ <artifactId>dubbo-samples-protobuf-json</artifactId>
++ <groupId>org.apache.dubbo</groupId>
++ <version>1.0-SNAPSHOT</version>
++ </parent>
++ <modelVersion>4.0.0</modelVersion>
++
++ <artifactId>protobuf-json-serialization-demo</artifactId>
++ <dependencies>
++ <dependency>
++ <groupId>org.apache.dubbo</groupId>
++ <artifactId>protobuf-json-serialization-api</artifactId>
++ <version>${project.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.dubbo</groupId>
++ <artifactId>protobuf-json-serialization-implement</artifactId>
++ <version>${project.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.dubbo</groupId>
++ <artifactId>dubbo-dependencies-zookeeper</artifactId>
++ <version>${dubbo.version}</version>
++ <type>pom</type>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.dubbo</groupId>
++ <artifactId>dubbo-dependencies-zookeeper</artifactId>
++ <version>${dubbo.version}</version>
++ <type>pom</type>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.dubbo</groupId>
++ <artifactId>dubbo-metadata-definition-protobuf</artifactId>
++ <version>${dubbo.version}</version>
++ </dependency>
++ </dependencies>
++
++ <profiles>
++ <profile>
++ <id>javax.annotation</id>
++ <activation>
++ <jdk>[1.11,)</jdk>
++ </activation>
++ <dependencies>
++ <dependency>
++ <groupId>javax.annotation</groupId>
++ <artifactId>javax.annotation-api</artifactId>
++ <version>1.3.2</version>
++ </dependency>
++ </dependencies>
++ </profile>
++ </profiles>
++
++</project>
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/consumer/ConsumerStarter.java
index 0000000,2e5cb84..2e5cb84
mode 000000,100644..100644
--- a/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/consumer/ConsumerStarter.java
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/consumer/ConsumerStarter.java
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/genericCall/GenericClient.java
index 0000000,1eba4a8..1eba4a8
mode 000000,100644..100644
--- a/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/genericCall/GenericClient.java
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/genericCall/GenericClient.java
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/provider/EmbeddedZooKeeper.java
index 0000000,8b7fa5c..8b7fa5c
mode 000000,100644..100644
--- a/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/provider/EmbeddedZooKeeper.java
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/provider/EmbeddedZooKeeper.java
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/provider/GoogleProtobufServiceImpl.java
index 0000000,b2059db..b2059db
mode 000000,100644..100644
--- a/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/provider/GoogleProtobufServiceImpl.java
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/provider/GoogleProtobufServiceImpl.java
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/provider/ProviderStarter.java
index 0000000,be6ed89..be6ed89
mode 000000,100644..100644
--- a/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/provider/ProviderStarter.java
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/provider/ProviderStarter.java
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/utils/ZkUtil.java
index 0000000,18bcb85..18bcb85
mode 000000,100644..100644
--- a/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/utils/ZkUtil.java
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/utils/ZkUtil.java
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/resources/META-INF/dubbo/org.apache.dubbo.common.serialize.Serialization
index 0000000,99f49b6..99f49b6
mode 000000,100644..100644
--- a/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/resources/META-INF/dubbo/org.apache.dubbo.common.serialize.Serialization
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/resources/META-INF/dubbo/org.apache.dubbo.common.serialize.Serialization
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/resources/log4j.properties
index 0000000,d6ecd5c..d6ecd5c
mode 000000,100644..100644
--- a/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/resources/log4j.properties
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/resources/log4j.properties
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/resources/spring/provider.xml
index 0000000,046e7d0..046e7d0
mode 000000,100644..100644
--- a/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/resources/spring/provider.xml
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/resources/spring/provider.xml
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/pom.xml
index 0000000,0000000..e88e457
new file mode 100644
--- /dev/null
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/pom.xml
@@@ -1,0 -1,0 +1,56 @@@
++<?xml version="1.0" encoding="UTF-8"?>
++<!--
++ ~ Licensed to the Apache Software Foundation (ASF) under one or more
++ ~ contributor license agreements. See the NOTICE file distributed with
++ ~ this work for additional information regarding copyright ownership.
++ ~ The ASF licenses this file to You 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.
++ -->
++<project xmlns="http://maven.apache.org/POM/4.0.0"
++ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
++ <parent>
++ <artifactId>dubbo-samples-protobuf-json</artifactId>
++ <groupId>org.apache.dubbo</groupId>
++ <version>1.0-SNAPSHOT</version>
++ </parent>
++ <modelVersion>4.0.0</modelVersion>
++
++ <artifactId>protobuf-json-serialization-implement</artifactId>
++
++ <dependencies>
++ <dependency>
++ <groupId>org.apache.dubbo</groupId>
++ <artifactId>dubbo</artifactId>
++ </dependency>
++ <dependency>
++ <groupId>com.google.protobuf</groupId>
++ <artifactId>protobuf-java</artifactId>
++ </dependency>
++ </dependencies>
++
++ <profiles>
++ <profile>
++ <id>javax.annotation</id>
++ <activation>
++ <jdk>[1.11,)</jdk>
++ </activation>
++ <dependencies>
++ <dependency>
++ <groupId>javax.annotation</groupId>
++ <artifactId>javax.annotation-api</artifactId>
++ <version>1.3.2</version>
++ </dependency>
++ </dependencies>
++ </profile>
++ </profiles>
++</project>
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/ProtobufObjectInput.java
index 0000000,95d9e6f..95d9e6f
mode 000000,100644..100644
--- a/java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/ProtobufObjectInput.java
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/ProtobufObjectInput.java
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/ProtobufObjectOutput.java
index 0000000,561ab6d..561ab6d
mode 000000,100644..100644
--- a/java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/ProtobufObjectOutput.java
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/ProtobufObjectOutput.java
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/ProtobufSerialization.java
index 0000000,50c7e0f..50c7e0f
mode 000000,100644..100644
--- a/java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/ProtobufSerialization.java
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/ProtobufSerialization.java
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/exception/ProtobufSerializationException.java
index 0000000,4f7068e..4f7068e
mode 000000,100644..100644
--- a/java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/exception/ProtobufSerializationException.java
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/exception/ProtobufSerializationException.java
diff --cc java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/utils/ProtobufUtils.java
index 0000000,db23512..db23512
mode 000000,100644..100644
--- a/java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/utils/ProtobufUtils.java
+++ b/java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/utils/ProtobufUtils.java
diff --cc java/pom.xml
index c4e82ba,0000000..1cc9a86
mode 100644,000000..100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@@ -1,104 -1,0 +1,105 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-samples-all</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <modules>
+ <module>dubbo-maven-address-plugin</module>
+ <module>dubbo-samples-annotation</module>
+ <module>dubbo-samples-api</module>
+ <module>dubbo-samples-async</module>
+ <module>dubbo-samples-attachment</module>
+ <module>dubbo-samples-basic</module>
+ <module>dubbo-samples-cache</module>
+ <module>dubbo-samples-chain</module>
+ <module>dubbo-samples-callback</module>
+ <module>dubbo-samples-compatible</module>
+ <module>dubbo-samples-configcenter</module>
+ <module>dubbo-samples-context</module>
+ <module>dubbo-samples-direct</module>
+ <module>dubbo-samples-docker</module>
+ <module>dubbo-samples-echo</module>
+ <module>dubbo-samples-gateway</module>
+ <module>dubbo-samples-generic</module>
+ <module>dubbo-samples-group</module>
+ <module>dubbo-samples-governance</module>
+ <module>dubbo-samples-http</module>
+ <module>dubbo-samples-jetty</module>
+ <module>dubbo-samples-local</module>
+ <module>dubbo-samples-merge</module>
+ <module>dubbo-samples-metadata-report</module>
+ <module>dubbo-samples-mock</module>
+ <module>dubbo-samples-monitor</module>
+ <module>dubbo-samples-multi-registry</module>
+ <module>dubbo-samples-default-config</module>
+ <module>dubbo-samples-notify</module>
+ <module>dubbo-samples-resilience4j</module>
+ <module>dubbo-samples-rest</module>
+ <module>dubbo-samples-scala</module>
+ <module>dubbo-samples-simplified-registry</module>
+ <module>dubbo-samples-spi-compatible</module>
+ <module>dubbo-samples-spring-hystrix</module>
+ <module>dubbo-samples-spring-boot-hystrix</module>
+ <module>dubbo-samples-stub</module>
+ <module>dubbo-samples-switch-serialization-thread</module>
+ <module>dubbo-samples-thrift</module>
+ <module>dubbo-samples-validation</module>
+ <module>dubbo-samples-version</module>
+ <module>dubbo-samples-zipkin</module>
+ <module>dubbo-samples-zookeeper</module>
+ <module>dubbo-samples-transaction</module>
+ <module>dubbo-samples-consul</module>
+ <module>dubbo-samples-edas</module>
+ <module>dubbo-samples-nacos</module>
+ <module>dubbo-samples-metrics</module>
+ <module>dubbo-samples-environment-keys</module>
+ <module>dubbo-samples-protostuff</module>
+ <module>dubbo-samples-serialization</module>
+ <module>dubbo-samples-sentinel</module>
+ <module>dubbo-samples-grpc</module>
+ <module>dubbo-samples-cloud-native</module>
+ <module>dubbo-samples-protobuf</module>
++ <module>dubbo-samples-protobuf-json</module>
+ <module>dubbo-samples-ssl</module>
+ <module>dubbo-samples-perf</module>
+ <module>dubbo-samples-tengine</module>
+ <module>dubbo-samples-webservice</module>
+ </modules>
+
+ <repositories>
+ <repository>
+ <id>apache.snapshots.https</id>
+ <name>Apache Development Snapshot Repository</name>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org