Merge pull request #134 in MC/connect from feature/ROCKSOLID-2710-mir…

…th-results-v3-sender-basic-mode-updates to development * commit '11cf67cbc1c622568ecebe425fb9654e8e06101f': ROCSOLID-2710. Fix MigratableConverter to work with 3_6_0 ROCKSOLID-2710 Add method stubs to support migrating to 3.6
nextgenhealthcare · Jun 1, 2018 · 41fbe4a · 41fbe4a
2 parents d93d67f + 11cf67c
commit 41fbe4a
Show file tree

Hide file tree

Showing 76 changed files with 231 additions and 3 deletions.
diff --git a/donkey/src/main/java/com/mirth/connect/donkey/model/channel/ConnectorPluginProperties.java b/donkey/src/main/java/com/mirth/connect/donkey/model/channel/ConnectorPluginProperties.java
@@ -50,4 +50,7 @@ public void migrate3_4_0(DonkeyElement element) {}
 
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
+
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
 }
diff --git a/.../src/main/java/com/mirth/connect/donkey/model/channel/DestinationConnectorProperties.java b/.../src/main/java/com/mirth/connect/donkey/model/channel/DestinationConnectorProperties.java
@@ -227,6 +227,9 @@ public void migrate3_5_0(DonkeyElement element) {
         element.addChildElementIfNotExists("reattachAttachments", "true");
     }
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = new HashMap<String, Object>();

diff --git a/donkey/src/main/java/com/mirth/connect/donkey/model/channel/ListenerConnectorProperties.java b/donkey/src/main/java/com/mirth/connect/donkey/model/channel/ListenerConnectorProperties.java
@@ -66,4 +66,7 @@ public void migrate3_4_0(DonkeyElement element) {}
 
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
+
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
 }
diff --git a/donkey/src/main/java/com/mirth/connect/donkey/model/channel/PollConnectorProperties.java b/donkey/src/main/java/com/mirth/connect/donkey/model/channel/PollConnectorProperties.java
@@ -185,6 +185,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = new HashMap<String, Object>();

diff --git a/donkey/src/main/java/com/mirth/connect/donkey/model/channel/SourceConnectorProperties.java b/donkey/src/main/java/com/mirth/connect/donkey/model/channel/SourceConnectorProperties.java
@@ -201,6 +201,9 @@ public void migrate3_4_0(DonkeyElement element) {
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = new HashMap<String, Object>();

diff --git a/...n/java/com/mirth/connect/donkey/model/message/attachment/AttachmentHandlerProperties.java b/...n/java/com/mirth/connect/donkey/model/message/attachment/AttachmentHandlerProperties.java
@@ -92,9 +92,6 @@ public void migrate3_2_0(DonkeyElement element) {}
     @Override
     public void migrate3_3_0(DonkeyElement element) {}
 
-    @Override
-    public void migrate3_5_0(DonkeyElement element) {}
-
     @Override
     public void migrate3_4_0(DonkeyElement element) {
         DonkeyElement classNameElement = element.getChildElement("className");
@@ -112,4 +109,10 @@ public void migrate3_4_0(DonkeyElement element) {
             }
         }
     }
+
+    @Override
+    public void migrate3_5_0(DonkeyElement element) {}
+
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
 }
diff --git a/donkey/src/main/java/com/mirth/connect/donkey/util/migration/Migratable.java b/donkey/src/main/java/com/mirth/connect/donkey/util/migration/Migratable.java
@@ -43,4 +43,6 @@ public interface Migratable {
     public void migrate3_4_0(DonkeyElement element);
 
     public void migrate3_5_0(DonkeyElement element);
+
+    public void migrate3_6_0(DonkeyElement element);
 }
diff --git a/donkey/src/test/java/com/mirth/connect/donkey/test/util/TestConnectorProperties.java b/donkey/src/test/java/com/mirth/connect/donkey/test/util/TestConnectorProperties.java
@@ -78,6 +78,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         // TODO Auto-generated method stub

diff --git a/donkey/src/test/java/com/mirth/connect/donkey/test/util/TestDispatcherProperties.java b/donkey/src/test/java/com/mirth/connect/donkey/test/util/TestDispatcherProperties.java
@@ -90,6 +90,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         return null;

diff --git a/donkey/src/test/java/com/mirth/connect/donkey/test/util/TestListenerConnectorProperties.java b/donkey/src/test/java/com/mirth/connect/donkey/test/util/TestListenerConnectorProperties.java
@@ -81,6 +81,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         return null;

diff --git a/donkey/src/test/java/com/mirth/connect/donkey/test/util/TestPollConnectorProperties.java b/donkey/src/test/java/com/mirth/connect/donkey/test/util/TestPollConnectorProperties.java
@@ -68,6 +68,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         return null;

