Merge branch 'protobuf-demo' of https://github.com/vio-lin/dubbo-samples into vio...
authorHuang Yunkun <htynkn@gmail.com>
Thu, 29 Oct 2020 11:16:36 +0000 (19:16 +0800)
committerHuang Yunkun <htynkn@gmail.com>
Thu, 29 Oct 2020 11:16:36 +0000 (19:16 +0800)
commit1f6ba73e9eca17ccf449e9e3bf30ebcacf855ead
treebf9326349e0ce1ce4415fd82a61cf2c8cf56464b
parent1902d4d79b206bcacf1831eddab60491b6a856f6
parentac40f38f983678e0775f0304babba983d58734fa
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
22 files changed:
java/dubbo-samples-protobuf-json/README.md
java/dubbo-samples-protobuf-json/pom.xml
java/dubbo-samples-protobuf-json/protobuf-json-serialization-api/pom.xml
java/dubbo-samples-protobuf-json/protobuf-json-serialization-api/src/main/java/org/apache/dubbo/sample/protobuf/GoogleProtobufService.java
java/dubbo-samples-protobuf-json/protobuf-json-serialization-api/src/main/resources/protobuf/googleProtobufBasic.proto
java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/pom.xml
java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/consumer/ConsumerStarter.java
java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/genericCall/GenericClient.java
java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/provider/EmbeddedZooKeeper.java
java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/provider/GoogleProtobufServiceImpl.java
java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/provider/ProviderStarter.java
java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/java/org/apache/dubbo/sample/protobuf/utils/ZkUtil.java
java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/resources/META-INF/dubbo/org.apache.dubbo.common.serialize.Serialization
java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/resources/log4j.properties
java/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/src/main/resources/spring/provider.xml
java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/pom.xml
java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/ProtobufObjectInput.java
java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/ProtobufObjectOutput.java
java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/ProtobufSerialization.java
java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/exception/ProtobufSerializationException.java
java/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/src/main/java/org/apache/dubbo/sample/protobuf/serialization/utils/ProtobufUtils.java
java/pom.xml