From a575c5bf52641c2ec8cff6926f121391ed501e38 Mon Sep 17 00:00:00 2001 From: Mark Herwege Date: Mon, 10 Feb 2025 11:51:25 +0100 Subject: [PATCH] review feedback Signed-off-by: Mark Herwege --- .../openhab/binding/mybmw/internal/MyBMWConstants.java | 8 ++++---- .../mybmw/internal/handler/MyBMWBridgeHandler.java | 1 + .../mybmw/internal/handler/auth/MyBMWAuthServlet.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/MyBMWConstants.java b/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/MyBMWConstants.java index 57d3cda00b16e..f1432645a9ef9 100644 --- a/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/MyBMWConstants.java +++ b/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/MyBMWConstants.java @@ -61,13 +61,13 @@ public interface MyBMWConstants { static final int DEFAULT_REFRESH_INTERVAL_MINUTES = 60; - static final String BASE_PATH = "/" + BINDING_ID + "/"; + static final String LOCAL_OPENHAB_BASE_PATH = "/" + BINDING_ID + "/"; - static final String HTML_SOURCE = "captcha/"; + static final String CAPTCHA_URL_ROOT = "captcha/"; static final String NORTH_AMERICA = "NORTH_AMERICA"; static final String ROW = "ROW"; - static final Map CAPTCHA_HTML = Map.of(NORTH_AMERICA, HTML_SOURCE + "north_america_form.html", ROW, - HTML_SOURCE + "rest_of_world_form.html"); + static final Map CAPTCHA_HTML = Map.of(NORTH_AMERICA, CAPTCHA_URL_ROOT + "north_america_form.html", ROW, + CAPTCHA_URL_ROOT + "rest_of_world_form.html"); static final String STATUS_AUTH_NEEDED = "@text/mybmw.status.authorization-needed"; static final String STATUS_USER_DETAILS_MISSING = "@text/mybmw.status.user-details-missing"; diff --git a/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/handler/MyBMWBridgeHandler.java b/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/handler/MyBMWBridgeHandler.java index ea7c329af5fb1..1c42941c0e75e 100644 --- a/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/handler/MyBMWBridgeHandler.java +++ b/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/handler/MyBMWBridgeHandler.java @@ -145,6 +145,7 @@ public void initialize() { return; } } + // Update the central configuration and get the updates configuration back super.updateConfiguration(config); localBridgeConfiguration = getConfigAs(MyBMWBridgeConfiguration.class); diff --git a/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/handler/auth/MyBMWAuthServlet.java b/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/handler/auth/MyBMWAuthServlet.java index c496fe7cdcae4..d968d9b354efd 100644 --- a/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/handler/auth/MyBMWAuthServlet.java +++ b/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/handler/auth/MyBMWAuthServlet.java @@ -50,7 +50,7 @@ public class MyBMWAuthServlet extends HttpServlet { public MyBMWAuthServlet(MyBMWBridgeHandler bridgeHandler, String region, HttpService httpService) { this.httpService = httpService; this.bridgeHandler = bridgeHandler; - this.path = MyBMWConstants.BASE_PATH + bridgeHandler.getThing().getUID().getAsString(); + this.path = MyBMWConstants.LOCAL_OPENHAB_BASE_PATH + bridgeHandler.getThing().getUID().getAsString(); String captchaTemplate = MyBMWConstants.CAPTCHA_HTML.get(region); if (captchaTemplate != null) { try (InputStream stream = classLoader.getResourceAsStream(captchaTemplate)) {