-
-
Notifications
You must be signed in to change notification settings - Fork 429
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
Adds a provider lookup for sitemaps #2162
Conversation
Signed-off-by: Brian Homeyer <bhomeyer@gmail.com>
This pull request has been mentioned on openHAB Community. There might be relevant details there: https://community.openhab.org/t/images-video-sitemaps-and-proxy/115677/4 |
private final Logger logger = LoggerFactory.getLogger(ProxyServletService.class); | ||
|
||
private final List<SitemapProvider> sitemapProviders = new ArrayList<>(); | ||
|
||
public interface SitemapSubscriptionCallback { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is this interface good for?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Leftover from testing. Removed.
} | ||
|
||
@Override | ||
public void modelChanged(String modelName, EventType type) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why does the class implement ModelRepositoryChangeListener
? This method does not seem to do anything besides doing a debug log statement.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Leftover from testing. Removed.
...rg.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/ProxyServletService.java
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All suggestions have been implemented. Thank you!
Signed-off-by: Brian Homeyer <bhomeyer@gmail.com>
...rg.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/ProxyServletService.java
Outdated
Show resolved
Hide resolved
Thanks for your updates.
as adviced by the failing Jenkins build. |
I actually didn't do that because on a clean checkout the first time you run that it'll change a number of files that aren't really being changed. Something with the way Eclipse does what it does I would suspect. If I do that now and push those changes this modification goes from 1 file to 11, which is not the desired commit. I'm switching to VS Code, hopefully have better results. |
Then only commit the change that concerns the class you are touching here and all should be fine. |
Removing old sitemap reference
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed as per review.
Should be all set now, I hope. Really need to learn more about Git, I'm terrible with this. |
Jenkins is still failing. Seems you didn't yet push the commit with the spotless fixes. |
I only committed the one file, so I don't know. Ran the spotless:apply committed and that's all. I'll try again I guess. |
Just ran it again and there would be no changes to the file in question, so I don't know what to do here. Sorry! |
There must be changes, otherwise Jenkins wouldn't fail. Does the Maven build succeed locally for you? Are you sure that you have pushed all your changes? |
Nope, completely broken by the updates above to satisfy your recommendations. Give me a minute I'll fix all that. |
5th time's a charm. Apologies, I'll get this sooner or later. |
Signed-off-by: Brian Homeyer <bhomeyer@gmail.com>
Signed-off-by: Brian Homeyer <bhomeyer@gmail.com>
Signed-off-by: Wouter Born <github@maindrain.net>
…2164) Signed-off-by: Sami Salonen <ssalonen@gmail.com> Signed-off-by: Brian Homeyer <bhomeyer@gmail.com>
Removing old sitemap reference Signed-off-by: Brian Homeyer <bhomeyer@gmail.com>
…basec/openhab-core into add_provider_lookup_sitemaps
Sorry, I tried. Again, I give up. |
This adds a sitemap provider lookup to the proxy service.
It's one part of a 2 part fix for issues :
openhab/openhab-webui#763
#2154
openhab/openhab-webui#745