From fc8b6d0fcbedd6a4c9ae394a0640e79690e28337 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sun, 14 Nov 2021 15:00:06 +0100 Subject: [PATCH] Clean up base package --- src/main/java/org/asamk/signal/App.java | 3 +++ .../java/org/asamk/signal/ReceiveMessageHandler.java | 1 + .../org/asamk/signal/commands/AddDeviceCommand.java | 2 +- .../java/org/asamk/signal/commands/BlockCommand.java | 2 +- .../java/org/asamk/signal/commands/DaemonCommand.java | 10 +++++----- .../org/asamk/signal/commands/FinishLinkCommand.java | 2 +- .../asamk/signal/commands/GetUserStatusCommand.java | 6 +++--- .../org/asamk/signal/commands/JoinGroupCommand.java | 6 +++--- .../signal/commands/JsonRpcDispatcherCommand.java | 4 ++-- .../org/asamk/signal/commands/JsonRpcLocalCommand.java | 2 +- .../org/asamk/signal/commands/JsonRpcMultiCommand.java | 2 +- .../signal/commands/JsonRpcMultiLocalCommand.java | 2 +- .../signal/commands/JsonRpcRegistrationCommand.java | 2 +- .../asamk/signal/commands/JsonRpcSingleCommand.java | 2 +- .../java/org/asamk/signal/commands/LinkCommand.java | 4 ++-- .../org/asamk/signal/commands/ListAccountsCommand.java | 6 +++--- .../org/asamk/signal/commands/ListContactsCommand.java | 6 +++--- .../org/asamk/signal/commands/ListDevicesCommand.java | 6 +++--- .../org/asamk/signal/commands/ListGroupsCommand.java | 6 +++--- .../asamk/signal/commands/ListIdentitiesCommand.java | 6 +++--- .../java/org/asamk/signal/commands/LocalCommand.java | 2 +- .../org/asamk/signal/commands/MultiLocalCommand.java | 2 +- .../org/asamk/signal/commands/ProvisioningCommand.java | 2 +- .../org/asamk/signal/commands/QuitGroupCommand.java | 6 +++--- .../java/org/asamk/signal/commands/ReceiveCommand.java | 8 ++++---- .../org/asamk/signal/commands/RegisterCommand.java | 2 +- .../org/asamk/signal/commands/RemoteDeleteCommand.java | 6 +++--- .../org/asamk/signal/commands/RemoveDeviceCommand.java | 2 +- .../org/asamk/signal/commands/RemovePinCommand.java | 2 +- .../java/org/asamk/signal/commands/SendCommand.java | 6 +++--- .../org/asamk/signal/commands/SendContactsCommand.java | 2 +- .../org/asamk/signal/commands/SendReactionCommand.java | 6 +++--- .../org/asamk/signal/commands/SendReceiptCommand.java | 6 +++--- .../asamk/signal/commands/SendSyncRequestCommand.java | 2 +- .../org/asamk/signal/commands/SendTypingCommand.java | 6 +++--- .../java/org/asamk/signal/commands/SetPinCommand.java | 2 +- .../org/asamk/signal/commands/StartLinkCommand.java | 2 +- .../commands/SubmitRateLimitChallengeCommand.java | 2 +- .../java/org/asamk/signal/commands/TrustCommand.java | 2 +- .../java/org/asamk/signal/commands/UnblockCommand.java | 2 +- .../org/asamk/signal/commands/UnregisterCommand.java | 2 +- .../asamk/signal/commands/UpdateAccountCommand.java | 2 +- .../signal/commands/UpdateConfigurationCommand.java | 2 +- .../asamk/signal/commands/UpdateContactCommand.java | 2 +- .../org/asamk/signal/commands/UpdateGroupCommand.java | 6 +++--- .../asamk/signal/commands/UpdateProfileCommand.java | 2 +- .../signal/commands/UploadStickerPackCommand.java | 6 +++--- .../java/org/asamk/signal/commands/VerifyCommand.java | 2 +- .../java/org/asamk/signal/commands/VersionCommand.java | 2 +- .../signal/{ => dbus}/DbusReceiveMessageHandler.java | 2 +- .../java/org/asamk/signal/dbus/DbusSignalImpl.java | 1 - .../signal/{ => json}/JsonReceiveMessageHandler.java | 5 ++--- .../java/org/asamk/signal/jsonrpc/JsonRpcSender.java | 2 +- .../signal/jsonrpc/SignalJsonRpcDispatcherHandler.java | 4 ++-- .../java/org/asamk/signal/{ => output}/JsonWriter.java | 2 +- .../org/asamk/signal/{ => output}/JsonWriterImpl.java | 2 +- .../org/asamk/signal/{ => output}/OutputWriter.java | 2 +- .../org/asamk/signal/{ => output}/PlainTextWriter.java | 2 +- .../asamk/signal/{ => output}/PlainTextWriterImpl.java | 2 +- src/main/java/org/asamk/signal/util/RandomUtils.java | 2 +- 60 files changed, 102 insertions(+), 100 deletions(-) rename src/main/java/org/asamk/signal/{ => dbus}/DbusReceiveMessageHandler.java (99%) rename src/main/java/org/asamk/signal/{ => json}/JsonReceiveMessageHandler.java (90%) rename src/main/java/org/asamk/signal/{ => output}/JsonWriter.java (73%) rename src/main/java/org/asamk/signal/{ => output}/JsonWriterImpl.java (96%) rename src/main/java/org/asamk/signal/{ => output}/OutputWriter.java (52%) rename src/main/java/org/asamk/signal/{ => output}/PlainTextWriter.java (91%) rename src/main/java/org/asamk/signal/{ => output}/PlainTextWriterImpl.java (98%) diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java index 0a8c7b41..e97f28d9 100644 --- a/src/main/java/org/asamk/signal/App.java +++ b/src/main/java/org/asamk/signal/App.java @@ -25,6 +25,9 @@ import org.asamk.signal.manager.RegistrationManager; import org.asamk.signal.manager.config.ServiceConfig; import org.asamk.signal.manager.config.ServiceEnvironment; import org.asamk.signal.manager.storage.identities.TrustNewIdentity; +import org.asamk.signal.output.JsonWriterImpl; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriterImpl; import org.asamk.signal.util.IOUtils; import org.freedesktop.dbus.connections.impl.DBusConnection; import org.freedesktop.dbus.exceptions.DBusException; diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java index c53e7583..b76817c3 100644 --- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java +++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java @@ -6,6 +6,7 @@ import org.asamk.signal.manager.api.MessageEnvelope; import org.asamk.signal.manager.api.RecipientIdentifier; import org.asamk.signal.manager.groups.GroupId; import org.asamk.signal.manager.storage.recipients.RecipientAddress; +import org.asamk.signal.output.PlainTextWriter; import org.asamk.signal.util.DateUtils; import org.slf4j.helpers.MessageFormatter; diff --git a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java index 86743452..24c4ea91 100644 --- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java +++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java @@ -3,12 +3,12 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.api.InvalidDeviceLinkException; +import org.asamk.signal.output.OutputWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/asamk/signal/commands/BlockCommand.java b/src/main/java/org/asamk/signal/commands/BlockCommand.java index 1ec1036c..069ed84b 100644 --- a/src/main/java/org/asamk/signal/commands/BlockCommand.java +++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java @@ -3,13 +3,13 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.UnexpectedErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.NotMasterDeviceException; import org.asamk.signal.manager.groups.GroupNotFoundException; +import org.asamk.signal.output.OutputWriter; import org.asamk.signal.util.CommandUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java index 726cf268..1e5bdca1 100644 --- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java +++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java @@ -5,21 +5,21 @@ import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; import org.asamk.signal.DbusConfig; -import org.asamk.signal.JsonReceiveMessageHandler; -import org.asamk.signal.JsonWriter; -import org.asamk.signal.JsonWriterImpl; import org.asamk.signal.OutputType; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.ReceiveMessageHandler; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.commands.exceptions.UnexpectedErrorException; import org.asamk.signal.dbus.DbusSignalControlImpl; import org.asamk.signal.dbus.DbusSignalImpl; +import org.asamk.signal.json.JsonReceiveMessageHandler; import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.MultiAccountManager; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.JsonWriterImpl; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import org.asamk.signal.util.IOUtils; import org.freedesktop.dbus.connections.impl.DBusConnection; import org.freedesktop.dbus.exceptions.DBusException; diff --git a/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java b/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java index 40c241a2..ce0de000 100644 --- a/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java +++ b/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java @@ -2,12 +2,12 @@ package org.asamk.signal.commands; import com.fasterxml.jackson.core.type.TypeReference; -import org.asamk.signal.JsonWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.MultiAccountManager; import org.asamk.signal.manager.UserAlreadyExists; +import org.asamk.signal.output.JsonWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java index dc444934..97e4af34 100644 --- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java +++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java @@ -3,13 +3,13 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonWriter; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.api.Pair; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java index 5feb7c1b..e04fca06 100644 --- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java +++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java @@ -3,9 +3,6 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonWriter; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.commands.exceptions.UnexpectedErrorException; @@ -13,6 +10,9 @@ import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.api.InactiveGroupLinkException; import org.asamk.signal.manager.groups.GroupInviteLinkUrl; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import org.freedesktop.dbus.exceptions.DBusExecutionException; import java.io.IOException; diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java index f5a4d011..8eafa5df 100644 --- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java +++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java @@ -4,12 +4,12 @@ import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonWriter; import org.asamk.signal.OutputType; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler; import org.asamk.signal.manager.Manager; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; import org.asamk.signal.util.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java index 5baadf52..d87b97cd 100644 --- a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java +++ b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java @@ -4,10 +4,10 @@ import com.fasterxml.jackson.core.type.TypeReference; import net.sourceforge.argparse4j.inf.Namespace; -import org.asamk.signal.JsonWriter; import org.asamk.signal.OutputType; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.manager.Manager; +import org.asamk.signal.output.JsonWriter; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcMultiCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcMultiCommand.java index 5ac5e4df..c6c68a4f 100644 --- a/src/main/java/org/asamk/signal/commands/JsonRpcMultiCommand.java +++ b/src/main/java/org/asamk/signal/commands/JsonRpcMultiCommand.java @@ -1,8 +1,8 @@ package org.asamk.signal.commands; -import org.asamk.signal.JsonWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.manager.MultiAccountManager; +import org.asamk.signal.output.JsonWriter; public interface JsonRpcMultiCommand extends JsonRpcCommand { diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java index 57bbe801..6082f6c5 100644 --- a/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java +++ b/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java @@ -4,10 +4,10 @@ import com.fasterxml.jackson.core.type.TypeReference; import net.sourceforge.argparse4j.inf.Namespace; -import org.asamk.signal.JsonWriter; import org.asamk.signal.OutputType; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.manager.MultiAccountManager; +import org.asamk.signal.output.JsonWriter; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcRegistrationCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcRegistrationCommand.java index c68fe9d0..d0bfa5ba 100644 --- a/src/main/java/org/asamk/signal/commands/JsonRpcRegistrationCommand.java +++ b/src/main/java/org/asamk/signal/commands/JsonRpcRegistrationCommand.java @@ -1,8 +1,8 @@ package org.asamk.signal.commands; -import org.asamk.signal.JsonWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.manager.RegistrationManager; +import org.asamk.signal.output.JsonWriter; public interface JsonRpcRegistrationCommand extends JsonRpcCommand { diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcSingleCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcSingleCommand.java index 05ca6932..1ab2150d 100644 --- a/src/main/java/org/asamk/signal/commands/JsonRpcSingleCommand.java +++ b/src/main/java/org/asamk/signal/commands/JsonRpcSingleCommand.java @@ -1,8 +1,8 @@ package org.asamk.signal.commands; -import org.asamk.signal.JsonWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.manager.Manager; +import org.asamk.signal.output.JsonWriter; public interface JsonRpcSingleCommand extends JsonRpcCommand { diff --git a/src/main/java/org/asamk/signal/commands/LinkCommand.java b/src/main/java/org/asamk/signal/commands/LinkCommand.java index c8830db2..c216c63a 100644 --- a/src/main/java/org/asamk/signal/commands/LinkCommand.java +++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java @@ -3,13 +3,13 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.ProvisioningManager; import org.asamk.signal.manager.UserAlreadyExists; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java b/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java index 4ad8fc2d..ad4e1f81 100644 --- a/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java +++ b/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java @@ -3,11 +3,11 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonWriter; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.manager.MultiAccountManager; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import java.util.stream.Collectors; diff --git a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java index b87cba7e..98c21141 100644 --- a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java +++ b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java @@ -3,10 +3,10 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonWriter; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.manager.Manager; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import java.util.UUID; import java.util.stream.Collectors; diff --git a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java index 6db929b0..877096e2 100644 --- a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java +++ b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java @@ -3,13 +3,13 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonWriter; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.api.Device; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import org.asamk.signal.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java index ef5fd452..8326125f 100644 --- a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java +++ b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java @@ -4,13 +4,13 @@ import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonWriter; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.api.Group; import org.asamk.signal.manager.storage.recipients.RecipientAddress; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java index 04a2f2bd..04cc00a0 100644 --- a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java +++ b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java @@ -3,12 +3,12 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonWriter; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.api.Identity; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import org.asamk.signal.util.CommandUtil; import org.asamk.signal.util.Hex; import org.asamk.signal.util.Util; diff --git a/src/main/java/org/asamk/signal/commands/LocalCommand.java b/src/main/java/org/asamk/signal/commands/LocalCommand.java index b0e9906b..45079d59 100644 --- a/src/main/java/org/asamk/signal/commands/LocalCommand.java +++ b/src/main/java/org/asamk/signal/commands/LocalCommand.java @@ -2,9 +2,9 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.manager.Manager; +import org.asamk.signal.output.OutputWriter; public interface LocalCommand extends CliCommand { diff --git a/src/main/java/org/asamk/signal/commands/MultiLocalCommand.java b/src/main/java/org/asamk/signal/commands/MultiLocalCommand.java index da37c7a7..add996eb 100644 --- a/src/main/java/org/asamk/signal/commands/MultiLocalCommand.java +++ b/src/main/java/org/asamk/signal/commands/MultiLocalCommand.java @@ -2,9 +2,9 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.manager.MultiAccountManager; +import org.asamk.signal.output.OutputWriter; public interface MultiLocalCommand extends CliCommand { diff --git a/src/main/java/org/asamk/signal/commands/ProvisioningCommand.java b/src/main/java/org/asamk/signal/commands/ProvisioningCommand.java index df68de59..6fd2825e 100644 --- a/src/main/java/org/asamk/signal/commands/ProvisioningCommand.java +++ b/src/main/java/org/asamk/signal/commands/ProvisioningCommand.java @@ -2,9 +2,9 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.manager.ProvisioningManager; +import org.asamk.signal.output.OutputWriter; public interface ProvisioningCommand extends CliCommand { diff --git a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java index 25647e4e..801a2640 100644 --- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java +++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java @@ -4,9 +4,6 @@ import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonWriter; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; @@ -14,6 +11,9 @@ import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.groups.GroupNotFoundException; import org.asamk.signal.manager.groups.LastGroupAdminException; import org.asamk.signal.manager.groups.NotAGroupMemberException; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import org.asamk.signal.util.CommandUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java index d3d9e8a6..0a38ad4e 100644 --- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java +++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java @@ -4,15 +4,15 @@ import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonReceiveMessageHandler; -import org.asamk.signal.JsonWriter; import org.asamk.signal.OutputType; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.ReceiveMessageHandler; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; +import org.asamk.signal.json.JsonReceiveMessageHandler; import org.asamk.signal.manager.Manager; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java index afb4ee11..d0bc6f1b 100644 --- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java +++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java @@ -6,13 +6,13 @@ import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonWriter; import org.asamk.signal.OutputType; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.RegistrationManager; import org.asamk.signal.manager.api.CaptchaRequiredException; +import org.asamk.signal.output.JsonWriter; import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java index 2b9ebe91..54a8d6fb 100644 --- a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java +++ b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java @@ -4,9 +4,6 @@ import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonWriter; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.UnexpectedErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; @@ -14,6 +11,9 @@ import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.groups.GroupNotFoundException; import org.asamk.signal.manager.groups.GroupSendingNotAllowedException; import org.asamk.signal.manager.groups.NotAGroupMemberException; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import org.asamk.signal.util.CommandUtil; import org.asamk.signal.util.ErrorUtils; diff --git a/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java b/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java index 4fcad79d..f2012e77 100644 --- a/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java +++ b/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java @@ -3,10 +3,10 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.manager.Manager; +import org.asamk.signal.output.OutputWriter; import java.io.IOException; diff --git a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java index d173ee63..58b6b80f 100644 --- a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java +++ b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java @@ -3,10 +3,10 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.manager.Manager; +import org.asamk.signal.output.OutputWriter; import java.io.IOException; import java.util.Optional; diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java index a7d29b17..9af95e6b 100644 --- a/src/main/java/org/asamk/signal/commands/SendCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendCommand.java @@ -4,9 +4,6 @@ import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonWriter; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.UnexpectedErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; @@ -17,6 +14,9 @@ import org.asamk.signal.manager.api.RecipientIdentifier; import org.asamk.signal.manager.groups.GroupNotFoundException; import org.asamk.signal.manager.groups.GroupSendingNotAllowedException; import org.asamk.signal.manager.groups.NotAGroupMemberException; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import org.asamk.signal.util.CommandUtil; import org.asamk.signal.util.ErrorUtils; import org.asamk.signal.util.IOUtils; diff --git a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java index 1cc59bff..a5128937 100644 --- a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java @@ -3,10 +3,10 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.manager.Manager; +import org.asamk.signal.output.OutputWriter; import java.io.IOException; diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java index 3992dc55..d6275726 100644 --- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java @@ -4,9 +4,6 @@ import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonWriter; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.UnexpectedErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; @@ -14,6 +11,9 @@ import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.groups.GroupNotFoundException; import org.asamk.signal.manager.groups.GroupSendingNotAllowedException; import org.asamk.signal.manager.groups.NotAGroupMemberException; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import org.asamk.signal.util.CommandUtil; import org.asamk.signal.util.ErrorUtils; diff --git a/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java b/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java index 266e3b8f..bc2ef379 100644 --- a/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java @@ -3,13 +3,13 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonWriter; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.api.SendMessageResults; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import org.asamk.signal.util.CommandUtil; import org.asamk.signal.util.ErrorUtils; diff --git a/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java b/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java index aef2d410..d429e47d 100644 --- a/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java @@ -3,10 +3,10 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.manager.Manager; +import org.asamk.signal.output.OutputWriter; import java.io.IOException; diff --git a/src/main/java/org/asamk/signal/commands/SendTypingCommand.java b/src/main/java/org/asamk/signal/commands/SendTypingCommand.java index 9ca55c79..f55981e3 100644 --- a/src/main/java/org/asamk/signal/commands/SendTypingCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendTypingCommand.java @@ -4,9 +4,6 @@ import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonWriter; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.Manager; @@ -15,6 +12,9 @@ import org.asamk.signal.manager.api.TypingAction; import org.asamk.signal.manager.groups.GroupNotFoundException; import org.asamk.signal.manager.groups.GroupSendingNotAllowedException; import org.asamk.signal.manager.groups.NotAGroupMemberException; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import org.asamk.signal.util.CommandUtil; import org.asamk.signal.util.ErrorUtils; diff --git a/src/main/java/org/asamk/signal/commands/SetPinCommand.java b/src/main/java/org/asamk/signal/commands/SetPinCommand.java index ea41341d..53786554 100644 --- a/src/main/java/org/asamk/signal/commands/SetPinCommand.java +++ b/src/main/java/org/asamk/signal/commands/SetPinCommand.java @@ -3,10 +3,10 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.manager.Manager; +import org.asamk.signal.output.OutputWriter; import java.io.IOException; import java.util.Optional; diff --git a/src/main/java/org/asamk/signal/commands/StartLinkCommand.java b/src/main/java/org/asamk/signal/commands/StartLinkCommand.java index 4a171140..70e36f40 100644 --- a/src/main/java/org/asamk/signal/commands/StartLinkCommand.java +++ b/src/main/java/org/asamk/signal/commands/StartLinkCommand.java @@ -1,10 +1,10 @@ package org.asamk.signal.commands; -import org.asamk.signal.JsonWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.MultiAccountManager; +import org.asamk.signal.output.JsonWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java b/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java index 07583392..a5e07627 100644 --- a/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java +++ b/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java @@ -3,10 +3,10 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.manager.Manager; +import org.asamk.signal.output.OutputWriter; import java.io.IOException; diff --git a/src/main/java/org/asamk/signal/commands/TrustCommand.java b/src/main/java/org/asamk/signal/commands/TrustCommand.java index 77fcc08a..0e1830c7 100644 --- a/src/main/java/org/asamk/signal/commands/TrustCommand.java +++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java @@ -4,10 +4,10 @@ import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.Manager; +import org.asamk.signal.output.OutputWriter; import org.asamk.signal.util.CommandUtil; import org.asamk.signal.util.Hex; diff --git a/src/main/java/org/asamk/signal/commands/UnblockCommand.java b/src/main/java/org/asamk/signal/commands/UnblockCommand.java index 53eab3b3..351b659d 100644 --- a/src/main/java/org/asamk/signal/commands/UnblockCommand.java +++ b/src/main/java/org/asamk/signal/commands/UnblockCommand.java @@ -3,13 +3,13 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.UnexpectedErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.NotMasterDeviceException; import org.asamk.signal.manager.groups.GroupNotFoundException; +import org.asamk.signal.output.OutputWriter; import org.asamk.signal.util.CommandUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java index d7b9c9e5..83694953 100644 --- a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java +++ b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java @@ -4,10 +4,10 @@ import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.manager.Manager; +import org.asamk.signal.output.OutputWriter; import java.io.IOException; diff --git a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java index e8211aee..7fe70213 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java @@ -3,10 +3,10 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.manager.Manager; +import org.asamk.signal.output.OutputWriter; import java.io.IOException; diff --git a/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java b/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java index c6c29b63..0e02b8c2 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java @@ -3,13 +3,13 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.NotMasterDeviceException; import org.asamk.signal.manager.api.Configuration; +import org.asamk.signal.output.OutputWriter; import java.io.IOException; import java.util.Optional; diff --git a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java index 46641668..b138b439 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java @@ -3,12 +3,12 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.NotMasterDeviceException; +import org.asamk.signal.output.OutputWriter; import org.asamk.signal.util.CommandUtil; import java.io.IOException; diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java index 20e70278..ed389719 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java @@ -4,9 +4,6 @@ import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonWriter; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.UnexpectedErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; @@ -19,6 +16,9 @@ import org.asamk.signal.manager.groups.GroupNotFoundException; import org.asamk.signal.manager.groups.GroupPermission; import org.asamk.signal.manager.groups.GroupSendingNotAllowedException; import org.asamk.signal.manager.groups.NotAGroupMemberException; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import org.asamk.signal.util.CommandUtil; import org.asamk.signal.util.ErrorUtils; import org.slf4j.Logger; diff --git a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java index bd3d59bd..e60edf23 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java @@ -4,10 +4,10 @@ import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.manager.Manager; +import org.asamk.signal.output.OutputWriter; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java index 23d29365..0fc75aee 100644 --- a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java +++ b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java @@ -3,14 +3,14 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonWriter; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.StickerPackInvalidException; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/asamk/signal/commands/VerifyCommand.java b/src/main/java/org/asamk/signal/commands/VerifyCommand.java index ae0017af..542c0716 100644 --- a/src/main/java/org/asamk/signal/commands/VerifyCommand.java +++ b/src/main/java/org/asamk/signal/commands/VerifyCommand.java @@ -5,7 +5,6 @@ import com.fasterxml.jackson.core.type.TypeReference; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.JsonWriter; import org.asamk.signal.OutputType; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; @@ -13,6 +12,7 @@ import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.RegistrationManager; import org.asamk.signal.manager.api.IncorrectPinException; import org.asamk.signal.manager.api.PinLockedException; +import org.asamk.signal.output.JsonWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/asamk/signal/commands/VersionCommand.java b/src/main/java/org/asamk/signal/commands/VersionCommand.java index b8fb1fe9..51f805a9 100644 --- a/src/main/java/org/asamk/signal/commands/VersionCommand.java +++ b/src/main/java/org/asamk/signal/commands/VersionCommand.java @@ -1,10 +1,10 @@ package org.asamk.signal.commands; import org.asamk.signal.BaseConfig; -import org.asamk.signal.JsonWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.MultiAccountManager; +import org.asamk.signal.output.JsonWriter; import java.util.Map; diff --git a/src/main/java/org/asamk/signal/DbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java similarity index 99% rename from src/main/java/org/asamk/signal/DbusReceiveMessageHandler.java rename to src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java index 2fb27a3d..c7cb2ab7 100644 --- a/src/main/java/org/asamk/signal/DbusReceiveMessageHandler.java +++ b/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java @@ -1,4 +1,4 @@ -package org.asamk.signal; +package org.asamk.signal.dbus; import org.asamk.Signal; import org.asamk.signal.manager.Manager; diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java index 7f0c3b31..7eb65af3 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java @@ -2,7 +2,6 @@ package org.asamk.signal.dbus; import org.asamk.Signal; import org.asamk.signal.BaseConfig; -import org.asamk.signal.DbusReceiveMessageHandler; import org.asamk.signal.manager.AttachmentInvalidException; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.NotMasterDeviceException; diff --git a/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java b/src/main/java/org/asamk/signal/json/JsonReceiveMessageHandler.java similarity index 90% rename from src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java rename to src/main/java/org/asamk/signal/json/JsonReceiveMessageHandler.java index 41edfd3f..758c5f5a 100644 --- a/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java +++ b/src/main/java/org/asamk/signal/json/JsonReceiveMessageHandler.java @@ -1,9 +1,8 @@ -package org.asamk.signal; +package org.asamk.signal.json; -import org.asamk.signal.json.JsonError; -import org.asamk.signal.json.JsonMessageEnvelope; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.api.MessageEnvelope; +import org.asamk.signal.output.JsonWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcSender.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcSender.java index 11dc1698..ae1e78fc 100644 --- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcSender.java +++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcSender.java @@ -1,6 +1,6 @@ package org.asamk.signal.jsonrpc; -import org.asamk.signal.JsonWriter; +import org.asamk.signal.output.JsonWriter; import java.util.List; diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java index 12a56775..cb87687e 100644 --- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java +++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java @@ -8,8 +8,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ContainerNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.asamk.signal.JsonReceiveMessageHandler; -import org.asamk.signal.JsonWriter; import org.asamk.signal.commands.Command; import org.asamk.signal.commands.Commands; import org.asamk.signal.commands.JsonRpcMultiCommand; @@ -19,9 +17,11 @@ import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; +import org.asamk.signal.json.JsonReceiveMessageHandler; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.MultiAccountManager; import org.asamk.signal.manager.RegistrationManager; +import org.asamk.signal.output.JsonWriter; import org.asamk.signal.util.Util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/asamk/signal/JsonWriter.java b/src/main/java/org/asamk/signal/output/JsonWriter.java similarity index 73% rename from src/main/java/org/asamk/signal/JsonWriter.java rename to src/main/java/org/asamk/signal/output/JsonWriter.java index 78a04c62..034d2f9f 100644 --- a/src/main/java/org/asamk/signal/JsonWriter.java +++ b/src/main/java/org/asamk/signal/output/JsonWriter.java @@ -1,4 +1,4 @@ -package org.asamk.signal; +package org.asamk.signal.output; public interface JsonWriter extends OutputWriter { diff --git a/src/main/java/org/asamk/signal/JsonWriterImpl.java b/src/main/java/org/asamk/signal/output/JsonWriterImpl.java similarity index 96% rename from src/main/java/org/asamk/signal/JsonWriterImpl.java rename to src/main/java/org/asamk/signal/output/JsonWriterImpl.java index aabf399a..46e3078d 100644 --- a/src/main/java/org/asamk/signal/JsonWriterImpl.java +++ b/src/main/java/org/asamk/signal/output/JsonWriterImpl.java @@ -1,4 +1,4 @@ -package org.asamk.signal; +package org.asamk.signal.output; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/org/asamk/signal/OutputWriter.java b/src/main/java/org/asamk/signal/output/OutputWriter.java similarity index 52% rename from src/main/java/org/asamk/signal/OutputWriter.java rename to src/main/java/org/asamk/signal/output/OutputWriter.java index c282738c..a32e773d 100644 --- a/src/main/java/org/asamk/signal/OutputWriter.java +++ b/src/main/java/org/asamk/signal/output/OutputWriter.java @@ -1,4 +1,4 @@ -package org.asamk.signal; +package org.asamk.signal.output; public interface OutputWriter { diff --git a/src/main/java/org/asamk/signal/PlainTextWriter.java b/src/main/java/org/asamk/signal/output/PlainTextWriter.java similarity index 91% rename from src/main/java/org/asamk/signal/PlainTextWriter.java rename to src/main/java/org/asamk/signal/output/PlainTextWriter.java index 92981e49..29ac87af 100644 --- a/src/main/java/org/asamk/signal/PlainTextWriter.java +++ b/src/main/java/org/asamk/signal/output/PlainTextWriter.java @@ -1,4 +1,4 @@ -package org.asamk.signal; +package org.asamk.signal.output; import java.util.function.Consumer; diff --git a/src/main/java/org/asamk/signal/PlainTextWriterImpl.java b/src/main/java/org/asamk/signal/output/PlainTextWriterImpl.java similarity index 98% rename from src/main/java/org/asamk/signal/PlainTextWriterImpl.java rename to src/main/java/org/asamk/signal/output/PlainTextWriterImpl.java index f43fe73e..abf850a9 100644 --- a/src/main/java/org/asamk/signal/PlainTextWriterImpl.java +++ b/src/main/java/org/asamk/signal/output/PlainTextWriterImpl.java @@ -1,4 +1,4 @@ -package org.asamk.signal; +package org.asamk.signal.output; import org.slf4j.helpers.MessageFormatter; diff --git a/src/main/java/org/asamk/signal/util/RandomUtils.java b/src/main/java/org/asamk/signal/util/RandomUtils.java index 6af4ec12..30b4bb94 100644 --- a/src/main/java/org/asamk/signal/util/RandomUtils.java +++ b/src/main/java/org/asamk/signal/util/RandomUtils.java @@ -8,7 +8,7 @@ public class RandomUtils { private static final ThreadLocal LOCAL_RANDOM = ThreadLocal.withInitial(() -> { var rand = getSecureRandomUnseeded(); - // Let the SecureRandom seed it self initially + // Let the SecureRandom seed itself initially rand.nextBoolean(); return rand; -- 2.50.1