Squashed 'third_party/flatbuffers/' changes from acc9990ab..d6a8dbd26
d6a8dbd26 Experimental fix for failing oss-fuzz coverage build (#6259)
ed391e177 BREAKING: Rust flexbuffers serde human readable set to false (#6257)
a49531414 Update to flags in fuzzing-cmake file (#6256)
de1f0342c Remove _POSIX_C_SOURCE and _XOPEN_SOURCE definitions when compiling o… (#6205)
d0d51e2a5 flatc should support --binary --schema with optional scalar fields. (#6252)
33ab26017 Bump version of rules_go to 0.24.5 (#6234)
febb9d87c Union As Accessors for C# (#6251)
8778dc7c2 Resets buffer without deallocating current pointer (#6247)
aae376e9a Add GetBufferSpan() function to bufferbuilder (#6235)
0ff047148 Modernize android build and sample (#6229)
46a8c7e95 Added required-nested-flatbuffer to monster_test and fixed rust (#6236)
bc56c553e Notify based on Labelling issues and PR (#6241)
07d7cd78a Converted globs to use single quotes (#6240)
cdef70e24 More adjustments to the auto labeler (#6239)
9dd44df35 Updated Lua labeller glob (#6238)
c9b29d088 Support size-prefixed buffers and add tests for size-prefixed messages (#6232)
fba93e0ab Removes duplicate swift in labeler (#6228)
d1a545b1f Added more labels for auto labeler (#6227)
ea92a668d [C#] Optional Scalars (#6217)
6034de286 [Label Bot] Add Java and Kotlin support for the label bot (#6226)
b08b0a440 Implement `Debug` trait for Rust flatbuffers. (#6207)
17ae48dec [Label Bot] Adds some languages to labeler bot (#6222)
fc8097925 Auto Labeler Setup, Just C# for now (#6221)
55658f523 Auto Labeler Setup, Just C# for now (#6218)
14ecfe423 Updated comments and fixed a fundamental type error. (#6214)
a0182cdb1 optional scalars for ts/js (#6215)
0dfcc0a37 Adds NetTest.bat to run .NET Core tests on Windows (#6216)
f9a18ea63 [Java] Implement optional scalars (#6212)
c7586e85a Empties the sharedString map on reset on go and csharp (#6187)
914c64601 Removed C# references from java generator. Move annotations closer to definitions (#6204)
42d7c7997 Adds readable size to asserts in read functions (#6210)
e68e8d7de Refactor idl_gen_rust (#6206)
84809be7e Fix typo in flatbuffers::span declaration. (#6202)
1606fb637 Kotlin test optional enum (#6201)
fe8e3c7e5 Mass Refactoring to use `IsString` and other BASE_TYPE helpers (#6193)
8f6fa4b71 Updated SupportsAdvancedUnionFeatures to look out for string (#6190)
b46db38f5 [JS/TS] Rewrite flexbuffers JS to TS (#6148)
9fa1d2705 Rework enums in rust. (#6098)
a402b3aba idl_gen_json_schema Fix generation of arrays of enums (#6184)
0e1415b99 fix(go_test): remove deprecated grpc call (#6183)
5cd713710 Add generation of JSON Schema to library (#6165)
5be777e1d Bump junit from 4.12 to 4.13.1 in /grpc/tests (#6173)
a49d440ec Bump junit from 4.12 to 4.13.1 in /grpc (#6172)
4ec5e8db9 [C++] Add option to not generate direct copy methods. (#6166)
04bec23a3 Add Array initialization from struct constructor (#5865) (#6147)
77d57fd07 Cast to right type for reserved_ subtraction (#6167)
543c1bbeb Fixed rust nested flatbuffers for tables other than self (#6062)
cb971eece [C++] Fix -Wnarrowing and -Woverflow due to signed bitfields on G++ ARM (#6163)
7b9e61fcc [TS] GRPC Implementation (#6141)
3359e3042 Moved C++ to optional_scalars2 and added some tests. (#6162)
187a4787f [Rust] Upgrade flatbuffers library to 2018 edition (#6159)
08943aa26 Flatbuffer C++ UnpackTo optimization for vectors of non-bool bytes. (#6154)
5975658eb Enables optional enums in swift (#6160)
5d3cf440e Updated Lobster test for optional bools/enums
8ec8322f0 Ruopt enum (#6156)
bbcc85fd4 Fix generation of C++ code with Optional<Enum> (#6155)
0bdf2fa15 [C#] Fix and improve project files (#6142)
2eedc769d possibility to create a vector from an iterator (#6135)
ab01ae162 flatc should output a warning, when an attribute is attached more than once (#6146)
689bfafa7 [Python/JS/TS] Codegen SizeOf method for structs (#6136)
641309a5b unix2dos on tests/FlatBuffers.Test/FlatBuffers.Core.Test.csproj (#6133)
52e362879 SpanT is available in .Net Standard 2.0. (#6137)
dca12522a Add static cast to avoid implicit double promotion. (#6132)
e0bbaa6f9 [C#]Change to ENABLE_SPAN_T that doesn't require UNSAFE_BYTEBUFFER. (#6073)
ab139d6be Revert "[C#] Fix and improve project files (#6116)" (#6130)
34d67b425 Minireflect fixed array (#6129)
96d5e3597 [JS/TS] fix flatbuffers default export (#6123)
eb686a86f Add missed file generated by optional_scalar.fbs (#6125)
750281630 [C#] Fix and improve project files (#6116)
fb4e1c34f Add CharToLower and CharToUpper into util.s (#6126)
8c67b5b12 Add support of Optional<T> scalars to C++ code generator (#6092)
6228b66d3 [Kotlin] Support for optional scalars. (#6115)
e1be8aaad Bump version for latest swift version (#6121)
94873e595 [JS/TS] Modernize TypeScript / JavaScript flatbuffers support (#6095)
b8e87fafe [JS] Add getFullyQualifiedName() (#6119)
f96d1ef74 [Java] allowing larger buffer sizes when growing a byte buffer (#6118)
89435303b [Swift] Migrates struct write APIS to write directly to the buffer (#6093)
c75ae2429 Optional-ness in reflection (#6097)
338944d3d Rename Nullable scalars to Optional scalars (#6112)
f5ab24bc4 Avoid memcpy call for empty vectors (#6111)
92a8c1a0f [JS] FlexBuffers Fix for wrong type of offset and length values (#6107)
6cea45dcd fix c# json serializer commandline argument docs (#6104)
fec58aa12 Fix for issue 6100: incorrect shrinking logic in ResizeContext() (#6102)
71aca81ff [JS] FlexBuffers Support (#5973)
04d87ffec [C++] Small refactoring of the C++ code generator (#6091)
bb25956f0 Wrap verify file id condition in Check call (#6085)
49f4948f0 + Add `removable-media` plug to the snapcraft config (#6083)
eeacc53d2 Adds proper access types for swift object api & flatbuffers & grpc (#6081)
f3003e08d [Lobster] missed a test
d713a0084 [CMake] enabled multi-core builds in VS projects
77f966f89 [Lobster] optional scalars support
e86d5b8e9 [Kotlin] Attach JvmStatic annotation to each method in companion object (#6052)
db2aa9b4e [C#] Cleaned up .NET testing script for Mono (#6016)
63cc0eec4 Adds a serialize helper function to native table (#6059)
c30a87de6 [TS] Fix four bugs with imported types in TypeScript. (#6054)
a0fb30575 [Swift] Append namespace for Swift Grpc implementation (#6049)
77c18c1d6 export a __version__ variable for python module (#5309)
f1f23d08e adding fb import when no other imports are present (#6030)
f1025b284 [Feature] Checks for Nullable strings (#6050)
5d052f4e5 [Swift] RFC: Switch Swift namespace from public enum to ordinary concat with _ (#6045)
18b015d25 Rust codegen improvements and lint fixes (#6046)
d76e93f27 adds code gen for optional scalars in swift (#6038)
82fac326c [C++] Fix compiler error from deleted assignment operator (#6036) (#6047)
043b52bd4 Optional Scalars support for Rust (#6034)
c8fa0afdf Allow to run cpp tests under grpc/tests/ using bazel. (#6040)
6d0aae73c Fix git command executed in wrong folder when doing cmake superbuild (#6039)
ff1b73128 [Swift] Optional Scalars Preparation (#6028)
2e48c8dd3 tests: Check for both quiet and signaling NaN on mipsel/hppa (#6029)
6942704f2 support deprecated flag in json schema (#6022)
9ecd2e16c Flatc parser support for nullable scalars (#6026)
33e2d8079 [Dart] Generate constant values map for enums (#6025)
969d0f7a6 Using proper symbol name for reexport (#6021)
515a4052a Silence false positive "-Wstringop-overflow" on GCC 10.0 to 11.0 (#6020)
36fbe6f13 Updated FB import (#6019)
b69fc8cc9 [Java] Add support for shared strings on FlatBufferBuilder. (#6012)
ab6af18d9 Not using non-existent create method for obj api (#6015)
37a5dee10 Code cleanup + updates test and readme (#6004)
8a721f69a Serde with bytes maps to Blob (#6009)
e810635ea [Swift] FlatBuffers createMonster method doesn't treat struct properly (#5992)
4995e1527 Manage grpc dependency in Bazel's WORKSPACE file. (#5995)
60b6066fe Add warning to schema parser if field name is not snake_case. (#6005)
35d45cac7 [Rust] Flexbuffers dependency cleanup and fixes (#5998)
165a6e3d1 Re-added Evolution Schema Code Generation Command (#5999)
13d3fb2ea Fix RPM install conflict (#6003)
d64078eb2 [Swift] Initialize memory when clear ByteBuffer (#5982)
ca1190a3d [TS] Use proper TypedArray in create*Vector (#5991)
7571b2ac5 [C++] Updates real_path to be truly portable (#5787)
e5a8f76a4 [C++] Generate default member initializers for >= C++11 (#5989)
413bb9b55 [Kotlin] Fix Access to union of vector element (#5994)
f35184aef [Swift] Add parsing from unowned UnsafeMutableRawPointer for ByteBuffer (#5981)
b124b7625 Removed requirement that enums be declared in ascending order. (#5887)
0ec7600c6 Do not remove the last digit from float values (#5974)
14baf45c9 Mark GetBufferMinAlignment() const (#5985)
9abb2ec2c TypeScript/JavaScript docs improvements (#5984)
2e57d80b1 [Swift] Internal library improvements (#5965)
cfc7753a4 [Doc] Added missing letters to compiler options (#5976)
12ddc8a92 Rust Flexbuffers Documentation update (#5979)
24ad35709 [docs] typo: updates monsterdata.json to be valid json (#5978)
cc44a4442 [idl_parser] Mark typefield as deprecated (#5958)
9ab4a5c0e Deleted old stale bot
6682cfe87 Increased Operations per run in stale.yml
64922904b Adding Stale Action to clean up PR and Issues
8e505cb67 [C++] Fixed/Enabled --cpp-ptr-type std::shared_ptr [#5813] (#5959)
a28357d7a Propagate boolean default values from proto to fbs (#5964)
7cb4762a6 [Swift] Improving reallocation time by using memcpy and moving reallocation code to storage (#5960)
4e45f7c9e Fix error in SimpleQSort (#5955)
7ac026405 fix error on GRPC Python - ignore namespace tree if not specified (#5862) (#5922)
108e981db Required is now implemented in swift (#5952)
94a78e385 Fixed: Access violation and ASAN/UNSAN failures with sorted tables
53fb453e0 [rust] Add FlatBufferBuilder::force_defaults API (#5946)
17c1f35fa [FlexBuffer][Java] ReadWriteBuf and ReadBuf interface public (#5948)
2eaf57778 [Java] Grow ArrayReadWriteBuf enough to match requested capacity. (#5921)
666800da3 Adds bool support in structs + updates grpc support + CI upgrades (#5943)
38ed69eb3 fixed mutating inline values (#5942)
d026e6f07 Add static asserts to ensure that reflection API arrays are kept in sync (#5934)
988164f6e [C++] Got rid of memset's in constructors (#5938)
7179a5a8b General Codebase clean up (#5939)
a0da0c08c Add GetStringView like GetString, GetCstring (#5937)
ac203b209 [C#] Add file identifier to ObjectAPI Serialization Utility. (#5920)
8dd1bf25b not creating creation methods when using structs (#5919)
5aa443d98 [Dart] Adding FlexBuffers support (#5853)
0fa087657 [Dart] Getting tests/DartTest.sh to work on master. (#5915)
424a473e1 Schema parser: prohibit declaration of an array of pointers inside structs (#5907)
c3faa8346 Fix Cargo.toml dependencies (#5911)
91399ad05 fix union type names (#5902)
32782e4ad Update Rust Flexbuffers metadata before publishing (#5905)
e7f3b1690 [TS] Make Obj-API work with --short-names (#5898)
12ed1fe4a fixed invalid imports with --gen-all (#5895)
85ee4df7a [C#] Thread safe reads of Double and Float values from a ByteBuffer (#5900)
de89bd193 Implement flexbuffers in python (#5880)
8be05f6bd Rust Flexbuffers (#5669)
870ecbc09 [swift] Moves code to use VTablesStorage (#5888)
c2da8d5d8 [Java][FlexBuffers] Make FlexBuffersBuilder reusable by adding clear() (#5889) (#5890)
e84cbff67 Align package name to FindFlatBuffers.cmake (#5899)
f94e6c84e Small tutorial improvements - documentation only (#5894)
f12cca8bc Attempt at adding Github Actions CI
7e4124d6e Handle git program or .git folder absence (#5878)
a875d247a only add native_include_files if object based api is enabled (#5886)
6e9f5d981 Respect shared attribute in Parser (#5885)
ff1c78233 include/flatbuffers: typo fixes in comments (#5884)
2e9a19673 Updates swift docs for package management (#5883)
e3cb07d32 [Rust] idl_gen_rust.cpp: (Option/required-aware codegen for unions) (#5850)
712866d57 Propagate use_string_pooling in CopyTable (#5879)
44c919a9e Not using reexports with --gen-all (#5873)
99aa1ef21 Added INCLUDE_PREFIX option for flatbuffers_generate_headers (#5866)
40ba170c9 Fixed text in internals doc that implied structs can be root
cb4d0f72e [Swift] Object API support (#5826)
003e16405 [TS] Add Obj API (#5788)
21cf300f4 fix cpp usage markdown error (#5845)
9655e12d6 Upgraded swift implementation for grpc (#5843)
fb96fadc2 [C#] Fix nested structs and arrays in Object API (#5765)
408f11fbd [ts] Fix empty source/dest namespaces when reexporting. (#5841)
a83caf591 Improves performance for the swift library by using structs + a storage class (#5835)
925fab6b1 [Java][FlexBuffers] Optimize Map access (#5735)
d9fecc332 [CMake] : Add precompiled header support with FLATBUFFERS_ENABLE_PCH (#5827)
e9d453240 Added flatbuffers_generate_headers and flatbuffers_generate_binary_files cmake functions. (#5830)
c37c989ed Correct calculation of vector element size (#5831)
6b271b7ec Fix Clang-trunk warnings about special members deprecated in C++20. (#5829)
90f3b8e8c Fix `float_constant` definition in './doc/Grammar.md` (#5828)
3af735934 [csharp] flatc should generate a 'Create…' method for tables with struct field… (#5818)
c4231c3cb Updated doxyfile - added missing files (#5824)
9657df184 Update Grammar.md (#5820)
97ffc590e Include CPack only when explictly packaging (#5817)
8b52af65b [C++] Add max_depth and max_tables parameters to reflection::Verify (#5815)
9b034eee1 Fix interpretation of 'nan(number)' by the idl_parser (#5810)
3e9ac3cff [Scripts] Adds swift to generated code (#5806)
697147a2e updated maven build files
6df40a247 pre-tag version bump for 1.12
0dba63909 Removes the inner loop in the endtable check written tables (#5803)
0e3fdd0ee Escape characters in jsonschema descriptions (#5644)
45a2b07cb Remove `noexcept` qualifier copy-ctor of `union` type (#5800) (#5802)
d10c16314 Replace 'assert' by 'FLATBUFFERS_ASSERT' inside idl_parser.cpp (#5799)
35abb7f89 Add non-nullable modifier to return type of functions never returning null (#5797)
9954e09ab [C++] Generate code for vector force_align attribute. (#5796)
95a21327f rust: pub export the VectorIter type (#5736)
89b6183ee Fix Python min alignment
5a98d65e8 [Rust] Add gen-name-strings for Rust (#5757)
f73d205bc Removed assert that wasn't backwards compatible.
7c37abe92 [C#] add ObjectAPI Serialization Utility (#5785)
4749e77b0 Fixed docs on how to obtain parser error.
6ff189841 Added --filename-suffix and --filename-ext to flatc (#5778)
c9a30c9ca Fixed refractoring issue in reflection/generate_code.sh. Also, mv deletes the original file, so I don't need to clean it up manually in that case. (#5777)
8c02d17be Skip writing reflection_generated.h if not changed (#5776)
34305c4ce [Swift] Adds GRPC to Swift (#5758)
cd88e6b2a [Java][FlexBuffers] Abstract buffer access from ByteBuffer (#5743)
3ec7a53c6 Adds cocoapods and a readme of how to get the package (#5771)
6d44cede7 [snap] Fix versioning (#5727)
cc08c0835 [Python] Fixed potential allignment issue (#5768)
54f8b787c Fix memory leak on cpp object api (#5761)
17557f913 [Python] Fixed issue #5499 (#5764)
d54af8cd4 [C++] Use strong enum type for vectors when scoped-enums is on. (#5750)
173e10fdf [C#] support Json Serialization (#5752)
8f56990f6 FlexBuffers: C++: scalar-only typed vectors were not aligned.
6400c9b05 Bump Rust port to 0.6.1 (#5747)
7418d8587 [C#] support Object API (#5710)
c580fa284 Adds min and max, comments, and all of swift's keywords + fix docs (#5737)
f2a127230 Use VS 2017 and 2019 on CI, fix cast issue in dart_idl (#5740)
316d7c208 Creates a flatbuffers validation function + small fix (#5725)
47026ea6b Added the code to embed the binary schema to the source (--bfbs-gen-embed). (#5701)
3f677f241 [Java][FlexBuffers] Deprecate typed vector strings due to design flaw (#5722)
a593a11e5 [Go] Implements a SharedStrings function (#5733)
7cdfc8475 [Swift] Fix padding function overflow when bufSize is 0 (#5721)
bab2b0db4 Add vcpkg installation instructions (#5732)
89418eb84 [Dart] Fix deprecated field support, inf/nan (#5724)
9cadf05d8 [typescript] Size-prefixed root accessors not taking into account size prefix (#5717)
6da1cf79d [rust] Add use declarations to Rust-generated bindings for imported FB definitions (#5645)
bee1df96d [Go] Replace references to hardcoded ”Monster" etc with idiomatic go wherever possible (#5716)
01189d7ed [C++] Fix for printing of enum in case output_enum_identifiers=1. (#5706)
c4b2b0a25 [Swift] Support create long string (#5709)
a4b2884e4 Added create function for swift (#5707)
04d80f255 [Swift] Swift implementation 🎉🎉 (#5603)
55686100a Changed direct calls to strtod to use StringToNumber
718351831 Document JSON compatibility guarantees. (#5704)
d1b34f0f2 Add CMake 'generated_code' target to simplify resolution of build dependencies (#5697)
21b706196 (Optionally) add an additional suffix namespace to generated fbs files. (#5698)
35daaf83d [Java] Replace Table.UTF8_CHARSET with StandardCharsets.UTF_8 (#5696)
3b458f7a1 Rust: Temporarily disable 2 endianness unit tests (#5695)
a5d9d0f7d [C++17] Add Traits class for Tables and Factory function within it. (#5678)
3cd9b6434 Removed code_generators.cpp from library targets
355dfd48d [rust] Make enum names public (#5690)
bcd58a159 Correct inverted logic around include prefixes. (#5689)
a2c12900a Optimize Pack method using numpy (#5662)
901b89e73 [C++] Add Builder and Table typedefs (#5685)
31f879908 Minor doc updates: FlexBuffers C#, Discord, CppUsage.
8023d99e2 Upgrade rules_go (#5684)
b4154405d Fix --incompatible_load_cc_rules_from_bzl (#5683)
04c17c7a7 Add support for absl::string_view when available (#5682)
62ec7d52c [Bazel] Add support for compatible_with and restricted_to (#5681)
7de668053 CI: New Docker tests for Python with numpy (#5677)
3a70e0b30 Fixed struct initialization error on older versions of C#
9b1320135 Fixed warnings in FlexBuffers.java
5e3916050 Fixed out of date licenses on gRPC Python files.
c95755051 Removed test proto output.
44bf71988 Add flatc '--cpp_std' switch (#5656)
3e8f15df9 Fix for FlexBuffers FBT_VECTOR_STRING size bit-width.
602721a73 Added Check to VerifyAlignment (#5675)
13c05f4da Improve import handling for proto conversion (#5673)
ce3a1c43a [Dart] Fix prepare space for writeListInt64 and writeListUint64 (#5654)
aa75e5734 Make Rust constants public (#5659)
2790fee25 Add namespace qualification to union types (#5666)
eddebec1b Bugfix for Rust generation of union fields named with language keywords (#5592)
030fee36a wrap multiple statements in do {} while(!IsConstTrue(true)) (#5655)
f9724d1bd [gRPC] Uncomment MessageBuilder (#5658)
b20801ca4 Supress unsigned-integer-overflow for PaddingBytes (#5647)
a8e800bd7 Add --force-empty-vectors option (#5653)
d7530ae96 Fixed enum min/max values not properly escaped.
99d11e279 Split Bazel targets into multiple packages (#5640)
4fd8eb214 Remove a static_assert (#5643)
65f870357 Flatbuffers Python Object API (#5616)
75823cc27 [Clang 10]: definition of implicit copy constructor for 'TableKeyComparatoris deprecated #5649 (#5650)
58e279244 [docs]: add missing semicolon (#5648)
3c964e10a [GO] Fix support for enums with underscores and Unions with imported members (#5600)
c3c32ec94 Fix ambiguity of a type deduction in TEST_EQ macro if arguments have `enum class` type. (#5630)
075e8d676 Simplify declarations of x-macro FLATBUFFERS_TD (#5638)
bcf1bd5c9 read vtable size through ReadScalar() (#5636)
136d75fa6 Changed null checks in test. Removed verifier pointer usage (#5634)
091fa1fd1 Add testing of C++ with sanitizers (CI-Docker) (#5631)
ff3781dc2 add namespace prefix in FLATBUFFERS_MAX_BUFFER_SIZE (#5629)
6beb9f49c Support for python grpc - continuing the work from the pull request #4270 #4705 (#5613)
80988ea86 Removed idl_gen_general.cpp and move contents to code_generators.cpp (#5625)
0f2ff7eaa Lua cleanup (#5624)
dda095023 [C++] Adds basic schema evolution tests (#5611)
adbcbba5d [C++, C#, Java] Separated C# and Java generators into their own classes (#5618)
cbbd6aca0 add check for root_type specified for json schema generation (#5622)
405c64e07 [Rust] Bump smallvec version to 1.0 (#5621)
42c08cbca Ran src/clang-format-all.sh (#5617)
33d5dd9bd Improved pull request & clang-format instructions.
105dd528e Change monster_extra generation to use flatbuffers::unique_ptr (#5612)
f0f0efe7b [C++] Refactor to conform to Google C++ style guide (#5608)
e837d5a29 Fixed deprecated method in GRPC Java test.
9834ee978 Fixed Apache license not using canonical version.
44b2ab087 include/flatbuffers/base.h: fix no_sanitize issue with old clang (#5610)
46ae3f80a [C++, Java, C#, TypeScript, JavaScript] Skip generation of mutable union types (#5599)
7b38aa71e flatbuffers.h: fix documentation warning (#5607)
661bedd83 Add Lua FlatbufferBuilder Clean() method to enable reuseable builders (#5606)
8526e12d7 [Kotlin] Fix union vector accessor after change in Java API (#5605)
3c7b660d6 [flatc] Remove an always true condition for flexbuffers (#5604)
964365ba6 [Go] Add UnPackTo functions (#5598)
32254b7ac [Go] Object API support (#5339)
521e255ad Rust: Add idiomatic iterator for Vector type (#5579)
1b85292fd Fix typos in comments (#5590)
480815447 C++ verifier for evolved union fields should return true (#5586)
8d5e424c6 Add ByteBuffer copy for vector of bytes in Java (#5587)
b4774d235 Rust: Fix Copy and Clone impls for a few generic types (#5577)
26f238c24 Add `--clean-first` to the cmake-build command (travis) (#5574)
e93c8c46e Fix Follow implementation for bool (#5554)
e21516b9d Fix issue #5557 (#5573)
fbc11e8ae Avoid intentional unsigned integer overflow getting caught by sanitizers (#5572)
e9d29c21a Python: Add forceDefaults opt to python Builder (#5564)
8bfafc76d Java: Don't annotate vector-of-tables item getters with @nullable. (#5562)
df3e8bf4a Fixed warnings generated by recent JSON sorting feature.
5665cfe49 [Java] byte buffer factory returned buffer capcity is used instead of the requested size (#5558)
5797540ed #5544 Fix of Array of table is not sorted if Create<type>Direct() is used (#5546)
7f1af7cb0 Fix build with gcc version 7.4.0 (#5570)
32f47ad24 Fixed JSON parser not sorting vectors of tables/structs with key.
842f672ba [FlexBuffers][Java] Cache size of Sized objects in FlexBuffers (#5551)
d4cae0a62 Fix issue #5542 (#5543)
f1147f65b Fixed Android STLPort related error.
69d3fec48 Fix namespaced struct/field name collision detection (#5540) (#5545)
cfb4ecf6f [flac] Add FlexBuffers option for generating data (#5519)
a92039687 Update Rust versions under test from 1.30.1 to 1.37.0 (#5538)
625338d09 Adds XOPEN_SOURCE for PATH_MAX and POSIX 1993 for stat (#5529)
3f8ce99c5 [FlexBuffers][Java] Add override Key::toString (#5533)
0798b7b69 [FlexBuffers][Java] Fix wrong access to a string using Reference::asString(). (#5532)
cbdf82e2f Fix Mutate() methods of Array<scalar/struct> (override 5508) (#5526)
e365c502f Java: Added access object for vector of struct and vector of tables. (#5233)
97f3aa917 Fixed DetachedBuffer self move assignment (#5521)
2f5bb2eec Fix buildifier warnings found in new bazel (#5517)
917687c7a Fixed Reflection Verifier not handling vectors of unions.
f9277e691 Fixed GenerateText not handling vectors of unions.
2706381ee Add element size parameter to __vector_as_arraysegment [c#] (#5512)
b5560fcd5 [Java][FlexBuffers] Improve documentation for FlexBuffers in Java. (#5506)
782b865c5 Annotate getters with @Pure when --java-checkerframework is specified. (#5510)
3bfc86eaf [Dart]fix: segment fault with empty namespace when generating dart file (#5507)
c0282873f Rust: Fixed cargo clippy on non-generated code (#5485)
4b870aca9 [Javascript] Fix syntax error for signed enum (#5503)
d0e3870c0 [C#] Fix retrieving enumeration vectors as arrays (#5457)
fb25eb87f Doc typo fixes (#5505)
cb35d3a0e Use all of the available space in the buffer returned by ByteBufferFactory to allow the factory to keep a pool of larger than initialsize sized buffers. (#5500)
8e6cabb31 [FlexBuffers][Java] Implementation of FlexBuffers API (#5476)
bd31dd242 Clarified value reuse in FlexBuffers
65b67d213 Fixed test build invocation of arrays_test.fbs
1fbb71132 FlexBuffers: allow any values to be shared.
cd75a3658 Android: remove app_dummy() calls
ec6b0bf29 Fixed STLPort Android compile error
c11b5d744 [bugfix]flexbuffers isvector bugfix (#5488)
4525c91be Fix incorrect padding in arrays of structs (Issue #5484) (#5491)
b97b342f5 Fixed missing generated code.
c1058a903 C++ IDL generation adds superfluous semicolon in GenTablePost, causing (#5483)
303044934 [go]add Name() for ForceCodec interface (#5486)
a2485d4ec reflection: check for valid union enum value during object verification (#5475)
a20e71ac9 has_method support for primitive fields in java runtime. Changed: idl.h, FlatBufferBuilder.java , idl_gen_general.cpp, idl_parser.cpp, flatc.cpp (#5468)
Change-Id: I836f4b43e6818bb16425a87899e6234ac86242aa
git-subtree-dir: third_party/flatbuffers
git-subtree-split: d6a8dbd26ff08a8868e0d0c1b4b67d31b40e4a7f
diff --git a/grpc/BUILD b/grpc/BUILD
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/grpc/BUILD
diff --git a/grpc/README.md b/grpc/README.md
index 544651d..685003f 100644
--- a/grpc/README.md
+++ b/grpc/README.md
@@ -22,6 +22,12 @@
5. `cmake -DFLATBUFFERS_BUILD_GRPCTEST=ON -DGRPC_INSTALL_PATH=${GRPC_INSTALL_PATH} -DPROTOBUF_DOWNLOAD_PATH=${PROTOBUF_DOWNLOAD_PATH} ..`
6. `make`
+For Bazel users:
+
+```shell
+$bazel test src/compiler/...
+```
+
## Running FlatBuffer gRPC tests
### Linux
@@ -29,3 +35,9 @@
1. `ln -s ${GRPC_INSTALL_PATH}/lib/libgrpc++_unsecure.so.6 ${GRPC_INSTALL_PATH}/lib/libgrpc++_unsecure.so.1`
2. `export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${GRPC_INSTALL_PATH}/lib`
3. `make test ARGS=-V`
+
+For Bazel users:
+
+```shell
+$bazel test tests/...
+```
\ No newline at end of file
diff --git a/grpc/build_grpc.sh b/grpc/build_grpc.sh
index 8fb9e1c..3c0c27e 100755
--- a/grpc/build_grpc.sh
+++ b/grpc/build_grpc.sh
@@ -5,7 +5,7 @@
function build_grpc () {
git clone https://github.com/grpc/grpc.git google/grpc
cd google/grpc
- git checkout ${grpc_1_15_1_githash}
+ git checkout ${grpc_1_15_1_githash}
git submodule update --init
make
make install prefix=`pwd`/install
diff --git a/grpc/flatbuffers-java-grpc/pom.xml b/grpc/flatbuffers-java-grpc/pom.xml
index b5b88cb..17814f6 100644
--- a/grpc/flatbuffers-java-grpc/pom.xml
+++ b/grpc/flatbuffers-java-grpc/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.google.flatbuffers</groupId>
<artifactId>flatbuffers-parent</artifactId>
- <version>1.11.1</version>
+ <version>1.12.0</version>
</parent>
<artifactId>flatbuffers-java-grpc</artifactId>
<name>${project.artifactId}</name>
@@ -24,7 +24,7 @@
</developer>
</developers>
<properties>
- <gRPC.version>1.11.1</gRPC.version>
+ <gRPC.version>1.12.0</gRPC.version>
</properties>
<dependencies>
<dependency>
diff --git a/grpc/flatbuffers-js-grpc/package.json b/grpc/flatbuffers-js-grpc/package.json
new file mode 100644
index 0000000..d827049
--- /dev/null
+++ b/grpc/flatbuffers-js-grpc/package.json
@@ -0,0 +1,9 @@
+{
+ "name": "flatbuffers-js-grpc",
+ "version": "1.0.0",
+ "author": "mustii@mmk.one",
+ "dependencies": {
+ "flatbuffers": "^1.12.0",
+ "grpc": "^1.24.3"
+ }
+}
diff --git a/grpc/flatbuffers-js-grpc/src/client.ts b/grpc/flatbuffers-js-grpc/src/client.ts
new file mode 100644
index 0000000..00d1009
--- /dev/null
+++ b/grpc/flatbuffers-js-grpc/src/client.ts
@@ -0,0 +1,28 @@
+import grpc from 'grpc';
+import { HelloRequest } from './greeter_generated';
+import { GreeterClient } from './greeter_grpc';
+import { flatbuffers } from 'flatbuffers';
+
+async function main() {
+ const _server = new GreeterClient('localhost:3000', grpc.credentials.createInsecure());
+ const builder = new flatbuffers.Builder();
+ const offset = builder.createString('mustii');
+ const root = HelloRequest.createHelloRequest(builder, offset);
+ builder.finish(root);
+ const buffer = HelloRequest.getRootAsHelloRequest(new flatbuffers.ByteBuffer(builder.asUint8Array()));
+
+ _server.SayHello(buffer, (err, response) => {
+ console.log(response.message());
+ });
+
+ const data = _server.SayManyHellos(buffer, null);
+
+ data.on('data', (data) => {
+ console.log(data.message());
+ });
+ data.on('end', (data) => {
+ console.log('end');
+ });
+}
+
+main();
\ No newline at end of file
diff --git a/grpc/flatbuffers-js-grpc/src/greeter.fbs b/grpc/flatbuffers-js-grpc/src/greeter.fbs
new file mode 100644
index 0000000..b510884
--- /dev/null
+++ b/grpc/flatbuffers-js-grpc/src/greeter.fbs
@@ -0,0 +1,12 @@
+table HelloReply {
+ message:string;
+}
+
+table HelloRequest {
+ name:string;
+}
+
+rpc_service Greeter {
+ SayHello(HelloRequest):HelloReply;
+ SayManyHellos(HelloRequest):HelloReply (streaming: "server");
+}
diff --git a/grpc/flatbuffers-js-grpc/src/greeter_generated.ts b/grpc/flatbuffers-js-grpc/src/greeter_generated.ts
new file mode 100644
index 0000000..87113f9
--- /dev/null
+++ b/grpc/flatbuffers-js-grpc/src/greeter_generated.ts
@@ -0,0 +1,174 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+/**
+ * @constructor
+ */
+export class HelloReply {
+ bb: flatbuffers.ByteBuffer|null = null;
+
+ bb_pos:number = 0;
+/**
+ * @param number i
+ * @param flatbuffers.ByteBuffer bb
+ * @returns HelloReply
+ */
+__init(i:number, bb:flatbuffers.ByteBuffer):HelloReply {
+ this.bb_pos = i;
+ this.bb = bb;
+ return this;
+};
+
+/**
+ * @param flatbuffers.ByteBuffer bb
+ * @param HelloReply= obj
+ * @returns HelloReply
+ */
+static getRootAsHelloReply(bb:flatbuffers.ByteBuffer, obj?:HelloReply):HelloReply {
+ return (obj || new HelloReply()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
+};
+
+/**
+ * @param flatbuffers.ByteBuffer bb
+ * @param HelloReply= obj
+ * @returns HelloReply
+ */
+static getSizePrefixedRootAsHelloReply(bb:flatbuffers.ByteBuffer, obj?:HelloReply):HelloReply {
+ bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
+ return (obj || new HelloReply()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
+};
+
+/**
+ * @param flatbuffers.Encoding= optionalEncoding
+ * @returns string|Uint8Array|null
+ */
+message():string|null
+message(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
+message(optionalEncoding?:any):string|Uint8Array|null {
+ var offset = this.bb!.__offset(this.bb_pos, 4);
+ return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
+};
+
+/**
+ * @param flatbuffers.Builder builder
+ */
+static startHelloReply(builder:flatbuffers.Builder) {
+ builder.startObject(1);
+};
+
+/**
+ * @param flatbuffers.Builder builder
+ * @param flatbuffers.Offset messageOffset
+ */
+static addMessage(builder:flatbuffers.Builder, messageOffset:flatbuffers.Offset) {
+ builder.addFieldOffset(0, messageOffset, 0);
+};
+
+/**
+ * @param flatbuffers.Builder builder
+ * @returns flatbuffers.Offset
+ */
+static endHelloReply(builder:flatbuffers.Builder):flatbuffers.Offset {
+ var offset = builder.endObject();
+ return offset;
+};
+
+static createHelloReply(builder:flatbuffers.Builder, messageOffset:flatbuffers.Offset):flatbuffers.Offset {
+ HelloReply.startHelloReply(builder);
+ HelloReply.addMessage(builder, messageOffset);
+ return HelloReply.endHelloReply(builder);
+}
+
+serialize():Uint8Array {
+ return this.bb!.bytes();
+}
+
+static deserialize(buffer: Uint8Array):HelloReply {
+ return HelloReply.getRootAsHelloReply(new flatbuffers.ByteBuffer(buffer))
+}
+}
+/**
+ * @constructor
+ */
+export class HelloRequest {
+ bb: flatbuffers.ByteBuffer|null = null;
+
+ bb_pos:number = 0;
+/**
+ * @param number i
+ * @param flatbuffers.ByteBuffer bb
+ * @returns HelloRequest
+ */
+__init(i:number, bb:flatbuffers.ByteBuffer):HelloRequest {
+ this.bb_pos = i;
+ this.bb = bb;
+ return this;
+};
+
+/**
+ * @param flatbuffers.ByteBuffer bb
+ * @param HelloRequest= obj
+ * @returns HelloRequest
+ */
+static getRootAsHelloRequest(bb:flatbuffers.ByteBuffer, obj?:HelloRequest):HelloRequest {
+ return (obj || new HelloRequest()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
+};
+
+/**
+ * @param flatbuffers.ByteBuffer bb
+ * @param HelloRequest= obj
+ * @returns HelloRequest
+ */
+static getSizePrefixedRootAsHelloRequest(bb:flatbuffers.ByteBuffer, obj?:HelloRequest):HelloRequest {
+ bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
+ return (obj || new HelloRequest()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
+};
+
+/**
+ * @param flatbuffers.Encoding= optionalEncoding
+ * @returns string|Uint8Array|null
+ */
+name():string|null
+name(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
+name(optionalEncoding?:any):string|Uint8Array|null {
+ var offset = this.bb!.__offset(this.bb_pos, 4);
+ return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
+};
+
+/**
+ * @param flatbuffers.Builder builder
+ */
+static startHelloRequest(builder:flatbuffers.Builder) {
+ builder.startObject(1);
+};
+
+/**
+ * @param flatbuffers.Builder builder
+ * @param flatbuffers.Offset nameOffset
+ */
+static addName(builder:flatbuffers.Builder, nameOffset:flatbuffers.Offset) {
+ builder.addFieldOffset(0, nameOffset, 0);
+};
+
+/**
+ * @param flatbuffers.Builder builder
+ * @returns flatbuffers.Offset
+ */
+static endHelloRequest(builder:flatbuffers.Builder):flatbuffers.Offset {
+ var offset = builder.endObject();
+ return offset;
+};
+
+static createHelloRequest(builder:flatbuffers.Builder, nameOffset:flatbuffers.Offset):flatbuffers.Offset {
+ HelloRequest.startHelloRequest(builder);
+ HelloRequest.addName(builder, nameOffset);
+ return HelloRequest.endHelloRequest(builder);
+}
+
+serialize():Uint8Array {
+ return this.bb!.bytes();
+}
+
+static deserialize(buffer: Uint8Array):HelloRequest {
+ return HelloRequest.getRootAsHelloRequest(new flatbuffers.ByteBuffer(buffer))
+}
+}
diff --git a/grpc/flatbuffers-js-grpc/src/greeter_grpc.d.ts b/grpc/flatbuffers-js-grpc/src/greeter_grpc.d.ts
new file mode 100644
index 0000000..acd4c2f
--- /dev/null
+++ b/grpc/flatbuffers-js-grpc/src/greeter_grpc.d.ts
@@ -0,0 +1,54 @@
+// Generated GRPC code for FlatBuffers TS *** DO NOT EDIT ***
+import { flatbuffers } from 'flatbuffers';
+import * as Greeter_fbs from './greeter_generated';
+
+import * as grpc from 'grpc';
+
+interface IGreeterService extends grpc.ServiceDefinition<grpc.UntypedServiceImplementation> {
+ SayHello: IGreeterService_ISayHello;
+ SayManyHellos: IGreeterService_ISayManyHellos;
+}
+interface IGreeterService_ISayHello extends grpc.MethodDefinition<Greeter_fbs.HelloRequest, Greeter_fbs.HelloReply> {
+ path: string; // /Greeter/SayHello
+ requestStream: boolean; // false
+ responseStream: boolean; // false
+ requestSerialize: grpc.serialize<Greeter_fbs.HelloRequest>;
+ requestDeserialize: grpc.deserialize<Greeter_fbs.HelloRequest>;
+ responseSerialize: grpc.serialize<Greeter_fbs.HelloReply>;
+ responseDeserialize: grpc.deserialize<Greeter_fbs.HelloReply>;
+}
+
+interface IGreeterService_ISayManyHellos extends grpc.MethodDefinition<Greeter_fbs.HelloRequest, Greeter_fbs.HelloReply> {
+ path: string; // /Greeter/SayManyHellos
+ requestStream: boolean; // false
+ responseStream: boolean; // true
+ requestSerialize: grpc.serialize<Greeter_fbs.HelloRequest>;
+ requestDeserialize: grpc.deserialize<Greeter_fbs.HelloRequest>;
+ responseSerialize: grpc.serialize<Greeter_fbs.HelloReply>;
+ responseDeserialize: grpc.deserialize<Greeter_fbs.HelloReply>;
+}
+
+
+export const GreeterService: IGreeterService;
+
+export interface IGreeterServer {
+ SayHello: grpc.handleUnaryCall<Greeter_fbs.HelloRequest, Greeter_fbs.HelloReply>;
+ SayManyHellos: grpc.handleServerStreamingCall<Greeter_fbs.HelloRequest, Greeter_fbs.HelloReply>;
+}
+
+export interface IGreeterClient {
+ SayHello(request: Greeter_fbs.HelloRequest, callback: (error: grpc.ServiceError | null, response: Greeter_fbs.HelloReply) => void): grpc.ClientUnaryCall;
+ SayHello(request: Greeter_fbs.HelloRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: Greeter_fbs.HelloReply) => void): grpc.ClientUnaryCall;
+ SayHello(request: Greeter_fbs.HelloRequest, metadata: grpc.Metadata, options: Partial<grpc.CallOptions>, callback: (error: grpc.ServiceError | null, response: Greeter_fbs.HelloReply) => void): grpc.ClientUnaryCall;
+ SayManyHellos(request: Greeter_fbs.HelloRequest, metadata: grpc.Metadata): grpc.ClientReadableStream<Greeter_fbs.HelloReply>;
+ SayManyHellos(request: Greeter_fbs.HelloRequest, options: Partial<grpc.CallOptions>): grpc.ClientReadableStream<Greeter_fbs.HelloReply>;
+}
+
+export class GreeterClient extends grpc.Client implements IGreeterClient {
+ constructor(address: string, credentials: grpc.ChannelCredentials, options?: object); public SayHello(request: Greeter_fbs.HelloRequest, callback: (error: grpc.ServiceError | null, response: Greeter_fbs.HelloReply) => void): grpc.ClientUnaryCall;
+ public SayHello(request: Greeter_fbs.HelloRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: Greeter_fbs.HelloReply) => void): grpc.ClientUnaryCall;
+ public SayHello(request: Greeter_fbs.HelloRequest, metadata: grpc.Metadata, options: Partial<grpc.CallOptions>, callback: (error: grpc.ServiceError | null, response: Greeter_fbs.HelloReply) => void): grpc.ClientUnaryCall;
+ public SayManyHellos(request: Greeter_fbs.HelloRequest, metadata: grpc.Metadata): grpc.ClientReadableStream<Greeter_fbs.HelloReply>;
+ public SayManyHellos(request: Greeter_fbs.HelloRequest, options: Partial<grpc.CallOptions>): grpc.ClientReadableStream<Greeter_fbs.HelloReply>;
+}
+
diff --git a/grpc/flatbuffers-js-grpc/src/greeter_grpc.js b/grpc/flatbuffers-js-grpc/src/greeter_grpc.js
new file mode 100644
index 0000000..a184ba1
--- /dev/null
+++ b/grpc/flatbuffers-js-grpc/src/greeter_grpc.js
@@ -0,0 +1,55 @@
+// Generated GRPC code for FlatBuffers TS *** DO NOT EDIT ***
+import { flatbuffers } from 'flatbuffers';
+import * as Greeter_fbs from './greeter_generated';
+
+var grpc = require('grpc');
+
+function serialize_HelloReply(buffer_args) {
+ if (!(buffer_args instanceof Greeter_fbs.HelloReply)) {
+ throw new Error('Expected argument of type Greeter_fbs.HelloReply');
+ }
+ return buffer_args.serialize();
+}
+
+function deserialize_HelloReply(buffer) {
+ return Greeter_fbs.HelloReply.getRootAsHelloReply(new flatbuffers.ByteBuffer(buffer))
+}
+
+
+function serialize_HelloRequest(buffer_args) {
+ if (!(buffer_args instanceof Greeter_fbs.HelloRequest)) {
+ throw new Error('Expected argument of type Greeter_fbs.HelloRequest');
+ }
+ return buffer_args.serialize();
+}
+
+function deserialize_HelloRequest(buffer) {
+ return Greeter_fbs.HelloRequest.getRootAsHelloRequest(new flatbuffers.ByteBuffer(buffer))
+}
+
+
+var GreeterService = exports.GreeterService = {
+ SayHello: {
+ path: '/Greeter/SayHello',
+ requestStream: false,
+ responseStream: false,
+ requestType: flatbuffers.ByteBuffer,
+ responseType: Greeter_fbs.HelloReply,
+ requestSerialize: serialize_HelloRequest,
+ requestDeserialize: deserialize_HelloRequest,
+ responseSerialize: serialize_HelloReply,
+ responseDeserialize: deserialize_HelloReply,
+ },
+ SayManyHellos: {
+ path: '/Greeter/SayManyHellos',
+ requestStream: false,
+ responseStream: true,
+ requestType: flatbuffers.ByteBuffer,
+ responseType: Greeter_fbs.HelloReply,
+ requestSerialize: serialize_HelloRequest,
+ requestDeserialize: deserialize_HelloRequest,
+ responseSerialize: serialize_HelloReply,
+ responseDeserialize: deserialize_HelloReply,
+ },
+};
+exports.GreeterClient = grpc.makeGenericClientConstructor(GreeterService);
diff --git a/grpc/flatbuffers-js-grpc/src/server.ts b/grpc/flatbuffers-js-grpc/src/server.ts
new file mode 100644
index 0000000..47c2f89
--- /dev/null
+++ b/grpc/flatbuffers-js-grpc/src/server.ts
@@ -0,0 +1,40 @@
+import grpc from 'grpc';
+import { HelloReply, HelloRequest } from './greeter_generated';
+import { IGreeterServer, GreeterService } from './greeter_grpc';
+import { flatbuffers } from 'flatbuffers';
+
+class GreeterServer implements IGreeterServer {
+
+ SayHello(call: grpc.ServerUnaryCall<HelloRequest>, callback: grpc.sendUnaryData<HelloReply>): void {
+ console.log(`${call.request.name()}`);
+ const builder = new flatbuffers.Builder();
+ const offset = builder.createString(`welcome ${call.request.name()}`);
+ const root = HelloReply.createHelloReply(builder, offset);
+ builder.finish(root);
+ callback(null, HelloReply.getRootAsHelloReply(new flatbuffers.ByteBuffer(builder.asUint8Array())));
+ }
+
+ async SayManyHellos(call: grpc.ServerWritableStream<HelloRequest>): Promise<void> {
+ const name = call.request.name();
+ console.log(`${call.request.name()} saying hi in different langagues`);
+ ['Hi', 'Hallo', 'Ciao'].forEach(element => {
+ const builder = new flatbuffers.Builder();
+ const offset = builder.createString(`${element} ${name}`);
+ const root = HelloReply.createHelloReply(builder, offset);
+ builder.finish(root);
+ call.write(HelloReply.getRootAsHelloReply(new flatbuffers.ByteBuffer(builder.asUint8Array())))
+ });
+ call.end();
+ }
+}
+
+function serve(): void {
+ const PORT = 3000;
+ const server = new grpc.Server();
+ server.addService<IGreeterServer>(GreeterService, new GreeterServer());
+ console.log(`Listening on ${PORT}`);
+ server.bind(`localhost:${PORT}`, grpc.ServerCredentials.createInsecure());
+ server.start();
+}
+
+serve();
\ No newline at end of file
diff --git a/grpc/flatbuffers-js-grpc/tsconfig.json b/grpc/flatbuffers-js-grpc/tsconfig.json
new file mode 100644
index 0000000..7076378
--- /dev/null
+++ b/grpc/flatbuffers-js-grpc/tsconfig.json
@@ -0,0 +1,17 @@
+{
+ "compilerOptions": {
+ "target": "es5",
+ "module": "commonjs",
+ "outDir": "./dist",
+ "allowJs": true,
+ "sourceMap": true,
+ "strict": true,
+ "noImplicitAny": false,
+ "strictNullChecks": false,
+ "esModuleInterop": true,
+ "baseUrl": "./",
+ "typeRoots": ["node_modules/@types"],
+ "skipLibCheck": true,
+ "forceConsistentCasingInFileNames": true
+ }
+ }
\ No newline at end of file
diff --git a/grpc/pom.xml b/grpc/pom.xml
index a0fca79..1eaf8d9 100644
--- a/grpc/pom.xml
+++ b/grpc/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.google.flatbuffers</groupId>
<artifactId>flatbuffers-parent</artifactId>
<packaging>pom</packaging>
- <version>1.11.1</version>
+ <version>1.12.0</version>
<name>flatbuffers-parent</name>
<description>parent pom for flatbuffers java artifacts</description>
<properties>
@@ -52,7 +52,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
@@ -185,6 +185,12 @@
<goals>
<goal>sign</goal>
</goals>
+ <configuration>
+ <gpgArguments>
+ <arg>--pinentry-mode</arg>
+ <arg>loopback</arg>
+ </gpgArguments>
+ </configuration>
</execution>
</executions>
</plugin>
diff --git a/grpc/samples/greeter/server.cpp b/grpc/samples/greeter/server.cpp
index 82c97dc..db44259 100644
--- a/grpc/samples/greeter/server.cpp
+++ b/grpc/samples/greeter/server.cpp
@@ -12,7 +12,8 @@
grpc::ServerContext *context,
const flatbuffers::grpc::Message<HelloRequest> *request_msg,
flatbuffers::grpc::Message<HelloReply> *response_msg) override {
- // flatbuffers::grpc::MessageBuilder mb_;
+ flatbuffers::grpc::MessageBuilder mb_;
+
// We call GetRoot to "parse" the message. Verification is already
// performed by default. See the notes below for more details.
const HelloRequest *request = request_msg->GetRoot();
diff --git a/grpc/src/compiler/BUILD b/grpc/src/compiler/BUILD
new file mode 100644
index 0000000..23fe540
--- /dev/null
+++ b/grpc/src/compiler/BUILD
@@ -0,0 +1,123 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
+package(
+ default_visibility = ["//visibility:public"],
+)
+
+filegroup(
+ name = "common_headers",
+ srcs = [
+ "config.h",
+ "schema_interface.h",
+ ],
+)
+
+cc_library(
+ name = "cpp_generator",
+ srcs = [
+ "cpp_generator.cc",
+ ],
+ hdrs = [
+ "cpp_generator.h",
+ ":common_headers",
+ ],
+ include_prefix = "src/compiler",
+ strip_include_prefix = "/grpc/src/compiler",
+ deps = [
+ "//:flatbuffers",
+ ],
+)
+
+cc_library(
+ name = "go_generator",
+ srcs = [
+ "go_generator.cc",
+ ],
+ hdrs = [
+ "go_generator.h",
+ ":common_headers",
+ ],
+ include_prefix = "src/compiler",
+ strip_include_prefix = "/grpc/src/compiler",
+ deps = [
+ "//:flatbuffers",
+ ],
+)
+
+cc_library(
+ name = "java_generator",
+ srcs = [
+ "java_generator.cc",
+ ],
+ hdrs = [
+ "java_generator.h",
+ ":common_headers",
+ ],
+ include_prefix = "src/compiler",
+ strip_include_prefix = "/grpc/src/compiler",
+ deps = [
+ "//:flatbuffers",
+ ],
+)
+
+cc_library(
+ name = "python_generator",
+ hdrs = [
+ "python_generator.h",
+ ],
+ include_prefix = "src/compiler",
+ strip_include_prefix = "/grpc/src/compiler",
+ deps = [
+ ":python_generator_private",
+ ],
+)
+
+cc_library(
+ name = "python_generator_private",
+ srcs = [
+ "python_generator.cc",
+ ],
+ hdrs = [
+ "python_generator.h",
+ "python_private_generator.h",
+ ":common_headers",
+ ],
+ include_prefix = "src/compiler",
+ strip_include_prefix = "/grpc/src/compiler",
+ visibility = ["//visibility:private"],
+ deps = [
+ "//:flatbuffers",
+ ],
+)
+
+cc_library(
+ name = "swift_generator",
+ srcs = [
+ "swift_generator.cc",
+ ],
+ hdrs = [
+ "swift_generator.h",
+ ":common_headers",
+ ],
+ include_prefix = "src/compiler",
+ strip_include_prefix = "/grpc/src/compiler",
+ deps = [
+ "//:flatbuffers",
+ ],
+)
+
+cc_library(
+ name = "ts_generator",
+ srcs = [
+ "ts_generator.cc",
+ ],
+ hdrs = [
+ "ts_generator.h",
+ ":common_headers",
+ ],
+ include_prefix = "src/compiler",
+ strip_include_prefix = "/grpc/src/compiler",
+ deps = [
+ "//:flatbuffers",
+ ],
+)
\ No newline at end of file
diff --git a/grpc/src/compiler/java_generator.cc b/grpc/src/compiler/java_generator.cc
index 661c9ee..d2cf5cc 100644
--- a/grpc/src/compiler/java_generator.cc
+++ b/grpc/src/compiler/java_generator.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "java_generator.h"
+#include "src/compiler/java_generator.h"
#include <algorithm>
#include <iostream>
diff --git a/grpc/src/compiler/python_generator.cc b/grpc/src/compiler/python_generator.cc
new file mode 100644
index 0000000..3fcf7ea
--- /dev/null
+++ b/grpc/src/compiler/python_generator.cc
@@ -0,0 +1,624 @@
+/*
+ *
+ * Copyright 2015 gRPC authors.
+ *
+ * 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.
+ *
+ */
+
+#include <algorithm>
+#include <cassert>
+#include <cctype>
+#include <cstring>
+#include <fstream>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <ostream>
+#include <set>
+#include <sstream>
+#include <tuple>
+#include <vector>
+
+#include "flatbuffers/util.h"
+#include "src/compiler/python_generator.h"
+#include "src/compiler/python_private_generator.h"
+
+using std::make_pair;
+using std::map;
+using std::pair;
+using std::replace;
+using std::tuple;
+using std::vector;
+using std::set;
+
+namespace grpc_python_generator {
+
+grpc::string generator_file_name;
+
+typedef map<grpc::string, grpc::string> StringMap;
+typedef vector<grpc::string> StringVector;
+typedef tuple<grpc::string, grpc::string> StringPair;
+typedef set<StringPair> StringPairSet;
+
+// Provides RAII indentation handling. Use as:
+// {
+// IndentScope raii_my_indent_var_name_here(my_py_printer);
+// // constructor indented my_py_printer
+// ...
+// // destructor called at end of scope, un-indenting my_py_printer
+// }
+class IndentScope {
+ public:
+ explicit IndentScope(grpc_generator::Printer* printer) : printer_(printer) {
+ printer_->Indent();
+ }
+
+ ~IndentScope() { printer_->Outdent(); }
+
+ private:
+ grpc_generator::Printer* printer_;
+};
+
+inline grpc::string StringReplace(grpc::string str, const grpc::string& from,
+ const grpc::string& to, bool replace_all) {
+ size_t pos = 0;
+
+ do {
+ pos = str.find(from, pos);
+ if (pos == grpc::string::npos) {
+ break;
+ }
+ str.replace(pos, from.length(), to);
+ pos += to.length();
+ } while (replace_all);
+
+ return str;
+}
+
+inline grpc::string StringReplace(grpc::string str, const grpc::string& from,
+ const grpc::string& to) {
+ return StringReplace(str, from, to, true);
+}
+
+grpc::string ModuleName(const grpc::string& filename,
+ const grpc::string& import_prefix) {
+ grpc::string basename = flatbuffers::StripExtension(filename);
+ basename = StringReplace(basename, "-", "_");
+ basename = StringReplace(basename, "/", ".");
+ return import_prefix + basename + "_fb";
+}
+
+grpc::string ModuleAlias(const grpc::string& filename,
+ const grpc::string& import_prefix) {
+ grpc::string module_name = ModuleName(filename, import_prefix);
+ // We can't have dots in the module name, so we replace each with _dot_.
+ // But that could lead to a collision between a.b and a_dot_b, so we also
+ // duplicate each underscore.
+ module_name = StringReplace(module_name, "_", "__");
+ module_name = StringReplace(module_name, ".", "_dot_");
+ return module_name;
+}
+
+PrivateGenerator::PrivateGenerator(const GeneratorConfiguration& config_,
+ const grpc_generator::File* file_)
+ : config(config_), file(file_) {}
+
+void PrivateGenerator::PrintBetaServicer(const grpc_generator::Service* service,
+ grpc_generator::Printer* out) {
+ StringMap service_dict;
+ service_dict["Service"] = service->name();
+ out->Print("\n\n");
+ out->Print(service_dict, "class Beta$Service$Servicer(object):\n");
+ {
+ IndentScope raii_class_indent(out);
+ out->Print(
+ "\"\"\"The Beta API is deprecated for 0.15.0 and later.\n"
+ "\nIt is recommended to use the GA API (classes and functions in this\n"
+ "file not marked beta) for all further purposes. This class was "
+ "generated\n"
+ "only to ease transition from grpcio<0.15.0 to "
+ "grpcio>=0.15.0.\"\"\"\n");
+ for (int i = 0; i < service->method_count(); ++i) {
+ auto method = service->method(i);
+ grpc::string arg_name =
+ method->ClientStreaming() ? "request_iterator" : "request";
+ StringMap method_dict;
+ method_dict["Method"] = method->name();
+ method_dict["ArgName"] = arg_name;
+ out->Print(method_dict, "def $Method$(self, $ArgName$, context):\n");
+ {
+ IndentScope raii_method_indent(out);
+ out->Print("context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)\n");
+ }
+ }
+ }
+}
+
+void PrivateGenerator::PrintBetaStub(const grpc_generator::Service* service,
+ grpc_generator::Printer* out) {
+ StringMap service_dict;
+ service_dict["Service"] = service->name();
+ out->Print("\n\n");
+ out->Print(service_dict, "class Beta$Service$Stub(object):\n");
+ {
+ IndentScope raii_class_indent(out);
+ out->Print(
+ "\"\"\"The Beta API is deprecated for 0.15.0 and later.\n"
+ "\nIt is recommended to use the GA API (classes and functions in this\n"
+ "file not marked beta) for all further purposes. This class was "
+ "generated\n"
+ "only to ease transition from grpcio<0.15.0 to "
+ "grpcio>=0.15.0.\"\"\"\n");
+ for (int i = 0; i < service->method_count(); ++i) {
+ auto method = service->method(i);
+ grpc::string arg_name =
+ method->ClientStreaming() ? "request_iterator" : "request";
+ StringMap method_dict;
+ method_dict["Method"] = method->name();
+ method_dict["ArgName"] = arg_name;
+ out->Print(method_dict,
+ "def $Method$(self, $ArgName$, timeout, metadata=None, "
+ "with_call=False, protocol_options=None):\n");
+ {
+ IndentScope raii_method_indent(out);
+ out->Print("raise NotImplementedError()\n");
+ }
+ if (!method->ServerStreaming()) {
+ out->Print(method_dict, "$Method$.future = None\n");
+ }
+ }
+ }
+}
+
+void PrivateGenerator::PrintBetaServerFactory(
+ const grpc::string& package_qualified_service_name,
+ const grpc_generator::Service* service, grpc_generator::Printer* out) {
+ StringMap service_dict;
+ service_dict["Service"] = service->name();
+ out->Print("\n\n");
+ out->Print(service_dict,
+ "def beta_create_$Service$_server(servicer, pool=None, "
+ "pool_size=None, default_timeout=None, maximum_timeout=None):\n");
+ {
+ IndentScope raii_create_server_indent(out);
+ out->Print(
+ "\"\"\"The Beta API is deprecated for 0.15.0 and later.\n"
+ "\nIt is recommended to use the GA API (classes and functions in this\n"
+ "file not marked beta) for all further purposes. This function was\n"
+ "generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"
+ "\"\"\"\n");
+ StringMap method_implementation_constructors;
+ StringMap input_message_modules_and_classes;
+ StringMap output_message_modules_and_classes;
+ for (int i = 0; i < service->method_count(); ++i) {
+ auto method = service->method(i);
+ const grpc::string method_implementation_constructor =
+ grpc::string(method->ClientStreaming() ? "stream_" : "unary_") +
+ grpc::string(method->ServerStreaming() ? "stream_" : "unary_") +
+ "inline";
+ grpc::string input_message_module_and_class = method->get_fb_builder();
+ grpc::string output_message_module_and_class = method->get_fb_builder();
+ method_implementation_constructors.insert(
+ make_pair(method->name(), method_implementation_constructor));
+ input_message_modules_and_classes.insert(
+ make_pair(method->name(), input_message_module_and_class));
+ output_message_modules_and_classes.insert(
+ make_pair(method->name(), output_message_module_and_class));
+ }
+ StringMap method_dict;
+ method_dict["PackageQualifiedServiceName"] = package_qualified_service_name;
+// out->Print("request_deserializers = {\n");
+// for (StringMap::iterator name_and_input_module_class_pair =
+// input_message_modules_and_classes.begin();
+// name_and_input_module_class_pair !=
+// input_message_modules_and_classes.end();
+// name_and_input_module_class_pair++) {
+// method_dict["MethodName"] = name_and_input_module_class_pair->first;
+// method_dict["InputTypeModuleAndClass"] =
+// name_and_input_module_class_pair->second;
+// IndentScope raii_indent(out);
+// out->Print(method_dict,
+// "(\'$PackageQualifiedServiceName$\', \'$MethodName$\'): "
+// "$InputTypeModuleAndClass$.FromString,\n");
+// }
+// out->Print("}\n");
+// out->Print("response_serializers = {\n");
+// for (StringMap::iterator name_and_output_module_class_pair =
+// output_message_modules_and_classes.begin();
+// name_and_output_module_class_pair !=
+// output_message_modules_and_classes.end();
+// name_and_output_module_class_pair++) {
+// method_dict["MethodName"] = name_and_output_module_class_pair->first;
+// method_dict["OutputTypeModuleAndClass"] =
+// name_and_output_module_class_pair->second;
+// IndentScope raii_indent(out);
+// out->Print(method_dict,
+// "(\'$PackageQualifiedServiceName$\', \'$MethodName$\'): "
+// "$OutputTypeModuleAndClass$.SerializeToString,\n");
+// }
+// out->Print("}\n");
+ out->Print("method_implementations = {\n");
+ for (StringMap::iterator name_and_implementation_constructor =
+ method_implementation_constructors.begin();
+ name_and_implementation_constructor !=
+ method_implementation_constructors.end();
+ name_and_implementation_constructor++) {
+ method_dict["Method"] = name_and_implementation_constructor->first;
+ method_dict["Constructor"] = name_and_implementation_constructor->second;
+ IndentScope raii_descriptions_indent(out);
+ const grpc::string method_name =
+ name_and_implementation_constructor->first;
+ out->Print(method_dict,
+ "(\'$PackageQualifiedServiceName$\', \'$Method$\'): "
+ "face_utilities.$Constructor$(servicer.$Method$),\n");
+ }
+ out->Print("}\n");
+ out->Print(
+ "server_options = beta_implementations.server_options("
+ "thread_pool=pool, thread_pool_size=pool_size, "
+ "default_timeout=default_timeout, "
+ "maximum_timeout=maximum_timeout)\n");
+ out->Print(
+ "return beta_implementations.server(method_implementations, "
+ "options=server_options)\n");
+ //"request_deserializers=request_deserializers, "
+ //"response_serializers=response_serializers, "
+ }
+}
+
+void PrivateGenerator::PrintBetaStubFactory(
+ const grpc::string& package_qualified_service_name,
+ const grpc_generator::Service* service, grpc_generator::Printer* out) {
+ StringMap dict;
+ dict["Service"] = service->name();
+ out->Print("\n\n");
+ out->Print(dict,
+ "def beta_create_$Service$_stub(channel, host=None,"
+ " metadata_transformer=None, pool=None, pool_size=None):\n");
+ {
+ IndentScope raii_create_server_indent(out);
+ out->Print(
+ "\"\"\"The Beta API is deprecated for 0.15.0 and later.\n"
+ "\nIt is recommended to use the GA API (classes and functions in this\n"
+ "file not marked beta) for all further purposes. This function was\n"
+ "generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"
+ "\"\"\"\n");
+ StringMap method_cardinalities;
+ StringMap input_message_modules_and_classes;
+ StringMap output_message_modules_and_classes;
+ for (int i = 0; i < service->method_count(); ++i) {
+ auto method = service->method(i);
+ const grpc::string method_cardinality =
+ grpc::string(method->ClientStreaming() ? "STREAM" : "UNARY") +
+ "_" +
+ grpc::string(method->ServerStreaming() ? "STREAM" : "UNARY");
+ grpc::string input_message_module_and_class = method->get_fb_builder();
+ grpc::string output_message_module_and_class = method->get_fb_builder();
+ method_cardinalities.insert(
+ make_pair(method->name(), method_cardinality));
+ input_message_modules_and_classes.insert(
+ make_pair(method->name(), input_message_module_and_class));
+ output_message_modules_and_classes.insert(
+ make_pair(method->name(), output_message_module_and_class));
+ }
+ StringMap method_dict;
+ method_dict["PackageQualifiedServiceName"] = package_qualified_service_name;
+// out->Print("request_serializers = {\n");
+// for (StringMap::iterator name_and_input_module_class_pair =
+// input_message_modules_and_classes.begin();
+// name_and_input_module_class_pair !=
+// input_message_modules_and_classes.end();
+// name_and_input_module_class_pair++) {
+// method_dict["MethodName"] = name_and_input_module_class_pair->first;
+// method_dict["InputTypeModuleAndClass"] =
+// name_and_input_module_class_pair->second;
+// IndentScope raii_indent(out);
+// out->Print(method_dict,
+// "(\'$PackageQualifiedServiceName$\', \'$MethodName$\'): "
+// "$InputTypeModuleAndClass$.SerializeToString,\n");
+// }
+// out->Print("}\n");
+// out->Print("response_deserializers = {\n");
+// for (StringMap::iterator name_and_output_module_class_pair =
+// output_message_modules_and_classes.begin();
+// name_and_output_module_class_pair !=
+// output_message_modules_and_classes.end();
+// name_and_output_module_class_pair++) {
+// method_dict["MethodName"] = name_and_output_module_class_pair->first;
+// method_dict["OutputTypeModuleAndClass"] =
+// name_and_output_module_class_pair->second;
+// IndentScope raii_indent(out);
+// out->Print(method_dict,
+// "(\'$PackageQualifiedServiceName$\', \'$MethodName$\'): "
+// "$OutputTypeModuleAndClass$.FromString,\n");
+// }
+// out->Print("}\n");
+ out->Print("cardinalities = {\n");
+ for (StringMap::iterator name_and_cardinality =
+ method_cardinalities.begin();
+ name_and_cardinality != method_cardinalities.end();
+ name_and_cardinality++) {
+ method_dict["Method"] = name_and_cardinality->first;
+ method_dict["Cardinality"] = name_and_cardinality->second;
+ IndentScope raii_descriptions_indent(out);
+ out->Print(method_dict,
+ "\'$Method$\': cardinality.Cardinality.$Cardinality$,\n");
+ }
+ out->Print("}\n");
+ out->Print(
+ "stub_options = beta_implementations.stub_options("
+ "host=host, metadata_transformer=metadata_transformer, "
+ "thread_pool=pool, thread_pool_size=pool_size)\n");
+ out->Print(method_dict,
+ "return beta_implementations.dynamic_stub(channel, "
+ "\'$PackageQualifiedServiceName$\', "
+ "cardinalities, options=stub_options)\n");
+ // "request_serializers=request_serializers, "
+ //"response_deserializers=response_deserializers, "
+ }
+}
+
+void PrivateGenerator::PrintStub(
+ const grpc::string& package_qualified_service_name,
+ const grpc_generator::Service* service, grpc_generator::Printer* out) {
+ StringMap dict;
+ dict["Service"] = service->name();
+ out->Print("\n\n");
+ out->Print(dict, "class $Service$Stub(object):\n");
+ {
+ IndentScope raii_class_indent(out);
+ out->Print("\n");
+ out->Print("def __init__(self, channel):\n");
+ {
+ IndentScope raii_init_indent(out);
+ out->Print("\"\"\"Constructor.\n");
+ out->Print("\n");
+ out->Print("Args:\n");
+ {
+ IndentScope raii_args_indent(out);
+ out->Print("channel: A grpc.Channel.\n");
+ }
+ out->Print("\"\"\"\n");
+ for (int i = 0; i < service->method_count(); ++i) {
+ auto method = service->method(i);
+ grpc::string multi_callable_constructor =
+ grpc::string(method->ClientStreaming() ? "stream" : "unary") +
+ "_" +
+ grpc::string(method->ServerStreaming() ? "stream" : "unary");
+ grpc::string request_module_and_class = method->get_fb_builder();
+ grpc::string response_module_and_class = method->get_fb_builder();
+ StringMap method_dict;
+ method_dict["Method"] = method->name();
+ method_dict["MultiCallableConstructor"] = multi_callable_constructor;
+ out->Print(method_dict,
+ "self.$Method$ = channel.$MultiCallableConstructor$(\n");
+ {
+ method_dict["PackageQualifiedService"] =
+ package_qualified_service_name;
+ method_dict["RequestModuleAndClass"] = request_module_and_class;
+ method_dict["ResponseModuleAndClass"] = response_module_and_class;
+ IndentScope raii_first_attribute_indent(out);
+ IndentScope raii_second_attribute_indent(out);
+ out->Print(method_dict, "'/$PackageQualifiedService$/$Method$',\n");
+ out->Print(method_dict,"\n");
+ out->Print(
+ method_dict,"\n");
+ out->Print(")\n");
+ }
+ }
+ }
+ }
+}
+
+void PrivateGenerator::PrintServicer(const grpc_generator::Service* service,
+ grpc_generator::Printer* out) {
+ StringMap service_dict;
+ service_dict["Service"] = service->name();
+ out->Print("\n\n");
+ out->Print(service_dict, "class $Service$Servicer(object):\n");
+ {
+ IndentScope raii_class_indent(out);
+ for (int i = 0; i < service->method_count(); ++i) {
+ auto method = service->method(i);
+ grpc::string arg_name =
+ method->ClientStreaming() ? "request_iterator" : "request";
+ StringMap method_dict;
+ method_dict["Method"] = method->name();
+ method_dict["ArgName"] = arg_name;
+ out->Print("\n");
+ out->Print(method_dict, "def $Method$(self, $ArgName$, context):\n");
+ {
+ IndentScope raii_method_indent(out);
+ out->Print("context.set_code(grpc.StatusCode.UNIMPLEMENTED)\n");
+ out->Print("context.set_details('Method not implemented!')\n");
+ out->Print("raise NotImplementedError('Method not implemented!')\n");
+ }
+ }
+ }
+}
+
+void PrivateGenerator::PrintAddServicerToServer(
+ const grpc::string& package_qualified_service_name,
+ const grpc_generator::Service* service, grpc_generator::Printer* out) {
+ StringMap service_dict;
+ service_dict["Service"] = service->name();
+ out->Print("\n\n");
+ out->Print(service_dict,
+ "def add_$Service$Servicer_to_server(servicer, server):\n");
+ {
+ IndentScope raii_class_indent(out);
+ out->Print("rpc_method_handlers = {\n");
+ {
+ IndentScope raii_dict_first_indent(out);
+ IndentScope raii_dict_second_indent(out);
+ for (int i = 0; i < service->method_count(); ++i) {
+ auto method = service->method(i);
+ grpc::string method_handler_constructor =
+ grpc::string(method->ClientStreaming() ? "stream" : "unary") +
+ "_" +
+ grpc::string(method->ServerStreaming() ? "stream" : "unary") +
+ "_rpc_method_handler";
+ grpc::string request_module_and_class = method->get_fb_builder();
+ grpc::string response_module_and_class = method->get_fb_builder();
+ StringMap method_dict;
+ method_dict["Method"] = method->name();
+ method_dict["MethodHandlerConstructor"] = method_handler_constructor;
+ method_dict["RequestModuleAndClass"] = request_module_and_class;
+ method_dict["ResponseModuleAndClass"] = response_module_and_class;
+ out->Print(method_dict,
+ "'$Method$': grpc.$MethodHandlerConstructor$(\n");
+ {
+ IndentScope raii_call_first_indent(out);
+ IndentScope raii_call_second_indent(out);
+ out->Print(method_dict, "servicer.$Method$,\n");
+ out->Print(
+ method_dict,"\n");
+ out->Print(
+ method_dict,
+ "\n");
+ }
+ out->Print("),\n");
+ }
+ }
+ StringMap method_dict;
+ method_dict["PackageQualifiedServiceName"] = package_qualified_service_name;
+ out->Print("}\n");
+ out->Print("generic_handler = grpc.method_handlers_generic_handler(\n");
+ {
+ IndentScope raii_call_first_indent(out);
+ IndentScope raii_call_second_indent(out);
+ out->Print(method_dict,
+ "'$PackageQualifiedServiceName$', rpc_method_handlers)\n");
+ }
+ out->Print("server.add_generic_rpc_handlers((generic_handler,))\n");
+ }
+}
+
+void PrivateGenerator::PrintBetaPreamble(grpc_generator::Printer* out) {
+ StringMap var;
+ var["Package"] = config.beta_package_root;
+ out->Print(var,
+ "from $Package$ import implementations as beta_implementations\n");
+ out->Print(var, "from $Package$ import interfaces as beta_interfaces\n");
+ out->Print("from grpc.framework.common import cardinality\n");
+ out->Print(
+ "from grpc.framework.interfaces.face import utilities as "
+ "face_utilities\n");
+}
+
+void PrivateGenerator::PrintPreamble(grpc_generator::Printer* out) {
+ StringMap var;
+ var["Package"] = config.grpc_package_root;
+ out->Print(var, "import $Package$\n");
+ out->Print("\n");
+ StringPairSet imports_set;
+ for (int i = 0; i < file->service_count(); ++i) {
+ auto service = file->service(i);
+ for (int j = 0; j < service->method_count(); ++j) {
+ auto method = service.get()->method(j);
+
+ grpc::string input_type_file_name = method->get_fb_builder();
+ grpc::string input_module_name =
+ ModuleName(input_type_file_name, config.import_prefix);
+ grpc::string input_module_alias =
+ ModuleAlias(input_type_file_name, config.import_prefix);
+ imports_set.insert(
+ std::make_tuple(input_module_name, input_module_alias));
+
+ grpc::string output_type_file_name = method->get_fb_builder();
+ grpc::string output_module_name =
+ ModuleName(output_type_file_name, config.import_prefix);
+ grpc::string output_module_alias =
+ ModuleAlias(output_type_file_name, config.import_prefix);
+ imports_set.insert(
+ std::make_tuple(output_module_name, output_module_alias));
+ }
+ }
+
+ for (StringPairSet::iterator it = imports_set.begin();
+ it != imports_set.end(); ++it) {
+ var["ModuleName"] = std::get<0>(*it);
+ var["ModuleAlias"] = std::get<1>(*it);
+ out->Print(var, "import $ModuleName$ as $ModuleAlias$\n");
+ }
+}
+
+void PrivateGenerator::PrintGAServices(grpc_generator::Printer* out) {
+ grpc::string package = file->package();
+ if (!package.empty()) {
+ package = package.append(".");
+ }
+
+ out->Print(file->additional_headers().c_str());
+
+ for (int i = 0; i < file->service_count(); ++i) {
+ auto service = file->service(i);
+
+ grpc::string package_qualified_service_name = package + service->name();
+ PrintStub(package_qualified_service_name, service.get(), out);
+ PrintServicer(service.get(), out);
+ PrintAddServicerToServer(package_qualified_service_name, service.get(),
+ out);
+ }
+}
+
+void PrivateGenerator::PrintBetaServices(grpc_generator::Printer* out) {
+ grpc::string package = file->package();
+ if (!package.empty()) {
+ package = package.append(".");
+ }
+ for (int i = 0; i < file->service_count(); ++i) {
+ auto service = file->service(i);
+
+ grpc::string package_qualified_service_name = package + service->name();
+ PrintBetaServicer(service.get(), out);
+ PrintBetaStub(service.get(), out);
+ PrintBetaServerFactory(package_qualified_service_name, service.get(), out);
+ PrintBetaStubFactory(package_qualified_service_name, service.get(), out);
+ }
+}
+
+grpc::string PrivateGenerator::GetGrpcServices() {
+ grpc::string output;
+ {
+ // Scope the output stream so it closes and finalizes output to the string.
+ auto out = file->CreatePrinter(&output);
+ out->Print(
+ "# Generated by the gRPC Python protocol compiler plugin. "
+ "DO NOT EDIT!\n");
+ StringMap var;
+ var["Package"] = config.grpc_package_root;
+ out->Print(var, "import $Package$\n");
+ PrintGAServices(out.get());
+ out->Print("try:\n");
+ {
+ IndentScope raii_dict_try_indent(out.get());
+ out->Print(
+ "# THESE ELEMENTS WILL BE DEPRECATED.\n"
+ "# Please use the generated *_pb2_grpc.py files instead.\n");
+ out->Print(var, "import $Package$\n");
+ PrintBetaPreamble(out.get());
+ PrintGAServices(out.get());
+ PrintBetaServices(out.get());
+ }
+ out->Print("except ImportError:\n");
+ {
+ IndentScope raii_dict_except_indent(out.get());
+ out->Print("pass");
+ }
+ }
+ return output;
+}
+
+} // namespace grpc_python_generator
diff --git a/grpc/src/compiler/python_generator.h b/grpc/src/compiler/python_generator.h
new file mode 100644
index 0000000..d92cb02
--- /dev/null
+++ b/grpc/src/compiler/python_generator.h
@@ -0,0 +1,40 @@
+/*
+ *
+ * Copyright 2015 gRPC authors.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GRPC_INTERNAL_COMPILER_PYTHON_GENERATOR_H
+#define GRPC_INTERNAL_COMPILER_PYTHON_GENERATOR_H
+
+#include <utility>
+
+#include "src/compiler/schema_interface.h"
+
+namespace grpc_python_generator {
+
+// Data pertaining to configuration of the generator with respect to anything
+// that may be used internally at Google.
+struct GeneratorConfiguration {
+ grpc::string grpc_package_root;
+ // TODO(https://github.com/grpc/grpc/issues/8622): Drop this.
+ grpc::string beta_package_root;
+ // TODO(https://github.com/google/protobuf/issues/888): Drop this.
+ grpc::string import_prefix;
+};
+
+} // namespace grpc_python_generator
+
+#endif // GRPC_INTERNAL_COMPILER_PYTHON_GENERATOR_H
diff --git a/grpc/src/compiler/python_private_generator.h b/grpc/src/compiler/python_private_generator.h
new file mode 100644
index 0000000..30ba0d7
--- /dev/null
+++ b/grpc/src/compiler/python_private_generator.h
@@ -0,0 +1,72 @@
+/*
+ *
+ * Copyright 2015 gRPC authors.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GRPC_INTERNAL_COMPILER_PYTHON_PRIVATE_GENERATOR_H
+#define GRPC_INTERNAL_COMPILER_PYTHON_PRIVATE_GENERATOR_H
+
+#include <iostream>
+#include <vector>
+
+#include "src/compiler/python_generator.h"
+#include "src/compiler/schema_interface.h"
+
+namespace grpc_python_generator {
+
+// Tucks all generator state in an anonymous namespace away from
+// PythonGrpcGenerator and the header file, mostly to encourage future changes
+// to not require updates to the grpcio-tools C++ code part. Assumes that it is
+// only ever used from a single thread.
+struct PrivateGenerator {
+ const GeneratorConfiguration& config;
+ const grpc_generator::File* file;
+
+ PrivateGenerator(const GeneratorConfiguration& config,
+ const grpc_generator::File* file);
+
+ grpc::string GetGrpcServices();
+
+ private:
+ void PrintPreamble(grpc_generator::Printer* out);
+ void PrintBetaPreamble(grpc_generator::Printer* out);
+ void PrintGAServices(grpc_generator::Printer* out);
+ void PrintBetaServices(grpc_generator::Printer* out);
+
+ void PrintAddServicerToServer(
+ const grpc::string& package_qualified_service_name,
+ const grpc_generator::Service* service, grpc_generator::Printer* out);
+ void PrintServicer(const grpc_generator::Service* service,
+ grpc_generator::Printer* out);
+ void PrintStub(const grpc::string& package_qualified_service_name,
+ const grpc_generator::Service* service,
+ grpc_generator::Printer* out);
+
+ void PrintBetaServicer(const grpc_generator::Service* service,
+ grpc_generator::Printer* out);
+ void PrintBetaServerFactory(
+ const grpc::string& package_qualified_service_name,
+ const grpc_generator::Service* service, grpc_generator::Printer* out);
+ void PrintBetaStub(const grpc_generator::Service* service,
+ grpc_generator::Printer* out);
+ void PrintBetaStubFactory(const grpc::string& package_qualified_service_name,
+ const grpc_generator::Service* service,
+ grpc_generator::Printer* out);
+};
+
+} // namespace grpc_python_generator
+
+#endif // GRPC_INTERNAL_COMPILER_PYTHON_PRIVATE_GENERATOR_H
diff --git a/grpc/src/compiler/schema_interface.h b/grpc/src/compiler/schema_interface.h
index 2be2ed7..c03ffe7 100644
--- a/grpc/src/compiler/schema_interface.h
+++ b/grpc/src/compiler/schema_interface.h
@@ -1,44 +1,29 @@
/*
*
- * Copyright 2015, Google Inc.
- * All rights reserved.
+ * Copyright 2015 gRPC authors.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * 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
*
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 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.
*
*/
#ifndef GRPC_INTERNAL_COMPILER_SCHEMA_INTERFACE_H
#define GRPC_INTERNAL_COMPILER_SCHEMA_INTERFACE_H
-#include "src/compiler/config.h"
-
#include <memory>
#include <vector>
+#include "src/compiler/config.h"
+
#ifndef GRPC_CUSTOM_STRING
# include <string>
# define GRPC_CUSTOM_STRING std::string
@@ -77,8 +62,13 @@
grpc::string *str, grpc::string generator_file_name,
bool generate_in_pb2_grpc, grpc::string import_prefix) const = 0;
+ virtual std::vector<grpc::string> get_input_namespace_parts() const = 0;
virtual grpc::string get_input_type_name() const = 0;
+ virtual std::vector<grpc::string> get_output_namespace_parts() const = 0;
virtual grpc::string get_output_type_name() const = 0;
+
+ virtual grpc::string get_fb_builder() const = 0;
+
virtual bool NoStreaming() const = 0;
virtual bool ClientStreaming() const = 0;
virtual bool ServerStreaming() const = 0;
@@ -89,7 +79,9 @@
struct Service : public CommentHolder {
virtual ~Service() {}
+ virtual std::vector<grpc::string> namespace_parts() const = 0;
virtual grpc::string name() const = 0;
+ virtual bool is_internal() const = 0;
virtual int method_count() const = 0;
virtual std::unique_ptr<const Method> method(int i) const = 0;
diff --git a/grpc/src/compiler/swift_generator.cc b/grpc/src/compiler/swift_generator.cc
new file mode 100644
index 0000000..bb731d5
--- /dev/null
+++ b/grpc/src/compiler/swift_generator.cc
@@ -0,0 +1,312 @@
+/*
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * 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.
+ */
+
+/*
+ * NOTE: The following implementation is a translation for the Swift-grpc
+ * generator since flatbuffers doesnt allow plugins for now. if an issue arises
+ * please open an issue in the flatbuffers repository. This file should always
+ * be maintained according to the Swift-grpc repository
+ */
+#include <map>
+#include <sstream>
+
+#include "flatbuffers/util.h"
+#include "src/compiler/schema_interface.h"
+#include "src/compiler/swift_generator.h"
+
+namespace grpc_swift_generator {
+
+std::string WrapInNameSpace(const std::vector<std::string> &components, const grpc::string &name) {
+ std::string qualified_name;
+ for (auto it = components.begin(); it != components.end(); ++it)
+ qualified_name += *it + "_";
+ return qualified_name + name;
+}
+
+grpc::string GenerateMessage(const std::vector<std::string> &components, const grpc::string &name) {
+ return "Message<" + WrapInNameSpace(components, name) + ">";
+}
+
+// MARK: - Client
+
+grpc::string GenerateClientFuncName(const grpc_generator::Method *method) {
+ if (method->NoStreaming()) {
+ return "$GenAccess$ func $MethodName$(_ request: $Input$"
+ ", callOptions: CallOptions?$isNil$) -> UnaryCall<$Input$,$Output$>";
+ }
+
+ if (method->ClientStreaming()) {
+ return "$GenAccess$ func $MethodName$"
+ "(callOptions: CallOptions?$isNil$) -> "
+ "ClientStreamingCall<$Input$,$Output$>";
+ }
+
+ if (method->ServerStreaming()) {
+ return "$GenAccess$ func $MethodName$(_ request: $Input$"
+ ", callOptions: CallOptions?$isNil$, handler: @escaping ($Output$"
+ ") -> Void) -> ServerStreamingCall<$Input$, $Output$>";
+ }
+ return "$GenAccess$ func $MethodName$"
+ "(callOptions: CallOptions?$isNil$, handler: @escaping ($Output$"
+ ") -> Void) -> BidirectionalStreamingCall<$Input$, $Output$>";
+}
+
+grpc::string GenerateClientFuncBody(const grpc_generator::Method *method) {
+ if (method->NoStreaming()) {
+ return "return self.makeUnaryCall(path: "
+ "\"/$PATH$$ServiceName$/$MethodName$\", request: request, "
+ "callOptions: callOptions ?? self.defaultCallOptions)";
+ }
+
+ if (method->ClientStreaming()) {
+ return "return self.makeClientStreamingCall(path: "
+ "\"/$PATH$$ServiceName$/$MethodName$\", callOptions: callOptions ?? "
+ "self.defaultCallOptions)";
+ }
+
+ if (method->ServerStreaming()) {
+ return "return self.makeServerStreamingCall(path: "
+ "\"/$PATH$$ServiceName$/$MethodName$\", request: request, "
+ "callOptions: callOptions ?? self.defaultCallOptions, handler: "
+ "handler)";
+ }
+ return "return self.makeBidirectionalStreamingCall(path: "
+ "\"/$PATH$$ServiceName$/$MethodName$\", callOptions: callOptions ?? "
+ "self.defaultCallOptions, handler: handler)";
+}
+
+void GenerateClientProtocol(const grpc_generator::Service *service,
+ grpc_generator::Printer *printer,
+ std::map<grpc::string, grpc::string> *dictonary) {
+ auto vars = *dictonary;
+ printer->Print(vars, "$ACCESS$ protocol $ServiceQualifiedName$Service {\n");
+ vars["GenAccess"] = "";
+ for (auto it = 0; it < service->method_count(); it++) {
+ auto method = service->method(it);
+ vars["Input"] = GenerateMessage(method->get_input_namespace_parts(), method->get_input_type_name());
+ vars["Output"] = GenerateMessage(method->get_output_namespace_parts(), method->get_output_type_name());
+ vars["MethodName"] = method->name();
+ vars["isNil"] = "";
+ printer->Print("\t");
+ auto func = GenerateClientFuncName(method.get());
+ printer->Print(vars, func.c_str());
+ printer->Print("\n");
+ }
+ printer->Print("}\n\n");
+}
+
+void GenerateClientClass(const grpc_generator::Service *service,
+ grpc_generator::Printer *printer,
+ std::map<grpc::string, grpc::string> *dictonary) {
+ auto vars = *dictonary;
+ printer->Print(vars,
+ "$ACCESS$ final class $ServiceQualifiedName$ServiceClient: GRPCClient, "
+ "$ServiceQualifiedName$Service {\n");
+ printer->Print(vars, "\t$ACCESS$ let channel: GRPCChannel\n");
+ printer->Print(vars, "\t$ACCESS$ var defaultCallOptions: CallOptions\n");
+ printer->Print("\n");
+ printer->Print(vars,
+ "\t$ACCESS$ init(channel: GRPCChannel, "
+ "defaultCallOptions: CallOptions = CallOptions()) {\n");
+ printer->Print("\t\tself.channel = channel\n");
+ printer->Print("\t\tself.defaultCallOptions = defaultCallOptions\n");
+ printer->Print("\t}");
+ printer->Print("\n");
+ vars["GenAccess"] = service->is_internal() ? "internal" : "public";
+ for (auto it = 0; it < service->method_count(); it++) {
+ auto method = service->method(it);
+ vars["Input"] = GenerateMessage(method->get_input_namespace_parts(), method->get_input_type_name());
+ vars["Output"] = GenerateMessage(method->get_output_namespace_parts(), method->get_output_type_name());
+ vars["MethodName"] = method->name();
+ vars["isNil"] = " = nil";
+ printer->Print("\n\t");
+ auto func = GenerateClientFuncName(method.get());
+ printer->Print(vars, func.c_str());
+ printer->Print(" {\n");
+ auto body = GenerateClientFuncBody(method.get());
+ printer->Print("\t\t");
+ printer->Print(vars, body.c_str());
+ printer->Print("\n\t}\n");
+ }
+ printer->Print("}\n");
+}
+
+// MARK: - Server
+
+grpc::string GenerateServerFuncName(const grpc_generator::Method *method) {
+ if (method->NoStreaming()) {
+ return "func $MethodName$(_ request: $Input$"
+ ", context: StatusOnlyCallContext) -> EventLoopFuture<$Output$>";
+ }
+
+ if (method->ClientStreaming()) {
+ return "func $MethodName$(context: UnaryResponseCallContext<$Output$>) -> "
+ "EventLoopFuture<(StreamEvent<$Input$"
+ ">) -> Void>";
+ }
+
+ if (method->ServerStreaming()) {
+ return "func $MethodName$(request: $Input$"
+ ", context: StreamingResponseCallContext<$Output$>) -> "
+ "EventLoopFuture<GRPCStatus>";
+ }
+ return "func $MethodName$(context: StreamingResponseCallContext<$Output$>) "
+ "-> EventLoopFuture<(StreamEvent<$Input$>) -> Void>";
+}
+
+grpc::string GenerateServerExtensionBody(const grpc_generator::Method *method) {
+ grpc::string start = "\t\tcase \"$MethodName$\":\n\t\t";
+ if (method->NoStreaming()) {
+ return start +
+ "return CallHandlerFactory.makeUnary(callHandlerContext: callHandlerContext) { "
+ "context in"
+ "\n\t\t\t"
+ "return { request in"
+ "\n\t\t\t\t"
+ "self.$MethodName$(request, context: context)"
+ "\n\t\t\t}"
+ "\n\t\t}";
+ }
+ if (method->ClientStreaming()) {
+ return start +
+ "return CallHandlerFactory.makeClientStreaming(callHandlerContext: "
+ "callHandlerContext) { context in"
+ "\n\t\t\t"
+ "self.$MethodName$(context: context)"
+ "\n\t\t}";
+ }
+ if (method->ServerStreaming()) {
+ return start +
+ "return CallHandlerFactory.makeServerStreaming(callHandlerContext: "
+ "callHandlerContext) { context in"
+ "\n\t\t\t"
+ "return { request in"
+ "\n\t\t\t\t"
+ "self.$MethodName$(request: request, context: context)"
+ "\n\t\t\t}"
+ "\n\t\t}";
+ }
+ if (method->BidiStreaming()) {
+ return start +
+ "return CallHandlerFactory.makeBidirectionalStreaming(callHandlerContext: "
+ "callHandlerContext) { context in"
+ "\n\t\t\t"
+ "self.$MethodName$(context: context)"
+ "\n\t\t}";
+ }
+ return "";
+}
+
+void GenerateServerProtocol(const grpc_generator::Service *service,
+ grpc_generator::Printer *printer,
+ std::map<grpc::string, grpc::string> *dictonary) {
+ auto vars = *dictonary;
+ printer->Print(
+ vars, "$ACCESS$ protocol $ServiceQualifiedName$Provider: CallHandlerProvider {\n");
+ for (auto it = 0; it < service->method_count(); it++) {
+ auto method = service->method(it);
+ vars["Input"] = GenerateMessage(method->get_input_namespace_parts(), method->get_input_type_name());
+ vars["Output"] = GenerateMessage(method->get_output_namespace_parts(), method->get_output_type_name());
+ vars["MethodName"] = method->name();
+ printer->Print("\t");
+ auto func = GenerateServerFuncName(method.get());
+ printer->Print(vars, func.c_str());
+ printer->Print("\n");
+ }
+ printer->Print("}\n\n");
+
+ printer->Print(vars, "$ACCESS$ extension $ServiceQualifiedName$Provider {\n");
+ printer->Print("\n");
+ printer->Print(vars,
+ "\tvar serviceName: Substring { return "
+ "\"$PATH$$ServiceName$\" }\n");
+ printer->Print("\n");
+ printer->Print(
+ "\tfunc handleMethod(_ methodName: Substring, callHandlerContext: "
+ "CallHandlerContext) -> GRPCCallHandler? {\n");
+ printer->Print("\t\tswitch methodName {\n");
+ for (auto it = 0; it < service->method_count(); it++) {
+ auto method = service->method(it);
+ vars["Input"] = GenerateMessage(method->get_input_namespace_parts(), method->get_input_type_name());
+ vars["Output"] = GenerateMessage(method->get_output_namespace_parts(), method->get_output_type_name());
+ vars["MethodName"] = method->name();
+ auto body = GenerateServerExtensionBody(method.get());
+ printer->Print(vars, body.c_str());
+ printer->Print("\n");
+ }
+ printer->Print("\t\tdefault: return nil;\n");
+ printer->Print("\t\t}\n");
+ printer->Print("\t}\n\n");
+ printer->Print("}\n\n");
+}
+
+grpc::string Generate(grpc_generator::File *file,
+ const grpc_generator::Service *service) {
+ grpc::string output;
+ std::map<grpc::string, grpc::string> vars;
+ vars["PATH"] = file->package();
+ if (!file->package().empty()) { vars["PATH"].append("."); }
+ vars["ServiceQualifiedName"] = WrapInNameSpace(service->namespace_parts(), service->name());
+ vars["ServiceName"] = service->name();
+ vars["ACCESS"] = service->is_internal() ? "internal" : "public";
+ auto printer = file->CreatePrinter(&output);
+ printer->Print(vars,
+ "/// Usage: instantiate $ServiceQualifiedName$ServiceClient, then call "
+ "methods of this protocol to make API calls.\n");
+ GenerateClientProtocol(service, &*printer, &vars);
+ GenerateClientClass(service, &*printer, &vars);
+ printer->Print("\n");
+ GenerateServerProtocol(service, &*printer, &vars);
+ return output;
+}
+
+grpc::string GenerateHeader() {
+ grpc::string code;
+ code +=
+ "/// The following code is generated by the Flatbuffers library which "
+ "might not be in sync with grpc-swift\n";
+ code +=
+ "/// in case of an issue please open github issue, though it would be "
+ "maintained\n";
+ code += "import Foundation\n";
+ code += "import GRPC\n";
+ code += "import NIO\n";
+ code += "import NIOHTTP1\n";
+ code += "import FlatBuffers\n";
+ code += "\n";
+ code +=
+ "public protocol GRPCFlatBufPayload: GRPCPayload, FlatBufferGRPCMessage "
+ "{}\n";
+
+ code += "public extension GRPCFlatBufPayload {\n";
+ code += " init(serializedByteBuffer: inout NIO.ByteBuffer) throws {\n";
+ code +=
+ " self.init(byteBuffer: FlatBuffers.ByteBuffer(contiguousBytes: "
+ "serializedByteBuffer.readableBytesView, count: "
+ "serializedByteBuffer.readableBytes))\n";
+ code += " }\n";
+
+ code += " func serialize(into buffer: inout NIO.ByteBuffer) throws {\n";
+ code +=
+ " let buf = UnsafeRawBufferPointer(start: self.rawPointer, count: "
+ "Int(self.size))\n";
+ code += " buffer.writeBytes(buf)\n";
+ code += " }\n";
+ code += "}\n";
+ code += "extension Message: GRPCFlatBufPayload {}\n";
+ return code;
+}
+} // namespace grpc_swift_generator
diff --git a/grpc/src/compiler/swift_generator.h b/grpc/src/compiler/swift_generator.h
new file mode 100644
index 0000000..1639cb0
--- /dev/null
+++ b/grpc/src/compiler/swift_generator.h
@@ -0,0 +1,55 @@
+/*
+ *
+ * Copyright 2020, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <memory>
+#include <vector>
+
+#include "src/compiler/config.h"
+#include "src/compiler/schema_interface.h"
+
+#ifndef GRPC_CUSTOM_STRING
+# include <string>
+# define GRPC_CUSTOM_STRING std::string
+#endif
+
+namespace grpc {
+
+typedef GRPC_CUSTOM_STRING string;
+
+} // namespace grpc
+
+namespace grpc_swift_generator {
+grpc::string Generate(grpc_generator::File *file,
+ const grpc_generator::Service *service);
+grpc::string GenerateHeader();
+} // namespace grpc_swift_generator
diff --git a/grpc/src/compiler/ts_generator.cc b/grpc/src/compiler/ts_generator.cc
new file mode 100644
index 0000000..fe9731d
--- /dev/null
+++ b/grpc/src/compiler/ts_generator.cc
@@ -0,0 +1,455 @@
+/*
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * 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.
+ */
+
+/*
+ * NOTE: The following implementation is a translation for the Swift-grpc
+ * generator since flatbuffers doesnt allow plugins for now. if an issue arises
+ * please open an issue in the flatbuffers repository. This file should always
+ * be maintained according to the Swift-grpc repository
+ */
+
+#include <map>
+#include <sstream>
+
+#include "flatbuffers/util.h"
+#include "src/compiler/schema_interface.h"
+#include "src/compiler/ts_generator.h"
+
+namespace grpc_ts_generator {
+
+// MARK: - Shared code
+
+void GenerateImports(grpc_generator::Printer *printer,
+ std::map<grpc::string, grpc::string> *dictonary,
+ const bool grpc_var_import) {
+ auto vars = *dictonary;
+ printer->Print(
+ "// Generated GRPC code for FlatBuffers TS *** DO NOT EDIT ***\n");
+ printer->Print("import { flatbuffers } from 'flatbuffers';\n");
+ printer->Print(vars,
+ "import * as $FBSFile$ from './$Filename$_generated';\n");
+ printer->Print("\n");
+ if (grpc_var_import)
+ printer->Print("var grpc = require('grpc');\n");
+ else
+ printer->Print("import * as grpc from 'grpc';\n");
+ printer->Print("\n");
+}
+
+// MARK: - Generate Main GRPC Code
+
+void GetStreamType(grpc_generator::Printer *printer,
+ const grpc_generator::Method *method,
+ std::map<grpc::string, grpc::string> *dictonary) {
+ auto vars = *dictonary;
+ auto client_streaming = method->ClientStreaming() || method->BidiStreaming();
+ auto server_streaming = method->ServerStreaming() || method->BidiStreaming();
+ vars["ClientStreaming"] = client_streaming ? "true" : "false";
+ vars["ServerStreaming"] = server_streaming ? "true" : "false";
+ printer->Print(vars, "requestStream: $ClientStreaming$,\n");
+ printer->Print(vars, "responseStream: $ServerStreaming$,\n");
+}
+
+void GenerateSerializeMethod(grpc_generator::Printer *printer,
+ std::map<grpc::string, grpc::string> *dictonary) {
+ auto vars = *dictonary;
+ printer->Print(vars, "function serialize_$Type$(buffer_args) {\n");
+ printer->Indent();
+ printer->Print(vars, "if (!(buffer_args instanceof $FBSFile$.$Type$)) {\n");
+ printer->Indent();
+ printer->Print(
+ vars, "throw new Error('Expected argument of type $FBSFile$.$Type$');\n");
+ printer->Outdent();
+ printer->Print("}\n");
+ printer->Print(vars, "return buffer_args.serialize();\n");
+ printer->Outdent();
+ printer->Print("}\n\n");
+}
+
+void GenerateDeserializeMethod(
+ grpc_generator::Printer *printer,
+ std::map<grpc::string, grpc::string> *dictonary) {
+ auto vars = *dictonary;
+ printer->Print(vars, "function deserialize_$Type$(buffer) {\n");
+ printer->Indent();
+ printer->Print(vars,
+ "return $FBSFile$.$Type$.getRootAs$Type$(new "
+ "flatbuffers.ByteBuffer(buffer))\n");
+ printer->Outdent();
+ printer->Print("}\n\n");
+}
+
+void GenerateMethods(const grpc_generator::Service *service,
+ grpc_generator::Printer *printer,
+ std::map<grpc::string, grpc::string> *dictonary) {
+ auto vars = *dictonary;
+
+ std::set<grpc::string> generated_functions;
+
+ for (auto it = 0; it < service->method_count(); it++) {
+ auto method = service->method(it);
+ auto output = method->get_output_type_name();
+ auto input = method->get_input_type_name();
+
+ if (generated_functions.find(output) == generated_functions.end()) {
+ generated_functions.insert(output);
+ vars["Type"] = output;
+ GenerateSerializeMethod(printer, &vars);
+ GenerateDeserializeMethod(printer, &vars);
+ }
+ printer->Print("\n");
+ if (generated_functions.find(input) == generated_functions.end()) {
+ generated_functions.insert(input);
+ vars["Type"] = input;
+ GenerateSerializeMethod(printer, &vars);
+ GenerateDeserializeMethod(printer, &vars);
+ }
+ }
+}
+
+void GenerateService(const grpc_generator::Service *service,
+ grpc_generator::Printer *printer,
+ std::map<grpc::string, grpc::string> *dictonary) {
+ auto vars = *dictonary;
+ vars["NAME"] = service->name() + "Service";
+
+ printer->Print(vars, "var $NAME$ = exports.$NAME$ = {\n");
+ printer->Indent();
+ for (auto it = 0; it < service->method_count(); it++) {
+ auto method = service->method(it);
+ vars["MethodName"] = method->name();
+ vars["Output"] = method->get_output_type_name();
+ vars["Input"] = method->get_input_type_name();
+ printer->Print(vars, "$MethodName$: {\n");
+ printer->Indent();
+ printer->Print(vars, "path: '/$PATH$$ServiceName$/$MethodName$',\n");
+ GetStreamType(printer, &*method, &vars);
+ printer->Print(vars, "requestType: flatbuffers.ByteBuffer,\n");
+ printer->Print(vars, "responseType: $FBSFile$.$Output$,\n");
+ printer->Print(vars, "requestSerialize: serialize_$Input$,\n");
+ printer->Print(vars, "requestDeserialize: deserialize_$Input$,\n");
+ printer->Print(vars, "responseSerialize: serialize_$Output$,\n");
+ printer->Print(vars, "responseDeserialize: deserialize_$Output$,\n");
+ printer->Outdent();
+ printer->Print("},\n");
+ }
+ printer->Outdent();
+ printer->Print("};\n");
+ printer->Print(vars,
+ "exports.$ServiceName$Client = "
+ "grpc.makeGenericClientConstructor($NAME$);");
+}
+
+grpc::string Generate(grpc_generator::File *file,
+ const grpc_generator::Service *service,
+ const grpc::string &filename) {
+ grpc::string output;
+ std::map<grpc::string, grpc::string> vars;
+
+ vars["PATH"] = file->package();
+
+ if (!file->package().empty()) { vars["PATH"].append("."); }
+
+ vars["ServiceName"] = service->name();
+ vars["FBSFile"] = service->name() + "_fbs";
+ vars["Filename"] = filename;
+ auto printer = file->CreatePrinter(&output);
+
+ GenerateImports(&*printer, &vars, true);
+ GenerateMethods(service, &*printer, &vars);
+ GenerateService(service, &*printer, &vars);
+ return output;
+}
+
+// MARK: - Generate Interface
+
+void FillInterface(grpc_generator::Printer *printer,
+ std::map<grpc::string, grpc::string> *dictonary) {
+ auto vars = *dictonary;
+ printer->Print(
+ vars,
+ "interface I$ServiceName$Service_I$MethodName$ extends "
+ "grpc.MethodDefinition<$FBSFile$.$INPUT$, $FBSFile$.$OUTPUT$> {\n");
+ printer->Indent();
+ printer->Print(vars, "path: string; // /$PATH$$ServiceName$/$MethodName$\n");
+ printer->Print(vars, "requestStream: boolean; // $ClientStreaming$\n");
+ printer->Print(vars, "responseStream: boolean; // $ServerStreaming$\n");
+ printer->Print(vars,
+ "requestSerialize: grpc.serialize<$FBSFile$.$INPUT$>;\n");
+ printer->Print(vars,
+ "requestDeserialize: grpc.deserialize<$FBSFile$.$INPUT$>;\n");
+ printer->Print(vars,
+ "responseSerialize: grpc.serialize<$FBSFile$.$OUTPUT$>;\n");
+ printer->Print(
+ vars, "responseDeserialize: grpc.deserialize<$FBSFile$.$OUTPUT$>;\n");
+ printer->Outdent();
+ printer->Print("}\n");
+}
+
+void GenerateInterfaces(const grpc_generator::Service *service,
+ grpc_generator::Printer *printer,
+ std::map<grpc::string, grpc::string> *dictonary) {
+ auto vars = *dictonary;
+ for (auto it = 0; it < service->method_count(); it++) {
+ auto method = service->method(it);
+ auto client_streaming =
+ method->ClientStreaming() || method->BidiStreaming();
+ auto server_streaming =
+ method->ServerStreaming() || method->BidiStreaming();
+ vars["ClientStreaming"] = client_streaming ? "true" : "false";
+ vars["ServerStreaming"] = server_streaming ? "true" : "false";
+ vars["MethodName"] = method->name();
+ vars["INPUT"] = method->get_input_type_name();
+ vars["OUTPUT"] = method->get_output_type_name();
+ FillInterface(printer, &vars);
+ printer->Print("\n");
+ }
+}
+
+void GenerateExportedInterface(
+ const grpc_generator::Service *service, grpc_generator::Printer *printer,
+ std::map<grpc::string, grpc::string> *dictonary) {
+ auto vars = *dictonary;
+ printer->Print(vars, "export interface I$ServiceName$Server {\n");
+ printer->Indent();
+ for (auto it = 0; it < service->method_count(); it++) {
+ auto method = service->method(it);
+ vars["Name"] = method->name();
+ vars["INPUT"] = method->get_input_type_name();
+ vars["OUTPUT"] = method->get_output_type_name();
+ if (method->BidiStreaming()) {
+ printer->Print(vars,
+ "$Name$: grpc.handleBidiStreamingCall<$FBSFile$.$INPUT$, "
+ "$FBSFile$.$OUTPUT$>;\n");
+ continue;
+ }
+ if (method->NoStreaming()) {
+ printer->Print(vars,
+ "$Name$: grpc.handleUnaryCall<$FBSFile$.$INPUT$, "
+ "$FBSFile$.$OUTPUT$>;\n");
+ continue;
+ }
+ if (method->ClientStreaming()) {
+ printer->Print(
+ vars,
+ "$Name$: grpc.handleClientStreamingCall<$FBSFile$.$INPUT$, "
+ "$FBSFile$.$OUTPUT$>;\n");
+ continue;
+ }
+ if (method->ServerStreaming()) {
+ printer->Print(
+ vars,
+ "$Name$: grpc.handleServerStreamingCall<$FBSFile$.$INPUT$, "
+ "$FBSFile$.$OUTPUT$>;\n");
+ continue;
+ }
+ }
+ printer->Outdent();
+ printer->Print("}\n");
+}
+
+void GenerateMainInterface(const grpc_generator::Service *service,
+ grpc_generator::Printer *printer,
+ std::map<grpc::string, grpc::string> *dictonary) {
+ auto vars = *dictonary;
+ printer->Print(
+ vars,
+ "interface I$ServiceName$Service extends "
+ "grpc.ServiceDefinition<grpc.UntypedServiceImplementation> {\n");
+ printer->Indent();
+ for (auto it = 0; it < service->method_count(); it++) {
+ auto method = service->method(it);
+ vars["MethodName"] = method->name();
+ printer->Print(vars,
+ "$MethodName$: I$ServiceName$Service_I$MethodName$;\n");
+ }
+ printer->Outdent();
+ printer->Print("}\n");
+ GenerateInterfaces(service, printer, &vars);
+ printer->Print("\n");
+ printer->Print(vars,
+ "export const $ServiceName$Service: I$ServiceName$Service;\n");
+ printer->Print("\n");
+ GenerateExportedInterface(service, printer, &vars);
+}
+
+grpc::string GenerateMetaData() { return "metadata: grpc.Metadata"; }
+
+grpc::string GenerateOptions() { return "options: Partial<grpc.CallOptions>"; }
+
+void GenerateUnaryClientInterface(
+ grpc_generator::Printer *printer,
+ std::map<grpc::string, grpc::string> *dictonary) {
+ auto vars = *dictonary;
+ grpc::string main = "$ISPUBLIC$$MethodName$(request: $FBSFile$.$INPUT$, ";
+ grpc::string callback =
+ "callback: (error: grpc.ServiceError | null, response: "
+ "$FBSFile$.$OUTPUT$) => void): grpc.ClientUnaryCall;\n";
+ auto meta_data = GenerateMetaData() + ", ";
+ auto options = GenerateOptions() + ", ";
+ printer->Print(vars, (main + callback).c_str());
+ printer->Print(vars, (main + meta_data + callback).c_str());
+ printer->Print(vars, (main + meta_data + options + callback).c_str());
+}
+
+void GenerateClientWriteStreamInterface(
+ grpc_generator::Printer *printer,
+ std::map<grpc::string, grpc::string> *dictonary) {
+ auto vars = *dictonary;
+ grpc::string main = "$ISPUBLIC$$MethodName$(";
+ grpc::string callback =
+ "callback: (error: grpc.ServiceError | null, response: "
+ "$FBSFile$.$INPUT$) => void): "
+ "grpc.ClientWritableStream<$FBSFile$.$OUTPUT$>;\n";
+ auto meta_data = GenerateMetaData() + ", ";
+ auto options = GenerateOptions() + ", ";
+ printer->Print(vars, (main + callback).c_str());
+ printer->Print(vars, (main + meta_data + callback).c_str());
+ printer->Print(vars, (main + options + callback).c_str());
+ printer->Print(vars, (main + meta_data + options + callback).c_str());
+}
+
+void GenerateClientReadableStreamInterface(
+ grpc_generator::Printer *printer,
+ std::map<grpc::string, grpc::string> *dictonary) {
+ auto vars = *dictonary;
+ grpc::string main = "$ISPUBLIC$$MethodName$(request: $FBSFile$.$INPUT$, ";
+ grpc::string end_function =
+ "): grpc.ClientReadableStream<$FBSFile$.$OUTPUT$>;\n";
+ auto meta_data = GenerateMetaData();
+ auto options = GenerateOptions();
+ printer->Print(vars, (main + meta_data + end_function).c_str());
+ printer->Print(vars, (main + options + end_function).c_str());
+}
+
+void GenerateDepluxStreamInterface(
+ grpc_generator::Printer *printer,
+ std::map<grpc::string, grpc::string> *dictonary) {
+ auto vars = *dictonary;
+ grpc::string main = "$ISPUBLIC$$MethodName$(";
+ grpc::string end_function =
+ "): grpc.ClientDuplexStream<$FBSFile$.$INPUT$, $FBSFile$.$OUTPUT$>;\n";
+ auto meta_data = GenerateMetaData();
+ auto options = GenerateOptions();
+ printer->Print(vars, (main + end_function).c_str());
+ printer->Print(vars, (main + options + end_function).c_str());
+ printer->Print(vars, (main + meta_data +
+ ", options?: Partial<grpc.CallOptions>" + end_function)
+ .c_str());
+}
+
+void GenerateClientInterface(const grpc_generator::Service *service,
+ grpc_generator::Printer *printer,
+ std::map<grpc::string, grpc::string> *dictonary) {
+ auto vars = *dictonary;
+ printer->Print(vars, "export interface I$ServiceName$Client {\n");
+ printer->Indent();
+ for (auto it = 0; it < service->method_count(); it++) {
+ auto method = service->method(it);
+ vars["MethodName"] = method->name();
+ vars["INPUT"] = method->get_input_type_name();
+ vars["OUTPUT"] = method->get_output_type_name();
+ vars["ISPUBLIC"] = "";
+
+ if (method->NoStreaming()) {
+ GenerateUnaryClientInterface(printer, &vars);
+ continue;
+ }
+ if (method->BidiStreaming()) {
+ GenerateDepluxStreamInterface(printer, &vars);
+ continue;
+ }
+
+ if (method->ClientStreaming()) {
+ GenerateClientWriteStreamInterface(printer, &vars);
+ continue;
+ }
+
+ if (method->ServerStreaming()) {
+ GenerateClientReadableStreamInterface(printer, &vars);
+ continue;
+ }
+ }
+ printer->Outdent();
+ printer->Print("}\n");
+}
+
+void GenerateClientClassInterface(
+ const grpc_generator::Service *service, grpc_generator::Printer *printer,
+ std::map<grpc::string, grpc::string> *dictonary) {
+ auto vars = *dictonary;
+ printer->Print(vars,
+ "export class $ServiceName$Client extends grpc.Client "
+ "implements I$ServiceName$Client {\n");
+ printer->Indent();
+ printer->Print(
+ "constructor(address: string, credentials: grpc.ChannelCredentials, "
+ "options?: object);");
+ for (auto it = 0; it < service->method_count(); it++) {
+ auto method = service->method(it);
+ vars["MethodName"] = method->name();
+ vars["INPUT"] = method->get_input_type_name();
+ vars["OUTPUT"] = method->get_output_type_name();
+ vars["ISPUBLIC"] = "public ";
+ if (method->NoStreaming()) {
+ GenerateUnaryClientInterface(printer, &vars);
+ continue;
+ }
+ if (method->BidiStreaming()) {
+ GenerateDepluxStreamInterface(printer, &vars);
+ continue;
+ }
+
+ if (method->ClientStreaming()) {
+ GenerateClientWriteStreamInterface(printer, &vars);
+ continue;
+ }
+
+ if (method->ServerStreaming()) {
+ GenerateClientReadableStreamInterface(printer, &vars);
+ continue;
+ }
+ }
+ printer->Outdent();
+ printer->Print("}\n");
+}
+
+grpc::string GenerateInterface(grpc_generator::File *file,
+ const grpc_generator::Service *service,
+ const grpc::string &filename) {
+ grpc::string output;
+
+ std::set<grpc::string> generated_functions;
+ std::map<grpc::string, grpc::string> vars;
+
+ vars["PATH"] = file->package();
+
+ if (!file->package().empty()) { vars["PATH"].append("."); }
+
+ vars["ServiceName"] = service->name();
+ vars["FBSFile"] = service->name() + "_fbs";
+ vars["Filename"] = filename;
+ auto printer = file->CreatePrinter(&output);
+
+ GenerateImports(&*printer, &vars, false);
+ GenerateMainInterface(service, &*printer, &vars);
+ printer->Print("\n");
+ GenerateClientInterface(service, &*printer, &vars);
+ printer->Print("\n");
+ GenerateClientClassInterface(service, &*printer, &vars);
+ return output;
+}
+} // namespace grpc_ts_generator
diff --git a/grpc/src/compiler/ts_generator.h b/grpc/src/compiler/ts_generator.h
new file mode 100644
index 0000000..a33bb3c
--- /dev/null
+++ b/grpc/src/compiler/ts_generator.h
@@ -0,0 +1,61 @@
+/*
+ *
+ * Copyright 2020, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <memory>
+#include <vector>
+#include <set>
+
+#include "src/compiler/config.h"
+#include "src/compiler/schema_interface.h"
+
+#ifndef GRPC_CUSTOM_STRING
+# include <string>
+# define GRPC_CUSTOM_STRING std::string
+#endif
+
+namespace grpc {
+
+typedef GRPC_CUSTOM_STRING string;
+
+} // namespace grpc
+
+namespace grpc_ts_generator {
+grpc::string Generate(grpc_generator::File *file,
+ const grpc_generator::Service *service,
+ const grpc::string &filename);
+
+grpc::string GenerateInterface(grpc_generator::File *file,
+ const grpc_generator::Service *service,
+ const grpc::string &filename);
+} // namespace grpc_ts_generator
+
diff --git a/grpc/tests/BUILD b/grpc/tests/BUILD
new file mode 100644
index 0000000..5d4023e
--- /dev/null
+++ b/grpc/tests/BUILD
@@ -0,0 +1,17 @@
+cc_test(
+ name = "grpc_test",
+ srcs = [
+ "grpctest.cpp",
+ "message_builder_test.cpp",
+ ],
+ copts = ["-Itests"],
+ # This is required.
+ linkstatic = 1,
+ deps = [
+ "//tests:monster_test_cc_fbs",
+ "//tests:monster_test_grpc",
+ "//tests:test_assert",
+ "//tests:test_builder",
+ "@com_github_grpc_grpc//:grpc++",
+ ],
+)
diff --git a/grpc/tests/JavaGrpcTest.java b/grpc/tests/JavaGrpcTest.java
index 98a67b5..2732911 100644
--- a/grpc/tests/JavaGrpcTest.java
+++ b/grpc/tests/JavaGrpcTest.java
@@ -96,7 +96,7 @@
if (monster.hp() > maxHp.get()) {
// Found a monster of higher hit points.
maxHp.set(monster.hp());
- maxHpMonsterName.set(monster.name());
+ maxHpMonsterName.set(monster.name());
maxHpCount.set(1);
}
else if (monster.hp() == maxHp.get()) {
@@ -141,7 +141,7 @@
channel = ManagedChannelBuilder.forAddress("localhost", port)
// Channels are secure by default (via SSL/TLS). For the example we disable TLS to avoid
// needing certificates.
- .usePlaintext(true)
+ .usePlaintext()
.directExecutor()
.build();
blockingStub = MonsterStorageGrpc.newBlockingStub(channel);
@@ -177,7 +177,7 @@
final CountDownLatch streamAlive = new CountDownLatch(1);
StreamObserver<Stat> statObserver = new StreamObserver<Stat>() {
- public void onCompleted() {
+ public void onCompleted() {
streamAlive.countDown();
}
public void onError(Throwable ex) { }
diff --git a/grpc/tests/go_test.go b/grpc/tests/go_test.go
index 288036b..1268169 100644
--- a/grpc/tests/go_test.go
+++ b/grpc/tests/go_test.go
@@ -74,7 +74,8 @@
if err != nil {
t.Fatalf("Failed to listen: %v", err)
}
- ser := grpc.NewServer(grpc.CustomCodec(flatbuffers.FlatbuffersCodec{}))
+ ser := grpc.NewServer()
+ encoding.RegisterCodec(flatbuffers.FlatbuffersCodec{})
Example.RegisterMonsterStorageServer(ser, &server{})
go func() {
if err := ser.Serve(lis); err != nil {
diff --git a/grpc/tests/grpctest.cpp b/grpc/tests/grpctest.cpp
index 7e5c6e6..decf5e5 100644
--- a/grpc/tests/grpctest.cpp
+++ b/grpc/tests/grpctest.cpp
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-#include <thread>
-
#include <grpc++/grpc++.h>
+#include <thread>
+
#include "monster_test.grpc.fb.h"
#include "monster_test_generated.h"
#include "test_assert.h"
using namespace MyGame::Example;
-using flatbuffers::grpc::MessageBuilder;
using flatbuffers::FlatBufferBuilder;
+using flatbuffers::grpc::MessageBuilder;
void message_builder_tests();
@@ -97,8 +97,7 @@
server_instance->Wait();
}
-template <class Builder>
-void StoreRPC(MonsterStorage::Stub *stub) {
+template<class Builder> void StoreRPC(MonsterStorage::Stub *stub) {
Builder fbb;
grpc::ClientContext context;
// Build a request with the name set.
@@ -119,8 +118,7 @@
}
}
-template <class Builder>
-void RetrieveRPC(MonsterStorage::Stub *stub) {
+template<class Builder> void RetrieveRPC(MonsterStorage::Stub *stub) {
Builder fbb;
grpc::ClientContext context;
fbb.Clear();
@@ -155,7 +153,6 @@
RetrieveRPC<MessageBuilder>(stub.get());
RetrieveRPC<FlatBufferBuilder>(stub.get());
-
#if !FLATBUFFERS_GRPC_DISABLE_AUTO_VERIFICATION
{
// Test that an invalid request errors out correctly
@@ -181,7 +178,7 @@
return 0;
}
-int main(int /*argc*/, const char * /*argv*/ []) {
+int main(int /*argc*/, const char * /*argv*/[]) {
message_builder_tests();
grpc_server_test();
@@ -193,4 +190,3 @@
return 1;
}
}
-
diff --git a/grpc/tests/grpctest.py b/grpc/tests/grpctest.py
new file mode 100644
index 0000000..1c5e92f
--- /dev/null
+++ b/grpc/tests/grpctest.py
@@ -0,0 +1,174 @@
+from __future__ import print_function
+
+import os
+import sys
+import grpc
+import flatbuffers
+
+from concurrent import futures
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'tests'))
+import MyGame.Example.Monster as Monster
+import MyGame.Example.Stat as Stat
+import MyGame.Example.Vec3 as Vec3
+import MyGame.Example.Test as Test
+import MyGame.Example.monster_test_grpc_fb as monster_grpc_fb
+
+
+test_stat_id = "test_stat_id"
+test_stat_val = 8
+test_stat_count = 1
+
+test_monster_name1 = "test_monster_name1"
+test_monster_name2 = "test_monster_name2"
+test_string = "test_string"
+test_color = 2
+test_X = 3.0
+test_Y = 2.0
+test_Z = 6.0
+test_test1 = 4.0
+test_a = 8
+test_b = 5
+test_hp = 67
+test_inventory = [1, 1, 2, 3, 5, 8]
+test_testtype = 4
+
+test_monsters_name_retrieve = ["big_monster", "small_monster"]
+test_no_of_monsters = 2
+
+
+class MonsterStorage(monster_grpc_fb.MonsterStorageServicer):
+
+ def Store(self, request, context):
+
+ m = Monster.Monster().GetRootAsMonster(request, 0)
+
+ assert m.Name().decode("utf-8") == test_monster_name1
+
+ assert m.Pos().X() == test_X
+ assert m.Pos().Y() == test_Y
+ assert m.Pos().Z() == test_Z
+ assert m.Pos().Test1() == test_test1
+ assert m.Pos().Test2() == test_color
+ test3 = Test.Test()
+ assert m.Pos().Test3(test3).A() == test_a
+ assert m.Pos().Test3(test3).B() == test_b
+
+ assert m.Hp() == test_hp
+
+ assert m.Color() == test_color
+
+ assert m.InventoryLength() == len(test_inventory)
+ for i in range(0, len(test_inventory)):
+ assert m.Inventory(i) == test_inventory[len(test_inventory)-i -1]
+
+ assert m.TestType() == test_testtype
+
+ assert m.Test() is not None
+ table = m.Test()
+
+ m2 = Monster.Monster()
+ m2.Init(table.Bytes, table.Pos)
+ assert m2.Name().decode("utf-8") == test_monster_name2
+
+ m3 = m.Enemy()
+ assert m3.Name().decode("utf-8") == test_monster_name2
+
+ assert m.Testarrayofstring(0).decode("utf-8") == test_string
+
+ b = flatbuffers.Builder(0)
+ i = b.CreateString(test_stat_id)
+ Stat.StatStart(b)
+ Stat.StatAddId(b, i)
+ Stat.StatAddVal(b, test_stat_val)
+ Stat.StatAddCount(b, test_stat_count)
+ b.Finish(Stat.StatEnd(b))
+ return bytes(b.Output())
+
+ def Retrieve(self, request, context):
+
+ s = Stat.Stat().GetRootAsStat(request, 0)
+
+ no_of_monsters = test_no_of_monsters
+ for i in range(0, no_of_monsters):
+ b = flatbuffers.Builder(0)
+ i = b.CreateString(test_monsters_name_retrieve[i])
+ Monster.MonsterStart(b)
+ Monster.MonsterAddName(b, i)
+ b.Finish(Monster.MonsterEnd(b))
+ yield bytes(b.Output())
+
+
+def serve():
+
+ server = grpc.server(futures.ThreadPoolExecutor(max_workers=10))
+ monster_grpc_fb.add_MonsterStorageServicer_to_server(MonsterStorage(), server)
+ server.add_insecure_port('[::]:50051')
+
+ server.start()
+
+ run()
+
+
+def run():
+
+ channel = grpc.insecure_channel('127.0.0.1:50051')
+ stub = monster_grpc_fb.MonsterStorageStub(channel)
+
+ b = flatbuffers.Builder(0)
+ name2 = b.CreateString(test_monster_name2)
+ name1 = b.CreateString(test_monster_name1)
+ Monster.MonsterStart(b)
+ Monster.MonsterAddName(b, name2)
+ monster2 = Monster.MonsterEnd(b)
+ test1 = b.CreateString(test_string)
+
+ Monster.MonsterStartInventoryVector(b, len(test_inventory))
+ for i in range(0, len(test_inventory)):
+ b.PrependByte(test_inventory[i])
+ inv = b.EndVector(len(test_inventory))
+
+ Monster.MonsterStartTest4Vector(b, 2)
+ Test.CreateTest(b, 10, 20)
+ Test.CreateTest(b, 30, 40)
+ test4 = b.EndVector(2)
+
+ Monster.MonsterStartTestarrayofstringVector(b, 1)
+ b.PrependUOffsetTRelative(test1)
+ test_array_of_string = b.EndVector(1)
+
+ Monster.MonsterStart(b)
+
+ Monster.MonsterAddHp(b, test_hp)
+ Monster.MonsterAddName(b, name1)
+ Monster.MonsterAddColor(b, test_color)
+ pos = Vec3.CreateVec3(b, test_X, test_Y, test_Z, test_test1, test_color, test_a, test_b)
+ Monster.MonsterAddPos(b, pos)
+ Monster.MonsterAddInventory(b, inv)
+ Monster.MonsterAddTestType(b, test_testtype)
+ Monster.MonsterAddTest(b, monster2)
+ Monster.MonsterAddTest4(b, test4)
+ Monster.MonsterAddEnemy(b, monster2)
+ Monster.MonsterAddTestarrayofstring(b, test_array_of_string)
+ monster = Monster.MonsterEnd(b)
+
+ b.Finish(monster)
+
+ stat_response = stub.Store(bytes(b.Output()))
+
+ s = Stat.Stat().GetRootAsStat(stat_response, 0)
+
+ assert s.Id().decode("utf-8") == test_stat_id
+ assert s.Val() == test_stat_val
+ assert s.Count() == test_stat_count
+
+ monster_reponses = stub.Retrieve(stat_response)
+ count = 0
+ for monster_reponse in monster_reponses:
+ m = Monster.Monster().GetRootAsMonster(monster_reponse, 0)
+ assert m.Name().decode("utf-8") == test_monsters_name_retrieve[count]
+ count = count + 1
+
+
+if __name__ == '__main__':
+ serve()
diff --git a/grpc/tests/message_builder_test.cpp b/grpc/tests/message_builder_test.cpp
index 36f5bc2..3ce33a9 100644
--- a/grpc/tests/message_builder_test.cpp
+++ b/grpc/tests/message_builder_test.cpp
@@ -3,22 +3,28 @@
#include "test_assert.h"
#include "test_builder.h"
-using MyGame::Example::Vec3;
-using MyGame::Example::CreateStat;
using MyGame::Example::Any_NONE;
+using MyGame::Example::CreateStat;
+using MyGame::Example::Vec3;
-bool verify(flatbuffers::grpc::Message<Monster> &msg, const std::string &expected_name, Color color) {
+bool verify(flatbuffers::grpc::Message<Monster> &msg,
+ const std::string &expected_name, Color expected_color) {
const Monster *monster = msg.GetRoot();
- return (monster->name()->str() == expected_name) && (monster->color() == color);
+ const auto name = monster->name()->str();
+ const auto color = monster->color();
+ TEST_EQ(name, expected_name);
+ TEST_EQ(color, expected_color);
+ return (name == expected_name) && (color == expected_color);
}
-bool release_n_verify(flatbuffers::grpc::MessageBuilder &mbb, const std::string &expected_name, Color color) {
+bool release_n_verify(flatbuffers::grpc::MessageBuilder &mbb,
+ const std::string &expected_name, Color expected_color) {
flatbuffers::grpc::Message<Monster> msg = mbb.ReleaseMessage<Monster>();
- const Monster *monster = msg.GetRoot();
- return (monster->name()->str() == expected_name) && (monster->color() == color);
+ return verify(msg, expected_name, expected_color);
}
-void builder_move_assign_after_releaseraw_test(flatbuffers::grpc::MessageBuilder dst) {
+void builder_move_assign_after_releaseraw_test(
+ flatbuffers::grpc::MessageBuilder dst) {
auto root_offset1 = populate1(dst);
dst.Finish(root_offset1);
size_t size, offset;
@@ -31,17 +37,16 @@
// Move into a released builder.
dst = std::move(src);
TEST_EQ(dst.GetSize(), src_size);
- TEST_ASSERT(release_n_verify(dst, m2_name, m2_color));
+ TEST_ASSERT(release_n_verify(dst, m2_name(), m2_color()));
TEST_EQ(src.GetSize(), 0);
grpc_slice_unref(slice);
}
-template <class SrcBuilder>
+template<class SrcBuilder>
struct BuilderReuseTests<flatbuffers::grpc::MessageBuilder, SrcBuilder> {
- static void builder_reusable_after_release_message_test(TestSelector selector) {
- if (!selector.count(REUSABLE_AFTER_RELEASE_MESSAGE)) {
- return;
- }
+ static void builder_reusable_after_release_message_test(
+ TestSelector selector) {
+ if (!selector.count(REUSABLE_AFTER_RELEASE_MESSAGE)) { return; }
flatbuffers::grpc::MessageBuilder mb;
std::vector<flatbuffers::grpc::Message<Monster>> buffers;
@@ -49,17 +54,15 @@
auto root_offset1 = populate1(mb);
mb.Finish(root_offset1);
buffers.push_back(mb.ReleaseMessage<Monster>());
- TEST_ASSERT_FUNC(verify(buffers[i], m1_name, m1_color));
+ TEST_ASSERT_FUNC(verify(buffers[i], m1_name(), m1_color()));
}
}
static void builder_reusable_after_release_test(TestSelector selector) {
- if (!selector.count(REUSABLE_AFTER_RELEASE)) {
- return;
- }
+ if (!selector.count(REUSABLE_AFTER_RELEASE)) { return; }
- // FIXME: Populate-Release loop fails assert(GRPC_SLICE_IS_EMPTY(slice_)) in SliceAllocator::allocate
- // in the second iteration.
+ // FIXME: Populate-Release loop fails assert(GRPC_SLICE_IS_EMPTY(slice_)) in
+ // SliceAllocator::allocate in the second iteration.
flatbuffers::grpc::MessageBuilder mb;
std::vector<flatbuffers::DetachedBuffer> buffers;
@@ -67,14 +70,12 @@
auto root_offset1 = populate1(mb);
mb.Finish(root_offset1);
buffers.push_back(mb.Release());
- TEST_ASSERT_FUNC(verify(buffers[i], m1_name, m1_color));
+ TEST_ASSERT_FUNC(verify(buffers[i], m1_name(), m1_color()));
}
}
static void builder_reusable_after_releaseraw_test(TestSelector selector) {
- if (!selector.count(REUSABLE_AFTER_RELEASE_RAW)) {
- return;
- }
+ if (!selector.count(REUSABLE_AFTER_RELEASE_RAW)) { return; }
flatbuffers::grpc::MessageBuilder mb;
for (int i = 0; i < 5; ++i) {
@@ -83,18 +84,18 @@
size_t size, offset;
grpc_slice slice;
const uint8_t *buf = mb.ReleaseRaw(size, offset, slice);
- TEST_ASSERT_FUNC(verify(buf, offset, m1_name, m1_color));
+ TEST_ASSERT_FUNC(verify(buf, offset, m1_name(), m1_color()));
grpc_slice_unref(slice);
}
}
- static void builder_reusable_after_release_and_move_assign_test(TestSelector selector) {
- if (!selector.count(REUSABLE_AFTER_RELEASE_AND_MOVE_ASSIGN)) {
- return;
- }
+ static void builder_reusable_after_release_and_move_assign_test(
+ TestSelector selector) {
+ if (!selector.count(REUSABLE_AFTER_RELEASE_AND_MOVE_ASSIGN)) { return; }
- // FIXME: Release-move_assign loop fails assert(p == GRPC_SLICE_START_PTR(slice_))
- // in DetachedBuffer destructor after all the iterations
+ // FIXME: Release-move_assign loop fails assert(p ==
+ // GRPC_SLICE_START_PTR(slice_)) in DetachedBuffer destructor after all the
+ // iterations
flatbuffers::grpc::MessageBuilder dst;
std::vector<flatbuffers::DetachedBuffer> buffers;
@@ -103,7 +104,7 @@
auto root_offset1 = populate1(dst);
dst.Finish(root_offset1);
buffers.push_back(dst.Release());
- TEST_ASSERT_FUNC(verify(buffers[i], m1_name, m1_color));
+ TEST_ASSERT_FUNC(verify(buffers[i], m1_name(), m1_color()));
// bring dst back to life.
SrcBuilder src;
@@ -113,7 +114,8 @@
}
}
- static void builder_reusable_after_release_message_and_move_assign_test(TestSelector selector) {
+ static void builder_reusable_after_release_message_and_move_assign_test(
+ TestSelector selector) {
if (!selector.count(REUSABLE_AFTER_RELEASE_MESSAGE_AND_MOVE_ASSIGN)) {
return;
}
@@ -125,7 +127,7 @@
auto root_offset1 = populate1(dst);
dst.Finish(root_offset1);
buffers.push_back(dst.ReleaseMessage<Monster>());
- TEST_ASSERT_FUNC(verify(buffers[i], m1_name, m1_color));
+ TEST_ASSERT_FUNC(verify(buffers[i], m1_name(), m1_color()));
// bring dst back to life.
SrcBuilder src;
@@ -135,10 +137,9 @@
}
}
- static void builder_reusable_after_releaseraw_and_move_assign_test(TestSelector selector) {
- if (!selector.count(REUSABLE_AFTER_RELEASE_RAW_AND_MOVE_ASSIGN)) {
- return;
- }
+ static void builder_reusable_after_releaseraw_and_move_assign_test(
+ TestSelector selector) {
+ if (!selector.count(REUSABLE_AFTER_RELEASE_RAW_AND_MOVE_ASSIGN)) { return; }
flatbuffers::grpc::MessageBuilder dst;
for (int i = 0; i < 5; ++i) {
@@ -147,7 +148,7 @@
size_t size, offset;
grpc_slice slice = grpc_empty_slice();
const uint8_t *buf = dst.ReleaseRaw(size, offset, slice);
- TEST_ASSERT_FUNC(verify(buf, offset, m1_name, m1_color));
+ TEST_ASSERT_FUNC(verify(buf, offset, m1_name(), m1_color()));
grpc_slice_unref(slice);
SrcBuilder src;
@@ -175,11 +176,11 @@
uint8_t *buf = sa1.allocate(size);
TEST_ASSERT_FUNC(buf != 0);
buf[0] = 100;
- buf[size-1] = 200;
+ buf[size - 1] = 200;
flatbuffers::grpc::SliceAllocator sa2(std::move(sa1));
// buf should not be deleted after move-construct
TEST_EQ_FUNC(buf[0], 100);
- TEST_EQ_FUNC(buf[size-1], 200);
+ TEST_EQ_FUNC(buf[size - 1], 200);
// buf is freed here
}
@@ -194,13 +195,16 @@
}
}
-/// This function does not populate exactly the first half of the table. But it could.
-void populate_first_half(MyGame::Example::MonsterBuilder &wrapper, flatbuffers::Offset<flatbuffers::String> name_offset) {
+/// This function does not populate exactly the first half of the table. But it
+/// could.
+void populate_first_half(MyGame::Example::MonsterBuilder &wrapper,
+ flatbuffers::Offset<flatbuffers::String> name_offset) {
wrapper.add_name(name_offset);
- wrapper.add_color(m1_color);
+ wrapper.add_color(m1_color());
}
-/// This function does not populate exactly the second half of the table. But it could.
+/// This function does not populate exactly the second half of the table. But it
+/// could.
void populate_second_half(MyGame::Example::MonsterBuilder &wrapper) {
wrapper.add_hp(77);
wrapper.add_mana(88);
@@ -208,114 +212,138 @@
wrapper.add_pos(&vec3);
}
-/// This function is a hack to update the FlatBufferBuilder reference (fbb_) in the MonsterBuilder object.
-/// This function will break if fbb_ is not the first member in MonsterBuilder. In that case, some offset must be added.
-/// This function is used exclusively for testing correctness of move operations between FlatBufferBuilders.
-/// If MonsterBuilder had a fbb_ pointer, this hack would be unnecessary. That involves a code-generator change though.
-void test_only_hack_update_fbb_reference(MyGame::Example::MonsterBuilder &monsterBuilder,
- flatbuffers::grpc::MessageBuilder &mb) {
+/// This function is a hack to update the FlatBufferBuilder reference (fbb_) in
+/// the MonsterBuilder object. This function will break if fbb_ is not the first
+/// member in MonsterBuilder. In that case, some offset must be added. This
+/// function is used exclusively for testing correctness of move operations
+/// between FlatBufferBuilders. If MonsterBuilder had a fbb_ pointer, this hack
+/// would be unnecessary. That involves a code-generator change though.
+void test_only_hack_update_fbb_reference(
+ MyGame::Example::MonsterBuilder &monsterBuilder,
+ flatbuffers::grpc::MessageBuilder &mb) {
*reinterpret_cast<flatbuffers::FlatBufferBuilder **>(&monsterBuilder) = &mb;
}
-/// This test validates correctness of move conversion of FlatBufferBuilder to a MessageBuilder DURING
-/// a table construction. Half of the table is constructed using FlatBufferBuilder and the other half
-/// of the table is constructed using a MessageBuilder.
+/// This test validates correctness of move conversion of FlatBufferBuilder to a
+/// MessageBuilder DURING a table construction. Half of the table is constructed
+/// using FlatBufferBuilder and the other half of the table is constructed using
+/// a MessageBuilder.
void builder_move_ctor_conversion_before_finish_half_n_half_table_test() {
- for (size_t initial_size = 4 ; initial_size <= 2048; initial_size *= 2) {
+ for (size_t initial_size = 4; initial_size <= 2048; initial_size *= 2) {
flatbuffers::FlatBufferBuilder fbb(initial_size);
- auto name_offset = fbb.CreateString(m1_name);
- MyGame::Example::MonsterBuilder monsterBuilder(fbb); // starts a table in FlatBufferBuilder
+ auto name_offset = fbb.CreateString(m1_name());
+ MyGame::Example::MonsterBuilder monsterBuilder(
+ fbb); // starts a table in FlatBufferBuilder
populate_first_half(monsterBuilder, name_offset);
flatbuffers::grpc::MessageBuilder mb(std::move(fbb));
- test_only_hack_update_fbb_reference(monsterBuilder, mb); // hack
+ test_only_hack_update_fbb_reference(monsterBuilder, mb); // hack
populate_second_half(monsterBuilder);
- mb.Finish(monsterBuilder.Finish()); // ends the table in MessageBuilder
- TEST_ASSERT_FUNC(release_n_verify(mb, m1_name, m1_color));
+ mb.Finish(monsterBuilder.Finish()); // ends the table in MessageBuilder
+ TEST_ASSERT_FUNC(release_n_verify(mb, m1_name(), m1_color()));
TEST_EQ_FUNC(fbb.GetSize(), 0);
}
}
-/// This test populates a COMPLETE inner table before move conversion and later populates more members in the outer table.
+/// This test populates a COMPLETE inner table before move conversion and later
+/// populates more members in the outer table.
void builder_move_ctor_conversion_before_finish_test() {
- for (size_t initial_size = 4 ; initial_size <= 2048; initial_size *= 2) {
+ for (size_t initial_size = 1; initial_size <= 2048; initial_size += 1) {
flatbuffers::FlatBufferBuilder fbb(initial_size);
auto stat_offset = CreateStat(fbb, fbb.CreateString("SomeId"), 0, 0);
flatbuffers::grpc::MessageBuilder mb(std::move(fbb));
- auto monster_offset = CreateMonster(mb, 0, 150, 100, mb.CreateString(m1_name), 0, m1_color, Any_NONE, 0, 0, 0, 0, 0, 0, stat_offset);
+ auto monster_offset =
+ CreateMonster(mb, 0, 150, 100, mb.CreateString(m1_name()), 0,
+ m1_color(), Any_NONE, 0, 0, 0, 0, 0, 0, stat_offset);
mb.Finish(monster_offset);
- TEST_ASSERT_FUNC(release_n_verify(mb, m1_name, m1_color));
+ {
+ auto mon = flatbuffers::GetRoot<Monster>(mb.GetBufferPointer());
+ TEST_NOTNULL(mon);
+ TEST_NOTNULL(mon->name());
+ TEST_EQ_STR(mon->name()->c_str(), m1_name().c_str());
+ TEST_EQ(mon->color(), m1_color());
+ }
+ TEST_EQ(1, MyGame::Example::Color_Red);
+ TEST_EQ(1, m1_color());
+ TEST_ASSERT_FUNC(release_n_verify(mb, m1_name(), m1_color()));
TEST_EQ_FUNC(fbb.GetSize(), 0);
}
}
-/// This test validates correctness of move conversion of FlatBufferBuilder to a MessageBuilder DURING
-/// a table construction. Half of the table is constructed using FlatBufferBuilder and the other half
-/// of the table is constructed using a MessageBuilder.
+/// This test validates correctness of move conversion of FlatBufferBuilder to a
+/// MessageBuilder DURING a table construction. Half of the table is constructed
+/// using FlatBufferBuilder and the other half of the table is constructed using
+/// a MessageBuilder.
void builder_move_assign_conversion_before_finish_half_n_half_table_test() {
flatbuffers::FlatBufferBuilder fbb;
flatbuffers::grpc::MessageBuilder mb;
- for (int i = 0;i < 5; ++i) {
+ for (int i = 0; i < 5; ++i) {
flatbuffers::FlatBufferBuilder fbb;
- auto name_offset = fbb.CreateString(m1_name);
- MyGame::Example::MonsterBuilder monsterBuilder(fbb); // starts a table in FlatBufferBuilder
+ auto name_offset = fbb.CreateString(m1_name());
+ MyGame::Example::MonsterBuilder monsterBuilder(
+ fbb); // starts a table in FlatBufferBuilder
populate_first_half(monsterBuilder, name_offset);
mb = std::move(fbb);
- test_only_hack_update_fbb_reference(monsterBuilder, mb); // hack
+ test_only_hack_update_fbb_reference(monsterBuilder, mb); // hack
populate_second_half(monsterBuilder);
- mb.Finish(monsterBuilder.Finish()); // ends the table in MessageBuilder
- TEST_ASSERT_FUNC(release_n_verify(mb, m1_name, m1_color));
+ mb.Finish(monsterBuilder.Finish()); // ends the table in MessageBuilder
+ TEST_ASSERT_FUNC(release_n_verify(mb, m1_name(), m1_color()));
TEST_EQ_FUNC(fbb.GetSize(), 0);
}
}
-/// This test populates a COMPLETE inner table before move conversion and later populates more members in the outer table.
+/// This test populates a COMPLETE inner table before move conversion and later
+/// populates more members in the outer table.
void builder_move_assign_conversion_before_finish_test() {
flatbuffers::FlatBufferBuilder fbb;
flatbuffers::grpc::MessageBuilder mb;
- for (int i = 0;i < 5; ++i) {
+ for (int i = 0; i < 5; ++i) {
auto stat_offset = CreateStat(fbb, fbb.CreateString("SomeId"), 0, 0);
mb = std::move(fbb);
- auto monster_offset = CreateMonster(mb, 0, 150, 100, mb.CreateString(m1_name), 0, m1_color, Any_NONE, 0, 0, 0, 0, 0, 0, stat_offset);
+ auto monster_offset =
+ CreateMonster(mb, 0, 150, 100, mb.CreateString(m1_name()), 0,
+ m1_color(), Any_NONE, 0, 0, 0, 0, 0, 0, stat_offset);
mb.Finish(monster_offset);
- TEST_ASSERT_FUNC(release_n_verify(mb, m1_name, m1_color));
+ TEST_ASSERT_FUNC(release_n_verify(mb, m1_name(), m1_color()));
TEST_EQ_FUNC(fbb.GetSize(), 0);
}
}
-/// This test populates data, finishes the buffer, and does move conversion after.
+/// This test populates data, finishes the buffer, and does move conversion
+/// after.
void builder_move_ctor_conversion_after_finish_test() {
flatbuffers::FlatBufferBuilder fbb;
fbb.Finish(populate1(fbb));
flatbuffers::grpc::MessageBuilder mb(std::move(fbb));
- TEST_ASSERT_FUNC(release_n_verify(mb, m1_name, m1_color));
+ TEST_ASSERT_FUNC(release_n_verify(mb, m1_name(), m1_color()));
TEST_EQ_FUNC(fbb.GetSize(), 0);
}
-/// This test populates data, finishes the buffer, and does move conversion after.
+/// This test populates data, finishes the buffer, and does move conversion
+/// after.
void builder_move_assign_conversion_after_finish_test() {
flatbuffers::FlatBufferBuilder fbb;
flatbuffers::grpc::MessageBuilder mb;
- for (int i = 0;i < 5; ++i) {
+ for (int i = 0; i < 5; ++i) {
fbb.Finish(populate1(fbb));
mb = std::move(fbb);
- TEST_ASSERT_FUNC(release_n_verify(mb, m1_name, m1_color));
+ TEST_ASSERT_FUNC(release_n_verify(mb, m1_name(), m1_color()));
TEST_EQ_FUNC(fbb.GetSize(), 0);
}
}
void message_builder_tests() {
- using flatbuffers::grpc::MessageBuilder;
using flatbuffers::FlatBufferBuilder;
+ using flatbuffers::grpc::MessageBuilder;
slice_allocator_tests();
#ifndef __APPLE__
builder_move_ctor_conversion_before_finish_half_n_half_table_test();
builder_move_assign_conversion_before_finish_half_n_half_table_test();
-#endif // __APPLE__
+#endif // __APPLE__
builder_move_ctor_conversion_before_finish_test();
builder_move_assign_conversion_before_finish_test();
@@ -326,15 +354,18 @@
BuilderTests<MessageBuilder, FlatBufferBuilder>::all_tests();
BuilderReuseTestSelector tests[6] = {
- //REUSABLE_AFTER_RELEASE, // Assertion failed: (GRPC_SLICE_IS_EMPTY(slice_))
- //REUSABLE_AFTER_RELEASE_AND_MOVE_ASSIGN, // Assertion failed: (p == GRPC_SLICE_START_PTR(slice_)
+ // REUSABLE_AFTER_RELEASE, // Assertion failed:
+ // (GRPC_SLICE_IS_EMPTY(slice_))
+ // REUSABLE_AFTER_RELEASE_AND_MOVE_ASSIGN, // Assertion failed: (p ==
+ // GRPC_SLICE_START_PTR(slice_)
- REUSABLE_AFTER_RELEASE_RAW,
- REUSABLE_AFTER_RELEASE_MESSAGE,
+ REUSABLE_AFTER_RELEASE_RAW, REUSABLE_AFTER_RELEASE_MESSAGE,
REUSABLE_AFTER_RELEASE_MESSAGE_AND_MOVE_ASSIGN,
REUSABLE_AFTER_RELEASE_RAW_AND_MOVE_ASSIGN
};
- BuilderReuseTests<MessageBuilder, MessageBuilder>::run_tests(TestSelector(tests, tests+6));
- BuilderReuseTests<MessageBuilder, FlatBufferBuilder>::run_tests(TestSelector(tests, tests+6));
+ BuilderReuseTests<MessageBuilder, MessageBuilder>::run_tests(
+ TestSelector(tests, tests + 6));
+ BuilderReuseTests<MessageBuilder, FlatBufferBuilder>::run_tests(
+ TestSelector(tests, tests + 6));
}
diff --git a/grpc/tests/pom.xml b/grpc/tests/pom.xml
index addc9fa..26e7624 100644
--- a/grpc/tests/pom.xml
+++ b/grpc/tests/pom.xml
@@ -4,13 +4,13 @@
<parent>
<groupId>com.google.flatbuffers</groupId>
<artifactId>flatbuffers-parent</artifactId>
- <version>1.11.1</version>
+ <version>1.12.0</version>
</parent>
<artifactId>grpc-test</artifactId>
<description>Example/Test project demonstrating usage of flatbuffers with GRPC-Java instead of protobufs
</description>
<properties>
- <gRPC.version>1.11.1</gRPC.version>
+ <gRPC.version>1.12.0</gRPC.version>
</properties>
<dependencies>
<dependency>
@@ -40,7 +40,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
</dependencies>