several java fixes

[mr-c]

No description provided.

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 83.45%. Comparing base (09c3d2c) to head (7fadbac).
⚠️ Report is 2 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main     #970   +/-   ##
=======================================
  Coverage   83.44%   83.45%           
=======================================
  Files          22       22           
  Lines        4960     4961    +1     
  Branches     1185     1185           
=======================================
+ Hits         4139     4140    +1     
  Misses        544      544           
  Partials      277      277           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.