Skip to content

Commit 54cce86

Browse files
committed
chore: adapt Tolgee Apps to Jackson 3 and the Spring Boot 4 upgrade
Rebasing onto main brought in the Spring Boot 4 upgrade, which moves Jackson's databind and Kotlin module from `com.fasterxml.jackson.*` to `tools.jackson.*` (the annotations keep their original package). Retargets the apps code that reads manifests, and regenerates the API schema and Cypress data-cy types against the rebased backend.
1 parent f2e6935 commit 54cce86

7 files changed

Lines changed: 5843 additions & 1852 deletions

File tree

backend/api/src/main/kotlin/io/tolgee/hateoas/organization/apps/AppInstallModelAssembler.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.tolgee.hateoas.organization.apps
22

3-
import com.fasterxml.jackson.databind.ObjectMapper
4-
import com.fasterxml.jackson.module.kotlin.readValue
3+
import tools.jackson.databind.ObjectMapper
4+
import tools.jackson.module.kotlin.readValue
55
import io.tolgee.dtos.apps.AppManifest
66
import io.tolgee.model.apps.AppInstall
77
import org.springframework.hateoas.server.RepresentationModelAssembler

backend/api/src/main/kotlin/io/tolgee/hateoas/project/apps/ProjectAppModelAssembler.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.tolgee.hateoas.project.apps
22

3-
import com.fasterxml.jackson.databind.ObjectMapper
4-
import com.fasterxml.jackson.module.kotlin.readValue
3+
import tools.jackson.databind.ObjectMapper
4+
import tools.jackson.module.kotlin.readValue
55
import io.tolgee.dtos.apps.AppManifest
66
import io.tolgee.model.apps.AppInstall
77
import org.springframework.stereotype.Component

backend/data/src/main/kotlin/io/tolgee/service/apps/AppManifestFetcher.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.tolgee.service.apps
22

3-
import com.fasterxml.jackson.databind.ObjectMapper
4-
import com.fasterxml.jackson.module.kotlin.readValue
3+
import tools.jackson.databind.ObjectMapper
4+
import tools.jackson.module.kotlin.readValue
55
import io.tolgee.configuration.tolgee.AppsProperties
66
import io.tolgee.constants.Message
77
import io.tolgee.dtos.apps.AppManifest

backend/data/src/main/resources/db/changelog/schema.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5875,6 +5875,7 @@
58755875
END IF;
58765876
END $$;
58775877
</sql>
5878+
</changeSet>
58785879
<changeSet author="jcizmar" id="1783771000000-1">
58795880
<createTable tableName="app_install">
58805881
<column name="id" type="BIGINT">

backend/data/src/test/kotlin/io/tolgee/unit/apps/AppManifestFetcherTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.tolgee.unit.apps
22

3-
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
3+
import tools.jackson.module.kotlin.jacksonObjectMapper
44
import io.tolgee.configuration.tolgee.AppsProperties
55
import io.tolgee.configuration.tolgee.InternalProperties
66
import io.tolgee.constants.Message

