Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generate valid tags in thing-description-1.0.0.xsd #4626

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from

Conversation

jimtng
Copy link
Contributor

@jimtng jimtng commented Mar 1, 2025

Populates the list of valid Point and Property tags in thing-description-1.0.0.xsd

Depends on/Based on: #4622, #4615, #4617

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
@andrewfg
Copy link
Contributor

andrewfg commented Mar 1, 2025

Did you take into account also #4617 ?

@jimtng
Copy link
Contributor Author

jimtng commented Mar 1, 2025

Did you take into account also #4617 ?

Nope, missed that one. Will add it shortly. This PR will wait until all those ones are merged first.

@jimtng
Copy link
Contributor Author

jimtng commented Mar 1, 2025

@andrewfg in #4615 you have:

<!-- Allowed Property Tag Values -->

But in #4617 you have:

<!-- Allowed Semantic Equipment Tag Values -->

Do you prefer the version with or without the word Semantic?

@andrewfg
Copy link
Contributor

andrewfg commented Mar 1, 2025

I think it is clearer with the word semantic.

@jimtng jimtng force-pushed the tag-xsd-autogen branch from 0ef74cf to a20460d Compare March 1, 2025 09:06
@jimtng
Copy link
Contributor Author

jimtng commented Mar 1, 2025

Updated to include #4617, and made all the comments say Semantic

@jimtng jimtng force-pushed the tag-xsd-autogen branch from a20460d to 5e11a71 Compare March 1, 2025 09:22
Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
@jimtng jimtng force-pushed the tag-xsd-autogen branch from 5e11a71 to 376d868 Compare March 1, 2025 09:51
Copy link
Contributor

@andrewfg andrewfg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Brilliant. LGTM.

@andrewfg
Copy link
Contributor

andrewfg commented Mar 1, 2025

@jimtng just wondering if you need to add a spotless exclusion somewhere to prevent it falling over later on the generated java and xsd files?

@jimtng
Copy link
Contributor Author

jimtng commented Mar 1, 2025

No, the result should be spotless-approved

@andrewfg
Copy link
Contributor

andrewfg commented Mar 1, 2025

@jimtng it works perfectly here

@andrewfg
Copy link
Contributor

andrewfg commented Mar 1, 2025

@jimtng since this PR is now dynamically generating the updated schema xsd file I wonder if I shall remove it from my own two PRs? You say you want to postpone your PR until mine is done. And perhaps I must postpone mine until yours is done? We need to ensure we avoid cross dependent merge conflicts.

EDIT: I think in my PRs I need to insert the begin/end markers in the XSD so your PR can later find and replace the lines between. Or??

EDIT2: I just noticed that the word "semantic" is missing from the end marker

			<!-- Begin Allowed Semantic Point Tag Values -->
			<!-- DO NOT EDIT THIS LIST - Generated by generateTagClasses.groovy -->
...
			<!-- End Allowed Point Tag Values -->

EDIT3: obviously this PR will fail its CI Build until after my PRs are merged; so that clarifies the merge sequence..

andrewfg added a commit to andrewfg/openhab-core that referenced this pull request Mar 1, 2025
Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
andrewfg added a commit to andrewfg/openhab-core that referenced this pull request Mar 1, 2025
Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
@andrewfg
Copy link
Contributor

andrewfg commented Mar 1, 2025

See

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
@jimtng
Copy link
Contributor Author

jimtng commented Mar 2, 2025

since this PR is now dynamically generating the updated schema xsd file I wonder if I shall remove it from my own two PRs? You say you want to postpone your PR until mine is done. And perhaps I must postpone mine until yours is done? We need to ensure we avoid cross dependent merge conflicts.

I think by now you've realised that your PR needs to go in first, with a static list of tags. It would only then make sense for this PR to be merged to generate that list.

EDIT2: I just noticed that the word "semantic" is missing from the end marker

Good catch, thanks! I've added them now.

EDIT3: obviously this PR will fail its CI Build until after my PRs are merged; so that clarifies the merge sequence..

Yup!

@andrewfg
Copy link
Contributor

andrewfg commented Mar 2, 2025

your PR needs to go in first, with a static list of tags

Agreed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants