Some more code review

Signed-off-by: Christian Kittel <ckittel@gmx.de>

Author: EvilPingu

bundles/org.openhab.binding.ntfy/README.md

@@ -4,20 +4,21 @@ The Ntfy binding enables openHAB to publish notifications to Ntfy-compatible ser
 
 Ntfy is a simple HTTP-based notification service and message broker; see [ntfy.sh](https://ntfy.sh) for details and public servers.
 
-It is intended for integrations where openHAB should push alert or informational messages to mobile or desktop clients that support the Ntfy protocol. The binding supports basic text messages as well as common rich features supported by the protocol: message priority, tags, icon URLs, attachments, click actions and simple action buttons.
+It is intended for integrations where openHAB should push alert or informational messages to mobile or desktop clients that support the Ntfy protocol.
+The binding supports basic text messages as well as common rich features supported by the protocol: message priority, tags, icon URLs, attachments, click actions and simple action buttons
 
 Typical uses include doorbell alerts, security notifications, system health messages, or any automation that should notify users in real time via an Ntfy-compatible notification channel.
 
 ## Supported Things
 
-This binding provides the following Thing types. The Thing type IDs match the definitions in `src/main/resources/OH-INF/thing/thing-types.xml`.
+This binding provides the following Thing types:
 
-- `ntfy:ntfyConnection` (bridge) — Represents a connection to an Ntfy server. Configure the bridge with the server hostname (for example `https://ntfy.sh`) and optional credentials (username/password). The bridge holds shared connection settings (hostname, username, password, connectionTimeout) which are used by topic Things.
-- `ntfy:ntfyTopic` (Thing) — Represents a topic/channel on a configured Ntfy server. Each topic Thing must be associated with an `ntfyConnection` bridge and requires the `topicname` configuration parameter.
+- `server` (bridge) — Represents a connection to an Ntfy server. The bridge holds shared connection settings (hostname, username, password, connectionTimeout) which are used by topic Things.
+- `ntfy-Topic` (Thing) — Represents a topic/channel on a configured Ntfy server. Each topic Thing must be associated with a `server` bridge.
 
 ## Thing Configuration
 
-### `ntfyConnection` Bridge Configuration
+### `server` Bridge Configuration
 
 | Name              | Type    | Description                                                                              | Default                            | Required | Advanced |
 |-------------------|---------|------------------------------------------------------------------------------------------|------------------------------------|----------|----------|
@@ -26,45 +27,44 @@ This binding provides the following Thing types. The Thing type IDs match the de
 | password          | text    | Optional password - if username is provided basic auth is used else Bearer token is used | N/A                                | no       | no       |
 | connectionTimeout | integer | WebSocket / HTTP connection timeout ms                                                   | 60000                              | no       | yes      |
 
-Configure the `ntfyConnection` as a bridge to hold shared server and authentication settings. Topic Things reference the bridge to reuse these settings. For authentication with access token only set the password and leave the username empty.
+Configure the `server` as a bridge to hold shared server and authentication settings.
+For authentication with access token only set the password and leave the username empty.
 
-### `ntfyTopic` Thing Configuration
+### `ntfy-topic` Thing Configuration
 
 | Name      | Type | Description               | Default | Required | Advanced |
 |-----------|------|---------------------------|---------|----------|----------|
 | topicname | text | Name of the topic/channel | N/A     | yes      | no       |
 
 ## Channels
 
-### `ntfyTopic` Channels
+### `ntfy-topic` Channels
 
-| Channel         | Type     | Read/Write | Description                                 |
-|-----------------|----------|------------|---------------------------------------------|
-| lastMessage     | String   | R          | Last received message payload (read-only)   |
-| lastMessageTime | DateTime | R          | Timestamp of the last message (read-only)   |
-| lastMessageId   | String   | R          | ID of the last message (read-only)          |
+| Channel           | Type     | Read/Write | Description                                 |
+|-------------------|----------|------------|---------------------------------------------|
+| last-message      | String   | R          | Last received message payload (read-only)   |
+| last-message-time | DateTime | R          | Timestamp of the last message (read-only)   |
+| last-message-id   | String   | R          | ID of the last message (read-only)          |
 
 ## Full Example
 
-Below are examples for textual configuration files showing a bridge (`ntfyConnection`), a topic Thing (`ntfyTopic`), Items bound to the Thing's channels, and a simple sitemap to display the last message and its timestamp.
+Below are examples for textual configuration files showing a bridge (`server`), a topic Thing (`ntfy-topic`), Items bound to the Thing's channels, and a simple sitemap to display the last message and its timestamp.
 
 ### Thing Configuration
 
-```things
-Bridge ntfy:ntfyConnection:myConn "Ntfy Server" [ hostname="https://ntfy.sh", connectionTimeout=60000 ]
+```java
+Bridge ntfy:server:myConn "Ntfy Server" [ hostname="https://ntfy.sh", connectionTimeout=60000, username="ntfyUser", password="MyPaSsWoRd"]
 
-Thing ntfy:ntfyTopic:home "Front Door Notifications" (ntfy:ntfyConnection:myConn) [ topicname="home" ]
+Thing ntfy:ntfy-topic:home "Front Door Notifications" (ntfy:server:myConn) [ topicname="home" ]
 ```
 
-If your server requires authentication, supply `username` and `password` in the bridge configuration. The `topicname` must be provided for each `ntfyTopic` Thing.
-
 ### Item Configuration (items file)
 
 Bind Items to the read-only channels exposed by the topic Thing to show the last received message and its timestamp:
 
-```items
-String FrontDoorLastMessage "Front Door Message" { channel="ntfy:ntfyTopic:home:lastMessage" }
-DateTime FrontDoorMessageTime "Last message received" { channel="ntfy:ntfyTopic:home:messageTime" }
+```java
+String FrontDoorLastMessage "Front Door Message" { channel="ntfy:ntfy-topic:home:last-message" }
+DateTime FrontDoorMessageTime "Last message received" { channel="ntfy:ntfy-topic:home:last-message-time" }
 ```
 
 Note: Sending notifications from openHAB to ntfy is done via the binding's Actions from rules (the binding exposes Actions to publish/delete messages). The channels above are read-only and show incoming or last-state values.
@@ -73,7 +73,7 @@ Note: Sending notifications from openHAB to ntfy is done via the binding's Actio
 
 Simple sitemap demonstrating how to display the last message and its timestamp:
 
-```sitemap
+```perl
  sitemap notifications label="Notifications"
 {
     <Frame label="Front Door">
@@ -85,9 +85,11 @@ Simple sitemap demonstrating how to display the last message and its timestamp:
 
 ## Actions (Rules DSL and JavaScript)
 
-This binding exposes Rule Actions to send and manage messages on a configured topic. Actions are available for use from the Rules DSL and the ECMAScript/JavaScript automation scripts. The actions support a builder-style API to configure a message (message text, priority, tags, icon, attachments, actions, sequence id, ...) and then send it.
+This binding exposes Rule Actions to send and manage messages on a configured topic.
+Actions are available for use from the Rules DSL and the ECMAScript/JavaScript automation scripts.
+The actions support a builder-style API to configure a message (message text, priority, tags, icon, attachments, actions, sequence id, ...) and then send it.
 
-Important: Always check that the returned actions object is not null (the Thing must exist and be handled by the binding) before invoking methods.
+Important: Always check that the Thing exist before invoking methods.
 
 ### Available action methods
 
@@ -118,7 +120,7 @@ For more information about ntfy features and the notification format, see the nt
 
 ```rules
 // Obtain the Thing-specific actions and use the builder to send a message
-val bindingActions = getActions("ntfy", "ntfy:ntfyTopic:frontdoor")
+val bindingActions = getActions("ntfy", "ntfy:ntfy-topic:frontdoor")
 if (bindingActions !== null) {
     // simple one-liner: send a message
     val msgId = bindingActions.withMessage("Someone is at the door").withPriority(4).send()
@@ -144,7 +146,7 @@ In ECMAScript scripts you can obtain the Thing Actions and use the same builder
 
 ```javascript
 // get the Thing actions for the topic Thing
-var bindingActions = actions.get("ntfy", "ntfy:ntfyTopic:frontdoor");
+var bindingActions = actions.get("ntfy", "ntfy:ntfy-topic:frontdoor");
 if (bindingActions) {
     // send a simple message
     var id = bindingActions.withMessage("Garage opened").withPriority(3).send();

bundles/org.openhab.binding.ntfy/src/main/java/org/openhab/binding/ntfy/internal/NtfyConnectionHandler.java

@@ -85,8 +85,6 @@ public void initialize() {
 
         config = getConfigAs(NtfyConnectionConfiguration.class);
 
-        updateStatus(ThingStatus.UNKNOWN);
-
         String scheme;
         try {
             scheme = (new URI(config.hostname)).getScheme();
@@ -96,8 +94,7 @@ public void initialize() {
         }
         if (!"http".equals(scheme) && !"https".equals(scheme)) {
             updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
-                    "URI scheme is missing in hostname or unsupported URI scheme (only http or https are supported): "
-                            + config.hostname);
+                    "@text/offline.communication-error.unsupported-schema");
             return;
         }
 
@@ -167,11 +164,10 @@ public synchronized boolean startWebSocketConnection(Thing topicThing, NtfyWebSo
                     client.stop();
                 } catch (InterruptedException e) {
                     Thread.currentThread().interrupt();
-                    logger.error("WebSocket connection was interrupted", e);
                     updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, e.getLocalizedMessage());
                     return false;
                 } catch (Exception e) {
-                    logger.warn("Error stopping WebSocket connection - ignore it and continue", e);
+                    logger.debug("Error stopping WebSocket connection - ignore it and continue", e);
                 }
             }
             try {
@@ -198,7 +194,6 @@ public synchronized boolean startWebSocketConnection(Thing topicThing, NtfyWebSo
                 return false;
             }
             updateStatus(ThingStatus.ONLINE);
-
         }
         return true;
     }