e2e/cypress/support/dataCyType.d.ts

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,10 @@ declare namespace DataCy {
163163
"comment-menu-needs-resolution": true;
164164
"comment-resolve": true;
165165
"comment-text": true;
166+
"community-my-contributions-toggle": true;
167+
"community-projects-view": true;
168+
"community-translation-banner": true;
169+
"community-translation-item": true;
166170
"content-delivery-add-button": true;
167171
"content-delivery-auto-publish-checkbox": true;
168172
"content-delivery-delete-button": true;
@@ -236,6 +240,7 @@ declare namespace DataCy {
236240
"export-submit-button": true;
237241
"export-support_arrays-selector": true;
238242
"file-dropzone-add-more-button": true;
243+
"file-dropzone-file-input": true;
239244
"file-dropzone-remove-button": true;
240245
"file-dropzone-select-button": true;
241246
"filter-item": true;
@@ -266,6 +271,7 @@ declare namespace DataCy {
266271
"global-search-field": true;
267272
"global-search-field-clear": true;
268273
"global-user-menu-button": true;
274+
"glossaries": true;
269275
"glossaries-empty-add-button": true;
270276
"glossaries-list-more-button": true;
271277
"glossary-batch-delete-button": true;
@@ -573,6 +579,7 @@ declare namespace DataCy {
573579
"plan-limit-dialog-close": true;
574580
"plan-limit-exceeded-popover": true;
575581
"plan_seat_limit_exceeded_while_accepting_invitation_message": true;
582+
"profile": true;
576583
"project-ai-prompt-dialog-description-input": true;
577584
"project-ai-prompt-dialog-save": true;
578585
"project-app-page-iframe": true;
@@ -587,6 +594,11 @@ declare namespace DataCy {
587594
"project-branch-merge-change": true;
588595
"project-branch-merge-delete-branch-checkbox": true;
589596
"project-branch-merge-detail": true;
597+
"project-contributor-invitation-pending": true;
598+
"project-contributor-invite-button": true;
599+
"project-contributor-item": true;
600+
"project-contributor-item-first-contribution": true;
601+
"project-contributor-item-last-contribution": true;
590602
"project-dashboard-activity-chart": true;
591603
"project-dashboard-activity-list": true;
592604
"project-dashboard-base-word-count": true;
@@ -617,11 +629,16 @@ declare namespace DataCy {
617629
"project-leave-button": true;
618630
"project-list-languages": true;
619631
"project-list-more-button": true;
632+
"project-list-org-name": true;
633+
"project-list-public-badge": true;
620634
"project-list-qa-badge-button": true;
621635
"project-list-translations-button": true;
622636
"project-member-item": true;
623637
"project-member-revoke-button": true;
638+
"project-members-invitation-cancel-button": true;
624639
"project-members-invitation-item": true;
640+
"project-members-tab-community": true;
641+
"project-members-tab-team": true;
625642
"project-menu-item": true;
626643
"project-menu-item-ai": true;
627644
"project-menu-item-app": true;
@@ -658,6 +675,12 @@ declare namespace DataCy {
658675
"project-settings-button": true;
659676
"project-settings-delete-button": true;
660677
"project-settings-description": true;
678+
"project-settings-export-button": true;
679+
"project-settings-export-import": true;
680+
"project-settings-import-button": true;
681+
"project-settings-import-manifest": true;
682+
"project-settings-import-manifest-unreadable": true;
683+
"project-settings-import-version-warning": true;
661684
"project-settings-label-item": true;
662685
"project-settings-label-item-description": true;
663686
"project-settings-label-item-label": true;
@@ -672,10 +695,12 @@ declare namespace DataCy {
672695
"project-settings-languages-list-name": true;
673696
"project-settings-menu-advanced": true;
674697
"project-settings-menu-apps": true;
698+
"project-settings-menu-export-import": true;
675699
"project-settings-menu-general": true;
676700
"project-settings-menu-labels": true;
677701
"project-settings-menu-qa": true;
678702
"project-settings-name": true;
703+
"project-settings-public-switch": true;
679704
"project-settings-suggestions-mode-switch": true;
680705
"project-settings-tm-configure": true;
681706
"project-settings-tm-row": true;
@@ -698,6 +723,8 @@ declare namespace DataCy {
698723
"project-transfer-dialog": true;
699724
"prompt-basic-option": true;
700725
"prompt-basic-option-edit": true;
726+
"public-projects-login-button": true;
727+
"public-projects-sign-up-button": true;
701728
"qa-action-correct": true;
702729
"qa-action-ignore": true;
703730
"qa-badge": true;
@@ -772,6 +799,8 @@ declare namespace DataCy {
772799
"submenu-item": true;
773800
"suggestion-action": true;
774801
"suggestions-list": true;
802+
"suggestions-show-all": true;
803+
"switch-popover-footer-action": true;
775804
"switch-popover-item": true;
776805
"switch-popover-new": true;
777806
"switch-popover-search": true;
@@ -898,6 +927,7 @@ declare namespace DataCy {
898927
"translation-label-add": true;
899928
"translation-label-control": true;
900929
"translation-label-delete": true;
930+
"translation-memories": true;
901931
"translation-memories-empty-add-button": true;
902932
"translation-memories-list-more-button": true;
903933
"translation-memory-delete-button": true;

0 commit comments

Comments
 (0)