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

[openhabcloud] Adds "configurationPid" to the CloudService component annotation #4991

Merged
merged 1 commit into from
Feb 25, 2019
Merged

[openhabcloud] Adds "configurationPid" to the CloudService component annotation #4991

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions ...nhab.io.openhabcloud/src/main/java/org/openhab/io/openhabcloud/internal/CloudService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,12 @@
* @author Victor Belov - Initial contribution
* @author Kai Kreuzer - migrated code to new Jetty client and ESH APIs
*/
@Component(immediate = true, service = { EventSubscriber.class, ActionService.class }, property = {
Constants.SERVICE_PID + "=org.openhab.openhabcloud",
ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=io:openhabcloud",
ConfigurableService.SERVICE_PROPERTY_LABEL + "=openHAB Cloud",
ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=io" })
@Component(immediate = true, service = { EventSubscriber.class,
ActionService.class }, configurationPid = "org.openhab.openhabcloud", property = {
Constants.SERVICE_PID + "=org.openhab.openhabcloud",
ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=io:openhabcloud",
ConfigurableService.SERVICE_PROPERTY_LABEL + "=openHAB Cloud",
ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=io" })
public class CloudService implements ActionService, CloudClientListener, EventSubscriber {

private static final String CFG_EXPOSE = "expose";
Expand All @@ -98,9 +99,9 @@ public CloudService() {
/**
* This method sends notification message to mobile app through the openHAB Cloud service
*
* @param userId the {@link String} containing the openHAB Cloud user id to send message to
* @param message the {@link String} containing a message to send to specified user id
* @param icon the {@link String} containing a name of the icon to be used with this notification
* @param userId the {@link String} containing the openHAB Cloud user id to send message to
* @param message the {@link String} containing a message to send to specified user id
* @param icon the {@link String} containing a name of the icon to be used with this notification
* @param severity the {@link String} containing severity (good, info, warning, error) of notification
*/
public void sendNotification(String userId, String message, String icon, String severity) {
Expand All @@ -112,8 +113,8 @@ public void sendNotification(String userId, String message, String icon, String
* Sends an advanced notification to log. Log notifications are not pushed to user
* devices but are shown to all account users in notifications log
*
* @param message the {@link String} containing a message to send to specified user id
* @param icon the {@link String} containing a name of the icon to be used with this notification
* @param message the {@link String} containing a message to send to specified user id
* @param icon the {@link String} containing a name of the icon to be used with this notification
* @param severity the {@link String} containing severity (good, info, warning, error) of notification
*/
public void sendLogNotification(String message, String icon, String severity) {
Expand All @@ -125,8 +126,8 @@ public void sendLogNotification(String message, String icon, String severity) {
* Sends a broadcast notification. Broadcast notifications are pushed to all
* mobile devices of all users of the account
*
* @param message the {@link String} containing a message to send to specified user id
* @param icon the {@link String} containing a name of the icon to be used with this notification
* @param message the {@link String} containing a message to send to specified user id
* @param icon the {@link String} containing a name of the icon to be used with this notification
* @param severity the {@link String} containing severity (good, info, warning, error) of notification
*/
public void sendBroadcastNotification(String message, String icon, String severity) {
Expand Down