From: AsamK Date: Fri, 15 Dec 2023 16:32:30 +0000 (+0100) Subject: Fix inspection issues X-Git-Tag: v0.13.0~62 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/caa4fa0180a84cca10a1b363d25147d03ccb0387?ds=sidebyside Fix inspection issues --- diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java index 80eb4c06..2af6337f 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java @@ -220,7 +220,7 @@ public class SendHelper { (messageSender, address, unidentifiedAccess) -> messageSender.sendTyping(List.of(address), List.of(unidentifiedAccess), message, - null).get(0)); + null).getFirst()); handleSendMessageResult(result); return result; } diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java index fa1eef11..1eed964d 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java @@ -302,7 +302,7 @@ public class StorageHelper { logger.warn("Failed to read storage records, ignoring."); return null; } - return !records.isEmpty() ? records.get(0) : null; + return !records.isEmpty() ? records.getFirst() : null; } private List getSignalStorageRecords(final Collection storageIds) throws IOException { diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java index cfa54cde..e87550b1 100644 --- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java @@ -1291,7 +1291,7 @@ public class ManagerImpl implements Manager { r -> context.getIdentityHelper().trustIdentityVerifiedSafetyNumber(r, safetyNumber.safetyNumber())); case IdentityVerificationCode.ScannableSafetyNumber safetyNumber -> trustIdentity(recipient, r -> context.getIdentityHelper().trustIdentityVerifiedSafetyNumber(r, safetyNumber.safetyNumber())); - case null, default -> throw new AssertionError("Invalid verification code type"); + case null -> throw new AssertionError("Invalid verification code type"); }; } diff --git a/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java b/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java index f8a65e7e..4f320ad8 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java +++ b/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java @@ -94,7 +94,7 @@ public class DbusCommandHandler { "Multiple users found, you need to specify an account (phone number) with -a"); } - return accounts.get(0).getPath(); + return accounts.getFirst().getPath(); } catch (UnknownMethod e) { // dbus daemon not running in multi-account mode return null; diff --git a/src/main/java/org/asamk/signal/dbus/DbusProperties.java b/src/main/java/org/asamk/signal/dbus/DbusProperties.java index a77ed164..419a034b 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusProperties.java +++ b/src/main/java/org/asamk/signal/dbus/DbusProperties.java @@ -52,7 +52,6 @@ public abstract class DbusProperties implements Properties { } @Override - @SuppressWarnings("unchecked") public Map> GetAll(final String interface_name) { final var handler = getHandlerOptional(interface_name); if (handler.isEmpty()) { diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java index 2921533e..6e394eb4 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java @@ -668,7 +668,7 @@ public class DbusSignalImpl implements Signal, AutoCloseable { @Override public boolean isRegistered(String number) { var result = isRegistered(List.of(number)); - return result.get(0); + return result.getFirst(); } @Override diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcMessage.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcMessage.java index 8d1fcbf7..e0acdcf1 100644 --- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcMessage.java +++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcMessage.java @@ -2,8 +2,6 @@ package org.asamk.signal.jsonrpc; /** * Represents a JSON-RPC (batch) request or (batch) response. - * https://www.jsonrpc.org/specification + * https://www.jsonrpc.org/specification */ -public sealed abstract class JsonRpcMessage permits JsonRpcBatchMessage, JsonRpcRequest, JsonRpcResponse { - -} +public sealed abstract class JsonRpcMessage permits JsonRpcBatchMessage, JsonRpcRequest, JsonRpcResponse {} diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java index 8e7535ec..e90d740c 100644 --- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java +++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.node.ValueNode; /** * Represents a JSON-RPC request. - * https://www.jsonrpc.org/specification#request_object + * https://www.jsonrpc.org/specification#request_object */ public final class JsonRpcRequest extends JsonRpcMessage { diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcResponse.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcResponse.java index 406212d8..9cc2e965 100644 --- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcResponse.java +++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcResponse.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.node.ValueNode; /** * Represents a JSON-RPC response. - * https://www.jsonrpc.org/specification#response_object + * https://www.jsonrpc.org/specification#response_object */ public final class JsonRpcResponse extends JsonRpcMessage { diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java index 3d470820..3609163c 100644 --- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java +++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java @@ -94,7 +94,7 @@ public class SignalJsonRpcCommandHandler { if (manager == null) { final var managers = c.getManagers(); if (managers.size() == 1) { - manager = managers.get(0); + manager = managers.getFirst(); } } if (manager != null) { diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java index 00abb635..c8b4bc15 100644 --- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java +++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java @@ -126,7 +126,7 @@ public class SignalJsonRpcDispatcherHandler { private void unsubscribeReceive(final Manager m) { final var subscriptionId = receiveHandlers.entrySet() .stream() - .filter(e -> e.getValue().size() == 1 && e.getValue().get(0).first().equals(m)) + .filter(e -> e.getValue().size() == 1 && e.getValue().getFirst().first().equals(m)) .map(Map.Entry::getKey) .findFirst(); subscriptionId.ifPresent(this::unsubscribeReceive); diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java index 4685249c..94996ee3 100644 --- a/src/main/java/org/asamk/signal/util/Util.java +++ b/src/main/java/org/asamk/signal/util/Util.java @@ -42,7 +42,7 @@ public class Util { if (strings.isEmpty()) { return ""; } - return strings.get(0) + strings.stream() + return strings.getFirst() + strings.stream() .skip(1) .filter(s -> !s.isEmpty()) .map(s -> Character.toUpperCase(s.charAt(0)) + s.substring(1).toLowerCase(Locale.ROOT))