/*
 * Copyright 2008-2012 the original author or authors.
 *
 * Licensed 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.broadleafcommerce.common.email.service.message;

import org.apache.velocity.app.VelocityEngine;
import org.broadleafcommerce.common.email.service.info.EmailInfo;
import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.ui.velocity.VelocityEngineUtils;

import java.util.HashMap;

public class VelocityMessageCreator extends MessageCreator {

    private VelocityEngine velocityEngine;
    private HashMap<String, Object> additionalConfigItems;
    
    public VelocityMessageCreator(VelocityEngine velocityEngine, JavaMailSender mailSender, HashMap<String, Object> additionalConfigItems) {
    	super(mailSender);
    	this.additionalConfigItems = additionalConfigItems;
        this.velocityEngine = velocityEngine;        
    }

	@Override
	public String buildMessageBody(EmailInfo info, HashMap<String,Object> props) {
		@SuppressWarnings("unchecked")
		HashMap<String,Object> propsCopy = (HashMap<String, Object>) props.clone();
        if (additionalConfigItems != null) {
        	propsCopy.putAll(additionalConfigItems);
        }
		return VelocityEngineUtils.mergeTemplateIntoString(velocityEngine, info.getEmailTemplate(), propsCopy);
	}

	public VelocityEngine getVelocityEngine() {
		return velocityEngine;
	}

	public void setVelocityEngine(VelocityEngine velocityEngine) {
		this.velocityEngine = velocityEngine;
	}

	public HashMap<String, Object> getAdditionalConfigItems() {
		return additionalConfigItems;
	}

	public void setAdditionalConfigItems(
			HashMap<String, Object> additionalConfigItems) {
		this.additionalConfigItems = additionalConfigItems;
	}	
}

@@ -933,16 +933,38 @@
 HashMap;
+%0Aimport java.util.Map;
 %0A%0Apublic
@@ -1074,20 +1074,16 @@
 private 
-Hash
 Map%3CStri
@@ -2012,20 +2012,16 @@
 %09public 
-Hash
 Map%3CStri
@@ -2139,20 +2139,16 @@
 ems(%0A%09%09%09
-Hash
 Map%3CStri

Fix a few issues with the admin forgot password flow