grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,365 Commits 79 Branches 186 Tags 175 MiB
Commit Graph

1365 Commits

Author SHA1 Message Date
Nathan Mittler b784eb6b72 Merge pull request #138 from ejona86/proto-release 
Depend on proto 3.0.0-alpha-2 instead of snapshot
 2015-02-26 08:01:55 -08:00
Eric Anderson a6f5fff6e4 Depend on proto 3.0.0-alpha-2 instead of snapshot 
There has now been a release of the proto code we need, so use it
instead of master.
 2015-02-26 07:56:13 -08:00
Nathan Mittler 98e5a38dd2 Merge pull request #137 from nmittler/test_protos 
Updating integ test protos to be consistent with C
 2015-02-26 07:47:40 -08:00
nmittler 0e7685b2dd Updating integ test protos to be consistent with C 
See https://github.com/grpc/grpc/tree/master/test/cpp/interop

Their protos are missing the java package options. I'll file a separate
PR to resolve this.
 2015-02-26 07:43:23 -08:00
Nathan Mittler fc55f8b3db Merge pull request #136 from grpc/jayantkolhe-patch-1 
Update README.md
 2015-02-26 07:25:30 -08:00
Nathan Mittler 1ddd47b3c7 Merge pull request #134 from ejona86/proto3 
Swap to proto3
 2015-02-26 07:06:43 -08:00
Jayant Kolhe a75b3901aa Merge pull request #108 from LisaFC/master 
updated with new example code location and build
 2015-02-26 06:57:03 -08:00
Lisa Carey 2587dc302e updated with new example code location and build 2015-02-26 14:53:08 +00:00
Jayant Kolhe 30b8a30964 Merge pull request #74 from nmittler/remove_java_examples 
Removing java examples from grpc-common
 2015-02-26 06:50:56 -08:00
Jayant Kolhe 02a02c3084 Update README.md 
Adding link to Java Tutorial from Readme
 2015-02-26 05:21:03 -08:00
Xiao Hang b9048f758d Fix Android example 2015-02-25 21:57:29 -08:00
Eric Anderson ff2a28535a Swap to proto3 
Benchmark remains proto2 as the .proto has defaults that will need to be
adjusted.
 2015-02-25 21:50:37 -08:00
Jakob Buchgraber df321fed73 Create temporary directory for javanano test if it does not exist. 
The gradle task testNanoGolden fails because the temporary folder it tries to use does not exist.
The task tries to write files to temporaryDir which points to ./compiler/build/tmp/testNanoGolden/ on my machine.
The directory does not exist by default and so the run_nano_test.sh fails.
 2015-02-25 21:47:28 -08:00
Xiao Hang f41834ba62 Merge branch 'master' of https://github.com/grpc/grpc-common 2015-02-25 21:14:10 -08:00
Xiao Hang 33d0f0f6a5 Update README.md 2015-02-25 21:02:07 -08:00
zsurocking 33717e7236 Merge pull request #133 from grpc/revert-132-removenanotest 
Revert "Remove nano codegen test temporarily. Currently I haven't figuir...
 2015-02-25 20:58:13 -08:00
zsurocking 5902c6a3bb Revert "Remove nano codegen test temporarily. Currently I haven't figuired" 2015-02-25 20:54:53 -08:00
zsurocking c449d90256 Merge pull request #132 from zsurocking/removenanotest 
Remove nano codegen test temporarily. Currently I haven't figuired
 2015-02-25 20:50:12 -08:00
Xiao Hang b8f5c90e48 Remove nano codegen test temporarily. Currently I haven't figuired 
out how to make it work with "gradle clean build"
Somehow temporaryDir is not created when doing gradle clean build,
so the test complains about path not found
 2015-02-25 20:43:33 -08:00
Xiao Hang 78caf51297 Update Android Helloworld example 2015-02-25 19:27:06 -08:00
Jayant Kolhe 5cb7b6d2e9 Merge pull request #113 from grpc/mugurm-patch-1 
Create CONTRIBUTING.md
 2015-02-25 18:10:14 -08:00
Mugur Marculescu 69e778fbdd Update CONTRIBUTING.md 2015-02-25 18:08:52 -08:00
Mugur Marculescu ce3de059be Merge pull request #71 from LisaFC/master 
New Java tutorial
 2015-02-25 17:17:44 -08:00
rocking c60f0171cb Open source nano proto related code 
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=87180572
 2015-02-25 15:36:20 -08:00
