Fix migration failure to 4.5.2

Verify that log4j2.properties and log4j2-cli.properties files exist
before attempting to update them. These files are not strictly required.
Log an INFO level message and continue when not found.
Also refactored to elimitate duplication of code.
Issue: nextgenhealthcare/connect#6327
Co-authored-by: bfnoling <107218487+bfnoling@users.noreply.github.com>
Co-authored-by: Tony Germano <tony@germano.name>
Signed-off-by: Richard Ogin <rogin@users.noreply.github.com>
Signed-off-by: Tony Germano <tony@germano.name>

Author: 3 people

server/src/com/mirth/connect/server/migration/Migrate4_5_2.java

@@ -2,6 +2,7 @@
 
 importjava.io.File;
 importjava.io.IOException;
+importjava.net.URI;
 importjava.util.Map;
 
 importorg.apache.commons.configuration2.PropertiesConfiguration;
@@ -23,33 +24,29 @@ public void migrate() throws MigrationException {
 migrateLog4jProperties();
 	}
 
-privatevoidmigrateLog4jProperties() {
-try {
-// Update log4j2.properties
-FileBasedConfigurationBuilder<PropertiesConfiguration> builder = PropertiesConfigurationUtil.createBuilder(newFile(ClassPathResource.getResourceURI("log4j2.properties")));
-PropertiesConfigurationlog4jproperties = builder.getConfiguration();
-
-StringconsoleCharset = (String) log4jproperties.getProperty("appender.console.layout.charset");
-if (StringUtils.isBlank(consoleCharset)) {
-log4jproperties.setProperty("appender.console.layout.charset", "UTF-8");
- }
-
-builder.save();
-
-// Update log4j2-cli.properties
-builder = PropertiesConfigurationUtil.createBuilder(newFile(ClassPathResource.getResourceURI("log4j2-cli.properties")));
-log4jproperties = builder.getConfiguration();
-
-consoleCharset = (String) log4jproperties.getProperty("appender.console.layout.charset");
-if (StringUtils.isBlank(consoleCharset)) {
-log4jproperties.setProperty("appender.console.layout.charset", "UTF-8");
- }
+privatevoidmigrateLog4jProperties() {
+updateAppender("log4j2.properties");
+updateAppender("log4j2-cli.properties");
+	}
 
-builder.save();
- } catch (ConfigurationException | IOExceptione) {
-logger.error("Failed to migrate log4j properties.", e);
- }
- }
+privatevoidupdateAppender(StringfileName) {
+try {
+URIuri = ClassPathResource.getResourceURI(fileName);
+if (uri == null) {
+logger.info("Migration could not find {}.", fileName);
+return;
+ }
+FileBasedConfigurationBuilder<PropertiesConfiguration> builder = PropertiesConfigurationUtil.createBuilder(newFile(uri));
+PropertiesConfigurationproperties = builder.getConfiguration();
+StringconsoleCharset = (String) properties.getProperty("appender.console.layout.charset");
+if (StringUtils.isBlank(consoleCharset)) {
+properties.setProperty("appender.console.layout.charset", "UTF-8");
+builder.save();
+ }
+ } catch (ConfigurationException | IOExceptione) {
+logger.error(String.format("Failed to migrate %s.", fileName), e);
+ }
+	}
 
 @Override
 publicMap<String, Object> getConfigurationPropertiesToAdd() {