[bugfix]update unit tests/jacoco to java 17

Signed-off-by: Chris Gibson <[email protected]>

Author: Innovarzweng

server/build.xml

@@ -1144,8 +1144,10 @@
 
 	<target name="create-derby-db" depends="compile">
 		<!-- re-create the embedded database -->
-		<delete dir="mirthdb" />
+		<delete dir="appdata/mirthdb" />
 		<java classname="com.mirth.connect.server.tools.ScriptRunner" fork="true" dir="${basedir}" failonerror="true">
+			<!-- Set Derby home so it creates mirthdb inside appdata -->
+			<jvmarg value="-Dderby.system.home=appdata" />
 			<classpath>
 				<pathelement location="${setup.server.lib}/${server.jar}" />
 				<pathelement location="classes" />
@@ -1271,9 +1273,15 @@
 
 	<target name="test-run" depends="test-compile">
 		<property name="junit-reports" value="junit-reports" />
+		<property name="junit-html" value="junit-html" />
 		<property name="code-coverage-reports" value="code-coverage-reports" />
+		<delete dir="${junit-reports}" />
+		<delete dir="${code-coverage-reports}" />
+		<delete dir="${junit-html}" />
+
 		<mkdir dir="${junit-reports}" />
 		<mkdir dir="${code-coverage-reports}" />
+		<mkdir dir="${junit-html}" />
 
 		<jacoco:coverage destfile="${code-coverage-reports}/jacoco.exec" xmlns:jacoco="antlib:org.jacoco.ant" exclclassloader="sun.reflect.DelegatingClassLoader:javassist.Loader" >
 			<junit haltonfailure="false" fork="true" forkmode="perTest">
@@ -1314,6 +1322,14 @@
 				</batchtest>
 			</junit>
 		</jacoco:coverage>
+
+		<!-- Generate HTML report from JUnit XML output -->
+		<junitreport todir="${junit-reports}">
+			<fileset dir="${junit-reports}">
+				<include name="TEST-*.xml"/>
+			</fileset>
+			<report format="frames" todir="${junit-html}" />
+		</junitreport>
 	</target>
 
 	<target name="remove-classes" depends="init">

server/lib/ant/ant-header.jar

@@ -25,8 +25,8 @@ public class DefaultMetaData {
     public static final MetaDataColumnType TYPE_COLUMN_TYPE = MetaDataColumnType.STRING;
     public static final MetaDataColumnType VERSION_COLUMN_TYPE = MetaDataColumnType.STRING;
 
-    public static final String SOURCE_VARIABLE_MAPPING = "mirth_source";
-    public static final String TYPE_VARIABLE_MAPPING = "mirth_type";
+    public static final String SOURCE_VARIABLE_MAPPING = "message_source";
+    public static final String TYPE_VARIABLE_MAPPING = "message_type";
     public static final String VERSION_VARIABLE_MAPPING = "mirth_version";
 
     public static final MetaDataColumn SOURCE_COLUMN = new MetaDataColumn(SOURCE_COLUMN_NAME, SOURCE_COLUMN_TYPE, SOURCE_VARIABLE_MAPPING);