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.

Sign up for GitHub

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

Jump to bottom

mDNS / UPnP discovery internationalization #2547

Merged
merged 7 commits into from
Nov 3, 2021
Merged

mDNS / UPnP discovery internationalization #2547

merged 7 commits into from
Nov 3, 2021

Conversation

lolodomo
Copy link
Contributor

Related to #2546

Signed-off-by: Laurent Garnier [email protected]

@lolodomo lolodomo requested a review from a team as a code owner October 29, 2021 20:23
@lolodomo
Copy link
Contributor Author

It has been tested with success with a modified version of the remote openHAB binding (mDNS discovery).

@lolodomo
Copy link
Contributor Author

lolodomo commented Oct 30, 2021 •
edited
Loading

@wborn : it looks like the additional CI Build failed while the main build succeeded.

@wborn
Copy link
Member

wborn commented Oct 30, 2021

Yes it sometimes gets stuck. It also happens when I build locally. Then I see for instance the thread being blocked in the tear down of the WebClientFactoryImplTest. It's somewhere on my todo list. 😉

@wborn
Copy link
Member

wborn commented Oct 30, 2021

I created #2550 so we can more easily see if build servers run into the same issue.

@lolodomo
Copy link
Contributor Author

@cweitkamp : can you please review ? As mentioned in the issue, the problem was that the wrong bundle was used to look for properties.

cweitkamp
cweitkamp reviewed Nov 1, 2021
View reviewed changes
Copy link
Contributor

@cweitkamp cweitkamp left a comment

Choose a reason for hiding this comment

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

Thank you very much @lolodomo. I left two comments.

...nfig.discovery/src/main/java/org/openhab/core/config/discovery/AbstractDiscoveryService.java Outdated Show resolved Hide resolved
...nfig.discovery/src/main/java/org/openhab/core/config/discovery/AbstractDiscoveryService.java Show resolved Hide resolved
@lolodomo
Create a new discovery result only if label changed
9ffe326 
Signed-off-by: Laurent Garnier <[email protected]>
@lolodomo
Use isBlank
d9716fd 
Signed-off-by: Laurent Garnier <[email protected]>
@cweitkamp cweitkamp added enhancement An enhancement or new feature of the Core i18n/l10n Internationalization/Localization labels Nov 1, 2021
@lolodomo
Bundle can be null
a766f42 
Signed-off-by: Laurent Garnier <[email protected]>
@lolodomo
Add unit tests
cb47175 
Signed-off-by: Laurent Garnier <[email protected]>
@lolodomo
Copy link
Contributor Author

lolodomo commented Nov 1, 2021

Build look s good even if it finished with UNSTABLE

