/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements. See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache license, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License. You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the license for the specific language governing permissions and
 * limitations under the license.
 */
package org.apache.logging.log4j.core.pattern;

import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.message.MultiformatMessage;

/**
 * Returns the event's rendered message in a StringBuilder.
 */
@Plugin(name = "MessagePatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "m", "msg", "message" })
public final class MessagePatternConverter extends LogEventPatternConverter {

    private static final String NULL = "null";
    private final String[] formats;
    private final Configuration config;

    /**
     * Private constructor.
     * @param options options, may be null.
     */
    private MessagePatternConverter(final Configuration config, final String[] options) {
        super("Message", "message");
        formats = options;
        this.config = config;
    }

    /**
     * Obtains an instance of pattern converter.
     *
     * @param config The Configuration.
     * @param options options, may be null.
     * @return instance of pattern converter.
     */
    public static MessagePatternConverter newInstance(final Configuration config, final String[] options) {
        return new MessagePatternConverter(config, options);
    }

    /**
     * {@inheritDoc}
     */
    @Override
    public void format(final LogEvent event, final StringBuilder toAppendTo) {
        final String result = messageString(event);
        if (result == NULL) {
            toAppendTo.append(NULL);
        } else {
            toAppendTo.append(replaceParams(event, result));
        }
    }

    private String replaceParams(final LogEvent event, final String result) {
        return config != null && result.contains("${") ?
            config.getStrSubstitutor().replace(event, result) : result;
    }

    private String messageString(final LogEvent event) {
        return messageString(event.getMessage());
    }

    private String messageString(final Message msg) {
        String result;
        if (msg instanceof MultiformatMessage) {
            result = ((MultiformatMessage) msg).getFormattedMessage(formats);
        } else {
            result = msg == null ? NULL : msg.getFormattedMessage();
        }
        return result;
    }
}

@@ -1391,55 +1391,8 @@
  %7B%0A%0A
-    private static final String NULL = %22null%22;%0A
     
@@ -1423,16 +1423,16 @@
 ormats;%0A
+
     priv
@@ -2269,43 +2269,39 @@
 nal 
-String result = messageString(event
+Message msg = event.getMessage(
 );%0A 
@@ -2315,22 +2315,19 @@
 if (
-result == NULL
+msg != null
 ) %7B%0A
@@ -2342,108 +2342,155 @@
     
-toAppendTo.append(NULL);%0A        %7D else %7B%0A            toAppendTo.append(replaceParams(event, result)
+String result;%0A            if (msg instanceof MultiformatMessage) %7B%0A                result = ((MultiformatMessage) msg).getFormattedMessage(formats
 );%0A 
@@ -2500,110 +2500,155 @@
     
-%7D%0A
     %7D
-%0A%0A    private String replaceParams(final LogEvent event, final String result) %7B%0A        return 
+ else %7B%0A                result = msg.getFormattedMessage();%0A            %7D%0A            if (result != null) %7B%0A                toAppendTo.append(
 conf
@@ -2685,16 +2685,28 @@
 %22$%7B%22) ?%0A
+            
         
@@ -2771,421 +2771,79 @@
 sult
-;%0A    %7D%0A%0A    private String messageString(final LogEvent event) %7B%0A        return messageString(event.getMessage());%0A    %7D%0A%0A    private String messageString(final Message msg) %7B%0A        String result;%0A        if (msg instanceof MultiformatMessage) %7B%0A            result = ((MultiformatMessage) msg).getFormattedMessage(formats);%0A        %7D else %7B%0A            result = msg == null ? NULL : msg.getFormattedMessage();%0A
+);%0A            %7D else %7B%0A                toAppendTo.append(%22null%22);%0A    
     
@@ -2860,22 +2860,9 @@
     
-return result;
+%7D
 %0A   

revert refactoring