Move data model types from basic-types.h to DataModelTypes.h #39146
+153
−159
Conversation
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
github-actions
bot
added
tools
examples
transport
platform
esp32
lib
controller
app
tests
core
nxp
ratgr
approved these changes
May 29, 2025
|
I see some changes in the auto generated code (zzz_generated folder), just want to confirm if this change will not be overwritten by some tool like ZAP or whatever one is used to generate that code. |
gabc-cpp
reviewed
May 30, 2025
src/app/clusters/boolean-state-configuration-server/boolean-state-configuration-server.h
Outdated
Show resolved
Hide resolved
|
@tersal Not really, the tests already build it again and test it, so if the tests were to fail when building then there'd be issues. That's not the case since we changed the BUILD.gn file which changes part of the code generation. |
gabc-cpp
approved these changes
May 30, 2025
bzbarsky-apple
requested changes
May 31, 2025
jennygaz
force-pushed
the
refactor-data-model-types
branch
from
d63c2a1 to
8ce15ad
Compare
|
/gemini review |
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request effectively refactors common data model types by moving them from src/app/util/basic-types.h to src/lib/core/DataModelTypes.h. This centralization is a positive step for maintainability and clarity, placing these fundamental types in a more appropriate core location. The changes appear correct and maintain existing functionality for consumers of basic-types.h.
One minor suggestion regarding the PR title: "Refactor data model types to include basic-types.h" could be slightly ambiguous. Perhaps a title like "Move data model types from basic-types.h to DataModelTypes.h" or "Centralize data model types into DataModelTypes.h" might more directly reflect the changes made. This is just a suggestion for clarity.
Overall, good work on this refactoring!
Summary of Findings
- Redundant include in
basic-types.h: Insrc/app/util/basic-types.h, the#include <cstdint>(previously on line 26, now effectively line 26 in the full file context post-diff) appears redundant aslib/core/DataModelTypes.h(included on line 29) already includes<cstdint>. This was not added as a review comment due to severity settings. - Empty namespace in
basic-types.h: The filesrc/app/util/basic-types.hnow contains an empty namespace declaration:namespace chip {} // namespace chip(line 31 post-diff). This seems unnecessary if the file's primary role is now an include forwarder. This was not added as a review comment due to severity settings. - File Doxygen comment in
basic-types.h: The Doxygen comment forsrc/app/util/basic-types.h(lines 18-22 in the full file context) states it's 'The include file for all the types for the data model...'. Since the types are now defined inDataModelTypes.hand only included here, this description might benefit from a slight update to reflect its current role. This was not added as a review comment due to severity settings.
Merge Readiness
The code changes are well-structured and achieve the goal of centralizing data model types. Based on the review criteria and severity settings, no medium or higher severity issues were found in the diff. The pull request appears to be in good shape for merging. As a reviewer, I am not authorized to approve pull requests, so please ensure it undergoes any further necessary review and approval processes.
jennygaz
changed the title
basic-types.h
|
PR #39146: Size comparison from 49594a5 to 1524ff9 Increases above 0.2%:
Full report (75 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
bzbarsky-apple
approved these changes
Jun 3, 2025
There was a problem hiding this comment.
And followup (or here, either way, but followup is better): to address the rest of #38390 (comment), actually change the zapt to include DataModelTypes.h, right?
bzbarsky-apple
approved these changes
Jun 5, 2025
| @@ -6,7 +6,7 @@ | |||
| #include <app/data-model/DecodableList.h> | |||
| #include <app/data-model/List.h> | |||
| #include <app/data-model/Nullable.h> | |||
| #include <app/util/basic-types.h> | |||
| $include <lib/core/DataModelTypes.h> | |||
There was a problem hiding this comment.
This needs a regen to pass ZAP CI....
There was a problem hiding this comment.
Should be fixed by now! I regenerated the ZAP files and pushed them here
|
Jenny Gallegos Cárdenas seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #38417
Testing
Tested with the same workflows in my own repo, passing most and some only failed due to not pulling docker images properly.