From ef1d323a6dfe759e56b45da3a8bd865fb034ba41 Mon Sep 17 00:00:00 2001 From: jdo Date: Mon, 23 Oct 2023 11:46:00 -0700 Subject: [PATCH 1/3] [ROCKSOLID-11653] Add dummy code changes to fix code changes not appearing in PR --- .../com/mirth/connect/client/ui/MessageExportDialog.java | 2 +- command/src/com/mirth/connect/cli/CommandLineInterface.java | 2 +- .../client/core/api/servlets/MessageServletInterface.java | 6 +++--- .../connect/server/controllers/DonkeyMessageController.java | 2 +- server/src/com/mirth/connect/util/PaginatedList.java | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/src/com/mirth/connect/client/ui/MessageExportDialog.java b/client/src/com/mirth/connect/client/ui/MessageExportDialog.java index 009810a96..1aed70180 100644 --- a/client/src/com/mirth/connect/client/ui/MessageExportDialog.java +++ b/client/src/com/mirth/connect/client/ui/MessageExportDialog.java @@ -165,7 +165,7 @@ public List getMessageAttachments(Message message) throws ClientExce } try { - exportCount = new MessageExporter().exportMessages(messageList, messageWriter, attachmentSource, writerOptions); + exportCount = new MessageExporter().exportMessages(messageList, messageWriter, attachmentSource, writerOptions); messageWriter.finishWrite(); } finally { messageWriter.close(); diff --git a/command/src/com/mirth/connect/cli/CommandLineInterface.java b/command/src/com/mirth/connect/cli/CommandLineInterface.java index 23b562a50..fbcf8cf5b 100644 --- a/command/src/com/mirth/connect/cli/CommandLineInterface.java +++ b/command/src/com/mirth/connect/cli/CommandLineInterface.java @@ -1364,7 +1364,7 @@ public List getMessageAttachments(Message message) throws ClientExce }; } - messageCount = new MessageExporter().exportMessages(messageList, messageWriter, attachmentSource, writerOptions); + messageCount = new MessageExporter().exportMessages(messageList, messageWriter, attachmentSource, writerOptions); messageWriter.finishWrite(); } catch (Exception e) { Throwable cause = ExceptionUtils.getRootCause(e); diff --git a/server/src/com/mirth/connect/client/core/api/servlets/MessageServletInterface.java b/server/src/com/mirth/connect/client/core/api/servlets/MessageServletInterface.java index a0ce1d59a..8da0533d9 100644 --- a/server/src/com/mirth/connect/client/core/api/servlets/MessageServletInterface.java +++ b/server/src/com/mirth/connect/client/core/api/servlets/MessageServletInterface.java @@ -569,14 +569,14 @@ public int exportMessagesServer(// @formatter:off @Param("maxSendAttempts") @Parameter(description = "The maximum number of send attempts for connector messages.") @QueryParam("maxSendAttempts") Integer maxSendAttempts, @Param("attachment") @Parameter(description = "If true, only messages with attachments are included in the results.") @QueryParam("attachment") Boolean attachment, @Param("error") @Parameter(description = "If true, only messages with errors are included in the results.") @QueryParam("error") Boolean error, - @Param("pageSize") @Parameter(description = "The maximum number of messages that will be queried at a time. Default Value: 100") @QueryParam("pageSize") int pageSize, + @Param("pageSize") @Parameter(description = "The maximum number of messages that will be queried at a time. Default Value: 100") @QueryParam("pageSize") int pageSize, @Param("contentType") @Parameter(description = "The ContentType that will be extracted from the message for writing. If null or not provided, the entire message will be written in serialized format.") @QueryParam("contentType") ContentType contentType, @Param("destinationContent") @Parameter(description = "If true, the content to write will be extracted from the destination message(s), rather than the source message.", schema = @Schema(defaultValue = "false")) @QueryParam("destinationContent") boolean destinationContent, @Param("encrypt") @Parameter(description = "If true, message content will be encrypted before writing.", schema = @Schema(defaultValue = "false")) @QueryParam("encrypt") boolean encrypt, @Param("includeAttachments") @Parameter(description = "Determines whether attachments will be included with messages.", schema = @Schema(defaultValue = "false")) @QueryParam("includeAttachments") boolean includeAttachments, @Param("baseFolder") @Parameter(description = "The base directory to use when resolving relative paths in the root folder.") @QueryParam("baseFolder") String baseFolder, - @Param("rootFolder") @Parameter(description = "The root folder to contain the written messages/sub-folders.", required = true) @QueryParam("rootFolder") String rootFolder, - @Param("filePattern") @Parameter(description = "A string defining the folder/filename(s) for writing messages. It may contain variables to be replaced.", required = true) @QueryParam("filePattern") String filePattern, + @Param("rootFolder") @Parameter(description = "The root folder to contain the written messages/sub-folders.", required = true) @QueryParam("rootFolder") String rootFolder, + @Param("filePattern") @Parameter(description = "A string defining the folder/filename(s) for writing messages. It may contain variables to be replaced.", required = true) @QueryParam("filePattern") String filePattern, @Param("archiveFileName") @Parameter(description = "The file name to use for archive exports.") @QueryParam("archiveFileName") String archiveFileName, @Param("archiveFormat") @Parameter(description = "The archiver format to use to archive messages/folders that are written to the root folder. Valid values: zip, tar") @QueryParam("archiveFormat") String archiveFormat, @Param("compressFormat") @Parameter(description = "The compressor format to use to compress the archive file. Only valid when using the TAR archive format. Valid values: gz, bzip2") @QueryParam("compressFormat") String compressFormat, diff --git a/server/src/com/mirth/connect/server/controllers/DonkeyMessageController.java b/server/src/com/mirth/connect/server/controllers/DonkeyMessageController.java index 3b2530326..1f37207fd 100644 --- a/server/src/com/mirth/connect/server/controllers/DonkeyMessageController.java +++ b/server/src/com/mirth/connect/server/controllers/DonkeyMessageController.java @@ -497,7 +497,7 @@ public List getMessageAttachments(Message message) { } try { - int numExported = new MessageExporter().exportMessages(messageList, messageWriter, attachmentSource, options); + int numExported = new MessageExporter().exportMessages(messageList, messageWriter, attachmentSource, options); messageWriter.finishWrite(); return numExported; } finally { diff --git a/server/src/com/mirth/connect/util/PaginatedList.java b/server/src/com/mirth/connect/util/PaginatedList.java index 42366d091..3732faf49 100644 --- a/server/src/com/mirth/connect/util/PaginatedList.java +++ b/server/src/com/mirth/connect/util/PaginatedList.java @@ -13,7 +13,7 @@ import java.util.List; public abstract class PaginatedList extends ArrayList { - private static final int DEFAULT_PAGE_SIZE = 100; + private static final int DEFAULT_PAGE_SIZE = 100; private int pageSize = 0; private int pageNumber = 1; private boolean hasNextPage = false; @@ -29,7 +29,7 @@ public int getPageSize() { * Set the maximum number of items that can be contained in a page */ public void setPageSize(int pageSize) { - this.pageSize = pageSize <= 0 ? DEFAULT_PAGE_SIZE : pageSize; + this.pageSize = pageSize <= 0 ? DEFAULT_PAGE_SIZE : pageSize; } /** From bad9deccdfd416540e6a42eba23bae72400706da Mon Sep 17 00:00:00 2001 From: jdo Date: Mon, 23 Oct 2023 11:47:10 -0700 Subject: [PATCH 2/3] Revert "[ROCKSOLID-11653] Add dummy code changes to fix code changes not appearing in PR" This reverts commit ef1d323a6dfe759e56b45da3a8bd865fb034ba41. --- .../com/mirth/connect/client/ui/MessageExportDialog.java | 2 +- command/src/com/mirth/connect/cli/CommandLineInterface.java | 2 +- .../client/core/api/servlets/MessageServletInterface.java | 6 +++--- .../connect/server/controllers/DonkeyMessageController.java | 2 +- server/src/com/mirth/connect/util/PaginatedList.java | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/src/com/mirth/connect/client/ui/MessageExportDialog.java b/client/src/com/mirth/connect/client/ui/MessageExportDialog.java index 1aed70180..009810a96 100644 --- a/client/src/com/mirth/connect/client/ui/MessageExportDialog.java +++ b/client/src/com/mirth/connect/client/ui/MessageExportDialog.java @@ -165,7 +165,7 @@ public List getMessageAttachments(Message message) throws ClientExce } try { - exportCount = new MessageExporter().exportMessages(messageList, messageWriter, attachmentSource, writerOptions); + exportCount = new MessageExporter().exportMessages(messageList, messageWriter, attachmentSource, writerOptions); messageWriter.finishWrite(); } finally { messageWriter.close(); diff --git a/command/src/com/mirth/connect/cli/CommandLineInterface.java b/command/src/com/mirth/connect/cli/CommandLineInterface.java index fbcf8cf5b..23b562a50 100644 --- a/command/src/com/mirth/connect/cli/CommandLineInterface.java +++ b/command/src/com/mirth/connect/cli/CommandLineInterface.java @@ -1364,7 +1364,7 @@ public List getMessageAttachments(Message message) throws ClientExce }; } - messageCount = new MessageExporter().exportMessages(messageList, messageWriter, attachmentSource, writerOptions); + messageCount = new MessageExporter().exportMessages(messageList, messageWriter, attachmentSource, writerOptions); messageWriter.finishWrite(); } catch (Exception e) { Throwable cause = ExceptionUtils.getRootCause(e); diff --git a/server/src/com/mirth/connect/client/core/api/servlets/MessageServletInterface.java b/server/src/com/mirth/connect/client/core/api/servlets/MessageServletInterface.java index 8da0533d9..a0ce1d59a 100644 --- a/server/src/com/mirth/connect/client/core/api/servlets/MessageServletInterface.java +++ b/server/src/com/mirth/connect/client/core/api/servlets/MessageServletInterface.java @@ -569,14 +569,14 @@ public int exportMessagesServer(// @formatter:off @Param("maxSendAttempts") @Parameter(description = "The maximum number of send attempts for connector messages.") @QueryParam("maxSendAttempts") Integer maxSendAttempts, @Param("attachment") @Parameter(description = "If true, only messages with attachments are included in the results.") @QueryParam("attachment") Boolean attachment, @Param("error") @Parameter(description = "If true, only messages with errors are included in the results.") @QueryParam("error") Boolean error, - @Param("pageSize") @Parameter(description = "The maximum number of messages that will be queried at a time. Default Value: 100") @QueryParam("pageSize") int pageSize, + @Param("pageSize") @Parameter(description = "The maximum number of messages that will be queried at a time. Default Value: 100") @QueryParam("pageSize") int pageSize, @Param("contentType") @Parameter(description = "The ContentType that will be extracted from the message for writing. If null or not provided, the entire message will be written in serialized format.") @QueryParam("contentType") ContentType contentType, @Param("destinationContent") @Parameter(description = "If true, the content to write will be extracted from the destination message(s), rather than the source message.", schema = @Schema(defaultValue = "false")) @QueryParam("destinationContent") boolean destinationContent, @Param("encrypt") @Parameter(description = "If true, message content will be encrypted before writing.", schema = @Schema(defaultValue = "false")) @QueryParam("encrypt") boolean encrypt, @Param("includeAttachments") @Parameter(description = "Determines whether attachments will be included with messages.", schema = @Schema(defaultValue = "false")) @QueryParam("includeAttachments") boolean includeAttachments, @Param("baseFolder") @Parameter(description = "The base directory to use when resolving relative paths in the root folder.") @QueryParam("baseFolder") String baseFolder, - @Param("rootFolder") @Parameter(description = "The root folder to contain the written messages/sub-folders.", required = true) @QueryParam("rootFolder") String rootFolder, - @Param("filePattern") @Parameter(description = "A string defining the folder/filename(s) for writing messages. It may contain variables to be replaced.", required = true) @QueryParam("filePattern") String filePattern, + @Param("rootFolder") @Parameter(description = "The root folder to contain the written messages/sub-folders.", required = true) @QueryParam("rootFolder") String rootFolder, + @Param("filePattern") @Parameter(description = "A string defining the folder/filename(s) for writing messages. It may contain variables to be replaced.", required = true) @QueryParam("filePattern") String filePattern, @Param("archiveFileName") @Parameter(description = "The file name to use for archive exports.") @QueryParam("archiveFileName") String archiveFileName, @Param("archiveFormat") @Parameter(description = "The archiver format to use to archive messages/folders that are written to the root folder. Valid values: zip, tar") @QueryParam("archiveFormat") String archiveFormat, @Param("compressFormat") @Parameter(description = "The compressor format to use to compress the archive file. Only valid when using the TAR archive format. Valid values: gz, bzip2") @QueryParam("compressFormat") String compressFormat, diff --git a/server/src/com/mirth/connect/server/controllers/DonkeyMessageController.java b/server/src/com/mirth/connect/server/controllers/DonkeyMessageController.java index 1f37207fd..3b2530326 100644 --- a/server/src/com/mirth/connect/server/controllers/DonkeyMessageController.java +++ b/server/src/com/mirth/connect/server/controllers/DonkeyMessageController.java @@ -497,7 +497,7 @@ public List getMessageAttachments(Message message) { } try { - int numExported = new MessageExporter().exportMessages(messageList, messageWriter, attachmentSource, options); + int numExported = new MessageExporter().exportMessages(messageList, messageWriter, attachmentSource, options); messageWriter.finishWrite(); return numExported; } finally { diff --git a/server/src/com/mirth/connect/util/PaginatedList.java b/server/src/com/mirth/connect/util/PaginatedList.java index 3732faf49..42366d091 100644 --- a/server/src/com/mirth/connect/util/PaginatedList.java +++ b/server/src/com/mirth/connect/util/PaginatedList.java @@ -13,7 +13,7 @@ import java.util.List; public abstract class PaginatedList extends ArrayList { - private static final int DEFAULT_PAGE_SIZE = 100; + private static final int DEFAULT_PAGE_SIZE = 100; private int pageSize = 0; private int pageNumber = 1; private boolean hasNextPage = false; @@ -29,7 +29,7 @@ public int getPageSize() { * Set the maximum number of items that can be contained in a page */ public void setPageSize(int pageSize) { - this.pageSize = pageSize <= 0 ? DEFAULT_PAGE_SIZE : pageSize; + this.pageSize = pageSize <= 0 ? DEFAULT_PAGE_SIZE : pageSize; } /** From 4d4b01f3fd530a3d8e32a96902971b55b3977ef6 Mon Sep 17 00:00:00 2001 From: jdo Date: Mon, 23 Oct 2023 11:48:12 -0700 Subject: [PATCH 3/3] Revert "Revert "[ROCKSOLID-11653] Add dummy code changes to fix code changes not appearing in PR"" This reverts commit bad9deccdfd416540e6a42eba23bae72400706da. --- .../com/mirth/connect/client/ui/MessageExportDialog.java | 2 +- command/src/com/mirth/connect/cli/CommandLineInterface.java | 2 +- .../client/core/api/servlets/MessageServletInterface.java | 6 +++--- .../connect/server/controllers/DonkeyMessageController.java | 2 +- server/src/com/mirth/connect/util/PaginatedList.java | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/src/com/mirth/connect/client/ui/MessageExportDialog.java b/client/src/com/mirth/connect/client/ui/MessageExportDialog.java index 009810a96..1aed70180 100644 --- a/client/src/com/mirth/connect/client/ui/MessageExportDialog.java +++ b/client/src/com/mirth/connect/client/ui/MessageExportDialog.java @@ -165,7 +165,7 @@ public List getMessageAttachments(Message message) throws ClientExce } try { - exportCount = new MessageExporter().exportMessages(messageList, messageWriter, attachmentSource, writerOptions); + exportCount = new MessageExporter().exportMessages(messageList, messageWriter, attachmentSource, writerOptions); messageWriter.finishWrite(); } finally { messageWriter.close(); diff --git a/command/src/com/mirth/connect/cli/CommandLineInterface.java b/command/src/com/mirth/connect/cli/CommandLineInterface.java index 23b562a50..fbcf8cf5b 100644 --- a/command/src/com/mirth/connect/cli/CommandLineInterface.java +++ b/command/src/com/mirth/connect/cli/CommandLineInterface.java @@ -1364,7 +1364,7 @@ public List getMessageAttachments(Message message) throws ClientExce }; } - messageCount = new MessageExporter().exportMessages(messageList, messageWriter, attachmentSource, writerOptions); + messageCount = new MessageExporter().exportMessages(messageList, messageWriter, attachmentSource, writerOptions); messageWriter.finishWrite(); } catch (Exception e) { Throwable cause = ExceptionUtils.getRootCause(e); diff --git a/server/src/com/mirth/connect/client/core/api/servlets/MessageServletInterface.java b/server/src/com/mirth/connect/client/core/api/servlets/MessageServletInterface.java index a0ce1d59a..8da0533d9 100644 --- a/server/src/com/mirth/connect/client/core/api/servlets/MessageServletInterface.java +++ b/server/src/com/mirth/connect/client/core/api/servlets/MessageServletInterface.java @@ -569,14 +569,14 @@ public int exportMessagesServer(// @formatter:off @Param("maxSendAttempts") @Parameter(description = "The maximum number of send attempts for connector messages.") @QueryParam("maxSendAttempts") Integer maxSendAttempts, @Param("attachment") @Parameter(description = "If true, only messages with attachments are included in the results.") @QueryParam("attachment") Boolean attachment, @Param("error") @Parameter(description = "If true, only messages with errors are included in the results.") @QueryParam("error") Boolean error, - @Param("pageSize") @Parameter(description = "The maximum number of messages that will be queried at a time. Default Value: 100") @QueryParam("pageSize") int pageSize, + @Param("pageSize") @Parameter(description = "The maximum number of messages that will be queried at a time. Default Value: 100") @QueryParam("pageSize") int pageSize, @Param("contentType") @Parameter(description = "The ContentType that will be extracted from the message for writing. If null or not provided, the entire message will be written in serialized format.") @QueryParam("contentType") ContentType contentType, @Param("destinationContent") @Parameter(description = "If true, the content to write will be extracted from the destination message(s), rather than the source message.", schema = @Schema(defaultValue = "false")) @QueryParam("destinationContent") boolean destinationContent, @Param("encrypt") @Parameter(description = "If true, message content will be encrypted before writing.", schema = @Schema(defaultValue = "false")) @QueryParam("encrypt") boolean encrypt, @Param("includeAttachments") @Parameter(description = "Determines whether attachments will be included with messages.", schema = @Schema(defaultValue = "false")) @QueryParam("includeAttachments") boolean includeAttachments, @Param("baseFolder") @Parameter(description = "The base directory to use when resolving relative paths in the root folder.") @QueryParam("baseFolder") String baseFolder, - @Param("rootFolder") @Parameter(description = "The root folder to contain the written messages/sub-folders.", required = true) @QueryParam("rootFolder") String rootFolder, - @Param("filePattern") @Parameter(description = "A string defining the folder/filename(s) for writing messages. It may contain variables to be replaced.", required = true) @QueryParam("filePattern") String filePattern, + @Param("rootFolder") @Parameter(description = "The root folder to contain the written messages/sub-folders.", required = true) @QueryParam("rootFolder") String rootFolder, + @Param("filePattern") @Parameter(description = "A string defining the folder/filename(s) for writing messages. It may contain variables to be replaced.", required = true) @QueryParam("filePattern") String filePattern, @Param("archiveFileName") @Parameter(description = "The file name to use for archive exports.") @QueryParam("archiveFileName") String archiveFileName, @Param("archiveFormat") @Parameter(description = "The archiver format to use to archive messages/folders that are written to the root folder. Valid values: zip, tar") @QueryParam("archiveFormat") String archiveFormat, @Param("compressFormat") @Parameter(description = "The compressor format to use to compress the archive file. Only valid when using the TAR archive format. Valid values: gz, bzip2") @QueryParam("compressFormat") String compressFormat, diff --git a/server/src/com/mirth/connect/server/controllers/DonkeyMessageController.java b/server/src/com/mirth/connect/server/controllers/DonkeyMessageController.java index 3b2530326..1f37207fd 100644 --- a/server/src/com/mirth/connect/server/controllers/DonkeyMessageController.java +++ b/server/src/com/mirth/connect/server/controllers/DonkeyMessageController.java @@ -497,7 +497,7 @@ public List getMessageAttachments(Message message) { } try { - int numExported = new MessageExporter().exportMessages(messageList, messageWriter, attachmentSource, options); + int numExported = new MessageExporter().exportMessages(messageList, messageWriter, attachmentSource, options); messageWriter.finishWrite(); return numExported; } finally { diff --git a/server/src/com/mirth/connect/util/PaginatedList.java b/server/src/com/mirth/connect/util/PaginatedList.java index 42366d091..3732faf49 100644 --- a/server/src/com/mirth/connect/util/PaginatedList.java +++ b/server/src/com/mirth/connect/util/PaginatedList.java @@ -13,7 +13,7 @@ import java.util.List; public abstract class PaginatedList extends ArrayList { - private static final int DEFAULT_PAGE_SIZE = 100; + private static final int DEFAULT_PAGE_SIZE = 100; private int pageSize = 0; private int pageNumber = 1; private boolean hasNextPage = false; @@ -29,7 +29,7 @@ public int getPageSize() { * Set the maximum number of items that can be contained in a page */ public void setPageSize(int pageSize) { - this.pageSize = pageSize <= 0 ? DEFAULT_PAGE_SIZE : pageSize; + this.pageSize = pageSize <= 0 ? DEFAULT_PAGE_SIZE : pageSize; } /**