/*
 * 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.slf4j.helpers;

import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.message.ParameterizedMessage;
import org.apache.logging.log4j.message.StructuredDataMessage;
import org.slf4j.ext.EventData;

import java.util.Map;

/**
 *
 */
public class EventDataConverter {

    public Message convertEvent(final String message, final Object[] objects, final Throwable throwable) {
        Message msg;
        try {
            final EventData data = (objects != null && objects[0] instanceof EventData) ? (EventData) objects[0] :
                new EventData(message);
            msg = new StructuredDataMessage(data.getEventId(), data.getMessage(), data.getEventType());
            for (final Map.Entry<String, Object> entry : data.getEventMap().entrySet()) {
                final String key = entry.getKey();
                if (EventData.EVENT_TYPE.equals(key) || EventData.EVENT_ID.equals(key) ||
                    EventData.EVENT_MESSAGE.equals(key)) {
                    continue;
                }
                ((StructuredDataMessage) msg).put(entry.getKey(), String.valueOf(entry.getValue()));
            }
        } catch (final Exception ex) {
            msg = new ParameterizedMessage(message, objects, throwable);
        }
        return msg;
    }
}

@@ -822,16 +822,39 @@
 lpers;%0A%0A
+import java.util.Map;%0A%0A
 import o
@@ -1052,39 +1052,16 @@
 tData;%0A%0A
-import java.util.Map;%0A%0A
 /**%0A *%0A 
@@ -1209,29 +1209,8 @@
 ) %7B%0A
-        Message msg;%0A
     
@@ -1331,18 +1331,16 @@
 jects%5B0%5D
- :
 %0A       
@@ -1347,16 +1347,22 @@
         
+     :
  new Eve
@@ -1382,32 +1382,60 @@
 e);%0A            
+final StructuredDataMessage 
 msg = new Struct
@@ -1487,16 +1487,36 @@
 ssage(),
+%0A                   
  data.ge
@@ -1757,19 +1757,16 @@
 als(key)
- %7C%7C
 %0A       
@@ -1777,16 +1777,23 @@
         
+     %7C%7C
  EventDa
@@ -1891,57 +1891,20 @@
     
- ((StructuredDataMessage)
  msg
-)
 .put(
-entry.getKey()
+key
 , St
@@ -1942,32 +1942,56 @@
 ;%0A            %7D%0A
+            return msg;%0A
         %7D catch 
@@ -2025,21 +2025,22 @@
         
-msg =
+return
  new Par
@@ -2097,36 +2097,16 @@
       %7D%0A
-        return msg;%0A
     %7D%0A%7D%0A

Rewrite method to avoid type casting. Also reuse key local var instead of calling getKey() again.