Skip to content

Commit a625d84

Browse files
SAT: Reduce warnings, add suppressions (#4863)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent ff2e108 commit a625d84

3 files changed

Lines changed: 13 additions & 6 deletions

File tree

bundles/org.openhab.core.automation.module.script.providersupport/src/main/java/org/openhab/core/automation/module/script/providersupport/shared/ScriptedMetadataProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* This {@link org.openhab.core.items.MetadataProvider} keeps metadata provided by scripts during runtime.
3333
* This ensures that metadata is not kept on reboot, but has to be provided by the scripts again.
3434
*
35-
* @author Florian Hotze
35+
* @author Florian Hotze - Initial contribution
3636
*/
3737
@NonNullByDefault
3838
@Component(immediate = true, service = { ScriptedMetadataProvider.class, MetadataProvider.class })

tools/i18n-plugin/src/main/java/org/openhab/core/tools/i18n/plugin/XmlToTranslationsConverter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ private Stream<TranslationsGroup> translateConfigDescription(ConfigDescription c
9797

9898
private Stream<TranslationsGroup> translateConfigDescription(ConfigDescription configDescription,
9999
@Nullable String configKeyPrefix) {
100-
String UID = configDescription.getUID().toString();
101-
if (processedURIs.contains(UID)) {
100+
String uid = configDescription.getUID().toString();
101+
if (processedURIs.contains(uid)) {
102102
return Stream.empty();
103103
}
104-
processedURIs.add(UID);
104+
processedURIs.add(uid);
105105
String keyPrefix = configKeyPrefix != null ? configKeyPrefix
106-
: UID.replaceFirst(":", ".config.").replace(":", ".");
106+
: uid.replaceFirst(":", ".config.").replace(":", ".");
107107
Builder<TranslationsGroup> streamBuilder = Stream.builder();
108108
configDescriptionGroupParameters(keyPrefix, configDescription.getParameterGroups()).forEach(streamBuilder::add);
109109
configDescriptionParameters(keyPrefix, configDescription.getParameters()).forEach(streamBuilder::add);

tools/static-code-analysis/checkstyle/suppressions.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<suppress files=".+org.openhab.core.config.discovery.mdns.internal.MDNSDiscoveryService.java|.+org.openhab.core.config.discovery.upnp.internal.UpnpDiscoveryService.java|.+org.openhab.core.io.console.eclipse.internal.ConsoleSupportEclipse.java|.+org.openhab.core.io.console.rfc147.internal.CommandWrapper.java|.+org.openhab.core.library.unit.BinaryPrefix.java|.+org.openhab.core.library.unit.MetricPrefix.java" checks="MethodNameCheck"/>
2525

2626
<!--suppress local variable naming check to stay consistent with the usual convention when calculating xyY/RGB/HSB conversion -->
27-
<suppress files=".+org.openhab.core.util.ColorUtil.java" checks="LocalVariableNameCheck" />
27+
<suppress files=".+org.openhab.core.util.ColorUtil.java" checks="LocalVariableNameCheck|LocalFinalVariableNameCheck" />
2828

2929
<!-- Add suppression as discussed in https://github.com/openhab/static-code-analysis/issues/265 -->
3030
<suppress files=".+org.openhab.core.common.registry.AbstractRegistry.java" checks="DeclarativeServicesDependencyInjectionCheck"/>
@@ -33,4 +33,11 @@
3333
<suppress files=".+org.openhab.core.transform.AbstractFileTransformationService.java" checks="DeclarativeServicesDependencyInjectionCheck"/>
3434
<suppress files=".+org.openhab.core.automation.internal.commands.AbstractCommandProvider.java" checks="DeclarativeServicesDependencyInjectionCheck"/>
3535
<suppress files=".+org.openhab.core.automation.sample.rest.api.internal.Activator.java" checks="DeclarativeServicesDependencyInjectionCheck"/>
36+
37+
<!-- API: public interface introduced this way -->
38+
<suppress files=".+org.openhab.core.internal.library.unit.CurrencyService.java" checks="StaticVariableNameCheck"/>
39+
<suppress files=".+org.openhab.core.thing.ThingStatusDetail.java" checks="MemberNameCheck"/>
40+
<!-- technical reasons, causes other issues if changed -->
41+
<suppress files=".+org.openhab.core.tools.UpgradeTool.java" checks="AvoidStarImportCheck"/>
42+
<suppress files=".+org.openhab.core.auth.client.oauth2.OAuthClientService.java" checks="JavadocMethodStyleCheck"/>
3643
</suppressions>

0 commit comments

Comments
 (0)