Skip to content

Commit 7ca628e

Browse files
Fix SAT warnings (openhab#5170)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent de78550 commit 7ca628e

4 files changed

Lines changed: 4 additions & 7 deletions

File tree

bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public String getRuleUID() {
145145
*
146146
* @return the type identifier
147147
*/
148-
abstract public String getTypeId();
148+
public abstract String getTypeId();
149149

150150
/**
151151
* Gets the script engine identifier for this module

bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ ItemSemanticsProblem getItemTagProblems(Item item, @Nullable Class<? extends Tag
289289
* @return true if the semantics are valid, false otherwise
290290
*/
291291
boolean checkSemantics(Item item) {
292-
return getItemSemanticsProblems(item, true).size() == 0 ? true : false;
292+
return getItemSemanticsProblems(item, true).isEmpty();
293293
}
294294

295295
@Override

bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/thing/channel-types.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</description>
3434
<category>ColorLight</category>
3535
<tags>
36-
<tag>Lighting</tag>
36+
<tag>Light</tag>
3737
</tags>
3838
<autoUpdatePolicy>recommend</autoUpdatePolicy>
3939
<config-description>

bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarker.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,7 @@ public boolean equals(@Nullable Object obj) {
7575
if (!identifier.equals(other.identifier)) {
7676
return false;
7777
}
78-
if (!type.equals(other.type)) {
79-
return false;
80-
}
81-
return true;
78+
return type.equals(other.type);
8279
}
8380

8481
@Override

0 commit comments

Comments
 (0)