diff --git a/server/src/com/mirth/connect/connectors/dimse/DICOMDispatcherProperties.java b/server/src/com/mirth/connect/connectors/dimse/DICOMDispatcherProperties.java
@@ -529,6 +529,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/connectors/dimse/DICOMReceiverProperties.java b/server/src/com/mirth/connect/connectors/dimse/DICOMReceiverProperties.java
@@ -393,6 +393,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/connectors/doc/DocumentDispatcherProperties.java b/server/src/com/mirth/connect/connectors/doc/DocumentDispatcherProperties.java
@@ -262,6 +262,9 @@ public void migrate3_4_0(DonkeyElement element) {
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/connectors/file/FileDispatcherProperties.java b/server/src/com/mirth/connect/connectors/file/FileDispatcherProperties.java
@@ -353,6 +353,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/connectors/file/FileReceiverProperties.java b/server/src/com/mirth/connect/connectors/file/FileReceiverProperties.java
@@ -409,6 +409,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/connectors/http/HttpDispatcherProperties.java b/server/src/com/mirth/connect/connectors/http/HttpDispatcherProperties.java
@@ -463,6 +463,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/connectors/http/HttpReceiverProperties.java b/server/src/com/mirth/connect/connectors/http/HttpReceiverProperties.java
@@ -258,6 +258,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/connectors/jdbc/DatabaseDispatcherProperties.java b/server/src/com/mirth/connect/connectors/jdbc/DatabaseDispatcherProperties.java
@@ -197,6 +197,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/connectors/jdbc/DatabaseReceiverProperties.java b/server/src/com/mirth/connect/connectors/jdbc/DatabaseReceiverProperties.java
@@ -247,6 +247,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/connectors/jms/JmsConnectorProperties.java b/server/src/com/mirth/connect/connectors/jms/JmsConnectorProperties.java
@@ -227,6 +227,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/connectors/js/JavaScriptDispatcherProperties.java b/server/src/com/mirth/connect/connectors/js/JavaScriptDispatcherProperties.java
@@ -104,6 +104,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/connectors/js/JavaScriptReceiverProperties.java b/server/src/com/mirth/connect/connectors/js/JavaScriptReceiverProperties.java
@@ -101,6 +101,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/connectors/smtp/SmtpDispatcherProperties.java b/server/src/com/mirth/connect/connectors/smtp/SmtpDispatcherProperties.java
@@ -389,6 +389,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/connectors/tcp/TcpDispatcherProperties.java b/server/src/com/mirth/connect/connectors/tcp/TcpDispatcherProperties.java
@@ -311,6 +311,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/connectors/tcp/TcpReceiverProperties.java b/server/src/com/mirth/connect/connectors/tcp/TcpReceiverProperties.java
@@ -304,6 +304,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/connectors/vm/VmDispatcherProperties.java b/server/src/com/mirth/connect/connectors/vm/VmDispatcherProperties.java
@@ -147,6 +147,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/connectors/vm/VmReceiverProperties.java b/server/src/com/mirth/connect/connectors/vm/VmReceiverProperties.java
@@ -78,6 +78,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/connectors/ws/WebServiceDispatcherProperties.java b/server/src/com/mirth/connect/connectors/ws/WebServiceDispatcherProperties.java
@@ -433,6 +433,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/connectors/ws/WebServiceReceiverProperties.java b/server/src/com/mirth/connect/connectors/ws/WebServiceReceiverProperties.java
@@ -148,6 +148,9 @@ public void migrate3_4_0(DonkeyElement element) {
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/model/Channel.java b/server/src/com/mirth/connect/model/Channel.java
@@ -332,6 +332,9 @@ public void migrate3_5_0(DonkeyElement element) {
             }
         }
     }
+
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
 
     @Override
     public Map<String, Object> getPurgedProperties() {

diff --git a/server/src/com/mirth/connect/model/ChannelGroup.java b/server/src/com/mirth/connect/model/ChannelGroup.java
@@ -153,6 +153,9 @@ public void migrate3_4_0(DonkeyElement element) {}
 
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
+
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
 
     @Override
     public Map<String, Object> getPurgedProperties() {

diff --git a/server/src/com/mirth/connect/model/ChannelProperties.java b/server/src/com/mirth/connect/model/ChannelProperties.java
@@ -190,6 +190,9 @@ public void migrate3_4_0(DonkeyElement element) {
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = new HashMap<String, Object>();

diff --git a/server/src/com/mirth/connect/model/Connector.java b/server/src/com/mirth/connect/model/Connector.java
@@ -205,6 +205,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = new HashMap<String, Object>();

diff --git a/server/src/com/mirth/connect/model/Filter.java b/server/src/com/mirth/connect/model/Filter.java
@@ -111,6 +111,9 @@ public void migrate3_5_0(DonkeyElement element) {
             newRuleElement.addChildElement("name", nameElement != null ? nameElement.getTextContent() : "");
         }
     }
+
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
 
     @Override
     public Filter clone() {

diff --git a/server/src/com/mirth/connect/model/ResourceProperties.java b/server/src/com/mirth/connect/model/ResourceProperties.java
@@ -117,6 +117,9 @@ public void migrate3_4_0(DonkeyElement element) {}
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = new HashMap<String, Object>();

diff --git a/server/src/com/mirth/connect/model/ServerConfiguration.java b/server/src/com/mirth/connect/model/ServerConfiguration.java
@@ -404,4 +404,7 @@ public void migrate3_5_0(DonkeyElement element) {
             bgColor.addChildElement("alpha", String.valueOf(newColor.getAlpha()));
         }
     }
+
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
 }
diff --git a/server/src/com/mirth/connect/model/Transformer.java b/server/src/com/mirth/connect/model/Transformer.java
@@ -210,6 +210,9 @@ public void migrate3_5_0(DonkeyElement element) {
         }
     }
 
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
+
     @Override
     public Map<String, Object> getPurgedProperties() {
         Map<String, Object> purgedProperties = super.getPurgedProperties();

diff --git a/server/src/com/mirth/connect/model/UpdateSettings.java b/server/src/com/mirth/connect/model/UpdateSettings.java
@@ -109,4 +109,7 @@ public void migrate3_4_0(DonkeyElement element) {}
 
     @Override
     public void migrate3_5_0(DonkeyElement element) {}
+
+    @Override
+    public void migrate3_6_0(DonkeyElement element) {}
 }