Permalink
Comparing changes
Choose two branches to see what’s changed or to start a new pull request.
If you need to, you can also or
learn more about diff comparisons.
Open a pull request
Create a new pull request by comparing changes across two branches. If you need to, you can also .
Learn more about diff comparisons here.
...
- 3 commits
- 83 files changed
- 3 contributors
Commits on Jun 16, 2025
-
chore: Hibernate enhancer, Gradle config & GHA improvements (#3126)
- Minor changes to Gradle config scripts - Remove Kapt where possible (it's old, and to be replaced by ksp once Hibernate supports it) - Enable strict JSR 305 for better integration with NotNull / Nullable annotation from 3p libraries (including Spring) - Uses JPA annotations instead of Kotlin's, fixing issues with Hibernate bytecode enhancements - ~~That one is likely to come bite again at some point; not sure if it'd be possible to somehow disallow it using a linter or something as that's very easy to do by mistake...~~ - Added a custom Ktlint rule to make sure this doesn't happen again - Upgraded Apache POI and misc libs <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary E1EA by CodeRabbit ## Summary by CodeRabbit - **New Features** - Introduced a custom Ktlint rule to enforce correct usage of `@Transient` annotations in entity classes. - Added a new module for Ktlint integration and custom linting rules. - **Bug Fixes** - Improved null-safety in various tests and runtime checks. - Enhanced annotation handling for entity fields to ensure correct persistence behavior. - **Refactor** - Updated annotation targets for several custom annotations to improve compatibility. - Simplified and clarified build configurations, toolchain settings, and dependency scopes. - Refined annotation access in reflection to rely on Java field annotations. - **Chores** - Upgraded dependencies, including Hibernate and Apache POI. - Added Ktlint checks to CI workflows and project dependencies. - Improved .editorconfig and Gradle settings for consistency and linting support. - Refactored GitHub Actions workflows to use reusable composite actions and upgraded action versions. - Updated Java version to 21 across build configurations. - **Tests** - Added and updated tests for new Ktlint rules and improved test setups with Spring Boot context where needed. - Enhanced test mocks and assertions for better null-safety and stability. - Introduced a stub for licensing client to control external calls during tests. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
-
fix: import with meta without creating new keys (#3000) (#3113)
When `shouldImportKey` is called in the `FileProcessorContext.processTranslations()` method, Hibernate does the flush before executing a select query. At this flush, it discovers that `ImportKey` has `KeyMeta`, which is newly created and needs to be flushed, however, there is no cascading. So cadacding would be a good solution. It is also the first one which is recommended in many articles, e.g. https://www.baeldung.com/hibernate-unsaved-transient-instance-error, as well as cascading is usually (sure, not always) applied in OneToOne relations: https://vladmihalcea.com/the-best-way-to-map-a-onetoone-relationship-with-jpa-and-hibernate/. But when I started applying cascading, I ended up modifying too many entities, which led to many unpredictable problems So I think this solution of saving a `KeyMeta` alongside the `ImportKey` is a good compromise here. Probably the test can be moved to a more suitable place. (I'm just getting acquainted with the code base). It can easily be replicated also with the `strings.xml` file mentioned in [the comment](#3000 (comment)) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **Tests** - Added a new test case to verify import behavior when creating new keys is disabled. - Updated existing tests to include the new "createNewKeys" setting during import. - **New Features** - Improved handling of key metadata during import, ensuring author information is set correctly for comments and code references. - Enhanced import process to prepare and save key metadata individually for each key. - **Bug Fixes** - Fixed import of PO files with single key metadata when creating new keys is disabled. <!-- end of auto-generated comment: release notes by coderabbit.ai --> Signed-off-by: dmitrii.bocharov <bdshadow@gmail.com>
-
chore(release): 3.123.2 [skip ci]
## [3.123.2](v3.123.1...v3.123.2) (2025-06-16) ### Bug Fixes * import with meta without creating new keys ([#3000](#3000)) ([#3113](#3113)) ([d266ce3](d266ce3)), closes [/github.com//issues/3000#issuecomment-2865753203](https://github.com//github.com/tolgee/tolgee-platform/issues/3000/issues/issuecomment-2865753203)
Loading
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff v3.123.1...v3.123.2