Skip to content

Commit 96c7c61

Browse files
mgaffiganmgaffigan
committed
Fix warnings on build
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>
1 parent 5ff9715 commit 96c7c61

File tree

16 files changed

+122
-108
lines changed

16 files changed

+122
-108
lines changed

‎client/src/com/mirth/connect/client/ui/OSXAdapter.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ protected static Object getApplication() throws Exception {
278278
return macOSXApplication;
279279
}
280280

281+
@SuppressWarnings("removal")
281282
protected static void setHandler(InvocationHandler adapter, String interfaceName, String applicationSetter) throws Exception {
282283
Class<?> handlerInterface = Class.forName(interfaceName);
283284
Object handlerImpl = Proxy.newProxyInstance(AccessController.doPrivileged(ReflectionHelper.getClassLoaderPA(handlerInterface)), new Class[] {

‎client/src/com/mirth/connect/client/ui/panels/connectors/ConnectorSettingsPanel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public final <T> T getServlet(final Class<T> servletInterface, final String work
197197
* A custom error message to display if an exception occurs during connector service
198198
* invocation
199199
*/
200-
@SuppressWarnings("unchecked")
200+
@SuppressWarnings({"removal", "unchecked"})
201201
public final <T> T getServlet(final Class<T> servletInterface, final String workerDisplayText, final String errorText, final ResponseHandler responseHandler, final String workerId) {
202202
return (T) Proxy.newProxyInstance(AccessController.doPrivileged(ReflectionHelper.getClassLoaderPA(servletInterface)), new Class[] {
203203
servletInterface }, new InvocationHandler() {

‎server/build.xml‎

Lines changed: 0 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,6 @@
228228
<include name="*.xml" />
229229
</fileset>
230230
</copy>
231-
<copy todir="${connectors.http}/lib" failonerror="false">
232-
<fileset dir="${lib.extensions}/http" />
233-
</copy>
234231
<jar destfile="${connectors.http}/http-shared.jar" basedir="${classes}">
235232
<include name="com/mirth/connect/connectors/http/HttpReceiverProperties.class" />
236233
<include name="com/mirth/connect/connectors/http/HttpDispatcherProperties.class" />
@@ -256,9 +253,6 @@
256253
<include name="*.xml" />
257254
</fileset>
258255
</copy>
259-
<copy todir="${connectors.jdbc}/lib" failonerror="false">
260-
<fileset dir="${lib.extensions}/jdbc" />
261-
</copy>
262256
<jar destfile="${connectors.jdbc}/jdbc-shared.jar" basedir="${classes}">
263257
<include name="com/mirth/connect/connectors/jdbc/DatabaseReceiverProperties.class" />
264258
<include name="com/mirth/connect/connectors/jdbc/DatabaseDispatcherProperties.class" />
@@ -286,9 +280,6 @@
286280
<include name="*.xml" />
287281
</fileset>
288282
</copy>
289-
<copy todir="${connectors.jms}/lib" failonerror="false">
290-
<fileset dir="${lib.extensions}/jms" />
291-
</copy>
292283
<jar destfile="${connectors.jms}/jms-shared.jar" basedir="${classes}">
293284
<include name="com/mirth/connect/connectors/jms/JmsConnectorProperties.class" />
294285
<include name="com/mirth/connect/connectors/jms/JmsReceiverProperties.class" />
@@ -312,9 +303,6 @@
312303
<include name="*.xml" />
313304
</fileset>
314305
</copy>
315-
<copy todir="${connectors.js}/lib" failonerror="false">
316-
<fileset dir="${lib.extensions}/js" />
317-
</copy>
318306
<jar destfile="${connectors.js}/js-shared.jar" basedir="${classes}">
319307
<include name="com/mirth/connect/connectors/js/JavaScriptReceiverProperties.class" />
320308
<include name="com/mirth/connect/connectors/js/JavaScriptDispatcherProperties.class" />
@@ -334,9 +322,6 @@
334322
<include name="*.xml" />
335323
</fileset>
336324
</copy>
337-
<copy todir="${connectors.smtp}/lib" failonerror="false">
338-
<fileset dir="${lib.extensions}/smtp" />
339-
</copy>
340325
<jar destfile="${connectors.smtp}/smtp-shared.jar" basedir="${classes}">
341326
<include name="com/mirth/connect/connectors/smtp/SmtpDispatcherProperties.class" />
342327
<include name="com/mirth/connect/connectors/smtp/SmtpConnectorServletInterface.class" />
@@ -358,9 +343,6 @@
358343
<include name="*.xml" />
359344
</fileset>
360345
</copy>
361-
<copy todir="${connectors.tcp}/lib" failonerror="false">
362-
<fileset dir="${lib.extensions}/tcp" />
363-
</copy>
364346
<jar destfile="${connectors.tcp}/tcp-shared.jar" basedir="${classes}">
365347
<include name="com/mirth/connect/connectors/tcp/TcpReceiverProperties.class" />
366348
<include name="com/mirth/connect/connectors/tcp/TcpDispatcherProperties.class" />
@@ -382,9 +364,6 @@
382364
<include name="*.xml" />
383365
</fileset>
384366
</copy>
385-
<copy todir="${connectors.vm}/lib" failonerror="false">
386-
<fileset dir="${lib.extensions}/vm" />
387-
</copy>
388367
<jar destfile="${connectors.vm}/vm-shared.jar" basedir="${classes}">
389368
<include name="com/mirth/connect/connectors/vm/VmReceiverProperties.class" />
390369
<include name="com/mirth/connect/connectors/vm/VmDispatcherProperties.class" />
@@ -443,9 +422,6 @@
443422
<include name="*.xml" />
444423
</fileset>
445424
</copy>
446-
<copy todir="${plugins.datatype-delimited}/lib" failonerror="false">
447-
<fileset dir="${lib.extensions}/datatypes/delimited" />
448-
</copy>
449425
<jar destfile="${plugins.datatype-delimited}/datatype-delimited-shared.jar" basedir="${classes}">
450426
<include name="com/mirth/connect/plugins/datatypes/delimited/**" />
451427
<exclude name="com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeServerPlugin.class" />
@@ -465,9 +441,6 @@
465441
<include name="*.xml" />
466442
</fileset>
467443
</copy>
468-
<copy todir="${plugins.datatype-dicom}/lib" failonerror="false">
469-
<fileset dir="${lib.extensions}/datatypes/dicom" />
470-
</copy>
471444
<jar destfile="${plugins.datatype-dicom}/datatype-dicom-shared.jar" basedir="${classes}">
472445
<include name="com/mirth/connect/plugins/datatypes/dicom/**" />
473446
<exclude name="com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeServerPlugin.class" />
@@ -484,9 +457,6 @@
484457
<include name="*.xml" />
485458
</fileset>
486459
</copy>
487-
<copy todir="${plugins.datatype-edi}/lib" failonerror="false">
488-
<fileset dir="${lib.extensions}/datatypes/edi" />
489-
</copy>
490460
<!-- copy the xml files so they will be included in jar -->
491461
<copy todir="${classes}/com/mirth/connect/plugins/datatypes/edi/xml">
492462
<fileset dir="${src}/com/mirth/connect/plugins/datatypes/edi/xml" />
@@ -506,9 +476,6 @@
506476
<include name="*.xml" />
507477
</fileset>
508478
</copy>
509-
<copy todir="${plugins.datatype-hl7v2}/lib" failonerror="false">
510-
<fileset dir="${lib.extensions}/datatypes/hl7v2" />
511-
</copy>
512479
<jar destfile="${plugins.datatype-hl7v2}/datatype-hl7v2-shared.jar" basedir="${classes}">
513480
<include name="com/mirth/connect/plugins/datatypes/hl7v2/**" />
514481
<exclude name="com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeServerPlugin.class" />
@@ -526,9 +493,6 @@
526493
<include name="*.xml" />
527494
</fileset>
528495
</copy>
529-
<copy todir="${plugins.datatype-hl7v3}/lib" failonerror="false">
530-
<fileset dir="${lib.extensions}/datatypes/hl7v3" />
531-
</copy>
532496
<jar destfile="${plugins.datatype-hl7v3}/datatype-hl7v3-shared.jar" basedir="${classes}">
533497
<include name="com/mirth/connect/plugins/datatypes/hl7v3/**" />
534498
<exclude name="com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeServerPlugin.class" />
@@ -544,9 +508,6 @@
544508
<include name="*.xml" />
545509
</fileset>
546510
</copy>
547-
<copy todir="${plugins.datatype-ncpdp}/lib" failonerror="false">
548-
<fileset dir="${lib.extensions}/datatypes/ncpdp" />
549-
</copy>
550511
<jar destfile="${plugins.datatype-ncpdp}/datatype-ncpdp-shared.jar" basedir="${classes}">
551512
<include name="com/mirth/connect/plugins/datatypes/ncpdp/**" />
552513
<exclude name="com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeServerPlugin.class" />
@@ -562,9 +523,6 @@
562523
<include name="*.xml" />
563524
</fileset>
564525
</copy>
565-
<copy todir="${plugins.datatype-xml}/lib" failonerror="false">
566-
<fileset dir="${lib.extensions}/datatypes/xml" />
567-
</copy>
568526
<jar destfile="${plugins.datatype-xml}/datatype-xml-shared.jar" basedir="${classes}">
569527
<include name="com/mirth/connect/plugins/datatypes/xml/**" />
570528
<exclude name="com/mirth/connect/plugins/datatypes/xml/XMLDataTypeServerPlugin.class" />
@@ -580,9 +538,6 @@
580538
<include name="*.xml" />
581539
</fileset>
582540
</copy>
583-
<copy todir="${plugins.datatype-raw}/lib" failonerror="false">
584-
<fileset dir="${lib.extensions}/datatypes/raw" />
585-
</copy>
586541
<jar destfile="${plugins.datatype-raw}/datatype-raw-shared.jar" basedir="${classes}">
587542
<include name="com/mirth/connect/plugins/datatypes/raw/**" />
588543
<exclude name="com/mirth/connect/plugins/datatypes/raw/RawDataTypeServerPlugin.class" />
@@ -598,9 +553,6 @@
598553
<include name="*.xml" />
599554
</fileset>
600555
</copy>
601-
<copy todir="${plugins.datatype-json}/lib" failonerror="false">
602-
<fileset dir="${lib.extensions}/datatypes/json" />
603-
</copy>
604556
<jar destfile="${plugins.datatype-json}/datatype-json-shared.jar" basedir="${classes}">
605557
<include name="com/mirth/connect/plugins/datatypes/json/**" />
606558
<exclude name="com/mirth/connect/plugins/datatypes/json/JSONDataTypeServerPlugin.class" />
@@ -616,9 +568,6 @@
616568
<include name="*.xml" />
617569
</fileset>
618570
</copy>
619-
<copy todir="${plugins.directoryresource}/lib" failonerror="false">
620-
<fileset dir="${lib.extensions}/directoryresource" />
621-
</copy>
622571
<jar destfile="${plugins.directoryresource}/directoryresource-shared.jar" basedir="${classes}">
623572
<include name="com/mirth/connect/plugins/directoryresource/DirectoryResourceProperties.class" />
624573
<include name="com/mirth/connect/plugins/directoryresource/DirectoryResourceServletInterface.class" />
@@ -636,9 +585,6 @@
636585
<include name="*.xml" />
637586
</fileset>
638587
</copy>
639-
<copy todir="${plugins.dashboardstatus}/lib" failonerror="false">
640-
<fileset dir="${lib.extensions}/dashboardstatus" />
641-
</copy>
642588
<jar destfile="${plugins.dashboardstatus}/dashboardstatus-shared.jar" basedir="${classes}">
643589
<include name="com/mirth/connect/plugins/dashboardstatus/ConnectionLogItem.class" />
644590
<include name="com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusServletInterface.class" />
@@ -656,9 +602,6 @@
656602
<include name="*.xml" />
657603
</fileset>
658604
</copy>
659-
<copy todir="${plugins.destinationsetfilter}/lib" failonerror="false">
660-
<fileset dir="${lib.extensions}/destinationsetfilter" />
661-
</copy>
662605
<jar destfile="${plugins.destinationsetfilter}/destinationsetfilter-shared.jar" basedir="${classes}">
663606
<include name="com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterStep.class" />
664607
<include name="com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterStep$Behavior.class" />
@@ -683,9 +626,6 @@
683626
<include name="*.xml" />
684627
</fileset>
685628
</copy>
686-
<copy todir="${plugins.globalmapviewer}/lib" failonerror="false">
687-
<fileset dir="${lib.extensions}/globalmapviewer" />
688-
</copy>
689629
<jar destfile="${plugins.globalmapviewer}/globalmapviewer-shared.jar" basedir="${classes}">
690630
<include name="com/mirth/connect/plugins/globalmapviewer/GlobalMapServletInterface.class" />
691631
</jar>
@@ -701,9 +641,6 @@
701641
<include name="*.xml" />
702642
</fileset>
703643
</copy>
704-
<copy todir="${plugins.httpauth}/lib" failonerror="false">
705-
<fileset dir="${lib.extensions}/httpauth" />
706-
</copy>
707644
<jar destfile="${plugins.httpauth}/httpauth-shared.jar" basedir="${classes}">
708645
<include name="com/mirth/connect/plugins/httpauth/HttpAuthConnectorPluginProperties.class" />
709646
<include name="com/mirth/connect/plugins/httpauth/HttpAuthConnectorPluginProperties$AuthType.class" />
@@ -742,9 +679,6 @@
742679
<include name="*.xml" />
743680
</fileset>
744681
</copy>
745-
<copy todir="${plugins.imageviewer}/lib" failonerror="false">
746-
<fileset dir="${lib.extensions}/imageviewer" />
747-
</copy>
748682

749683
<!-- plugins.javascriptrule -->
750684
<mkdir dir="${plugins.javascriptrule}" />
@@ -753,9 +687,6 @@
753687
<include name="*.xml" />
754688
</fileset>
755689
</copy>
756-
<copy todir="${plugins.javascriptrule}/lib" failonerror="false">
757-
<fileset dir="${lib.extensions}/javascriptrule" />
758-
</copy>
759690
<jar destfile="${plugins.javascriptrule}/javascriptrule-shared.jar" basedir="${classes}">
760691
<include name="com/mirth/connect/plugins/javascriptrule/JavaScriptRule.class" />
761692
</jar>
@@ -767,9 +698,6 @@
767698
<include name="*.xml" />
768699
</fileset>
769700
</copy>
770-
<copy todir="${plugins.javascriptstep}/lib" failonerror="false">
771-
<fileset dir="${lib.extensions}/javascriptstep" />
772-
</copy>
773701
<jar destfile="${plugins.javascriptstep}/javascriptstep-shared.jar" basedir="${classes}">
774702
<include name="com/mirth/connect/plugins/javascriptstep/JavaScriptStep.class" />
775703
</jar>
@@ -781,9 +709,6 @@
781709
<include name="*.xml" />
782710
</fileset>
783711
</copy>
784-
<copy todir="${plugins.mapper}/lib" failonerror="false">
785-
<fileset dir="${lib.extensions}/mapper" />
786-
</copy>
787712
<jar destfile="${plugins.mapper}/mapper-shared.jar" basedir="${classes}">
788713
<include name="com/mirth/connect/plugins/mapper/MapperStep.class" />
789714
<include name="com/mirth/connect/plugins/mapper/MapperStep$Scope.class" />
@@ -796,9 +721,6 @@
796721
<include name="*.xml" />
797722
</fileset>
798723
</copy>
799-
<copy todir="${plugins.messagebuilder}/lib" failonerror="false">
800-
<fileset dir="${lib.extensions}/messagebuilder" />
801-
</copy>
802724
<jar destfile="${plugins.messagebuilder}/messagebuilder-shared.jar" basedir="${classes}">
803725
<include name="com/mirth/connect/plugins/messagebuilder/MessageBuilderStep.class" />
804726
</jar>
@@ -810,9 +732,6 @@
810732
<include name="*.xml" />
811733
</fileset>
812734
</copy>
813-
<copy todir="${plugins.datapruner}/lib" failonerror="false">
814-
<fileset dir="${lib.extensions}/datapruner" />
815-
</copy>
816735
<jar destfile="${plugins.datapruner}/datapruner-shared.jar" basedir="${classes}">
817736
<include name="com/mirth/connect/plugins/datapruner/DataPrunerServletInterface.class" />
818737
</jar>
@@ -828,9 +747,6 @@
828747
<include name="*.xml" />
829748
</fileset>
830749
</copy>
831-
<copy todir="${plugins.mllpmode}/lib" failonerror="false">
832-
<fileset dir="${lib.extensions}/mllpmode" />
833-
</copy>
834750
<jar destfile="${plugins.mllpmode}/mllpmode-shared.jar" basedir="${classes}">
835751
<include name="com/mirth/connect/plugins/mllpmode/MLLPModeProperties.class" />
836752
</jar>
@@ -857,9 +773,6 @@
857773
<include name="*.xml" />
858774
</fileset>
859775
</copy>
860-
<copy todir="${plugins.textviewer}/lib" failonerror="false">
861-
<fileset dir="${lib.extensions}/textviewer" />
862-
</copy>
863776

864777
<!-- plugins.rulebuilder -->
865778
<mkdir dir="${plugins.rulebuilder}" />
@@ -868,9 +781,6 @@
868781
<include name="*.xml" />
869782
</fileset>
870783
</copy>
871-
<copy todir="${plugins.rulebuilder}/lib" failonerror="false">
872-
<fileset dir="${lib.extensions}/rulebuilder" />
873-
</copy>
874784
<jar destfile="${plugins.rulebuilder}/rulebuilder-shared.jar" basedir="${classes}">
875785
<include name="com/mirth/connect/plugins/rulebuilder/RuleBuilderRule.class" />
876786
<include name="com/mirth/connect/plugins/rulebuilder/RuleBuilderRule$Condition.class" />
@@ -883,9 +793,6 @@
883793
<include name="*.xml" />
884794
</fileset>
885795
</copy>
886-
<copy todir="${plugins.serverlog}/lib" failonerror="false">
887-
<fileset dir="${lib.extensions}/serverlog" />
888-
</copy>
889796
<jar destfile="${plugins.serverlog}/serverlog-shared.jar" basedir="${classes}">
890797
<include name="com/mirth/connect/plugins/serverlog/ServerLogItem.class" />
891798
<include name="com/mirth/connect/plugins/serverlog/ServerLogServletInterface.class" />
@@ -903,9 +810,6 @@
903810
<include name="*.xml" />
904811
</fileset>
905812
</copy>
906-
<copy todir="${plugins.scriptfilerule}/lib" failonerror="false">
907-
<fileset dir="${lib.extensions}/scriptfilerule" />
908-
</copy>
909813
<jar destfile="${plugins.scriptfilerule}/scriptfilerule-shared.jar" basedir="${classes}">
910814
<include name="com/mirth/connect/plugins/scriptfilerule/ExternalScriptRule.class" />
911815
</jar>
@@ -917,9 +821,6 @@
917821
<include name="*.xml" />
918822
</fileset>
919823
</copy>
920-
<copy todir="${plugins.scriptfilestep}/lib" failonerror="false">
921-
<fileset dir="${lib.extensions}/scriptfilestep" />
922-
</copy>
923824
<jar destfile="${plugins.scriptfilestep}/scriptfilestep-shared.jar" basedir="${classes}">
924825
<include name="com/mirth/connect/plugins/scriptfilestep/ExternalScriptStep.class" />
925826
</jar>
@@ -931,9 +832,6 @@
931832
<include name="*.xml" />
932833
</fileset>
933834
</copy>
934-
<copy todir="${plugins.xsltstep}/lib" failonerror="false">
935-
<fileset dir="${lib.extensions}/xsltstep" />
936-
</copy>
937835
<jar destfile="${plugins.xsltstep}/xsltstep-shared.jar" basedir="${classes}">
938836
<include name="com/mirth/connect/plugins/xsltstep/XsltStep.class" />
939837
</jar>

‎server/src/com/mirth/connect/client/core/Client.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ public <T> T getServlet(Class<T> servletInterface, ExecuteType executeType) {
243243
return getServlet(servletInterface, executeType, null);
244244
}
245245

246-
@SuppressWarnings("unchecked")
246+
@SuppressWarnings({"removal", "unchecked"})
247247
public <T> T getServlet(final Class<T> servletInterface, final ExecuteType executeType, final Map<String, List<String>> customHeaders) {
248248
return (T) Proxy.newProxyInstance(AccessController.doPrivileged(ReflectionHelper.getClassLoaderPA(servletInterface)), new Class[] {
249249
servletInterface }, new InvocationHandler() {

‎server/src/com/mirth/connect/server/userutil/DatabaseConnectionFactory.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ public class DatabaseConnectionFactory {
3131
private Map<String, CustomDriverInfo> customDriverInfoMap;
3232
private Logger logger = LogManager.getLogger(getClass());
3333

34+
/**
35+
* Instantiates a new DatabaseConnectionFactory with the specified MirthContextFactory.
36+
*
37+
* @param contextFactory
38+
* The MirthContextFactory to use when creating database connections.
39+
*/
3440
public DatabaseConnectionFactory(MirthContextFactory contextFactory) {
3541
this.contextFactory = contextFactory;
3642
}

0 commit comments

Comments
 (0)