[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary for openHAB Core 3.2.0-SNAPSHOT:
[INFO] 
[INFO] openHAB Core ....................................... SUCCESS [  5.111 s]
[INFO] openHAB Core :: BOM ................................ SUCCESS [  0.386 s]
[INFO] openHAB Core :: BOM :: Compile ..................... SUCCESS [  0.832 s]
[INFO] openHAB Core :: BOM :: Compile Model ............... SUCCESS [  1.241 s]
[INFO] openHAB Core :: BOM :: Runtime ..................... SUCCESS [  2.575 s]
[INFO] openHAB Core :: BOM :: Runtime Index ............... SUCCESS [  5.708 s]
[INFO] openHAB Core :: BOM :: Test ........................ SUCCESS [  0.452 s]
[INFO] openHAB Core :: BOM :: Test Index .................. SUCCESS [  5.544 s]
[INFO] openHAB Core :: Bundles ............................ SUCCESS [  2.340 s]
[INFO] openHAB Core :: Bundles :: Core .................... SUCCESS [01:46 min]
[INFO] openHAB Core :: Bundles :: Test .................... SUCCESS [ 29.151 s]
[INFO] openHAB Core :: Bundles :: Configuration Core ...... SUCCESS [ 30.398 s]
[INFO] openHAB Core :: Bundles :: Console ................. SUCCESS [ 12.966 s]
[INFO] openHAB Core :: Bundles :: Thing ................... SUCCESS [01:03 min]
[INFO] openHAB Core :: Bundles :: Configuration Discovery . SUCCESS [ 26.952 s]
[INFO] openHAB Core :: Bundles :: Network I/O ............. SUCCESS [ 20.852 s]
[INFO] openHAB Core :: Bundles :: Ephemeris ............... SUCCESS [ 15.859 s]
[INFO] openHAB Core :: Bundles :: Automation .............. SUCCESS [01:01 min]
[INFO] openHAB Core :: Bundles :: Magic Bundle ............ SUCCESS [ 35.234 s]
[INFO] openHAB Core :: Bundles :: Karaf Integration ....... SUCCESS [ 19.909 s]
[INFO] openHAB Core :: Bundles :: HTTP Interface .......... SUCCESS [ 30.984 s]
[INFO] openHAB Core :: Bundles :: Audio ................... SUCCESS [ 33.955 s]
[INFO] openHAB Core :: Bundles :: Voice ................... SUCCESS [ 25.388 s]
[INFO] openHAB Core :: Bundles :: Configuration XML ....... SUCCESS [ 25.143 s]
[INFO] openHAB Core :: Bundles :: Binding XML ............. SUCCESS [ 14.570 s]
[INFO] openHAB Core :: Bundles :: REST Interface .......... SUCCESS [ 19.889 s]
[INFO] openHAB Core :: Bundles :: ID ...................... SUCCESS [ 13.704 s]
[INFO] openHAB Core :: Bundles :: Persistence ............. SUCCESS [ 25.881 s]
[INFO] openHAB Core :: Bundles :: Semantics ............... SUCCESS [ 26.729 s]
[INFO] openHAB Core :: Bundles :: Thing XML ............... SUCCESS [ 19.276 s]
[INFO] openHAB Core :: Bundles :: Transformation Service .. SUCCESS [ 19.791 s]
[INFO] openHAB Core :: Bundles :: JAAS Authentication ..... SUCCESS [ 13.824 s]
[INFO] openHAB Core :: Bundles :: OAuth2Client ............ SUCCESS [ 17.168 s]
[INFO] openHAB Core :: Bundles :: Binary To JSON converter  SUCCESS [ 17.731 s]
[INFO] openHAB Core :: Bundles :: mDNS Service ............ SUCCESS [ 20.873 s]
[INFO] openHAB Core :: Bundles :: Modbus Transport ........ SUCCESS [ 51.193 s]
[INFO] openHAB Core :: Bundles :: Serial Transport ........ SUCCESS [ 14.596 s]
[INFO] openHAB Core :: Bundles :: Console for OSGi framework Eclipse Equinox SUCCESS [ 12.516 s]
[INFO] openHAB Core :: Bundles :: Console for OSGi Console RFC 147 SUCCESS [ 13.905 s]
[INFO] openHAB Core :: Bundles :: Console for OSGi runtime Karaf SUCCESS [ 14.697 s]
[INFO] openHAB Core :: Bundles :: HTTP Interface Authentication SUCCESS [ 17.358 s]
[INFO] openHAB Core :: Bundles :: Monitor ................. SUCCESS [ 33.935 s]
[INFO] openHAB Core :: Bundles :: Audio REST Interface .... SUCCESS [ 12.049 s]
[INFO] openHAB Core :: Bundles :: Authentication Support for the REST Interface SUCCESS [ 18.544 s]
[INFO] openHAB Core :: Bundles :: REST Interface :: Core .. SUCCESS [ 45.638 s]
[INFO] openHAB Core :: Bundles :: REST UI Logging Module .. SUCCESS [ 14.363 s]
[INFO] openHAB Core :: Bundles :: REST mDNS Announcer ..... SUCCESS [ 12.805 s]
[INFO] openHAB Core :: Bundles :: Model Core .............. SUCCESS [ 19.286 s]
[INFO] openHAB Core :: Bundles :: Model Sitemap ........... SUCCESS [01:34 min]
[INFO] openHAB Core :: Bundles :: UI ...................... SUCCESS [01:04 min]
[INFO] openHAB Core :: Bundles :: Sitemap REST Interface .. SUCCESS [ 33.746 s]
[INFO] openHAB Core :: Bundles :: SSE Interface ........... SUCCESS [ 17.939 s]
[INFO] openHAB Core :: Bundles :: REST Interface :: Swagger 1 SUCCESS [ 15.242 s]
[INFO] openHAB Core :: Bundles :: UI REST Interface ....... SUCCESS [ 12.187 s]
[INFO] openHAB Core :: Bundles :: Voice REST Interface .... SUCCESS [ 20.429 s]
[INFO] openHAB Core :: Bundles :: MQTT Transport .......... SUCCESS [ 24.568 s]
[INFO] openHAB Core :: Bundles :: Serial Transport for Java Communications API SUCCESS [ 13.076 s]
[INFO] openHAB Core :: Bundles :: Serial Transport for RXTX SUCCESS [ 12.095 s]
[INFO] openHAB Core :: Bundles :: Serial Transport for RFC2217 SUCCESS [  9.261 s]
[INFO] openHAB Core :: Bundles :: UPnP Transport .......... SUCCESS [ 20.227 s]
[INFO] openHAB Core :: Bundles :: SSL Certificate Generator SUCCESS [ 30.225 s]
[INFO] openHAB Core :: Bundles :: Configuration mDNS Discovery SUCCESS [ 16.800 s]
[INFO] openHAB Core :: Bundles :: Configuration USB-Serial Discovery SUCCESS [ 15.701 s]
[INFO] openHAB Core :: Bundles :: Configuration USB-Serial Discovery for Linux using sysfs scanning SUCCESS [ 17.294 s]
[INFO] openHAB Core :: Bundles :: Configuration UPnP Discovery SUCCESS [ 17.033 s]
[INFO] openHAB Core :: Bundles :: Configuration Dispatcher  SUCCESS [ 19.725 s]
[INFO] openHAB Core :: Bundles :: Configuration Serial .... SUCCESS [ 13.054 s]
[INFO] openHAB Core :: Bundles :: Automation Script Modules SUCCESS [ 26.126 s]
[INFO] openHAB Core :: Bundles :: Automation Media Modules  SUCCESS [ 18.132 s]
[INFO] openHAB Core :: Bundles :: Automation Script RuleSupport SUCCESS [ 30.283 s]
[INFO] openHAB Core :: Bundles :: Automation REST API ..... SUCCESS [ 19.357 s]
[INFO] openHAB Core :: Bundles :: Model Items ............. SUCCESS [01:11 min]
[INFO] openHAB Core :: Bundles :: Model Item IDE .......... SUCCESS [ 24.340 s]
[INFO] openHAB Core :: Bundles :: Model Items Runtime ..... SUCCESS [ 13.596 s]
[INFO] openHAB Core :: Bundles :: Model Persistence ....... SUCCESS [01:06 min]
[INFO] openHAB Core :: Bundles :: Model Persistence IDE ... SUCCESS [ 25.718 s]
[INFO] openHAB Core :: Bundles :: Model Script ............ SUCCESS [02:02 min]
[INFO] openHAB Core :: Bundles :: Model Rules ............. SUCCESS [01:14 min]
[INFO] openHAB Core :: Bundles :: Model Rule IDE .......... SUCCESS [ 19.517 s]
[INFO] openHAB Core :: Bundles :: Model Script IDE ........ SUCCESS [ 27.621 s]
[INFO] openHAB Core :: Bundles :: Model Sitemap IDE ....... SUCCESS [ 45.945 s]
[INFO] openHAB Core :: Bundles :: Model Thing ............. SUCCESS [01:25 min]
[INFO] openHAB Core :: Bundles :: Model Thing IDE ......... SUCCESS [ 29.128 s]
[INFO] openHAB Core :: Bundles :: Language Server ......... SUCCESS [ 12.363 s]
[INFO] openHAB Core :: Bundles :: Model Persistence Runtime SUCCESS [ 15.751 s]
[INFO] openHAB Core :: Bundles :: Model Script Runtime .... SUCCESS [ 17.210 s]
[INFO] openHAB Core :: Bundles :: Model Rules Runtime ..... SUCCESS [ 13.489 s]
[INFO] openHAB Core :: Bundles :: Model Sitemap Runtime ... SUCCESS [ 13.357 s]
[INFO] openHAB Core :: Bundles :: Model Thing Runtime ..... SUCCESS [ 17.365 s]
[INFO] openHAB Core :: Bundles :: UI Icon Support ......... SUCCESS [ 20.285 s]
[INFO] openHAB Core :: Bundles :: JSON Storage ............ SUCCESS [ 20.613 s]
[INFO] openHAB Core :: Bundles :: Community Marketplace Add-on Service SUCCESS [ 26.855 s]
[INFO] openHAB Core :: Bundles :: Community Marketplace Add-on Service :: Karaf SUCCESS [ 17.062 s]
[INFO] openHAB Core :: BOM :: openHAB Core ................ SUCCESS [  0.299 s]
[INFO] openHAB Core :: BOM :: openHAB Core Index .......... SUCCESS [  4.603 s]
[INFO] openHAB Core :: Bundles :: Sample Add-on Service ... SUCCESS [ 12.755 s]
[INFO] openHAB Core :: Bundles :: Model Lazy Generation ... SUCCESS [ 30.902 s]
[INFO] openHAB Core :: Features ........................... SUCCESS [  0.477 s]
[INFO] openHAB Core :: Features :: Karaf .................. SUCCESS [  0.505 s]
[INFO] openHAB Core :: Features :: Karaf :: Target Platform SUCCESS [ 35.035 s]
[INFO] openHAB Core :: Features :: Karaf :: Core .......... SUCCESS [02:18 min]
[INFO] openHAB Core :: Tools .............................. SUCCESS [  0.364 s]
[INFO] openHAB Core :: Tools :: Archetypes ................ SUCCESS [  0.648 s]
[INFO] openHAB Core :: Tools :: Archetypes :: Binding ..... SUCCESS [  6.607 s]
[INFO] openHAB Core :: Integration Tests .................. SUCCESS [  0.784 s]
[INFO] openHAB Core :: Integration Tests :: Tests ......... SUCCESS [ 24.340 s]
[INFO] openHAB Core :: Integration Tests :: OAuth2Client Tests SUCCESS [ 15.037 s]
[INFO] openHAB Core :: Integration Tests :: Automation Tests SUCCESS [ 18.070 s]
[INFO] openHAB Core :: Integration Tests :: Automation Core Module Tests SUCCESS [ 15.861 s]
[INFO] openHAB Core :: Integration Tests :: Automation Module Timer Tests SUCCESS [ 18.783 s]
[INFO] openHAB Core :: Integration Tests :: Automation Script Module Tests SUCCESS [ 16.567 s]
[INFO] openHAB Core :: Integration Tests :: Automation Integration Tests SUCCESS [ 24.623 s]
[INFO] openHAB Core :: Integration Tests :: Binding XML Tests SUCCESS [ 16.735 s]
[INFO] openHAB Core :: Integration Tests :: Configuration Core Tests SUCCESS [ 14.229 s]
[INFO] openHAB Core :: Integration Tests :: Configuration mDNS Discovery Tests SUCCESS [ 14.840 s]
[INFO] openHAB Core :: Integration Tests :: Configuration Discovery Tests SUCCESS [ 22.240 s]
[INFO] openHAB Core :: Integration Tests :: Configuration Discovery UsbSerial Tests SUCCESS [ 16.427 s]
[INFO] openHAB Core :: Integration Tests :: Configuration Dispatcher Tests SUCCESS [ 16.318 s]
[INFO] openHAB Core :: Integration Tests :: Configuration XML Tests SUCCESS [ 18.136 s]
[INFO] openHAB Core :: Integration Tests :: Ephemeris Tests SUCCESS [ 17.034 s]
[INFO] openHAB Core :: Integration Tests :: IO REST Core Tests SUCCESS [ 18.685 s]
[INFO] openHAB Core :: Integration Tests :: Model Core Tests SUCCESS [ 18.503 s]
[INFO] openHAB Core :: Integration Tests :: Model Item Tests SUCCESS [ 18.948 s]
[INFO] openHAB Core :: Integration Tests :: Model Rule Tests SUCCESS [ 15.985 s]
[INFO] openHAB Core :: Integration Tests :: Model Script Tests SUCCESS [ 17.088 s]
[INFO] openHAB Core :: Integration Tests :: Model Thing Test Support SUCCESS [ 13.932 s]
[INFO] openHAB Core :: Integration Tests :: Model Thing Tests SUCCESS [ 17.543 s]
[INFO] openHAB Core :: Integration Tests :: JSON Storage Tests SUCCESS [ 14.304 s]
[INFO] openHAB Core :: Integration Tests :: Thing Tests ... SUCCESS [ 37.104 s]
[INFO] openHAB Core :: Integration Tests :: Thing XML Tests SUCCESS [ 20.260 s]
[INFO] openHAB Core :: Integration Tests :: Voice Test .... SUCCESS [ 19.326 s]
[INFO] openHAB Core :: Integration Tests :: Configuration USB-Serial Discovery for Linux using sysfs scanning Tests SUCCESS [ 17.824 s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time:  15:51 min (Wall Clock)
[INFO] Finished at: 2021-11-01T12:48:49Z
[INFO] ------------------------------------------------------------------------
[INFO] Static code analysis summary report is available in:
[INFO] file:/home/jenkins/jenkins-agent1/workspace/PR-openHAB-Core/target/summary_report.html
channel stopped
[htmlpublisher] Archiving HTML reports...
[htmlpublisher] Archiving at BUILD level /home/jenkins/jenkins-agent1/workspace/PR-openHAB-Core/target to /var/jenkins_home/jobs/PR-openHAB-Core/builds/3792/htmlreports/Static_20Code_20Analysis_20Report
Finished: UNSTABLE

@lolodomo
Copy link
Contributor Author

lolodomo commented Nov 2, 2021

Is it possible to have a merge so that I can start fixing few bindings?

This was referenced Nov 2, 2021
Merged
Merged
@wborn wborn added rebuild Triggers the Jenkins PR build and removed rebuild Triggers the Jenkins PR build labels Nov 3, 2021
@cweitkamp cweitkamp added rebuild Triggers the Jenkins PR build and removed rebuild Triggers the Jenkins PR build labels Nov 3, 2021
cweitkamp
cweitkamp approved these changes Nov 3, 2021
View reviewed changes
Copy link
Contributor

@cweitkamp cweitkamp left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks.

Jenkins succeeded and GHA still fails because it didn't pick up the changes of #2555.

@cweitkamp cweitkamp merged commit 089b9d2 into openhab:main Nov 3, 2021
@lolodomo lolodomo deleted the mdms_upnp_discovery_i18n branch November 3, 2021 20:38
@cweitkamp cweitkamp added this to the 3.2 milestone Nov 3, 2021
splatch pushed a commit to ConnectorIO/copybara-hab-core that referenced this pull request Jul 12, 2023
@lolodomo @splatch
mDNS / UPnP discovery internationalization (openhab#2547)
a695b6f 
* mDNS / UPnP discovery internationalization

Related to openhab#2546

Signed-off-by: Laurent Garnier <[email protected]>
GitOrigin-RevId: 089b9d2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cweitkamp cweitkamp cweitkamp approved these changes

Assignees
No one assigned
Labels
enhancement An enhancement or new feature of the Core i18n/l10n Internationalization/Localization
Projects
None yet
Milestone
3.2
Development

Successfully merging this pull request may close these issues.
3 participants
@lolodomo @wborn @cweitkamp