Move toString to MessageFilter/out of MessageBrowser, add tests

Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>

Author: mgaffigan

client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowser.java

@@ -684,7 +684,7 @@ protected void runSearch() {
             clearCache();
             loadPageNumber(1);
 
-            updateSearchCriteriaPane();
+            lastSearchCriteria.setText(messageFilter.toDisplayString(connectors, "\n", true));
             auditSearch();
         }
     }
@@ -723,183 +723,6 @@ protected void auditSearch(String channelId, String channelName) {
         }
     }
 
-    protected void updateSearchCriteriaPane() {
-        StringBuilder text = new StringBuilder();
-        Calendar startDate = messageFilter.getStartDate();
-        Calendar endDate = messageFilter.getEndDate();
-        String padding = "\n";
-
-        text.append("Max Message Id: ");
-        text.append(messageFilter.getMaxMessageId());
-
-        if (messageFilter.getMinMessageId() != null) {
-            text.append(padding + "Min Message Id: ");
-            text.append(messageFilter.getMinMessageId());
-        }
-
-        String startDateFormatString = mirthTimePicker1.isEnabled() ? "yyyy-MM-dd HH:mm" : "yyyy-MM-dd";
-        String endDateFormatString = mirthTimePicker2.isEnabled() ? "yyyy-MM-dd HH:mm" : "yyyy-MM-dd";
-
-        DateFormat startDateFormat = new SimpleDateFormat(startDateFormatString);
-        DateFormat endDateFormat = new SimpleDateFormat(endDateFormatString);
-
-        text.append(padding + "Date Range: ");
-
-        if (startDate == null) {
-            text.append("(any)");
-        } else {
-            text.append(startDateFormat.format(startDate.getTime()));
-            if (!mirthTimePicker1.isEnabled()) {
-                text.append(" (all day)");
-            }
-        }
-
-        text.append(" to ");
-
-        if (endDate == null) {
-            text.append("(any)");
-        } else {
-            text.append(endDateFormat.format(endDate.getTime()));
-            if (!mirthTimePicker2.isEnabled()) {
-                text.append(" (all day)");
-            }
-        }
-
-        text.append(padding + "Statuses: ");
-
-        if (messageFilter.getStatuses() == null) {
-            text.append("(any)");
-        } else {
-            text.append(StringUtils.join(messageFilter.getStatuses(), ", "));
-        }
-
-        if (messageFilter.getTextSearch() != null) {
-            text.append(padding + "Text Search: " + messageFilter.getTextSearch());
-        }
-
-        text.append(getConnectorSearchCriteriaText(padding));
-
-        if (messageFilter.getOriginalIdLower() != null || messageFilter.getOriginalIdUpper() != null) {
-            text.append(padding + "Original Id: ");
-            if (messageFilter.getOriginalIdUpper() == null) {
-                text.append("Greater than " + messageFilter.getOriginalIdLower());
-            } else if (messageFilter.getOriginalIdLower() == null) {
-                text.append("Less than " + messageFilter.getOriginalIdUpper());
-            } else {
-                text.append("Between " + messageFilter.getOriginalIdLower() + " and " + messageFilter.getOriginalIdUpper());
-            }
-        }
-
-        if (messageFilter.getImportIdLower() != null || messageFilter.getImportIdUpper() != null) {
-            text.append(padding + "Import Id: ");
-            if (messageFilter.getImportIdUpper() == null) {
-                text.append("Greater than " + messageFilter.getImportIdLower());
-            } else if (messageFilter.getImportIdLower() == null) {
-                text.append("Less than " + messageFilter.getImportIdUpper());
-            } else {
-                text.append("Between " + messageFilter.getImportIdLower() + " and " + messageFilter.getImportIdUpper());
-            }
-        }
-
-        if (messageFilter.getServerId() != null) {
-            text.append(padding + "Server Id: " + messageFilter.getServerId());
-        }
-
-        Integer sendAttemptsLower = messageFilter.getSendAttemptsLower();
-        Integer sendAttemptsUpper = messageFilter.getSendAttemptsUpper();
-
-        if (sendAttemptsLower != null || sendAttemptsUpper != null) {
-            text.append(padding + "# of Send Attempts: ");
-
-            if (sendAttemptsLower != null) {
-                text.append(sendAttemptsLower);
-            } else {
-                text.append("(any)");
-            }
-
-            text.append(" - ");
-
-            if (sendAttemptsUpper != null) {
-                text.append(sendAttemptsUpper);
-            } else {
-                text.append("(any)");
-            }
-        }
-
-        if (messageFilter.getContentSearch() != null) {
-            List<ContentSearchElement> contentSearch = messageFilter.getContentSearch();
-
-            for (ContentSearchElement element : contentSearch) {
-                for (String value : element.getSearches()) {
-                    text.append(padding + ContentType.fromCode(element.getContentCode()) + " contains \"" + value + "\"");
-                }
-            }
-        }
-
-        if (messageFilter.getMetaDataSearch() != null) {
-            List<MetaDataSearchElement> elements = messageFilter.getMetaDataSearch();
-
-            for (MetaDataSearchElement element : elements) {
-                text.append(padding + element.getColumnName() + " " + MetaDataSearchOperator.fromString(element.getOperator()).toString() + " ");
-                if (element.getValue() instanceof Calendar) {
-                    Calendar date = (Calendar) element.getValue();
-                    text.append(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date.getTime()));
-                } else {
-                    text.append(element.getValue());
-                }
-                if (element.getIgnoreCase()) {
-                    text.append(" (Ignore Case)");
-                }
-            }
-        }
-
-        if (messageFilter.getAttachment()) {
-            text.append(padding + "Has Attachment");
-        }
-
-        if (messageFilter.getError()) {
-            text.append(padding + "Has Error");
-        }
-
-        lastSearchCriteria.setText(text.toString());
-    }
-    
-    protected String getConnectorSearchCriteriaText(String padding) {
-    	StringBuilder text = new StringBuilder();
-    	text.append(padding + "Connectors: ");
-
-        if (messageFilter.getIncludedMetaDataIds() == null) {
-            if (messageFilter.getExcludedMetaDataIds() == null) {
-                text.append("(any)");
-            } else {
-                List<Integer> excludedMetaDataIds = messageFilter.getExcludedMetaDataIds();
-                List<String> connectorNames = new ArrayList<String>();
-
-                for (Entry<Integer, String> connectorEntry : connectors.entrySet()) {
-                    if (!excludedMetaDataIds.contains(connectorEntry.getKey())) {
-                        connectorNames.add(connectorEntry.getValue());
-                    }
-                }
-
-                text.append(StringUtils.join(connectorNames, ", "));
-            }
-        } else if (messageFilter.getIncludedMetaDataIds().isEmpty()) {
-            text.append("(none)");
-        } else {
-            List<Integer> includedMetaDataIds = messageFilter.getIncludedMetaDataIds();
-            List<String> connectorNames = new ArrayList<String>();
-
-            for (Entry<Integer, String> connectorEntry : connectors.entrySet()) {
-                if (includedMetaDataIds.contains(connectorEntry.getKey())) {
-                    connectorNames.add(connectorEntry.getValue());
-                }
-            }
-
-            text.append(StringUtils.join(connectorNames, ", "));
-        }
-        return text.toString();
-    }
-
     public void jumpToPageNumber() {
         if (messages.getPageCount() != null && messages.getPageCount() > 0 && StringUtils.isNotEmpty(pageNumberField.getText())) {
             loadPageNumber(Math.min(Math.max(Integer.parseInt(pageNumberField.getText()), 1), messages.getPageCount()));