zhangkun83 c01af90d18 Polish javadoc for stub/* 2015-02-25 15:20:36 -08:00
Mugur Marculescu 961ecc5a2c Update CONTRIBUTING.md 
Fix typos.
 2015-02-25 14:47:42 -08:00
Xiao Hang dcff315dc3 Add nano support to Java codegen. Now the user can specify a flag nano=true 
to generate naon related code in grpc service interface

Commandline example:
protoc --plugin=protoc-gen-java_rpc=build/binaries/java_pluginExecutable/java_plugin \
  --java_rpc_out=nano=true:"$OUTPUT_FILE" --javanano_out=ignore_services=true:"$OUTPUT_FILE" \
  --proto_path="$DIR_OF_PROTO_FILE" "$PROTO_FILE
 2015-02-25 14:38:03 -08:00
LisaFC c6deececa7 changed gradle command to ./gradlew 2015-02-25 22:34:56 +00:00
LisaFC 13177db545 made last added comment a bit simpler! 2015-02-25 22:30:00 +00:00
Dan Ciruli 66206399a6 Update README.md 2015-02-25 14:29:11 -08:00
LisaFC e691ffb8d4 Added note about using most recent compiler 2015-02-25 22:25:47 +00:00
Louis Ryan 46dd47f86b Cleanup Javadoc for Channel, ServerCall and their related classes. 2015-02-25 14:22:12 -08:00
LisaFC fa27c1a4d1 Update javatutorial.md 
Updated with @nmittler's edits.
 2015-02-25 22:20:20 +00:00
Jakob Buchgraber 1961402104 Revert "Have SendGrpcFrameCommand constructor take an AbstractStream object instead of a stream id." 
This reverts commit 0d78268b83.

Some unit tests aren't compiling due to this change.
 2015-02-25 14:05:57 -08:00
Jakob Buchgraber 7ef1781016 Cleanup and Nitpicking 
- Renamed 'eventGroup' property to 'group' as this what's used elsewhere.
- Moved assignment of the channel before the listener is added as currently
  there is a (theoretical) chance that the listener is executed before the assignment
  to channel happens, namely in case the Future is already done when the listener
  is added.
- Removed comment that seemed out of place / relict.
 2015-02-25 12:28:25 -08:00
Jakob Buchgraber 0d78268b83 Have SendGrpcFrameCommand constructor take an AbstractStream object instead of a stream id. 
As part of the effort to remove all blocking bits from the NettyClientStream with
this commit the SendGrpcFrameCommand now takes a stream object instead of the
stream id. This will be necessary as in a non blocking world the stream id might
not have yet been allocated when the SendGrpcFrameCommand gets instantiated.
 2015-02-25 12:20:35 -08:00
Nathan Mittler 1a39f7b248 Merge pull request #128 from jpinner/bump_hpack 
Upgrade com.twitter.hpack to v0.10.1
 2015-02-25 11:08:21 -08:00
nmittler e82a000835 Removing java examples from grpc-common 2015-02-25 11:03:42 -08:00
Nathan Mittler 194cad3f60 Merge pull request #127 from nmittler/helloworld 
Adding HelloWorld example to grpc-java repo.
 2015-02-25 10:58:56 -08:00
nmittler 87daf0e0dc Adding HelloWorld example to grpc-java repo. 2015-02-25 10:56:51 -08:00
Lisa Carey c716badd56 Fixed typo 2015-02-25 18:48:22 +00:00
Lisa Carey d60ef19609 New shiny Java tutorial 2015-02-25 18:46:17 +00:00
Jeff Pinner b1cc7cc09d Upgrade com.twitter.hpack to v0.10.1 2015-02-25 10:17:23 -08:00
Nathan Mittler 488f8a9989 Merge pull request #117 from nmittler/stream_removal_fix 
Fixing memory leak in stream removal policy
 2015-02-25 09:55:40 -08:00
Tim Emiola 7f6bb722e5 Remove superfluous link to protobuf install 2015-02-24 15:57:30 -08:00
Tim Emiola f3b5e7ab20 Update the Maven link 2015-02-24 15:56:44 -08:00
Eric Anderson 61179abcaa Set encoding for Java source to UTF-8 
Our new example uses UTF-8 characters. On systems that don't have UTF-8 as
their default locale, the build fails without the override.
 2015-02-24 23:02:50 +00:00
Nathan Mittler 360a84f42a Merge pull request #108 from nmittler/route_guide 
Adding RouteGuide example and deleting others.
 2015-02-24 13:59:07 -08:00
nmittler b897a89e78 Adding RouteGuide example and deleting others. 2015-02-24 13:58:16 -08:00
Nathan Mittler 494d273b05 Merge pull request #112 from nmittler/comments 
Some comment cleanup in the Netty builders.
 2015-02-24 13:17:47 -08:00