forked from openhab/openhab-core
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix SAT errors/warnings in resources and tests (openhab#1178)
Fixes SAT errors/warnings in resources and tests reported by SAT 0.8.0-SNAPSHOT. Related to openhab/static-code-analysis#363 Signed-off-by: Wouter Born <github@maindrain.net>
- Loading branch information
Showing
64 changed files
with
1,154 additions
and
1,150 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
136 changes: 68 additions & 68 deletions
136
...t.rulesupport/src/main/resources/ESH-INF/automation/moduletypes/PrivateScriptedTypes.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,69 +1,69 @@ | ||
| { | ||
| "conditions":[ | ||
| { | ||
| "uid":"jsr223.ScriptedCondition", | ||
| "label":"Scripted condition", | ||
| "description":"allows the definition of a condition by a script", | ||
| "visibility": "EXPERT", | ||
| "configDescriptions":[ | ||
| { | ||
| "name":"privId", | ||
| "type":"TEXT", | ||
| "description":"the identifier of the private method", | ||
| "required":true | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "actions":[ | ||
| { | ||
| "uid":"jsr223.ScriptedAction", | ||
| "label":"Scripted action", | ||
| "description":"allows the execution of a method defined by a script", | ||
| "visibility": "EXPERT", | ||
| "configDescriptions":[ | ||
| { | ||
| "name":"privId", | ||
| "type":"TEXT", | ||
| "description":"the identifier of the private method", | ||
| "required":true | ||
| } | ||
| ], | ||
| "outputs":[ | ||
| { | ||
| "name":"result", | ||
| "type":"java.lang.Object", | ||
| "label":"result", | ||
| "description":"the script result.", | ||
| "reference":"" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "triggers": [ | ||
| { | ||
| "uid":"jsr223.ScriptedTrigger", | ||
| "label":"Scripted trigger", | ||
| "description":"allows the execution of a method defined by a script", | ||
| "visibility": "EXPERT", | ||
| "configDescriptions":[ | ||
| { | ||
| "name":"privId", | ||
| "type":"TEXT", | ||
| "description":"the identifier of the private method", | ||
| "required":true | ||
| } | ||
| ], | ||
| "outputs":[ | ||
| { | ||
| "name":"triggerOutput", | ||
| "type":"java.lang.String", | ||
| "label":"TriggerOutput label", | ||
| "description":"Text from the trigger", | ||
| "reference":"consoleInput", | ||
| "defaultValue":"dtag" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| { | ||
| "conditions": [ | ||
| { | ||
| "uid": "jsr223.ScriptedCondition", | ||
| "label": "Scripted condition", | ||
| "description": "allows the definition of a condition by a script", | ||
| "visibility": "EXPERT", | ||
| "configDescriptions": [ | ||
| { | ||
| "name": "privId", | ||
| "type": "TEXT", | ||
| "description": "the identifier of the private method", | ||
| "required": true | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "actions": [ | ||
| { | ||
| "uid": "jsr223.ScriptedAction", | ||
| "label": "Scripted action", | ||
| "description": "allows the execution of a method defined by a script", | ||
| "visibility": "EXPERT", | ||
| "configDescriptions": [ | ||
| { | ||
| "name": "privId", | ||
| "type": "TEXT", | ||
| "description": "the identifier of the private method", | ||
| "required": true | ||
| } | ||
| ], | ||
| "outputs": [ | ||
| { | ||
| "name": "result", | ||
| "type": "java.lang.Object", | ||
| "label": "result", | ||
| "description": "the script result.", | ||
| "reference": "" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "triggers": [ | ||
| { | ||
| "uid": "jsr223.ScriptedTrigger", | ||
| "label": "Scripted trigger", | ||
| "description": "allows the execution of a method defined by a script", | ||
| "visibility": "EXPERT", | ||
| "configDescriptions": [ | ||
| { | ||
| "name": "privId", | ||
| "type": "TEXT", | ||
| "description": "the identifier of the private method", | ||
| "required": true | ||
| } | ||
| ], | ||
| "outputs": [ | ||
| { | ||
| "name": "triggerOutput", | ||
| "type": "java.lang.String", | ||
| "label": "TriggerOutput label", | ||
| "description": "Text from the trigger", | ||
| "reference": "consoleInput", | ||
| "defaultValue": "dtag" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
78 changes: 39 additions & 39 deletions
78
...hab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ChannelTrigger.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,41 @@ | ||
| { | ||
| "triggers":[ | ||
| { | ||
| "uid":"core.ChannelEventTrigger", | ||
| "label":"a trigger channel fires", | ||
| "description":"React on events from a trigger channel of a thing.", | ||
| "configDescriptions":[ | ||
| { | ||
| "name":"channelUID", | ||
| "type":"TEXT", | ||
| "context":"channel", | ||
| "label":"Channel", | ||
| "description":"the id of the channel which should be observed for triggers", | ||
| "required":true, | ||
| "filterCriteria":[ | ||
| { | ||
| "value": "TRIGGER", | ||
| "name": "kind" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "name":"event", | ||
| "type":"TEXT", | ||
| "label":"Event", | ||
| "description":"the event on the channel to react on", | ||
| "required":false | ||
| } | ||
| ], | ||
| "outputs":[ | ||
| { | ||
| "name":"event", | ||
| "type":"org.eclipse.smarthome.core.events.Event", | ||
| "description":"the event of the channel trigger", | ||
| "label":"Event", | ||
| "reference":"channelEventTriggerId.event" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| "triggers": [ | ||
| { | ||
| "uid": "core.ChannelEventTrigger", | ||
| "label": "a trigger channel fires", | ||
| "description": "React on events from a trigger channel of a thing.", | ||
| "configDescriptions": [ | ||
| { | ||
| "name": "channelUID", | ||
| "type": "TEXT", | ||
| "context": "channel", | ||
| "label": "Channel", | ||
| "description": "the id of the channel which should be observed for triggers", | ||
| "required": true, | ||
| "filterCriteria": [ | ||
| { | ||
| "value": "TRIGGER", | ||
| "name": "kind" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "name": "event", | ||
| "type": "TEXT", | ||
| "label": "Event", | ||
| "description": "the event on the channel to react on", | ||
| "required": false | ||
| } | ||
| ], | ||
| "outputs": [ | ||
| { | ||
| "name": "event", | ||
| "type": "org.eclipse.smarthome.core.events.Event", | ||
| "description": "the event of the channel trigger", | ||
| "label": "Event", | ||
| "reference": "channelEventTriggerId.event" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
36 changes: 18 additions & 18 deletions
36
...core.automation/src/main/resources/ESH-INF/automation/moduletypes/GenericCronTrigger.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,19 @@ | ||
| { | ||
| "triggers":[ | ||
| { | ||
| "uid":"timer.GenericCronTrigger", | ||
| "label":"Cron Trigger", | ||
| "description":"This triggers a rule based on a cron expression", | ||
| "configDescriptions":[ | ||
| { | ||
| "name":"cronExpression", | ||
| "type":"TEXT", | ||
| "context":"cronexpression", | ||
| "label":"cron expression", | ||
| "description":"the cron expression", | ||
| "required":true | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| { | ||
| "triggers": [ | ||
| { | ||
| "uid": "timer.GenericCronTrigger", | ||
| "label": "Cron Trigger", | ||
| "description": "This triggers a rule based on a cron expression", | ||
| "configDescriptions": [ | ||
| { | ||
| "name": "cronExpression", | ||
| "type": "TEXT", | ||
| "context": "cronexpression", | ||
| "label": "cron expression", | ||
| "description": "the cron expression", | ||
| "required": true | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
86 changes: 43 additions & 43 deletions
86
...ab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/GenericTriggers.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,45 @@ | ||
| { | ||
| "triggers":[ | ||
| { | ||
| "uid":"core.GenericEventTrigger", | ||
| "label":"Basic Event Trigger", | ||
| "description":"Triggers Rules on Events", | ||
| "visibility":"HIDDEN", | ||
| "configDescriptions":[ | ||
| { | ||
| "name":"eventTopic", | ||
| "type":"TEXT", | ||
| "label":"Topic", | ||
| "description":"This is the topic, the trigger will listen to: >>smarthome/*<<", | ||
| "required":true, | ||
| "default":"smarthome/*" | ||
| }, | ||
| { | ||
| "name":"eventSource", | ||
| "type":"TEXT", | ||
| "label":"Source", | ||
| "description":"This is the source of the event (eg. item name)", | ||
| "required":true, | ||
| "default":"" | ||
| }, | ||
| { | ||
| "name":"eventTypes", | ||
| "type":"TEXT", | ||
| "label":"Event Type", | ||
| "description":"the event type, the trigger should listen to. Multiple types can be specified comma-separated", | ||
| "required":true, | ||
| "default":"" | ||
| } | ||
| ], | ||
| "outputs":[ | ||
| { | ||
| "name":"event", | ||
| "type":"org.eclipse.smarthome.core.events.Event", | ||
| "label":"Event", | ||
| "description":"The events which was sent.", | ||
| "reference":"event" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| "triggers": [ | ||
| { | ||
| "uid": "core.GenericEventTrigger", | ||
| "label": "Basic Event Trigger", | ||
| "description": "Triggers Rules on Events", | ||
| "visibility": "HIDDEN", | ||
| "configDescriptions": [ | ||
| { | ||
| "name": "eventTopic", | ||
| "type": "TEXT", | ||
| "label": "Topic", | ||
| "description": "This is the topic, the trigger will listen to: >>smarthome/*<<", | ||
| "required": true, | ||
| "default": "smarthome/*" | ||
| }, | ||
| { | ||
| "name": "eventSource", | ||
| "type": "TEXT", | ||
| "label": "Source", | ||
| "description": "This is the source of the event (eg. item name)", | ||
| "required": true, | ||
| "default": "" | ||
| }, | ||
| { | ||
| "name": "eventTypes", | ||
| "type": "TEXT", | ||
| "label": "Event Type", | ||
| "description": "the event type, the trigger should listen to. Multiple types can be specified comma-separated", | ||
| "required": true, | ||
| "default": "" | ||
| } | ||
| ], | ||
| "outputs": [ | ||
| { | ||
| "name": "event", | ||
| "type": "org.eclipse.smarthome.core.events.Event", | ||
| "label": "Event", | ||
| "description": "The events which was sent.", | ||
| "reference": "event" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.