@@ -215,10 +210,7 @@ private String getTopicNameFromThing(Thing topicThing) {
      */
     public void connectionError(Throwable cause) {
         updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, cause.getLocalizedMessage());
-        retryConnectionFuture = scheduler.schedule(() -> {
-            retryConnectionFuture = null;
-            updateStatus(ThingStatus.ONLINE);
-        }, 30, TimeUnit.SECONDS);
+        retryConnectionFuture = scheduler.schedule(this::initialize, 30, TimeUnit.SECONDS);
     }
 
     @Override

bundles/org.openhab.binding.ntfy/src/main/java/org/openhab/binding/ntfy/internal/NtfyTopicHandler.java

@@ -17,6 +17,7 @@
 import java.net.URISyntaxException;
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -51,7 +52,7 @@ public class NtfyTopicHandler extends BaseThingHandler implements WebSocketConne
 
     private NtfyWebSocket ntfyWebSocket;
     private @Nullable NtfySender ntfySender;
-    private boolean isInitializing;
+    private AtomicBoolean isInitializing = new AtomicBoolean(false);
     private @Nullable MessageEvent lastMessageEvent;
 
     /**
@@ -121,18 +122,17 @@ public void handleCommand(ChannelUID channelUID, Command command) {
 
     @Override
     public void initialize() {
-        if (isInitializing) {
+        if (!isInitializing.compareAndSet(false, true)) {
             return;
         }
-        this.isInitializing = true;
 
         updateStatus(ThingStatus.UNKNOWN);
 
         scheduler.execute(() -> {
             try {
                 start(thing);
             } finally {
-                this.isInitializing = false;
+                isInitializing.set(false);
             }
         });
     }
@@ -157,7 +157,8 @@ public void connectionEstablished() {
     @Override
     public void connectionLost(@Nullable String reason) {
         updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
-                reason == null || reason.isBlank() ? "WebSocket connection lost" : reason);
+                reason == null || reason.isBlank() ? "@text/offline.communication-error.websocket-connection-lost"
+                        : reason);
     }
 
     @Override

bundles/org.openhab.binding.ntfy/src/main/java/org/openhab/binding/ntfy/internal/network/NtfySender.java

@@ -143,14 +143,14 @@ public NtfySender(String topicName, HttpClient httpClient, NtfyConnectionHandler
                 return GsonDeserializer.deserialize(response.getContentAsString(), MessageEvent.class);
             }
         } catch (IOException e) {
-            logger.error("Failed to read file for upload: {}", e.getMessage());
+            logger.warn("Failed to read file for upload: {}", e.getMessage());
             return null;
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
-            logger.error("Failed to send message: {}", e.getMessage());
+            logger.debug("Failed to send message: {}", e.getMessage());
             bridgeHandler.connectionError(e);
         } catch (TimeoutException | ExecutionException e) {
-            logger.error("Failed to send file: {}", e.getMessage());
+            logger.warn("Failed to send file: {}", e.getMessage());
             bridgeHandler.connectionError(e);
         }
         return null;
@@ -180,10 +180,10 @@ public boolean deleteMessage(String sequenceId) throws URISyntaxException {
             return HttpStatus.isSuccess(request.send().getStatus());
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
-            logger.error("Failed to delete message: {}", e.getMessage());
+            logger.warn("Failed to delete message: {}", e.getMessage());
             bridgeHandler.connectionError(e);
         } catch (TimeoutException | ExecutionException e) {
-            logger.error("Failed to delete message: {}", e.getMessage());
+            logger.warn("Failed to delete message: {}", e.getMessage());
             bridgeHandler.connectionError(e);
         }
         return false;

bundles/org.openhab.binding.ntfy/src/main/resources/OH-INF/i18n/ntfy.properties

@@ -12,7 +12,7 @@ thing-type.ntfy.server.description = Connection to an ntfy server
 
 # thing types config
 
-thing-type.config.ntfy.ntfy-topic.topicName.label = Topic name
+thing-type.config.ntfy.ntfy-topic.topicName.label = Topic Name
 thing-type.config.ntfy.ntfy-topic.topicName.description = Name of the topic
 thing-type.config.ntfy.server.connectionTimeout.label = Connection timeout
 thing-type.config.ntfy.server.connectionTimeout.description = Connection timeout for web requests and web socket connections in milliseconds
@@ -28,3 +28,8 @@ thing-type.config.ntfy.server.username.description = Username to access the serv
 channel-type.ntfy.last-message-id.label = Message Id of the last message
 channel-type.ntfy.last-message-time.label = Time of the last message
 channel-type.ntfy.last-message.label = Last Message
+
+# thing status descriptions
+
+offline.communication-error.unsupported-schema = "URI scheme is missing in hostname or unsupported URI scheme (only http or https are supported): {0}"
+offline.communication-error.websocket-connection-lost = "WebSocket connection lost"

bundles/org.openhab.binding.ntfy/src/main/resources/OH-INF/thing/thing-types.xml

@@ -8,6 +8,7 @@
 
 		<label>Ntfy Connection</label>
 		<description>Connection to an ntfy server</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 		<representation-property>hostname</representation-property>
 
 		<config-description>
@@ -27,11 +28,12 @@
 				<label>Password</label>
 				<description>Password to access the server</description>
 			</parameter>
-			<parameter name="connectionTimeout" type="integer" required="false">
+			<parameter name="connectionTimeout" type="integer" required="true">
 				<context>time</context>
 				<label>Connection timeout</label>
 				<description>Connection timeout for web requests and web socket connections in milliseconds</description>
 				<advanced>true</advanced>
+				<default>60000</default>
 			</parameter>
 		</config-description>
 	</bridge-type>
@@ -42,7 +44,7 @@
 		</supported-bridge-type-refs>
 		<label>Ntfy Topic</label>
 		<description>Topic of a ntfy server</description>
-
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 		<channels>
 			<channel id="last-message" typeId="last-message"/>
 			<channel id="last-message-time" typeId="last-message-time"/>
@@ -54,7 +56,7 @@
 		<config-description>
 			<parameter name="topicName" type="text" required="true">
 				<context>topicName</context>
-				<label>Topic name</label>
+				<label>Topic Name</label>
 				<description>Name of the topic</description>
 			</parameter>
 		</config-description>