demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix JavaDoc, SAT and depreacation warnings (#4598)

Browse Source 
* Fix SAT and depreacation warnings
* Fix JavaDoc build

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich
2025-02-16 11:37:22 +01:00
committed by GitHub
parent a94908c305
commit b90e87367d
10 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigParser.java
-1
View File
@@ -79,7 +79,6 @@ public final class ConfigParser {
@SuppressWarnings({ "rawtypes", "unchecked" })
public static <T> @Nullable T configurationAs(Map<String, @Nullable Object> properties,
Class<T> configurationClass) {
Constructor<T> constructor;
T configuration = null;
try {
bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigValidationExceptionTest.java
+2 -2
View File
@@ -43,8 +43,8 @@ public class ConfigValidationExceptionTest {
private static final String PARAM1 = "param1";
private static final String PARAM2 = "param2";
private static final Locale DE = new Locale("de");
private static final Locale EN = new Locale("en");
private static final Locale DE = Locale.GERMAN;
private static final Locale EN = Locale.ENGLISH;
private static final int MAX = 3;
private static final String TXT_DE1 = "German 1";
bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java
+2 -1
View File
@@ -106,6 +106,7 @@ import org.openhab.core.model.sitemap.sitemap.Widget;
import org.openhab.core.types.State;
import org.openhab.core.ui.items.ItemUIRegistry;
import org.openhab.core.ui.items.ItemUIRegistry.WidgetLabelSource;
import org.openhab.core.util.ColorUtil;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
@@ -745,7 +746,7 @@ public class SitemapResource
public static @Nullable String convertItemValueColor(@Nullable String color, @Nullable State itemState) {
if ("itemValue".equals(color)) {
if (itemState instanceof HSBType hsbState) {
return "#" + Integer.toHexString(hsbState.getRGB()).substring(2);
return "#" + Integer.toHexString(ColorUtil.hsbTosRgb(hsbState)).substring(2);
}
return null;
}
bundles/org.openhab.core.io.transport.modbus/src/main/java/org/openhab/core/io/transport/modbus/internal/ModbusPoolConfig.java
+4 -2
View File
@@ -12,6 +12,8 @@
*/
package org.openhab.core.io.transport.modbus.internal;
import java.time.Duration;
import org.apache.commons.pool2.impl.DefaultEvictionPolicy;
import org.apache.commons.pool2.impl.EvictionPolicy;
import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
@@ -51,7 +53,7 @@ public class ModbusPoolConfig extends GenericKeyedObjectPoolConfig<@Nullable Mod
setMaxTotalPerKey(1);
// block infinitely when exhausted
setMaxWaitMillis(-1);
setMaxWait(Duration.ofMillis(-1));
// Connections are "tested" on return. Effectively, disconnected connections are destroyed when returning on
// pool
@@ -65,7 +67,7 @@ public class ModbusPoolConfig extends GenericKeyedObjectPoolConfig<@Nullable Mod
// Evict idle connections every 10 seconds
setEvictionPolicy(new ModbusSlaveConnectionEvictionPolicy());
setTimeBetweenEvictionRunsMillis(10000);
setTimeBetweenEvictionRuns(Duration.ofMillis(10000));
// Let eviction re-create ready-to-use idle (=unconnected) connections
// This is to avoid occasional / rare deadlocks seen with pool 2.8.1 & 2.4.3 when
// borrow hangs (waiting indefinitely for idle object to appear in the pool)
bundles/org.openhab.core.io.websocket/src/main/java/org/openhab/core/io/websocket/log/LogWebSocket.java
+3 -3
View File
@@ -67,8 +67,8 @@ public class LogWebSocket implements LogListener {
private static final TypeToken<List<String>> STRING_LIST_TYPE = (TypeToken<List<String>>) TypeToken
.getParameterized(List.class, String.class);
private final static int SEND_PERIOD = 100; // Minimum allowable time between log packets (in milliseconds)
private final static long FIRST_SEQUENCE = 0;
private static final int SEND_PERIOD = 100; // Minimum allowable time between log packets (in milliseconds)
private static final long FIRST_SEQUENCE = 0;
private final Logger logger = LoggerFactory.getLogger(LogWebSocket.class);
@@ -116,7 +116,7 @@ public class LogWebSocket implements LogListener {
@OnWebSocketMessage
public void onText(String message) {
// Detect empty message (keepalive) and ignore
if (message.equals("{}")) {
if ("{}".equals(message)) {
return;
}
bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/extensions/PersistenceExtensions.java
+8 -8
View File
@@ -332,7 +332,7 @@ public class PersistenceExtensions {
/**
* Query the last historic update time of a given <code>item</code>. The default persistence service is used.
* Note the {@link Item.getLastStateUpdate()} is generally preferred to get the last update time of an item.
* Note the {@link Item#getLastStateUpdate()} is generally preferred to get the last update time of an item.
*
* @param item the item for which the last historic update time is to be returned
* @return point in time of the last historic update to <code>item</code>, <code>null</code> if there are no
@@ -345,7 +345,7 @@ public class PersistenceExtensions {
/**
* Query for the last historic update time of a given <code>item</code>.
* Note the {@link Item.getLastStateUpdate()} is generally preferred to get the last update time of an item.
* Note the {@link Item#getLastStateUpdate()} is generally preferred to get the last update time of an item.
*
* @param item the item for which the last historic update time is to be returned
* @param serviceId the name of the {@link PersistenceService} to use
@@ -389,7 +389,7 @@ public class PersistenceExtensions {
/**
* Query the last historic change time of a given <code>item</code>. The default persistence service is used.
* Note the {@link Item.getLastStateChange()} is generally preferred to get the last state change time of an item.
* Note the {@link Item#getLastStateChange()} is generally preferred to get the last state change time of an item.
*
* @param item the item for which the last historic change time is to be returned
* @return point in time of the last historic change to <code>item</code>, <code>null</code> if there are no
@@ -402,7 +402,7 @@ public class PersistenceExtensions {
/**
* Query for the last historic change time of a given <code>item</code>.
* Note the {@link Item.getLastStateChange()} is generally preferred to get the last state change time of an item.
* Note the {@link Item#getLastStateChange()} is generally preferred to get the last state change time of an item.
*
* @param item the item for which the last historic change time is to be returned
* @param serviceId the name of the {@link PersistenceService} to use
@@ -512,7 +512,7 @@ public class PersistenceExtensions {
/**
* Returns the previous state of a given <code>item</code>.
* Note the {@link Item.getLastState()} is generally preferred to get the previous state of an item.
* Note the {@link Item#getLastState()} is generally preferred to get the previous state of an item.
*
* @param item the item to get the previous state value for
* @return the previous state or <code>null</code> if no previous state could be found, or if the default
@@ -524,7 +524,7 @@ public class PersistenceExtensions {
/**
* Returns the previous state of a given <code>item</code>.
* Note the {@link Item.getLastState()} is generally preferred to get the previous state of an item.
* Note the {@link Item#getLastState()} is generally preferred to get the previous state of an item.
*
* @param item the item to get the previous state value for
* @param skipEqual if true, skips equal state values and searches the first state not equal the current state
@@ -538,7 +538,7 @@ public class PersistenceExtensions {
/**
* Returns the previous state of a given <code>item</code>.
* The {@link PersistenceService} identified by the <code>serviceId</code> is used.
* Note the {@link Item.getLastState()} is generally preferred to get the previous state of an item.
* Note the {@link Item#getLastState()} is generally preferred to get the previous state of an item.
*
* @param item the item to get the previous state value for
* @param serviceId the name of the {@link PersistenceService} to use
@@ -552,7 +552,7 @@ public class PersistenceExtensions {
/**
* Returns the previous state of a given <code>item</code>.
* The {@link PersistenceService} identified by the <code>serviceId</code> is used.
* Note the {@link Item.getLastState()} is generally preferred to get the previous state of an item.
* Note the {@link Item#getLastState()} is generally preferred to get the previous state of an item.
*
* @param item the item to get the previous state value for
* @param skipEqual if <code>true</code>, skips equal state values and searches the first state not equal the
bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/converter/ColorChannelHandler.java
+2 -1
View File
@@ -28,6 +28,7 @@ import org.openhab.core.thing.internal.binding.generic.converter.AbstractTransfo
import org.openhab.core.types.Command;
import org.openhab.core.types.State;
import org.openhab.core.types.UnDefType;
import org.openhab.core.util.ColorUtil;
/**
* The {@link ColorChannelHandler} implements {@link org.openhab.core.library.items.ColorItem} conversions
@@ -122,7 +123,7 @@ public class ColorChannelHandler extends AbstractTransformingChannelHandler {
private String hsbToString(HSBType state) {
switch (channelConfig.colorMode) {
case RGB:
PercentType[] rgb = state.toRGB();
PercentType[] rgb = ColorUtil.hsbToRgbPercent(state);
return String.format("%1$d,%2$d,%3$d", rgb[0].toBigDecimal().multiply(BYTE_FACTOR).intValue(),
rgb[1].toBigDecimal().multiply(BYTE_FACTOR).intValue(),
rgb[2].toBigDecimal().multiply(BYTE_FACTOR).intValue());
bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/actions/Transformation.java
+1 -3
View File
@@ -17,7 +17,6 @@ import org.eclipse.jdt.annotation.Nullable;
import org.openhab.core.transform.TransformationException;
import org.openhab.core.transform.TransformationHelper;
import org.openhab.core.transform.TransformationService;
import org.openhab.core.transform.internal.TransformationActivator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,8 +31,7 @@ public class Transformation {
private static @Nullable String trans(String type, String function, String value) throws TransformationException {
String result;
TransformationService service = TransformationHelper
.getTransformationService(TransformationActivator.getContext(), type);
TransformationService service = TransformationHelper.getTransformationService(type);
if (service != null) {
result = service.transform(function, value);
} else {
bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/AbstractInvocationHandler.java
+2 -2
View File
@@ -108,14 +108,14 @@ abstract class AbstractInvocationHandler<T> {
void handleDuplicate(Method method, DuplicateExecutionException e) {
Thread thread = Objects.requireNonNull(e.getCallable().getThread());
logger.debug(MSG_DUPLICATE, toString(method), target, toString(e.getCallable().getMethod()), thread.getName(),
thread.getId(), thread.getState().toString(), getStacktrace(thread));
thread.threadId(), thread.getState().toString(), getStacktrace(thread));
}
void handleTimeout(Method method, Invocation invocation) {
final Thread thread = invocation.getThread();
if (thread != null) {
logger.debug(MSG_TIMEOUT_R, timeout, toString(invocation.getInvocationStack()), thread.getName(),
thread.getId(), thread.getState().toString(), getStacktrace(thread));
thread.threadId(), thread.getState().toString(), getStacktrace(thread));
} else {
logger.debug(MSG_TIMEOUT_Q, timeout, toString(invocation.getInvocationStack()));
}
bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/QuantityTypeArithmeticGroupFunction.java
+1 -1
View File
@@ -146,7 +146,7 @@ public interface QuantityTypeArithmeticGroupFunction extends GroupFunction {
/**
* Calculates the sum of a set of item states whose value could be converted to the 'referenceUnit'.
*
* Uses the {@link QuanitityType.add()} method so the result is an incremental sum based on the 'referenceUnit'. As
* Uses the {@link QuantityType#add} method so the result is an incremental sum based on the 'referenceUnit'. As
* a general rule this class is instantiated with a 'referenceUnit' that is a "system unit" (which are zero based)
* so such incremental sum is in fact also an absolute sum. However the class COULD be instantiated with a "non-
* system unit" (e.g. °C, °F) in which case the result would be an incremental sum based on that unit.