Commit Graph

325 Commits

Author SHA1 Message Date
Adam Cozzette
a336ba0346 Sync from Piper @435734090
PROTOBUF_SYNC_PIPER
2022-03-18 21:25:56 +00:00
Adam Cozzette
b20209f321 Sync from Piper @acozzette/proto_github_202203101748
PROTOBUF_SYNC_PIPER
2022-03-10 18:36:42 +00:00
Adam Cozzette
88a18db91e Update protobuf version 2022-03-04 09:52:19 -08:00
Adam Cozzette
b0f9799a7c Sync from Piper @432209397
PROTOBUF_SYNC_PIPER
2022-03-03 17:18:16 +00:00
Adam Cozzette
f7232f2aa3 Replace EasyMock dependency with Mockito and re-pin Bazel deps 2022-03-02 19:27:59 +00:00
Adam Cozzette
76398dab31 Sync from Piper @431959314
PROTOBUF_SYNC_PIPER
2022-03-02 17:37:55 +00:00
David L. Jones
3ab97ce830 Sync from Piper @429642851
PROTOBUF_SYNC_PIPER
2022-02-18 14:02:12 -08:00
David L. Jones
1ba1d73e0d Sync from Piper @429333699
PROTOBUF_SYNC_PIPER
2022-02-17 09:53:51 -08:00
Joshua Haberman
06196e9b4c Merge tag 'refs/tags/sync-piper' into sync-stage 2022-02-08 20:53:32 -08:00
Joshua Haberman
dce403a8b3 Sync from Piper @427369078
PROTOBUF_SYNC_PIPER
2022-02-08 20:53:31 -08:00
Joshua Haberman
5aacba062b Resolved remaining conflict markers. 2022-02-08 18:38:48 -08:00
Joshua Haberman
42e806fbf2 Merge branch 'master' into sync-stage-2 2022-02-08 18:36:24 -08:00
Deanna Garcia
c8b388a6cb Fixing java test 2022-02-04 00:23:34 +00:00
Deanna Garcia
5e0fc2f1df Fix java tests 2022-02-03 18:02:13 +00:00
Phil Clay
3be46483ba
Resolve more java field accessor name conflicts (#8198)
* Remove javanano from .gitignore.
Ignore java/lite/target

* Resolve more java field accessor name conflicts.

Previously, some proto field names would cause the java code generator to generate accessor names that conflict with method names from the message super classes/interfaces.
A list of field names that cause such conflicts previously existed, but the list did not contain every field name that would cause a conflict.
Additionally, only snake_case field names would be detected. If the field name was in camelCase, the conflict would not be detected.

This change adds the complete set of field names that will cause assessor name conflicts, and detects conflicts in both snake_case and camelCase field names.

Fixes #8142

* Prevent java accessor name conflicts for fields with leading underscores.
Previously, some protobuf field names beginning with leading underscores (e.g. _class) would cause uncompilable java code to be generated due to assessor name conflicts.
Now, non-conflicting java accessor method names are created for those fields

* Improve comments/documentation for conversion from snake case to camel case
Rename snakeCaseToCamelCase to snakeCaseToLowerCamelCase
Add snakeCaseToUpperCamelCase
Add clarifying in-line comments for field name generation
Remove explicit version numbers from references.

* Fix indents and typo

* Unnest <pre> tag

* improve grammar in comments
are colliding -> collide

* Remove ternary operator and improve comments

* Fix typo in comment
2022-02-03 12:49:57 -05:00
Deanna Garcia
b2ff4f82c2 Fixing tests 2022-02-03 01:05:20 +00:00
Deanna Garcia
7dff52929f Fixing tests 2022-02-02 21:08:44 +00:00
Deanna Garcia
349738dde5 Fixing java and protoc builds 2022-02-01 23:22:23 +00:00
Deanna Garcia
b7fe12e367 Syncing from internal 2022-02-01 21:30:49 +00:00
Deanna Garcia
ab4585a695 Sync from Piper @425656941
PROTOBUF_SYNC_PIPER
2022-02-01 18:24:53 +00:00
Adam Cozzette
18521f6055 Merge branch '3.19.x' into merge-3.19.x 2022-01-28 17:42:21 +00:00
Adam Cozzette
22d0e265de
Update protobuf version for 3.19.4 (#9449)
I also updated the PHP release notes in
php/ext/google/protobuf/package.xml.
2022-01-27 19:35:56 -08:00
Deanna Garcia
dfd99e7ec0 Adding kotlin bazel tests 2022-01-12 21:54:30 +00:00
Elliotte Rusty Harold
c160ae52a9
remove Proto2MessageLiteInfoFactory and Proto3MessageLiteInfoFactory (#9407)
* remove Proto2MessageLiteInfoFactory.java=
* remove Proto3MessageLiteInfoFactory.java
2022-01-12 20:31:20 +00:00
Adam Cozzette
5bb34e9930 Merge branch '3.19.x' into merge-3.19.x 2022-01-11 18:07:17 +00:00
Adam Cozzette
49b184b163
Revert "Standardize on Array copyOf" (#9400)
This reverts commit 935d099ad9 from PR #9162.

While the original commit was a nice simplification, I learned from
another Googler that there is unfortunately a performance cost to this
(or at least there was last time this change was attempted). Even if it
turns out to be fast on modern Java runtimes, we still care about the
performance on old Android devices.
2022-01-11 08:47:10 -08:00
Adam Cozzette
cc7b1b5323 Update protobuf version 2022-01-10 18:08:15 -08:00
Elliotte Rusty Harold
c7808a87fa
restore even more Android API level 14 compatibility (#9388) 2022-01-07 21:27:07 +00:00
Elliotte Rusty Harold
864aa49c6d
restore Android API level 14 compatibility (#9386) 2022-01-07 20:08:45 +00:00
Elliotte Rusty Harold
d8ccfbf005
Revert "Transition to NIO StandardCharsets" (#9382) 2022-01-07 18:19:51 +00:00
Adam Cozzette
eb94f17a8b Update protobuf version 2022-01-05 10:05:11 -08:00
Adam Cozzette
9638a5e531 Improve performance of parsing unknown fields in Java (#9371)
Credit should go to @elharo for most of these Java changes--I am just
cherry-picking them from our internal codebase. The one thing I did
change was to give the UTF-8 validation tests their own Bazel test
target. This makes it possible to give the other tests a shorter
timeout, which is important for UnknownFieldSetPerformanceTest in
particular.
2022-01-05 10:05:11 -08:00
Adam Cozzette
c555c3dd14
Improve performance of parsing unknown fields in Java (#9371)
Credit should go to @elharo for most of these Java changes--I am just
cherry-picking them from our internal codebase. The one thing I did
change was to give the UTF-8 validation tests their own Bazel test
target. This makes it possible to give the other tests a shorter
timeout, which is important for UnknownFieldSetPerformanceTest in
particular.
2022-01-05 08:50:29 -08:00
Elliotte Rusty Harold
a35c973b7f
remove unused test proto (#9298)
* remove unused test proto
2021-12-16 16:50:40 +00:00
Elliotte Rusty Harold
278dfb2496 remove UTF8Utils class that hasn't been needed since Java 6 2021-11-29 16:07:20 -05:00
Elliotte Rusty Harold
19eaec02e1
delete unused files (#9262)
* delete unused files
* update Makefile
2021-11-29 17:31:46 +00:00
Adam Cozzette
7ccf4d8f67
Merge pull request #9169 from protocolbuffers/3.19.x
Merge 3.19.x into master
2021-11-02 10:10:47 -07:00
Adam Cozzette
7c40b2df1f
Update protobuf version (#9167) 2021-10-28 14:07:53 -07:00
Adam Cozzette
c7dfd0d6b9
Align dependency handling with Bazel best practices (#9165)
This commit removes the use of bind() since that function goes against
Bazel best practices:
https://docs.bazel.build/versions/main/external.html#repository-rules-1
The bind() function basically maps a dependency into //external, but
there is no good reason to do this. By mapping dependencies into
//external and relying on this in our own BUILD files, we're forcing
projects that depend on us to do the same. The one bind() call that I
did leave in place was //:python_headers. This one seems to be doing
something complicated I don't fully understand, and I don't want to risk
breaking it.

This change also moves our list of required Maven artifacts into a
constant in protobuf_deps.bzl. This way, projects that depend on us can
refer to this list when they invoke maven_install() and automatically
pull in all the necesary dependencies.

This fixes #9132.
2021-10-28 10:34:54 -07:00
David Mollitor
935d099ad9 Standardize on Array copyOf 2021-10-27 11:08:33 -04:00
David Mollitor
3370cc4456 Transition to NIO StandardCharsets 2021-10-25 13:46:34 -04:00
Derek Perez
adc1f931e3
Fix wkt dupes (#8942)
* properly ignore WKTs in lang_proto_toolchain for java

We already pre-compile the well known types into the runtimes so they shouldn't be re-compiled. #8925

* remove accidental proto addition.
2021-10-21 14:17:20 -07:00
Adam Cozzette
17b30e9647
Update protobuf version (#9119) 2021-10-20 10:14:02 -07:00
Adam Cozzette
3f3e6f47c6
Update version to 3.19.0-rc2 and fix changelog about Java 7 (#9116)
* Update protobuf version

* Update CHANGES.txt to reflect that we're not yet dropping Java 7
2021-10-19 09:01:57 -07:00
Adam Cozzette
519340d662
Update protobuf version (#9106) 2021-10-15 14:33:06 -07:00
Elliotte Rusty Harold
21873ae54a
Merge pull request #7853 from belugabehr/CopyList
Use ArrayList copy constructor
2021-10-13 11:13:06 +00:00
Adam Cozzette
9aa1adc60c Removed unused references to easymock_classextension 2021-10-12 15:43:34 -07:00
Adam Cozzette
3afc828309 Sync from Piper @401883098
PROTOBUF_SYNC_PIPER
2021-10-08 16:45:26 -07:00
Adam Cozzette
0613ca8284
Merge pull request #9061 from acozzette/merge-3.18.x
Merge 3.18.x into master
2021-10-05 17:08:16 -07:00
Elliotte Rusty Harold
1e88936fce
Stop using EasyMock classextension (#9008)
* get rid of classextension and update EasyMock
2021-10-05 21:49:01 +00:00