Feat/sync repo - #29
Draft
droslbl wants to merge 38 commits into
Draft
Conversation
… upstream Both files are untouched by us since the fork (e650ecd) and were extended by FIWARE/main PR FIWARE#145 (Sub entities). Taken as file-level content rather than cherry-picking the source commit, since that commit also touches ValidatingDeserializer.java which conflicts with our own changes and is tracked separately in UPSTREAM_SYNC.md. Part of the upstream sync tracked in UPSTREAM_SYNC.md.
…o 63 (FIWARE#139) Co-authored-by: Víctor Rampérez Martín <vramperez@MacBook-Air-de-Victor.local>
…nRef (FIWARE#141) Co-authored-by: Víctor Rampérez Martín <vramperez@MacBook-Air-de-Victor.local> Co-authored-by: Stefan Wiedemann <wistefan@googlemail.com>
…nRef in ProductCatalog (FIWARE#142) Co-authored-by: Víctor Rampérez Martín <vramperez@MacBook-Air-de-Victor.local> Co-authored-by: Stefan Wiedemann <wistefan@googlemail.com>
If getBasepath() returns null, it is now ignored instead of being concatenated as the string "null" in the subscription callback URI.
…ificationRef in ProductCatalog (FIWARE#142)" This reverts commit 95e7134.
…ificationRef (FIWARE#141)" This reverts commit 4937e67.
droslbl
marked this pull request as draft
July 10, 2026 10:04
… thant one (FIWARE#140) Co-authored-by: Víctor Rampérez Martín <vramperez@MacBook-Air-de-Victor.local> Co-authored-by: Stefan Wiedemann <wistefan@googlemail.com>
…ore thant one (FIWARE#143) Co-authored-by: Víctor Rampérez Martín <vramperez@MacBook-Air-de-Victor.local>
…RE#144, partial) Partial cherry-pick of PR FIWARE#144 (56ab620) — only the AbstractProductCatalogApiController.java chunk. The rest of FIWARE#144 touches ResourceRef.java, which depends on subtype classes only introduced by upstream PR FIWARE#137 (not ported); applying it standalone would break the build the same way FIWARE#141/FIWARE#142 did. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
…legalStateException (FIWARE#147) Co-authored-by: Víctor Rampérez Martín <vramperez@MacBook-Air-de-Victor.local>
Cherry-pick of e01ae30. Adds Resource/ResourceSpecification sub-type classes (PhysicalResource, LogicalResource, SoftwareResource, InstalledSoftware, SoftwareSupportPackage, ApiResource, HostingPlatformRequirement + their *Specification counterparts) to resource-shared-models, plus sub-type-aware @schemaLocation validation in ValidatingDeserializer. Only real conflict was a trivial import-style difference in ValidatingDeserializer.java (java.util.* vs explicit imports) — our independent rewrite of that file had already converged on the same validation logic upstream did. Everything else (new subtype classes, Resource.java, ResourceSpecification.java, ExtendedCustomerBillApiIT.java, software-management files) auto-merged with zero conflicts. This unblocks FIWARE#141, FIWARE#142, and FIWARE#144's ResourceRef.java chunk, which all depend on the subtype classes introduced here. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
…nRef in ProductCatalog (FIWARE#142) Cherry-pick of 81a00f8. Previously reverted (95e7134 -> 3382a5c) because it depends on subtype classes only introduced by FIWARE#137 (Sub-entities), which wasn't ported yet. Now that FIWARE#137 is applied (de088e0), all referenced classes resolve and this cherry-picks with zero conflicts. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
…nRef (FIWARE#141) Cherry-pick of b9b06ea. Previously reverted (4937e67 -> 7ff1e68) for the same reason as FIWARE#142 — depends on subtype classes from FIWARE#137. Now applies cleanly with FIWARE#137 (de088e0) in place. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
… remaining chunk) Applies the ResourceRef.java chunk of PR FIWARE#144 (56ab620) that was deliberately excluded from 6de8afc, since it depends on the subtype classes introduced by FIWARE#137 (Sub-entities). Now applies cleanly with FIWARE#137 (de088e0) in place. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
…ing files) Applies the rest of PR FIWARE#144 (56ab620) not covered by 6de8afc/7aebb97: CustomerBillApiController, ProductOfferingPriceApiController, ResourceApiController (resource-inventory & software-management), ServiceSpecificationApiController, ServiceApiController. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
…IWARE#145, remainder) Applies the ValidatingDeserializer.java + Ref-class chunk of PR FIWARE#145 (26625cd) not covered by the earlier UnknownPreservingBase.java/SubTypePropertyProvider.java pick (02526a3). Adds @type resolution fallback in ValidatingDeserializer and @MappingEnabled entityType lists to ResourceRef.java/ResourceSpecificationRef.java (both locations) -- complementary to the getReferencedTypes() changes from FIWARE#141/FIWARE#142/FIWARE#144, not overlapping. Zero conflicts now that FIWARE#137 is in place. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Recursive schema-driven array rebuild in BaseMapper (coerceToSchema) replaces the old top-level-only isArray() check, undoing JSON-LD's single-element-array compaction at any nesting depth. Cherry-picked from FIWARE/main 64a8642; merged with our copyAdditionalPropertiesFromVO/ copyAdditionalPropertiesToVO additions (unrelated concern, kept as-is). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
…ype/@schemaLocation/@id (FIWARE#155) Translates JSON-LD reserved query tokens to their persisted NGSI-LD attribute names (@type -> atType, @id -> id, etc.) before attribute resolution, so clients can filter by the natural TMF JSON name. Cherry-picked from FIWARE/main 16b0cdb; merged the translation call into our two-phase boolean/unknown resolution loop (Scorpio PostgreSQL workaround) instead of upstream's now-superseded single-pass loop. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
(cherry picked from commit 81dcdcd)
…tyle expansion Upstream's diff rewrote star imports into an explicit list scoped to its own usage; it didn't account for JsonNode/HashSet/ArrayList used by our independently-added schema-override validation methods, so the cherry-pick compiled with missing-symbol errors despite zero git conflicts.
get-spec.sh force-downloads the official TMForum spec and overwrites the local api.json before every pre-release build. Both modules now carry custom subtype schema definitions (FIWARE#159/FIWARE#160) the official spec doesn't have, so the refresh was wiping them and breaking the pre-release build with "cannot find symbol" on the generated VO classes. Excluded both, matching the existing precedent for quote/document-management.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.